mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 05:16:07 +00:00
remove duplicate
This commit is contained in:
@@ -4,7 +4,7 @@ import { z } from 'zod';
|
||||
|
||||
export const MessageTableSchema = z.object({
|
||||
$id: z.number().optional(),
|
||||
id: z.string().optional(),
|
||||
id: z.string().uuid().optional(),
|
||||
roomId: z.string().uuid().optional(),
|
||||
message: z.string().nullable().optional(),
|
||||
messageType: z.number(),
|
||||
|
||||
@@ -11,7 +11,7 @@ import { BehaviorSubject } from 'rxjs';
|
||||
export class HttpService {
|
||||
|
||||
private responseSubject = new BehaviorSubject<Result<HttpResult<any>, HttpErrorResponse>>(null);
|
||||
|
||||
|
||||
constructor(private http: HttpClient) { }
|
||||
|
||||
async post<T>(url: string, body: any): Promise<Result<HttpResult<T>, HttpErrorResponse>> {
|
||||
@@ -21,7 +21,8 @@ export class HttpService {
|
||||
data: response.body,
|
||||
status: response.status,
|
||||
headers: response.headers,
|
||||
url: response.url || url
|
||||
url: response.url || url,
|
||||
method: '',
|
||||
}
|
||||
this.responseSubject.next(ok(data))
|
||||
return ok(data);
|
||||
@@ -36,6 +37,7 @@ export class HttpService {
|
||||
const response = await this.http.get<T>(url, { ...options, observe: 'response' }).toPromise();
|
||||
|
||||
const data = {
|
||||
method: 'GET',
|
||||
data: response.body,
|
||||
status: response.status,
|
||||
headers: response.headers,
|
||||
@@ -58,7 +60,8 @@ export class HttpService {
|
||||
data: response.body,
|
||||
status: response.status,
|
||||
headers: response.headers,
|
||||
url: response.url || url
|
||||
url: response.url || url,
|
||||
method: '',
|
||||
}
|
||||
|
||||
this.responseSubject.next(ok(data))
|
||||
@@ -77,7 +80,8 @@ export class HttpService {
|
||||
data: response.body,
|
||||
status: response.status,
|
||||
headers: response.headers,
|
||||
url: response.url || url
|
||||
url: response.url || url,
|
||||
method: '',
|
||||
}
|
||||
|
||||
this.responseSubject.next(ok(data))
|
||||
@@ -101,7 +105,8 @@ export class HttpService {
|
||||
data: response?.body,
|
||||
status: response?.status,
|
||||
headers: response?.headers,
|
||||
url: response?.url || url
|
||||
url: response?.url || url,
|
||||
method: '',
|
||||
}
|
||||
|
||||
this.responseSubject.next(ok(data))
|
||||
|
||||
@@ -10,4 +10,5 @@ export interface HttpResult<T> {
|
||||
status: number;
|
||||
headers: HttpHeaders;
|
||||
url: string;
|
||||
method: string
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ export class SignalRConnection {
|
||||
|
||||
this.pendingRequests.forEach((_, requestId) => {
|
||||
const data = this.pendingRequests.get(requestId);
|
||||
|
||||
|
||||
if(data) {
|
||||
const { reject } = data
|
||||
reject(err({
|
||||
@@ -81,7 +81,7 @@ export class SignalRConnection {
|
||||
}));
|
||||
this.pendingRequests.delete(requestId);
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
if(this.reconnect) {
|
||||
@@ -122,20 +122,19 @@ export class SignalRConnection {
|
||||
if(this.connectionStateSubject.value == true) {
|
||||
try {
|
||||
this.pendingRequests.set(input.data.requestId, { resolve, reject: (data: any) => resolve(data) });
|
||||
|
||||
|
||||
this.hubConnection.invoke(input.method, input.data)
|
||||
|
||||
this.sendDataSubject.pipe(
|
||||
filter((message) => {
|
||||
console.log(message)
|
||||
return input.data.requestId == message?.data.requestId ||
|
||||
input.data.roomName == message?.data.roomName
|
||||
input?.data?.roomName == message?.data.roomName && typeof input?.data?.roomName == 'string'
|
||||
|
||||
}),
|
||||
first()
|
||||
).subscribe(value => {
|
||||
resolve(ok(value.data as unknown as T))
|
||||
// console.log('Received valid value:', value);
|
||||
console.log('Received valid value:', value);
|
||||
});
|
||||
|
||||
} catch(error) {
|
||||
@@ -154,7 +153,7 @@ export class SignalRConnection {
|
||||
}
|
||||
|
||||
private addMessageListener(): void {
|
||||
|
||||
|
||||
const methods = ['ReceiveMessage', 'TypingMessage', 'AvailableUsers',
|
||||
'ReadAt', 'DeleteMessage', 'UpdateMessage', 'GroupAddedMembers',
|
||||
'GroupDeletedMembers', 'UserAddGroup']
|
||||
@@ -191,7 +190,7 @@ export class SignalRConnection {
|
||||
this.connectionStateSubject.next(false);
|
||||
this.pendingRequests.forEach((_, requestId) => {
|
||||
const data = this.pendingRequests.get(requestId);
|
||||
|
||||
|
||||
if(data) {
|
||||
const { reject } = data
|
||||
reject(err({
|
||||
@@ -199,7 +198,7 @@ export class SignalRConnection {
|
||||
}));
|
||||
this.pendingRequests.delete(requestId);
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
})
|
||||
.catch(err => console.log('Error while closing connection: ' + err));
|
||||
|
||||
Reference in New Issue
Block a user