@ipcom/asterisk-ari 0.0.32 → 0.0.34

package/dist/esm/index.js

@@ -1676,6 +1676,8 @@ var AriClient = class {
   baseClient;
   isReconnecting = false;
   eventEmitter = new EventEmitter4();
+  wsConnections = /* @__PURE__ */ new Map();
+  isWebSocketConnectedFlag = false;
   channels;
   endpoints;
   applications;
@@ -1700,14 +1702,19 @@ 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}`;
+    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 backoffOptions = {
       delayFirstAttempt: false,
       startingDelay: 1e3,
@@ -1717,77 +1724,87 @@ var AriClient = class {
       jitter: "full",
       retry: (error, attemptNumber) => {
         console.warn(`Tentativa ${attemptNumber} falhou: ${error.message}`);
-        return !this.wsClient?.isConnected();
+        return !wsClient.isConnected();
       }
     };
-    if (this.wsClient?.isConnected()) {
-      console.log("WebSocket j\xE1 conectado. Removendo listeners antigos...");
-      this.wsClient.removeAllListeners();
-      this.wsClient.close();
-    }
-    this.wsClient = new WebSocketClient(wsUrl);
     try {
       await (0, import_exponential_backoff.backOff)(async () => {
         if (!this.wsClient) {
           throw new Error("WebSocketClient instance is null.");
         }
         await this.wsClient.connect();
-        this.integrateWebSocketEvents();
+        this.isWebSocketConnectedFlag = true;
+        this.integrateWebSocketEvents(app, this.wsClient);
         console.log(`WebSocket conectado para o app: ${app}`);
         await this.ensureAppRegistered(app);
       }, backoffOptions);
     } catch (err) {
+      this.isWebSocketConnectedFlag = false;
       console.error(
         "N\xE3o foi poss\xEDvel conectar ao WebSocket ap\xF3s m\xFAltiplas tentativas:",
         err
       );
       throw err;
-    } finally {
-      this.isReconnecting = false;
     }
   }
   /**
    * Integrates WebSocket events with playback listeners.
    */
-  integrateWebSocketEvents() {
-    if (!this.wsClient) {
-      throw new Error("WebSocket client n\xE3o est\xE1 conectado.");
+  integrateWebSocketEvents(app, wsClient) {
+    if (!wsClient) {
+      throw new Error(
+        `WebSocket client para o app '${app}' n\xE3o est\xE1 conectado.`
+      );
     }
     const eventHandlers = {
       PlaybackFinished: (data) => {
         if ("playbackId" in data) {
           this.playbacks.emitPlaybackEvent("PlaybackFinished", data);
         }
+        console.log(`[${app}] PlaybackFinished:`, data);
         this.emitGlobalEvent(data);
       },
       ChannelStateChange: (data) => {
         if ("channel" in data) {
-          console.log("Estado do canal alterado:", data.channel);
+          console.log(`[${app}] Estado do canal alterado:`, data.channel);
+          this.channels.emitChannelEvent("ChannelStateChange", data);
         }
         this.emitGlobalEvent(data);
       },
       BridgeDestroyed: (data) => {
         if ("bridge" in data) {
-          console.log("Bridge destru\xEDda:", data.bridge);
+          console.log(`[${app}] Bridge destru\xEDda:`, data.bridge);
         }
         this.emitGlobalEvent(data);
       },
-      // Adicione mais eventos conforme necessário
-      // Exemplo:
       ChannelDtmfReceived: (data) => {
         if ("channel" in data) {
-          console.log("DTMF recebido no canal:", data.channel);
+          console.log(`[${app}] DTMF recebido no canal:`, data.channel);
           this.channels.emitChannelEvent("ChannelDtmfReceived", data);
         }
         this.emitGlobalEvent(data);
+      },
+      // Adicione mais eventos conforme necessário
+      EndpointStateChange: (data) => {
+        if ("endpoint" in data) {
+          console.log(`[${app}] Estado do endpoint alterado:`, data.endpoint);
+        }
+        this.emitGlobalEvent(data);
+      },
+      ChannelHangupRequest: (data) => {
+        if ("channel" in data) {
+          console.log(`[${app}] Requisi\xE7\xE3o de hangup no canal:`, data.channel);
+          this.channels.emitChannelEvent("ChannelHangupRequest", data);
+        }
+        this.emitGlobalEvent(data);
       }
     };
     for (const [eventType, handler] of Object.entries(eventHandlers)) {
       if (handler) {
-        this.wsClient.on(eventType, handler);
+        wsClient.on(eventType, handler);
       }
     }
-    console.log("Todos os eventos do WebSocket foram registrados.");
+    console.log(`[${app}] Todos os eventos do WebSocket foram registrados.`);
   }
   /**
    * Registra um listener para eventos globais.
@@ -1887,9 +1904,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);
   }