@webex/internal-plugin-llm 3.0.0-beta.39 → 3.0.0-beta.391

package/dist/llm.js

@@ -56,35 +56,24 @@ exports.config = config;
 var LLMChannel = /*#__PURE__*/function (_ref) {
   (0, _inherits2.default)(LLMChannel, _ref);
   var _super = _createSuper(LLMChannel);
-  /**
-   * If the LLM plugin has been registered and listening
-   * @instance
-   * @type {Boolean}
-   * @public
-   */
-
-  /**
-   * Initializes the LLM Plugin
-   * @constructor
-   * @public
-   */
   function LLMChannel() {
     var _this;
     (0, _classCallCheck2.default)(this, LLMChannel);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    // eslint-disable-next-line constructor-super
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "namespace", _constants.LLM);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "registered", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "webSocketUrl", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "binding", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "locusUrl", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "register", function (llmSocketUrl) {
       return _this.request({
         method: 'POST',
-        url: llmSocketUrl
+        url: llmSocketUrl,
+        body: {
+          deviceUrl: _this.webex.internal.device.url
+        }
       }).then(function (res) {
         _this.webSocketUrl = res.body.webSocketUrl;
         _this.binding = res.body.binding;
@@ -97,13 +86,11 @@ var LLMChannel = /*#__PURE__*/function (_ref) {
       return _this.register(datachannelUrl).then(function () {
         if (!locusUrl || !datachannelUrl) return undefined;
         _this.locusUrl = locusUrl;
-        _this.connect(_this.webSocketUrl).then(function () {
-          _this.registered = true;
-        });
+        _this.connect(_this.webSocketUrl);
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isConnected", function () {
-      return _this.registered;
+      return _this.connected;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getBinding", function () {
       return _this.binding;
@@ -113,21 +100,13 @@ var LLMChannel = /*#__PURE__*/function (_ref) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "disconnectLLM", function () {
       return _this.disconnect().then(function () {
-        _this.registered = false;
         _this.locusUrl = undefined;
         _this.binding = undefined;
         _this.webSocketUrl = undefined;
       });
     });
-    _this.registered = false;
     return _this;
   }
-
-  /**
-   * Register to the websocket
-   * @param {string} llmSocketUrl
-   * @returns {Promise<void>}
-   */
   return (0, _createClass2.default)(LLMChannel);
 }(_internalPluginMercury.default);
 exports.default = LLMChannel;

package/dist/llm.js.map

@@ -1 +1 @@
-{"version":3,"names":["config","llm","pingInterval","process","env","MERCURY_PING_INTERVAL","pongTimeout","MERCURY_PONG_TIMEOUT","backoffTimeMax","MERCURY_BACKOFF_TIME_MAX","backoffTimeReset","MERCURY_BACKOFF_TIME_RESET","forceCloseDelay","MERCURY_FORCE_CLOSE_DELAY","LLMChannel","args","LLM","llmSocketUrl","request","method","url","then","res","webSocketUrl","body","binding","catch","error","logger","locusUrl","datachannelUrl","register","undefined","connect","registered","disconnect","Mercury"],"sources":["llm.ts"],"sourcesContent":["/* eslint-disable consistent-return */\n\nimport Mercury from '@webex/internal-plugin-mercury';\n\nimport {LLM} from './constants';\n// eslint-disable-next-line no-unused-vars\nimport {ILLMChannel} from './llm.types';\n\nexport const config = {\n  llm: {\n    /**\n     * Milliseconds between pings sent up the socket\n     * @type {number}\n     */\n    pingInterval: process.env.MERCURY_PING_INTERVAL || 15000,\n    /**\n     * Milliseconds to wait for a pong before declaring the connection dead\n     * @type {number}\n     */\n    pongTimeout: process.env.MERCURY_PONG_TIMEOUT || 14000,\n    /**\n     * Maximum milliseconds between connection attempts\n     * @type {Number}\n     */\n    backoffTimeMax: process.env.MERCURY_BACKOFF_TIME_MAX || 32000,\n    /**\n     * Initial milliseconds between connection attempts\n     * @type {Number}\n     */\n    backoffTimeReset: process.env.MERCURY_BACKOFF_TIME_RESET || 1000,\n    /**\n     * Milliseconds to wait for a close frame before declaring the socket dead and\n     * discarding it\n     * @type {[type]}\n     */\n    forceCloseDelay: process.env.MERCURY_FORCE_CLOSE_DELAY || 2000,\n  },\n};\n\n/**\n * LLMChannel to provide socket connections\n */\nexport default class LLMChannel extends (Mercury as any) implements ILLMChannel {\n  namespace = LLM;\n\n  /**\n   * If the LLM plugin has been registered and listening\n   * @instance\n   * @type {Boolean}\n   * @public\n   */\n  private registered = false;\n\n  private webSocketUrl?: string;\n\n  private binding?: string;\n\n  private locusUrl?: string;\n\n  /**\n   * Initializes the LLM Plugin\n   * @constructor\n   * @public\n   */\n  constructor(...args) {\n    // eslint-disable-next-line constructor-super\n    super(...args);\n\n    this.registered = false;\n  }\n\n  /**\n   * Register to the websocket\n   * @param {string} llmSocketUrl\n   * @returns {Promise<void>}\n   */\n  private register = (llmSocketUrl: string): Promise<void> =>\n    this.request({\n      method: 'POST',\n      url: llmSocketUrl,\n    })\n      .then((res: {body: {webSocketUrl: string; binding: string}}) => {\n        this.webSocketUrl = res.body.webSocketUrl;\n        this.binding = res.body.binding;\n      })\n      .catch((error: any) => {\n        this.logger.error(`Error connecting to websocket: ${error}`);\n        throw error;\n      });\n\n  /**\n   * Register and connect to the websocket\n   * @param {string} locusUrl\n   * @param {string} datachannelUrl\n   * @returns {Promise<void>}\n   */\n  public registerAndConnect = (locusUrl: string, datachannelUrl: string): Promise<void> =>\n    this.register(datachannelUrl).then(() => {\n      if (!locusUrl || !datachannelUrl) return undefined;\n      this.locusUrl = locusUrl;\n      this.connect(this.webSocketUrl).then(() => {\n        this.registered = true;\n      });\n    });\n\n  /**\n   * Tells if LLM socket is connected\n   * @returns {boolean} isRegistered\n   */\n  public isConnected = (): boolean => this.registered;\n\n  /**\n   * Tells if LLM socket is connected\n   * @returns {bool} isRegistered\n   */\n  public getBinding = (): string => this.binding;\n\n  /**\n   * Get Locus URL for the connection\n   * @returns {string} locus Url\n   */\n  public getLocusUrl = (): string => this.locusUrl;\n\n  /**\n   * Disconnects websocket connection\n   * @returns {Promise<void>}\n   */\n  public disconnectLLM = (): Promise<void> =>\n    this.disconnect().then(() => {\n      this.registered = false;\n      this.locusUrl = undefined;\n      this.binding = undefined;\n      this.webSocketUrl = undefined;\n    });\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAEA;AAEA;AAAgC;AAAA;AAIzB,IAAMA,MAAM,GAAG;EACpBC,GAAG,EAAE;IACH;AACJ;AACA;AACA;IACIC,YAAY,EAAEC,OAAO,CAACC,GAAG,CAACC,qBAAqB,IAAI,KAAK;IACxD;AACJ;AACA;AACA;IACIC,WAAW,EAAEH,OAAO,CAACC,GAAG,CAACG,oBAAoB,IAAI,KAAK;IACtD;AACJ;AACA;AACA;IACIC,cAAc,EAAEL,OAAO,CAACC,GAAG,CAACK,wBAAwB,IAAI,KAAK;IAC7D;AACJ;AACA;AACA;IACIC,gBAAgB,EAAEP,OAAO,CAACC,GAAG,CAACO,0BAA0B,IAAI,IAAI;IAChE;AACJ;AACA;AACA;AACA;IACIC,eAAe,EAAET,OAAO,CAACC,GAAG,CAACS,yBAAyB,IAAI;EAC5D;AACF,CAAC;;AAED;AACA;AACA;AAFA;AAAA,IAGqBC,UAAU;EAAA;EAAA;EAG7B;AACF;AACA;AACA;AACA;AACA;;EASE;AACF;AACA;AACA;AACA;EACE,sBAAqB;IAAA;IAAA;IAAA,kCAANC,IAAI;MAAJA,IAAI;IAAA;IACjB;IACA,gDAASA,IAAI;IAAE,wFAvBLC,cAAG;IAAA,yFAQM,KAAK;IAAA;IAAA;IAAA;IAAA,uFAyBP,UAACC,YAAoB;MAAA,OACtC,MAAKC,OAAO,CAAC;QACXC,MAAM,EAAE,MAAM;QACdC,GAAG,EAAEH;MACP,CAAC,CAAC,CACCI,IAAI,CAAC,UAACC,GAAoD,EAAK;QAC9D,MAAKC,YAAY,GAAGD,GAAG,CAACE,IAAI,CAACD,YAAY;QACzC,MAAKE,OAAO,GAAGH,GAAG,CAACE,IAAI,CAACC,OAAO;MACjC,CAAC,CAAC,CACDC,KAAK,CAAC,UAACC,KAAU,EAAK;QACrB,MAAKC,MAAM,CAACD,KAAK,0CAAmCA,KAAK,EAAG;QAC5D,MAAMA,KAAK;MACb,CAAC,CAAC;IAAA;IAAA,iGAQsB,UAACE,QAAgB,EAAEC,cAAsB;MAAA,OACnE,MAAKC,QAAQ,CAACD,cAAc,CAAC,CAACT,IAAI,CAAC,YAAM;QACvC,IAAI,CAACQ,QAAQ,IAAI,CAACC,cAAc,EAAE,OAAOE,SAAS;QAClD,MAAKH,QAAQ,GAAGA,QAAQ;QACxB,MAAKI,OAAO,CAAC,MAAKV,YAAY,CAAC,CAACF,IAAI,CAAC,YAAM;UACzC,MAAKa,UAAU,GAAG,IAAI;QACxB,CAAC,CAAC;MACJ,CAAC,CAAC;IAAA;IAAA,0FAMiB;MAAA,OAAe,MAAKA,UAAU;IAAA;IAAA,yFAM/B;MAAA,OAAc,MAAKT,OAAO;IAAA;IAAA,0FAMzB;MAAA,OAAc,MAAKI,QAAQ;IAAA;IAAA,4FAMzB;MAAA,OACrB,MAAKM,UAAU,EAAE,CAACd,IAAI,CAAC,YAAM;QAC3B,MAAKa,UAAU,GAAG,KAAK;QACvB,MAAKL,QAAQ,GAAGG,SAAS;QACzB,MAAKP,OAAO,GAAGO,SAAS;QACxB,MAAKT,YAAY,GAAGS,SAAS;MAC/B,CAAC,CAAC;IAAA;IAjEF,MAAKE,UAAU,GAAG,KAAK;IAAC;EAC1B;;EAEA;AACF;AACA;AACA;AACA;EAJE;AAAA,EA7BuCE,8BAAO;AAAA"}
+{"version":3,"names":["config","llm","pingInterval","process","env","MERCURY_PING_INTERVAL","pongTimeout","MERCURY_PONG_TIMEOUT","backoffTimeMax","MERCURY_BACKOFF_TIME_MAX","backoffTimeReset","MERCURY_BACKOFF_TIME_RESET","forceCloseDelay","MERCURY_FORCE_CLOSE_DELAY","LLMChannel","LLM","llmSocketUrl","request","method","url","body","deviceUrl","webex","internal","device","then","res","webSocketUrl","binding","catch","error","logger","locusUrl","datachannelUrl","register","undefined","connect","connected","disconnect","Mercury"],"sources":["llm.ts"],"sourcesContent":["/* eslint-disable consistent-return */\n\nimport Mercury from '@webex/internal-plugin-mercury';\n\nimport {LLM} from './constants';\n// eslint-disable-next-line no-unused-vars\nimport {ILLMChannel} from './llm.types';\n\nexport const config = {\n  llm: {\n    /**\n     * Milliseconds between pings sent up the socket\n     * @type {number}\n     */\n    pingInterval: process.env.MERCURY_PING_INTERVAL || 15000,\n    /**\n     * Milliseconds to wait for a pong before declaring the connection dead\n     * @type {number}\n     */\n    pongTimeout: process.env.MERCURY_PONG_TIMEOUT || 14000,\n    /**\n     * Maximum milliseconds between connection attempts\n     * @type {Number}\n     */\n    backoffTimeMax: process.env.MERCURY_BACKOFF_TIME_MAX || 32000,\n    /**\n     * Initial milliseconds between connection attempts\n     * @type {Number}\n     */\n    backoffTimeReset: process.env.MERCURY_BACKOFF_TIME_RESET || 1000,\n    /**\n     * Milliseconds to wait for a close frame before declaring the socket dead and\n     * discarding it\n     * @type {[type]}\n     */\n    forceCloseDelay: process.env.MERCURY_FORCE_CLOSE_DELAY || 2000,\n  },\n};\n\n/**\n * LLMChannel to provide socket connections\n */\nexport default class LLMChannel extends (Mercury as any) implements ILLMChannel {\n  namespace = LLM;\n\n  /**\n   * If the LLM plugin has been registered and listening\n   * @instance\n   * @type {Boolean}\n   * @public\n   */\n\n  private webSocketUrl?: string;\n\n  private binding?: string;\n\n  private locusUrl?: string;\n\n  /**\n   * Register to the websocket\n   * @param {string} llmSocketUrl\n   * @returns {Promise<void>}\n   */\n  private register = (llmSocketUrl: string): Promise<void> =>\n    this.request({\n      method: 'POST',\n      url: llmSocketUrl,\n      body: {deviceUrl: this.webex.internal.device.url},\n    })\n      .then((res: {body: {webSocketUrl: string; binding: string}}) => {\n        this.webSocketUrl = res.body.webSocketUrl;\n        this.binding = res.body.binding;\n      })\n      .catch((error: any) => {\n        this.logger.error(`Error connecting to websocket: ${error}`);\n        throw error;\n      });\n\n  /**\n   * Register and connect to the websocket\n   * @param {string} locusUrl\n   * @param {string} datachannelUrl\n   * @returns {Promise<void>}\n   */\n  public registerAndConnect = (locusUrl: string, datachannelUrl: string): Promise<void> =>\n    this.register(datachannelUrl).then(() => {\n      if (!locusUrl || !datachannelUrl) return undefined;\n      this.locusUrl = locusUrl;\n      this.connect(this.webSocketUrl);\n    });\n\n  /**\n   * Tells if LLM socket is connected\n   * @returns {boolean} connected\n   */\n  public isConnected = (): boolean => this.connected;\n\n  /**\n   * Tells if LLM socket is binding\n   * @returns {string} binding\n   */\n  public getBinding = (): string => this.binding;\n\n  /**\n   * Get Locus URL for the connection\n   * @returns {string} locus Url\n   */\n  public getLocusUrl = (): string => this.locusUrl;\n\n  /**\n   * Disconnects websocket connection\n   * @returns {Promise<void>}\n   */\n  public disconnectLLM = (): Promise<void> =>\n    this.disconnect().then(() => {\n      this.locusUrl = undefined;\n      this.binding = undefined;\n      this.webSocketUrl = undefined;\n    });\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAEA;AAEA;AAAgC;AAAA;AAIzB,IAAMA,MAAM,GAAG;EACpBC,GAAG,EAAE;IACH;AACJ;AACA;AACA;IACIC,YAAY,EAAEC,OAAO,CAACC,GAAG,CAACC,qBAAqB,IAAI,KAAK;IACxD;AACJ;AACA;AACA;IACIC,WAAW,EAAEH,OAAO,CAACC,GAAG,CAACG,oBAAoB,IAAI,KAAK;IACtD;AACJ;AACA;AACA;IACIC,cAAc,EAAEL,OAAO,CAACC,GAAG,CAACK,wBAAwB,IAAI,KAAK;IAC7D;AACJ;AACA;AACA;IACIC,gBAAgB,EAAEP,OAAO,CAACC,GAAG,CAACO,0BAA0B,IAAI,IAAI;IAChE;AACJ;AACA;AACA;AACA;IACIC,eAAe,EAAET,OAAO,CAACC,GAAG,CAACS,yBAAyB,IAAI;EAC5D;AACF,CAAC;;AAED;AACA;AACA;AAFA;AAAA,IAGqBC,UAAU;EAAA;EAAA;EAAA;IAAA;IAAA;IAAA;MAAA;IAAA;IAAA;IAAA,wFACjBC,cAAG;IAAA;IAAA;IAAA;IAAA,uFAoBI,UAACC,YAAoB;MAAA,OACtC,MAAKC,OAAO,CAAC;QACXC,MAAM,EAAE,MAAM;QACdC,GAAG,EAAEH,YAAY;QACjBI,IAAI,EAAE;UAACC,SAAS,EAAE,MAAKC,KAAK,CAACC,QAAQ,CAACC,MAAM,CAACL;QAAG;MAClD,CAAC,CAAC,CACCM,IAAI,CAAC,UAACC,GAAoD,EAAK;QAC9D,MAAKC,YAAY,GAAGD,GAAG,CAACN,IAAI,CAACO,YAAY;QACzC,MAAKC,OAAO,GAAGF,GAAG,CAACN,IAAI,CAACQ,OAAO;MACjC,CAAC,CAAC,CACDC,KAAK,CAAC,UAACC,KAAU,EAAK;QACrB,MAAKC,MAAM,CAACD,KAAK,0CAAmCA,KAAK,EAAG;QAC5D,MAAMA,KAAK;MACb,CAAC,CAAC;IAAA;IAAA,iGAQsB,UAACE,QAAgB,EAAEC,cAAsB;MAAA,OACnE,MAAKC,QAAQ,CAACD,cAAc,CAAC,CAACR,IAAI,CAAC,YAAM;QACvC,IAAI,CAACO,QAAQ,IAAI,CAACC,cAAc,EAAE,OAAOE,SAAS;QAClD,MAAKH,QAAQ,GAAGA,QAAQ;QACxB,MAAKI,OAAO,CAAC,MAAKT,YAAY,CAAC;MACjC,CAAC,CAAC;IAAA;IAAA,0FAMiB;MAAA,OAAe,MAAKU,SAAS;IAAA;IAAA,yFAM9B;MAAA,OAAc,MAAKT,OAAO;IAAA;IAAA,0FAMzB;MAAA,OAAc,MAAKI,QAAQ;IAAA;IAAA,4FAMzB;MAAA,OACrB,MAAKM,UAAU,EAAE,CAACb,IAAI,CAAC,YAAM;QAC3B,MAAKO,QAAQ,GAAGG,SAAS;QACzB,MAAKP,OAAO,GAAGO,SAAS;QACxB,MAAKR,YAAY,GAAGQ,SAAS;MAC/B,CAAC,CAAC;IAAA;IAAA;EAAA;EAAA;AAAA,EA5EmCI,8BAAO;AAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/internal-plugin-llm",
-  "version": "3.0.0-beta.39",
+  "version": "3.0.0-beta.391",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "main": "dist/index.js",
@@ -14,8 +14,8 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@webex/internal-plugin-llm": "3.0.0-beta.39",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.39"
+    "@webex/internal-plugin-llm": "3.0.0-beta.391",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.391"
   },
   "browserify": {
     "transform": [
@@ -24,8 +24,8 @@
     ]
   },
   "devDependencies": {
-    "@webex/test-helper-chai": "3.0.0-beta.39",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.39",
+    "@webex/test-helper-chai": "3.0.0-beta.391",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.391",
     "sinon": "^9.2.4"
   }
 }

package/src/llm.ts

@@ -49,7 +49,6 @@ export default class LLMChannel extends (Mercury as any) implements ILLMChannel
    * @type {Boolean}
    * @public
    */
-  private registered = false;
 
   private webSocketUrl?: string;
 
@@ -57,18 +56,6 @@ export default class LLMChannel extends (Mercury as any) implements ILLMChannel
 
   private locusUrl?: string;
 
-  /**
-   * Initializes the LLM Plugin
-   * @constructor
-   * @public
-   */
-  constructor(...args) {
-    // eslint-disable-next-line constructor-super
-    super(...args);
-
-    this.registered = false;
-  }
-
   /**
    * Register to the websocket
    * @param {string} llmSocketUrl
@@ -78,6 +65,7 @@ export default class LLMChannel extends (Mercury as any) implements ILLMChannel
     this.request({
       method: 'POST',
       url: llmSocketUrl,
+      body: {deviceUrl: this.webex.internal.device.url},
     })
       .then((res: {body: {webSocketUrl: string; binding: string}}) => {
         this.webSocketUrl = res.body.webSocketUrl;
@@ -98,20 +86,18 @@ export default class LLMChannel extends (Mercury as any) implements ILLMChannel
     this.register(datachannelUrl).then(() => {
       if (!locusUrl || !datachannelUrl) return undefined;
       this.locusUrl = locusUrl;
-      this.connect(this.webSocketUrl).then(() => {
-        this.registered = true;
-      });
+      this.connect(this.webSocketUrl);
     });
 
   /**
    * Tells if LLM socket is connected
-   * @returns {boolean} isRegistered
+   * @returns {boolean} connected
    */
-  public isConnected = (): boolean => this.registered;
+  public isConnected = (): boolean => this.connected;
 
   /**
-   * Tells if LLM socket is connected
-   * @returns {bool} isRegistered
+   * Tells if LLM socket is binding
+   * @returns {string} binding
    */
   public getBinding = (): string => this.binding;
 
@@ -127,7 +113,6 @@ export default class LLMChannel extends (Mercury as any) implements ILLMChannel
    */
   public disconnectLLM = (): Promise<void> =>
     this.disconnect().then(() => {
-      this.registered = false;
       this.locusUrl = undefined;
       this.binding = undefined;
       this.webSocketUrl = undefined;

package/test/unit/spec/llm.js

@@ -20,7 +20,9 @@ describe('plugin-llm', () => {
       });
 
       llmService = webex.internal.llm;
-      llmService.connect = sinon.stub().resolves(true);
+      llmService.connect = sinon.stub().callsFake(() => {
+        llmService.connected = true;
+      });
       llmService.disconnect = sinon.stub().resolves(true);
       llmService.request = sinon.stub().resolves({
         headers: {},
@@ -65,6 +67,7 @@ describe('plugin-llm', () => {
           sinon.match({
             method: 'POST',
             url: `${datachannelUrl}`,
+            body: {deviceUrl: webex.internal.device.url},
           })
         );