wingbot 3.65.9 → 3.65.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.65.9",
+  "version": "3.65.11",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -57,7 +57,7 @@
     "compress-json": "^2.1.2",
     "deep-extend": "^0.6.0",
     "form-data": "^4.0.0",
-    "graphql": "^15.8.0",
+    "graphql": "^16.8.0",
     "jsonwebtoken": "^9.0.0",
     "node-fetch": "^2.6.7",
     "path-to-regexp": "^6.2.1",

package/plugins/index.js

@@ -8,14 +8,14 @@ const pluginsJson = require('./plugins.json');
 const plugins = new Map();
 
 for (const plugin of pluginsJson.plugins) {
-    // @ts-ignore
-    const fn = module.require(`./${plugin.id}/plugin`);
+    plugins.set(plugin.id, {
+        pluginFactory: (...args) => {
+            // @ts-ignore
+            const fn = module.require(`./${plugin.id}/plugin`);
 
-    if (plugin.isFactory) {
-        plugins.set(plugin.id, { pluginFactory: fn });
-    } else {
-        plugins.set(plugin.id, fn);
-    }
+            return plugin.isFactory ? fn(...args) : fn;
+        }
+    });
 }
 
 module.exports = plugins;

package/src/graphApi/GraphApi.js

@@ -4,7 +4,6 @@
 'use strict';
 
 const assert = require('assert');
-const { graphql, buildSchema } = require('graphql');
 const WingbotApiConnector = require('./WingbotApiConnector');
 // @ts-ignore
 const packageJson = require('../../package.json');
@@ -21,6 +20,7 @@ const DEFAULT_CACHE = 86400000; // 24 hours
  */
 
 /** @typedef {import('../CallbackAuditLog')} AuditLog */
+/** @typedef {import('graphql')} GqlLib */
 
 /**
  * Experimental chatbot API
@@ -81,6 +81,19 @@ class GraphApi {
             cacheKeys: opts.cacheKeys,
             useBundledGql: opts.useBundledGql
         });
+
+        this._lib = null;
+    }
+
+    /**
+     * @returns {GqlLib}
+     */
+    get _gql () {
+        if (this._lib === null) {
+            // eslint-disable-next-line global-require
+            this._lib = require('graphql');
+        }
+        return this._lib;
     }
 
     /**
@@ -139,8 +152,16 @@ class GraphApi {
             audit
         };
 
-        // @ts-ignore
-        return graphql(schema, body.query, this._root, ctx, body.variables, body.operationName);
+        const response = await this._gql.graphql({
+            schema,
+            source: body.query,
+            rootValue: this._root,
+            contextValue: ctx,
+            variableValues: body.variables,
+            operationName: body.operationName
+        });
+
+        return response;
     }
 
     async _schema () {
@@ -151,7 +172,7 @@ class GraphApi {
 
         if (!schemaIsSame) {
             this._originalSchema = loadedSchema;
-            this._cachedSchema = buildSchema(loadedSchema);
+            this._cachedSchema = this._gql.buildSchema(loadedSchema);
         }
         return this._cachedSchema;
     }