@signalwire/js 3.19.0 → 3.19.1

package/dist/index.js

@@ -752,7 +752,7 @@ var memberPositionWorker = function* memberPositionWorker2(options) {
 var import_core9 = require("@signalwire/core");
 var childMemberJoinedWorker = function* (options) {
   (0, import_core9.getLogger)().trace("childMemberJoinedWorker started");
-  const { channels, instance, initialState } = options;
+  const { channels, instance, initialState, onDone, onFail } = options;
   const { swEventChannel } = channels;
   const { parentId } = initialState;
   if (!parentId) {
@@ -766,16 +766,22 @@ var childMemberJoinedWorker = function* (options) {
   });
   const { member } = action.payload;
   if (member == null ? void 0 : member.parent_id) {
-    instance._attachListeners(member.id);
-    instance.applyEmitterTransforms();
-    const parent = yield import_core9.sagaEffects.select(import_core9.componentSelectors.getComponent, member.parent_id);
+    const byId = yield import_core9.sagaEffects.select(import_core9.componentSelectors.getComponentsById);
+    const parent = Object.values(byId).find((row) => {
+      return "memberId" in row && row.memberId === member.parent_id;
+    });
     if (parent) {
+      instance._attachListeners(member.id);
+      instance.applyEmitterTransforms();
       yield import_core9.sagaEffects.put(import_core9.componentActions.upsert({
         id: instance.callId,
         roomId: action.payload.room_id,
         roomSessionId: action.payload.room_session_id,
         memberId: member.id
       }));
+      onDone == null ? void 0 : onDone();
+    } else {
+      onFail == null ? void 0 : onFail({ error: new Error("Unknown parent_id") });
     }
   }
   (0, import_core9.getLogger)().trace("childMemberJoinedWorker ended");
@@ -982,61 +988,65 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
   }
   startScreenShare() {
     return __async(this, arguments, function* (opts = {}) {
-      var _a;
-      const {
-        autoJoin = true,
-        audio = false,
-        video = true,
-        layout,
-        positions
-      } = opts;
-      const displayStream = yield (0, import_webrtc4.getDisplayMedia)({
-        audio: audio === true ? SCREENSHARE_AUDIO_CONSTRAINTS : audio,
-        video
-      });
-      const options = __spreadProps(__spreadValues({}, this.options), {
-        screenShare: true,
-        recoverCall: false,
-        localStream: displayStream,
-        remoteStream: void 0,
-        userVariables: __spreadProps(__spreadValues({}, ((_a = this.options) == null ? void 0 : _a.userVariables) || {}), {
-          memberCallId: this.callId,
-          memberId: this.memberId
-        }),
-        layout,
-        positions
-      });
-      const screenShare = (0, import_core10.connect)({
-        store: this.store,
-        Component: RoomSessionScreenShareAPI
-      })(options);
-      displayStream.getVideoTracks().forEach((t) => {
-        t.addEventListener("ended", () => {
-          if (screenShare && screenShare.active) {
-            screenShare.leave();
-          }
+      return new Promise((resolve, reject) => __async(this, null, function* () {
+        var _a;
+        const {
+          autoJoin = true,
+          audio = false,
+          video = true,
+          layout,
+          positions
+        } = opts;
+        const displayStream = yield (0, import_webrtc4.getDisplayMedia)({
+          audio: audio === true ? SCREENSHARE_AUDIO_CONSTRAINTS : audio,
+          video
         });
-      });
-      screenShare.once("destroy", () => {
-        screenShare.emit("room.left");
-        this._screenShareList.delete(screenShare);
-      });
-      try {
-        screenShare.runWorker("childMemberJoinedWorker", {
-          worker: childMemberJoinedWorker,
-          initialState: {
-            parentId: this.memberId
-          }
+        const options = __spreadProps(__spreadValues({}, this.options), {
+          screenShare: true,
+          recoverCall: false,
+          localStream: displayStream,
+          remoteStream: void 0,
+          userVariables: __spreadProps(__spreadValues({}, ((_a = this.options) == null ? void 0 : _a.userVariables) || {}), {
+            memberCallId: this.callId,
+            memberId: this.memberId
+          }),
+          layout,
+          positions
+        });
+        const screenShare = (0, import_core10.connect)({
+          store: this.store,
+          Component: RoomSessionScreenShareAPI
+        })(options);
+        displayStream.getVideoTracks().forEach((t) => {
+          t.addEventListener("ended", () => {
+            if (screenShare && screenShare.active) {
+              screenShare.leave();
+            }
+          });
+        });
+        screenShare.once("destroy", () => {
+          screenShare.emit("room.left");
+          this._screenShareList.delete(screenShare);
         });
-        this._screenShareList.add(screenShare);
-        if (autoJoin) {
-          yield screenShare.join();
+        try {
+          screenShare.runWorker("childMemberJoinedWorker", {
+            worker: childMemberJoinedWorker,
+            onDone: () => resolve(screenShare),
+            onFail: reject,
+            initialState: {
+              parentId: this.memberId
+            }
+          });
+          this._screenShareList.add(screenShare);
+          if (autoJoin) {
+            return yield screenShare.join();
+          }
+          return resolve(screenShare);
+        } catch (error) {
+          this.logger.error("ScreenShare Error", error);
+          reject(error);
         }
-        return screenShare;
-      } catch (error) {
-        this.logger.error("ScreenShare Error", error);
-        throw error;
-      }
+      }));
     });
   }
   addCamera(opts = {}) {
@@ -1055,47 +1065,51 @@ var RoomSessionConnection = class extends import_webrtc4.BaseConnection {
   }
   addDevice() {
     return __async(this, arguments, function* (opts = {}) {
-      var _a;
-      const { autoJoin = true, audio = false, video = false } = opts;
-      if (!audio && !video) {
-        throw new TypeError("At least one of `audio` or `video` must be requested.");
-      }
-      const options = __spreadProps(__spreadValues({}, this.options), {
-        localStream: void 0,
-        remoteStream: void 0,
-        audio,
-        video,
-        additionalDevice: true,
-        recoverCall: false,
-        userVariables: __spreadProps(__spreadValues({}, ((_a = this.options) == null ? void 0 : _a.userVariables) || {}), {
-          memberCallId: this.callId,
-          memberId: this.memberId
-        })
-      });
-      const roomDevice = (0, import_core10.connect)({
-        store: this.store,
-        Component: RoomSessionDeviceAPI
-      })(options);
-      roomDevice.once("destroy", () => {
-        roomDevice.emit("room.left");
-        this._deviceList.delete(roomDevice);
-      });
-      try {
-        roomDevice.runWorker("childMemberJoinedWorker", {
-          worker: childMemberJoinedWorker,
-          initialState: {
-            parentId: this.memberId
-          }
+      return new Promise((resolve, reject) => __async(this, null, function* () {
+        var _a;
+        const { autoJoin = true, audio = false, video = false } = opts;
+        if (!audio && !video) {
+          throw new TypeError("At least one of `audio` or `video` must be requested.");
+        }
+        const options = __spreadProps(__spreadValues({}, this.options), {
+          localStream: void 0,
+          remoteStream: void 0,
+          audio,
+          video,
+          additionalDevice: true,
+          recoverCall: false,
+          userVariables: __spreadProps(__spreadValues({}, ((_a = this.options) == null ? void 0 : _a.userVariables) || {}), {
+            memberCallId: this.callId,
+            memberId: this.memberId
+          })
         });
-        this._deviceList.add(roomDevice);
-        if (autoJoin) {
-          yield roomDevice.join();
+        const roomDevice = (0, import_core10.connect)({
+          store: this.store,
+          Component: RoomSessionDeviceAPI
+        })(options);
+        roomDevice.once("destroy", () => {
+          roomDevice.emit("room.left");
+          this._deviceList.delete(roomDevice);
+        });
+        try {
+          roomDevice.runWorker("childMemberJoinedWorker", {
+            worker: childMemberJoinedWorker,
+            onDone: () => resolve(roomDevice),
+            onFail: reject,
+            initialState: {
+              parentId: this.memberId
+            }
+          });
+          this._deviceList.add(roomDevice);
+          if (autoJoin) {
+            return yield roomDevice.join();
+          }
+          return resolve(roomDevice);
+        } catch (error) {
+          this.logger.error("RoomDevice Error", error);
+          reject(error);
         }
-        return roomDevice;
-      } catch (error) {
-        this.logger.error("RoomDevice Error", error);
-        throw error;
-      }
+      }));
     });
   }
   join() {
@@ -1379,7 +1393,7 @@ var JWTSession = class extends import_core14.BaseJWTSession {
     this.options = options;
     __publicField(this, "WebSocketConstructor", WebSocket);
     __publicField(this, "CloseEventConstructor", CloseEvent);
-    __publicField(this, "agent", "@signalwire/js/browser/3.19.0");
+    __publicField(this, "agent", "@signalwire/js/browser/3.19.1");
   }
   get allowReattach() {
     var _a;
@@ -1968,6 +1982,9 @@ var RoomSession = function(roomOptions) {
     reattachManager.destroy();
     client.disconnect();
   });
+  client.once("session.disconnected", () => {
+    room.destroy();
+  });
   const join = (params) => {
     return new Promise((resolve, reject) => __async(this, null, function* () {
       var _a2, _b;