@webex/plugin-meetings 3.0.0-beta.4 → 3.0.0-beta.400

package/src/locus-info/{infoUtils.js → infoUtils.ts}

@@ -1,16 +1,23 @@
+import {SELF_ROLES, DISPLAY_HINTS, INTERSTITIAL_DISPLAY_HINTS} from '../constants';
 
-import {SELF_ROLES, DISPLAY_HINTS} from '../constants';
-
-const InfoUtils = {};
+const InfoUtils: any = {};
 
 InfoUtils.parse = (info, roles, isJoined = true) => {
-  const parsed = {
+  const parsed: any = {
     policy: InfoUtils.parsePolicy(info),
     moderator: InfoUtils.parseModerator(info),
     coHost: InfoUtils.parseCoHost(info),
   };
 
-  let userDisplayHints = isJoined ? {...parsed.policy} : {};
+  let userDisplayHints = isJoined
+    ? {...parsed.policy}
+    : {
+        ...Object.fromEntries(
+          Object.entries(parsed.policy).filter(([hint]) =>
+            INTERSTITIAL_DISPLAY_HINTS.includes(hint)
+          )
+        ),
+      };
 
   if (roles.includes(SELF_ROLES.COHOST)) {
     userDisplayHints = {...userDisplayHints, ...parsed.coHost};
@@ -30,13 +37,22 @@ InfoUtils.parse = (info, roles, isJoined = true) => {
     parsed.meetingNumber = info.meetingId;
   }
 
+  if (info.datachannelUrl) {
+    parsed.datachannelUrl = info.datachannelUrl;
+  }
+
   return parsed;
 };
 
 InfoUtils.parseDisplayHintSection = (info, displayHintKey) => {
   const displayHints = {};
 
-  if (info && info.displayHints && info.displayHints[displayHintKey] && info.displayHints[displayHintKey].length > 0) {
+  if (
+    info &&
+    info.displayHints &&
+    info.displayHints[displayHintKey] &&
+    info.displayHints[displayHintKey].length > 0
+  ) {
     info.displayHints[displayHintKey].forEach((key) => {
       displayHints[key] = true;
     });
@@ -70,16 +86,19 @@ InfoUtils.getInfos = (oldInfo, newInfo, roles, isJoined) => {
     previous = oldInfo;
   }
   const current = newInfo && InfoUtils.parse(newInfo, roles, isJoined);
-  const updates = {};
+  const updates: any = {};
 
   if (current) {
     current.isLocked = InfoUtils.isLocked(current.policy);
     current.isUnlocked = InfoUtils.isUnlocked(current.policy);
 
-    if (previous && previous.isUnlocked && current.isLocked || !previous && current.isLocked) {
+    if ((previous && previous.isUnlocked && current.isLocked) || (!previous && current.isLocked)) {
       updates.isLocked = current.isLocked;
     }
-    if (previous && previous.isLocked && current.isUnlocked || !previous && current.isUnlocked) {
+    if (
+      (previous && previous.isLocked && current.isUnlocked) ||
+      (!previous && current.isUnlocked)
+    ) {
       updates.isUnlocked = current.isUnlocked;
     }
   }
@@ -87,7 +106,7 @@ InfoUtils.getInfos = (oldInfo, newInfo, roles, isJoined) => {
   return {
     previous,
     current,
-    updates
+    updates,
   };
 };
 

package/src/locus-info/{mediaSharesUtils.js → mediaSharesUtils.ts}

@@ -1,24 +1,29 @@
 import {CONTENT, WHITEBOARD} from '../constants';
 
-const MediaSharesUtils = {};
+const MediaSharesUtils: any = {};
 
 /**
  * parses the relevant values for mediaShares: contentId, disposition
  * @param {Object} mediaShares
  * @returns {undefined}
  */
-MediaSharesUtils.parse = (mediaShares) => {
+MediaSharesUtils.parse = (mediaShares: object) => {
   if (mediaShares) {
     return {
       content: {
         beneficiaryId: MediaSharesUtils.getContentBeneficiaryId(mediaShares),
-        disposition: MediaSharesUtils.getContentDisposition(mediaShares)
+        disposition: MediaSharesUtils.getContentDisposition(mediaShares),
+        annotation: MediaSharesUtils.getContentAnnotation(mediaShares),
+        url: MediaSharesUtils.getContentUrl(mediaShares),
+        shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares),
+        deviceUrlSharing: MediaSharesUtils.getContentBeneficiaryDeviceUrl(mediaShares),
+        resourceType: MediaSharesUtils.getContentResourceType(mediaShares),
       },
       whiteboard: {
         beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),
         disposition: MediaSharesUtils.getWhiteboardDisposition(mediaShares),
-        resourceUrl: MediaSharesUtils.getWhiteboardResourceUrl(mediaShares)
-      }
+        resourceUrl: MediaSharesUtils.getWhiteboardResourceUrl(mediaShares),
+      },
     };
   }
 
@@ -32,13 +37,13 @@ MediaSharesUtils.parse = (mediaShares) => {
  * @returns {Object}
  * previous: {Object} old share, current: {Object} new share,
  */
-MediaSharesUtils.getMediaShares = (oldShare, newShare) => {
+MediaSharesUtils.getMediaShares = (oldShare: object, newShare: object) => {
   const previous = oldShare && MediaSharesUtils.parse(oldShare);
   const current = newShare && MediaSharesUtils.parse(newShare);
 
   return {
     previous,
-    current
+    current,
   };
 };
 
@@ -47,7 +52,7 @@ MediaSharesUtils.getMediaShares = (oldShare, newShare) => {
  * @param {Object} mediaShares
  * @returns {Boolean} disposition
  */
-MediaSharesUtils.getContentDisposition = (mediaShares) => {
+MediaSharesUtils.getContentDisposition = (mediaShares: object) => {
   const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);
 
   return contentFloor ? contentFloor.disposition : null;
@@ -58,7 +63,7 @@ MediaSharesUtils.getContentDisposition = (mediaShares) => {
  * @param {Object} mediaShares
  * @returns {Boolean} disposition
  */
-MediaSharesUtils.getWhiteboardDisposition = (mediaShares) => {
+MediaSharesUtils.getWhiteboardDisposition = (mediaShares: object) => {
   const whiteboardFloor = MediaSharesUtils.extractWhiteboardFloor(mediaShares);
 
   return whiteboardFloor ? whiteboardFloor.disposition : null;
@@ -69,7 +74,7 @@ MediaSharesUtils.getWhiteboardDisposition = (mediaShares) => {
  * @param {Object} mediaShares
  * @returns {Object}
  */
-MediaSharesUtils.extractContent = (mediaShares) => {
+MediaSharesUtils.extractContent = (mediaShares: any) => {
   if (!mediaShares || !mediaShares.length) {
     return null;
   }
@@ -82,7 +87,7 @@ MediaSharesUtils.extractContent = (mediaShares) => {
  * @param {Object} mediaShares
  * @returns {Object}
  */
-MediaSharesUtils.extractWhiteboard = (mediaShares) => {
+MediaSharesUtils.extractWhiteboard = (mediaShares: any) => {
   if (!mediaShares || !mediaShares.length) {
     return null;
   }
@@ -95,7 +100,7 @@ MediaSharesUtils.extractWhiteboard = (mediaShares) => {
  * @param {Object} mediaStream
  * @returns {Object}
  */
-MediaSharesUtils.extractFloor = (mediaStream) => {
+MediaSharesUtils.extractFloor = (mediaStream: any) => {
   if (!mediaStream) {
     return null;
   }
@@ -108,7 +113,7 @@ MediaSharesUtils.extractFloor = (mediaStream) => {
  * @param {Object} mediaShares
  * @returns {Object}
  */
-MediaSharesUtils.extractContentFloor = (mediaShares) => {
+MediaSharesUtils.extractContentFloor = (mediaShares: object) => {
   const content = MediaSharesUtils.extractContent(mediaShares);
 
   return MediaSharesUtils.extractFloor(content);
@@ -119,7 +124,7 @@ MediaSharesUtils.extractContentFloor = (mediaShares) => {
  * @param {Object} mediaShares
  * @returns {Object}
  */
-MediaSharesUtils.extractWhiteboardFloor = (mediaShares) => {
+MediaSharesUtils.extractWhiteboardFloor = (mediaShares: object) => {
   const whiteboard = MediaSharesUtils.extractWhiteboard(mediaShares);
 
   return MediaSharesUtils.extractFloor(whiteboard);
@@ -130,7 +135,7 @@ MediaSharesUtils.extractWhiteboardFloor = (mediaShares) => {
  * @param {Object} mediaShares
  * @returns {Object}
  */
-MediaSharesUtils.getContentBeneficiaryId = (mediaShares) => {
+MediaSharesUtils.getContentBeneficiaryId = (mediaShares: object) => {
   const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);
 
   if (!contentFloor || !contentFloor.beneficiary) {
@@ -140,12 +145,87 @@ MediaSharesUtils.getContentBeneficiaryId = (mediaShares) => {
   return contentFloor.beneficiary.id;
 };
 
+/**
+ * get live annotation is sharing from media shares (content)
+ * @param {Object} mediaShares
+ * @returns {Object}
+ */
+MediaSharesUtils.getContentAnnotation = (mediaShares: object) => {
+  const extractContent = MediaSharesUtils.extractContent(mediaShares);
+
+  if (!extractContent || !extractContent.annotation) {
+    return undefined;
+  }
+
+  return extractContent.annotation;
+};
+
+/**
+ * get live resourceType is sharing from media shares (content)
+ * @param {Object} mediaShares
+ * @returns {Object}
+ */
+MediaSharesUtils.getContentResourceType = (mediaShares: object) => {
+  const extractContent = MediaSharesUtils.extractContent(mediaShares);
+
+  if (!extractContent || !extractContent.resourceType) {
+    return undefined;
+  }
+
+  return extractContent.resourceType;
+};
+
+/**
+ * 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 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
  * @returns {Object}
  */
-MediaSharesUtils.getWhiteboardBeneficiaryId = (mediaShares) => {
+MediaSharesUtils.getWhiteboardBeneficiaryId = (mediaShares: object) => {
   const whiteboardFloor = MediaSharesUtils.extractWhiteboardFloor(mediaShares);
 
   if (!whiteboardFloor || !whiteboardFloor.beneficiary) {
@@ -160,7 +240,7 @@ MediaSharesUtils.getWhiteboardBeneficiaryId = (mediaShares) => {
  * @param {Object} mediaShares
  * @returns {Object}
  */
-MediaSharesUtils.getWhiteboardResourceUrl = (mediaShares) => {
+MediaSharesUtils.getWhiteboardResourceUrl = (mediaShares: object) => {
   const whiteboard = MediaSharesUtils.extractWhiteboard(mediaShares);
 
   if (!whiteboard || !whiteboard.resourceUrl) {