@aws-amplify/interactions 4.0.49-unstable.13 → 4.0.50-unstable.5

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.49](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/interactions@4.0.48...@aws-amplify/interactions@4.0.49) (2022-08-16)
+
+**Note:** Version bump only for package @aws-amplify/interactions
+
+
+
+
+
 ## [4.0.48](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/interactions@4.0.47...@aws-amplify/interactions@4.0.48) (2022-08-01)
 
 **Note:** Version bump only for package @aws-amplify/interactions

package/dist/aws-amplify-interactions.js

@@ -11207,6 +11207,10 @@ function () {
    * @param {InteractionsOptions} options - Configuration object for Interactions
    */
   function InteractionsClass(options) {
+    if (options === void 0) {
+      options = {};
+    }
+
     this._options = options;
     logger.debug('Interactions Options', this._options);
     this._pluggables = {};
@@ -11218,7 +11222,7 @@ function () {
   /**
    *
    * @param {InteractionsOptions} options - Configuration object for Interactions
-   * @return {Object} - The current configuration
+   * @return {InteractionsOptions} - The current configuration
    */
 
 
@@ -11242,32 +11246,50 @@ function () {
           _this._options.bots[bot.name] = bot;
         });
       }
-    } // Check if AWSLex provider is already on pluggables
+    } // configure bots to their specific providers
 
 
-    if (!this._pluggables.AWSLexProvider && bots_config && Object.keys(bots_config).map(function (key) {
-      return bots_config[key];
-    }).find(function (bot) {
-      return !bot.providerName || bot.providerName === 'AWSLexProvider';
-    })) {
-      this._pluggables.AWSLexProvider = new _Providers__WEBPACK_IMPORTED_MODULE_1__["AWSLexProvider"]();
-    }
+    Object.keys(bots_config).forEach(function (botKey) {
+      var _a;
+
+      var bot = bots_config[botKey];
+      var providerName = bot.providerName || 'AWSLexProvider'; // add default provider if required
+
+      if (!_this._pluggables.AWSLexProvider && providerName === 'AWSLexProvider') {
+        _this._pluggables.AWSLexProvider = new _Providers__WEBPACK_IMPORTED_MODULE_1__["AWSLexProvider"]();
+      } // configure bot with it's respective provider
+
 
-    Object.keys(this._pluggables).map(function (key) {
-      _this._pluggables[key].configure(_this._options.bots);
+      if (_this._pluggables[providerName]) {
+        _this._pluggables[providerName].configure((_a = {}, _a[bot.name] = bot, _a));
+      } else {
+        logger.debug("bot " + bot.name + " was not configured as " + providerName + " provider was not found");
+      }
     });
     return this._options;
   };
 
   InteractionsClass.prototype.addPluggable = function (pluggable) {
-    if (pluggable && pluggable.getCategory() === 'Interactions') {
-      if (!this._pluggables[pluggable.getProviderName()]) {
-        pluggable.configure(this._options.bots);
-        this._pluggables[pluggable.getProviderName()] = pluggable;
-        return;
-      } else {
-        throw new Error('Bot ' + pluggable.getProviderName() + ' already plugged');
-      }
+    var _this = this;
+
+    if (!(pluggable && pluggable.getCategory() === 'Interactions')) {
+      throw new Error('Invalid pluggable');
+    }
+
+    if (!this._pluggables[pluggable.getProviderName()]) {
+      // configure bots for the new plugin
+      Object.keys(this._options.bots).filter(function (botKey) {
+        return _this._options.bots[botKey].providerName === pluggable.getProviderName();
+      }).forEach(function (botKey) {
+        var _a;
+
+        var bot = _this._options.bots[botKey];
+        pluggable.configure((_a = {}, _a[bot.name] = bot, _a));
+      });
+      this._pluggables[pluggable.getProviderName()] = pluggable;
+      return;
+    } else {
+      throw new Error('Pluggable ' + pluggable.getProviderName() + ' already plugged');
     }
   };
 
@@ -11278,13 +11300,17 @@ function () {
         switch (_a.label) {
           case 0:
             if (!this._options.bots || !this._options.bots[botname]) {
-              throw new Error('Bot ' + botname + ' does not exist');
+              return [2
+              /*return*/
+              , Promise.reject('Bot ' + botname + ' does not exist')];
             }
 
             botProvider = this._options.bots[botname].providerName || 'AWSLexProvider';
 
             if (!this._pluggables[botProvider]) {
-              throw new Error('Bot ' + botProvider + ' does not have valid pluggin did you try addPluggable first?');
+              return [2
+              /*return*/
+              , Promise.reject('Bot ' + botProvider + ' does not have valid pluggin did you try addPluggable first?')];
             }
 
             return [4
@@ -11318,7 +11344,7 @@ function () {
 }();
 
 
-var Interactions = new InteractionsClass(null);
+var Interactions = new InteractionsClass();
 _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Amplify"].register(Interactions);
 
 /***/ }),
@@ -11338,18 +11364,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
 /* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _AWSLexProviderHelper_convert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./AWSLexProviderHelper/convert */ "./lib-esm/Providers/AWSLexProviderHelper/convert.js");
-/*
- * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 var __extends = undefined && undefined.__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -11534,6 +11548,19 @@ var __generator = undefined && undefined.__generator || function (thisArg, body)
     };
   }
 };
+/*
+ * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+ * the License. A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
 
 
 
@@ -11561,6 +11588,24 @@ function (_super) {
     return 'AWSLexProvider';
   };
 
+  AWSLexProvider.prototype.configure = function (config) {
+    if (config === void 0) {
+      config = {};
+    }
+
+    var propertiesToTest = ['name', 'alias', 'region'];
+    Object.keys(config).forEach(function (botKey) {
+      var botConfig = config[botKey]; // is bot config correct
+
+      if (!propertiesToTest.every(function (x) {
+        return x in botConfig;
+      })) {
+        throw new Error('invalid bot configuration');
+      }
+    });
+    return _super.prototype.configure.call(this, config);
+  };
+
   AWSLexProvider.prototype.reportBotStatus = function (data, botname) {
     var _this = this; // Check if state is fulfilled to resolve onFullfilment promise
 
@@ -11602,29 +11647,40 @@ function (_super) {
 
   AWSLexProvider.prototype.sendMessage = function (botname, message) {
     return __awaiter(this, void 0, void 0, function () {
-      var credentials, params, postTextCommand, data, err_1, content, messageType, postContentCommand, data, audioArray, err_2;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
+      var credentials, error_1, params, postTextCommand, data, err_1, content, messageType, _a, postContentCommand, data, audioArray, _b, err_2;
+
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
+            // check if bot exists
             if (!this._config[botname]) {
               return [2
               /*return*/
               , Promise.reject('Bot ' + botname + ' does not exist')];
             }
 
+            _c.label = 1;
+
+          case 1:
+            _c.trys.push([1, 3,, 4]);
+
             return [4
             /*yield*/
             , _aws_amplify_core__WEBPACK_IMPORTED_MODULE_2__["Credentials"].get()];
 
-          case 1:
-            credentials = _a.sent();
+          case 2:
+            credentials = _c.sent();
+            return [3
+            /*break*/
+            , 4];
 
-            if (!credentials) {
-              return [2
-              /*return*/
-              , Promise.reject('No credentials')];
-            }
+          case 3:
+            error_1 = _c.sent();
+            return [2
+            /*return*/
+            , Promise.reject('No credentials')];
 
+          case 4:
             this.lexRuntimeServiceClient = new _aws_sdk_client_lex_runtime_service__WEBPACK_IMPORTED_MODULE_1__["LexRuntimeServiceClient"]({
               region: this._config[botname].region,
               credentials: credentials,
@@ -11632,7 +11688,7 @@ function (_super) {
             });
             if (!(typeof message === 'string')) return [3
             /*break*/
-            , 6];
+            , 9];
             params = {
               botAlias: this._config[botname].alias,
               botName: botname,
@@ -11640,76 +11696,104 @@ function (_super) {
               userId: credentials.identityId
             };
             logger.debug('postText to lex', message);
-            _a.label = 2;
+            _c.label = 5;
 
-          case 2:
-            _a.trys.push([2, 4,, 5]);
+          case 5:
+            _c.trys.push([5, 7,, 8]);
 
             postTextCommand = new _aws_sdk_client_lex_runtime_service__WEBPACK_IMPORTED_MODULE_1__["PostTextCommand"](params);
             return [4
             /*yield*/
             , this.lexRuntimeServiceClient.send(postTextCommand)];
 
-          case 3:
-            data = _a.sent();
+          case 6:
+            data = _c.sent();
             this.reportBotStatus(data, botname);
             return [2
             /*return*/
             , data];
 
-          case 4:
-            err_1 = _a.sent();
+          case 7:
+            err_1 = _c.sent();
             return [2
             /*return*/
             , Promise.reject(err_1)];
 
-          case 5:
+          case 8:
             return [3
             /*break*/
-            , 11];
+            , 19];
 
-          case 6:
+          case 9:
             content = message.content, messageType = message.options.messageType;
+            if (!(messageType === 'voice')) return [3
+            /*break*/
+            , 11];
+            if (!(content instanceof Blob || content instanceof ReadableStream)) return [2
+            /*return*/
+            , Promise.reject('invalid content type')];
+            _a = {
+              botAlias: this._config[botname].alias,
+              botName: botname,
+              contentType: 'audio/x-l16; sample-rate=16000; channel-count=1'
+            };
+            return [4
+            /*yield*/
+            , Object(_AWSLexProviderHelper_convert__WEBPACK_IMPORTED_MODULE_3__["convert"])(content)];
 
-            if (messageType === 'voice') {
-              params = {
-                botAlias: this._config[botname].alias,
-                botName: botname,
-                contentType: 'audio/x-l16; sample-rate=16000',
-                inputStream: content,
-                userId: credentials.identityId,
-                accept: 'audio/mpeg'
-              };
-            } else {
-              params = {
-                botAlias: this._config[botname].alias,
-                botName: botname,
-                contentType: 'text/plain; charset=utf-8',
-                inputStream: content,
-                userId: credentials.identityId,
-                accept: 'audio/mpeg'
-              };
-            }
+          case 10:
+            params = (_a.inputStream = _c.sent(), _a.userId = credentials.identityId, _a.accept = 'audio/mpeg', _a);
+            return [3
+            /*break*/
+            , 12];
+
+          case 11:
+            if (typeof content !== 'string') return [2
+            /*return*/
+            , Promise.reject('invalid content type')];
+            params = {
+              botAlias: this._config[botname].alias,
+              botName: botname,
+              contentType: 'text/plain; charset=utf-8',
+              inputStream: content,
+              userId: credentials.identityId,
+              accept: 'audio/mpeg'
+            };
+            _c.label = 12;
 
+          case 12:
             logger.debug('postContent to lex', message);
-            _a.label = 7;
+            _c.label = 13;
 
-          case 7:
-            _a.trys.push([7, 10,, 11]);
+          case 13:
+            _c.trys.push([13, 18,, 19]);
 
             postContentCommand = new _aws_sdk_client_lex_runtime_service__WEBPACK_IMPORTED_MODULE_1__["PostContentCommand"](params);
             return [4
             /*yield*/
             , this.lexRuntimeServiceClient.send(postContentCommand)];
 
-          case 8:
-            data = _a.sent();
+          case 14:
+            data = _c.sent();
+            if (!data.audioStream) return [3
+            /*break*/
+            , 16];
             return [4
             /*yield*/
             , Object(_AWSLexProviderHelper_convert__WEBPACK_IMPORTED_MODULE_3__["convert"])(data.audioStream)];
 
-          case 9:
-            audioArray = _a.sent();
+          case 15:
+            _b = _c.sent();
+            return [3
+            /*break*/
+            , 17];
+
+          case 16:
+            _b = undefined;
+            _c.label = 17;
+
+          case 17:
+            audioArray = _b;
             this.reportBotStatus(data, botname);
             return [2
             /*return*/
@@ -11717,13 +11801,13 @@ function (_super) {
               audioStream: audioArray
             })];
 
-          case 10:
-            err_2 = _a.sent();
+          case 18:
+            err_2 = _c.sent();
             return [2
             /*return*/
             , Promise.reject(err_2)];
 
-          case 11:
+          case 19:
             return [2
             /*return*/
             ];
@@ -11733,8 +11817,9 @@ function (_super) {
   };
 
   AWSLexProvider.prototype.onComplete = function (botname, callback) {
+    // does bot exist
     if (!this._config[botname]) {
-      throw new ErrorEvent('Bot ' + botname + ' does not exist');
+      throw new Error('Bot ' + botname + ' does not exist');
     }
 
     this._botsCompleteCallback[botname] = callback;
@@ -11887,7 +11972,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!**************************!*\
   !*** ./lib-esm/index.js ***!
   \**************************/
-/*! exports provided: default, AWSLexProvider, Interactions */
+/*! exports provided: default, AbstractInteractionsProvider, AWSLexProvider, Interactions */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -11895,8 +11980,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Interactions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Interactions */ "./lib-esm/Interactions.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Interactions", function() { return _Interactions__WEBPACK_IMPORTED_MODULE_0__["Interactions"]; });
 
-/* harmony import */ var _Providers_AWSLexProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Providers/AWSLexProvider */ "./lib-esm/Providers/AWSLexProvider.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AWSLexProvider", function() { return _Providers_AWSLexProvider__WEBPACK_IMPORTED_MODULE_1__["AWSLexProvider"]; });
+/* harmony import */ var _Providers_InteractionsProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Providers/InteractionsProvider */ "./lib-esm/Providers/InteractionsProvider.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AbstractInteractionsProvider", function() { return _Providers_InteractionsProvider__WEBPACK_IMPORTED_MODULE_1__["AbstractInteractionsProvider"]; });
+
+/* harmony import */ var _Providers_AWSLexProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Providers/AWSLexProvider */ "./lib-esm/Providers/AWSLexProvider.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AWSLexProvider", function() { return _Providers_AWSLexProvider__WEBPACK_IMPORTED_MODULE_2__["AWSLexProvider"]; });
 
 /*
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -11919,6 +12007,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 /***/ }),
 
 /***/ "@aws-amplify/core":