@experteam-mx/ngx-services 20.8.9 → 20.8.10

package/fesm2022/experteam-mx-ngx-services.mjs

@@ -5671,28 +5671,40 @@ class WebSocketsService {
         return channel.trigger(`client-${eventName}`, data);
     }
     /**
-     * Subscribes to a specified channel, retrying multiple times upon failure.
+     * Subscribes to a specified channel and resolves when Pusher reports success.
      *
      * @param {string} channelName - The name of the channel to be subscribed to.
      * @return {Promise<Channel>} A promise that resolves to the subscribed channel object if successful.
-     * @throws {Error} If the subscription fails after the maximum number of retry attempts.
+     * @throws {Error} If the subscription fails.
      */
     async channelSub(channelName) {
         const pusher = await this.ensureConnected();
         this.refreshChannelAuthHeader();
-        const attempts = 3;
-        for (let attempt = 0; attempt <= attempts; attempt++) {
-            const channel = pusher.channel(channelName);
-            if (channel?.subscribed) {
-                return channel;
-            }
-            this.refreshChannelAuthHeader();
-            pusher.subscribe(channelName);
-            if (attempt < attempts) {
-                await this.wait();
-            }
+        const existing = pusher.channel(channelName);
+        if (existing?.subscribed) {
+            return existing;
         }
-        throw new Error(`Failed to subscribe to channel "${channelName}" after ${attempts} attempts.`);
+        const channel = pusher.subscribe(channelName);
+        if (channel.subscribed) {
+            return channel;
+        }
+        await new Promise((resolve, reject) => {
+            const onSuccess = () => {
+                cleanup();
+                resolve();
+            };
+            const onError = () => {
+                cleanup();
+                reject(new Error(`Failed to subscribe to channel "${channelName}".`));
+            };
+            const cleanup = () => {
+                channel.unbind('pusher:subscription_succeeded', onSuccess);
+                channel.unbind('pusher:subscription_error', onError);
+            };
+            channel.bind('pusher:subscription_succeeded', onSuccess);
+            channel.bind('pusher:subscription_error', onError);
+        });
+        return channel;
     }
     /**
      * Binds an event listener to a specified event on a given channel using Pusher or a Channel object,
@@ -5704,17 +5716,16 @@ class WebSocketsService {
      */
     eventBind(channel, event) {
         return new Observable((subscriber) => {
+            if (channel?.name) {
+                channel.bind(event, (data) => subscriber.next(data));
+                return;
+            }
             void (async () => {
                 try {
                     const pusher = await this.ensureConnected();
                     this.refreshChannelAuthHeader();
-                    if (channel?.name) {
-                        channel.bind(event, (data) => subscriber.next(data));
-                    }
-                    else {
-                        pusher.subscribe(channel)
-                            .bind(event, (data) => subscriber.next(data));
-                    }
+                    pusher.subscribe(channel)
+                        .bind(event, (data) => subscriber.next(data));
                 }
                 catch (error) {
                     subscriber.error(error);
@@ -5733,6 +5744,14 @@ class WebSocketsService {
     eventUnbind(channel, event) {
         return new Observable((subscriber) => channel.unbind(event, (data) => subscriber.next(data)));
     }
+    /**
+     * Unsubscribes from a channel by name.
+     *
+     * @param {string} channelName - The channel name previously passed to subscribe.
+     */
+    unsubscribe(channelName) {
+        this.pusher?.unsubscribe(channelName);
+    }
     async ensureConnected() {
         if (this.pusher)
             return this.pusher;
@@ -5761,10 +5780,6 @@ class WebSocketsService {
             delete this.channelAuthHeaders['Authorization'];
         }
     }
-    async wait() {
-        const waitTime = 3 * 1000;
-        return new Promise((resolve) => setTimeout(resolve, waitTime));
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.25", ngImport: i0, type: WebSocketsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.25", ngImport: i0, type: WebSocketsService, providedIn: 'root' });
 }