@ipcom/asterisk-ari 0.0.74 → 0.0.76

package/dist/cjs/index.cjs

@@ -332,12 +332,21 @@ function toQueryParams2(options) {
     Object.entries(options).filter(([, value]) => value !== void 0).map(([key, value]) => [key, value])
   ).toString();
 }
-function isChannelEvent(event) {
-  return event.channel?.id !== void 0;
+function isChannelEvent(event, channelId) {
+  const hasChannel = "channel" in event && event.channel?.id !== void 0;
+  const matchesChannelId = hasChannel && (!channelId || event.channel?.id === channelId);
+  if (!hasChannel || channelId && !matchesChannelId) {
+    console.log(
+      `Evento ignorado no isChannelEvent: tipo=${event.type}, canal esperado=${channelId}, evento recebido=`,
+      event
+    );
+  }
+  return matchesChannelId;
 }
 
 // src/ari-client/resources/channels.ts
 var ChannelInstance = class extends import_events2.EventEmitter {
+  // ID do canal
   constructor(client, baseClient, channelId = `channel-${Date.now()}`) {
     super();
     this.client = client;
@@ -350,11 +359,11 @@ var ChannelInstance = class extends import_events2.EventEmitter {
     );
     if (!wsClient) {
       throw new Error(
-        `Nenhum WebSocket conectado dispon\xEDvel para o canal: ${this.channelId}`
+        `Nenhum WebSocket conectado dispon\xEDvel para o canal: ${this.id}`
       );
     }
     wsClient.on("message", (event) => {
-      if (this.isChannelEvent(event)) {
+      if (isChannelEvent(event, this.id)) {
         console.log(`Evento recebido no ChannelInstance: ${event.type}`, event);
         this.emit(event.type, event);
       }
@@ -362,18 +371,6 @@ var ChannelInstance = class extends import_events2.EventEmitter {
   }
   channelData = null;
   id;
-  // ID do canal
-  /**
-   * Verifica se o evento possui a propriedade `channel`.
-   * @param event Evento recebido.
-   */
-  isChannelEvent(event) {
-    const isChannelEvent2 = event && typeof event === "object" && "channel" in event && event.channel?.id === this.channelId;
-    if (!isChannelEvent2) {
-      console.log(`Evento ignorado no ChannelInstance: ${event.type}`, event);
-    }
-    return isChannelEvent2;
-  }
   /**
    * Adiciona um listener para eventos de canal.
    */
@@ -1118,6 +1115,7 @@ var WebSocketClient = class extends import_events4.EventEmitter {
       const decodedData = JSON.parse(rawData.toString());
       if (decodedData?.type) {
         this.emit(decodedData.type, decodedData);
+        this.emit("message", decodedData);
       } else {
         console.warn("Mensagem recebida sem tipo:", decodedData);
       }
@@ -1235,6 +1233,7 @@ var AriClient = class {
             this.channelInstances.set(channelId, channelInstance);
           }
           event.instanceChannel = this.channelInstances.get(channelId);
+          event.instanceChannel?.emit(event.type, event);
         }
       }
       callback(event);