@signalwire/js 3.25.0 → 3.26.0-dev.202401232045.8ee0040.0

package/dist/index.js

@@ -1051,11 +1051,14 @@ var videoWorker = function* (options) {
       default:
         break;
     }
-    roomSession.emit((0, import_core12.stripNamespacePrefix)(type), payload);
+    const event = (0, import_core12.stripNamespacePrefix)(type, "video");
+    roomSession.emit(event, payload);
   }
-  const isVideoEvent = (action) => action.type.startsWith("video.");
+  const isVideoOrCallEvent = (action) => {
+    return action.type.startsWith("video.") || action.type.startsWith("call.");
+  };
   while (true) {
-    const action = yield import_core12.sagaEffects.take(swEventChannel, isVideoEvent);
+    const action = yield import_core12.sagaEffects.take(swEventChannel, isVideoOrCallEvent);
     yield import_core12.sagaEffects.fork(worker, action);
   }
   (0, import_core12.getLogger)().trace("videoWorker ended");
@@ -1073,6 +1076,9 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
     this.runWorker("videoWorker", {
       worker: videoWorker
     });
+    if (options.eventsWatcher) {
+      this.runWorker("eventsWatcher", { worker: options.eventsWatcher });
+    }
   }
   get screenShareList() {
     return Array.from(this._screenShareList);
@@ -1633,7 +1639,7 @@ var JWTSession = class extends import_core21.BaseJWTSession {
     this.options = options;
     __publicField(this, "WebSocketConstructor", WebSocket);
     __publicField(this, "CloseEventConstructor", SwCloseEvent);
-    __publicField(this, "agent", "@signalwire/js/browser/3.25.0");
+    __publicField(this, "agent", "@signalwire/js/browser/3.26.0-dev.202401232045.8ee0040.0");
     __publicField(this, "tokenTyp");
     this.tokenTyp = (_a = decodedJwt.typ) != null ? _a : "VRT";
   }
@@ -1943,7 +1949,8 @@ var RoomSession = function(roomOptions) {
     destinationNumber,
     localStream,
     watchMediaPackets,
-    watchMediaPacketsTimeout
+    watchMediaPacketsTimeout,
+    disableUdpIceServers = false
   } = _a, userOptions = __objRest(_a, [
     "audio",
     "video",
@@ -1957,7 +1964,8 @@ var RoomSession = function(roomOptions) {
     "destinationNumber",
     "localStream",
     "watchMediaPackets",
-    "watchMediaPacketsTimeout"
+    "watchMediaPacketsTimeout",
+    "disableUdpIceServers"
   ]);
   const deprecatedParams = ["audio", "video"];
   deprecatedParams.forEach((param) => {
@@ -2013,7 +2021,8 @@ var RoomSession = function(roomOptions) {
     localStream,
     watchMediaPackets,
     watchMediaPacketsTimeout,
-    prevCallId: reattachManager.getPrevCallId()
+    prevCallId: reattachManager.getPrevCallId(),
+    disableUdpIceServers
   });
   room.once("destroy", () => {
     room.emit("room.left", { reason: room.leaveReason });
@@ -2252,7 +2261,7 @@ var SWClient = class {
 };
 
 // src/fabric/WSClient.ts
-var import_core27 = require("@signalwire/core");
+var import_core28 = require("@signalwire/core");
 
 // src/fabric/WSClientWorker.ts
 var import_core26 = require("@signalwire/core");
@@ -2274,19 +2283,160 @@ var WSClientWorker = function* (options) {
   (0, import_core26.getLogger)().trace("WSClientWorker ended");
 };
 
+// src/fabric/unified/workers/unifiedEventsWatcher.ts
+var import_core27 = require("@signalwire/core");
+
+// ../core/src/utils/mapObject.ts
+var import_object_path = __toESM(require("object-path"));
+function isMappableObject(obj) {
+  return !!obj.type;
+}
+function mapObject(template, action) {
+  var _a;
+  const matches = new RegExp("^(?<prefix>(\\w|\\.)*)(\\[(?<stateKey>[^\\(\\)]*)(?<replace>\\((?<from>(\\w|\\.)*):(?<to>\\S*)\\))?\\]){0,1}(?<payloadMap>\\{.*\\}){0,1}").exec(template);
+  let result = __spreadProps(__spreadValues({}, action), {
+    type: template
+  });
+  if ((matches == null ? void 0 : matches.groups) && !!action.payload) {
+    const { prefix, stateKey, replace, from, to } = matches.groups;
+    let newType;
+    if (!!replace) {
+      newType = action.payload[stateKey] === from ? `${prefix}${to}` : void 0;
+    } else if (!!stateKey) {
+      newType = !!action.payload[stateKey] ? `${prefix}${action.payload[stateKey]}` : void 0;
+    } else {
+      newType = `${prefix}`;
+    }
+    result = !!newType ? __spreadProps(__spreadValues({}, action), {
+      type: newType
+    }) : void 0;
+  }
+  if ((_a = matches == null ? void 0 : matches.groups) == null ? void 0 : _a.payloadMap) {
+    const { payloadMap: mapString } = matches.groups;
+    const { payload } = action;
+    const payloadMap = JSON.parse(mapString);
+    const newContent = {};
+    Object.entries(payloadMap).forEach(([old_path, new_path]) => {
+      const value = import_object_path.default.get(payload, old_path);
+      import_object_path.default.del(payload, old_path);
+      import_object_path.default.set(newContent, new_path, value);
+    });
+    const newPayload = __spreadValues(__spreadValues({}, payload), newContent);
+    result = __spreadProps(__spreadValues({}, result), {
+      payload: newPayload
+    });
+  }
+  return result;
+}
+
+// src/fabric/unified/workers/mappers/UnifiedEventsMapper.ts
+var EVENT_MAPPINGS = {
+  "call.state": [
+    "call.state.[call_state]",
+    "video.room.[call_state]",
+    "video.room.[call_state(created:started)]"
+  ],
+  "call.play": ["call.play.[state]"],
+  "call.collect": ["call.collect.[collect_state]"],
+  "call.connect": [
+    "call.connect.[connect_state]",
+    "video.room.[connect_state(connected:subscribed)]"
+  ],
+  "call.join": ['video.room.subscribed{"callID":"room_id"}'],
+  "call.audience_count": ["video.room.audience_count"],
+  "call.denoise": ["call.denoise"],
+  "call.detect": ["call.detect.[detect_state]"],
+  "call.dial": ["call.dial.[dial_state]"],
+  "call.send_digits": ["call.send_digits", "video.room.send_digits"],
+  "call.refer": ["calling.call.refer"],
+  "call.received": ["call.received"],
+  "call.fax": ["call.fax.[fax_state]"],
+  "call.hold": ["call.hold.[fax_state]"],
+  "call.prompt": ["call.prompt.[prompt_state]"],
+  "call.started": ["video.room.started"],
+  "call.subscribed": ["video.room.subscribed"],
+  "call.updated": ["video.room.updated"],
+  "call.ended": ["video.room.ended"],
+  "member.joined": ["video.member.joined"],
+  "member.left": ["video.member.left"],
+  "member.updated": ["video.member.updated"],
+  "member.talking": ["video.member.talking"],
+  "member.promoted": ["video.member.promoted"],
+  "member.demoted": ["video.member.demoted"],
+  "layout.changed": ["video.layout.changed"],
+  "call.recording": ["video.room.recording.[recording_state]"],
+  "call.playback": ["video.room.playback.[playback_state]"],
+  "call.outbound_stream.started": ["video.stream.started"],
+  "call.outbound_stream.ended": ["video.stream.ended"]
+};
+function fromUnifiedEvent(action) {
+  const { type } = action;
+  if (!Object.keys(EVENT_MAPPINGS).includes(type)) {
+    return [];
+  }
+  const mapDefinitions = EVENT_MAPPINGS[type];
+  const allNewActions = mapDefinitions.map((eventTemplate) => mapObject(eventTemplate, action));
+  return allNewActions.filter((obj) => !!obj);
+}
+
+// src/fabric/unified/workers/unifiedEventsWatcher.ts
+function* eventMapperWorker({
+  action,
+  swEventChannel
+}) {
+  if (isMappableObject(action)) {
+    const mappedActions = fromUnifiedEvent(action);
+    for (const mappedAction of mappedActions) {
+      yield import_core27.sagaEffects.put(swEventChannel, mappedAction);
+    }
+  }
+}
+function* debugEmitter({
+  action,
+  instance
+}) {
+  const { type, payload } = action;
+  yield instance.emit(type, payload);
+}
+var unifiedEventsWatcher = function* (options) {
+  const {
+    channels: { swEventChannel },
+    instance
+  } = options;
+  (0, import_core27.getLogger)().debug("unifiedEventsWatcher started");
+  function* worker(action) {
+    yield import_core27.sagaEffects.fork(eventMapperWorker, __spreadProps(__spreadValues({}, options), {
+      action,
+      swEventChannel
+    }));
+    yield import_core27.sagaEffects.fork(debugEmitter, __spreadProps(__spreadValues({}, options), {
+      action,
+      instance
+    }));
+  }
+  const isUnifiedEvent = (action) => action.type.startsWith("member") || action.type.startsWith("layout");
+  while (true) {
+    const action = yield import_core27.sagaEffects.take(swEventChannel, isUnifiedEvent);
+    (0, import_core27.getLogger)().debug("UnifiedEventsWatcher action:", action);
+    yield import_core27.sagaEffects.fork(worker, action);
+  }
+  (0, import_core27.getLogger)().trace("unifiedEventsWatcher ended");
+};
+
 // src/fabric/WSClient.ts
 var WSClient = class {
   constructor(options) {
     this.options = options;
     __publicField(this, "wsClient");
-    __publicField(this, "logger", (0, import_core27.getLogger)());
+    __publicField(this, "logger", (0, import_core28.getLogger)());
     this.wsClient = createClient({
       host: this.options.host,
       token: this.options.token,
       debug: {
         logWsTraffic: true
       },
-      logLevel: "debug"
+      logLevel: "debug",
+      unifiedEventing: true
     });
   }
   connect() {
@@ -2313,7 +2463,9 @@ var WSClient = class {
             stopMicrophoneWhileMuted: true,
             destinationNumber: params.to,
             watchMediaPackets: false,
-            nodeId: params.nodeId
+            nodeId: params.nodeId,
+            eventsWatcher: unifiedEventsWatcher,
+            disableUdpIceServers: this.options.disableUdpIceServers || false
           });
           call.once("destroy", () => {
             this.logger.debug("RTC Connection Destroyed");
@@ -2329,14 +2481,14 @@ var WSClient = class {
                 call.once("room.subscribed", () => resolve2(call));
                 yield call.join();
               } catch (error) {
-                (0, import_core27.getLogger)().error("WSClient call start", error);
+                (0, import_core28.getLogger)().error("WSClient call start", error);
                 reject2(error);
               }
             }));
           };
           resolve(call);
         } catch (error) {
-          (0, import_core27.getLogger)().error("WSClient dial", error);
+          (0, import_core28.getLogger)().error("WSClient dial", error);
           reject(error);
         }
       }));
@@ -2391,10 +2543,10 @@ var WSClient = class {
           nodeId
         });
         call.once("destroy", () => {
-          (0, import_core27.getLogger)().debug("RTC Connection Destroyed");
+          (0, import_core28.getLogger)().debug("RTC Connection Destroyed");
         });
         call.attachPreConnectWorkers();
-        (0, import_core27.getLogger)().debug("Resolving Call", call);
+        (0, import_core28.getLogger)().debug("Resolving Call", call);
         resolve({ resultType: "inboundCall", resultObject: call });
       } catch (error) {
         reject(error);
@@ -2410,7 +2562,7 @@ var WSClient = class {
             callID: callId,
             node_id: nodeId,
             subscribe: [],
-            message: (0, import_core27.VertoSubscribe)({
+            message: (0, import_core28.VertoSubscribe)({
               sessid: callId,
               eventChannel: []
             })
@@ -2454,13 +2606,23 @@ var HTTPClient = class {
     }
     return `fabric.${host.split(".").splice(1).join(".")}`;
   }
-  getAddresses() {
+  getAddresses(options) {
     return __async(this, null, function* () {
-      const path = "/addresses";
+      const { type, displayName } = options || {};
+      let path = "/addresses";
+      if (type || displayName) {
+        const queryParams = new URLSearchParams();
+        if (type) {
+          queryParams.append("type", type);
+        }
+        if (displayName) {
+          queryParams.append("display_name", displayName);
+        }
+        path += `?${queryParams.toString()}`;
+      }
       const { body } = yield this.httpClient(path);
       const anotherPage = (url) => __async(this, null, function* () {
-        const { search } = new URL(url);
-        const { body: body2 } = yield this.httpClient(`${path}${search}`);
+        const { body: body2 } = yield this.httpClient(url);
         return buildResult(body2);
       });
       const buildResult = (body2) => {
@@ -2473,7 +2635,13 @@ var HTTPClient = class {
           prevPage: () => __async(this, null, function* () {
             const { prev } = body2.links;
             return prev ? anotherPage(prev) : void 0;
-          })
+          }),
+          firstPage: () => __async(this, null, function* () {
+            const { first } = body2.links;
+            return first ? anotherPage(first) : void 0;
+          }),
+          hasNext: Boolean(body2.links.next),
+          hasPrev: Boolean(body2.links.prev)
         };
       };
       return buildResult(body);
@@ -2533,17 +2701,10 @@ var SignalWire = (options) => {
 // src/chat/index.ts
 var chat_exports = {};
 __export(chat_exports, {
-  ChatMember: () => ChatMember,
-  ChatMessage: () => ChatMessage,
+  ChatMember: () => import_core29.ChatMember,
+  ChatMessage: () => import_core29.ChatMessage,
   Client: () => Client3
 });
-var import_core29 = require("@signalwire/core");
-
-// src/utils/interfaces.ts
-var import_core28 = require("@signalwire/core");
-var INTERNAL_MEMBER_UPDATED_EVENTS = Object.keys(import_core28.INTERNAL_MEMBER_UPDATABLE_PROPS).map((key) => {
-  return `member.updated.${key}`;
-});
 
 // src/chat/Client.ts
 var INTERCEPTED_METHODS = [
@@ -2581,8 +2742,7 @@ var Client3 = function(chatOptions) {
 };
 
 // src/chat/index.ts
-var ChatMember = import_core29.Chat.ChatMember;
-var ChatMessage = import_core29.Chat.ChatMessage;
+var import_core29 = require("@signalwire/core");
 
 // src/pubSub/index.ts
 var pubSub_exports = {};
@@ -2590,7 +2750,13 @@ __export(pubSub_exports, {
   Client: () => Client4,
   PubSubMessage: () => PubSubMessage
 });
+var import_core31 = require("@signalwire/core");
+
+// src/utils/interfaces.ts
 var import_core30 = require("@signalwire/core");
+var INTERNAL_MEMBER_UPDATED_EVENTS = Object.keys(import_core30.INTERNAL_MEMBER_UPDATABLE_PROPS).map((key) => {
+  return `member.updated.${key}`;
+});
 
 // src/pubSub/Client.ts
 var INTERCEPTED_METHODS2 = [
@@ -2624,7 +2790,7 @@ var Client4 = function(pubSubOptions) {
 };
 
 // src/pubSub/index.ts
-var PubSubMessage = import_core30.PubSub.PubSubMessage;
+var PubSubMessage = import_core31.PubSub.PubSubMessage;
 
 // src/webrtc.ts
 var webrtc_exports = {};