@webex/plugin-meetings 3.0.0-beta.7 → 3.0.0-beta.71

package/test/utils/cmr.js

@@ -1,4 +1,3 @@
-
 import uuid from 'uuid';
 import retry from '@webex/test-helper-retry';
 
@@ -23,16 +22,16 @@ CMR.reserve = (webex, claimed) => {
       authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
       'cisco-no-http-redirect': null,
       'spark-user-agent': null,
-      trackingid: `ITCLIENT_${uuid.v4()}_0_imi:true`
+      trackingid: `ITCLIENT_${uuid.v4()}_0_imi:true`,
     },
     body: {
       resourceType,
       requestMetaData: {
         emailAddress: `test${uuid.v4()}@wx2.example.com`,
-        loginType: 'loginGuest'
+        loginType: 'loginGuest',
       },
-      reservedBy: 'Webex JavaScript SDK Test Suite'
-    }
+      reservedBy: 'Webex JavaScript SDK Test Suite',
+    },
   };
 
   if (claimed) {
@@ -40,7 +39,8 @@ CMR.reserve = (webex, claimed) => {
   }
   console.log('USER ID ', webex.internal.device.userId);
 
-  return webex.request(requestBody)
+  return webex
+    .request(requestBody)
     .then((response) => {
       const cmr = response.body;
 
@@ -56,47 +56,49 @@ CMR.reserve = (webex, claimed) => {
 CMR.release = (webex, reservationUrl) => {
   console.log('releasing cmr');
 
-  return webex.request({
-    method: 'DELETE',
-    uri: reservationUrl,
-    headers: {
-      authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
-      'cisco-no-http-redirect': null,
-      'spark-user-agent': null
-    }
-  })
+  return webex
+    .request({
+      method: 'DELETE',
+      uri: reservationUrl,
+      headers: {
+        authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
+        'cisco-no-http-redirect': null,
+        'spark-user-agent': null,
+      },
+    })
     .then(() => console.log('released cmr'));
 };
 
-CMR.waitForHostToJoin = (webex, resourceUrl) => retry(() => {
-  console.log('checking if the host has joined');
-
-  return webex.request({
-    method: 'GET',
-    uri: resourceUrl,
-    headers: {
-      authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
-      'cisco-no-http-redirect': null,
-      'spark-user-agent': null
-    }
+CMR.waitForHostToJoin = (webex, resourceUrl) =>
+  retry(() => {
+    console.log('checking if the host has joined');
+
+    return webex
+      .request({
+        method: 'GET',
+        uri: resourceUrl,
+        headers: {
+          authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
+          'cisco-no-http-redirect': null,
+          'spark-user-agent': null,
+        },
+      })
+      .then((res) => {
+        if (res.body && res.body.meeting.hostPresent) {
+          console.log('the host has joined');
+
+          return;
+        }
+
+        console.log('the host has not joined');
+        throw new Error('Meeting host has not yet joined');
+      });
   })
-    .then((res) => {
-      if (res.body && res.body.meeting.hostPresent) {
-        console.log('the host has joined');
+    .then(() => true)
+    .catch((reason) => {
+      console.warn(reason);
 
-        return;
-      }
-
-      console.log('the host has not joined');
-      throw new Error('Meeting host has not yet joined');
+      return false;
     });
-})
-  .then(() => true)
-  .catch((reason) => {
-    console.warn(reason);
-
-    return false;
-  });
-
 
 export default CMR;

package/test/utils/constants.js

@@ -0,0 +1,9 @@
+// MOVE TO TEST CONSTANTS
+export const MEDIA_SERVERS = {
+  // The homer media server for converged multistream meetings.
+  HOMER: 'homer',
+  // The linus media server
+  LINUS: 'linus',
+  // The calliope media server for transcoded meetings
+  CALLIOPE: 'calliope',
+};

package/test/utils/testUtils.js

@@ -19,7 +19,7 @@ const waitForSpy = (spy, event) => {
           resolve(spy.args[0][0]);
         }
       }, 1000);
-    })
+    }),
   ]);
 };
 
@@ -40,7 +40,7 @@ const waitForStateChange = (meeting, state) => {
           resolve(meeting.locusInfo.parsedLocus.states);
         }
       }, 1000);
-    })
+    }),
   ]);
 };
 
@@ -59,44 +59,46 @@ const waitForCallEnded = (user, email) => {
           clearTimeout(timer);
           clearInterval(interval);
           resolve();
-        }
-        else {
+        } else {
           console.log('MEETING STILL EXISTS!', user.webex.meetings.getAllMeetings());
         }
       }, 3000);
-    })
+    }),
   ]);
 };
 
-const syncAndEndMeeting = (user) => user.webex.meetings.syncMeetings()
-  .then(() => {
-    const promise = [];
-    const meetings = user.webex.meetings.getAllMeetings();
+const syncAndEndMeeting = (user) =>
+  user.webex.meetings
+    .syncMeetings()
+    .then(() => {
+      const promise = [];
+      const meetings = user.webex.meetings.getAllMeetings();
 
-    if (Object.keys(meetings).length === 0) {
-      return Promise.resolve();
-    }
-    Object.keys(meetings)
-      .forEach((key) => {
+      if (Object.keys(meetings).length === 0) {
+        return Promise.resolve();
+      }
+      Object.keys(meetings).forEach((key) => {
         promise.push(meetings[key].leave());
       });
 
-    return Promise.all(promise);
-  })
-  .then(() => new Promise((resolve) => {
-    const interval = setInterval(() => {
-      if (Object.keys(user.webex.meetings.getAllMeetings()).length === 0) {
-        clearInterval(interval);
-        resolve();
-      }
-      else {
-        console.log('End Meetings before test failed');
-      }
-    }, 3000);
-  }))
-  .catch((e) => {
-    console.log('ERROR on syncMeeting', e);
-  });
+      return Promise.all(promise);
+    })
+    .then(
+      () =>
+        new Promise((resolve) => {
+          const interval = setInterval(() => {
+            if (Object.keys(user.webex.meetings.getAllMeetings()).length === 0) {
+              clearInterval(interval);
+              resolve();
+            } else {
+              console.log('End Meetings before test failed');
+            }
+          }, 3000);
+        })
+    )
+    .catch((e) => {
+      console.log('ERROR on syncMeeting', e);
+    });
 
 //
 const waitForEvents = (scopeEvents, timeout = max) => {
@@ -125,11 +127,12 @@ const waitForEvents = (scopeEvents, timeout = max) => {
               obj.user.memberId = value.meeting.locusInfo.parsedLocus.selfId;
             }
             if (obj.event === 'meeting:removed') {
-              console.log(`MEETING:REMOVED ${obj.user.name} ID ${obj.user.meeting.id} correlationID ${obj.user.meeting.correlationId}`);
+              console.log(
+                `MEETING:REMOVED ${obj.user.name} ID ${obj.user.meeting.id} correlationID ${obj.user.meeting.correlationId}`
+              );
               if (obj.user.meeting.id === value.meetingId) {
                 obj.user.meeting = null;
-              }
-              else {
+              } else {
                 console.log('MEETING EXISTING ', obj.user.webex.meetings.getAllMeetings());
                 reject(new Error(`Different Meeting Object ${value}`));
               }
@@ -142,8 +145,7 @@ const waitForEvents = (scopeEvents, timeout = max) => {
 
                 resolve(result);
               }
-            }
-            else if (result.length === scopeEvents.length) {
+            } else if (result.length === scopeEvents.length) {
               resolve(result);
               obj.scope.off(obj.event, handler);
               clearTimeout(timer);
@@ -152,12 +154,11 @@ const waitForEvents = (scopeEvents, timeout = max) => {
 
           obj.scope.on(obj.event, handler);
         });
-      }
-      catch (e) {
+      } catch (e) {
         console.error('waitForEvents', e);
         reject(e);
       }
-    })
+    }),
   ]);
 };
 
@@ -172,32 +173,41 @@ const delayedPromise = (promise) => {
     }),
     new Promise((resolve, reject) => {
       setTimeout(() => {
-        promise.then((res) => {
-          resolve(res);
-          clearTimeout(timer);
-        })
+        promise
+          .then((res) => {
+            resolve(res);
+            clearTimeout(timer);
+          })
           .catch((e) => {
             console.error('delayedPromise', e);
             reject(e);
           });
       }, 2000);
-    })
+    }),
   ]);
 };
 
-const delayedTest = (callback, timeout) => new Promise((resolve) => {
-  setTimeout(() => {
-    callback();
-    resolve();
-  }, timeout);
-});
-
-const addMedia = (user) => {
-  const mediaReadyPromises = {
-    local: new Defer(),
-    remoteAudio: new Defer(),
-    remoteVideo: new Defer(),
-  };
+const delayedTest = (callback, timeout) =>
+  new Promise((resolve) => {
+    setTimeout(() => {
+      callback();
+      resolve();
+    }, timeout);
+  });
+
+const addMedia = async (user, options = {}) => {
+  const mediaReadyPromises = Array.isArray(options.expectedMediaReadyTypes)
+    ? options.expectedMediaReadyTypes.reduce((output, expectedMediaReadyType) => {
+      if (typeof expectedMediaReadyType !== 'string') {
+        return output;
+      }
+
+      output[expectedMediaReadyType] = new Defer();
+
+      return output;
+    }, {})
+    : {local: new Defer(), remoteAudio: new Defer(), remoteVideo: new Defer()};
+
   const mediaReady = (media) => {
     if (!media) {
       return;
@@ -209,35 +219,44 @@ const addMedia = (user) => {
 
   user.meeting.on('media:ready', mediaReady);
 
-  return user.meeting.getMediaStreams({
-    sendAudio: true,
-    sendVideo: true,
-    sendShare: false
-  })
-    .then(([localStream, localShare]) => user.meeting.addMedia({
+  const [localStream, localShare] = await user.meeting
+      .getMediaStreams({
+        sendAudio: true,
+        sendVideo: true,
+        sendShare: false,
+      });
+
+  if (options.multistream) {
+    await user.meeting.addMedia({});
+
+    await user.meeting.publishTracks({microphone: localStream.getAudioTracks()[0], camera: localStream.getVideoTracks()[0]})
+  } else {
+    await user.meeting.addMedia({
       mediaSettings: {
         sendAudio: true,
         sendVideo: true,
         sendShare: false,
         receiveShare: true,
         receiveAudio: true,
-        receiveVideo: true
+        receiveVideo: true,
       },
       localShare,
-      localStream
-    }))
-    .then(() => Promise.all(Object.values(mediaReadyPromises).map((defer) => defer.promise)))
-    .then(() => {
-      assert.exists(user.meeting.mediaProperties.audioTrack, 'audioTrack not present');
-      assert.exists(user.meeting.mediaProperties.videoTrack, 'videoTrack not present');
+      localStream,
     });
+  }
+
+  await Promise.all(Object.values(mediaReadyPromises).map((defer) => defer.promise));
+
+  assert.exists(user.meeting.mediaProperties.audioTrack, 'audioTrack not present');
+  assert.exists(user.meeting.mediaProperties.videoTrack, 'videoTrack not present');
 };
 
-const waitUntil = (waitTime) => new Promise((resolve) => {
-  setTimeout(() => {
-    resolve();
-  }, waitTime);
-});
+const waitUntil = (waitTime) =>
+  new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, waitTime);
+  });
 
 const flushPromises = () => new Promise(setImmediate);
 
@@ -259,7 +278,10 @@ const getCircularReplacer = () => {
 
 // this function is meant to be used as the "match" callback with waitForEvents()
 // when you want to wait for a particular users's status to reach a certain value
-const checkParticipantUpdatedStatus = (user, expectedStatus) => (event) => !!event.delta.updated.find((member) => user.meeting.members.selfId === member.id && member.status === expectedStatus);
+const checkParticipantUpdatedStatus = (user, expectedStatus) => (event) =>
+  !!event.delta.updated.find(
+    (member) => user.meeting.members.selfId === member.id && member.status === expectedStatus
+  );
 
 export default {
   waitForSpy,
@@ -273,6 +295,5 @@ export default {
   waitUntil,
   delayedTest,
   flushPromises,
-  getCircularReplacer
+  getCircularReplacer,
 };
-

package/test/utils/webex-config.js

@@ -8,29 +8,29 @@ const SCOPE = [
   'spark:memberships_read',
   'spark:memberships_write',
   'spark:messages_read',
-  'spark:messages_write'
+  'spark:messages_write',
 ].join(' ');
 
 const Config = {
-  version: (() => process.env.BUILD_VERSION || -1),
-  appType: (() => {
+  version: () => process.env.BUILD_VERSION || -1,
+  appType: () => {
     const type = 'Web';
 
     return type;
-  }),
+  },
   clientId: process.env.WEBEX_CLIENT_ID,
-  clientSecret: process.env.WEBEX_CLIENT_SECRET
+  clientSecret: process.env.WEBEX_CLIENT_SECRET,
 };
 
 Config.allowedOutboundTags = {
-  'webex-mention': ['data-object-type', 'data-object-id', 'data-group-type', 'data-object-url']
+  'webex-mention': ['data-object-type', 'data-object-id', 'data-group-type', 'data-object-url'],
 };
 
 Config.webex = {
   maxReconnectAttempts: 5,
   conversation: {
     allowedInboundTags: Config.allowedInboundTags,
-    allowedOutboundTags: Config.allowedOutboundTags
+    allowedOutboundTags: Config.allowedOutboundTags,
   },
   credentials: {
     clientType: 'confidential',
@@ -39,39 +39,43 @@ Config.webex = {
       client_id: Config.clientId,
       client_secret: Config.clientSecret,
       redirect_uri: process.env.LAUNCH_URL,
-      scope: SCOPE
-    }
+      scope: SCOPE,
+    },
   },
   encryption: {
-    decryptionFailureMessage: 'This message cannot be decrypted'
+    decryptionFailureMessage: 'This message cannot be decrypted',
   },
   logger: {
-    level: process.env.NODE_ENV === 'test' ? 'error' : 'error'
+    level: process.env.NODE_ENV === 'test' ? 'error' : 'error',
   },
   meetings: {
     metrics: {
-      autoSendMQA: true
+      autoSendMQA: true,
     },
     autoUploadLogs: false,
     reconnection: {
-      enabled: true
+      enabled: true,
+    },
+    enableRtx: true,
+    experimental: {
+      enableMediaNegotiatedEvent: true,
+      enableUnifiedMeetings: true,
     },
-    enableRtx: true
   },
   people: {
-    showAllTypes: true
+    showAllTypes: true,
   },
   metrics: {
     appVersion: Config.version,
-    appType: Config.appType
+    appType: Config.appType,
   },
   support: {
     appVersion: Config.version,
     appType: Config.appType,
-    languageCode: 'en'
+    languageCode: 'en',
   },
   trackingIdPrefix: 'ITCLIENT',
-  trackingIdSuffix: 'imu:false_imi:true'
+  trackingIdSuffix: 'imu:false_imi:true',
 };
 
 module.exports = Config;

package/test/utils/webex-test-users.js

@@ -8,6 +8,7 @@ const config = require('./webex-config');
 
 // Include the plugins which you feel will be used by the webex instance
 require('@webex/internal-plugin-mercury');
+require('@webex/internal-plugin-llm');
 require('@webex/internal-plugin-user');
 require('@webex/internal-plugin-device');
 require('@webex/internal-plugin-conversation');
@@ -16,64 +17,70 @@ require('@webex/plugin-people');
 require('@webex/plugin-rooms');
 require('@webex/plugin-meetings');
 
-const generateTestUsers = (options) => testUser.create({count: options.count})
-  .then(async (userSet) => {
-    if (userSet.length !== options.count) {
-      return Promise.reject(new Error('Test users not created'));
-    }
+const generateTestUsers = (options = {}) => {
+  options.config = options.config || {};
+  options.config.orgId = options.config.orgId || process.env.WEBEX_CONVERGED_ORG_ID;
 
-    // Pause for 5 seconds for CI
-    await new Promise((done) => setTimeout(done, 5000));
+  return testUser.create(options)
+    .then(async (userSet) => {
+      if (userSet.length !== options.count) {
+        return Promise.reject(new Error('Test users not created'));
+      }
 
-    const userRegisterPromises = [];
+      // Pause for 5 seconds for CI
+      await new Promise((done) => setTimeout(done, 5000));
 
-    userSet.forEach((user) => {
-      // eslint-disable-next-line no-param-reassign
-      user.webex = new WebexCore({
-        config: config.webex,
-        credentials: {
-          authorization: user.token
-        },
-        meetings: {
-          autoUploadLogs: false
-        }
-      });
+      const userRegisterPromises = [];
 
-      user.webex.internal.support.submitLogs = sinon.stub().returns(Promise.resolve());
+      userSet.forEach((user) => {
+        // eslint-disable-next-line no-param-reassign
+        user.webex = new WebexCore({
+          config: config.webex,
+          credentials: {
+            authorization: user.token,
+          },
+          meetings: {
+            autoUploadLogs: false,
+          },
+        });
 
-      userRegisterPromises.push(user.webex.meetings.register());
-    });
+        user.webex.internal.support.submitLogs = sinon.stub().returns(Promise.resolve());
 
-    return Promise.all(userRegisterPromises)
-      .then(() => userSet);
-  })
-  .catch((error) => {
-    console.error('#generateTestUsers=>ERROR', error);
-  });
+        userRegisterPromises.push(user.webex.meetings.register());
+      });
 
-const reserveCMR = (user) => user.webex.request({
-  method: 'POST',
-  uri: 'https://whistler-prod.allnint.ciscospark.com/api/v1/reservations',
-  headers: {
-    authorization: `Bearer ${user.webex.credentials.supertoken.access_token}`,
-    'cisco-no-http-redirect': null,
-    'spark-user-agent': null,
-    trackingid: `ITCLIENT_ ${user.id} _0_imi:true`
-  },
-  body: {
-    resourceType: 'CMR_3',
-    reservedBy: 'SDK_TEST_USER',
-    requestMetaData: {
-      emailAddress: user.emailAddress,
-      loginType: 'loginGuest'
-    }
-  }
-})
-  .then((res) => {
-    console.log('SUCCESS ', res);
-  });
+      return Promise.all(userRegisterPromises).then(() => userSet);
+    })
+    .catch((error) => {
+      console.error('#generateTestUsers=>ERROR', error);
+    });
+};
+
+const reserveCMR = (user) =>
+  user.webex
+    .request({
+      method: 'POST',
+      uri: 'https://whistler-prod.allnint.ciscospark.com/api/v1/reservations',
+      headers: {
+        authorization: `Bearer ${user.webex.credentials.supertoken.access_token}`,
+        'cisco-no-http-redirect': null,
+        'spark-user-agent': null,
+        trackingid: `ITCLIENT_ ${user.id} _0_imi:true`,
+      },
+      body: {
+        resourceType: 'CMR_3',
+        reservedBy: 'SDK_TEST_USER',
+        requestMetaData: {
+          emailAddress: user.emailAddress,
+          loginType: 'loginGuest',
+        },
+      },
+    })
+    .then((res) => {
+      console.log('SUCCESS ', res);
+    });
 
 module.exports = {
   generateTestUsers,
-  reserveCMR
+  reserveCMR,
 };

package/tsconfig.json

@@ -0,0 +1,6 @@
+{
+    "extends": "../../../tsconfig.json",
+    "include": [
+        "src"
+    ],
+}

package/dist/media/internal-media-core-wrapper.js

@@ -1,22 +0,0 @@
-"use strict";
-
-var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
-
-_Object$defineProperty(exports, "__esModule", {
-  value: true
-});
-
-exports.RoapMediaConnection = exports.MultistreamRoapMediaConnection = void 0;
-
-var _internalMediaCore = require("@webex/internal-media-core");
-
-/* We have this wrapper just because otherwise it's impossible to mock
- * RoapMediaConnection and MultistreamRoapMediaConnection constructors in unit tests,
- * because they are exported by @webex/internal-media-core as non-writable, non-configurable
- * properties of MediaConnection and sinon doesn't allow spying on them or stubbing them.
- */
-var RoapMediaConnection = _internalMediaCore.MediaConnection.RoapMediaConnection;
-exports.RoapMediaConnection = RoapMediaConnection;
-var MultistreamRoapMediaConnection = _internalMediaCore.MediaConnection.MultistreamRoapMediaConnection;
-exports.MultistreamRoapMediaConnection = MultistreamRoapMediaConnection;
-//# sourceMappingURL=internal-media-core-wrapper.js.map

package/dist/media/internal-media-core-wrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["RoapMediaConnection","MC","MultistreamRoapMediaConnection"],"sources":["internal-media-core-wrapper.ts"],"sourcesContent":["import {MediaConnection as MC} from '@webex/internal-media-core';\n\n/* We have this wrapper just because otherwise it's impossible to mock\n * RoapMediaConnection and MultistreamRoapMediaConnection constructors in unit tests,\n * because they are exported by @webex/internal-media-core as non-writable, non-configurable\n * properties of MediaConnection and sinon doesn't allow spying on them or stubbing them.\n */\nexport const RoapMediaConnection = MC.RoapMediaConnection;\nexport const MultistreamRoapMediaConnection = MC.MultistreamRoapMediaConnection;\n"],"mappings":";;;;;;;;;;AAAA;;AAEA;AACA;AACA;AACA;AACA;AACO,IAAMA,mBAAmB,GAAGC,kCAAA,CAAGD,mBAA/B;;AACA,IAAME,8BAA8B,GAAGD,kCAAA,CAAGC,8BAA1C"}