@signalwire/js 3.26.0 → 3.27.0-dev.202404301530.94a97d7.0

package/dist/index.js

@@ -87,127 +87,26 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// src/fabric/index.ts
-var fabric_exports = {};
-__export(fabric_exports, {
-  Client: () => Client2,
-  SWClient: () => SWClient,
-  SignalWire: () => SignalWire,
-  WSClient: () => WSClient
-});
-
-// src/fabric/createHttpClient.ts
-var import_core = require("@signalwire/core");
-function http(input, init) {
-  return __async(this, null, function* () {
-    const response = yield fetch(input, init);
-    if (!response.ok) {
-      if (response.status === 401) {
-        throw new import_core.AuthError(response.status, "Unauthorized");
-      }
-      let errorResponse;
-      try {
-        errorResponse = yield response.json();
-      } catch (e) {
-      }
-      const errorMessage = (errorResponse == null ? void 0 : errorResponse.errors) ? JSON.stringify(errorResponse.errors) : "Not Found";
-      throw new import_core.HttpError(response.status, errorMessage, errorResponse);
-    }
-    try {
-      response.parsedBody = yield response.json();
-    } catch (e) {
-    }
-    return response;
-  });
-}
-var createHttpClient = (_a, fetcher = http) => {
-  var _b = _a, { baseUrl, timeout = 3e4 } = _b, globalOptions = __objRest(_b, ["baseUrl", "timeout"]);
-  const apiClient = (path, options) => __async(void 0, null, function* () {
-    const headers = __spreadValues(__spreadValues(__spreadValues({}, (options == null ? void 0 : options.body) ? { "Content-Type": "application/json" } : {}), globalOptions.headers), options == null ? void 0 : options.headers);
-    const reqInit = getRequestInit(__spreadProps(__spreadValues(__spreadValues({}, globalOptions), options), {
-      headers
-    }));
-    let timerId;
-    if (timeout) {
-      const controller = new AbortController();
-      const signal = controller.signal;
-      reqInit.signal = signal;
-      timerId = setTimeout(() => {
-        controller.abort();
-      }, timeout);
-    }
-    try {
-      const response = yield fetcher(getUrl({
-        path,
-        baseUrl,
-        searchParams: options == null ? void 0 : options.searchParams
-      }), reqInit);
-      return { body: response.parsedBody };
-    } catch (e) {
-      throw e;
-    } finally {
-      timerId && clearTimeout(timerId);
-    }
-  });
-  return apiClient;
-};
-var getBody = (body) => {
-  return typeof body === "string" ? body : JSON.stringify(body);
-};
-var getRequestInit = (options) => {
-  return Object.entries(options).reduce((reducer, [key, value]) => {
-    if (key === "body") {
-      return __spreadProps(__spreadValues({}, reducer), {
-        body: getBody(value)
-      });
-    } else if (value != void 0) {
-      return __spreadProps(__spreadValues({}, reducer), {
-        [key]: value
-      });
-    }
-    return reducer;
-  }, {});
-};
-var getUrl = ({
-  path,
-  baseUrl,
-  searchParams
-}) => {
-  const url = new URL(path, baseUrl);
-  if (searchParams) {
-    Object.entries(searchParams).forEach(([key, value]) => {
-      if (value != void 0) {
-        url.searchParams.append(key, value);
-      }
-    });
-  }
-  return url.toString();
-};
-
-// src/video.ts
-var video_exports = {};
-__export(video_exports, {
-  RoomSession: () => RoomSession,
-  createClient: () => createClient,
-  createRoomObject: () => createRoomObject,
-  joinRoom: () => joinRoom
+// src/chat/index.ts
+var chat_exports = {};
+__export(chat_exports, {
+  ChatMember: () => import_core36.ChatMember,
+  ChatMessage: () => import_core36.ChatMessage,
+  Client: () => Client2
 });
 
-// src/createRoomObject.ts
-var import_core23 = require("@signalwire/core");
-
 // src/createClient.ts
-var import_core22 = require("@signalwire/core");
+var import_core35 = require("@signalwire/core");
 
 // src/Client.ts
-var import_core18 = require("@signalwire/core");
+var import_core34 = require("@signalwire/core");
 
 // src/features/mediaElements/mediaElementsSagas.ts
-var import_core4 = require("@signalwire/core");
+var import_core3 = require("@signalwire/core");
 var import_webrtc = require("@signalwire/webrtc");
 
 // src/utils/videoElement.ts
-var import_core2 = require("@signalwire/core");
+var import_core = require("@signalwire/core");
 var addSDKPrefix = (input) => {
   return `sw-sdk-${input}`;
 };
@@ -218,7 +117,7 @@ var buildVideo = () => {
   video.playsInline = true;
   video.addEventListener("pause", () => {
     video.play().catch((error) => {
-      (0, import_core2.getLogger)().error("Video Element Paused", video, error);
+      (0, import_core.getLogger)().error("Video Element Paused", video, error);
     });
   });
   return video;
@@ -260,22 +159,22 @@ var _buildLayer = ({ location }) => {
   return layer;
 };
 var makeLayoutChangedHandler = ({ localOverlay, rootElement }) => (_0) => __async(void 0, [_0], function* ({ layout, myMemberId, localStream }) {
-  (0, import_core2.getLogger)().debug("Process layout.changed");
+  (0, import_core.getLogger)().debug("Process layout.changed");
   try {
     const { layers = [] } = layout;
     const location = layers.find(({ member_id }) => member_id === myMemberId);
     let myLayer = localOverlay.domElement;
     localOverlay.status = location ? "visible" : "hidden";
     if (!location) {
-      (0, import_core2.getLogger)().debug("Location not found");
+      (0, import_core.getLogger)().debug("Location not found");
       if (myLayer) {
-        (0, import_core2.getLogger)().debug("Current layer not visible");
+        (0, import_core.getLogger)().debug("Current layer not visible");
         localOverlay.hide();
       }
       return;
     }
     if (!myLayer) {
-      (0, import_core2.getLogger)().debug("Build myLayer");
+      (0, import_core.getLogger)().debug("Build myLayer");
       myLayer = _buildLayer({ location });
       myLayer.id = localOverlay.id;
       const localVideo = buildVideo();
@@ -289,17 +188,17 @@ var makeLayoutChangedHandler = ({ localOverlay, rootElement }) => (_0) => __asyn
       const mcuLayers = rootElement.querySelector(".mcuLayers");
       const exists = mcuLayers == null ? void 0 : mcuLayers.querySelector(`#${myLayer.id}`);
       if (mcuLayers && !exists) {
-        (0, import_core2.getLogger)().debug("Build myLayer append it");
+        (0, import_core.getLogger)().debug("Build myLayer append it");
         mcuLayers.appendChild(myLayer);
         localOverlay.domElement = myLayer;
         localOverlay.setLocalOverlayMirror();
         return;
       }
-      (0, import_core2.getLogger)().debug("Build myLayer >> wait next");
+      (0, import_core.getLogger)().debug("Build myLayer >> wait next");
       return;
     }
     const { top, left, width, height } = _getLocationStyles(location);
-    (0, import_core2.getLogger)().debug("Update myLayer:", top, left, width, height);
+    (0, import_core.getLogger)().debug("Update myLayer:", top, left, width, height);
     const hasVideo = localStream.getVideoTracks().filter((t) => t.enabled && t.readyState === "live").length > 0;
     if (hasVideo) {
       localOverlay.setLocalOverlayMediaStream(localStream);
@@ -310,7 +209,7 @@ var makeLayoutChangedHandler = ({ localOverlay, rootElement }) => (_0) => __asyn
     myLayer.style.width = width;
     myLayer.style.height = height;
   } catch (error) {
-    (0, import_core2.getLogger)().error("Layout Changed Error", error);
+    (0, import_core.getLogger)().error("Layout Changed Error", error);
   }
 });
 var cleanupElement = (rootElement) => {
@@ -328,46 +227,6 @@ var setVideoMediaTrack = ({
     element.remove();
   });
 };
-var createRootElementResizeObserver = ({
-  video,
-  rootElement,
-  paddingWrapper
-}) => {
-  const computePaddingWrapperWidth = (width, height) => {
-    const nativeVideoRatio = video.videoWidth / video.videoHeight;
-    const rootElementRatio = width / height;
-    if (nativeVideoRatio > rootElementRatio) {
-      return "100%";
-    } else {
-      return `${height * nativeVideoRatio}px`;
-    }
-  };
-  const maxPaddingBottom = video.videoHeight / video.videoWidth * 100;
-  const update = (0, import_core2.debounce)(({ width, height }) => {
-    if (paddingWrapper) {
-      const pb = height / width * 100;
-      paddingWrapper.style.paddingBottom = `${pb > maxPaddingBottom ? maxPaddingBottom : pb}%`;
-      paddingWrapper.style.width = computePaddingWrapperWidth(width, height);
-    }
-  }, 100);
-  const observer = new ResizeObserver((entries) => {
-    entries.forEach((entry) => {
-      if (entry.contentBoxSize) {
-        const { inlineSize, blockSize } = Array.isArray(entry.contentBoxSize) ? entry.contentBoxSize[0] : entry.contentBoxSize;
-        update({ width: inlineSize, height: blockSize });
-      } else if (entry.contentRect) {
-        update({
-          width: entry.contentRect.width,
-          height: entry.contentRect.height
-        });
-      }
-    });
-  });
-  return {
-    start: () => observer.observe(rootElement),
-    stop: () => observer.disconnect()
-  };
-};
 
 // src/utils/audioElement.ts
 var setAudioMediaTrack = ({
@@ -385,8 +244,46 @@ var setAudioMediaTrack = ({
 };
 
 // src/features/actions.ts
-var import_core3 = require("@signalwire/core");
-var audioSetSpeakerAction = import_core3.actions.createAction("swJs/audioSetSpeakerAction");
+var import_core2 = require("@signalwire/core");
+var audioSetSpeakerAction = import_core2.actions.createAction("swJs/audioSetSpeakerAction");
+
+// src/utils/aspectRatioListener.ts
+var VIDEO_SIZING_EVENTS = ["loadedmetadata", "resize"];
+function aspectRatioListener({ videoElement, paddingWrapper, fixInLandscapeOrientation = false, debugDivElementId = "videoDimensionsDebug", samplingInterval = 0 }) {
+  const buildHtmlContent = (event, width, height) => `Video dimensions on <strong>${event} event</strong>:</strong> ${width}x${height}px - fixInLandscapeOrientation: ${fixInLandscapeOrientation}`;
+  const appendDebugInfo = (containerElement, event) => {
+    const pEl = document.createElement("p");
+    pEl.innerHTML = buildHtmlContent(event, videoElement.videoWidth, videoElement.videoHeight);
+    containerElement.appendChild(pEl);
+  };
+  let debugElement;
+  try {
+    debugElement = document.getElementById(debugDivElementId);
+  } catch (e) {
+  }
+  VIDEO_SIZING_EVENTS.forEach((event) => videoElement.addEventListener(event, () => {
+    const paddingBottom = fixInLandscapeOrientation ? "56.25" : videoElement.videoHeight / videoElement.videoWidth * 100;
+    paddingWrapper.style.paddingBottom = `${paddingBottom}%`;
+    if (debugElement) {
+      appendDebugInfo(debugElement, event);
+    }
+  }));
+  if (samplingInterval > 0) {
+    setInterval(() => {
+      const paddingBottom = videoElement.videoHeight / videoElement.videoWidth * 100;
+      paddingWrapper.style.paddingBottom = `${paddingBottom}%`;
+      if (debugElement) {
+        let statsElement = debugElement.querySelector(".timer-values");
+        if (!statsElement) {
+          statsElement = document.createElement("div");
+          statsElement.className = "timer-values";
+          debugElement.appendChild(statsElement);
+        }
+        appendDebugInfo(debugElement, "timer");
+      }
+    });
+  }
+}
 
 // src/features/mediaElements/mediaElementsSagas.ts
 var makeVideoElementSaga = ({
@@ -410,31 +307,31 @@ var makeVideoElementSaga = ({
         },
         set domElement(element) {
           if (element) {
-            (0, import_core4.getLogger)().debug("Set localOverlay", element);
+            (0, import_core3.getLogger)().debug("Set localOverlay", element);
             layerMap.set(this.id, element);
           } else {
-            (0, import_core4.getLogger)().debug("Remove localOverlay");
+            (0, import_core3.getLogger)().debug("Remove localOverlay");
             layerMap.delete(this.id);
           }
         },
         hide() {
           if (!this.domElement) {
-            return (0, import_core4.getLogger)().warn("Missing localOverlay to hide");
+            return (0, import_core3.getLogger)().warn("Missing localOverlay to hide");
           }
           this.domElement.style.opacity = "0";
         },
         show() {
           if (!this.domElement) {
-            return (0, import_core4.getLogger)().warn("Missing localOverlay to show");
+            return (0, import_core3.getLogger)().warn("Missing localOverlay to show");
           }
           if (this.status === "hidden") {
-            return (0, import_core4.getLogger)().info("localOverlay not visible");
+            return (0, import_core3.getLogger)().info("localOverlay not visible");
           }
           this.domElement.style.opacity = "1";
         },
         setLocalOverlayMediaStream(stream) {
           if (!this.domElement) {
-            return (0, import_core4.getLogger)().warn("Missing localOverlay to set the local overlay stream");
+            return (0, import_core3.getLogger)().warn("Missing localOverlay to set the local overlay stream");
           }
           const localVideo = this.domElement.querySelector("video");
           if (localVideo) {
@@ -443,7 +340,7 @@ var makeVideoElementSaga = ({
         },
         setLocalOverlayMirror(mirror) {
           if (!this.domElement || !this.domElement.firstChild) {
-            return (0, import_core4.getLogger)().warn("Missing localOverlay to set the mirror");
+            return (0, import_core3.getLogger)().warn("Missing localOverlay to set the mirror");
           }
           const videoEl2 = this.domElement.firstChild;
           if (mirror != null ? mirror : room.localOverlay.mirrored) {
@@ -473,11 +370,11 @@ var makeVideoElementSaga = ({
           localOverlay.hide();
         }
       };
-      room.on(`${import_core4.LOCAL_EVENT_PREFIX}.mirror.video`, (value) => {
+      room.on(`${import_core3.LOCAL_EVENT_PREFIX}.mirror.video`, (value) => {
         localOverlay.setLocalOverlayMirror(value);
       });
       room.on("layout.changed", (params) => {
-        (0, import_core4.getLogger)().debug("Received layout.changed - videoTrack", hasVideoTrack);
+        (0, import_core3.getLogger)().debug("Received layout.changed - videoTrack", hasVideoTrack);
         if (hasVideoTrack) {
           _processLayoutChanged(params);
           return;
@@ -491,14 +388,14 @@ var makeVideoElementSaga = ({
           try {
             room.stopOutboundAudio();
           } catch (error) {
-            (0, import_core4.getLogger)().error("Error handling audio_muted", error);
+            (0, import_core3.getLogger)().error("Error handling audio_muted", error);
           }
         }
         if (member == null ? void 0 : member.video_muted) {
           try {
             room.stopOutboundVideo();
           } catch (error) {
-            (0, import_core4.getLogger)().error("Error handling video_muted", error);
+            (0, import_core3.getLogger)().error("Error handling video_muted", error);
           }
         }
         if (room.localStream) {
@@ -512,7 +409,7 @@ var makeVideoElementSaga = ({
             member.video_muted ? localOverlay.hide() : localOverlay.show();
           }
         } catch (error) {
-          (0, import_core4.getLogger)().error("Error handling video_muted", error);
+          (0, import_core3.getLogger)().error("Error handling video_muted", error);
         }
       });
       let videoTask;
@@ -540,7 +437,7 @@ var makeVideoElementSaga = ({
         videoTask == null ? void 0 : videoTask.cancel();
       });
     } catch (error) {
-      (0, import_core4.getLogger)().error("videoElementSaga", error);
+      (0, import_core3.getLogger)().error("videoElementSaga", error);
     }
   };
 };
@@ -550,7 +447,7 @@ var makeAudioElementSaga = ({ speakerId }) => {
     runSaga
   }) {
     if (typeof Audio === "undefined") {
-      (0, import_core4.getLogger)().warn("`Audio` is not supported on this environment.");
+      (0, import_core3.getLogger)().warn("`Audio` is not supported on this environment.");
       return;
     }
     try {
@@ -574,7 +471,7 @@ var makeAudioElementSaga = ({ speakerId }) => {
         audioTask == null ? void 0 : audioTask.cancel();
       });
     } catch (error) {
-      (0, import_core4.getLogger)().error("audioElementSaga", error);
+      (0, import_core3.getLogger)().error("audioElementSaga", error);
     }
   };
 };
@@ -582,14 +479,14 @@ function* audioElementActionsWatcher({
   element,
   room
 }) {
-  const setSpeakerActionType = import_core4.actions.getCustomSagaActionType(room.__uuid, audioSetSpeakerAction);
+  const setSpeakerActionType = import_core3.actions.getCustomSagaActionType(room.__uuid, audioSetSpeakerAction);
   while (true) {
-    const action = yield import_core4.sagaEffects.take([setSpeakerActionType]);
+    const action = yield import_core3.sagaEffects.take([setSpeakerActionType]);
     try {
       switch (action.type) {
         case setSpeakerActionType:
-          const response = yield import_core4.sagaEffects.call(import_webrtc.setMediaElementSinkId, element, action.payload);
-          room.emit(`${import_core4.LOCAL_EVENT_PREFIX}.speaker.updated`, action.payload);
+          const response = yield import_core3.sagaEffects.call(import_webrtc.setMediaElementSinkId, element, action.payload);
+          room.emit(`${import_core3.LOCAL_EVENT_PREFIX}.speaker.updated`, action.payload);
           room.settleCustomSagaTrigger({
             dispatchId: action.dispatchId,
             payload: response,
@@ -603,7 +500,7 @@ function* audioElementActionsWatcher({
         payload: error,
         kind: "reject"
       });
-      (0, import_core4.getLogger)().error(error);
+      (0, import_core3.getLogger)().error(error);
     }
   }
 }
@@ -618,7 +515,7 @@ function* audioElementSetupWorker({
     (0, import_webrtc.setMediaElementSinkId)(element, speakerId).catch(() => {
     });
   }
-  yield import_core4.sagaEffects.fork(audioElementActionsWatcher, {
+  yield import_core3.sagaEffects.fork(audioElementActionsWatcher, {
     element,
     room
   });
@@ -638,7 +535,7 @@ function* videoElementSetupWorker({
       return;
     }
     if (rootElement.querySelector(".mcuContent")) {
-      (0, import_core4.getLogger)().debug("MCU Content already there");
+      (0, import_core3.getLogger)().debug("MCU Content already there");
       return;
     }
     const mcuWrapper = document.createElement("div");
@@ -650,10 +547,14 @@ function* videoElementSetupWorker({
     mcuWrapper.appendChild(element);
     const paddingWrapper = document.createElement("div");
     paddingWrapper.classList.add("paddingWrapper");
-    paddingWrapper.style.paddingBottom = "56.25%";
     paddingWrapper.style.position = "relative";
     paddingWrapper.style.width = "100%";
     paddingWrapper.appendChild(mcuWrapper);
+    aspectRatioListener({
+      videoElement: element,
+      paddingWrapper,
+      fixInLandscapeOrientation: rootElement.classList.contains("landscape-only")
+    });
     const layersWrapper = document.createElement("div");
     layersWrapper.classList.add("mcuLayers");
     layersWrapper.style.display = "none";
@@ -671,31 +572,20 @@ function* videoElementSetupWorker({
     rootElement.style.width = "100%";
     rootElement.style.height = "100%";
     rootElement.appendChild(relativeWrapper);
-    (0, import_core4.getLogger)().debug("MCU readyState 1 >>", element.readyState);
+    (0, import_core3.getLogger)().debug("MCU readyState 1 >>", element.readyState);
     if (element.readyState === HTMLMediaElement.HAVE_NOTHING) {
-      (0, import_core4.getLogger)().debug("Wait for the MCU to be ready");
-      yield import_core4.sagaEffects.call(waitForVideoReady, { element });
+      (0, import_core3.getLogger)().debug("Wait for the MCU to be ready");
+      yield import_core3.sagaEffects.call(waitForVideoReady, { element });
     }
-    (0, import_core4.getLogger)().debug("MCU is ready..");
-    const rootElementResizeObserver = createRootElementResizeObserver({
-      rootElement,
-      video: element,
-      paddingWrapper
-    });
-    rootElementResizeObserver.start();
-    track.addEventListener("ended", () => {
-      if (rootElementResizeObserver) {
-        rootElementResizeObserver.stop();
-      }
-    });
+    (0, import_core3.getLogger)().debug("MCU is ready..");
     layersWrapper.style.display = "block";
   } catch (error) {
-    (0, import_core4.getLogger)().error("Handle video track error", error);
+    (0, import_core3.getLogger)().error("Handle video track error", error);
   }
 }
 
 // src/BaseRoomSession.ts
-var import_core13 = require("@signalwire/core");
+var import_core14 = require("@signalwire/core");
 var import_webrtc4 = require("@signalwire/webrtc");
 
 // src/utils/constants.ts
@@ -707,7 +597,7 @@ var SCREENSHARE_AUDIO_CONSTRAINTS = {
 };
 
 // src/RoomSessionScreenShare.ts
-var import_core5 = require("@signalwire/core");
+var import_core4 = require("@signalwire/core");
 var import_webrtc2 = require("@signalwire/webrtc");
 var RoomSessionScreenShareConnection = class extends import_webrtc2.BaseConnection {
   join() {
@@ -717,18 +607,18 @@ var RoomSessionScreenShareConnection = class extends import_webrtc2.BaseConnecti
     return super.hangup();
   }
 };
-var RoomSessionScreenShareAPI = (0, import_core5.extendComponent)(RoomSessionScreenShareConnection, {
-  audioMute: import_core5.Rooms.audioMuteMember,
-  audioUnmute: import_core5.Rooms.audioUnmuteMember,
-  videoMute: import_core5.Rooms.videoMuteMember,
-  videoUnmute: import_core5.Rooms.videoUnmuteMember,
-  setMicrophoneVolume: import_core5.Rooms.setInputVolumeMember,
-  setInputVolume: import_core5.Rooms.setInputVolumeMember,
-  setInputSensitivity: import_core5.Rooms.setInputSensitivityMember
+var RoomSessionScreenShareAPI = (0, import_core4.extendComponent)(RoomSessionScreenShareConnection, {
+  audioMute: import_core4.Rooms.audioMuteMember,
+  audioUnmute: import_core4.Rooms.audioUnmuteMember,
+  videoMute: import_core4.Rooms.videoMuteMember,
+  videoUnmute: import_core4.Rooms.videoUnmuteMember,
+  setMicrophoneVolume: import_core4.Rooms.setInputVolumeMember,
+  setInputVolume: import_core4.Rooms.setInputVolumeMember,
+  setInputSensitivity: import_core4.Rooms.setInputSensitivityMember
 });
 
 // src/RoomSessionDevice.ts
-var import_core6 = require("@signalwire/core");
+var import_core5 = require("@signalwire/core");
 var import_webrtc3 = require("@signalwire/webrtc");
 var RoomSessionDeviceConnection = class extends import_webrtc3.BaseConnection {
   join() {
@@ -738,25 +628,25 @@ var RoomSessionDeviceConnection = class extends import_webrtc3.BaseConnection {
     return super.hangup();
   }
 };
-var RoomSessionDeviceAPI = (0, import_core6.extendComponent)(RoomSessionDeviceConnection, {
-  audioMute: import_core6.Rooms.audioMuteMember,
-  audioUnmute: import_core6.Rooms.audioUnmuteMember,
-  videoMute: import_core6.Rooms.videoMuteMember,
-  videoUnmute: import_core6.Rooms.videoUnmuteMember,
-  setInputVolume: import_core6.Rooms.setInputVolumeMember,
-  setMicrophoneVolume: import_core6.Rooms.setInputVolumeMember,
-  setInputSensitivity: import_core6.Rooms.setInputSensitivityMember
+var RoomSessionDeviceAPI = (0, import_core5.extendComponent)(RoomSessionDeviceConnection, {
+  audioMute: import_core5.Rooms.audioMuteMember,
+  audioUnmute: import_core5.Rooms.audioUnmuteMember,
+  videoMute: import_core5.Rooms.videoMuteMember,
+  videoUnmute: import_core5.Rooms.videoUnmuteMember,
+  setInputVolume: import_core5.Rooms.setInputVolumeMember,
+  setMicrophoneVolume: import_core5.Rooms.setInputVolumeMember,
+  setInputSensitivity: import_core5.Rooms.setInputSensitivityMember
 });
 
 // src/video/memberListUpdatedWorker.ts
-var import_core7 = require("@signalwire/core");
+var import_core6 = require("@signalwire/core");
 var noop = () => {
 };
 var EXTERNAL_MEMBER_LIST_UPDATED_EVENT = "memberList.updated";
-var INTERNAL_MEMBER_LIST_UPDATED_EVENT = (0, import_core7.toInternalEventName)({
+var INTERNAL_MEMBER_LIST_UPDATED_EVENT = (0, import_core6.toInternalEventName)({
   event: EXTERNAL_MEMBER_LIST_UPDATED_EVENT
 });
-var SYNTHETIC_MEMBER_LIST_UPDATED_EVENT = (0, import_core7.toSyntheticEvent)(INTERNAL_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",
@@ -767,7 +657,7 @@ var isMemberListEvent = (event) => {
   return MEMBER_LIST_EVENTS.includes(event);
 };
 var getMemberListEventsToSubscribe = (subscriptions) => {
-  return (0, import_core7.validateEventsToSubscribe)(MEMBER_LIST_EVENTS).filter((event) => {
+  return (0, import_core6.validateEventsToSubscribe)(MEMBER_LIST_EVENTS).filter((event) => {
     return !subscriptions.includes(event);
   });
 };
@@ -829,10 +719,10 @@ function* membersListUpdatedWatcher({
     instance.emit(SYNTHETIC_MEMBER_LIST_UPDATED_EVENT, memberListPayload);
   }
   while (true) {
-    const pubSubAction = yield import_core7.sagaEffects.take(swEventChannel, ({ type }) => {
+    const pubSubAction = yield import_core6.sagaEffects.take(swEventChannel, ({ type }) => {
       return isMemberListEvent(type);
     });
-    yield import_core7.sagaEffects.fork(worker, pubSubAction);
+    yield import_core6.sagaEffects.fork(worker, pubSubAction);
   }
 }
 var memberListUpdatedWorker = function* membersChangedWorker({
@@ -844,7 +734,7 @@ var memberListUpdatedWorker = function* membersChangedWorker({
     return;
   }
   const { cleanup } = initMemberListSubscriptions(instance, subscriptions);
-  yield import_core7.sagaEffects.fork(membersListUpdatedWatcher, {
+  yield import_core6.sagaEffects.fork(membersListUpdatedWatcher, {
     swEventChannel,
     instance
   });
@@ -854,16 +744,16 @@ var memberListUpdatedWorker = function* membersChangedWorker({
 };
 
 // src/video/childMemberJoinedWorker.ts
-var import_core8 = require("@signalwire/core");
+var import_core7 = require("@signalwire/core");
 var childMemberJoinedWorker = function* (options) {
-  (0, import_core8.getLogger)().trace("childMemberJoinedWorker started");
+  (0, import_core7.getLogger)().trace("childMemberJoinedWorker started");
   const { channels, instance, initialState, onDone, onFail } = options;
   const { swEventChannel } = channels;
   const { parentId } = initialState;
   if (!parentId) {
     throw new Error("Missing parentId for childMemberJoinedWorker");
   }
-  const action = yield import_core8.sagaEffects.take(swEventChannel, (action2) => {
+  const action = yield import_core7.sagaEffects.take(swEventChannel, (action2) => {
     if (action2.type === "video.member.joined") {
       return action2.payload.member.parent_id === parentId;
     }
@@ -871,12 +761,12 @@ var childMemberJoinedWorker = function* (options) {
   });
   const { member } = action.payload;
   if (member == null ? void 0 : member.parent_id) {
-    const byId = yield import_core8.sagaEffects.select(import_core8.componentSelectors.getComponentsById);
+    const byId = yield import_core7.sagaEffects.select(import_core7.componentSelectors.getComponentsById);
     const parent = Object.values(byId).find((row) => {
       return "memberId" in row && row.memberId === member.parent_id;
     });
     if (parent) {
-      yield import_core8.sagaEffects.put(import_core8.componentActions.upsert({
+      yield import_core7.sagaEffects.put(import_core7.componentActions.upsert({
         id: instance.callId,
         roomId: action.payload.room_id,
         roomSessionId: action.payload.room_session_id,
@@ -887,16 +777,16 @@ var childMemberJoinedWorker = function* (options) {
       onFail == null ? void 0 : onFail({ error: new Error("Unknown parent_id") });
     }
   }
-  (0, import_core8.getLogger)().trace("childMemberJoinedWorker ended");
+  (0, import_core7.getLogger)().trace("childMemberJoinedWorker ended");
 };
 
 // src/video/videoWorker.ts
-var import_core12 = require("@signalwire/core");
+var import_core11 = require("@signalwire/core");
 
 // src/video/videoStreamWorker.ts
-var import_core9 = require("@signalwire/core");
+var import_core8 = require("@signalwire/core");
 var videoStreamWorker = function* (options) {
-  (0, import_core9.getLogger)().trace("videoStreamWorker started");
+  (0, import_core8.getLogger)().trace("videoStreamWorker started");
   const {
     instance: roomSession,
     action: { type, payload },
@@ -904,7 +794,7 @@ var videoStreamWorker = function* (options) {
   } = options;
   let streamInstance = get(payload.stream.id);
   if (!streamInstance) {
-    streamInstance = import_core9.Rooms.createRoomSessionStreamObject({
+    streamInstance = import_core8.Rooms.createRoomSessionStreamObject({
       store: roomSession.store,
       payload
     });
@@ -921,16 +811,16 @@ var videoStreamWorker = function* (options) {
       remove(payload.stream.id);
       break;
     default:
-      (0, import_core9.getLogger)().warn(`Unknown video.stream event: "${type}"`);
+      (0, import_core8.getLogger)().warn(`Unknown video.stream event: "${type}"`);
       break;
   }
-  (0, import_core9.getLogger)().trace("videoStreamWorker ended");
+  (0, import_core8.getLogger)().trace("videoStreamWorker ended");
 };
 
 // src/video/videoRecordWorker.ts
-var import_core10 = require("@signalwire/core");
+var import_core9 = require("@signalwire/core");
 var videoRecordWorker = function* (options) {
-  (0, import_core10.getLogger)().trace("videoRecordWorker started");
+  (0, import_core9.getLogger)().trace("videoRecordWorker started");
   const {
     instance: roomSession,
     action: { type, payload },
@@ -938,7 +828,7 @@ var videoRecordWorker = function* (options) {
   } = options;
   let recordingInstance = get(payload.recording.id);
   if (!recordingInstance) {
-    recordingInstance = import_core10.Rooms.createRoomSessionRecordingObject({
+    recordingInstance = import_core9.Rooms.createRoomSessionRecordingObject({
       store: roomSession.store,
       payload
     });
@@ -946,7 +836,7 @@ var videoRecordWorker = function* (options) {
     recordingInstance.setPayload(payload);
   }
   set(payload.recording.id, recordingInstance);
-  const event = (0, import_core10.stripNamespacePrefix)(type);
+  const event = (0, import_core9.stripNamespacePrefix)(type);
   switch (type) {
     case "video.recording.started":
     case "video.recording.updated": {
@@ -958,16 +848,16 @@ var videoRecordWorker = function* (options) {
       remove(payload.recording.id);
       break;
     default:
-      (0, import_core10.getLogger)().warn(`Unknown video.stream event: "${type}"`);
+      (0, import_core9.getLogger)().warn(`Unknown video.stream event: "${type}"`);
       break;
   }
-  (0, import_core10.getLogger)().trace("videoRecordWorker ended");
+  (0, import_core9.getLogger)().trace("videoRecordWorker ended");
 };
 
 // src/video/videoPlaybackWorker.ts
-var import_core11 = require("@signalwire/core");
+var import_core10 = require("@signalwire/core");
 var videoPlaybackWorker = function* (options) {
-  (0, import_core11.getLogger)().trace("videoPlaybackWorker started");
+  (0, import_core10.getLogger)().trace("videoPlaybackWorker started");
   const {
     instance: roomSession,
     action: { type, payload },
@@ -975,7 +865,7 @@ var videoPlaybackWorker = function* (options) {
   } = options;
   let playbackInstance = get(payload.playback.id);
   if (!playbackInstance) {
-    playbackInstance = import_core11.Rooms.createRoomSessionPlaybackObject({
+    playbackInstance = import_core10.Rooms.createRoomSessionPlaybackObject({
       store: roomSession.store,
       payload
     });
@@ -983,7 +873,7 @@ var videoPlaybackWorker = function* (options) {
     playbackInstance.setPayload(payload);
   }
   set(payload.playback.id, playbackInstance);
-  const event = (0, import_core11.stripNamespacePrefix)(type);
+  const event = (0, import_core10.stripNamespacePrefix)(type);
   switch (type) {
     case "video.playback.started":
     case "video.playback.updated": {
@@ -995,21 +885,22 @@ var videoPlaybackWorker = function* (options) {
       remove(payload.playback.id);
       break;
     default:
-      (0, import_core11.getLogger)().warn(`Unknown video.stream event: "${type}"`);
+      (0, import_core10.getLogger)().warn(`Unknown video.stream event: "${type}"`);
       break;
   }
-  (0, import_core11.getLogger)().trace("videoPlaybackWorker ended");
+  (0, import_core10.getLogger)().trace("videoPlaybackWorker ended");
 };
 
 // src/video/videoWorker.ts
 var videoWorker = function* (options) {
+  (0, import_core11.getLogger)().trace("videoWorker started");
   const { channels, instance: roomSession } = options;
   const { swEventChannel } = channels;
   function* worker(action) {
     const { type, payload } = action;
     switch (type) {
       case "video.room.subscribed":
-        yield import_core12.sagaEffects.spawn(import_core12.MemberPosition.memberPositionWorker, __spreadProps(__spreadValues({}, options), {
+        yield import_core11.sagaEffects.spawn(import_core11.MemberPosition.memberPositionWorker, __spreadProps(__spreadValues({}, options), {
           instance: roomSession,
           initialState: payload
         }));
@@ -1017,20 +908,20 @@ var videoWorker = function* (options) {
       case "video.playback.started":
       case "video.playback.updated":
       case "video.playback.ended":
-        yield import_core12.sagaEffects.fork(videoPlaybackWorker, __spreadValues({
+        yield import_core11.sagaEffects.fork(videoPlaybackWorker, __spreadValues({
           action
         }, options));
         return;
       case "video.recording.started":
       case "video.recording.updated":
       case "video.recording.ended":
-        yield import_core12.sagaEffects.fork(videoRecordWorker, __spreadValues({
+        yield import_core11.sagaEffects.fork(videoRecordWorker, __spreadValues({
           action
         }, options));
         return;
       case "video.stream.ended":
       case "video.stream.started":
-        yield import_core12.sagaEffects.fork(videoStreamWorker, __spreadValues({
+        yield import_core11.sagaEffects.fork(videoStreamWorker, __spreadValues({
           action
         }, options));
         return;
@@ -1051,16 +942,82 @@ var videoWorker = function* (options) {
       default:
         break;
     }
-    roomSession.emit((0, import_core12.stripNamespacePrefix)(type), payload);
+    const event = (0, import_core11.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);
-    yield import_core12.sagaEffects.fork(worker, action);
+    const action = yield import_core11.sagaEffects.take(swEventChannel, isVideoOrCallEvent);
+    yield import_core11.sagaEffects.fork(worker, action);
+  }
+  (0, import_core11.getLogger)().trace("videoWorker ended");
+};
+
+// src/video/videoMemberWorker.ts
+var import_core12 = require("@signalwire/core");
+var videoMemberWorker = function* (options) {
+  var _a, _b;
+  (0, import_core12.getLogger)().trace("videoMemberWorker started");
+  const {
+    instance: roomSession,
+    callSegments,
+    action: { type, payload },
+    instanceMap: { get, set, remove }
+  } = options;
+  const memberId = ((_a = payload.member) == null ? void 0 : _a.id) || ((_b = payload.member) == null ? void 0 : _b.member_id);
+  let memberInstance = get(memberId);
+  if (!memberInstance) {
+    memberInstance = import_core12.Rooms.createRoomSessionMemberObject({
+      store: roomSession.store,
+      payload
+    });
+  } else {
+    memberInstance.setPayload(payload);
+  }
+  set(memberId, memberInstance);
+  let newPayload = __spreadValues({}, payload);
+  const currentCallSegment = callSegments[callSegments.length - 1];
+  if (payload.member.member_id === currentCallSegment.memberId) {
+    newPayload = __spreadProps(__spreadValues({}, payload), {
+      member: __spreadProps(__spreadValues({}, payload.member), {
+        id: roomSession.callSegments[0].memberId,
+        member_id: roomSession.callSegments[0].memberId
+      })
+    });
+  }
+  const event = (0, import_core12.stripNamespacePrefix)(type);
+  if (type.startsWith("video.member.updated.")) {
+    roomSession.emit(event, newPayload);
+  }
+  switch (type) {
+    case "video.member.joined":
+    case "video.member.updated":
+      roomSession.emit(event, newPayload);
+      break;
+    case "video.member.left":
+      roomSession.emit(event, newPayload);
+      remove(memberId);
+      break;
+    case "video.member.talking":
+      roomSession.emit(event, newPayload);
+      if ("talking" in payload.member) {
+        const suffix = payload.member.talking ? "started" : "ended";
+        roomSession.emit(`${event}.${suffix}`, newPayload);
+        const deprecatedSuffix = payload.member.talking ? "start" : "stop";
+        roomSession.emit(`${event}.${deprecatedSuffix}`, newPayload);
+      }
+      break;
+    default:
+      break;
   }
-  (0, import_core12.getLogger)().trace("videoWorker ended");
+  (0, import_core12.getLogger)().trace("videoMemberWorker ended");
 };
 
+// src/video/videoRoomWorker.ts
+var import_core13 = require("@signalwire/core");
+
 // src/BaseRoomSession.ts
 var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
   constructor(options) {
@@ -1070,6 +1027,9 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
     __publicField(this, "_mirrored");
     __publicField(this, "_audioEl");
     this._mirrored = options.mirrorLocalVideoOverlay;
+    this.initWorker();
+  }
+  initWorker() {
     this.runWorker("videoWorker", {
       worker: videoWorker
     });
@@ -1131,7 +1091,7 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
           layout,
           positions
         });
-        const screenShare = (0, import_core13.connect)({
+        const screenShare = (0, import_core14.connect)({
           store: this.store,
           Component: RoomSessionScreenShareAPI
         })(options);
@@ -1201,7 +1161,7 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
             memberId: this.memberId
           })
         });
-        const roomDevice = (0, import_core13.connect)({
+        const roomDevice = (0, import_core14.connect)({
           store: this.store,
           Component: RoomSessionDeviceAPI
         })(options);
@@ -1238,7 +1198,7 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
   }
   updateSpeaker({ deviceId }) {
     const prevId = this._audioEl.sinkId;
-    this.once(`${import_core13.LOCAL_EVENT_PREFIX}.speaker.updated`, (newId) => __async(this, null, function* () {
+    this.once(`${import_core14.LOCAL_EVENT_PREFIX}.speaker.updated`, (newId) => __async(this, null, function* () {
       const prevSpeaker = yield (0, import_webrtc4.getSpeakerById)(prevId);
       const newSpeaker = yield (0, import_webrtc4.getSpeakerById)(newId);
       const isSame = (newSpeaker == null ? void 0 : newSpeaker.deviceId) === (prevSpeaker == null ? void 0 : prevSpeaker.deviceId);
@@ -1325,60 +1285,60 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
       mirrored: this._mirrored,
       setMirrored: (value) => {
         this._mirrored = value;
-        this.emit(`${import_core13.LOCAL_EVENT_PREFIX}.mirror.video`, this._mirrored);
+        this.emit(`${import_core14.LOCAL_EVENT_PREFIX}.mirror.video`, this._mirrored);
       }
     };
   }
   getSubscriptions() {
     const eventNamesWithPrefix = this.eventNames().map((event) => `video.${event}`);
-    return (0, import_core13.validateEventsToSubscribe)(eventNamesWithPrefix);
-  }
-};
-var RoomSessionAPI = (0, import_core13.extendComponent)(RoomSessionConnection, {
-  audioMute: import_core13.Rooms.audioMuteMember,
-  audioUnmute: import_core13.Rooms.audioUnmuteMember,
-  videoMute: import_core13.Rooms.videoMuteMember,
-  videoUnmute: import_core13.Rooms.videoUnmuteMember,
-  deaf: import_core13.Rooms.deafMember,
-  undeaf: import_core13.Rooms.undeafMember,
-  setInputVolume: import_core13.Rooms.setInputVolumeMember,
-  setOutputVolume: import_core13.Rooms.setOutputVolumeMember,
-  setMicrophoneVolume: import_core13.Rooms.setInputVolumeMember,
-  setSpeakerVolume: import_core13.Rooms.setOutputVolumeMember,
-  setInputSensitivity: import_core13.Rooms.setInputSensitivityMember,
-  removeMember: import_core13.Rooms.removeMember,
-  removeAllMembers: import_core13.Rooms.removeAllMembers,
-  getMembers: import_core13.Rooms.getMembers,
-  getLayouts: import_core13.Rooms.getLayouts,
-  setLayout: import_core13.Rooms.setLayout,
-  setPositions: import_core13.Rooms.setPositions,
-  setMemberPosition: import_core13.Rooms.setMemberPosition,
-  hideVideoMuted: import_core13.Rooms.hideVideoMuted,
-  showVideoMuted: import_core13.Rooms.showVideoMuted,
-  getRecordings: import_core13.Rooms.getRecordings,
-  startRecording: import_core13.Rooms.startRecording,
-  getPlaybacks: import_core13.Rooms.getPlaybacks,
-  play: import_core13.Rooms.play,
-  setHideVideoMuted: import_core13.Rooms.setHideVideoMuted,
-  getMeta: import_core13.Rooms.getMeta,
-  setMeta: import_core13.Rooms.setMeta,
-  updateMeta: import_core13.Rooms.updateMeta,
-  deleteMeta: import_core13.Rooms.deleteMeta,
-  getMemberMeta: import_core13.Rooms.getMemberMeta,
-  setMemberMeta: import_core13.Rooms.setMemberMeta,
-  updateMemberMeta: import_core13.Rooms.updateMemberMeta,
-  deleteMemberMeta: import_core13.Rooms.deleteMemberMeta,
-  promote: import_core13.Rooms.promote,
-  demote: import_core13.Rooms.demote,
-  getStreams: import_core13.Rooms.getStreams,
-  startStream: import_core13.Rooms.startStream,
-  lock: import_core13.Rooms.lock,
-  unlock: import_core13.Rooms.unlock,
-  setRaisedHand: import_core13.Rooms.setRaisedHand,
-  setPrioritizeHandraise: import_core13.Rooms.setPrioritizeHandraise
+    return (0, import_core14.validateEventsToSubscribe)(eventNamesWithPrefix);
+  }
+};
+var RoomSessionAPI = (0, import_core14.extendComponent)(RoomSessionConnection, {
+  audioMute: import_core14.Rooms.audioMuteMember,
+  audioUnmute: import_core14.Rooms.audioUnmuteMember,
+  videoMute: import_core14.Rooms.videoMuteMember,
+  videoUnmute: import_core14.Rooms.videoUnmuteMember,
+  deaf: import_core14.Rooms.deafMember,
+  undeaf: import_core14.Rooms.undeafMember,
+  setInputVolume: import_core14.Rooms.setInputVolumeMember,
+  setOutputVolume: import_core14.Rooms.setOutputVolumeMember,
+  setMicrophoneVolume: import_core14.Rooms.setInputVolumeMember,
+  setSpeakerVolume: import_core14.Rooms.setOutputVolumeMember,
+  setInputSensitivity: import_core14.Rooms.setInputSensitivityMember,
+  removeMember: import_core14.Rooms.removeMember,
+  removeAllMembers: import_core14.Rooms.removeAllMembers,
+  getMembers: import_core14.Rooms.getMembers,
+  getLayouts: import_core14.Rooms.getLayouts,
+  setLayout: import_core14.Rooms.setLayout,
+  setPositions: import_core14.Rooms.setPositions,
+  setMemberPosition: import_core14.Rooms.setMemberPosition,
+  hideVideoMuted: import_core14.Rooms.hideVideoMuted,
+  showVideoMuted: import_core14.Rooms.showVideoMuted,
+  getRecordings: import_core14.Rooms.getRecordings,
+  startRecording: import_core14.Rooms.startRecording,
+  getPlaybacks: import_core14.Rooms.getPlaybacks,
+  play: import_core14.Rooms.play,
+  setHideVideoMuted: import_core14.Rooms.setHideVideoMuted,
+  getMeta: import_core14.Rooms.getMeta,
+  setMeta: import_core14.Rooms.setMeta,
+  updateMeta: import_core14.Rooms.updateMeta,
+  deleteMeta: import_core14.Rooms.deleteMeta,
+  getMemberMeta: import_core14.Rooms.getMemberMeta,
+  setMemberMeta: import_core14.Rooms.setMemberMeta,
+  updateMemberMeta: import_core14.Rooms.updateMemberMeta,
+  deleteMemberMeta: import_core14.Rooms.deleteMemberMeta,
+  promote: import_core14.Rooms.promote,
+  demote: import_core14.Rooms.demote,
+  getStreams: import_core14.Rooms.getStreams,
+  startStream: import_core14.Rooms.startStream,
+  lock: import_core14.Rooms.lock,
+  unlock: import_core14.Rooms.unlock,
+  setRaisedHand: import_core14.Rooms.setRaisedHand,
+  setPrioritizeHandraise: import_core14.Rooms.setPrioritizeHandraise
 });
 var createBaseRoomSessionObject = (params) => {
-  const room = (0, import_core13.connect)({
+  const room = (0, import_core14.connect)({
     store: params.store,
     customSagas: params.customSagas,
     Component: RoomSessionAPI
@@ -1387,41 +1347,41 @@ var createBaseRoomSessionObject = (params) => {
 };
 
 // src/cantina/VideoManager.ts
-var import_core17 = require("@signalwire/core");
+var import_core18 = require("@signalwire/core");
 
 // src/cantina/workers/videoManagerWorker.ts
-var import_core16 = require("@signalwire/core");
+var import_core17 = require("@signalwire/core");
 
 // src/cantina/workers/videoManagerRoomsWorker.ts
-var import_core14 = require("@signalwire/core");
+var import_core15 = require("@signalwire/core");
 var videoManagerRoomsWorker = function* (options) {
-  (0, import_core14.getLogger)().trace("videoManagerRoomsWorker started");
+  (0, import_core15.getLogger)().trace("videoManagerRoomsWorker started");
   const {
     instance: client,
     action: { type, payload }
   } = options;
   const modPayload = {
-    rooms: payload.rooms.map((row) => (0, import_core14.toExternalJSON)(row))
+    rooms: payload.rooms.map((row) => (0, import_core15.toExternalJSON)(row))
   };
-  client.emit((0, import_core14.stripNamespacePrefix)(type), modPayload);
-  (0, import_core14.getLogger)().trace("videoManagerRoomsWorker ended");
+  client.emit((0, import_core15.stripNamespacePrefix)(type), modPayload);
+  (0, import_core15.getLogger)().trace("videoManagerRoomsWorker ended");
 };
 
 // src/cantina/workers/videoManagerRoomWorker.ts
-var import_core15 = require("@signalwire/core");
+var import_core16 = require("@signalwire/core");
 var videoManagerRoomWorker = function* (options) {
-  (0, import_core15.getLogger)().trace("videoManagerRoomWorker started");
+  (0, import_core16.getLogger)().trace("videoManagerRoomWorker started");
   const {
     instance: client,
     action: { type, payload }
   } = options;
-  client.emit((0, import_core15.stripNamespacePrefix)(type), (0, import_core15.toExternalJSON)(payload));
-  (0, import_core15.getLogger)().trace("videoManagerRoomWorker ended");
+  client.emit((0, import_core16.stripNamespacePrefix)(type), (0, import_core16.toExternalJSON)(payload));
+  (0, import_core16.getLogger)().trace("videoManagerRoomWorker ended");
 };
 
 // src/cantina/workers/videoManagerWorker.ts
 var videoManagerWorker = function* (options) {
-  (0, import_core16.getLogger)().trace("videoManagerWorker started");
+  (0, import_core17.getLogger)().trace("videoManagerWorker started");
   const {
     channels: { swEventChannel }
   } = options;
@@ -1429,7 +1389,7 @@ var videoManagerWorker = function* (options) {
     const { type } = action;
     switch (type) {
       case "video-manager.rooms.subscribed":
-        yield import_core16.sagaEffects.fork(videoManagerRoomsWorker, __spreadValues({
+        yield import_core17.sagaEffects.fork(videoManagerRoomsWorker, __spreadValues({
           action
         }, options));
         break;
@@ -1438,26 +1398,26 @@ var videoManagerWorker = function* (options) {
       case "video-manager.room.ended":
       case "video-manager.room.started":
       case "video-manager.room.updated":
-        yield import_core16.sagaEffects.fork(videoManagerRoomWorker, __spreadValues({
+        yield import_core17.sagaEffects.fork(videoManagerRoomWorker, __spreadValues({
           action
         }, options));
         break;
       default:
-        (0, import_core16.getLogger)().warn(`Unknown video-manager event: "${type}"`);
+        (0, import_core17.getLogger)().warn(`Unknown video-manager event: "${type}"`);
         break;
     }
   }
   while (true) {
-    const action = yield import_core16.sagaEffects.take(swEventChannel, (action2) => {
+    const action = yield import_core17.sagaEffects.take(swEventChannel, (action2) => {
       return action2.type.startsWith("video-manager.");
     });
-    yield import_core16.sagaEffects.fork(worker, action);
+    yield import_core17.sagaEffects.fork(worker, action);
   }
-  (0, import_core16.getLogger)().trace("videoManagerWorker ended");
+  (0, import_core17.getLogger)().trace("videoManagerWorker ended");
 };
 
 // src/cantina/VideoManager.ts
-var VideoManagerAPI = class extends import_core17.BaseConsumer {
+var VideoManagerAPI = class extends import_core18.BaseConsumer {
   constructor(options) {
     super(options);
     this.runWorker("videoManagerWorker", {
@@ -1466,11 +1426,11 @@ var VideoManagerAPI = class extends import_core17.BaseConsumer {
   }
   getSubscriptions() {
     const eventNamesWithPrefix = this.eventNames().map((event) => `video-manager.${event}`);
-    return (0, import_core17.validateEventsToSubscribe)(eventNamesWithPrefix);
+    return (0, import_core18.validateEventsToSubscribe)(eventNamesWithPrefix);
   }
 };
 var createVideoManagerObject = (params) => {
-  const manager = (0, import_core17.connect)({
+  const manager = (0, import_core18.connect)({
     store: params.store,
     Component: VideoManagerAPI
   })(params);
@@ -1487,102 +1447,61 @@ var createVideoManagerObject = (params) => {
   return proxy;
 };
 
-// src/Client.ts
-var ClientAPI = class extends import_core18.BaseClient {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "_videoManager");
-    __publicField(this, "_chat");
-    __publicField(this, "_pubSub");
+// src/fabric/CallFabricBaseRoomSession.ts
+var import_core33 = require("@signalwire/core");
+
+// src/fabric/workers/wsClientWorker.ts
+var import_core19 = require("@signalwire/core");
+var wsClientWorker = function* (options) {
+  (0, import_core19.getLogger)().trace("wsClientWorker started");
+  const { channels, initialState } = options;
+  const { swEventChannel } = channels;
+  const { buildInboundCall } = initialState;
+  while (true) {
+    const action = yield import_core19.sagaEffects.take(swEventChannel, (action2) => {
+      if (action2.type === "webrtc.message") {
+        return action2.payload.method === "verto.invite";
+      }
+      return false;
+    });
+    (0, import_core19.getLogger)().debug("Receiving a new call over WebSocket", action);
+    buildInboundCall(action.payload.params);
   }
-  get rooms() {
-    return {
-      makeRoomObject: (makeRoomOptions) => {
-        const _a = makeRoomOptions, {
-          rootElement,
-          applyLocalVideoOverlay = true,
-          stopCameraWhileMuted = true,
-          stopMicrophoneWhileMuted = true
-        } = _a, options = __objRest(_a, [
-          "rootElement",
-          "applyLocalVideoOverlay",
-          "stopCameraWhileMuted",
-          "stopMicrophoneWhileMuted"
-        ]);
-        const customSagas = [];
-        customSagas.push(makeAudioElementSaga({
-          speakerId: options.speakerId
-        }));
-        if (rootElement) {
-          customSagas.push(makeVideoElementSaga({
-            rootElement,
-            applyLocalVideoOverlay
-          }));
-        }
-        const room = createBaseRoomSessionObject(__spreadProps(__spreadValues({}, options), {
-          store: this.store,
-          customSagas
-        }));
-        if (stopMicrophoneWhileMuted) {
-          room.on("member.updated.audio_muted", ({ member }) => {
-            try {
-              if (member.id === room.memberId && "audio_muted" in member) {
-                member.audio_muted ? room.stopOutboundAudio() : room.restoreOutboundAudio();
-              }
-            } catch (error) {
-              this.logger.error("Error handling audio_muted", error);
-            }
-          });
-        }
-        if (stopCameraWhileMuted) {
-          room.on("member.updated.video_muted", ({ member }) => {
-            try {
-              if (member.id === room.memberId && "video_muted" in member) {
-                member.video_muted ? room.stopOutboundVideo() : room.restoreOutboundVideo();
-              }
-            } catch (error) {
-              this.logger.error("Error handling video_muted", error);
-            }
-          });
-        }
-        return room;
-      }
-    };
-  }
-  get chat() {
-    if (!this._chat) {
-      this._chat = import_core18.Chat.createBaseChatObject({
-        store: this.store
-      });
-    }
-    return this._chat;
-  }
-  get pubSub() {
-    if (!this._pubSub) {
-      this._pubSub = import_core18.PubSub.createBasePubSubObject({
-        store: this.store
-      });
-    }
-    return this._pubSub;
-  }
-  get videoManager() {
-    if (!this._videoManager) {
-      this._videoManager = createVideoManagerObject(this.options);
-    }
-    return this._videoManager;
-  }
-  reauthenticate(token) {
-    this.store.dispatch(import_core18.actions.reauthAction({ token }));
+  (0, import_core19.getLogger)().trace("wsClientWorker ended");
+};
+
+// src/fabric/workers/conversationWorker.ts
+var import_core20 = require("@signalwire/core");
+var conversationWorker = function* (options) {
+  (0, import_core20.getLogger)().debug("conversationWorker started");
+  const {
+    channels: { swEventChannel },
+    initialState
+  } = options;
+  const { conversation } = initialState;
+  const isConversationEvent = (action) => {
+    return action.type === "conversation.message";
+  };
+  while (true) {
+    const action = yield import_core20.sagaEffects.take(swEventChannel, isConversationEvent);
+    conversation.handleEvent(action.payload);
   }
+  (0, import_core20.getLogger)().trace("conversationWorker ended");
 };
 
+// src/fabric/workers/unifiedTargetWorker.ts
+var import_core25 = require("@signalwire/core");
+
+// src/UnifiedJWTSession.ts
+var import_core24 = require("@signalwire/core");
+
 // src/JWTSession.ts
 var import_jwt_decode2 = __toESM(require("jwt-decode"));
-var import_core21 = require("@signalwire/core");
+var import_core23 = require("@signalwire/core");
 
 // src/utils/storage.ts
 var import_jwt_decode = __toESM(require("jwt-decode"));
-var import_core19 = require("@signalwire/core");
+var import_core21 = require("@signalwire/core");
 var getStorage = () => {
   if (window && window.sessionStorage) {
     return window.sessionStorage;
@@ -1597,7 +1516,7 @@ var sessionStorageManager = (token) => {
     roomName = (_a = jwtPayload == null ? void 0 : jwtPayload.r) != null ? _a : "";
   } catch (e) {
     if (process.env.NODE_ENV !== "production") {
-      (0, import_core19.getLogger)().error("[sessionStorageManager] error decoding JWT", token);
+      (0, import_core21.getLogger)().error("[sessionStorageManager] error decoding JWT", token);
     }
     roomName = "";
   }
@@ -1610,11 +1529,11 @@ var sessionStorageManager = (token) => {
 };
 
 // src/utils/CloseEvent.ts
-var import_core20 = require("@signalwire/core");
-var SwCloseEvent = typeof CloseEvent === "function" ? CloseEvent : import_core20.SWCloseEvent;
+var import_core22 = require("@signalwire/core");
+var SwCloseEvent = typeof CloseEvent === "function" ? CloseEvent : import_core22.SWCloseEvent;
 
 // src/JWTSession.ts
-var JWTSession = class extends import_core21.BaseJWTSession {
+var JWTSession = class extends import_core23.BaseJWTSession {
   constructor(options) {
     var _a;
     let decodedJwt = {};
@@ -1624,16 +1543,16 @@ var JWTSession = class extends import_core21.BaseJWTSession {
       });
     } catch (e) {
       if (process.env.NODE_ENV !== "production") {
-        (0, import_core21.getLogger)().debug("[JWTSession] error decoding the JWT");
+        (0, import_core23.getLogger)().debug("[JWTSession] error decoding the JWT");
       }
     }
     super(__spreadProps(__spreadValues({}, options), {
-      host: options.host || (decodedJwt == null ? void 0 : decodedJwt.ch)
+      host: (decodedJwt == null ? void 0 : decodedJwt.ch) || options.host
     }));
     this.options = options;
     __publicField(this, "WebSocketConstructor", WebSocket);
     __publicField(this, "CloseEventConstructor", SwCloseEvent);
-    __publicField(this, "agent", "@signalwire/js/browser/3.26.0");
+    __publicField(this, "agent", "@signalwire/js/browser/3.27.0-dev.202404301530.94a97d7.0");
     __publicField(this, "tokenTyp");
     this.tokenTyp = (_a = decodedJwt.typ) != null ? _a : "VRT";
   }
@@ -1716,23 +1635,725 @@ var JWTSession = class extends import_core21.BaseJWTSession {
   }
 };
 
+// src/fabric/workers/unifiedEventsWatcher.ts
+var import_core27 = require("@signalwire/core");
+
+// src/fabric/workers/mappers/unifiedEventsMapper.ts
+var import_core26 = require("@signalwire/core");
+
+// src/fabric/workers/callFabricWorker.ts
+var import_core32 = require("@signalwire/core");
+
+// src/fabric/workers/callJoinWorker.ts
+var import_core29 = require("@signalwire/core");
+
+// src/fabric/CallSegment.ts
+var import_core28 = require("@signalwire/core");
+var CallSegmentAPI = class extends import_core28.BaseComponent {
+  constructor(options) {
+    super(options);
+    __publicField(this, "_payload");
+    this._payload = options.payload;
+  }
+  get roomId() {
+    return this._payload.room_id;
+  }
+  get roomSessionId() {
+    return this._payload.room_session_id;
+  }
+  get callId() {
+    return this._payload.call_id;
+  }
+  get memberId() {
+    return this._payload.member_id;
+  }
+  get roomSession() {
+    return this._payload.room_session;
+  }
+  get members() {
+    return this._payload.members;
+  }
+  get member() {
+    var _a;
+    return (_a = this.members) == null ? void 0 : _a.find((member) => member.memberId === this.memberId);
+  }
+  setPayload(payload) {
+    this._payload = payload;
+  }
+};
+var createCallSegmentObject = (params) => {
+  const playback = (0, import_core28.connect)({
+    store: params.store,
+    Component: CallSegmentAPI
+  })(params);
+  return playback;
+};
+
+// src/fabric/workers/callJoinWorker.ts
+var callJoinWorker = function* (options) {
+  var _a;
+  (0, import_core29.getLogger)().trace("callJoinWorker started");
+  const { action, callSegments, instanceMap, instance: cfRoomSession } = options;
+  const { payload } = action;
+  const { get, set } = instanceMap;
+  const memberInstances = (_a = payload.room_session.members) == null ? void 0 : _a.map((member) => {
+    let memberInstance = get(member.member_id);
+    if (!memberInstance) {
+      memberInstance = import_core29.Rooms.createRoomSessionMemberObject({
+        store: cfRoomSession.store,
+        payload: {
+          room_id: payload.room_id,
+          room_session_id: payload.room_session_id,
+          member
+        }
+      });
+    } else {
+      memberInstance.setPayload({
+        room_id: payload.room_id,
+        room_session_id: payload.room_session_id,
+        member
+      });
+    }
+    set(member.member_id, memberInstance);
+    return memberInstance;
+  });
+  const callSegmentInstance = createCallSegmentObject({
+    store: cfRoomSession.store,
+    payload: __spreadProps(__spreadValues({}, payload), {
+      members: memberInstances
+    })
+  });
+  callSegments.push(callSegmentInstance);
+  cfRoomSession.runWorker("memberPositionWorker", __spreadProps(__spreadValues({
+    worker: import_core29.MemberPosition.memberPositionWorker
+  }, options), {
+    instance: cfRoomSession,
+    initialState: payload,
+    dispatcher: function* (subType, subPayload) {
+      yield import_core29.sagaEffects.fork(videoMemberWorker, __spreadProps(__spreadValues({}, options), {
+        action: { type: subType, payload: subPayload }
+      }));
+    }
+  }));
+  for (const memberPayload of payload.room_session.members || []) {
+    yield import_core29.sagaEffects.fork(videoMemberWorker, __spreadProps(__spreadValues({}, options), {
+      action: {
+        type: "video.member.joined",
+        payload: { member: memberPayload }
+      }
+    }));
+  }
+  cfRoomSession.emit("room.subscribed", payload);
+  cfRoomSession.emit("call.joined", payload);
+  (0, import_core29.getLogger)().trace("callJoinWorker ended");
+};
+
+// src/fabric/workers/callLeftWorker.ts
+var import_core30 = require("@signalwire/core");
+var callLeftWorker = function* (options) {
+  (0, import_core30.getLogger)().trace("callLeftWorker started");
+  const {
+    action: { payload },
+    instance: cfRoomSession,
+    callSegments,
+    instanceMap
+  } = options;
+  const { call_id, room_session_id } = payload;
+  const segmentToRemoveIndex = callSegments.findIndex((segment) => segment.callId == call_id);
+  if (segmentToRemoveIndex >= 0) {
+    callSegments.splice(segmentToRemoveIndex, 1);
+  }
+  instanceMap.getAll().forEach(([key, obj]) => {
+    if (obj instanceof import_core30.Rooms.RoomSessionMemberAPI && obj.roomSessionId === room_session_id) {
+      instanceMap.remove(key);
+    }
+  });
+  cfRoomSession.emit("call.left", payload);
+  (0, import_core30.getLogger)().trace("callLeftWorker ended");
+};
+
+// src/fabric/workers/callStateWorker.ts
+var import_core31 = require("@signalwire/core");
+var callStateWorker = function* (options) {
+  (0, import_core31.getLogger)().trace("callStateWorker started");
+  const {
+    instance: cfRoomSession,
+    action: { payload },
+    callSegments
+  } = options;
+  switch (payload.call_state) {
+    case "ended": {
+      cfRoomSession.emit("call.state", payload);
+      if (callSegments.length < 1 && cfRoomSession.state === "destroy") {
+        console.log(">> destroy");
+        cfRoomSession.destroy();
+      }
+      break;
+    }
+    default:
+      cfRoomSession.emit("call.state", payload);
+      break;
+  }
+  (0, import_core31.getLogger)().trace("callStateWorker ended");
+};
+
+// src/fabric/workers/callFabricWorker.ts
+var callFabricWorker = function* (options) {
+  (0, import_core32.getLogger)().trace("callFabricWorker started");
+  const { channels, instance: roomSession } = options;
+  const { swEventChannel } = channels;
+  function* worker(action) {
+    const { type, payload } = action;
+    switch (type) {
+      case "call.joined": {
+        yield import_core32.sagaEffects.fork(callJoinWorker, __spreadValues({
+          action
+        }, options));
+        return;
+      }
+      case "call.left": {
+        yield import_core32.sagaEffects.fork(callLeftWorker, __spreadValues({
+          action
+        }, options));
+        return;
+      }
+      case "call.state": {
+        yield import_core32.sagaEffects.fork(callStateWorker, __spreadValues({
+          action
+        }, options));
+        return;
+      }
+      case "call.started":
+      case "call.updated":
+      case "call.ended": {
+        const action2 = type.split(".")[1];
+        const newEventName = `room.${action2}`;
+        roomSession.emit(newEventName, payload);
+        break;
+      }
+      case "member.joined":
+      case "member.left":
+      case "member.updated":
+      case "member.talking": {
+        const updatedAction = __spreadProps(__spreadValues({}, action), {
+          type: `video.${type}`
+        });
+        yield import_core32.sagaEffects.fork(videoMemberWorker, __spreadValues({
+          action: updatedAction
+        }, options));
+        return;
+      }
+      case "layout.changed": {
+        const updatedAction = __spreadProps(__spreadValues({}, action), {
+          type: `video.${type}`
+        });
+        yield import_core32.sagaEffects.put(swEventChannel, updatedAction);
+        break;
+      }
+      case "member.demoted":
+      case "member.promoted": {
+        const updatedAction = __spreadProps(__spreadValues({}, action), {
+          type: `video.${type}`
+        });
+        yield import_core32.sagaEffects.put(swEventChannel, updatedAction);
+        return;
+      }
+      default:
+        break;
+    }
+    roomSession.emit(type, payload);
+  }
+  const isVideoOrCallEvent = (action) => {
+    return action.type.startsWith("call.") || action.type.startsWith("member.") || action.type.startsWith("layout.");
+  };
+  while (true) {
+    const action = yield import_core32.sagaEffects.take(swEventChannel, isVideoOrCallEvent);
+    yield import_core32.sagaEffects.fork(worker, action);
+  }
+  (0, import_core32.getLogger)().trace("callFabricWorker ended");
+};
+
+// src/fabric/CallFabricBaseRoomSession.ts
+var CallFabricRoomSessionConnection = class extends RoomSessionConnection {
+  initWorker() {
+    this.runWorker("callFabricWorker", {
+      worker: callFabricWorker
+    });
+  }
+  get selfMember() {
+    var _a;
+    return (_a = this.callSegments[0]) == null ? void 0 : _a.member;
+  }
+  get targetMember() {
+    var _a;
+    return (_a = this.callSegments[this.callSegments.length - 1]) == null ? void 0 : _a.member;
+  }
+  isSelfMember(id) {
+    return this.callSegments.findIndex((segment) => segment.memberId === id) > -1;
+  }
+  executeAction(params, options = {}) {
+    const { method, extraParams = {} } = params;
+    return this.execute({
+      method,
+      params: __spreadValues({
+        self: {
+          member_id: this.selfMember.id,
+          call_id: this.selfMember.callId,
+          node_id: this.selfMember.nodeId
+        }
+      }, extraParams)
+    }, options);
+  }
+  executeMemberAction(params, options = {}) {
+    const { method, channel, memberId, extraParams = {} } = params;
+    let targetMember = this.targetMember;
+    if (memberId && !this.isSelfMember(memberId)) {
+      const lastSegment = this.callSegments[this.callSegments.length - 1];
+      const memberInCurrentSegment = lastSegment.members.find((member) => member.id === memberId);
+      if (!memberInCurrentSegment) {
+        throw new Error("The memberId is not a part of the current call segment!");
+      } else {
+        targetMember = memberInCurrentSegment;
+      }
+    }
+    return this.execute({
+      method,
+      params: __spreadValues(__spreadProps(__spreadValues({}, channel && { channels: [channel] }), {
+        self: {
+          member_id: this.selfMember.id,
+          call_id: this.selfMember.callId,
+          node_id: this.selfMember.nodeId
+        },
+        target: {
+          member_id: targetMember.id,
+          call_id: targetMember.callId,
+          node_id: targetMember.nodeId
+        }
+      }), extraParams)
+    }, options);
+  }
+  audioMute(params) {
+    return this.executeMemberAction({
+      method: "call.mute",
+      channel: "audio",
+      memberId: params == null ? void 0 : params.memberId
+    });
+  }
+  audioUnmute(params) {
+    return this.executeMemberAction({
+      method: "call.unmute",
+      channel: "audio",
+      memberId: params == null ? void 0 : params.memberId
+    });
+  }
+  videoMute(params) {
+    return this.executeMemberAction({
+      method: "call.mute",
+      channel: "video",
+      memberId: params == null ? void 0 : params.memberId
+    });
+  }
+  videoUnmute(params) {
+    return this.executeMemberAction({
+      method: "call.unmute",
+      channel: "video",
+      memberId: params == null ? void 0 : params.memberId
+    });
+  }
+  deaf(params) {
+    return this.executeMemberAction({
+      method: "call.deaf",
+      memberId: params == null ? void 0 : params.memberId
+    });
+  }
+  undeaf(params) {
+    return this.executeMemberAction({
+      method: "call.undeaf",
+      memberId: params == null ? void 0 : params.memberId
+    });
+  }
+  getLayouts() {
+    return this.executeAction({
+      method: "call.layout.list"
+    }, {
+      transformResolve: (payload) => ({
+        layouts: payload.layouts
+      })
+    });
+  }
+  getMembers() {
+    return this.executeAction({
+      method: "call.member.list"
+    }, {
+      transformResolve: (payload) => ({
+        members: payload.members
+      })
+    });
+  }
+  removeMember(params) {
+    if (!(params == null ? void 0 : params.memberId)) {
+      throw new TypeError('Invalid or missing "memberId" argument');
+    }
+    return this.executeMemberAction({
+      method: "call.member.remove",
+      memberId: params.memberId
+    });
+  }
+  setLayout(params) {
+    const extraParams = {
+      name: params == null ? void 0 : params.name,
+      layout: Object.values((params == null ? void 0 : params.positions) || {})[0]
+    };
+    return this.executeAction({
+      method: "call.layout.set",
+      extraParams
+    });
+  }
+  setInputVolume(params) {
+    return this.executeMemberAction({
+      method: "call.microphone.volume.set",
+      memberId: params == null ? void 0 : params.memberId,
+      extraParams: {
+        volume: params == null ? void 0 : params.volume
+      }
+    });
+  }
+  setOutputVolume(params) {
+    return this.executeMemberAction({
+      method: "video.member.set_output_volume",
+      memberId: params == null ? void 0 : params.memberId,
+      extraParams: {
+        volume: params == null ? void 0 : params.volume
+      }
+    });
+  }
+  setInputSensitivity(params) {
+    return this.executeMemberAction({
+      method: "call.microphone.sensitivity.set",
+      memberId: params == null ? void 0 : params.memberId,
+      extraParams: {
+        value: params == null ? void 0 : params.value
+      }
+    });
+  }
+};
+var createCallFabricBaseRoomSessionObject = (params) => {
+  const room = (0, import_core33.connect)({
+    store: params.store,
+    customSagas: params.customSagas,
+    Component: CallFabricRoomSessionConnection
+  })(params);
+  return room;
+};
+
+// src/Client.ts
+var ClientAPI = class extends import_core34.BaseClient {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "_videoManager");
+    __publicField(this, "_chat");
+    __publicField(this, "_pubSub");
+  }
+  get rooms() {
+    return {
+      makeRoomObject: (makeRoomOptions) => {
+        const _a = makeRoomOptions, {
+          rootElement,
+          applyLocalVideoOverlay = true,
+          stopCameraWhileMuted = true,
+          stopMicrophoneWhileMuted = true,
+          unifiedEventing = false
+        } = _a, options = __objRest(_a, [
+          "rootElement",
+          "applyLocalVideoOverlay",
+          "stopCameraWhileMuted",
+          "stopMicrophoneWhileMuted",
+          "unifiedEventing"
+        ]);
+        const customSagas = [];
+        customSagas.push(makeAudioElementSaga({
+          speakerId: options.speakerId
+        }));
+        if (rootElement) {
+          customSagas.push(makeVideoElementSaga({
+            rootElement,
+            applyLocalVideoOverlay
+          }));
+        }
+        let roomSessionObject = createBaseRoomSessionObject;
+        if (unifiedEventing) {
+          roomSessionObject = createCallFabricBaseRoomSessionObject;
+        }
+        const room = roomSessionObject(__spreadProps(__spreadValues({}, options), {
+          store: this.store,
+          customSagas
+        }));
+        if (stopMicrophoneWhileMuted) {
+          room.on("member.updated.audio_muted", ({ member }) => {
+            try {
+              if (member.id === room.memberId && "audio_muted" in member) {
+                member.audio_muted ? room.stopOutboundAudio() : room.restoreOutboundAudio();
+              }
+            } catch (error) {
+              this.logger.error("Error handling audio_muted", error);
+            }
+          });
+        }
+        if (stopCameraWhileMuted) {
+          room.on("member.updated.video_muted", ({ member }) => {
+            try {
+              if (member.id === room.memberId && "video_muted" in member) {
+                member.video_muted ? room.stopOutboundVideo() : room.restoreOutboundVideo();
+              }
+            } catch (error) {
+              this.logger.error("Error handling video_muted", error);
+            }
+          });
+        }
+        return room;
+      }
+    };
+  }
+  get chat() {
+    if (!this._chat) {
+      this._chat = import_core34.Chat.createBaseChatObject({
+        store: this.store
+      });
+    }
+    return this._chat;
+  }
+  get pubSub() {
+    if (!this._pubSub) {
+      this._pubSub = import_core34.PubSub.createBasePubSubObject({
+        store: this.store
+      });
+    }
+    return this._pubSub;
+  }
+  get videoManager() {
+    if (!this._videoManager) {
+      this._videoManager = createVideoManagerObject(this.options);
+    }
+    return this._videoManager;
+  }
+  reauthenticate(token) {
+    this.store.dispatch(import_core34.actions.reauthAction({ token }));
+  }
+};
+
 // src/createClient.ts
 var createClient = (userOptions) => {
   const baseUserOptions = __spreadProps(__spreadValues({}, userOptions), {
-    emitter: (0, import_core22.getEventEmitter)()
+    emitter: (0, import_core35.getEventEmitter)()
   });
-  const store = (0, import_core22.configureStore)({
+  const store = (0, import_core35.configureStore)({
     userOptions: baseUserOptions,
     SessionConstructor: JWTSession
   });
-  const client = (0, import_core22.connect)({
+  const client = (0, import_core35.connect)({
     store,
     Component: ClientAPI
   })(baseUserOptions);
   return client;
 };
 
+// src/chat/Client.ts
+var INTERCEPTED_METHODS = [
+  "subscribe",
+  "publish",
+  "getMessages",
+  "getMembers",
+  "getMemberState",
+  "getAllowedChannels",
+  "setMemberState"
+];
+var Client2 = function(chatOptions) {
+  const client = createClient(chatOptions);
+  const createInterceptor = (prop) => {
+    return (...params) => __async(this, null, function* () {
+      yield client.connect();
+      return client.chat[prop](...params);
+    });
+  };
+  const interceptors = {
+    _session: client,
+    disconnect: () => client.disconnect()
+  };
+  return new Proxy(client.chat, {
+    get(target, prop, receiver) {
+      if (prop in interceptors) {
+        return interceptors[prop];
+      }
+      if (INTERCEPTED_METHODS.includes(prop)) {
+        return createInterceptor(prop);
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+};
+
+// src/chat/index.ts
+var import_core36 = require("@signalwire/core");
+
+// src/pubSub/index.ts
+var pubSub_exports = {};
+__export(pubSub_exports, {
+  Client: () => Client3,
+  PubSubMessage: () => PubSubMessage
+});
+var import_core38 = require("@signalwire/core");
+
+// src/utils/interfaces.ts
+var import_core37 = require("@signalwire/core");
+var INTERNAL_MEMBER_UPDATED_EVENTS = Object.keys(import_core37.INTERNAL_MEMBER_UPDATABLE_PROPS).map((key) => {
+  return `member.updated.${key}`;
+});
+
+// src/pubSub/Client.ts
+var INTERCEPTED_METHODS2 = [
+  "getAllowedChannels",
+  "subscribe",
+  "publish"
+];
+var Client3 = function(pubSubOptions) {
+  const client = createClient(pubSubOptions);
+  const createInterceptor = (prop) => {
+    return (...params) => __async(this, null, function* () {
+      yield client.connect();
+      return client.pubSub[prop](...params);
+    });
+  };
+  const interceptors = {
+    _session: client,
+    disconnect: () => client.disconnect()
+  };
+  return new Proxy(client.pubSub, {
+    get(target, prop, receiver) {
+      if (prop in interceptors) {
+        return interceptors[prop];
+      }
+      if (INTERCEPTED_METHODS2.includes(prop)) {
+        return createInterceptor(prop);
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+};
+
+// src/pubSub/index.ts
+var PubSubMessage = import_core38.PubSub.PubSubMessage;
+
+// src/fabric/index.ts
+var fabric_exports = {};
+__export(fabric_exports, {
+  Client: () => Client4,
+  ConversationAPI: () => ConversationAPI,
+  HTTPClient: () => HTTPClient,
+  IncomingCallManager: () => IncomingCallManager,
+  SWClient: () => SWClient,
+  SignalWire: () => SignalWire,
+  WSClient: () => WSClient
+});
+
+// src/fabric/createHttpClient.ts
+var import_core39 = require("@signalwire/core");
+function http(input, init) {
+  return __async(this, null, function* () {
+    const response = yield fetch(input, init);
+    if (!response.ok) {
+      if (response.status === 401) {
+        throw new import_core39.AuthError(response.status, "Unauthorized");
+      }
+      let errorResponse;
+      try {
+        errorResponse = yield response.json();
+      } catch (e) {
+      }
+      const errorMessage = (errorResponse == null ? void 0 : errorResponse.errors) ? JSON.stringify(errorResponse.errors) : "Not Found";
+      throw new import_core39.HttpError(response.status, errorMessage, errorResponse);
+    }
+    try {
+      response.parsedBody = yield response.json();
+    } catch (e) {
+    }
+    return response;
+  });
+}
+var createHttpClient = (_a, fetcher = http) => {
+  var _b = _a, { baseUrl, timeout = 3e4 } = _b, globalOptions = __objRest(_b, ["baseUrl", "timeout"]);
+  const apiClient = (path, options) => __async(void 0, null, function* () {
+    const headers = __spreadValues(__spreadValues(__spreadValues({}, (options == null ? void 0 : options.body) ? { "Content-Type": "application/json" } : {}), globalOptions.headers), options == null ? void 0 : options.headers);
+    const reqInit = getRequestInit(__spreadProps(__spreadValues(__spreadValues({}, globalOptions), options), {
+      headers
+    }));
+    let timerId;
+    if (timeout) {
+      const controller = new AbortController();
+      const signal = controller.signal;
+      reqInit.signal = signal;
+      timerId = setTimeout(() => {
+        controller.abort();
+      }, timeout);
+    }
+    try {
+      const response = yield fetcher(getUrl({
+        path,
+        baseUrl,
+        searchParams: options == null ? void 0 : options.searchParams
+      }), reqInit);
+      return { body: response.parsedBody };
+    } catch (e) {
+      throw e;
+    } finally {
+      timerId && clearTimeout(timerId);
+    }
+  });
+  return apiClient;
+};
+var getBody = (body) => {
+  return typeof body === "string" ? body : JSON.stringify(body);
+};
+var getRequestInit = (options) => {
+  return Object.entries(options).reduce((reducer, [key, value]) => {
+    if (key === "body") {
+      return __spreadProps(__spreadValues({}, reducer), {
+        body: getBody(value)
+      });
+    } else if (value != void 0) {
+      return __spreadProps(__spreadValues({}, reducer), {
+        [key]: value
+      });
+    }
+    return reducer;
+  }, {});
+};
+var getUrl = ({
+  path,
+  baseUrl,
+  searchParams
+}) => {
+  const url = new URL(path, baseUrl);
+  if (searchParams) {
+    Object.entries(searchParams).forEach(([key, value]) => {
+      if (value != void 0) {
+        url.searchParams.append(key, value);
+      }
+    });
+  }
+  return url.toString();
+};
+
+// src/video.ts
+var video_exports = {};
+__export(video_exports, {
+  RoomSession: () => RoomSession,
+  createClient: () => createClient,
+  createRoomObject: () => createRoomObject,
+  joinRoom: () => joinRoom
+});
+
 // src/createRoomObject.ts
+var import_core40 = require("@signalwire/core");
 var VIDEO_CONSTRAINTS = {
   aspectRatio: { ideal: 16 / 9 }
 };
@@ -1771,7 +2392,7 @@ var createRoomObject = (roomOptions) => {
         rootElement = el;
       } else {
         rootElement = document.body;
-        (0, import_core23.getLogger)().warn(`We couldn't find an element with id: ${rootElementId}: using 'document.body' instead.`);
+        (0, import_core40.getLogger)().warn(`We couldn't find an element with id: ${rootElementId}: using 'document.body' instead.`);
       }
     }
     const roomObject = client.rooms.makeRoomObject({
@@ -1798,7 +2419,7 @@ var createRoomObject = (roomOptions) => {
           });
           yield roomObject.join();
         } catch (error) {
-          (0, import_core23.getLogger)().error("Join", error);
+          (0, import_core40.getLogger)().error("Join", error);
           client.disconnect();
           reject2(error);
         }
@@ -1833,10 +2454,10 @@ var joinRoom = (roomOptions) => {
 };
 
 // src/RoomSession.ts
-var import_core25 = require("@signalwire/core");
+var import_core42 = require("@signalwire/core");
 
 // src/utils/roomSession.ts
-var import_core24 = require("@signalwire/core");
+var import_core41 = require("@signalwire/core");
 var getJoinMediaParams = (options) => {
   const {
     authState,
@@ -1847,7 +2468,7 @@ var getJoinMediaParams = (options) => {
     receiveAudio,
     receiveVideo
   } = options;
-  (0, import_core24.getLogger)().debug("getJoinMediaParams options", __spreadValues({}, options));
+  (0, import_core41.getLogger)().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";
@@ -1860,16 +2481,16 @@ var getJoinMediaParams = (options) => {
   const reqToReceiveAudio = Boolean(receiveAudio != null ? receiveAudio : audio);
   const reqToReceiveVideo = Boolean(receiveVideo != null ? receiveVideo : video);
   if (!canSendAudio && reqToSendAudio) {
-    (0, import_core24.getLogger)().info("Not allowed to send audio on this room. Default values will be used.");
+    (0, import_core41.getLogger)().info("Not allowed to send audio on this room. Default values will be used.");
   }
   if (!canSendVideo && reqToSendVideo) {
-    (0, import_core24.getLogger)().info("Not allowed to send video on this room. Default values will be used.");
+    (0, import_core41.getLogger)().info("Not allowed to send video on this room. Default values will be used.");
   }
   if (!canReceiveAudio && reqToReceiveAudio) {
-    (0, import_core24.getLogger)().info("Not allowed to receive video from the room. Default values will be used.");
+    (0, import_core41.getLogger)().info("Not allowed to receive video from the room. Default values will be used.");
   }
   if (!canReceiveVideo && reqToReceiveVideo) {
-    (0, import_core24.getLogger)().info("Not allowed to receive video from the room. Default values will be used.");
+    (0, import_core41.getLogger)().info("Not allowed to receive video from the room. Default values will be used.");
   }
   return {
     mustSendAudio: canSendAudio && reqToSendAudio,
@@ -1964,7 +2585,7 @@ var RoomSession = function(roomOptions) {
   const deprecatedParams = ["audio", "video"];
   deprecatedParams.forEach((param) => {
     if (param in roomOptions) {
-      (0, import_core25.getLogger)().warn(`The '${param}' parameter on the RoomSession constructor is deprecated. Set it on the '.join()' function instead.`);
+      (0, import_core42.getLogger)().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;
@@ -2035,7 +2656,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;
-        (0, import_core25.getLogger)().debug("getJoinMediaParams authState?", authState);
+        (0, import_core42.getLogger)().debug("getJoinMediaParams authState?", authState);
         if (authState && authState.type === "video") {
           const mediaOptions = getJoinMediaParams(__spreadValues({
             authState,
@@ -2048,7 +2669,7 @@ var RoomSession = function(roomOptions) {
 ${JSON.stringify(params, null, 2)}
 `));
           }
-          (0, import_core25.getLogger)().debug("Set mediaOptions", mediaOptions);
+          (0, import_core42.getLogger)().debug("Set mediaOptions", mediaOptions);
           room.updateMediaOptions({
             audio: mediaOptions.mustSendAudio ? audio || true : false,
             video: mediaOptions.mustSendVideo ? video || true : false,
@@ -2063,7 +2684,7 @@ ${JSON.stringify(params, null, 2)}
         REQUIRED_EVENTS.forEach((event) => room.once(event, noop2));
         yield room.join();
       } catch (error) {
-        (0, import_core25.getLogger)().error("RoomSession Join", error);
+        (0, import_core42.getLogger)().error("RoomSession Join", error);
         client.disconnect();
         reject(error);
       }
@@ -2128,7 +2749,7 @@ var buildCall = ({
 };
 
 // src/fabric/Client.ts
-var Client2 = class {
+var Client4 = class {
   constructor(options) {
     this.options = options;
     __publicField(this, "httpClient");
@@ -2255,48 +2876,95 @@ var SWClient = class {
 };
 
 // src/fabric/WSClient.ts
-var import_core27 = require("@signalwire/core");
-
-// src/fabric/WSClientWorker.ts
-var import_core26 = require("@signalwire/core");
-var WSClientWorker = function* (options) {
-  (0, import_core26.getLogger)().debug("WSClientWorker started");
-  const { channels, instance } = options;
-  const { swEventChannel } = channels;
-  (0, import_core26.getLogger)().debug("WSClientWorker instance", instance);
-  while (true) {
-    const action = yield import_core26.sagaEffects.take(swEventChannel, (action2) => {
-      (0, import_core26.getLogger)().debug("WSClientWorker action", action2);
-      if (action2.type === "webrtc.message") {
-        return action2.payload.method === "verto.invite";
-      }
-      return false;
-    });
-    (0, import_core26.getLogger)().debug("Build new call to answer", action);
-  }
-  (0, import_core26.getLogger)().trace("WSClientWorker ended");
-};
-
-// src/fabric/WSClient.ts
+var import_core43 = require("@signalwire/core");
+
+// src/fabric/IncomingCallManager.ts
+var IncomingCallManager = class {
+  constructor(_buildCallObject, _executeReject) {
+    this._buildCallObject = _buildCallObject;
+    this._executeReject = _executeReject;
+    __publicField(this, "_pendingInvites", {});
+    __publicField(this, "_handlers", {});
+  }
+  _buildNotification(invite) {
+    const accept = (params) => __async(this, null, function* () {
+      return new Promise((resolve, reject2) => {
+        delete this._pendingInvites[invite.callID];
+        try {
+          const call = this._buildCallObject(invite, params);
+          call.answer();
+          resolve(call);
+        } catch (e) {
+          reject2(e);
+        }
+      });
+    });
+    const reject = () => {
+      delete this._pendingInvites[invite.callID];
+      return this._executeReject(invite.callID, invite.nodeId);
+    };
+    return {
+      invite: {
+        details: invite,
+        accept: (params) => accept(params),
+        reject: () => reject()
+      }
+    };
+  }
+  setNotificationHandlers(handlers) {
+    this._handlers.all = handlers.all;
+    if (handlers.pushNotification && this._handlers.all != handlers.pushNotification || !handlers.pushNotification) {
+      this._handlers.pushNotification = handlers.pushNotification;
+    }
+    if (handlers.websocket && this._handlers.all != handlers.websocket || !handlers.websocket) {
+      this._handlers.websocket = handlers.websocket;
+    }
+  }
+  handleIncomingInvite(incomingInvite) {
+    var _a, _b;
+    if (incomingInvite.callID in this._pendingInvites) {
+      console.log(`skiping nottification for pending invite to callID: ${incomingInvite.callID}`);
+      return;
+    }
+    this._pendingInvites[incomingInvite.callID] = incomingInvite;
+    if (!(this._handlers.all || this._handlers[incomingInvite.source])) {
+      console.log("skiping nottification no listeners:");
+      return;
+    }
+    const notification = this._buildNotification(incomingInvite);
+    (_b = (_a = this._handlers).all) == null ? void 0 : _b.call(_a, notification);
+    const handler = this._handlers[incomingInvite.source];
+    handler == null ? void 0 : handler(notification);
+  }
+};
+
+// src/fabric/WSClient.ts
 var WSClient = class {
   constructor(options) {
     this.options = options;
     __publicField(this, "wsClient");
-    __publicField(this, "logger", (0, import_core27.getLogger)());
-    this.wsClient = createClient({
-      host: this.options.host,
-      token: this.options.token,
-      debug: {
-        logWsTraffic: true
-      },
-      logLevel: "debug"
-    });
+    __publicField(this, "logger", (0, import_core43.getLogger)());
+    __publicField(this, "_incomingCallManager");
+    this.wsClient = createClient(__spreadProps(__spreadValues({}, this.options), {
+      unifiedEventing: true
+    }));
+    this._incomingCallManager = new IncomingCallManager((payload, params) => this.buildInboundCall(payload, params), (callId, nodeId) => this.executeVertoBye(callId, nodeId));
+  }
+  get clientApi() {
+    return this.wsClient;
   }
   connect() {
-    this.wsClient.runWorker("WSClientWorker", {
-      worker: WSClientWorker
+    return __async(this, null, function* () {
+      if (!this.wsClient.connected) {
+        this.wsClient.runWorker("wsClientWorker", {
+          worker: wsClientWorker,
+          initialState: {
+            buildInboundCall: (incomingInvite) => this.notifyIncomingInvite("websocket", incomingInvite)
+          }
+        });
+        yield this.wsClient.connect();
+      }
     });
-    return this.wsClient.connect();
   }
   disconnect() {
     return this.wsClient.disconnect();
@@ -2304,20 +2972,23 @@ var WSClient = class {
   dial(params) {
     return __async(this, null, function* () {
       return new Promise((resolve, reject) => __async(this, null, function* () {
+        var _a, _b;
         try {
-          console.log("WSClient dial with:", params);
           yield this.connect();
           const call = this.wsClient.rooms.makeRoomObject({
+            audio: (_a = params.audio) != null ? _a : true,
+            video: (_b = params.video) != null ? _b : true,
             negotiateAudio: true,
             negotiateVideo: true,
-            rootElement: this.options.rootElement,
+            rootElement: params.rootElement,
             applyLocalVideoOverlay: true,
             stopCameraWhileMuted: true,
             stopMicrophoneWhileMuted: true,
             destinationNumber: params.to,
             watchMediaPackets: false,
             nodeId: params.nodeId,
-            disableUdpIceServers: this.options.disableUdpIceServers || false
+            disableUdpIceServers: params.disableUdpIceServers || false,
+            unifiedEventing: true
           });
           call.once("destroy", () => {
             this.logger.debug("RTC Connection Destroyed");
@@ -2329,18 +3000,17 @@ var WSClient = class {
           call.start = () => {
             return new Promise((resolve2, reject2) => __async(this, null, function* () {
               try {
-                call.once("verto.display", () => resolve2(call));
                 call.once("room.subscribed", () => resolve2(call));
                 yield call.join();
               } catch (error) {
-                (0, import_core27.getLogger)().error("WSClient call start", error);
+                (0, import_core43.getLogger)().error("WSClient call start", error);
                 reject2(error);
               }
             }));
           };
           resolve(call);
         } catch (error) {
-          (0, import_core27.getLogger)().error("WSClient dial", error);
+          (0, import_core43.getLogger)().error("WSClient dial", error);
           reject(error);
         }
       }));
@@ -2366,15 +3036,6 @@ var WSClient = class {
           display_direction
         }
       } = jsonrpc;
-      this.logger.debug("handlePushNotification data", {
-        callID,
-        sdp,
-        caller_id_name,
-        caller_id_number,
-        callee_id_name,
-        callee_id_number,
-        display_direction
-      });
       try {
         yield this.connect();
         try {
@@ -2382,29 +3043,48 @@ var WSClient = class {
         } catch (error) {
           this.logger.warn("Verto Subscribe", error);
         }
-        const call = this.wsClient.rooms.makeRoomObject({
-          negotiateAudio: true,
-          negotiateVideo: true,
-          rootElement: this.options.rootElement,
-          applyLocalVideoOverlay: true,
-          stopCameraWhileMuted: true,
-          stopMicrophoneWhileMuted: true,
-          watchMediaPackets: false,
-          remoteSdp: sdp,
-          prevCallId: callID,
+        this.notifyIncomingInvite("pushNotification", {
+          callID,
+          sdp,
+          caller_id_name,
+          caller_id_number,
+          callee_id_name,
+          callee_id_number,
+          display_direction,
           nodeId
         });
-        call.once("destroy", () => {
-          (0, import_core27.getLogger)().debug("RTC Connection Destroyed");
-        });
-        call.attachPreConnectWorkers();
-        (0, import_core27.getLogger)().debug("Resolving Call", call);
-        resolve({ resultType: "inboundCall", resultObject: call });
+        resolve({ resultType: "inboundCall" });
       } catch (error) {
         reject(error);
       }
     }));
   }
+  notifyIncomingInvite(source, buildCallParams) {
+    this._incomingCallManager.handleIncomingInvite(__spreadValues({
+      source
+    }, buildCallParams));
+  }
+  executeVertoBye(callId, nodeId) {
+    return __async(this, null, function* () {
+      try {
+        return yield this.wsClient.execute({
+          method: "webrtc.verto",
+          params: {
+            callID: callId,
+            node_id: nodeId,
+            message: (0, import_core43.VertoBye)({
+              cause: "USER_BUSY",
+              causeCode: "17",
+              dialogParams: { callID: callId }
+            })
+          }
+        });
+      } catch (error) {
+        this.logger.warn("The call is not available anymore", callId);
+        throw error;
+      }
+    });
+  }
   executeVertoSubscribe(callId, nodeId) {
     return __async(this, null, function* () {
       try {
@@ -2414,7 +3094,7 @@ var WSClient = class {
             callID: callId,
             node_id: nodeId,
             subscribe: [],
-            message: (0, import_core27.VertoSubscribe)({
+            message: (0, import_core43.VertoSubscribe)({
               sessid: callId,
               eventChannel: []
             })
@@ -2426,6 +3106,33 @@ var WSClient = class {
       }
     });
   }
+  buildInboundCall(payload, params) {
+    var _a, _b;
+    (0, import_core43.getLogger)().debug("Build new call to answer");
+    const { callID, nodeId, sdp } = payload;
+    const call = this.wsClient.rooms.makeRoomObject({
+      audio: (_a = params.audio) != null ? _a : true,
+      video: (_b = params.video) != null ? _b : true,
+      negotiateAudio: true,
+      negotiateVideo: true,
+      rootElement: params.rootElement,
+      applyLocalVideoOverlay: true,
+      stopCameraWhileMuted: true,
+      stopMicrophoneWhileMuted: true,
+      watchMediaPackets: false,
+      remoteSdp: sdp,
+      prevCallId: callID,
+      nodeId,
+      disableUdpIceServers: params.disableUdpIceServers || false,
+      unifiedEventing: true
+    });
+    call.once("destroy", () => {
+      (0, import_core43.getLogger)().debug("RTC Connection Destroyed");
+    });
+    call.attachPreConnectWorkers();
+    (0, import_core43.getLogger)().debug("Resolving Call", call);
+    return call;
+  }
   updateToken(token) {
     return new Promise((resolve, reject) => {
       this.wsClient.once("session.auth_error", (error) => {
@@ -2437,11 +3144,65 @@ var WSClient = class {
       this.wsClient.reauthenticate(token);
     });
   }
+  online(_0) {
+    return __async(this, arguments, function* ({ incomingCallHandlers }) {
+      this._incomingCallManager.setNotificationHandlers(incomingCallHandlers);
+      yield this.connect();
+      return this.wsClient.execute({
+        method: "subscriber.online",
+        params: {}
+      });
+    });
+  }
+  offline() {
+    this._incomingCallManager.setNotificationHandlers({});
+    return this.wsClient.execute({
+      method: "subscriber.offline",
+      params: {}
+    });
+  }
 };
 
 // src/fabric/HTTPClient.ts
-var import_core28 = require("@signalwire/core");
 var import_jwt_decode3 = __toESM(require("jwt-decode"));
+var import_core44 = require("@signalwire/core");
+
+// src/utils/paginatedResult.ts
+function buildPaginatedResult(body, client) {
+  const anotherPage = (url) => __async(this, null, function* () {
+    const { body: body2 } = yield client(url);
+    return buildPaginatedResult(body2, client);
+  });
+  return {
+    data: body.data,
+    self: () => __async(this, null, function* () {
+      const { self } = body.links;
+      return self ? anotherPage(self) : void 0;
+    }),
+    nextPage: () => __async(this, null, function* () {
+      const { next } = body.links;
+      return next ? anotherPage(next) : void 0;
+    }),
+    prevPage: () => __async(this, null, function* () {
+      const { prev } = body.links;
+      return prev ? anotherPage(prev) : void 0;
+    }),
+    firstPage: () => __async(this, null, function* () {
+      const { first } = body.links;
+      return first ? anotherPage(first) : void 0;
+    }),
+    hasNext: Boolean(body.links.next),
+    hasPrev: Boolean(body.links.prev)
+  };
+}
+
+// src/utils/makeQueryParamsUrl.ts
+function makeQueryParamsUrls(path, queryParams) {
+  const queryString = queryParams.toString();
+  return queryString ? `${path}?${queryString}` : path;
+}
+
+// src/fabric/HTTPClient.ts
 var HTTPClient = class {
   constructor(options) {
     this.options = options;
@@ -2453,6 +3214,9 @@ var HTTPClient = class {
       }
     });
   }
+  get fetch() {
+    return this.httpClient;
+  }
   get httpHost() {
     let decodedJwt = {};
     try {
@@ -2461,7 +3225,7 @@ var HTTPClient = class {
       });
     } catch (e) {
       if (process.env.NODE_ENV !== "production") {
-        (0, import_core28.getLogger)().debug("[JWTSession] error decoding the JWT");
+        (0, import_core44.getLogger)().debug("[JWTSession] error decoding the JWT");
       }
     }
     const host = this.options.host || (decodedJwt == null ? void 0 : decodedJwt.ch);
@@ -2470,45 +3234,30 @@ var HTTPClient = class {
     }
     return `fabric.${host.split(".").splice(1).join(".")}`;
   }
+  getAddress(options) {
+    return __async(this, null, function* () {
+      const { id } = options;
+      let path = `/api/fabric/addresses/${id}`;
+      const { body } = yield this.httpClient(path);
+      return body;
+    });
+  }
   getAddresses(options) {
     return __async(this, null, function* () {
-      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 { type, displayName, pageSize } = options || {};
+      let path = "/api/fabric/addresses";
+      const queryParams = new URLSearchParams();
+      if (type) {
+        queryParams.append("type", type);
       }
-      const { body } = yield this.httpClient(path);
-      const anotherPage = (url) => __async(this, null, function* () {
-        const { body: body2 } = yield this.httpClient(url);
-        return buildResult(body2);
-      });
-      const buildResult = (body2) => {
-        return {
-          addresses: body2.data,
-          nextPage: () => __async(this, null, function* () {
-            const { next } = body2.links;
-            return next ? anotherPage(next) : void 0;
-          }),
-          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);
+      if (displayName) {
+        queryParams.append("display_name", displayName);
+      }
+      if (pageSize) {
+        queryParams.append("page_size", pageSize.toString());
+      }
+      const { body } = yield this.httpClient(makeQueryParamsUrls(path, queryParams));
+      return buildPaginatedResult(body, this.httpClient);
     });
   }
   registerDevice(_0) {
@@ -2535,6 +3284,143 @@ var HTTPClient = class {
       });
     });
   }
+  getSubscriberInfo() {
+    return __async(this, null, function* () {
+      let path = "/api/fabric/subscriber/info";
+      const { body } = yield this.httpClient(path);
+      return body;
+    });
+  }
+};
+
+// src/fabric/ConversationAPI.ts
+var ConversationAPI = class {
+  constructor(conversation, data) {
+    this.conversation = conversation;
+    this.data = data;
+  }
+  get id() {
+    return this.data.id;
+  }
+  get created_at() {
+    return this.data.created_at;
+  }
+  get last_message_at() {
+    return this.data.last_message_at;
+  }
+  get metadata() {
+    return this.data.metadata;
+  }
+  get name() {
+    return this.data.name;
+  }
+  sendMessage(options) {
+    return this.conversation.sendMessage({
+      addressId: this.id,
+      text: options.text
+    });
+  }
+  getMessages(options) {
+    return this.conversation.getConversationMessages(__spreadValues({ addressId: this.id }, options));
+  }
+};
+
+// src/fabric/Conversation.ts
+var Conversation = class {
+  constructor(options) {
+    __publicField(this, "httpClient");
+    __publicField(this, "wsClient");
+    __publicField(this, "callbacks", []);
+    this.httpClient = options.httpClient;
+    this.wsClient = options.wsClient;
+    this.wsClient.clientApi.runWorker("conversationWorker", {
+      worker: conversationWorker,
+      initialState: {
+        conversation: this
+      }
+    });
+  }
+  sendMessage(options) {
+    return __async(this, null, function* () {
+      try {
+        const { addressId, text } = options;
+        const path = "/api/fabric/messages";
+        const { body } = yield this.httpClient.fetch(path, {
+          method: "POST",
+          body: {
+            conversation_id: addressId,
+            text
+          }
+        });
+        return body;
+      } catch (error) {
+        throw new Error("Error sending message to conversation!", error);
+      }
+    });
+  }
+  getConversations(options) {
+    return __async(this, null, function* () {
+      try {
+        const { pageSize } = options || {};
+        const path = "/api/fabric/conversations";
+        const queryParams = new URLSearchParams();
+        if (pageSize) {
+          queryParams.append("page_size", pageSize.toString());
+        }
+        const { body } = yield this.httpClient.fetch(makeQueryParamsUrls(path, queryParams));
+        const self = this;
+        const data = body.data.map((conversation) => new ConversationAPI(self, conversation));
+        return buildPaginatedResult(__spreadProps(__spreadValues({}, body), { data }), this.httpClient.fetch);
+      } catch (error) {
+        throw new Error("Error fetching the conversation history!", error);
+      }
+    });
+  }
+  getMessages(options) {
+    return __async(this, null, function* () {
+      try {
+        const { pageSize } = options || {};
+        const path = "/api/fabric/messages";
+        const queryParams = new URLSearchParams();
+        if (pageSize) {
+          queryParams.append("page_size", pageSize.toString());
+        }
+        const { body } = yield this.httpClient.fetch(makeQueryParamsUrls(path, queryParams));
+        return buildPaginatedResult(body, this.httpClient.fetch);
+      } catch (error) {
+        throw new Error("Error fetching the conversation messages!", error);
+      }
+    });
+  }
+  getConversationMessages(options) {
+    return __async(this, null, function* () {
+      try {
+        const { addressId, pageSize } = options || {};
+        const path = `/api/fabric/conversations/${addressId}/messages`;
+        const queryParams = new URLSearchParams();
+        if (pageSize) {
+          queryParams.append("page_size", pageSize.toString());
+        }
+        const { body } = yield this.httpClient.fetch(makeQueryParamsUrls(path, queryParams));
+        return buildPaginatedResult(body, this.httpClient.fetch);
+      } catch (error) {
+        throw new Error("Error fetching the conversation messages!", error);
+      }
+    });
+  }
+  subscribe(callback) {
+    return __async(this, null, function* () {
+      this.wsClient.connect();
+      this.callbacks.push(callback);
+    });
+  }
+  handleEvent(event) {
+    if (this.callbacks.length) {
+      this.callbacks.forEach((callback) => {
+        callback(event);
+      });
+    }
+  }
 };
 
 // src/fabric/SignalWire.ts
@@ -2543,16 +3429,30 @@ var SignalWire = (options) => {
     try {
       const httpClient = new HTTPClient(options);
       const wsClient = new WSClient(options);
+      const conversation = new Conversation({ httpClient, wsClient });
       resolve({
         httpHost: httpClient.httpHost,
-        getAddresses: httpClient.getAddresses.bind(httpClient),
         registerDevice: httpClient.registerDevice.bind(httpClient),
         unregisterDevice: httpClient.unregisterDevice.bind(httpClient),
+        getSubscriberInfo: httpClient.getSubscriberInfo.bind(httpClient),
         connect: wsClient.connect.bind(wsClient),
         disconnect: wsClient.disconnect.bind(wsClient),
+        online: wsClient.online.bind(wsClient),
+        offline: wsClient.offline.bind(wsClient),
         dial: wsClient.dial.bind(wsClient),
         handlePushNotification: wsClient.handlePushNotification.bind(wsClient),
         updateToken: wsClient.updateToken.bind(wsClient),
+        address: {
+          getAddresses: httpClient.getAddresses.bind(httpClient),
+          getAddress: httpClient.getAddress.bind(httpClient)
+        },
+        conversation: {
+          getConversations: conversation.getConversations.bind(conversation),
+          getMessages: conversation.getMessages.bind(conversation),
+          getConversationMessages: conversation.getConversationMessages.bind(conversation),
+          subscribe: conversation.subscribe.bind(conversation),
+          sendMessage: conversation.sendMessage.bind(conversation)
+        },
         __httpClient: httpClient,
         __wsClient: wsClient
       });
@@ -2562,100 +3462,6 @@ var SignalWire = (options) => {
   }));
 };
 
-// src/chat/index.ts
-var chat_exports = {};
-__export(chat_exports, {
-  ChatMember: () => import_core29.ChatMember,
-  ChatMessage: () => import_core29.ChatMessage,
-  Client: () => Client3
-});
-
-// src/chat/Client.ts
-var INTERCEPTED_METHODS = [
-  "subscribe",
-  "publish",
-  "getMessages",
-  "getMembers",
-  "getMemberState",
-  "getAllowedChannels",
-  "setMemberState"
-];
-var Client3 = function(chatOptions) {
-  const client = createClient(chatOptions);
-  const createInterceptor = (prop) => {
-    return (...params) => __async(this, null, function* () {
-      yield client.connect();
-      return client.chat[prop](...params);
-    });
-  };
-  const interceptors = {
-    _session: client,
-    disconnect: () => client.disconnect()
-  };
-  return new Proxy(client.chat, {
-    get(target, prop, receiver) {
-      if (prop in interceptors) {
-        return interceptors[prop];
-      }
-      if (INTERCEPTED_METHODS.includes(prop)) {
-        return createInterceptor(prop);
-      }
-      return Reflect.get(target, prop, receiver);
-    }
-  });
-};
-
-// src/chat/index.ts
-var import_core29 = require("@signalwire/core");
-
-// src/pubSub/index.ts
-var pubSub_exports = {};
-__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 = [
-  "getAllowedChannels",
-  "subscribe",
-  "publish"
-];
-var Client4 = function(pubSubOptions) {
-  const client = createClient(pubSubOptions);
-  const createInterceptor = (prop) => {
-    return (...params) => __async(this, null, function* () {
-      yield client.connect();
-      return client.pubSub[prop](...params);
-    });
-  };
-  const interceptors = {
-    _session: client,
-    disconnect: () => client.disconnect()
-  };
-  return new Proxy(client.pubSub, {
-    get(target, prop, receiver) {
-      if (prop in interceptors) {
-        return interceptors[prop];
-      }
-      if (INTERCEPTED_METHODS2.includes(prop)) {
-        return createInterceptor(prop);
-      }
-      return Reflect.get(target, prop, receiver);
-    }
-  });
-};
-
-// src/pubSub/index.ts
-var PubSubMessage = import_core31.PubSub.PubSubMessage;
-
 // src/webrtc.ts
 var webrtc_exports = {};
 __export(webrtc_exports, {