@addev-be/ui 0.11.7 → 0.12.0

package/src/services/HttpService.ts

@@ -1,92 +1,92 @@
-import { Config } from '../config';
-import { trimEnd } from 'lodash';
-import { v4 } from 'uuid';
-
-export class HttpService {
-  private static instance: HttpService;
-  private config: Config;
-  private promises: {
-    [id: string]: {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      resolve: (value: any) => void;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      reject: (reason?: any) => void;
-    };
-  } = {};
-
-  constructor(config: Config) {
-    HttpService.instance = this;
-    this.config = config;
-  }
-
-  public static getInstance() {
-    return HttpService.instance;
-  }
-
-  public sendRequest<TReq, TRes>(
-    name: string,
-    data: TReq,
-    files?: Record<string, File>
-  ) {
-    const id = v4();
-    const promise = new Promise<TRes>((resolve, reject) => {
-      this.promises[id] = { resolve, reject };
-
-      const formData = new FormData();
-      formData.append('id', id);
-      formData.append('data', JSON.stringify(data));
-      if (files) {
-        Object.entries(files).forEach(([key, file]) => {
-          formData.append(key, file);
-        });
-      }
-
-      console.log('[HTTP] Sending request:', { id, name, data });
-      fetch(`${trimEnd(this.config.httpServerUrl, '/')}/${name}`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: formData,
-      })
-        .then(async (response) => {
-          if (!response.ok) {
-            throw new Error('HTTP request failed');
-          }
-          const body = await response.text();
-          this.parseMessage(body);
-        })
-        .catch((error) => {
-          reject(error);
-        });
-    });
-    return promise;
-  }
-
-  private parseMessage(message: string) {
-    try {
-      const response = JSON.parse(message);
-      if (!response.id) {
-        throw new Error('Received message is not valid');
-      }
-      if (this.promises[response.id]) {
-        console.log('[HTTP] Received response:', response);
-        if (
-          typeof response.data?.status === 'number' &&
-          response.data.status < 0
-        ) {
-          this.promises[response.id].reject(new Error(response.data.message));
-        } else {
-          this.promises[response.id].resolve(response.data);
-        }
-        delete this.promises[response.id];
-      } else {
-        console.log('[HTTP] Received request:', response);
-        // TODO : Implement request handling
-        throw new Error('Not yet implemented');
-      }
-    } catch (error) {
-      console.error('[HTTP] Error parsing message:', error);
-    }
-  }
-}
+import { Config } from '../config';
+import { trimEnd } from 'lodash';
+import { v4 } from 'uuid';
+
+export class HttpService {
+  private static instance: HttpService;
+  private config: Config;
+  private promises: {
+    [id: string]: {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      resolve: (value: any) => void;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      reject: (reason?: any) => void;
+    };
+  } = {};
+
+  constructor(config: Config) {
+    HttpService.instance = this;
+    this.config = config;
+  }
+
+  public static getInstance() {
+    return HttpService.instance;
+  }
+
+  public sendRequest<TReq, TRes>(
+    name: string,
+    data: TReq,
+    files?: Record<string, File>
+  ) {
+    const id = v4();
+    const promise = new Promise<TRes>((resolve, reject) => {
+      this.promises[id] = { resolve, reject };
+
+      const formData = new FormData();
+      formData.append('id', id);
+      formData.append('data', JSON.stringify(data));
+      if (files) {
+        Object.entries(files).forEach(([key, file]) => {
+          formData.append(key, file);
+        });
+      }
+
+      console.log('[HTTP] Sending request:', { id, name, data });
+      fetch(`${trimEnd(this.config.httpServerUrl, '/')}/${name}`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: formData,
+      })
+        .then(async (response) => {
+          if (!response.ok) {
+            throw new Error('HTTP request failed');
+          }
+          const body = await response.text();
+          this.parseMessage(body);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+    return promise;
+  }
+
+  private parseMessage(message: string) {
+    try {
+      const response = JSON.parse(message);
+      if (!response.id) {
+        throw new Error('Received message is not valid');
+      }
+      if (this.promises[response.id]) {
+        console.log('[HTTP] Received response:', response);
+        if (
+          typeof response.data?.status === 'number' &&
+          response.data.status < 0
+        ) {
+          this.promises[response.id].reject(new Error(response.data.message));
+        } else {
+          this.promises[response.id].resolve(response.data);
+        }
+        delete this.promises[response.id];
+      } else {
+        console.log('[HTTP] Received request:', response);
+        // TODO : Implement request handling
+        throw new Error('Not yet implemented');
+      }
+    } catch (error) {
+      console.error('[HTTP] Error parsing message:', error);
+    }
+  }
+}

package/src/services/WebSocketService.ts

@@ -1,137 +1,137 @@
-import { Config } from '../config';
-import { Request } from './base';
-import { Subject } from 'rxjs';
-import { v4 } from 'uuid';
-
-export class WebSocketService {
-  private static instance: WebSocketService;
-  private config: Config;
-  private socket: WebSocket | null = null;
-
-  public status: boolean | undefined = undefined;
-  public status$ = new Subject<boolean | undefined>();
-
-  private queue: Request[] = [];
-  private promises: {
-    [id: string]: {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      resolve: (value: any) => void;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      reject: (reason?: any) => void;
-    };
-  } = {};
-
-  public onOpen?: () => void = () => {};
-  public onClose?: () => void = () => {};
-  public onMessage?: (message: string) => void = () => {};
-  public onError?: (error: unknown) => void = () => {};
-
-  constructor(config: Config) {
-    WebSocketService.instance = this;
-    this.config = config;
-  }
-
-  public static getInstance() {
-    return WebSocketService.instance;
-  }
-
-  private resetConnection() {
-    this.setStatus(undefined);
-    this.socket = new WebSocket(this.config.webSocketUrl);
-
-    this.socket.onopen = () => {
-      console.log('[WS] Connected');
-      const interval = setInterval(() => {
-        if (this.socket && this.socket.readyState === 1) {
-          clearInterval(interval);
-          this.setStatus(true);
-          this.sendQueue();
-          this.onOpen?.();
-        }
-      }, 100);
-    };
-
-    this.socket.onclose = () => {
-      console.log('[WS] Disconnected');
-      setTimeout(() => this.connect(), this.status === true ? 500 : 5000);
-      this.onClose?.();
-      this.setStatus(false);
-    };
-
-    this.socket.onmessage = (event) => {
-      this.onMessage?.(event.data);
-      this.parseMessage(event.data);
-    };
-
-    this.socket.onerror = (error) => {
-      this.onError?.(error);
-      console.error('[WS] Error:', error);
-    };
-  }
-
-  public connect(force = false) {
-    if (this.status === false || force) {
-      this.resetConnection();
-    }
-  }
-
-  private setStatus(status: boolean | undefined) {
-    this.status = status;
-    this.status$.next(status);
-  }
-
-  private sendQueue() {
-    if (this.socket && this.status) {
-      let request: Request | undefined;
-      while ((request = this.queue.shift())) {
-        console.log('[WS] Sending queued request:', request);
-        this.socket?.send(JSON.stringify(request));
-      }
-      this.queue.forEach((request) =>
-        this.socket?.send(JSON.stringify(request))
-      );
-    }
-  }
-
-  public sendRequest<TReq, TRes>(name: string, data: TReq) {
-    const id = v4();
-    const promise = new Promise<TRes>((resolve, reject) => {
-      const request: Request = { id, name, data };
-      this.promises[id] = { resolve, reject };
-      if (!this.socket || !this.status) {
-        this.queue.push(request);
-        return;
-      }
-      console.log('[WS] Sending request:', request);
-      this.socket?.send(JSON.stringify(request));
-    });
-    return promise;
-  }
-
-  private parseMessage(message: string) {
-    try {
-      const response = JSON.parse(message);
-      if (!response.id) {
-        throw new Error('Received message is not valid');
-      }
-      if (this.promises[response.id]) {
-        console.log('[WS] Received response:', response);
-        if (
-          typeof response.data?.status === 'number' &&
-          response.data.status < 0
-        ) {
-          this.promises[response.id].reject(new Error(response.data.message));
-        } else {
-          this.promises[response.id].resolve(response.data);
-        }
-        delete this.promises[response.id];
-      } else {
-        console.log('[WS] Received request:', response);
-        // TODO : Implement request handling
-        throw new Error('Not yet implemented');
-      }
-    } catch (error) {
-      console.error('[WS] Error parsing message:', error);
-    }
-  }
-}
+import { Config } from '../config';
+import { Request } from './base';
+import { Subject } from 'rxjs';
+import { v4 } from 'uuid';
+
+export class WebSocketService {
+  private static instance: WebSocketService;
+  private config: Config;
+  private socket: WebSocket | null = null;
+
+  public status: boolean | undefined = undefined;
+  public status$ = new Subject<boolean | undefined>();
+
+  private queue: Request[] = [];
+  private promises: {
+    [id: string]: {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      resolve: (value: any) => void;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      reject: (reason?: any) => void;
+    };
+  } = {};
+
+  public onOpen?: () => void = () => {};
+  public onClose?: () => void = () => {};
+  public onMessage?: (message: string) => void = () => {};
+  public onError?: (error: unknown) => void = () => {};
+
+  constructor(config: Config) {
+    WebSocketService.instance = this;
+    this.config = config;
+  }
+
+  public static getInstance() {
+    return WebSocketService.instance;
+  }
+
+  private resetConnection() {
+    this.setStatus(undefined);
+    this.socket = new WebSocket(this.config.webSocketUrl);
+
+    this.socket.onopen = () => {
+      console.log('[WS] Connected');
+      const interval = setInterval(() => {
+        if (this.socket && this.socket.readyState === 1) {
+          clearInterval(interval);
+          this.setStatus(true);
+          this.sendQueue();
+          this.onOpen?.();
+        }
+      }, 100);
+    };
+
+    this.socket.onclose = () => {
+      console.log('[WS] Disconnected');
+      setTimeout(() => this.connect(), this.status === true ? 500 : 5000);
+      this.onClose?.();
+      this.setStatus(false);
+    };
+
+    this.socket.onmessage = (event) => {
+      this.onMessage?.(event.data);
+      this.parseMessage(event.data);
+    };
+
+    this.socket.onerror = (error) => {
+      this.onError?.(error);
+      console.error('[WS] Error:', error);
+    };
+  }
+
+  public connect(force = false) {
+    if (this.status === false || force) {
+      this.resetConnection();
+    }
+  }
+
+  private setStatus(status: boolean | undefined) {
+    this.status = status;
+    this.status$.next(status);
+  }
+
+  private sendQueue() {
+    if (this.socket && this.status) {
+      let request: Request | undefined;
+      while ((request = this.queue.shift())) {
+        console.log('[WS] Sending queued request:', request);
+        this.socket?.send(JSON.stringify(request));
+      }
+      this.queue.forEach((request) =>
+        this.socket?.send(JSON.stringify(request))
+      );
+    }
+  }
+
+  public sendRequest<TReq, TRes>(name: string, data: TReq) {
+    const id = v4();
+    const promise = new Promise<TRes>((resolve, reject) => {
+      const request: Request = { id, name, data };
+      this.promises[id] = { resolve, reject };
+      if (!this.socket || !this.status) {
+        this.queue.push(request);
+        return;
+      }
+      console.log('[WS] Sending request:', request);
+      this.socket?.send(JSON.stringify(request));
+    });
+    return promise;
+  }
+
+  private parseMessage(message: string) {
+    try {
+      const response = JSON.parse(message);
+      if (!response.id) {
+        throw new Error('Received message is not valid');
+      }
+      if (this.promises[response.id]) {
+        console.log('[WS] Received response:', response);
+        if (
+          typeof response.data?.status === 'number' &&
+          response.data.status < 0
+        ) {
+          this.promises[response.id].reject(new Error(response.data.message));
+        } else {
+          this.promises[response.id].resolve(response.data);
+        }
+        delete this.promises[response.id];
+      } else {
+        console.log('[WS] Received request:', response);
+        // TODO : Implement request handling
+        throw new Error('Not yet implemented');
+      }
+    } catch (error) {
+      console.error('[WS] Error parsing message:', error);
+    }
+  }
+}

package/src/services/advancedRequests.ts

@@ -1,102 +1,102 @@
-import { useWebSocketRequestHandler } from './hooks';
-
-export type FieldDTO<T extends string = string> = {
-  fieldName?: T;
-  fieldAlias?: string;
-  operator?:
-    | 'add'
-    | 'concat'
-    | 'divide'
-    | 'groupConcat'
-    | 'if'
-    | 'ifNull'
-    | 'jsonObject'
-    | 'length'
-    | 'modulo'
-    | 'multiply'
-    | 'subtract'
-    | 'sum'
-    | 'trim';
-  operands?: FieldDTO[];
-  constantValue?: string | number | boolean | null;
-  groupBy?: boolean;
-};
-
-export type ConditionDTO = {
-  field: string;
-  operator:
-    | 'lessThan'
-    | 'lessThanOrEqual'
-    | 'lessThanOrEquals'
-    | 'equals'
-    | 'notEquals'
-    | 'greaterThanOrEqual'
-    | 'greaterThanOrEquals'
-    | 'greaterThan'
-    | 'like'
-    | 'contains'
-    | 'notContains'
-    | 'startsWith'
-    | 'endsWith'
-    | 'notLike'
-    | 'inRange'
-    | 'between'
-    | 'isNull'
-    | 'isNotNull'
-    | 'inArray'
-    | 'in'
-    | 'not'
-    | 'and'
-    | 'or';
-  value?:
-    | string
-    | number
-    | boolean
-    | null
-    | (string | number | boolean | null)[];
-  children?: boolean;
-};
-
-export type OrderByDTO = {
-  field: string;
-  direction?: 'ASC' | 'DESC';
-};
-
-export type AdvancedRequestDTO = {
-  type: string;
-  fields: FieldDTO[];
-  conditions: ConditionDTO[];
-  orderBy?: OrderByDTO[];
-  start?: number;
-  length?: number;
-  getTotal?: boolean;
-  unique?: boolean;
-};
-
-export type AdvancedRequestRow<R> = {
-  [K in keyof R]: R[K] extends string | number | null
-    ? R[K]
-    : string | number | null;
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type AdvancedResponseDTO<T = any> = {
-  data: AdvancedRequestRow<T>[];
-  count?: number;
-};
-
-export type AdvancedRequestFieldDTO =
-  | string
-  | {
-      name: string;
-      fields: AdvancedRequestFieldDTO[];
-    };
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const useAdvancedRequestHandler = <T = any>() =>
-  useWebSocketRequestHandler<AdvancedRequestDTO, AdvancedResponseDTO<T>>(
-    'AdvancedRequest'
-  );
-
-export const useRawAdvancedRequestHandler = () =>
-  useWebSocketRequestHandler<AdvancedRequestDTO, string>('RawAdvancedRequest');
+import { useWebSocketRequestHandler } from './hooks';
+
+export type FieldDTO<T extends string = string> = {
+  fieldName?: T;
+  fieldAlias?: string;
+  operator?:
+    | 'add'
+    | 'concat'
+    | 'divide'
+    | 'groupConcat'
+    | 'if'
+    | 'ifNull'
+    | 'jsonObject'
+    | 'length'
+    | 'modulo'
+    | 'multiply'
+    | 'subtract'
+    | 'sum'
+    | 'trim';
+  operands?: FieldDTO[];
+  constantValue?: string | number | boolean | null;
+  groupBy?: boolean;
+};
+
+export type ConditionDTO = {
+  field: string;
+  operator:
+    | 'lessThan'
+    | 'lessThanOrEqual'
+    | 'lessThanOrEquals'
+    | 'equals'
+    | 'notEquals'
+    | 'greaterThanOrEqual'
+    | 'greaterThanOrEquals'
+    | 'greaterThan'
+    | 'like'
+    | 'contains'
+    | 'notContains'
+    | 'startsWith'
+    | 'endsWith'
+    | 'notLike'
+    | 'inRange'
+    | 'between'
+    | 'isNull'
+    | 'isNotNull'
+    | 'inArray'
+    | 'in'
+    | 'not'
+    | 'and'
+    | 'or';
+  value?:
+    | string
+    | number
+    | boolean
+    | null
+    | (string | number | boolean | null)[];
+  children?: boolean;
+};
+
+export type OrderByDTO = {
+  field: string;
+  direction?: 'ASC' | 'DESC';
+};
+
+export type AdvancedRequestDTO = {
+  type: string;
+  fields: FieldDTO[];
+  conditions: ConditionDTO[];
+  orderBy?: OrderByDTO[];
+  start?: number;
+  length?: number;
+  getTotal?: boolean;
+  unique?: boolean;
+};
+
+export type AdvancedRequestRow<R> = {
+  [K in keyof R]: R[K] extends string | number | null
+    ? R[K]
+    : string | number | null;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type AdvancedResponseDTO<T = any> = {
+  data: AdvancedRequestRow<T>[];
+  count?: number;
+};
+
+export type AdvancedRequestFieldDTO =
+  | string
+  | {
+      name: string;
+      fields: AdvancedRequestFieldDTO[];
+    };
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const useAdvancedRequestHandler = <T = any>() =>
+  useWebSocketRequestHandler<AdvancedRequestDTO, AdvancedResponseDTO<T>>(
+    'AdvancedRequest'
+  );
+
+export const useRawAdvancedRequestHandler = () =>
+  useWebSocketRequestHandler<AdvancedRequestDTO, string>('RawAdvancedRequest');