@webex/plugin-meetings 3.0.0-beta.117 → 3.0.0-beta.119

package/dist/types/annotation/annotation.types.d.ts

@@ -8,6 +8,7 @@ type StrokeData = {
     content: string;
     shareInstanceId: string;
     encryptionKeyUrl: string;
+    version: string;
 };
 type RequestData = {
     toUserId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.117",
+  "version": "3.0.0-beta.119",
   "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.117",
-    "@webex/test-helper-chai": "3.0.0-beta.117",
-    "@webex/test-helper-mocha": "3.0.0-beta.117",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.117",
-    "@webex/test-helper-retry": "3.0.0-beta.117",
-    "@webex/test-helper-test-users": "3.0.0-beta.117",
+    "@webex/plugin-meetings": "3.0.0-beta.119",
+    "@webex/test-helper-chai": "3.0.0-beta.119",
+    "@webex/test-helper-mocha": "3.0.0-beta.119",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.119",
+    "@webex/test-helper-retry": "3.0.0-beta.119",
+    "@webex/test-helper-test-users": "3.0.0-beta.119",
     "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.117",
-    "@webex/internal-media-core": "1.38.0",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.117",
-    "@webex/internal-plugin-device": "3.0.0-beta.117",
-    "@webex/internal-plugin-llm": "3.0.0-beta.117",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.117",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.117",
-    "@webex/internal-plugin-support": "3.0.0-beta.117",
-    "@webex/internal-plugin-user": "3.0.0-beta.117",
-    "@webex/media-helpers": "3.0.0-beta.117",
-    "@webex/plugin-people": "3.0.0-beta.117",
-    "@webex/plugin-rooms": "3.0.0-beta.117",
-    "@webex/webex-core": "3.0.0-beta.117",
+    "@webex/common": "3.0.0-beta.119",
+    "@webex/internal-media-core": "1.38.1",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.119",
+    "@webex/internal-plugin-device": "3.0.0-beta.119",
+    "@webex/internal-plugin-llm": "3.0.0-beta.119",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.119",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.119",
+    "@webex/internal-plugin-support": "3.0.0-beta.119",
+    "@webex/internal-plugin-user": "3.0.0-beta.119",
+    "@webex/media-helpers": "3.0.0-beta.119",
+    "@webex/plugin-people": "3.0.0-beta.119",
+    "@webex/plugin-rooms": "3.0.0-beta.119",
+    "@webex/webex-core": "3.0.0-beta.119",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/annotation/annotation.types.ts

@@ -8,6 +8,7 @@ type StrokeData = {
   content: string;
   shareInstanceId: string;
   encryptionKeyUrl: string;
+  version: string;
 };
 
 type RequestData = {

package/src/annotation/index.ts

@@ -315,7 +315,7 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
             type: ANNOTATION_REQUEST_TYPE.ANNOTATION_MESSAGE,
             locusUrl: this.locusUrl,
             content: encryptedContent,
-            version: 'mVersion',
+            version: strokeData.version,
             fromUserId: strokeData.fromUserId,
             fromDeviceUrl: strokeData.fromDeviceUrl,
             shareInstanceId: strokeData.shareInstanceId,

package/src/locus-info/mediaSharesUtils.ts

@@ -14,6 +14,8 @@ MediaSharesUtils.parse = (mediaShares: object) => {
         beneficiaryId: MediaSharesUtils.getContentBeneficiaryId(mediaShares),
         disposition: MediaSharesUtils.getContentDisposition(mediaShares),
         annotation: MediaSharesUtils.getContentAnnotation(mediaShares),
+        url: MediaSharesUtils.getContentUrl(mediaShares),
+        shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares),
       },
       whiteboard: {
         beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),
@@ -156,6 +158,36 @@ MediaSharesUtils.getContentAnnotation = (mediaShares: object) => {
   return extractContent.annotation;
 };
 
+/**
+ * get url is sharing from media shares (content)
+ * @param {Object} mediaShares
+ * @returns {Object}
+ */
+MediaSharesUtils.getContentUrl = (mediaShares: object) => {
+  const extractContent = MediaSharesUtils.extractContent(mediaShares);
+
+  if (!extractContent || !extractContent.url) {
+    return undefined;
+  }
+
+  return extractContent.url;
+};
+
+/**
+ * get shareInstanceId is sharing from media shares (content)
+ * @param {Object} mediaShares
+ * @returns {Object}
+ */
+MediaSharesUtils.getShareInstanceId = (mediaShares: object) => {
+  const extractContent = MediaSharesUtils.extractContent(mediaShares);
+
+  if (!extractContent || !extractContent.floor || !extractContent.floor.shareInstanceId) {
+    return undefined;
+  }
+
+  return extractContent.floor.shareInstanceId;
+};
+
 /**
  * get who is sharing from media shares (whiteboard)
  * @param {Object} mediaShares

package/src/meeting/index.ts

@@ -2339,6 +2339,8 @@ export default class Meeting extends StatelessWebexPlugin {
                 EVENT_TRIGGERS.MEETING_STARTED_SHARING_REMOTE,
                 {
                   memberId: contentShare.beneficiaryId,
+                  url: contentShare.url,
+                  shareInstanceId: contentShare.shareInstanceId,
                 }
               );
             };
@@ -2413,6 +2415,8 @@ export default class Meeting extends StatelessWebexPlugin {
           EVENT_TRIGGERS.MEETING_STARTED_SHARING_REMOTE,
           {
             memberId: contentShare.beneficiaryId,
+            url: contentShare.url,
+            shareInstanceId: contentShare.shareInstanceId,
           }
         );
         this.members.locusMediaSharesUpdate(payload);

package/test/unit/spec/annotation/index.ts

@@ -246,6 +246,7 @@ describe('live-annotation', () => {
           locusUrl: "https://locus.wbx2.com/locus/api/v1/loci/163c1787-c1f5-47cc-95eb-ab2d660999e6",
           shareInstanceId: "7fa6fe07-dcb1-41ad-973d-7bcf65fab55d",
           encryptionKeyUrl: "encryptionKeyUrl",
+          version: '1',
         };
 
         annotationService.publishEncrypted(strokeData.content, strokeData);
@@ -264,7 +265,7 @@ describe('live-annotation', () => {
                 type: ANNOTATION_REQUEST_TYPE.ANNOTATION_MESSAGE,
                 locusUrl: locusUrl,
                 content: strokeData.content,
-                version: "mVersion",
+                version: '1',
                 fromUserId: strokeData.fromUserId,
                 fromDeviceUrl: strokeData.fromDeviceUrl,
                 shareInstanceId: strokeData.shareInstanceId,

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

@@ -0,0 +1,22 @@
+import MediaSharesUtils from '@webex/plugin-meetings/src/locus-info/mediaSharesUtils';
+import {assert} from "chai";
+import Sinon from "sinon";
+
+describe('getShareInstanceId', () => {
+  it('getShareInstanceId return correct shareInstanceId value', () => {
+    const stub = Sinon.stub(MediaSharesUtils, 'extractContent').returns({ floor:{shareInstanceId:'shareInstanceId'}});
+    const shareInstanceId = MediaSharesUtils.getShareInstanceId();
+    assert.equal(shareInstanceId,'shareInstanceId');
+    stub.restore();
+  });
+});
+
+describe('getContentUrl', () => {
+  it('getContentUrl return correct url value', () => {
+    const stub = Sinon.stub(MediaSharesUtils, 'extractContent').returns({url:'url'});
+    const url = MediaSharesUtils.getContentUrl();
+    assert.equal(url,'url');
+    stub.restore();
+  });
+});
+

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

@@ -5879,6 +5879,8 @@ describe('plugin-meetings', () => {
             isAccepting,
             otherBeneficiaryId,
             annotation,
+            url,
+            shareInstanceId
           ) => {
             const newPayload = cloneDeep(payload);
 
@@ -5958,7 +5960,7 @@ describe('plugin-meetings', () => {
                     eventTrigger.share.push({
                       eventName: EVENT_TRIGGERS.MEETING_STARTED_SHARING_REMOTE,
                       functionName: 'remoteShare',
-                      eventPayload: {memberId: beneficiaryId},
+                      eventPayload: {memberId: beneficiaryId, url, shareInstanceId},
                     });
                   }
                 }