@ipcom/asterisk-ari 0.0.37 → 0.0.39

package/dist/cjs/index.cjs

@@ -1700,6 +1700,8 @@ var AriClient = class {
   eventEmitter = new import_events4.EventEmitter();
   wsConnections = /* @__PURE__ */ new Map();
   isWebSocketConnectedFlag = false;
+  webSocketReady = null;
+  // Promise para rastrear o estado do WebSocket
   pendingListeners = [];
   processPendingListeners() {
     if (!this.wsClient || !this.isWebSocketConnectedFlag) {
@@ -1738,58 +1740,67 @@ var AriClient = class {
   async connectWebSocket(app, subscribedEvents) {
     if (!app) {
       throw new Error(
-        "The 'app' parameter is required to connect to the WebSocket."
+        "O par\xE2metro 'app' \xE9 obrigat\xF3rio para conectar ao 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 backoffOptions = {
-      delayFirstAttempt: false,
-      startingDelay: 1e3,
-      timeMultiple: 2,
-      maxDelay: 3e4,
-      numOfAttempts: 10,
-      jitter: "full",
-      retry: (error, attemptNumber) => {
-        console.warn(`Tentativa ${attemptNumber} falhou: ${error.message}`);
-        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);
+    if (this.webSocketReady) {
+      console.log("J\xE1 existe uma tentativa de conex\xE3o ativa. Aguardando...");
+      return this.webSocketReady;
     }
-    try {
-      await (0, import_exponential_backoff.backOff)(async () => {
-        if (!this.wsClient) {
-          throw new Error("WebSocketClient instance is null.");
+    this.webSocketReady = new Promise(async (resolve, reject) => {
+      try {
+        if (this.isReconnecting) {
+          console.warn(
+            "J\xE1 est\xE1 tentando reconectar. Ignorando esta tentativa."
+          );
+          return;
         }
-        await this.wsClient.connect();
-        this.integrateWebSocketEvents(app, this.wsClient);
-        console.log(`WebSocket conectado para o app: ${app}`);
-        await this.ensureAppRegistered(app);
-        this.processPendingListeners();
-      }, backoffOptions);
-    } catch (err) {
-      console.error(
-        "N\xE3o foi poss\xEDvel conectar ao WebSocket ap\xF3s m\xFAltiplas tentativas:",
-        err
-      );
-      throw err;
-    } finally {
-      this.isReconnecting = false;
-    }
+        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 backoffOptions = {
+          delayFirstAttempt: false,
+          startingDelay: 1e3,
+          timeMultiple: 2,
+          maxDelay: 3e4,
+          numOfAttempts: 10,
+          jitter: "full",
+          retry: (error, attemptNumber) => {
+            console.warn(`Tentativa ${attemptNumber} falhou: ${error.message}`);
+            return !this.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);
+        await (0, import_exponential_backoff.backOff)(async () => {
+          if (!this.wsClient) {
+            throw new Error("WebSocketClient instance is null.");
+          }
+          await this.wsClient.connect();
+          this.integrateWebSocketEvents(app, this.wsClient);
+          console.log(`WebSocket conectado para o app: ${app}`);
+          await this.ensureAppRegistered(app);
+          this.processPendingListeners();
+          this.isWebSocketConnectedFlag = true;
+        }, backoffOptions);
+        resolve();
+      } catch (err) {
+        console.error(
+          "N\xE3o foi poss\xEDvel conectar ao WebSocket ap\xF3s m\xFAltiplas tentativas:",
+          err
+        );
+        reject(err);
+      } finally {
+        this.isReconnecting = false;
+        this.webSocketReady = null;
+      }
+    });
+    return this.webSocketReady;
   }
   /**
    * Integrates WebSocket events with playback listeners.
@@ -1800,6 +1811,7 @@ var AriClient = class {
         `WebSocket client para o app '${app}' n\xE3o est\xE1 conectado.`
       );
     }
+    console.log(`[${app}] Registrando eventos do WebSocket...`);
     const eventHandlers = {
       PlaybackFinished: (data) => {
         if ("playbackId" in data) {
@@ -1827,20 +1839,6 @@ var AriClient = class {
           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)) {
@@ -1948,13 +1946,13 @@ 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.webSocketReady) {
+      console.log(`Aguardando WebSocket conectar antes de registrar: ${event}`);
+      await this.webSocketReady;
+    }
     if (!this.wsClient || !this.isWebSocketConnectedFlag) {
-      console.warn(
-        `WebSocket ainda n\xE3o est\xE1 conectado. Colocando o listener na fila para: ${event}`
-      );
-      this.pendingListeners.push({ event, callback });
-      return;
+      throw new Error("WebSocket ainda n\xE3o est\xE1 conectado.");
     }
     console.log(`Registrando listener para evento: ${event}`);
     this.wsClient.on(event, callback);