@stemy/ngx-utils 19.4.2 → 19.4.4

package/fesm2022/stemy-ngx-utils.mjs

@@ -2353,12 +2353,13 @@ class SocketClient {
                     this.open = false;
                     this.status.next(false);
                 });
-                Object.keys(this.channels).map(event => {
+                for (const [event, subject] of this.channels.entries()) {
+                    ws.off(event);
                     ws.on(event, (data) => {
                         this.handleResponse(event, data);
-                        this.channels[event].next(data);
+                        subject.next(data);
                     });
-                });
+                }
                 resolve(ws);
             }, reject);
         });
@@ -2370,16 +2371,17 @@ class SocketClient {
         this.ws = null;
     }
     subscribe(event, cb) {
-        if (!this.channels[event]) {
-            this.channels[event] = new Subject();
+        if (!this.channels.has(event)) {
+            this.channels.set(event, new Subject());
             this.ws?.then(ws => {
+                ws.off(event);
                 ws.on(event, (data) => {
                     this.handleResponse(event, data);
-                    this.channels[event].next(data);
+                    this.channels.get(event).next(data);
                 });
             });
         }
-        return this.channels[event].subscribe(cb);
+        return this.channels.get(event).subscribe(cb);
     }
     emit(event, content) {
         this.ws.then(ws => ws.emit(event, content));
@@ -3177,8 +3179,10 @@ class ApiService extends BaseHttpService {
         return "api";
     }
     url(url) {
-        const baseUrl = this.expressRequestUrl(`/api/${url}`);
-        if (url == "api-docs" || url == "socket") {
+        const config = this.configs.config;
+        const baseUrl = this.expressRequestUrl(`${config.apiUrl}${url}`);
+        const socket = this.injector.get(SOCKET_IO_PATH);
+        if (url == "api-docs" || url == socket) {
             return baseUrl.replace("/api/", "/");
         }
         return baseUrl;
@@ -7555,7 +7559,7 @@ class NgxUtilsModule {
             },
             {
                 provide: SOCKET_IO_PATH,
-                useValue: (!config ? null : config.socketPath) ?? "/socket",
+                useValue: (!config ? null : config.socketPath) ?? "socket.io",
             },
             {
                 provide: APP_INITIALIZER,