@webex/plugin-meetings 3.0.0-beta.263 → 3.0.0-beta.264

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.263",
+  "version": "3.0.0-beta.264",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.263",
-    "@webex/test-helper-chai": "3.0.0-beta.263",
-    "@webex/test-helper-mocha": "3.0.0-beta.263",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.263",
-    "@webex/test-helper-retry": "3.0.0-beta.263",
-    "@webex/test-helper-test-users": "3.0.0-beta.263",
+    "@webex/plugin-meetings": "3.0.0-beta.264",
+    "@webex/test-helper-chai": "3.0.0-beta.264",
+    "@webex/test-helper-mocha": "3.0.0-beta.264",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.264",
+    "@webex/test-helper-retry": "3.0.0-beta.264",
+    "@webex/test-helper-test-users": "3.0.0-beta.264",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,19 +46,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.263",
+    "@webex/common": "3.0.0-beta.264",
     "@webex/internal-media-core": "2.0.4",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.263",
-    "@webex/internal-plugin-device": "3.0.0-beta.263",
-    "@webex/internal-plugin-llm": "3.0.0-beta.263",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.263",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.263",
-    "@webex/internal-plugin-support": "3.0.0-beta.263",
-    "@webex/internal-plugin-user": "3.0.0-beta.263",
-    "@webex/media-helpers": "3.0.0-beta.263",
-    "@webex/plugin-people": "3.0.0-beta.263",
-    "@webex/plugin-rooms": "3.0.0-beta.263",
-    "@webex/webex-core": "3.0.0-beta.263",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.264",
+    "@webex/internal-plugin-device": "3.0.0-beta.264",
+    "@webex/internal-plugin-llm": "3.0.0-beta.264",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.264",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.264",
+    "@webex/internal-plugin-support": "3.0.0-beta.264",
+    "@webex/internal-plugin-user": "3.0.0-beta.264",
+    "@webex/media-helpers": "3.0.0-beta.264",
+    "@webex/plugin-people": "3.0.0-beta.264",
+    "@webex/plugin-rooms": "3.0.0-beta.264",
+    "@webex/webex-core": "3.0.0-beta.264",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/locus-info/mediaSharesUtils.ts

@@ -16,6 +16,7 @@ MediaSharesUtils.parse = (mediaShares: object) => {
         annotation: MediaSharesUtils.getContentAnnotation(mediaShares),
         url: MediaSharesUtils.getContentUrl(mediaShares),
         shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares),
+        deviceUrlSharing: MediaSharesUtils.getContentBeneficiaryDeviceUrl(mediaShares),
       },
       whiteboard: {
         beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),
@@ -188,6 +189,21 @@ MediaSharesUtils.getShareInstanceId = (mediaShares: object) => {
   return extractContent.floor.shareInstanceId;
 };
 
+/**
+ * get deviceUrl that is requesting the floor for media shares (content)
+ * @param {Object} mediaShares
+ * @returns {Object}
+ */
+MediaSharesUtils.getContentBeneficiaryDeviceUrl = (mediaShares: object) => {
+  const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);
+
+  if (!contentFloor || !contentFloor.beneficiary || !contentFloor.beneficiary.deviceUrl) {
+    return null;
+  }
+
+  return contentFloor.beneficiary.deviceUrl;
+};
+
 /**
  * get who is sharing from media shares (whiteboard)
  * @param {Object} mediaShares

package/src/meeting/index.ts

@@ -2254,6 +2254,7 @@ export default class Meeting extends StatelessWebexPlugin {
       if (
         contentShare.beneficiaryId === previousContentShare?.beneficiaryId &&
         contentShare.disposition === previousContentShare?.disposition &&
+        contentShare.deviceUrlSharing === previousContentShare.deviceUrlSharing &&
         whiteboardShare.beneficiaryId === previousWhiteboardShare?.beneficiaryId &&
         whiteboardShare.disposition === previousWhiteboardShare?.disposition &&
         whiteboardShare.resourceUrl === previousWhiteboardShare?.resourceUrl
@@ -2276,11 +2277,21 @@ export default class Meeting extends StatelessWebexPlugin {
       // LOCAL - check if we started sharing content
       else if (
         this.selfId === contentShare.beneficiaryId &&
-        contentShare.disposition === FLOOR_ACTION.GRANTED
+        contentShare.disposition === FLOOR_ACTION.GRANTED &&
+        contentShare.deviceUrlSharing === this.deviceUrl
       ) {
         // CONTENT - sharing content local
         newShareStatus = SHARE_STATUS.LOCAL_SHARE_ACTIVE;
       }
+      // SAME USER REMOTE - check if same user started sharing content from another client
+      else if (
+        this.selfId === contentShare.beneficiaryId &&
+        contentShare.disposition === FLOOR_ACTION.GRANTED &&
+        contentShare.deviceUrlSharing !== this.deviceUrl
+      ) {
+        // CONTENT - same user sharing content remote
+        newShareStatus = SHARE_STATUS.REMOTE_SHARE_ACTIVE;
+      }
       // 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

package/test/unit/spec/locus-info/mediaSharesUtils.ts

@@ -20,3 +20,13 @@ describe('getContentUrl', () => {
   });
 });
 
+describe('getContentBeneficiaryDeviceUrl', () => {
+  it('getContentBeneficiaryDeviceUrl return correct deviceUrl value', () => {
+    const mockContentBeneficiaryDeviceUrl = "https://wdm-a.wbx2.com/wdm/api/v1/devices/e9ffd8a1-1fae-42d1-afbe-013e951f93ab"
+    const stub = Sinon.stub(MediaSharesUtils, 'extractContentFloor').returns({ beneficiary: {deviceUrl : mockContentBeneficiaryDeviceUrl}});
+    const contentBeneficiaryDeviceUrl = MediaSharesUtils.getContentBeneficiaryDeviceUrl();
+    assert.equal(contentBeneficiaryDeviceUrl, mockContentBeneficiaryDeviceUrl);
+    stub.restore();
+  });
+});
+

package/test/unit/spec/meeting/index.js

@@ -7213,6 +7213,7 @@ describe('plugin-meetings', () => {
         describe('setUpLocusMediaSharesListener', () => {
           beforeEach(() => {
             meeting.selfId = '9528d952-e4de-46cf-8157-fd4823b98377';
+            meeting.deviceUrl = 'my-web-url';
           });
 
           const USER_IDS = {
@@ -7228,13 +7229,23 @@ describe('plugin-meetings', () => {
               'https://board-a.wbx2.com/board/api/v1/channels/977a7330-54f4-11eb-b1ef-91f5eefc7bf3',
           };
 
+          const DEVICE_URL = {
+            LOCAL_WEB: 'my-web-url',
+            LOCAL_MAC: 'my-mac-url',
+            REMOTE_A: 'remote-user-A-url',
+            REMOTE_B: 'remote-user-B-url',
+          };
+
+
           const generateContent = (
             beneficiaryId = null,
             disposition = null,
+            deviceUrlSharing = null,
             annotation = undefined
           ) => ({
             beneficiaryId,
             disposition,
+            deviceUrlSharing
           });
           const generateWhiteboard = (
             beneficiaryId = null,
@@ -7252,7 +7263,8 @@ describe('plugin-meetings', () => {
             otherBeneficiaryId,
             annotation,
             url,
-            shareInstanceId
+            shareInstanceId,
+            deviceUrlSharing,
           ) => {
             const newPayload = cloneDeep(payload);
 
@@ -7285,6 +7297,7 @@ describe('plugin-meetings', () => {
                 newPayload.current.content = generateContent(
                   beneficiaryId,
                   FLOOR_ACTION.GRANTED,
+                  deviceUrlSharing,
                   annotation
                 );
 
@@ -7330,8 +7343,9 @@ describe('plugin-meetings', () => {
                       functionName: 'stopWhiteboardShare',
                     });
                   }
-
-                  if (beneficiaryId === USER_IDS.ME) {
+                  
+                  // Web client is sharing locally
+                  if (beneficiaryId === USER_IDS.ME && deviceUrlSharing === DEVICE_URL.LOCAL_WEB) {
                     eventTrigger.share.push({
                       eventName: EVENT_TRIGGERS.MEETING_STARTED_SHARING_LOCAL,
                       functionName: 'share',
@@ -7350,7 +7364,7 @@ describe('plugin-meetings', () => {
                   }
                 }
 
-                if (beneficiaryId === USER_IDS.ME) {
+                if (beneficiaryId === USER_IDS.ME && deviceUrlSharing === DEVICE_URL.LOCAL_WEB) {
                   shareStatus = SHARE_STATUS.LOCAL_SHARE_ACTIVE;
                 } else {
                   shareStatus = SHARE_STATUS.REMOTE_SHARE_ACTIVE;
@@ -7433,7 +7447,7 @@ describe('plugin-meetings', () => {
               if (isContent) {
                 newPayload.current.content.disposition = FLOOR_ACTION.RELEASED;
 
-                if (beneficiaryId === USER_IDS.ME) {
+                if (beneficiaryId === USER_IDS.ME && deviceUrlSharing === DEVICE_URL.LOCAL_WEB) {
                   eventTrigger.share.push({
                     eventName: EVENT_TRIGGERS.MEETING_STOPPED_SHARING_LOCAL,
                     functionName: 'localShare',
@@ -7537,7 +7551,6 @@ describe('plugin-meetings', () => {
                 const {functionName, eventName, eventPayload} = share[idx];
                 const fileName =
                   functionName === 'remoteShare' ? 'meetings/index' : 'meeting/index';
-
                 assert.deepEqual(shareCallArgs[1], {
                   file: fileName,
                   function: functionName,
@@ -7696,7 +7709,7 @@ describe('plugin-meetings', () => {
                 true,
                 false,
                 USER_IDS.ME,
-                RESOURCE_URLS.WHITEBOARD_A
+                RESOURCE_URLS.WHITEBOARD_A,
               );
               const data2 = generateData(
                 data1.payload,
@@ -7705,7 +7718,7 @@ describe('plugin-meetings', () => {
                 USER_IDS.ME,
                 RESOURCE_URLS.WHITEBOARD_A,
                 true,
-                USER_IDS.ME
+                USER_IDS.ME,
               );
               const data3 = generateData(
                 data2.payload,
@@ -7714,9 +7727,13 @@ describe('plugin-meetings', () => {
                 USER_IDS.ME,
                 undefined,
                 true,
-                USER_IDS.ME
+                USER_IDS.ME,
+                undefined,
+                undefined,
+                undefined,
+                DEVICE_URL.LOCAL_WEB,
               );
-              const data4 = generateData(data3.payload, false, true, USER_IDS.ME);
+              const data4 = generateData(data3.payload, false, true, USER_IDS.ME, undefined, undefined, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
 
               payloadTestHelper([data1, data2, data3, data4]);
             });
@@ -7745,7 +7762,11 @@ describe('plugin-meetings', () => {
                 USER_IDS.REMOTE_A,
                 undefined,
                 true,
-                USER_IDS.ME
+                USER_IDS.ME,
+                undefined,
+                undefined,
+                undefined,
+                DEVICE_URL.REMOTE_A,
               );
               const data4 = generateData(data3.payload, false, true, USER_IDS.REMOTE_A);
 
@@ -7776,9 +7797,13 @@ describe('plugin-meetings', () => {
                 USER_IDS.ME,
                 undefined,
                 true,
-                USER_IDS.REMOTE_A
+                USER_IDS.REMOTE_A,
+                undefined,
+                undefined,
+                undefined,
+                DEVICE_URL.LOCAL_WEB,
               );
-              const data4 = generateData(data3.payload, false, true, USER_IDS.ME);
+              const data4 = generateData(data3.payload, false, true, USER_IDS.ME, undefined, undefined, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
 
               payloadTestHelper([data1, data2, data3, data4]);
             });
@@ -7807,7 +7832,11 @@ describe('plugin-meetings', () => {
                 USER_IDS.REMOTE_A,
                 undefined,
                 true,
-                USER_IDS.REMOTE_A
+                USER_IDS.REMOTE_A,
+                undefined,
+                undefined,
+                undefined,
+                DEVICE_URL.REMOTE_A,
               );
               const data4 = generateData(data3.payload, false, true, USER_IDS.REMOTE_A);
 
@@ -7838,7 +7867,11 @@ describe('plugin-meetings', () => {
                 USER_IDS.REMOTE_B,
                 undefined,
                 true,
-                USER_IDS.REMOTE_A
+                USER_IDS.REMOTE_A,
+                undefined,
+                undefined,
+                undefined,
+                DEVICE_URL.REMOTE_B,
               );
               const data4 = generateData(data3.payload, false, true, USER_IDS.REMOTE_B);
 
@@ -7848,7 +7881,7 @@ describe('plugin-meetings', () => {
 
           describe('Desktop --> Whiteboard A', () => {
             it('Scenario #1: you share desktop and then share whiteboard', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.ME);
+              const data1 = generateData(blankPayload, true, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
               const data2 = generateData(
                 data1.payload,
                 true,
@@ -7862,7 +7895,7 @@ describe('plugin-meetings', () => {
             });
 
             it('Scenario #2: you share desktop and remote person A shares whiteboard', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.ME);
+              const data1 = generateData(blankPayload, true, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
               const data2 = generateData(
                 data1.payload,
                 true,
@@ -7876,69 +7909,69 @@ describe('plugin-meetings', () => {
             });
 
             it('Scenario #3: remote person A shares desktop and you share whiteboard', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A);
+              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_A);
               const data2 = generateData(
                 data1.payload,
                 true,
                 false,
-                USER_IDS.REMOTE_A,
+                USER_IDS.ME,
                 RESOURCE_URLS.WHITEBOARD_A
               );
-              const data3 = generateData(data2.payload, false, false, USER_IDS.REMOTE_A);
+              const data3 = generateData(data2.payload, false, false, USER_IDS.ME);
 
               payloadTestHelper([data1, data2, data3]);
             });
 
             it('Scenario #4: remote person A shares desktop and then shares whiteboard', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A);
+              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_A);
               const data2 = generateData(
                 data1.payload,
                 true,
                 false,
-                USER_IDS.ME,
+                USER_IDS.REMOTE_A,
                 RESOURCE_URLS.WHITEBOARD_A
               );
-              const data3 = generateData(data2.payload, false, false, USER_IDS.ME);
+              const data3 = generateData(data2.payload, false, false, USER_IDS.REMOTE_A);
 
               payloadTestHelper([data1, data2, data3]);
             });
 
             it('Scenario #5: remote person A shares desktop and remote person B shares whiteboard', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A);
+              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_A);
               const data2 = generateData(
                 data1.payload,
                 true,
                 false,
-                USER_IDS.REMOTE_A,
-                RESOURCE_URLS.WHITEBOARD_A
+                USER_IDS.REMOTE_B,
+                RESOURCE_URLS.WHITEBOARD_B
               );
-              const data3 = generateData(data2.payload, false, false, USER_IDS.REMOTE_A);
+              const data3 = generateData(data2.payload, false, false, USER_IDS.REMOTE_B);
 
               payloadTestHelper([data1, data2, data3]);
             });
           });
           describe('Desktop A --> Desktop B', () => {
-            it('Scenario #1: you share desktop A and then share desktop B', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.ME);
-              const data2 = generateData(data1.payload, false, true, USER_IDS.ME);
-              const data3 = generateData(data2.payload, true, true, USER_IDS.ME);
-              const data4 = generateData(data3.payload, false, true, USER_IDS.ME);
+            it('Scenario #1: you share desktop using web client and then share using native client', () => {
+              const data1 = generateData(blankPayload, true, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
+              const data2 = generateData(data1.payload, false, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
+              const data3 = generateData(data2.payload, true, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_MAC);
+              const data4 = generateData(data3.payload, false, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_MAC);
 
               payloadTestHelper([data1, data2, data3, data4]);
             });
 
-            it('Scenario #2: you share desktop A and remote person A shares desktop B', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.ME);
-              const data2 = generateData(data1.payload, true, true, USER_IDS.REMOTE_A);
-              const data3 = generateData(data2.payload, false, true, USER_IDS.REMOTE_A);
+            it('Scenario #2: you share desktop using web client and remote person A shares desktop', () => {
+              const data1 = generateData(blankPayload, true, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
+              const data2 = generateData(data1.payload, true, true, USER_IDS.REMOTE_A, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_A) ;
+              const data3 = generateData(data2.payload, false, true, USER_IDS.REMOTE_A, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_A);
 
               payloadTestHelper([data1, data2, data3]);
             });
 
-            it('Scenario #3: remote person A shares desktop A and you share desktop B', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A);
-              const data2 = generateData(data1.payload, true, true, USER_IDS.ME);
-              const data3 = generateData(data2.payload, false, true, USER_IDS.ME);
+            it('Scenario #3: remote person A shares desktop and then you share desktop using web client', () => {
+              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_A);
+              const data2 = generateData(data1.payload, true, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
+              const data3 = generateData(data2.payload, false, true, USER_IDS.ME, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.LOCAL_WEB);
 
               payloadTestHelper([data1, data2, data3]);
             });
@@ -7952,8 +7985,8 @@ describe('plugin-meetings', () => {
             });
 
             it('Scenario #5: remote person A shares desktop A and remote person B shares desktop B', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A);
-              const data2 = generateData(data1.payload, true, true, USER_IDS.REMOTE_B);
+              const data1 = generateData(blankPayload, true, true, USER_IDS.REMOTE_A, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_A);
+              const data2 = generateData(data1.payload, true, true, USER_IDS.REMOTE_B, undefined, false, undefined, undefined, undefined, undefined, DEVICE_URL.REMOTE_B);
               const data3 = generateData(data2.payload, false, true, USER_IDS.REMOTE_B);
 
               payloadTestHelper([data1, data2, data3]);