@ipcom/asterisk-ari 0.0.33 → 0.0.35

package/dist/cjs/index.cjs

@@ -1699,6 +1699,7 @@ var AriClient = class {
   isReconnecting = false;
   eventEmitter = new import_events4.EventEmitter();
   wsConnections = /* @__PURE__ */ new Map();
+  isWebSocketConnectedFlag = false;
   channels;
   endpoints;
   applications;
@@ -1723,19 +1724,14 @@ var AriClient = class {
         "The 'app' parameter is required to connect to the WebSocket."
       );
     }
+    if (this.isReconnecting) {
+      console.warn("Already attempting to reconnect. Skipping this attempt.");
+      return;
+    }
+    this.isReconnecting = true;
     const eventsParam = subscribedEvents && subscribedEvents.length > 0 ? `&event=${subscribedEvents.join(",")}` : "&subscribeAll=true";
     const protocol = this.config.secure ? "wss" : "ws";
-    const wsUrl = `${protocol}://${encodeURIComponent(
-      this.config.username
-    )}:${encodeURIComponent(this.config.password)}@${this.config.host}:${this.config.port}/ari/events?app=${app}${eventsParam}`;
-    if (this.wsConnections.has(app)) {
-      const existingWsClient = this.wsConnections.get(app);
-      console.log(`WebSocket j\xE1 conectado para o app: ${app}. Reiniciando...`);
-      existingWsClient?.removeAllListeners();
-      existingWsClient?.close();
-    }
-    const wsClient = new WebSocketClient(wsUrl);
-    this.wsConnections.set(app, wsClient);
+    const wsUrl = `${protocol}://${encodeURIComponent(this.config.username)}:${encodeURIComponent(this.config.password)}@${this.config.host}:${this.config.port}/ari/events?app=${app}${eventsParam}`;
     const backoffOptions = {
       delayFirstAttempt: false,
       startingDelay: 1e3,
@@ -1745,23 +1741,39 @@ var AriClient = class {
       jitter: "full",
       retry: (error, attemptNumber) => {
         console.warn(`Tentativa ${attemptNumber} falhou: ${error.message}`);
-        return !wsClient.isConnected();
+        return !this.wsClient?.isConnected();
       }
     };
+    if (this.wsClient?.isConnected()) {
+      console.log("WebSocket j\xE1 conectado. Removendo listeners antigos...");
+      this.wsClient.removeAllListeners();
+      this.wsClient.close();
+    }
+    if (!this.wsClient) {
+      console.log("Criando nova inst\xE2ncia do WebSocketClient...");
+      this.wsClient = new WebSocketClient(wsUrl);
+    }
     try {
       await (0, import_exponential_backoff.backOff)(async () => {
-        await wsClient.connect();
-        this.integrateWebSocketEvents(app, wsClient);
-        console.log(`WebSocket conectado para o app: ${app}`);
-        await this.ensureAppRegistered(app);
+        if (!this.wsClient) {
+          throw new Error("WebSocketClient instance is null.");
+        }
+        if (!this.wsClient.isConnected()) {
+          console.log("Tentando conectar ao WebSocket...");
+          await this.wsClient.connect();
+        }
       }, backoffOptions);
+      this.integrateWebSocketEvents(app, this.wsClient);
+      console.log(`WebSocket conectado para o app: ${app}`);
+      await this.ensureAppRegistered(app);
     } catch (err) {
       console.error(
-        `N\xE3o foi poss\xEDvel conectar ao WebSocket para o app ${app}:`,
+        "N\xE3o foi poss\xEDvel conectar ao WebSocket ap\xF3s m\xFAltiplas tentativas:",
         err
       );
-      this.wsConnections.delete(app);
       throw err;
+    } finally {
+      this.isReconnecting = false;
     }
   }
   /**
@@ -1921,9 +1933,12 @@ var AriClient = class {
    * @throws {Error} Throws an error if the WebSocket client is not connected when this method is called.
    * @returns {void} This function doesn't return a value.
    */
-  onWebSocketEvent(event, callback) {
+  async onWebSocketEvent(event, callback) {
+    if (!this.isWebSocketConnectedFlag) {
+      throw new Error("WebSocket ainda n\xE3o est\xE1 conectado.");
+    }
     if (!this.wsClient) {
-      throw new Error("WebSocket n\xE3o est\xE1 conectado.");
+      throw new Error("WebSocket n\xE3o est\xE1 configurado.");
     }
     this.wsClient.on(event, callback);
   }