@webex/plugin-meetings 3.0.0-beta.14 → 3.0.0-beta.140

package/src/locus-info/infoUtils.ts

@@ -39,7 +39,12 @@ InfoUtils.parse = (info, roles, isJoined = true) => {
 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;
     });
@@ -79,10 +84,13 @@ InfoUtils.getInfos = (oldInfo, newInfo, roles, isJoined) => {
     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;
     }
   }
@@ -90,7 +98,7 @@ InfoUtils.getInfos = (oldInfo, newInfo, roles, isJoined) => {
   return {
     previous,
     current,
-    updates
+    updates,
   };
 };
 

package/src/locus-info/mediaSharesUtils.ts

@@ -12,13 +12,16 @@ MediaSharesUtils.parse = (mediaShares: object) => {
     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),
       },
       whiteboard: {
         beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),
         disposition: MediaSharesUtils.getWhiteboardDisposition(mediaShares),
-        resourceUrl: MediaSharesUtils.getWhiteboardResourceUrl(mediaShares)
-      }
+        resourceUrl: MediaSharesUtils.getWhiteboardResourceUrl(mediaShares),
+      },
     };
   }
 
@@ -38,7 +41,7 @@ MediaSharesUtils.getMediaShares = (oldShare: object, newShare: object) => {
 
   return {
     previous,
-    current
+    current,
   };
 };
 
@@ -140,6 +143,51 @@ MediaSharesUtils.getContentBeneficiaryId = (mediaShares: object) => {
   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 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/locus-info/parser.ts

@@ -13,7 +13,7 @@ export default class Parser {
   static status = {
     IDLE: 'IDLE',
     PAUSED: 'PAUSED',
-    WORKING: 'WORKING'
+    WORKING: 'WORKING',
   };
 
   // loci comparison states
@@ -24,7 +24,7 @@ export default class Parser {
     DESYNC: 'DESYNC',
     USE_INCOMING: 'USE_INCOMING',
     USE_CURRENT: 'USE_CURRENT',
-    ERROR: 'ERROR'
+    ERROR: 'ERROR',
   };
 
   queue: any;
@@ -41,7 +41,6 @@ export default class Parser {
     this.workingCopy = null;
   }
 
-
   /**
    * Checks if two sequences overlap in time,
    * the sequence with the higher minimum value is greater.
@@ -68,7 +67,6 @@ export default class Parser {
     return comparison;
   }
 
-
   /**
    * Checks if two sequences have unequal ranges.
    * Chooses sequence with most larger range.
@@ -94,8 +92,7 @@ export default class Parser {
       else if (currentTotalRange < incomingTotalRange) {
         // choose right side (incoming)
         comparison = `${Parser.loci.LT}:UR002`;
-      }
-      else {
+      } else {
         // with no unique entries and with ranges either absent or
         // of the same size, the sequences are considered equal.
         comparison = `${Parser.loci.EQ}:UR003`;
@@ -105,7 +102,6 @@ export default class Parser {
     return comparison;
   }
 
-
   /**
    * Checks if either sequences has unique entries.
    * Entries are considered unique if they do not overlap
@@ -134,7 +130,6 @@ export default class Parser {
     return comparison;
   }
 
-
   /**
    * Checks both Locus Delta objects to see if they are
    * out of sync with one another. If so sends a DESYNC
@@ -164,12 +159,10 @@ export default class Parser {
 
       // send DESYNC to server
       comparison = `${Parser.loci.DESYNC}:OOS001:${debugInfo}`;
-    }
-    else if (currentUniqueMin > incomingUniqueMin) {
+    } else if (currentUniqueMin > incomingUniqueMin) {
       // choose left side (current)
       comparison = `${Parser.loci.GT}:OOS002`;
-    }
-    else {
+    } else {
       // choose right side (incoming)
       comparison = `${Parser.loci.LT}:OOS003`;
     }
@@ -177,7 +170,6 @@ export default class Parser {
     return comparison;
   }
 
-
   /**
    * Compares two loci to determine which one contains the most recent state
    * @instance
@@ -191,7 +183,6 @@ export default class Parser {
     const {extractComparisonState: extract} = Parser;
     const {packComparisonResult: pack} = Parser;
 
-
     if (isSequenceEmpty(current) || isSequenceEmpty(incoming)) {
       return pack(Parser.loci.USE_INCOMING, 'C001');
     }
@@ -206,7 +197,6 @@ export default class Parser {
     return pack(action, result);
   }
 
-
   /**
    * Compares two loci sequences (with delta params) and indicates what action
    * to take.
@@ -218,16 +208,14 @@ export default class Parser {
    * @returns {string} loci comparison state
    */
   private static compareDelta(current, incoming) {
-    const {
-      LT, GT, EQ, DESYNC, USE_INCOMING
-    } = Parser.loci;
+    const {LT, GT, EQ, DESYNC, USE_INCOMING} = Parser.loci;
+
     const {extractComparisonState: extract} = Parser;
     const {packComparisonResult: pack} = Parser;
 
     const result = Parser.compareSequence(current.sequence, incoming.sequence);
     let comparison = extract(result);
 
-
     if (comparison !== LT) {
       return pack(Parser.compareToAction(comparison), result);
     }
@@ -247,7 +235,6 @@ export default class Parser {
     return pack(comparison, result);
   }
 
-
   /**
    * Compares Locus sequences
    * @param {Types~Locus} current Current working copy
@@ -271,7 +258,7 @@ export default class Parser {
       Parser.checkSequenceOverlap,
       Parser.checkUnequalRanges,
       Parser.checkForUniqueEntries,
-      Parser.checkIfOutOfSync
+      Parser.checkIfOutOfSync,
     ];
 
     for (const rule of rules) {
@@ -290,16 +277,13 @@ export default class Parser {
     return Parser.loci.ERROR;
   }
 
-
   /**
    * Transates the result of a sequence comparison into an intended behavior
    * @param {string} result
    * @returns {string} Locus comparison action
    */
   static compareToAction(result: string) {
-    const {
-      DESYNC, EQ, ERROR, GT, LT, USE_CURRENT, USE_INCOMING
-    } = Parser.loci;
+    const {DESYNC, EQ, ERROR, GT, LT, USE_CURRENT, USE_INCOMING} = Parser.loci;
 
     let action = ERROR;
 
@@ -315,13 +299,14 @@ export default class Parser {
         action = DESYNC;
         break;
       default:
-        LoggerProxy.logger.info(`Locus-info:parser#compareToAction --> Error: ${result} is not a recognized sequence comparison result.`);
+        LoggerProxy.logger.info(
+          `Locus-info:parser#compareToAction --> Error: ${result} is not a recognized sequence comparison result.`
+        );
     }
 
     return action;
   }
 
-
   /**
    * Extracts a loci comparison from a string of data.
    * @param {string} lociComparisonResult Comparison result with extra data
@@ -331,7 +316,6 @@ export default class Parser {
     return lociComparisonResult.split(':')[0];
   }
 
-
   /**
    * @typedef {object} LociMetadata
    * @property {number} start - Starting sequence number
@@ -368,11 +352,10 @@ export default class Parser {
       // Grab last entry if exist else default to rangeEnd
       max: last || end,
       // keep reference to actual sequence entries
-      entries
+      entries,
     };
   }
 
-
   /**
    * Compares two Locus delta objects and notes unique
    * values contained within baseLoci.
@@ -381,16 +364,13 @@ export default class Parser {
    * @returns {Array.<number>} List of unique sequences
    */
   static getUniqueSequences(baseLoci: any, otherLoci: any) {
-    const diff: any = difference(
-      baseLoci.entries,
-      otherLoci.entries
-    );
+    const diff: any = difference(baseLoci.entries, otherLoci.entries);
+
     const {start, end} = otherLoci;
 
     return Parser.getNumbersOutOfRange(diff, start, end);
   }
 
-
   /**
    * Returns an array of numbers outside of a given range.
    * @param {Array.<number>} list Array to filter
@@ -406,7 +386,6 @@ export default class Parser {
     return output.sort((a, b) => a - b);
   }
 
-
   /**
    * Checks if newLoci or workingCopy is invalid.
    * @param {Types~Locus} newLoci
@@ -417,21 +396,27 @@ export default class Parser {
     const {IDLE} = Parser.status;
     const {isLoci} = Parser;
     // @ts-ignore
-    const setStatus = (status) => { this.status = status; };
+    const setStatus = (status) => {
+      // @ts-ignore
+      this.status = status;
+    };
 
     // one or both objects are not locus delta events
     if (!isLoci(this.workingCopy) || !isLoci(newLoci)) {
       setStatus(IDLE);
-      LoggerProxy.logger.info('Locus-info:parser#processDeltaEvent --> Ignoring non-locus object. workingCopy:', this.workingCopy, 'newLoci:', newLoci);
-    }
-    else {
+      LoggerProxy.logger.info(
+        'Locus-info:parser#processDeltaEvent --> Ignoring non-locus object. workingCopy:',
+        this.workingCopy,
+        'newLoci:',
+        newLoci
+      );
+    } else {
       isValid = true;
     }
 
     return isValid;
   }
 
-
   /**
    * Determines if a paricular locus's sequence is empty
    * @param {Types~Locus} locus
@@ -445,7 +430,6 @@ export default class Parser {
     return hasEmptyEntries && hasEmptyRange;
   }
 
-
   /**
    * Determines if an object has basic
    * structure of a locus object.
@@ -456,8 +440,7 @@ export default class Parser {
     if (!loci || !loci.sequence) {
       return false;
     }
-    const hasProp = (prop) =>
-      Object.prototype.hasOwnProperty.call(loci.sequence, prop);
+    const hasProp = (prop) => Object.prototype.hasOwnProperty.call(loci.sequence, prop);
 
     if (hasProp('rangeStart') && hasProp('rangeEnd')) {
       return true;
@@ -482,14 +465,12 @@ export default class Parser {
     // continue processing until queue is empty
     if (this.queue.size() > 0) {
       this.processDeltaEvent();
-    }
-    else {
+    } else {
       // @ts-ignore
       this.status = Parser.status.IDLE;
     }
   }
 
-
   /**
    * Function handler for delta actions,
    * is set by instance callee.
@@ -497,10 +478,9 @@ export default class Parser {
    * @param {Types~Locus} locus Locus delta
    * @returns {undefined}
    */
-  // eslint-disable-next-line no-unused-vars
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   onDeltaAction(action: string, locus) {}
 
-
   /**
    * Event handler for locus delta events
    * @param {Types~Locus} loci Locus Delta
@@ -521,7 +501,6 @@ export default class Parser {
     }
   }
 
-
   /**
    * Appends new data onto a string of existing data.
    * @param {string} newData
@@ -532,7 +511,6 @@ export default class Parser {
     return `${newData}:${oldData}`;
   }
 
-
   /**
    * Pause locus processing
    * @returns {undefined}
@@ -543,7 +521,6 @@ export default class Parser {
     LoggerProxy.logger.info('Locus-info:parser#pause --> Locus parser paused.');
   }
 
-
   /**
    * Processes next locus delta in the queue,
    * continues until the queue is empty
@@ -569,8 +546,7 @@ export default class Parser {
     if (lociComparison === DESYNC) {
       // wait for desync response
       this.pause();
-    }
-    else if (lociComparison === USE_INCOMING) {
+    } else if (lociComparison === USE_INCOMING) {
       // update working copy for future comparisons.
       // Note: The working copy of parser gets updated in .onFullLocus()
       // and here when USE_INCOMING locus.
@@ -578,14 +554,17 @@ export default class Parser {
     }
 
     if (this.onDeltaAction) {
-      LoggerProxy.logger.info(`Locus-info:parser#processDeltaEvent --> Locus Delta Action: ${lociComparison}`);
+      LoggerProxy.logger.info(
+        `Locus-info:parser#processDeltaEvent --> Locus Delta Action: ${lociComparison}`
+      );
+
+      // eslint-disable-next-line no-useless-call
       this.onDeltaAction.call(this, lociComparison, newLoci);
     }
 
     this.nextEvent();
   }
 
-
   /**
    * Resume from a paused state
    * @returns {undefined}
@@ -597,7 +576,6 @@ export default class Parser {
     this.nextEvent();
   }
 
-
   /**
    * Gets related debug info for given error code
    * @param {string} debugCode Debug code
@@ -611,7 +589,7 @@ export default class Parser {
     const resolutionMap = {
       EQ: `${Parser.loci.LT}: is equal (current == incoming).`,
       LT: `${Parser.loci.LT}: choose right side (incoming).`,
-      GT: `${Parser.loci.GT}: choose left side (current).`
+      GT: `${Parser.loci.GT}: choose left side (current).`,
     };
 
     const debugMap = {
@@ -619,28 +597,28 @@ export default class Parser {
         title: 'checkSequenceOverlap-001',
         description: mStr`Occurs if earliest working copy sequence is more \
             recent than last incoming sequence.`,
-        logic: 'current.min > incoming.max'
+        logic: 'current.min > incoming.max',
       },
 
       SO002: {
         title: 'checkSequenceOverlap-002',
         description: mStr`Occurs if last working copy sequence is before the \
           earliest incoming sequence.`,
-        logic: 'current.max < incoming.min'
+        logic: 'current.max < incoming.min',
       },
 
       UR001: {
         title: 'checkUnequalRanges-001',
         description: mStr`Occurs if there are no unique values for both loci, \
           and the current working copy loci has a larger range.`,
-        logic: 'currentTotalRange > incomingTotalRange'
+        logic: 'currentTotalRange > incomingTotalRange',
       },
 
       UR002: {
         title: 'checkUnequalRanges-002',
         description: mStr`Occurs if there are no unique values for both loci, \
           and the incoming delta loci has a larger range.`,
-        logic: 'currentTotalRange < incomingTotalRange'
+        logic: 'currentTotalRange < incomingTotalRange',
       },
 
       UR003: {
@@ -648,7 +626,7 @@ export default class Parser {
         description: mStr`Occurs if there are no unique values for both loci, \
           and with ranges either absent or of the same size, the sequences \
           are considered equal.`,
-        logic: 'currentTotalRange == incomingTotalRange'
+        logic: 'currentTotalRange == incomingTotalRange',
       },
 
       UE001: {
@@ -656,7 +634,7 @@ export default class Parser {
         description: mStr`Occurs if current loci has unique entries and \
           incoming does not. Entries are considered unique if they \
           do not overlap with other Loci sequences or range values.`,
-        logic: 'currentIsUnique && !incomingIsUnique'
+        logic: 'currentIsUnique && !incomingIsUnique',
       },
 
       UE002: {
@@ -664,7 +642,7 @@ export default class Parser {
         description: mStr`Occurs if current has no unique entries but \
           incoming does. Entries are considered unique if they \
           do not overlap with other Loci sequences or range values.`,
-        logic: '!currentIsUnique && incomingIsUnique'
+        logic: '!currentIsUnique && incomingIsUnique',
       },
 
       OOS001: {
@@ -673,7 +651,7 @@ export default class Parser {
           if the current loci unique entries overlap the total range of the \
           incoming sequence, or if the incoming unique entries overlap \
           the total range of current sequence.`,
-        logic: 'neitherSeqHasRange || currentUniqOverlap || incomingUniqOverlap'
+        logic: 'neitherSeqHasRange || currentUniqOverlap || incomingUniqOverlap',
       },
 
       OOS002: {
@@ -681,15 +659,15 @@ export default class Parser {
         description: mStr`Occurs if the minimum value from sequences that are \
           unique to the current loci is greater than the minimum value from \
           sequences that are unique to the incoming loci.`,
-        logic: 'currentUniqueMin > incomingUniqueMin'
+        logic: 'currentUniqueMin > incomingUniqueMin',
       },
 
       OOS003: {
         title: 'checkIfOutOfSync-003',
         description: mStr`Occurs if none of the comparison rules applied. \
           It is a catch all.`,
-        logic: 'else (catch all)'
-      }
+        logic: 'else (catch all)',
+      },
     };
 
     const debugObj = debugMap[debugCode];