botium-core 1.12.1 → 1.12.2

package/dist/botium-es.js

@@ -36,7 +36,7 @@ import express from 'express';
 import bodyParser from 'body-parser';
 
 var name = "botium-core";
-var version$1 = "1.12.1";
+var version$1 = "1.12.2";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module = "dist/botium-es.js";
@@ -314,6 +314,7 @@ var Capabilities = {
   // API Calls Rate Limiting
   RATELIMIT_USERSAYS_MAXCONCURRENT: 'RATELIMIT_USERSAYS_MAXCONCURRENT',
   RATELIMIT_USERSAYS_MINTIME: 'RATELIMIT_USERSAYS_MINTIME',
+  RATELIMIT_BOTTLENECK_FN: 'RATELIMIT_BOTTLENECK_FN',
   SECURITY_ALLOW_UNSAFE: 'SECURITY_ALLOW_UNSAFE',
   PRECOMPILERS: 'PRECOMPILERS'
 };
@@ -448,6 +449,7 @@ Capabilities.LOGIC_HOOKS;
 Capabilities.USER_INPUTS;
 Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT;
 Capabilities.RATELIMIT_USERSAYS_MINTIME;
+Capabilities.RATELIMIT_BOTTLENECK_FN;
 Capabilities.SECURITY_ALLOW_UNSAFE;
 Capabilities.PRECOMPILERS;
 
@@ -7537,7 +7539,7 @@ var BaseContainer_1 = class BaseContainer {
     this.tempDirectory = tempDirectory;
     this.cleanupTasks = [];
     this.queues = {};
-    this.userSaysLimiter = null;
+    this.bottleneck = null;
   }
 
   Validate() {
@@ -7547,18 +7549,33 @@ var BaseContainer_1 = class BaseContainer {
     this.onBotResponseHook = getHook$1(this.caps, this.caps[Capabilities.CUSTOMHOOK_ONBOTRESPONSE]);
     this.onStopHook = getHook$1(this.caps, this.caps[Capabilities.CUSTOMHOOK_ONSTOP]);
     this.onCleanHook = getHook$1(this.caps, this.caps[Capabilities.CUSTOMHOOK_ONCLEAN]);
-    return Promise.resolve();
-  }
 
-  Build() {
-    if (this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT] || this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME]) {
+    if (this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN]) {
+      if (lodash.isFunction(this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN])) {
+        this.bottleneck = this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN];
+        debug$7('Validate: Applying userSays rate limits from capability');
+      } else {
+        const limiter = new bottleneck(this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN]);
+
+        this.bottleneck = fn => limiter.schedule(fn);
+
+        debug$7(`Validate: Applying userSays rate limits ${util.inspect(this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN])}`);
+      }
+    } else if (this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT] || this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME]) {
       const opts = {};
       if (this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT]) opts.maxConcurrent = this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT];
       if (this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME]) opts.minTime = this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME];
-      this.userSaysLimiter = new bottleneck(opts);
-      debug$7(`Build: Applying userSays rate limits ${util.inspect(opts)}`);
+      const limiter = new bottleneck(opts);
+
+      this.bottleneck = fn => limiter.schedule(fn);
+
+      debug$7(`Validate: Applying userSays rate limits ${util.inspect(opts)}`);
     }
 
+    return Promise.resolve();
+  }
+
+  Build() {
     return new Promise((resolve, reject) => {
       this._RunCustomHook('onBuild', this.onBuildHook).then(() => resolve(this)).catch(err => reject(err));
     });
@@ -7584,8 +7601,8 @@ var BaseContainer_1 = class BaseContainer {
       meMsg
     }).then(() => this.UserSaysImpl(meMsg));
 
-    if (this.userSaysLimiter) {
-      return this.userSaysLimiter.schedule(run);
+    if (this.bottleneck) {
+      return this.bottleneck(run);
     } else {
       return run();
     }
@@ -8073,10 +8090,14 @@ mustache.escape = s => s;
 var SimpleRestContainer_1 = class SimpleRestContainer {
   constructor({
     queueBotSays,
-    caps
+    caps,
+    bottleneck
   }) {
     this.queueBotSays = queueBotSays;
     this.caps = Object.assign({}, Defaults, caps);
+
+    this.bottleneck = bottleneck || (fn => fn());
+
     this.processInbound = false;
     this.redisTopic = this.caps[Capabilities.SIMPLEREST_REDIS_TOPIC] || 'SIMPLEREST_INBOUND_SUBSCRIPTION';
 
@@ -8615,7 +8636,7 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
         err,
         response,
         body
-      } = await new Promise(resolve => {
+      } = await this.bottleneck(() => new Promise(resolve => {
         request(pingConfig, (err, response, body) => {
           resolve({
             err,
@@ -8623,7 +8644,7 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
             body
           });
         });
-      });
+      }));
 
       if (err) {
         debug$4(`_waitForUrlResponse error on url check ${pingConfig.uri}: ${err}`);
@@ -9147,6 +9168,7 @@ var PluginConnectorContainer_1 = class PluginConnectorContainer extends BaseCont
     this.pluginInstance = tryLoadPlugin(this.caps[Capabilities.CONTAINERMODE], this.caps[Capabilities.PLUGINMODULEPATH], {
       container: this,
       queueBotSays: msg => this._QueueBotSays(msg),
+      bottleneck: this.bottleneck,
       eventEmitter: this.eventEmitter,
       caps: this.caps,
       sources: this.sources,