@webex/widgets 1.22.2 → 1.22.3

package/dist/webexWidgets.esm.js

@@ -12704,7 +12704,113 @@ performance.now || performance.mozNow || performance.msNow || performance.oNow |
   return new Date().getTime();
 }; // generate timestamp or delta
 
+/**
+ * Custom rxjs operator for chaining dependent observables.
+ * Usage:
+ ```js
+  obs.pipe(
+    chainWith((lastMessage) => createDependentObservable(lastMessage),
+  );
+  ```
+ *
+ * @param {function(lastMessage): Observable} createDependentObservable  Function that is passed the last message emitted by the source observable and returns a new observable
+ * @returns {Observable} observable
+ */
+
+
+function chainWith(createDependentObservable) {
+  return source => new Observable(subscriber => {
+    let lastValue;
+    let subscription;
+    subscription = source.subscribe(value => {
+      subscriber.next(value);
+      lastValue = value;
+    }, error => subscriber.error(error), () => {
+      subscription = createDependentObservable(lastValue).subscribe(value => subscriber.next(value), error => subscriber.error(error), () => subscriber.complete());
+    });
+    return () => {
+      if (subscription) {
+        subscription.unsubscribe();
+      }
+    };
+  });
+}
+/**
+ * Custom rxjs operator that works like combineLatest, but emits even if some of the source observables haven't emitted yet.
+ * Usage:
+ ```js
+  combineLatestImmediate(obs1, obs2, ...);
+  ```
+ *
+ * @param {ObservableInput} [observables] An array of input Observables to combine with each other.
+ * @returns {Observable} Observable that emits arrays containing the last emitted value from each of the observables defined above.
+ */
+
+
+function combineLatestImmediate() {
+  for (var _len = arguments.length, observables = new Array(_len), _key = 0; _key < _len; _key++) {
+    observables[_key] = arguments[_key];
+  }
+
+  return combineLatest(observables.map(obs => obs.pipe(startWith(undefined))));
+}
+/**
+ * Helper function for deep merge on objects.
+ *
+ * @param {object} dest - The destination object.
+ * @param {object} src - The source object.
+ */
+
+
+function deepMerge(dest, src) {
+  const result = dest;
+
+  for (const [key, val] of Object.entries(src || {})) {
+    if (val && val.constructor === Object) {
+      deepMerge(result[key], val);
+    } else {
+      result[key] = val;
+    }
+  }
+}
+/**
+ * Safe JSON stringifier that:
+ * - replaces circular references with the text [circular-reference]
+ * - catches any JSON.stringify error and returns [error-stringifying:<ERROR-MESSAGE>]
+ *
+ * @param {any} data  Data to be stringified
+ * @param {function} [replacer]  JSON.stringify() replacer parameter
+ * @param {string|number} [space]  JSON.stringify() space parameter
+ * @returns {string} The string result
+ */
+
+
+function safeJsonStringify(data, replacer, space) {
+  const seen = new WeakSet();
+  let str;
+
+  try {
+    str = JSON.stringify(data, (key, value) => {
+      let replaced = replacer ? replacer(key, value) : value;
+
+      if (typeof replaced === 'object' && replaced !== null) {
+        if (seen.has(replaced)) {
+          replaced = '[circular-reference]';
+        } else {
+          seen.add(replaced);
+        }
+      }
+
+      return replaced;
+    }, space);
+  } catch (error) {
+    str = `[error-stringifying:${error.message}]`;
+  }
+
+  return str;
+}
 
+const isSpeakerSupported = !!document.createElement('audio').setSinkId;
 const logFormat = format.printf(_ref => {
   let {
     timestamp,
@@ -12718,7 +12824,7 @@ const logFormat = format.printf(_ref => {
   let msgString = message;
 
   if (Array.isArray(message)) {
-    msgString = message.map(item => typeof item === 'string' && item || JSON.stringify(item, (key, value) => value instanceof MediaStream && `MediaStream([${value.getTracks().map(track => track.kind)}])` || value, 2)).join(' ');
+    msgString = message.map(item => typeof item === 'string' && item || safeJsonStringify(item, (key, value) => value instanceof MediaStream && `MediaStream([${value.getTracks().map(track => track.kind)}])` || value, 2)).join(' ');
   }
 
   return `${timestamp} ${level} ${resourceType} ${resourceID} ${action} ${msgString} ${error ? ` ${error.stack || error}` : ''}`;
@@ -13396,77 +13502,6 @@ class ShareControl extends MeetingControl {
   }
 
 }
-/**
- * Custom rxjs operator for chaining dependent observables.
- * Usage:
- ```js
-  obs.pipe(
-    chainWith((lastMessage) => createDependentObservable(lastMessage),
-  );
-  ```
- *
- * @param {function(lastMessage): Observable} createDependentObservable  Function that is passed the last message emitted by the source observable and returns a new observable
- * @returns {Observable} observable
- */
-
-
-function chainWith(createDependentObservable) {
-  return source => new Observable(subscriber => {
-    let lastValue;
-    let subscription;
-    subscription = source.subscribe(value => {
-      subscriber.next(value);
-      lastValue = value;
-    }, error => subscriber.error(error), () => {
-      subscription = createDependentObservable(lastValue).subscribe(value => subscriber.next(value), error => subscriber.error(error), () => subscriber.complete());
-    });
-    return () => {
-      if (subscription) {
-        subscription.unsubscribe();
-      }
-    };
-  });
-}
-/**
- * Custom rxjs operator that works like combineLatest, but emits even if some of the source observables haven't emitted yet.
- * Usage:
- ```js
-  combineLatestImmediate(obs1, obs2, ...);
-  ```
- *
- * @param {ObservableInput} [observables] An array of input Observables to combine with each other.
- * @returns {Observable} Observable that emits arrays containing the last emitted value from each of the observables defined above.
- */
-
-
-function combineLatestImmediate() {
-  for (var _len = arguments.length, observables = new Array(_len), _key = 0; _key < _len; _key++) {
-    observables[_key] = arguments[_key];
-  }
-
-  return combineLatest(observables.map(obs => obs.pipe(startWith(undefined))));
-}
-/**
- * Helper function for deep merge on objects.
- *
- * @param {object} dest - The destination object.
- * @param {object} src - The source object.
- */
-
-
-function deepMerge(dest, src) {
-  const result = dest;
-
-  for (const [key, val] of Object.entries(src || {})) {
-    if (val && val.constructor === Object) {
-      deepMerge(result[key], val);
-    } else {
-      result[key] = val;
-    }
-  }
-}
-
-const isSpeakerSupported = !!document.createElement('audio').setSinkId;
 /**
  * Display options of a meeting control.
  *
@@ -13474,6 +13509,7 @@ const isSpeakerSupported = !!document.createElement('audio').setSinkId;
  * @see {@link https://github.com/webex/component-adapter-interfaces/blob/master/src/MeetingsAdapter.js#L58}
  */
 
+
 class SwitchCameraControl extends MeetingControl {
   /**
    * Calls the action of the switch camera control.
@@ -13500,7 +13536,7 @@ class SwitchCameraControl extends MeetingControl {
       meetingID
     }]);
     const cameraID$ = this.adapter.getMeeting(meetingID).pipe(map(meeting => meeting.cameraID), distinctUntilChanged());
-    const options$ = defer(() => this.adapter.getAvailableDevices(meetingID, 'videoinput')).pipe(map(availableCameras => availableCameras.map(camera => ({
+    const options$ = this.adapter.getAvailableDevices(meetingID, 'videoinput').pipe(map(availableCameras => availableCameras.map(camera => ({
       value: camera.deviceId,
       label: camera.label
     }))));
@@ -13553,7 +13589,7 @@ class SwitchMicrophoneControl extends MeetingControl {
       meetingID
     }]);
     const microphoneID$ = this.adapter.getMeeting(meetingID).pipe(map(meeting => meeting.microphoneID), distinctUntilChanged());
-    const options$ = defer(() => this.adapter.getAvailableDevices(meetingID, 'audioinput')).pipe(map(availableMicrophones => availableMicrophones.map(microphone => ({
+    const options$ = this.adapter.getAvailableDevices(meetingID, 'audioinput').pipe(map(availableMicrophones => availableMicrophones.map(microphone => ({
       value: microphone.deviceId,
       label: microphone.label
     }))));
@@ -13606,7 +13642,7 @@ class SwitchSpeakerControl extends MeetingControl {
       meetingID
     }]);
     const speakerID$ = this.adapter.getMeeting(meetingID).pipe(map(meeting => meeting.speakerID), distinctUntilChanged());
-    const options$ = defer(() => this.adapter.getAvailableDevices(meetingID, 'audiooutput')).pipe(map(availableSpeakers => availableSpeakers.map(speaker => ({
+    const options$ = this.adapter.getAvailableDevices(meetingID, 'audiooutput').pipe(map(availableSpeakers => availableSpeakers.map(speaker => ({
       value: speaker.deviceId,
       label: speaker.label
     }))), map(options => [{
@@ -13930,7 +13966,7 @@ class MeetingsSDKAdapter extends d {
           }
         }, 2000);
         const [localStream] = await sdkMeeting.getMediaStreams(mediaDirection, audioVideo);
-        const availableDevices = await this.getAvailableDevices(ID);
+        const availableDevices = await navigator.mediaDevices.enumerateDevices();
         const [{
           label: deviceLabel
         }] = localStream.getTracks();
@@ -13962,10 +13998,7 @@ class MeetingsSDKAdapter extends d {
         if (!ignored) {
           let perm;
           const ee = error.error;
-          logger.error('MEETING', ID, 'getStream()', ['Unable to retrieve local media stream', {
-            mediaDirection,
-            audioVideo
-          }], ee);
+          logger.error('MEETING', ID, 'getStream()', 'Unable to retrieve local media stream', ee || error);
 
           if (ee instanceof DOMException) {
             if (ee.name === 'NotAllowedError') {
@@ -14019,35 +14052,38 @@ class MeetingsSDKAdapter extends d {
     });
   }
   /**
-   * Returns available media devices.
+   * Emits available media devices.
+   * If the user did no grant access to media (browser and OS), the returned observable
+   * will emit an empty array.
    *
-   * @param {string} ID ID of the meeting
-   * @param {'videoinput'|'audioinput'|'audiooutput'} [type] String specifying the device type.
+   * @param {string} ID  Id of the meeting
+   * @param {'videoinput'|'audioinput'|'audiooutput'} type  String specifying the device type.
    * See {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaDeviceInfo/kind|MDN}
-   * @returns {MediaDeviceInfo[]} Array containing media devices.
+   * @returns {Observable<MediaDeviceInfo[]>} Observable that emits arrays containing media devices.
    * @private
    */
-  // eslint-disable-next-line class-methods-use-this
 
 
-  async getAvailableDevices(ID, type) {
+  getAvailableDevices(ID, type) {
     logger.debug('MEETING', ID, 'getAvailableDevices()', ['called with', {
       ID,
       type
     }]);
-    let devices;
 
-    try {
-      const sdkMeeting = this.fetchMeeting(ID);
-      devices = await sdkMeeting.getDevices();
-      devices = devices.filter(device => !type || device.kind === type && device.deviceId);
-    } catch (error) {
-      logger.error('MEETING', ID, 'getAvailableDevices()', 'Unable to retrieve devices', error);
-      devices = [];
-    }
+    const getDevices = async () => {
+      let devices = [];
+
+      try {
+        devices = await this.fetchMeeting(ID).getDevices();
+        devices = devices.filter(device => !type || device.kind === type && device.deviceId);
+      } catch (error) {
+        logger.error('MEETING', ID, 'getAvailableDevices()', 'Unable to retrieve devices', error);
+      }
+
+      return devices;
+    };
 
-    logger.debug('MEETING', ID, 'getAvailabelDevices()', ['return', devices]);
-    return devices;
+    return this.getMeeting(ID).pipe(map(meeting => type !== 'videoinput' && type !== 'audioinput' || type === 'videoinput' && meeting.localVideo.permission === 'ALLOWED' || type === 'audioinput' && meeting.localAudio.permission === 'ALLOWED'), distinctUntilChanged(), concatMap(allowed => from(allowed ? getDevices() : [[]])), tap(devices => logger.debug('MEETING', ID, 'getAvailabelDevices()', ['emitting', devices])));
   }
   /**
    * Update the meeting object with media attached based on a given event type.
@@ -14111,21 +14147,24 @@ class MeetingsSDKAdapter extends d {
 
       case MEDIA_TYPE_REMOTE_SHARE:
         this.meetings[ID] = { ...meeting,
-          remoteShareStream: stream
+          remoteShareStream: stream,
+          remoteShare: meeting.remoteSharing ? stream : null
         };
         break;
 
       case EVENT_REMOTE_SHARE_START:
         // Only activate the remote stream when get get the start notification
         this.meetings[ID] = { ...meeting,
-          remoteShare: meeting.remoteShareStream
+          remoteShare: meeting.remoteShareStream || null,
+          remoteSharing: true
         };
         break;
 
       case EVENT_REMOTE_SHARE_STOP:
         // Remove remote share on stop event
         this.meetings[ID] = { ...meeting,
-          remoteShare: null
+          remoteShare: null,
+          remoteSharing: false
         };
         break;
     }
@@ -15529,7 +15568,7 @@ var defineProperty = defineProperty$1;
 })(constants);
 
 var name = "@webex/sdk-component-adapter";
-var version = "1.95.0";
+var version = "1.97.1";
 const LOG_ARGS$1 = ['SDK-MEMBERSHIPS', `${name}-${version}`]; // max parameter value must be greater than 0 and less than or equal to 1000
 
 const MAX_MEMBERSHIPS = 1000; // TODO: Figure out how to import JS Doc definitions and remove duplication.
@@ -16571,7 +16610,7 @@ var WebexMeetings = si(ai(WebexMeetingsWidget), function (props) {
     },
     config: {
       appName: appName,
-      appVersion: "1.22.1"
+      appVersion: "1.22.2"
     }
   });
   return new WebexSDKAdapter(webex);