@signalwire/js 3.23.3 → 3.23.4

package/dist/index.esm.js

@@ -143,7 +143,7 @@ __export(video_exports, {
 });
 
 // src/createRoomObject.ts
-import { getLogger as getLogger7 } from "@signalwire/core";
+import { getLogger as getLogger13 } from "@signalwire/core";
 
 // src/createClient.ts
 import {
@@ -164,7 +164,8 @@ import {
 import {
   getLogger as getLogger2,
   actions as actions2,
-  sagaEffects
+  sagaEffects,
+  LOCAL_EVENT_PREFIX
 } from "@signalwire/core";
 import { setMediaElementSinkId } from "@signalwire/webrtc";
 
@@ -249,6 +250,7 @@ var makeLayoutChangedHandler = ({ localOverlay, rootElement }) => async ({ layou
       localVideo.style.width = "100%";
       localVideo.style.height = "100%";
       localVideo.style.pointerEvents = "none";
+      localVideo.style.objectFit = "cover";
       myLayer.appendChild(localVideo);
       const mcuLayers = rootElement.querySelector(".mcuLayers");
       const exists = mcuLayers == null ? void 0 : mcuLayers.querySelector(`#${myLayer.id}`);
@@ -437,7 +439,7 @@ var makeVideoElementSaga = ({
           localOverlay.hide();
         }
       };
-      room.on("_internal.mirror.video", (value) => {
+      room.on(`${LOCAL_EVENT_PREFIX}.mirror.video`, (value) => {
         localOverlay.setLocalOverlayMirror(value);
       });
       room.on("layout.changed", (params) => {
@@ -553,7 +555,7 @@ function* audioElementActionsWatcher({
       switch (action.type) {
         case setSpeakerActionType:
           const response = yield sagaEffects.call(setMediaElementSinkId, element, action.payload);
-          room.emit("_internal.speaker.updated", action.payload);
+          room.emit(`${LOCAL_EVENT_PREFIX}.speaker.updated`, action.payload);
           room.settleCustomSagaTrigger({
             dispatchId: action.dispatchId,
             payload: response,
@@ -661,11 +663,10 @@ function* videoElementSetupWorker({
 // src/BaseRoomSession.ts
 import {
   connect,
-  Rooms as Rooms3,
+  Rooms as Rooms6,
   extendComponent as extendComponent3,
-  toLocalEvent,
-  toExternalJSON,
-  MemberPosition as MemberPosition2
+  LOCAL_EVENT_PREFIX as LOCAL_EVENT_PREFIX2,
+  validateEventsToSubscribe as validateEventsToSubscribe2
 } from "@signalwire/core";
 import {
   getDisplayMedia,
@@ -740,7 +741,7 @@ import {
 } from "@signalwire/core";
 var noop = () => {
 };
-var EXTERNAL_MEMBER_LIST_UPDATED_EVENT = "video.memberList.updated";
+var EXTERNAL_MEMBER_LIST_UPDATED_EVENT = "memberList.updated";
 var INTERNAL_MEMBER_LIST_UPDATED_EVENT = toInternalEventName({
   event: EXTERNAL_MEMBER_LIST_UPDATED_EVENT
 });
@@ -760,7 +761,7 @@ var getMemberListEventsToSubscribe = (subscriptions) => {
   });
 };
 var shouldHandleMemberList = (subscriptions) => {
-  return subscriptions.some((event) => event.includes(INTERNAL_MEMBER_LIST_UPDATED_EVENT));
+  return subscriptions.some((event) => event.includes(EXTERNAL_MEMBER_LIST_UPDATED_EVENT));
 };
 var getMembersFromAction = (action) => {
   if (action.type === "video.room.joined") {
@@ -803,7 +804,8 @@ var initMemberListSubscriptions = (room, subscriptions) => {
   };
 };
 function* membersListUpdatedWatcher({
-  pubSubChannel
+  swEventChannel,
+  instance
 }) {
   const memberList = /* @__PURE__ */ new Map();
   function* worker(pubSubAction) {
@@ -813,20 +815,17 @@ function* membersListUpdatedWatcher({
       room_session_id: roomSessionId,
       members
     };
-    yield sagaEffects2.put(pubSubChannel, {
-      type: SYNTHETIC_MEMBER_LIST_UPDATED_EVENT,
-      payload: memberListPayload
-    });
+    instance.emit(SYNTHETIC_MEMBER_LIST_UPDATED_EVENT, memberListPayload);
   }
   while (true) {
-    const pubSubAction = yield sagaEffects2.take(pubSubChannel, ({ type }) => {
+    const pubSubAction = yield sagaEffects2.take(swEventChannel, ({ type }) => {
       return isMemberListEvent(type);
     });
     yield sagaEffects2.fork(worker, pubSubAction);
   }
 }
 var memberListUpdatedWorker = function* membersChangedWorker({
-  channels: { pubSubChannel },
+  channels: { swEventChannel },
   instance
 }) {
   const subscriptions = instance.getSubscriptions();
@@ -835,29 +834,18 @@ var memberListUpdatedWorker = function* membersChangedWorker({
   }
   const { cleanup } = initMemberListSubscriptions(instance, subscriptions);
   yield sagaEffects2.fork(membersListUpdatedWatcher, {
-    pubSubChannel
+    swEventChannel,
+    instance
   });
   instance.once("destroy", () => {
     cleanup();
   });
 };
 
-// src/video/memberPositionWorker.ts
-import {
-  MemberPosition,
-  sagaEffects as sagaEffects3
-} from "@signalwire/core";
-var memberPositionWorker = function* memberPositionWorker2(options) {
-  if (!options.initialState) {
-    throw new Error("[memberPositionWorker] Missing initialState");
-  }
-  yield sagaEffects3.fork(MemberPosition.memberPositionWorker, options);
-};
-
 // src/video/childMemberJoinedWorker.ts
 import {
   getLogger as getLogger3,
-  sagaEffects as sagaEffects4,
+  sagaEffects as sagaEffects3,
   componentSelectors,
   componentActions
 } from "@signalwire/core";
@@ -869,7 +857,7 @@ var childMemberJoinedWorker = function* (options) {
   if (!parentId) {
     throw new Error("Missing parentId for childMemberJoinedWorker");
   }
-  const action = yield sagaEffects4.take(swEventChannel, (action2) => {
+  const action = yield sagaEffects3.take(swEventChannel, (action2) => {
     if (action2.type === "video.member.joined") {
       return action2.payload.member.parent_id === parentId;
     }
@@ -877,14 +865,12 @@ var childMemberJoinedWorker = function* (options) {
   });
   const { member } = action.payload;
   if (member == null ? void 0 : member.parent_id) {
-    const byId = yield sagaEffects4.select(componentSelectors.getComponentsById);
+    const byId = yield sagaEffects3.select(componentSelectors.getComponentsById);
     const parent = Object.values(byId).find((row) => {
       return "memberId" in row && row.memberId === member.parent_id;
     });
     if (parent) {
-      instance._attachListeners(member.id);
-      instance.applyEmitterTransforms();
-      yield sagaEffects4.put(componentActions.upsert({
+      yield sagaEffects3.put(componentActions.upsert({
         id: instance.callId,
         roomId: action.payload.room_id,
         roomSessionId: action.payload.room_session_id,
@@ -898,6 +884,193 @@ var childMemberJoinedWorker = function* (options) {
   getLogger3().trace("childMemberJoinedWorker ended");
 };
 
+// src/video/videoWorker.ts
+import {
+  getLogger as getLogger7,
+  sagaEffects as sagaEffects4,
+  MemberPosition,
+  stripNamespacePrefix as stripNamespacePrefix3
+} from "@signalwire/core";
+
+// src/video/videoStreamWorker.ts
+import {
+  getLogger as getLogger4,
+  Rooms as Rooms3
+} from "@signalwire/core";
+var videoStreamWorker = function* (options) {
+  getLogger4().trace("videoStreamWorker started");
+  const {
+    instance: roomSession,
+    action: { type, payload },
+    instanceMap: { get, set, remove }
+  } = options;
+  let streamInstance = get(payload.stream.id);
+  if (!streamInstance) {
+    streamInstance = Rooms3.createRoomSessionStreamObject({
+      store: roomSession.store,
+      payload
+    });
+  } else {
+    streamInstance.setPayload(payload);
+  }
+  set(payload.stream.id, streamInstance);
+  switch (type) {
+    case "video.stream.started":
+      roomSession.emit("stream.started", streamInstance);
+      break;
+    case "video.stream.ended":
+      roomSession.emit("stream.ended", streamInstance);
+      remove(payload.stream.id);
+      break;
+    default:
+      getLogger4().warn(`Unknown video.stream event: "${type}"`);
+      break;
+  }
+  getLogger4().trace("videoStreamWorker ended");
+};
+
+// src/video/videoRecordWorker.ts
+import {
+  getLogger as getLogger5,
+  Rooms as Rooms4,
+  stripNamespacePrefix
+} from "@signalwire/core";
+var videoRecordWorker = function* (options) {
+  getLogger5().trace("videoRecordWorker started");
+  const {
+    instance: roomSession,
+    action: { type, payload },
+    instanceMap: { get, set, remove }
+  } = options;
+  let recordingInstance = get(payload.recording.id);
+  if (!recordingInstance) {
+    recordingInstance = Rooms4.createRoomSessionRecordingObject({
+      store: roomSession.store,
+      payload
+    });
+  } else {
+    recordingInstance.setPayload(payload);
+  }
+  set(payload.recording.id, recordingInstance);
+  const event = stripNamespacePrefix(type);
+  switch (type) {
+    case "video.recording.started":
+    case "video.recording.updated": {
+      roomSession.emit(event, recordingInstance);
+      break;
+    }
+    case "video.recording.ended":
+      roomSession.emit(event, recordingInstance);
+      remove(payload.recording.id);
+      break;
+    default:
+      getLogger5().warn(`Unknown video.stream event: "${type}"`);
+      break;
+  }
+  getLogger5().trace("videoRecordWorker ended");
+};
+
+// src/video/videoPlaybackWorker.ts
+import {
+  getLogger as getLogger6,
+  Rooms as Rooms5,
+  stripNamespacePrefix as stripNamespacePrefix2
+} from "@signalwire/core";
+var videoPlaybackWorker = function* (options) {
+  getLogger6().trace("videoPlaybackWorker started");
+  const {
+    instance: roomSession,
+    action: { type, payload },
+    instanceMap: { get, set, remove }
+  } = options;
+  let playbackInstance = get(payload.playback.id);
+  if (!playbackInstance) {
+    playbackInstance = Rooms5.createRoomSessionPlaybackObject({
+      store: roomSession.store,
+      payload
+    });
+  } else {
+    playbackInstance.setPayload(payload);
+  }
+  set(payload.playback.id, playbackInstance);
+  const event = stripNamespacePrefix2(type);
+  switch (type) {
+    case "video.playback.started":
+    case "video.playback.updated": {
+      roomSession.emit(event, playbackInstance);
+      break;
+    }
+    case "video.playback.ended":
+      roomSession.emit(event, playbackInstance);
+      remove(payload.playback.id);
+      break;
+    default:
+      getLogger6().warn(`Unknown video.stream event: "${type}"`);
+      break;
+  }
+  getLogger6().trace("videoPlaybackWorker ended");
+};
+
+// src/video/videoWorker.ts
+var videoWorker = function* (options) {
+  const { channels, instance: roomSession } = options;
+  const { swEventChannel } = channels;
+  function* worker(action) {
+    const { type, payload } = action;
+    switch (type) {
+      case "video.room.subscribed":
+        yield sagaEffects4.spawn(MemberPosition.memberPositionWorker, __spreadProps(__spreadValues({}, options), {
+          instance: roomSession,
+          initialState: payload
+        }));
+        break;
+      case "video.playback.started":
+      case "video.playback.updated":
+      case "video.playback.ended":
+        yield sagaEffects4.fork(videoPlaybackWorker, __spreadValues({
+          action
+        }, options));
+        return;
+      case "video.recording.started":
+      case "video.recording.updated":
+      case "video.recording.ended":
+        yield sagaEffects4.fork(videoRecordWorker, __spreadValues({
+          action
+        }, options));
+        return;
+      case "video.stream.ended":
+      case "video.stream.started":
+        yield sagaEffects4.fork(videoStreamWorker, __spreadValues({
+          action
+        }, options));
+        return;
+      case "video.room.audience_count": {
+        roomSession.emit("room.audienceCount", payload);
+        return;
+      }
+      case "video.member.talking": {
+        const { member } = payload;
+        if ("talking" in member) {
+          const suffix = member.talking ? "started" : "ended";
+          roomSession.emit(`member.talking.${suffix}`, payload);
+          const deprecatedSuffix = member.talking ? "start" : "stop";
+          roomSession.emit(`member.talking.${deprecatedSuffix}`, payload);
+        }
+        break;
+      }
+      default:
+        break;
+    }
+    roomSession.emit(stripNamespacePrefix3(type), payload);
+  }
+  const isVideoEvent = (action) => action.type.startsWith("video.");
+  while (true) {
+    const action = yield sagaEffects4.take(swEventChannel, isVideoEvent);
+    yield sagaEffects4.fork(worker, action);
+  }
+  getLogger7().trace("videoWorker ended");
+};
+
 // src/BaseRoomSession.ts
 var RoomSessionConnection = class extends BaseConnection3 {
   constructor(options) {
@@ -907,6 +1080,9 @@ var RoomSessionConnection = class extends BaseConnection3 {
     __publicField(this, "_mirrored");
     __publicField(this, "_audioEl");
     this._mirrored = options.mirrorLocalVideoOverlay;
+    this.runWorker("videoWorker", {
+      worker: videoWorker
+    });
   }
   get screenShareList() {
     return Array.from(this._screenShareList);
@@ -928,173 +1104,11 @@ var RoomSessionConnection = class extends BaseConnection3 {
       return (_b = (_a = authState == null ? void 0 : authState.room) == null ? void 0 : _a.scopes) != null ? _b : [];
     });
   }
-  getEmitterTransforms() {
-    return /* @__PURE__ */ new Map([
-      [
-        ["video.room.joined"],
-        {
-          type: "roomSession",
-          instanceFactory: () => {
-            return {};
-          },
-          payloadTransform: (payload) => {
-            return payload;
-          },
-          nestedFieldsToProcess: {
-            recordings: {
-              eventTransformType: "roomSessionRecording",
-              processInstancePayload: (payload) => ({ recording: payload })
-            },
-            playbacks: {
-              eventTransformType: "roomSessionPlayback",
-              processInstancePayload: (payload) => ({ playback: payload })
-            },
-            streams: {
-              eventTransformType: "roomSessionStream",
-              processInstancePayload: (payload) => ({ stream: payload })
-            }
-          }
-        }
-      ],
-      [
-        [toLocalEvent("video.recording.list")],
-        {
-          type: "roomSessionRecordingList",
-          instanceFactory: (_payload) => {
-            return {};
-          },
-          payloadTransform: (payload) => {
-            return payload;
-          },
-          nestedFieldsToProcess: {
-            recordings: {
-              eventTransformType: "roomSessionRecording",
-              processInstancePayload: (payload) => ({ recording: payload })
-            }
-          }
-        }
-      ],
-      [
-        [toLocalEvent("video.playback.list")],
-        {
-          type: "roomSessionPlaybackList",
-          instanceFactory: (_payload) => {
-            return {};
-          },
-          payloadTransform: (payload) => {
-            return payload;
-          },
-          nestedFieldsToProcess: {
-            playbacks: {
-              eventTransformType: "roomSessionPlayback",
-              processInstancePayload: (payload) => ({ playback: payload })
-            }
-          }
-        }
-      ],
-      [
-        [
-          toLocalEvent("video.recording.start"),
-          "video.recording.started",
-          "video.recording.updated",
-          "video.recording.ended"
-        ],
-        {
-          type: "roomSessionRecording",
-          instanceFactory: (_payload) => {
-            return Rooms3.createRoomSessionRecordingObject({
-              store: this.store,
-              emitter: this.emitter
-            });
-          },
-          payloadTransform: (payload) => {
-            return toExternalJSON(__spreadProps(__spreadValues({}, payload.recording), {
-              room_session_id: this.roomSessionId
-            }));
-          }
-        }
-      ],
-      [
-        [
-          toLocalEvent("video.playback.start"),
-          "video.playback.started",
-          "video.playback.updated",
-          "video.playback.ended"
-        ],
-        {
-          type: "roomSessionPlayback",
-          instanceFactory: (_payload) => {
-            return Rooms3.createRoomSessionPlaybackObject({
-              store: this.store,
-              emitter: this.emitter
-            });
-          },
-          payloadTransform: (payload) => {
-            return toExternalJSON(__spreadProps(__spreadValues({}, payload.playback), {
-              room_session_id: this.roomSessionId
-            }));
-          }
-        }
-      ],
-      [
-        [toLocalEvent("video.stream.list")],
-        {
-          type: "roomSessionStreamList",
-          instanceFactory: (_payload) => {
-            return {};
-          },
-          payloadTransform: (payload) => {
-            return payload;
-          },
-          nestedFieldsToProcess: {
-            streams: {
-              eventTransformType: "roomSessionStream",
-              processInstancePayload: (payload) => {
-                return { stream: payload };
-              }
-            }
-          }
-        }
-      ],
-      [
-        [
-          toLocalEvent("video.stream.start"),
-          "video.stream.started",
-          "video.stream.ended"
-        ],
-        {
-          type: "roomSessionStream",
-          instanceFactory: (_payload) => {
-            return Rooms3.createRoomSessionStreamObject({
-              store: this.store,
-              emitter: this.emitter
-            });
-          },
-          payloadTransform: (payload) => {
-            return toExternalJSON(__spreadProps(__spreadValues({}, payload.stream), {
-              room_session_id: this.roomSessionId
-            }));
-          }
-        }
-      ]
-    ]);
-  }
-  getCompoundEvents() {
-    return new Map([
-      ...MemberPosition2.MEMBER_POSITION_COMPOUND_EVENTS
-    ]);
-  }
   attachPreConnectWorkers() {
     this.runWorker("memberListUpdated", {
       worker: memberListUpdatedWorker
     });
   }
-  attachOnSubscribedWorkers(payload) {
-    this.runWorker("memberPositionWorker", {
-      worker: memberPositionWorker,
-      initialState: payload
-    });
-  }
   async createScreenShareObject(opts = {}) {
     return this.startScreenShare(opts);
   }
@@ -1228,7 +1242,7 @@ var RoomSessionConnection = class extends BaseConnection3 {
   }
   updateSpeaker({ deviceId }) {
     const prevId = this._audioEl.sinkId;
-    this.once("_internal.speaker.updated", async (newId) => {
+    this.once(`${LOCAL_EVENT_PREFIX2}.speaker.updated`, async (newId) => {
       const prevSpeaker = await getSpeakerById(prevId);
       const newSpeaker = await getSpeakerById(newId);
       const isSame = (newSpeaker == null ? void 0 : newSpeaker.deviceId) === (prevSpeaker == null ? void 0 : prevSpeaker.deviceId);
@@ -1285,7 +1299,6 @@ var RoomSessionConnection = class extends BaseConnection3 {
     if (this._audioEl)
       return this._audioEl;
     this._audioEl = new Audio();
-    console.log("listener attached!");
     this._attachSpeakerTrackListener();
     return this._audioEl;
   }
@@ -1314,49 +1327,53 @@ var RoomSessionConnection = class extends BaseConnection3 {
       mirrored: this._mirrored,
       setMirrored: (value) => {
         this._mirrored = value;
-        this.emit("_internal.mirror.video", this._mirrored);
+        this.emit(`${LOCAL_EVENT_PREFIX2}.mirror.video`, this._mirrored);
       }
     };
   }
+  getSubscriptions() {
+    const eventNamesWithPrefix = this.eventNames().map((event) => `video.${event}`);
+    return validateEventsToSubscribe2(eventNamesWithPrefix);
+  }
 };
 var RoomSessionAPI = extendComponent3(RoomSessionConnection, {
-  audioMute: Rooms3.audioMuteMember,
-  audioUnmute: Rooms3.audioUnmuteMember,
-  videoMute: Rooms3.videoMuteMember,
-  videoUnmute: Rooms3.videoUnmuteMember,
-  deaf: Rooms3.deafMember,
-  undeaf: Rooms3.undeafMember,
-  setInputVolume: Rooms3.setInputVolumeMember,
-  setOutputVolume: Rooms3.setOutputVolumeMember,
-  setMicrophoneVolume: Rooms3.setInputVolumeMember,
-  setSpeakerVolume: Rooms3.setOutputVolumeMember,
-  setInputSensitivity: Rooms3.setInputSensitivityMember,
-  removeMember: Rooms3.removeMember,
-  removeAllMembers: Rooms3.removeAllMembers,
-  getMembers: Rooms3.getMembers,
-  getLayouts: Rooms3.getLayouts,
-  setLayout: Rooms3.setLayout,
-  setPositions: Rooms3.setPositions,
-  setMemberPosition: Rooms3.setMemberPosition,
-  hideVideoMuted: Rooms3.hideVideoMuted,
-  showVideoMuted: Rooms3.showVideoMuted,
-  getRecordings: Rooms3.getRecordings,
-  startRecording: Rooms3.startRecording,
-  getPlaybacks: Rooms3.getPlaybacks,
-  play: Rooms3.play,
-  setHideVideoMuted: Rooms3.setHideVideoMuted,
-  getMeta: Rooms3.getMeta,
-  setMeta: Rooms3.setMeta,
-  updateMeta: Rooms3.updateMeta,
-  deleteMeta: Rooms3.deleteMeta,
-  getMemberMeta: Rooms3.getMemberMeta,
-  setMemberMeta: Rooms3.setMemberMeta,
-  updateMemberMeta: Rooms3.updateMemberMeta,
-  deleteMemberMeta: Rooms3.deleteMemberMeta,
-  promote: Rooms3.promote,
-  demote: Rooms3.demote,
-  getStreams: Rooms3.getStreams,
-  startStream: Rooms3.startStream
+  audioMute: Rooms6.audioMuteMember,
+  audioUnmute: Rooms6.audioUnmuteMember,
+  videoMute: Rooms6.videoMuteMember,
+  videoUnmute: Rooms6.videoUnmuteMember,
+  deaf: Rooms6.deafMember,
+  undeaf: Rooms6.undeafMember,
+  setInputVolume: Rooms6.setInputVolumeMember,
+  setOutputVolume: Rooms6.setOutputVolumeMember,
+  setMicrophoneVolume: Rooms6.setInputVolumeMember,
+  setSpeakerVolume: Rooms6.setOutputVolumeMember,
+  setInputSensitivity: Rooms6.setInputSensitivityMember,
+  removeMember: Rooms6.removeMember,
+  removeAllMembers: Rooms6.removeAllMembers,
+  getMembers: Rooms6.getMembers,
+  getLayouts: Rooms6.getLayouts,
+  setLayout: Rooms6.setLayout,
+  setPositions: Rooms6.setPositions,
+  setMemberPosition: Rooms6.setMemberPosition,
+  hideVideoMuted: Rooms6.hideVideoMuted,
+  showVideoMuted: Rooms6.showVideoMuted,
+  getRecordings: Rooms6.getRecordings,
+  startRecording: Rooms6.startRecording,
+  getPlaybacks: Rooms6.getPlaybacks,
+  play: Rooms6.play,
+  setHideVideoMuted: Rooms6.setHideVideoMuted,
+  getMeta: Rooms6.getMeta,
+  setMeta: Rooms6.setMeta,
+  updateMeta: Rooms6.updateMeta,
+  deleteMeta: Rooms6.deleteMeta,
+  getMemberMeta: Rooms6.getMemberMeta,
+  setMemberMeta: Rooms6.setMemberMeta,
+  updateMemberMeta: Rooms6.updateMemberMeta,
+  deleteMemberMeta: Rooms6.deleteMemberMeta,
+  promote: Rooms6.promote,
+  demote: Rooms6.demote,
+  getStreams: Rooms6.getStreams,
+  startStream: Rooms6.startStream
 });
 var createBaseRoomSessionObject = (params) => {
   const room = connect({
@@ -1369,67 +1386,97 @@ var createBaseRoomSessionObject = (params) => {
 
 // src/cantina/VideoManager.ts
 import {
-  BaseConsumer,
   connect as connect2,
-  toExternalJSON as toExternalJSON2
+  validateEventsToSubscribe as validateEventsToSubscribe3,
+  BaseConsumer
+} from "@signalwire/core";
+
+// src/cantina/workers/videoManagerWorker.ts
+import { getLogger as getLogger10, sagaEffects as sagaEffects5 } from "@signalwire/core";
+
+// src/cantina/workers/videoManagerRoomsWorker.ts
+import {
+  getLogger as getLogger8,
+  toExternalJSON,
+  stripNamespacePrefix as stripNamespacePrefix4
 } from "@signalwire/core";
+var videoManagerRoomsWorker = function* (options) {
+  getLogger8().trace("videoManagerRoomsWorker started");
+  const {
+    instance: client,
+    action: { type, payload }
+  } = options;
+  const modPayload = {
+    rooms: payload.rooms.map((row) => toExternalJSON(row))
+  };
+  client.emit(stripNamespacePrefix4(type), modPayload);
+  getLogger8().trace("videoManagerRoomsWorker ended");
+};
 
-// src/cantina/workers.ts
-import { getLogger as getLogger4, sagaEffects as sagaEffects5 } from "@signalwire/core";
+// src/cantina/workers/videoManagerRoomWorker.ts
+import {
+  getLogger as getLogger9,
+  toExternalJSON as toExternalJSON2,
+  stripNamespacePrefix as stripNamespacePrefix5
+} from "@signalwire/core";
+var videoManagerRoomWorker = function* (options) {
+  getLogger9().trace("videoManagerRoomWorker started");
+  const {
+    instance: client,
+    action: { type, payload }
+  } = options;
+  client.emit(stripNamespacePrefix5(type), toExternalJSON2(payload));
+  getLogger9().trace("videoManagerRoomWorker ended");
+};
+
+// src/cantina/workers/videoManagerWorker.ts
 var videoManagerWorker = function* (options) {
-  getLogger4().trace("videoManagerWorker started");
-  const { channels } = options;
-  const { swEventChannel, pubSubChannel } = channels;
+  getLogger10().trace("videoManagerWorker started");
+  const {
+    channels: { swEventChannel }
+  } = options;
+  function* worker(action) {
+    const { type } = action;
+    switch (type) {
+      case "video-manager.rooms.subscribed":
+        yield sagaEffects5.fork(videoManagerRoomsWorker, __spreadValues({
+          action
+        }, options));
+        break;
+      case "video-manager.room.added":
+      case "video-manager.room.deleted":
+      case "video-manager.room.ended":
+      case "video-manager.room.started":
+      case "video-manager.room.updated":
+        yield sagaEffects5.fork(videoManagerRoomWorker, __spreadValues({
+          action
+        }, options));
+        break;
+      default:
+        getLogger10().warn(`Unknown video-manager event: "${type}"`);
+        break;
+    }
+  }
   while (true) {
     const action = yield sagaEffects5.take(swEventChannel, (action2) => {
       return action2.type.startsWith("video-manager.");
     });
-    yield sagaEffects5.put(pubSubChannel, action);
+    yield sagaEffects5.fork(worker, action);
   }
+  getLogger10().trace("videoManagerWorker ended");
 };
 
 // src/cantina/VideoManager.ts
 var VideoManagerAPI = class extends BaseConsumer {
   constructor(options) {
     super(options);
-    __publicField(this, "_eventsPrefix", "video-manager");
     this.runWorker("videoManagerWorker", {
       worker: videoManagerWorker
     });
   }
-  getEmitterTransforms() {
-    return /* @__PURE__ */ new Map([
-      [
-        ["video-manager.rooms.subscribed"],
-        {
-          type: "roomSession",
-          instanceFactory: ({
-            rooms
-          }) => ({
-            rooms: rooms.map((row) => toExternalJSON2(row))
-          }),
-          payloadTransform: ({
-            rooms
-          }) => ({
-            rooms: rooms.map((row) => toExternalJSON2(row))
-          })
-        }
-      ],
-      [
-        [
-          "video-manager.room.started",
-          "video-manager.room.added",
-          "video-manager.room.updated",
-          "video-manager.room.ended",
-          "video-manager.room.deleted"
-        ],
-        {
-          type: "roomSession",
-          instanceFactory: (payload) => toExternalJSON2(payload),
-          payloadTransform: (payload) => toExternalJSON2(payload)
-        }
-      ]
-    ]);
+  getSubscriptions() {
+    const eventNamesWithPrefix = this.eventNames().map((event) => `video-manager.${event}`);
+    return validateEventsToSubscribe3(eventNamesWithPrefix);
   }
 };
 var createVideoManagerObject = (params) => {
@@ -1484,7 +1531,6 @@ var ClientAPI = class extends BaseClient {
         }
         const room = createBaseRoomSessionObject(__spreadProps(__spreadValues({}, options), {
           store: this.store,
-          emitter: this.emitter,
           customSagas
         }));
         if (stopMicrophoneWhileMuted) {
@@ -1516,8 +1562,7 @@ var ClientAPI = class extends BaseClient {
   get chat() {
     if (!this._chat) {
       this._chat = ChatNamespace.createBaseChatObject({
-        store: this.store,
-        emitter: this.options.emitter
+        store: this.store
       });
     }
     return this._chat;
@@ -1525,8 +1570,7 @@ var ClientAPI = class extends BaseClient {
   get pubSub() {
     if (!this._pubSub) {
       this._pubSub = PubSubNamespace.createBasePubSubObject({
-        store: this.store,
-        emitter: this.options.emitter
+        store: this.store
       });
     }
     return this._pubSub;
@@ -1546,12 +1590,12 @@ var ClientAPI = class extends BaseClient {
 import jwtDecode2 from "jwt-decode";
 import {
   BaseJWTSession,
-  getLogger as getLogger6
+  getLogger as getLogger12
 } from "@signalwire/core";
 
 // src/utils/storage.ts
 import jwtDecode from "jwt-decode";
-import { getLogger as getLogger5 } from "@signalwire/core";
+import { getLogger as getLogger11 } from "@signalwire/core";
 var getStorage = () => {
   if (window && window.sessionStorage) {
     return window.sessionStorage;
@@ -1566,7 +1610,7 @@ var sessionStorageManager = (token) => {
     roomName = (_a = jwtPayload == null ? void 0 : jwtPayload.r) != null ? _a : "";
   } catch (e) {
     if (process.env.NODE_ENV !== "production") {
-      getLogger5().error("[sessionStorageManager] error decoding JWT", token);
+      getLogger11().error("[sessionStorageManager] error decoding JWT", token);
     }
     roomName = "";
   }
@@ -1593,7 +1637,7 @@ var JWTSession = class extends BaseJWTSession {
       });
     } catch (e) {
       if (process.env.NODE_ENV !== "production") {
-        getLogger6().debug("[JWTSession] error decoding the JWT");
+        getLogger12().debug("[JWTSession] error decoding the JWT");
       }
     }
     super(__spreadProps(__spreadValues({}, options), {
@@ -1602,7 +1646,7 @@ var JWTSession = class extends BaseJWTSession {
     this.options = options;
     __publicField(this, "WebSocketConstructor", WebSocket);
     __publicField(this, "CloseEventConstructor", SwCloseEvent);
-    __publicField(this, "agent", "@signalwire/js/browser/3.23.3");
+    __publicField(this, "agent", "@signalwire/js/browser/3.23.4");
     __publicField(this, "tokenTyp");
     this.tokenTyp = (_a = decodedJwt.typ) != null ? _a : "VRT";
   }
@@ -1732,7 +1776,7 @@ var createRoomObject = (roomOptions) => {
         rootElement = el;
       } else {
         rootElement = document.body;
-        getLogger7().warn(`We couldn't find an element with id: ${rootElementId}: using 'document.body' instead.`);
+        getLogger13().warn(`We couldn't find an element with id: ${rootElementId}: using 'document.body' instead.`);
       }
     }
     const roomObject = client.rooms.makeRoomObject({
@@ -1759,7 +1803,7 @@ var createRoomObject = (roomOptions) => {
           });
           await roomObject.join();
         } catch (error) {
-          getLogger7().error("Join", error);
+          getLogger13().error("Join", error);
           client.disconnect();
           reject2(error);
         }
@@ -1795,11 +1839,11 @@ var joinRoom = (roomOptions) => {
 
 // src/RoomSession.ts
 import {
-  getLogger as getLogger9
+  getLogger as getLogger15
 } from "@signalwire/core";
 
 // src/utils/roomSession.ts
-import { getLogger as getLogger8 } from "@signalwire/core";
+import { getLogger as getLogger14 } from "@signalwire/core";
 var getJoinMediaParams = (options) => {
   const {
     authState,
@@ -1810,7 +1854,7 @@ var getJoinMediaParams = (options) => {
     receiveAudio,
     receiveVideo
   } = options;
-  getLogger8().debug("getJoinMediaParams options", __spreadValues({}, options));
+  getLogger14().debug("getJoinMediaParams options", __spreadValues({}, options));
   const { audio_allowed, video_allowed, join_as } = authState;
   const joinAs = join_as != null ? join_as : "member";
   const canSend = joinAs === "member";
@@ -1823,16 +1867,16 @@ var getJoinMediaParams = (options) => {
   const reqToReceiveAudio = Boolean(receiveAudio != null ? receiveAudio : audio);
   const reqToReceiveVideo = Boolean(receiveVideo != null ? receiveVideo : video);
   if (!canSendAudio && reqToSendAudio) {
-    getLogger8().info("Not allowed to send audio on this room. Default values will be used.");
+    getLogger14().info("Not allowed to send audio on this room. Default values will be used.");
   }
   if (!canSendVideo && reqToSendVideo) {
-    getLogger8().info("Not allowed to send video on this room. Default values will be used.");
+    getLogger14().info("Not allowed to send video on this room. Default values will be used.");
   }
   if (!canReceiveAudio && reqToReceiveAudio) {
-    getLogger8().info("Not allowed to receive video from the room. Default values will be used.");
+    getLogger14().info("Not allowed to receive video from the room. Default values will be used.");
   }
   if (!canReceiveVideo && reqToReceiveVideo) {
-    getLogger8().info("Not allowed to receive video from the room. Default values will be used.");
+    getLogger14().info("Not allowed to receive video from the room. Default values will be used.");
   }
   return {
     mustSendAudio: canSendAudio && reqToSendAudio,
@@ -1882,7 +1926,9 @@ var UNSAFE_PROP_ACCESS = [
   "updateMemberMeta",
   "deleteMemberMeta",
   "promote",
-  "demote"
+  "demote",
+  "lock",
+  "unlock"
 ];
 var REQUIRED_EVENTS = [
   "member.joined",
@@ -1923,7 +1969,7 @@ var RoomSession = function(roomOptions) {
   const deprecatedParams = ["audio", "video"];
   deprecatedParams.forEach((param) => {
     if (param in roomOptions) {
-      getLogger9().warn(`The '${param}' parameter on the RoomSession constructor is deprecated. Set it on the '.join()' function instead.`);
+      getLogger15().warn(`The '${param}' parameter on the RoomSession constructor is deprecated. Set it on the '.join()' function instead.`);
     }
   });
   const allowReattach = (roomOptions == null ? void 0 : roomOptions.reattach) !== false;
@@ -1981,7 +2027,7 @@ var RoomSession = function(roomOptions) {
     reattachManager.destroy();
     client.disconnect();
   });
-  client.once("session.disconnected", () => {
+  client.session.once("session.disconnected", () => {
     room.destroy();
   });
   const join = (params) => {
@@ -1993,7 +2039,7 @@ var RoomSession = function(roomOptions) {
         const audio = (_a2 = params == null ? void 0 : params.audio) != null ? _a2 : audioFromConstructor;
         const video = (_b = params == null ? void 0 : params.video) != null ? _b : videoFromConstructor;
         const authState = client._sessionAuthState;
-        getLogger9().debug("getJoinMediaParams authState?", authState);
+        getLogger15().debug("getJoinMediaParams authState?", authState);
         if (authState && authState.type === "video") {
           const mediaOptions = getJoinMediaParams(__spreadValues({
             authState,
@@ -2006,7 +2052,7 @@ var RoomSession = function(roomOptions) {
 ${JSON.stringify(params, null, 2)}
 `));
           }
-          getLogger9().debug("Set mediaOptions", mediaOptions);
+          getLogger15().debug("Set mediaOptions", mediaOptions);
           room.updateMediaOptions({
             audio: mediaOptions.mustSendAudio ? audio || true : false,
             video: mediaOptions.mustSendVideo ? video || true : false,
@@ -2014,15 +2060,14 @@ ${JSON.stringify(params, null, 2)}
             negotiateVideo: mediaOptions.mustRecvVideo
           });
         }
-        room.once("room.subscribed", (payload) => {
-          room.attachOnSubscribedWorkers(payload);
+        room.once("room.subscribed", () => {
           resolve(room);
         });
         reattachManager.init();
         REQUIRED_EVENTS.forEach((event) => room.once(event, noop2));
         await room.join();
       } catch (error) {
-        getLogger9().error("RoomSession Join", error);
+        getLogger15().error("RoomSession Join", error);
         client.disconnect();
         reject(error);
       }
@@ -2204,29 +2249,29 @@ var SWClient = class {
 };
 
 // src/fabric/WSClient.ts
-import { getLogger as getLogger11, VertoSubscribe } from "@signalwire/core";
+import { getLogger as getLogger17, VertoSubscribe } from "@signalwire/core";
 
 // src/fabric/WSClientWorker.ts
 import {
-  getLogger as getLogger10,
+  getLogger as getLogger16,
   sagaEffects as sagaEffects6
 } from "@signalwire/core";
 var WSClientWorker = function* (options) {
-  getLogger10().debug("WSClientWorker started");
+  getLogger16().debug("WSClientWorker started");
   const { channels, instance } = options;
   const { swEventChannel } = channels;
-  getLogger10().debug("WSClientWorker instance", instance);
+  getLogger16().debug("WSClientWorker instance", instance);
   while (true) {
     const action = yield sagaEffects6.take(swEventChannel, (action2) => {
-      getLogger10().debug("WSClientWorker action", action2);
+      getLogger16().debug("WSClientWorker action", action2);
       if (action2.type === "webrtc.message") {
         return action2.payload.method === "verto.invite";
       }
       return false;
     });
-    getLogger10().debug("Build new call to answer", action);
+    getLogger16().debug("Build new call to answer", action);
   }
-  getLogger10().trace("WSClientWorker ended");
+  getLogger16().trace("WSClientWorker ended");
 };
 
 // src/fabric/WSClient.ts
@@ -2234,7 +2279,7 @@ var WSClient = class {
   constructor(options) {
     this.options = options;
     __publicField(this, "wsClient");
-    __publicField(this, "logger", getLogger11());
+    __publicField(this, "logger", getLogger17());
     this.wsClient = createClient({
       host: this.options.host,
       token: this.options.token,
@@ -2279,18 +2324,18 @@ var WSClient = class {
         call.start = () => {
           return new Promise(async (resolve2, reject2) => {
             try {
-              call.emitter.once("verto.display", () => resolve2(call));
+              call.once("verto.display", () => resolve2(call));
               call.once("room.subscribed", () => resolve2(call));
               await call.join();
             } catch (error) {
-              getLogger11().error("WSClient call start", error);
+              getLogger17().error("WSClient call start", error);
               reject2(error);
             }
           });
         };
         resolve(call);
       } catch (error) {
-        getLogger11().error("WSClient dial", error);
+        getLogger17().error("WSClient dial", error);
         reject(error);
       }
     });
@@ -2344,10 +2389,10 @@ var WSClient = class {
           nodeId
         });
         call.once("destroy", () => {
-          getLogger11().debug("RTC Connection Destroyed");
+          getLogger17().debug("RTC Connection Destroyed");
         });
         call.attachPreConnectWorkers();
-        getLogger11().debug("Resolving Call", call);
+        getLogger17().debug("Resolving Call", call);
         resolve({ resultType: "inboundCall", resultObject: call });
       } catch (error) {
         reject(error);