@signalwire/js 3.7.0 → 3.8.0-dev.202202021245.c33a456.0

package/dist/index.js

@@ -92,13 +92,13 @@ __export(video_exports, {
 });
 
 // src/createRoomObject.ts
-var import_core11 = require("@signalwire/core");
+var import_core12 = require("@signalwire/core");
 
 // src/createClient.ts
-var import_core10 = require("@signalwire/core");
+var import_core11 = require("@signalwire/core");
 
 // src/Client.ts
-var import_core8 = require("@signalwire/core");
+var import_core9 = require("@signalwire/core");
 
 // src/features/mediaElements/mediaElementsSagas.ts
 var import_core3 = require("@signalwire/core");
@@ -423,7 +423,7 @@ function* videoElementSetupWorker({
 }
 
 // src/BaseRoomSession.ts
-var import_core6 = require("@signalwire/core");
+var import_core7 = require("@signalwire/core");
 var import_webrtc4 = require("@signalwire/webrtc");
 
 // src/utils/constants.ts
@@ -485,6 +485,112 @@ var RoomSessionDeviceAPI = (0, import_core5.extendComponent)(RoomSessionDeviceCo
   setInputSensitivity: import_core5.Rooms.setInputSensitivityMember
 });
 
+// src/video/workers.ts
+var import_core6 = require("@signalwire/core");
+var noop = () => {
+};
+var EXTERNAL_MEMBER_LIST_UPDATED_EVENT = "video.memberList.updated";
+var INTERNAL_MEMBER_LIST_UPDATED_EVENT = (0, import_core6.toInternalEventName)({
+  event: EXTERNAL_MEMBER_LIST_UPDATED_EVENT
+});
+var SYNTHETIC_MEMBER_LIST_UPDATED_EVENT = (0, import_core6.toSyntheticEvent)(INTERNAL_MEMBER_LIST_UPDATED_EVENT);
+var MEMBER_LIST_EVENTS = [
+  "video.room.joined",
+  "video.member.joined",
+  "video.member.left",
+  "video.member.updated"
+];
+var isMemberListEvent = (event) => {
+  return MEMBER_LIST_EVENTS.includes(event);
+};
+var getMemberListEventsToSubscribe = (subscriptions) => {
+  return (0, import_core6.validateEventsToSubscribe)(MEMBER_LIST_EVENTS).filter((event) => {
+    return !subscriptions.includes(event);
+  });
+};
+var shouldHandleMemberList = (subscriptions) => {
+  return subscriptions.some((event) => event.includes(INTERNAL_MEMBER_LIST_UPDATED_EVENT));
+};
+var getMembersFromAction = (action) => {
+  if (action.type === "video.room.joined") {
+    return action.payload.room_session.members;
+  }
+  return [action.payload.member];
+};
+var getUpdatedMembers = ({
+  action,
+  memberList
+}) => {
+  const actionMembers = getMembersFromAction(action);
+  switch (action.type) {
+    case "video.member.left":
+      actionMembers.forEach((member) => {
+        memberList.delete(member.id);
+      });
+      break;
+    default:
+      actionMembers.forEach((member) => {
+        memberList.set(member.id, member);
+      });
+  }
+  return Array.from(memberList.values());
+};
+var initMemberListSubscriptions = (room, subscriptions) => {
+  const events = getMemberListEventsToSubscribe(subscriptions);
+  events.forEach((event) => {
+    room.once(event, noop);
+  });
+  const eventBridgeHandler = (payload) => {
+    room.emit(EXTERNAL_MEMBER_LIST_UPDATED_EVENT, payload);
+  };
+  room.on(SYNTHETIC_MEMBER_LIST_UPDATED_EVENT, eventBridgeHandler);
+  const cleanup = () => {
+    room.off(SYNTHETIC_MEMBER_LIST_UPDATED_EVENT, eventBridgeHandler);
+  };
+  return {
+    cleanup
+  };
+};
+function* membersListUpdatedWatcher({
+  pubSubChannel
+}) {
+  const memberList = /* @__PURE__ */ new Map();
+  function* worker(pubSubAction) {
+    const { payload } = pubSubAction;
+    const members = getUpdatedMembers({ action: pubSubAction, memberList });
+    const memberListPayload = {
+      room_session_id: payload.room_session_id || payload.room_session.id,
+      members
+    };
+    yield import_core6.sagaEffects.put(pubSubChannel, {
+      type: SYNTHETIC_MEMBER_LIST_UPDATED_EVENT,
+      payload: memberListPayload
+    });
+  }
+  while (true) {
+    const pubSubAction = yield import_core6.sagaEffects.take(pubSubChannel, ({ type }) => {
+      return isMemberListEvent(type);
+    });
+    yield import_core6.sagaEffects.fork(worker, pubSubAction);
+  }
+}
+var memberListUpdatedWorker = function* membersChangedWorker({
+  channels: { pubSubChannel },
+  instance
+}) {
+  const subscriptions = instance.getSubscriptions();
+  if (!shouldHandleMemberList(subscriptions)) {
+    return;
+  }
+  const { cleanup } = initMemberListSubscriptions(instance, subscriptions);
+  yield import_core6.sagaEffects.fork(membersListUpdatedWatcher, {
+    pubSubChannel
+  });
+  instance.once("destroy", () => {
+    cleanup();
+  });
+};
+
 // src/BaseRoomSession.ts
 var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
   constructor() {
@@ -502,7 +608,7 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
     return /* @__PURE__ */ new Map([
       [
         [
-          (0, import_core6.toLocalEvent)("video.recording.start"),
+          (0, import_core7.toLocalEvent)("video.recording.start"),
           "video.recording.started",
           "video.recording.updated",
           "video.recording.ended"
@@ -510,13 +616,13 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
         {
           type: "roomSessionRecording",
           instanceFactory: (_payload) => {
-            return import_core6.Rooms.createRoomSessionRecordingObject({
+            return import_core7.Rooms.createRoomSessionRecordingObject({
               store: this.store,
               emitter: this.emitter
             });
           },
           payloadTransform: (payload) => {
-            return (0, import_core6.toExternalJSON)(__spreadProps(__spreadValues({}, payload.recording), {
+            return (0, import_core7.toExternalJSON)(__spreadProps(__spreadValues({}, payload.recording), {
               room_session_id: this.roomSessionId
             }));
           }
@@ -524,7 +630,7 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
       ],
       [
         [
-          (0, import_core6.toLocalEvent)("video.playback.start"),
+          (0, import_core7.toLocalEvent)("video.playback.start"),
           "video.playback.started",
           "video.playback.updated",
           "video.playback.ended"
@@ -532,13 +638,13 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
         {
           type: "roomSessionPlayback",
           instanceFactory: (_payload) => {
-            return import_core6.Rooms.createRoomSessionPlaybackObject({
+            return import_core7.Rooms.createRoomSessionPlaybackObject({
               store: this.store,
               emitter: this.emitter
             });
           },
           payloadTransform: (payload) => {
-            return (0, import_core6.toExternalJSON)(__spreadProps(__spreadValues({}, payload.playback), {
+            return (0, import_core7.toExternalJSON)(__spreadProps(__spreadValues({}, payload.playback), {
               room_session_id: this.roomSessionId
             }));
           }
@@ -546,6 +652,12 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
       ]
     ]);
   }
+  attachPreConnectWorkers() {
+    this.setWorker("memberListUpdated", {
+      worker: memberListUpdatedWorker
+    });
+    this.attachWorkers();
+  }
   createScreenShareObject() {
     return __async(this, arguments, function* (opts = {}) {
       return this.startScreenShare(opts);
@@ -569,7 +681,7 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
           memberId: this.memberId
         })
       });
-      const screenShare = (0, import_core6.connect)({
+      const screenShare = (0, import_core7.connect)({
         store: this.store,
         Component: RoomSessionScreenShareAPI,
         componentListeners: ROOM_COMPONENT_LISTENERS
@@ -629,7 +741,7 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
           memberId: this.memberId
         })
       });
-      const roomDevice = (0, import_core6.connect)({
+      const roomDevice = (0, import_core7.connect)({
         store: this.store,
         Component: RoomSessionDeviceAPI,
         componentListeners: ROOM_COMPONENT_LISTENERS
@@ -682,32 +794,32 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
     return this.getMembers();
   }
 };
-var RoomSessionAPI = (0, import_core6.extendComponent)(RoomSessionConnection, {
-  audioMute: import_core6.Rooms.audioMuteMember,
-  audioUnmute: import_core6.Rooms.audioUnmuteMember,
-  videoMute: import_core6.Rooms.videoMuteMember,
-  videoUnmute: import_core6.Rooms.videoUnmuteMember,
-  deaf: import_core6.Rooms.deafMember,
-  undeaf: import_core6.Rooms.undeafMember,
-  setInputVolume: import_core6.Rooms.setInputVolumeMember,
-  setOutputVolume: import_core6.Rooms.setOutputVolumeMember,
-  setMicrophoneVolume: import_core6.Rooms.setInputVolumeMember,
-  setSpeakerVolume: import_core6.Rooms.setOutputVolumeMember,
-  setInputSensitivity: import_core6.Rooms.setInputSensitivityMember,
-  removeMember: import_core6.Rooms.removeMember,
-  getMembers: import_core6.Rooms.getMembers,
-  getLayouts: import_core6.Rooms.getLayouts,
-  setLayout: import_core6.Rooms.setLayout,
-  hideVideoMuted: import_core6.Rooms.hideVideoMuted,
-  showVideoMuted: import_core6.Rooms.showVideoMuted,
-  getRecordings: import_core6.Rooms.getRecordings,
-  startRecording: import_core6.Rooms.startRecording,
-  getPlaybacks: import_core6.Rooms.getPlaybacks,
-  play: import_core6.Rooms.play,
-  setHideVideoMuted: import_core6.Rooms.setHideVideoMuted
+var RoomSessionAPI = (0, import_core7.extendComponent)(RoomSessionConnection, {
+  audioMute: import_core7.Rooms.audioMuteMember,
+  audioUnmute: import_core7.Rooms.audioUnmuteMember,
+  videoMute: import_core7.Rooms.videoMuteMember,
+  videoUnmute: import_core7.Rooms.videoUnmuteMember,
+  deaf: import_core7.Rooms.deafMember,
+  undeaf: import_core7.Rooms.undeafMember,
+  setInputVolume: import_core7.Rooms.setInputVolumeMember,
+  setOutputVolume: import_core7.Rooms.setOutputVolumeMember,
+  setMicrophoneVolume: import_core7.Rooms.setInputVolumeMember,
+  setSpeakerVolume: import_core7.Rooms.setOutputVolumeMember,
+  setInputSensitivity: import_core7.Rooms.setInputSensitivityMember,
+  removeMember: import_core7.Rooms.removeMember,
+  getMembers: import_core7.Rooms.getMembers,
+  getLayouts: import_core7.Rooms.getLayouts,
+  setLayout: import_core7.Rooms.setLayout,
+  hideVideoMuted: import_core7.Rooms.hideVideoMuted,
+  showVideoMuted: import_core7.Rooms.showVideoMuted,
+  getRecordings: import_core7.Rooms.getRecordings,
+  startRecording: import_core7.Rooms.startRecording,
+  getPlaybacks: import_core7.Rooms.getPlaybacks,
+  play: import_core7.Rooms.play,
+  setHideVideoMuted: import_core7.Rooms.setHideVideoMuted
 });
 var createBaseRoomSessionObject = (params) => {
-  const room = (0, import_core6.connect)({
+  const room = (0, import_core7.connect)({
     store: params.store,
     customSagas: params.customSagas,
     Component: RoomSessionAPI,
@@ -717,8 +829,8 @@ var createBaseRoomSessionObject = (params) => {
 };
 
 // src/cantina/Cantina.ts
-var import_core7 = require("@signalwire/core");
-var CantinaAPI = class extends import_core7.BaseConsumer {
+var import_core8 = require("@signalwire/core");
+var CantinaAPI = class extends import_core8.BaseConsumer {
   constructor() {
     super(...arguments);
     __publicField(this, "_eventsPrefix", "cantina-manager");
@@ -730,10 +842,10 @@ var CantinaAPI = class extends import_core7.BaseConsumer {
         {
           type: "roomSession",
           instanceFactory: ({ rooms }) => ({
-            rooms: rooms.map((row) => (0, import_core7.toExternalJSON)(row))
+            rooms: rooms.map((row) => (0, import_core8.toExternalJSON)(row))
           }),
           payloadTransform: ({ rooms }) => ({
-            rooms: rooms.map((row) => (0, import_core7.toExternalJSON)(row))
+            rooms: rooms.map((row) => (0, import_core8.toExternalJSON)(row))
           })
         }
       ],
@@ -747,15 +859,15 @@ var CantinaAPI = class extends import_core7.BaseConsumer {
         ],
         {
           type: "roomSession",
-          instanceFactory: (payload) => (0, import_core7.toExternalJSON)(payload),
-          payloadTransform: (payload) => (0, import_core7.toExternalJSON)(payload)
+          instanceFactory: (payload) => (0, import_core8.toExternalJSON)(payload),
+          payloadTransform: (payload) => (0, import_core8.toExternalJSON)(payload)
         }
       ]
     ]);
   }
 };
 var createCantinaObject = (params) => {
-  const cantina = (0, import_core7.connect)({
+  const cantina = (0, import_core8.connect)({
     store: params.store,
     Component: CantinaAPI,
     componentListeners: {
@@ -777,7 +889,7 @@ var createCantinaObject = (params) => {
 };
 
 // src/Client.ts
-var ClientAPI = class extends import_core8.BaseClient {
+var ClientAPI = class extends import_core9.BaseClient {
   constructor() {
     super(...arguments);
     __publicField(this, "_cantina");
@@ -840,7 +952,7 @@ var ClientAPI = class extends import_core8.BaseClient {
   }
   get chat() {
     if (!this._chat) {
-      this._chat = import_core8.Chat.createBaseChatObject({
+      this._chat = import_core9.Chat.createBaseChatObject({
         store: this.store,
         emitter: this.options.emitter
       });
@@ -854,30 +966,30 @@ var ClientAPI = class extends import_core8.BaseClient {
     return this._cantina;
   }
   reauthenticate(token) {
-    this.store.dispatch(import_core8.actions.reauthAction({ token }));
+    this.store.dispatch(import_core9.actions.reauthAction({ token }));
   }
 };
 
 // src/JWTSession.ts
-var import_core9 = require("@signalwire/core");
-var JWTSession = class extends import_core9.BaseJWTSession {
+var import_core10 = require("@signalwire/core");
+var JWTSession = class extends import_core10.BaseJWTSession {
   constructor() {
     super(...arguments);
     __publicField(this, "WebSocketConstructor", WebSocket);
-    __publicField(this, "agent", "@signalwire/js/3.7.0");
+    __publicField(this, "agent", "@signalwire/js/3.8.0-dev.202202021245.c33a456.0");
   }
 };
 
 // src/createClient.ts
 var createClient = (userOptions) => {
   const baseUserOptions = __spreadProps(__spreadValues({}, userOptions), {
-    emitter: (0, import_core10.getEventEmitter)()
+    emitter: (0, import_core11.getEventEmitter)()
   });
-  const store = (0, import_core10.configureStore)({
+  const store = (0, import_core11.configureStore)({
     userOptions: baseUserOptions,
     SessionConstructor: JWTSession
   });
-  const client = (0, import_core10.connect)({
+  const client = (0, import_core11.connect)({
     store,
     Component: ClientAPI,
     componentListeners: {
@@ -927,7 +1039,7 @@ var createRoomObject = (roomOptions) => {
         rootElement = el;
       } else {
         rootElement = document.body;
-        (0, import_core11.getLogger)().warn(`We couldn't find an element with id: ${rootElementId}: using 'document.body' instead.`);
+        (0, import_core12.getLogger)().warn(`We couldn't find an element with id: ${rootElementId}: using 'document.body' instead.`);
       }
     }
     const room = client.rooms.makeRoomObject({
@@ -966,7 +1078,7 @@ var joinRoom = (roomOptions) => {
 };
 
 // src/RoomSession.ts
-var import_core12 = require("@signalwire/core");
+var import_core13 = require("@signalwire/core");
 var VIDEO_CONSTRAINTS2 = {
   aspectRatio: { ideal: 16 / 9 }
 };
@@ -1035,21 +1147,25 @@ var RoomSession = function(roomOptions) {
   const join = () => {
     return new Promise((resolve, reject) => __async(this, null, function* () {
       try {
+        room.attachPreConnectWorkers();
         yield client.connect();
         room.once("room.subscribed", () => {
           resolve(room);
         });
         yield room.join();
       } catch (error) {
-        (0, import_core12.getLogger)().error("RoomSession Join", error);
+        (0, import_core13.getLogger)().error("RoomSession Join", error);
         reject(error);
       }
     }));
   };
+  const interceptors = {
+    join
+  };
   return new Proxy(room, {
     get(target, prop, receiver) {
-      if (prop === "join") {
-        return join;
+      if (prop in interceptors) {
+        return interceptors[prop];
       }
       if (!target.active && UNSAFE_PROP_ACCESS.includes(prop)) {
         throw new Error(`Tried to access the property/method "${prop}" before the room was connected. Please call roomSession.join() first.`);
@@ -1100,10 +1216,10 @@ __export(chat_exports, {
 });
 
 // src/chat/Client.ts
-var import_core13 = require("@signalwire/core");
+var import_core14 = require("@signalwire/core");
 var Client2 = function(chatOptions) {
   if (process.env.NODE_ENV === "production") {
-    (0, import_core13.getLogger)().warn("`Chat` is still under development and may change in the future without prior notice.");
+    (0, import_core14.getLogger)().warn("`Chat` is still under development and may change in the future without prior notice.");
   }
   const client = createClient(chatOptions);
   const subscribe = (channels) => __async(this, null, function* () {