@webex/plugin-meetings 1.149.0 → 1.150.1

package/src/meeting/index.js

@@ -1310,7 +1310,7 @@ export default class Meeting extends StatelessWebexPlugin {
 
   /**
    * Set up the locus info media shares listener
-   * update content sharing id value for members, and updates the member
+   * update content and whiteboard sharing id value for members, and updates the member
    * notifies consumer with members:content:update {activeContentSharingId, endedContentSharingId}
    * @returns {undefined}
    * @private
@@ -1319,11 +1319,16 @@ export default class Meeting extends StatelessWebexPlugin {
   setUpLocusMediaSharesListener() {
     // Will get triggered on local and remote share
     this.locusInfo.on(EVENTS.LOCUS_INFO_UPDATE_MEDIA_SHARES, (payload) => {
-      const {contentId, disposition} = payload.current;
+      const {content: contentShare, whiteboard: whiteboardShare} = payload.current;
+      const previousContentShare = payload.previous?.content;
+      const previousWhiteboardShare = payload.previous?.whiteboard;
 
       if (
-        contentId === payload.previous?.contentId &&
-        disposition === payload.previous?.disposition
+        (contentShare.beneficiaryId === previousContentShare?.beneficiaryId &&
+          contentShare.disposition === previousContentShare?.disposition) &&
+        (whiteboardShare.beneficiaryId === previousWhiteboardShare?.beneficiaryId &&
+          whiteboardShare.disposition === previousWhiteboardShare?.disposition &&
+          whiteboardShare.resourceUrl === previousWhiteboardShare?.resourceUrl)
       ) {
         // nothing changed, so ignore
         // (this happens when we steal presentation from remote)
@@ -1334,15 +1339,16 @@ export default class Meeting extends StatelessWebexPlugin {
 
       // REMOTE - check if remote started sharing
       if (
-        this.selfId !== contentId &&
-        disposition === FLOOR_ACTION.GRANTED
+        this.selfId !== contentShare.beneficiaryId &&
+        contentShare.disposition === FLOOR_ACTION.GRANTED
       ) {
+        // CONTENT - sharing content remote
         newShareStatus = SHARE_STATUS.REMOTE_SHARE_ACTIVE;
       }
-      // LOCAL - check if we started sharing
+      // LOCAL - check if we started sharing content
       else if (
-        this.selfId === contentId &&
-        disposition === FLOOR_ACTION.GRANTED
+        this.selfId === contentShare.beneficiaryId &&
+        contentShare.disposition === FLOOR_ACTION.GRANTED
       ) {
         if (this.mediaProperties.shareTrack?.readyState === 'ended') {
           this.stopShare({
@@ -1353,13 +1359,23 @@ export default class Meeting extends StatelessWebexPlugin {
             });
         }
         else {
+          // CONTENT - sharing content local
           newShareStatus = SHARE_STATUS.LOCAL_SHARE_ACTIVE;
         }
       }
-      // or if sharing has been stopped
+      // If we did not hit the cases above, no one is sharng content, so we check if we are sharing whiteboard
+      // There is no concept of local/remote share for whiteboard
+      // It does not matter who requested to share the whiteboard, everyone gets the same view
+      else if (whiteboardShare.disposition === FLOOR_ACTION.GRANTED) {
+        // WHITEBOARD - sharing whiteboard
+        newShareStatus = SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE;
+      }
+      // or if content share is either released or null and whiteboard share is either released or null, no one is sharing
       else if (
-        payload.previous &&
-        disposition === FLOOR_ACTION.RELEASED
+        (previousContentShare &&
+          (contentShare.disposition === FLOOR_ACTION.RELEASED) || (contentShare.disposition === null)) &&
+        (previousWhiteboardShare &&
+          (whiteboardShare.disposition === FLOOR_ACTION.RELEASED) || (whiteboardShare.disposition === null))
       ) {
         newShareStatus = SHARE_STATUS.NO_SHARE;
       }
@@ -1397,6 +1413,17 @@ export default class Meeting extends StatelessWebexPlugin {
             );
             break;
 
+          case SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE:
+            Trigger.trigger(
+              this,
+              {
+                file: 'meeting/index',
+                function: 'stopWhiteboardShare'
+              },
+              EVENT_TRIGGERS.MEETING_STOPPED_SHARING_WHITEBOARD
+            );
+            break;
+
           case SHARE_STATUS.NO_SHARE:
             // nothing to do
             break;
@@ -1417,13 +1444,16 @@ export default class Meeting extends StatelessWebexPlugin {
                 },
                 EVENT_TRIGGERS.MEETING_STARTED_SHARING_REMOTE,
                 {
-                  memberId: contentId
+                  memberId: contentShare.beneficiaryId
                 }
               );
             };
 
             // if a remote participant is stealing the presentation from us
-            if (this.mediaProperties.mediaDirection?.sendShare) {
+            if (!this.mediaProperties.mediaDirection?.sendShare || oldShareStatus === SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE) {
+              sendStartedSharingRemote();
+            }
+            else {
               this.updateShare({
                 sendShare: false,
                 receiveShare: this.mediaProperties.mediaDirection.receiveShare
@@ -1432,9 +1462,6 @@ export default class Meeting extends StatelessWebexPlugin {
                   sendStartedSharingRemote();
                 });
             }
-            else {
-              sendStartedSharingRemote();
-            }
             break;
           }
 
@@ -1450,6 +1477,22 @@ export default class Meeting extends StatelessWebexPlugin {
             Metrics.postEvent({event: eventType.LOCAL_SHARE_FLOOR_GRANTED, meeting: this});
             break;
 
+          case SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE:
+            Trigger.trigger(
+              this,
+              {
+                file: 'meeting/index',
+                function: 'startWhiteboardShare'
+              },
+              EVENT_TRIGGERS.MEETING_STARTED_SHARING_WHITEBOARD,
+              {
+                resourceUrl: whiteboardShare.resourceUrl,
+                memberId: whiteboardShare.beneficiaryId
+              }
+            );
+            Metrics.postEvent({event: eventType.WHITEBOARD_SHARE_FLOOR_GRANTED, meeting: this});
+            break;
+
           case SHARE_STATUS.NO_SHARE:
           // nothing to do
             break;
@@ -1471,9 +1514,27 @@ export default class Meeting extends StatelessWebexPlugin {
           },
           EVENT_TRIGGERS.MEETING_STARTED_SHARING_REMOTE,
           {
-            memberId: contentId
+            memberId: contentShare.beneficiaryId
+          }
+        );
+        this.members.locusMediaSharesUpdate(payload);
+      }
+      else if (newShareStatus === SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE) {
+        // if we got here, then some remote participant has stolen
+        // the presentation from another remote participant
+        Trigger.trigger(
+          this,
+          {
+            file: 'meeting/index',
+            function: 'startWhiteboardShare'
+          },
+          EVENT_TRIGGERS.MEETING_STARTED_SHARING_WHITEBOARD,
+          {
+            resourceUrl: whiteboardShare.resourceUrl,
+            memberId: whiteboardShare.beneficiaryId
           }
         );
+        Metrics.postEvent({event: eventType.WHITEBOARD_SHARE_FLOOR_GRANTED, meeting: this});
         this.members.locusMediaSharesUpdate(payload);
       }
     });
@@ -4491,6 +4552,105 @@ export default class Meeting extends StatelessWebexPlugin {
       });
   }
 
+  /**
+   * Start sharing whiteboard given channelUrl
+   * @param {string} channelUrl whiteboard url
+   * @param {String} resourceToken token created by authorize media injector
+   * @returns {Promise}
+   * @public
+   * @memberof Meeting
+   */
+  startWhiteboardShare(channelUrl, resourceToken) {
+    const whiteboard = this.locusInfo.mediaShares.find((element) => element.name === 'whiteboard');
+
+    if (!channelUrl) {
+      return Promise.reject(new ParameterError('Cannot share without channelUrl.'));
+    }
+
+    if (whiteboard) {
+      Metrics.postEvent({event: eventType.WHITEBOARD_SHARE_INITIATED, meeting: this});
+
+      const body = {
+        disposition: FLOOR_ACTION.GRANTED,
+        personUrl: this.locusInfo.self.url,
+        deviceUrl: this.deviceUrl,
+        uri: whiteboard.url,
+        resourceUrl: channelUrl
+      };
+
+      if (resourceToken) {
+        body.resourceToken = resourceToken;
+      }
+
+      return this.meetingRequest.changeMeetingFloor(body)
+        .then(() => {
+          this.isSharing = false;
+
+          return Promise.resolve();
+        })
+        .catch((error) => {
+          LoggerProxy.logger.error('Meeting:index#startWhiteboardShare --> Error ', error);
+
+          Metrics.sendOperationalMetric(
+            METRICS_OPERATIONAL_MEASURES.MEETING_START_WHITEBOARD_SHARE_FAILURE,
+            {
+              correlation_id: this.correlationId,
+              locus_id: this.locusUrl.split('/').pop(),
+              reason: error.message,
+              stack: error.stack,
+              board: {channelUrl}
+            }
+          );
+
+          return Promise.reject(error);
+        });
+    }
+
+    return Promise.reject(new ParameterError('Cannot share without whiteboard.'));
+  }
+
+  /**
+   * Stop sharing whiteboard given channelUrl
+   * @param {string} channelUrl whiteboard url
+   * @returns {Promise}
+   * @public
+   * @memberof Meeting
+   */
+  stopWhiteboardShare(channelUrl) {
+    const whiteboard = this.locusInfo.mediaShares.find((element) => element.name === 'whiteboard');
+
+    if (whiteboard) {
+      Metrics.postEvent({event: eventType.WHITEBOARD_SHARE_STOPPED, meeting: this});
+
+      return this.meetingRequest.changeMeetingFloor({
+        disposition: FLOOR_ACTION.RELEASED,
+        personUrl: this.locusInfo.self.url,
+        deviceUrl: this.deviceUrl,
+        uri: whiteboard.url
+      })
+        .catch((error) => {
+          LoggerProxy.logger.error('Meeting:index#stopWhiteboardShare --> Error ', error);
+
+          Metrics.sendOperationalMetric(
+            METRICS_OPERATIONAL_MEASURES.STOP_WHITEBOARD_SHARE_FAILURE,
+            {
+              correlation_id: this.correlationId,
+              locus_id: this.locusUrl.split('/').pop(),
+              reason: error.message,
+              stack: error.stack,
+              board: {channelUrl}
+            }
+          );
+
+          return Promise.reject(error);
+        })
+        .finally(() => {
+        });
+    }
+
+    return Promise.reject(new ParameterError('Cannot stop share without whiteboard.'));
+  }
+
   /**
    * Start sharing content with server
    * @returns {Promise} see #meetingRequest.changeMeetingFloor
@@ -4564,7 +4724,7 @@ export default class Meeting extends StatelessWebexPlugin {
       Metrics.postEvent({event: eventType.SHARE_STOPPED, meeting: this});
       Media.stopTracks(this.mediaProperties.shareTrack);
 
-      if (this.contentId !== this.selfId) {
+      if (content.floor.beneficiary.id !== this.selfId) {
         // remote participant started sharing and caused our sharing to stop, we don't want to send any floor action request in that case
         this.isSharing = false;
 

package/src/meeting/request.js

@@ -1,9 +1,7 @@
 import uuid from 'uuid';
 import {debounce} from 'lodash';
 import {StatelessWebexPlugin} from '@webex/webex-core';
-import {
-  deviceType
-} from '@webex/common';
+import {deviceType} from '@webex/common';
 
 import LoggerProxy from '../common/logs/logger-proxy';
 import {
@@ -51,7 +49,19 @@ export default class MeetingRequest extends StatelessWebexPlugin {
    */
   async joinMeeting(options) {
     const {
-      asResourceOccupant, sipUri, meetingNumber, deviceUrl, locusUrl, resourceId, correlationId, ensureConversation, moderator, pin, moveToResource, roapMessage, preferTranscoding
+      asResourceOccupant,
+      sipUri,
+      meetingNumber,
+      deviceUrl,
+      locusUrl,
+      resourceId,
+      correlationId,
+      ensureConversation,
+      moderator,
+      pin,
+      moveToResource,
+      roapMessage,
+      preferTranscoding
     } = options;
 
     LoggerProxy.logger.info(
@@ -95,29 +105,16 @@ export default class MeetingRequest extends StatelessWebexPlugin {
     if (locusUrl) {
       url = `${locusUrl}/${PARTICIPANT}`;
     }
-    else if (meetingNumber) {
+    else if (sipUri || meetingNumber) {
       try {
         await this.webex.internal.services.waitForCatalog('postauth');
         url = `${this.webex.internal.services.get('locus')}/${LOCI}/${CALL}`;
         body.invitee = {
-          address: `wbxmn:${meetingNumber}`
+          address: sipUri || `wbxmn:${meetingNumber}`
         };
       }
       catch (e) {
-        LoggerProxy.logger.error(`Meeting:request#joinMeeting  webex meeting id--> ${e}`);
-        throw (e);
-      }
-    }
-    else if (sipUri) {
-      try {
-        await this.webex.internal.services.waitForCatalog('postauth');
-        url = `${this.webex.internal.services.get('locus')}/${LOCI}/${CALL}`;
-        body.invitee = {
-          address: sipUri
-        };
-      }
-      catch (e) {
-        LoggerProxy.logger.error(`Meeting:request#joinMeeting sipUrl --> ${e}`);
+        LoggerProxy.logger.error(`Meeting:request#joinMeeting ${sipUri ? 'sipUri' : 'meetingNumber'} --> ${e}`);
         throw (e);
       }
     }
@@ -154,7 +151,10 @@ export default class MeetingRequest extends StatelessWebexPlugin {
    * @private
    */
   dialIn({
-    locusUrl, dialInUrl, clientUrl, correlationId
+    locusUrl,
+    dialInUrl,
+    clientUrl,
+    correlationId
   }) {
     LoggerProxy.logger.info(
       'Meeting:request#dialIn --> Provisioning a dial in device',
@@ -195,7 +195,11 @@ export default class MeetingRequest extends StatelessWebexPlugin {
    * @private
    */
   dialOut({
-    locusUrl, dialOutUrl, phoneNumber, clientUrl, correlationId
+    locusUrl,
+    dialOutUrl,
+    phoneNumber,
+    clientUrl,
+    correlationId
   }) {
     LoggerProxy.logger.info(
       'Meeting:request#dialOut --> Provisioning a dial out device',
@@ -294,7 +298,10 @@ export default class MeetingRequest extends StatelessWebexPlugin {
    * @private
    */
   disconnectPhoneAudio({
-    locusUrl, phoneUrl, correlationId, selfId
+    locusUrl,
+    phoneUrl,
+    correlationId,
+    selfId
   }) {
     LoggerProxy.logger.info(
       `Meeting:request#disconnectPhoneAudio --> request phone ${phoneUrl} to leave`,
@@ -334,7 +341,11 @@ export default class MeetingRequest extends StatelessWebexPlugin {
    * @returns {Promise}
    */
   leaveMeeting({
-    locusUrl, selfId, deviceUrl: url, resourceId, correlationId
+    locusUrl,
+    selfId,
+    deviceUrl: url,
+    resourceId,
+    correlationId
   }) {
     LoggerProxy.logger.info(
       'Meeting:request#leaveMeeting --> Leaving a meeting',
@@ -512,13 +523,19 @@ export default class MeetingRequest extends StatelessWebexPlugin {
       };
     }
 
+    const body = {
+      floor: floorReq,
+      resourceUrl: options.resourceUrl
+    };
+
+    if (options?.resourceToken) {
+      body.resourceToken = options?.resourceToken;
+    }
+
     return this.request({
       uri: options.uri,
       method: HTTP_VERBS.PUT,
-      body: {
-        floor: floorReq,
-        resourceUrl: options.resourceUrl
-      }
+      body
     });
   }
 
@@ -559,7 +576,11 @@ export default class MeetingRequest extends StatelessWebexPlugin {
    * @returns {Promise}
    */
   changeVideoLayout({
-    locusUrl, deviceUrl, layoutType, main, content
+    locusUrl,
+    deviceUrl,
+    layoutType,
+    main,
+    content
   }) {
     // send main/content renderInfo only if both width and height are specified
     if (main && (!main.width || !main.height)) {

package/src/meeting-info/index.js

@@ -108,7 +108,10 @@ export default class MeetingInfo {
    * @memberof MeetingInfo
    */
   fetchMeetingInfo(destination, type = null) {
-    return this.fetchInfoOptions(destination, type).then((options) =>
+    return this.fetchInfoOptions(
+      MeetingInfoUtil.extractDestination(destination, type),
+      type
+    ).then((options) =>
     // fetch meeting info
       this.requestFetchInfo(options).catch((error) => {
       // if it failed the first time as meeting link

package/src/meeting-info/util.js

@@ -35,6 +35,19 @@ import {
 
 const MeetingInfoUtil = {};
 
+MeetingInfoUtil.extractDestination = (destination, type) => {
+  let dest = destination;
+
+  if (type === _LOCUS_ID_) {
+    if (!(destination && destination.url)) {
+      throw new ParameterError('You cannot create a meeting by locus without a locus.url defined');
+    }
+    dest = destination.url;
+  }
+
+  return dest;
+};
+
 MeetingInfoUtil.getParsedUrl = (link) => {
   try {
     let parsedUrl = url.parse(link);

package/src/meetings/index.js

@@ -116,15 +116,7 @@ export default class Meetings extends WebexPlugin {
      */
     constructor(...args) {
       super(...args);
-      /**
-       * The MeetingInfo object to interact with server
-       * @instance
-       * @type {Object}
-       * @private
-       * @memberof Meetings
-       */
 
-      this.meetingInfo = null;
       /**
        * The Meetings request to interact with server
        * @instance
@@ -381,6 +373,15 @@ export default class Meetings extends WebexPlugin {
         LoggerConfig.set(this.config.logging);
         LoggerProxy.set(this.webex.logger);
 
+        /**
+       * The MeetingInfo object to interact with server
+       * @instance
+       * @type {Object}
+       * @private
+       * @memberof Meetings
+       */
+        this.meetingInfo = this.config.experimental.enableUnifiedMeetings ? new MeetingInfoV2(this.webex) : new MeetingInfo(this.webex);
+
         Trigger.trigger(
           this,
           {
@@ -407,8 +408,6 @@ export default class Meetings extends WebexPlugin {
         return Promise.reject(new Error('SDK cannot authorize'));
       }
 
-      this.meetingInfo = this.config.experimental.enableUnifiedMeetings ? new MeetingInfoV2(this.webex) : new MeetingInfo(this.webex);
-
 
       if (this.registered) {
         LoggerProxy.logger.info('Meetings:index#register --> INFO, Meetings plugin already registered');
@@ -725,7 +724,7 @@ export default class Meetings extends WebexPlugin {
       this.meetingCollection.set(meeting);
 
       try {
-        const info = await this.meetingInfo.fetchMeetingInfo(MeetingsUtil.extractDestination(destination, type), type);
+        const info = await this.meetingInfo.fetchMeetingInfo(destination, type);
 
         meeting.parseMeetingInfo(info);
         meeting.meetingInfo = info ? info.body : null;

package/src/meetings/util.js

@@ -8,7 +8,6 @@ import {
   CORRELATION_ID,
   EVENT_TRIGGERS
 } from '../constants';
-import ParameterError from '../common/errors/parameter';
 import LoggerProxy from '../common/logs/logger-proxy';
 import Trigger from '../common/events/trigger-proxy';
 
@@ -32,19 +31,6 @@ import Trigger from '../common/events/trigger-proxy';
 
 const MeetingsUtil = {};
 
-MeetingsUtil.extractDestination = (destination, type) => {
-  let dest = destination;
-
-  if (type === _LOCUS_ID_) {
-    if (!(destination && destination.url)) {
-      throw new ParameterError('You cannot create a meeting by locus without a locus.url defined');
-    }
-    dest = destination.url;
-  }
-
-  return dest;
-};
-
 MeetingsUtil.getMeetingAddedType = (type) => (type === _LOCUS_ID_ ? _INCOMING_ : _CREATED_);
 
 MeetingsUtil.handleRoapMercury = (envelope, meetingCollection) => {