chat-platform 2.1.4 → 3.0.0

package/.eslintrc

@@ -1,6 +1,8 @@
 {
   "globals": {
-    "Promise": true
+    "Promise": true,
+    "fetch": true,
+    "URLSearchParams": true
   },
   "env": {
     "node": true,

package/__tests__/chat-platform.js

@@ -1,4 +1,3 @@
-const moment = require('moment');
 const assert = require('chai').assert;
 const RED = require('../lib/red-stub')();
 const ChatExpress = require('../chat-platform');
@@ -79,7 +78,7 @@ describe('Chat platform framework', () => {
       chatIdKey: payload => payload.myChatIdKey,
       userIdKey: payload => payload.myUserIdKey,
       type: payload => payload.type,
-      tsKey: () => moment(),
+      tsKey: () => new Date(),
       transport: 'generic',
       inboundMessageEvent: 'message',
       connector: connector,
@@ -103,7 +102,8 @@ describe('Chat platform framework', () => {
     assert.equal(message.payload.userId, '62');
     assert.equal(message.payload.inbound, true);
     assert.equal(message.payload.transport, 'generic');
-    assert.equal(message.payload.ts.isValid(), true);
+    assert.instanceOf(message.payload.ts, Date);
+    assert.isFalse(isNaN(message.payload.ts.getTime()));
     assert.isFunction(message.chat);
     const variables = message.chat().all();
     assert.equal(variables.pending, false);

package/__tests__/context-provider-memory.js

@@ -1,4 +1,4 @@
-const _ = require('underscore');
+const _ = require('lodash');
 const assert = require('chai').assert;
 const fs = require('fs');
 const os = require('os');

package/__tests__/context-provider-sqlite.js

@@ -1,4 +1,4 @@
-const _ = require('underscore');
+const _ = require('lodash');
 const assert = require('chai').assert;
 const fs = require('fs');
 const os = require('os');

package/__tests__/universal-platform.js

@@ -1,4 +1,3 @@
-const moment = require('moment');
 const chai = require('chai');
 const assert = chai.assert;
 const expect = chai.expect;
@@ -114,7 +113,7 @@ describe('Universal Connector', () => {
       assert.equal(variables.payload, 'Bazinga');
       assert.equal(variables.authorized, false);
       assert.equal(variables.language, 'it');
-      assert.instanceOf(message.payload.ts, moment);
+      assert.instanceOf(message.payload.ts, Date);
       done();
     });
     chatServer.receive({

package/chat-context-factory.js

@@ -1,4 +1,4 @@
-const _ = require('underscore');
+const _ = require('lodash');
 
 const contextProviders = {};
 contextProviders.memory = require('./providers/memory');
@@ -59,7 +59,7 @@ const ContextProviders = function(RED) {
     },
 
     hasProvider(provider) {
-      return _(methods.getProviders()).contains(provider);
+      return _.includes(methods.getProviders(), provider);
     },
 
     getProvider(providerName, params = {}) {

package/chat-log.js

@@ -1,5 +1,4 @@
-var _ = require('underscore');
-var moment = require('moment');
+var _ = require('lodash');
 var fs = require('fs');
 var lcd = require('./helpers/lcd');
 
@@ -103,7 +102,7 @@ module.exports = function(variables) {
             + (!_.isEmpty(name) ? '[' + name.join(' ') + '] ' : '')
             + (inbound ? '> ' : '< ')
             + (transport != null ? '[' + transport.toUpperCase() + '] ' : '')
-            + moment().toString() + ' - ' + stringifiedMessage;
+            + new Date().toString() + ' - ' + stringifiedMessage;
         }
       }
 

package/chat-platform.js

@@ -1,5 +1,4 @@
-const _ = require('underscore');
-const _s = require('underscore.string');
+const _ = require('lodash');
 const clc = require('cli-color');
 const prettyjson = require('prettyjson');
 const { when } = require('./lib/utils');
@@ -7,7 +6,6 @@ const EventEmitter = require('events').EventEmitter;
 const inherits = require('util').inherits;
 const lcd = require('./helpers/lcd');
 const Table = require('cli-table');
-const request = require('request').defaults({ encoding: null });
 
 const identity = function(obj) { return obj; };
 const green = clc.greenBright;
@@ -541,11 +539,13 @@ const ChatExpress = function(options) {
     var options = chatServer.getOptions();
     var connector = options.connector;
     if (connector != null) {
-      if (options.inboundMessageEvent != null) {
+      if (_.isFunction(options.inboundMessageEvent)) {
         connector.off(options.inboundMessageEvent);
       }
       _(events).each(function (callback, eventName) {
-        connector.off(eventName);
+        if (_.isFunction(eventName)) {
+          connector.off(eventName);
+        }
       });
     }
   }
@@ -562,7 +562,7 @@ const ChatExpress = function(options) {
 
   function unmountRoutes(RED, routes, chatServer) {
     if (routes != null) {
-      const endpoints = _(routes).keys();
+      const endpoints = _.keys(routes);
       if (!_.isEmpty(endpoints)) {
         let routesCount = RED.httpNode._router.stack.length;
         let idx = 0;
@@ -571,7 +571,7 @@ const ChatExpress = function(options) {
           const route = stack[idx];
           if (route != null && route.name != null) {
             const routeName = String(route.name).replace('bound ', '');
-            if (_.contains(endpoints, routeName)) {
+            if (_.includes(endpoints, routeName)) {
               stack.splice(idx, 1);
             } else {
               idx += 1;
@@ -611,7 +611,7 @@ const ChatExpress = function(options) {
       console.log(lcd.timestamp() + '');
       // eslint-disable-next-line no-console
       console.log(lcd.timestamp() + grey('------ WebHooks for ' + options.transport.toUpperCase() + '----------------'));
-      _(routes).map((middleware, route) => {
+      _.each(routes, (middleware, route) => {
         const host = 'http://localhost' + (uiPort != '80' ? ':' + uiPort : '');
         const callback = generateCallback(route, chatServer);
         // make description
@@ -687,8 +687,8 @@ const ChatExpress = function(options) {
       if (type == null || typeof type !== 'string') {
         throw 'Missing type in .registerMessageType()';
       }
-      name = name != null ? name : _s.capitalize(type);
-      let typeDescriptor = _(_messageTypes).findWhere({ type: type });
+      name = name != null ? name : _.upperFirst(type);
+      let typeDescriptor = _.find(_messageTypes, { type: type });
       if (typeDescriptor == null) {
         typeDescriptor = { type: type };
         _messageTypes.push(typeDescriptor);
@@ -715,7 +715,7 @@ const ChatExpress = function(options) {
       if (name == null || typeof name !== 'string') {
         throw 'Missing name in .registerEvent()';
       }
-      var eventDescriptor = _(_events).findWhere({ name: name });
+      var eventDescriptor = _.find(_events, { name: name });
       if (eventDescriptor == null) {
         eventDescriptor = { name: name };
         _events.push(eventDescriptor);
@@ -787,15 +787,48 @@ const ChatExpress = function(options) {
           console.log(prettyjson.render(obj));
         };
         this.request = function(options = {}) {
-          return new Promise(function(resolve, reject) {
-            request(options, function(error, response, body) {
-              if (error) {
-                reject(`Error calling URL ${options.url}`);
-              } else {
-                resolve(body);
-              }
+          var url = options.url || options.uri;
+          // Translate "request"-style options into a "fetch" call
+          if (options.qs != null) {
+            var qs = new URLSearchParams(options.qs).toString();
+            if (qs) {
+              url += (url.indexOf('?') === -1 ? '?' : '&') + qs;
+            }
+          }
+          var headers = _.extend({}, options.headers);
+          var body;
+          if (options.json != null && options.json !== true && options.json !== false) {
+            body = JSON.stringify(options.json);
+            if (headers['content-type'] == null && headers['Content-Type'] == null) {
+              headers['Content-Type'] = 'application/json';
+            }
+          } else if (options.json === true && options.body != null) {
+            body = JSON.stringify(options.body);
+            if (headers['content-type'] == null && headers['Content-Type'] == null) {
+              headers['Content-Type'] = 'application/json';
+            }
+          } else if (options.form != null) {
+            body = new URLSearchParams(options.form).toString();
+            if (headers['content-type'] == null && headers['Content-Type'] == null) {
+              headers['Content-Type'] = 'application/x-www-form-urlencoded';
+            }
+          } else if (options.body != null) {
+            body = options.body;
+          }
+          return fetch(url, {
+            method: options.method || 'GET',
+            headers: headers,
+            body: body
+          })
+            .then(function(response) {
+              // Preserve the previous behaviour ({ encoding: null }) of resolving with a Buffer
+              return response.arrayBuffer().then(function(buffer) {
+                return Buffer.from(buffer);
+              });
+            })
+            .catch(function() {
+              return Promise.reject(`Error calling URL ${url}`);
             });
-          });
         };
         this.getOptions = function() {
           return this.options;
@@ -815,7 +848,7 @@ const ChatExpress = function(options) {
             return outboundMessage(message, this);
           } else {
             var task = when(true);
-            _(message.payload).each(function(payload) {
+            _.each(message.payload, function(payload) {
               task = task.then(function() {
                 return outboundMessage(_.extend({}, message, { payload: payload }), _this);
               });
@@ -861,8 +894,8 @@ const ChatExpress = function(options) {
           if (type == null || typeof type !== 'string') {
             throw 'Missing type in .registerMessageType()';
           }
-          name = name != null ? name : _s.capitalize(type);
-          let typeDescriptor = _(_messageTypes).findWhere({ type: type });
+          name = name != null ? name : _.upperFirst(type);
+          let typeDescriptor = _.find(_messageTypes, { type: type });
           if (typeDescriptor == null) {
             typeDescriptor = { type: type };
             _messageTypes.push(typeDescriptor);
@@ -889,7 +922,7 @@ const ChatExpress = function(options) {
           if (name == null || typeof name !== 'string') {
             throw 'Missing name in .registerEvent()';
           }
-          var eventDescriptor = _(_events).findWhere({ name: name });
+          var eventDescriptor = _.find(_events, { name: name });
           if (eventDescriptor == null) {
             eventDescriptor = { name: name };
             _events.push(eventDescriptor);
@@ -1086,20 +1119,20 @@ const ChatExpress = function(options) {
   Static methods for ChatExpress
  */
 ChatExpress.getMessageTypes = function() {
-  return _(_messageTypes).map(function(item) {
+  return _.map(_messageTypes, function(item) {
     return {
       value: item.type,
       label: item.name,
-      platforms: _(item.platforms).keys()
+      platforms: _.keys(item.platforms)
     };
   });
 };
 ChatExpress.getEvents = function() {
-  return _(_events).map(function(item) {
+  return _.map(_events, function(item) {
     return {
       value: item.name,
       label: item.description,
-      platforms: _(item.platforms).keys()
+      platforms: _.keys(item.platforms)
     };
   });
 };
@@ -1110,19 +1143,18 @@ ChatExpress.getParams = function() {
 function compatibilityTable(items, options) {
   options = _.extend({ column: 'Column' }, options);
   // collect platforms except universal
-  var platforms = _(ChatExpress.getPlatforms()).chain()
-    .map(function(platform) {
+  var platforms = _.reject(
+    _.map(ChatExpress.getPlatforms(), function(platform) {
       return platform.id;
-    })
-    .reject(function(id) {
+    }),
+    function(id) {
       return id === 'universal';
-    })
-    .sort()
-    .value();
+    }
+  ).sort();
   // build header
   var head = [options.column];
-  _(platforms).each(function(name) {
-    head.push(_s.capitalize(name));
+  _.each(platforms, function(name) {
+    head.push(_.upperFirst(name));
   });
   var colAligns = ['left'];
   _.times(platforms.length, function() {
@@ -1137,21 +1169,19 @@ function compatibilityTable(items, options) {
     }
   });
   // message types columns
-  _(items).chain()
-    .sortBy(function(type) {
-      return type.name;
-    })
-    .each(function(type) {
-      var row = [type.name];
-      _(platforms).each(function(platform) {
-        if (type.platforms[platform]) {
-          row.push('✔');
-        } else {
-          row.push('');
-        }
-      });
-      table.push(row);
+  _.each(_.sortBy(items, function(type) {
+    return type.name;
+  }), function(type) {
+    var row = [type.name];
+    _.each(platforms, function(platform) {
+      if (type.platforms[platform]) {
+        row.push('✔');
+      } else {
+        row.push('');
+      }
     });
+    table.push(row);
+  });
   // eslint-disable-next-line no-console
   console.log(table.toString());
 
@@ -1172,21 +1202,21 @@ ChatExpress.showCompatibilityChart = function() {
  * @return {Array}
  */
 ChatExpress.getPlatforms = function() {
-  var platforms = _(_platforms).keys();
+  var platforms = _.keys(_platforms);
 
-  return _(platforms).chain()
-    .map(function(platform) {
+  return _.sortBy(
+    _.map(platforms, function(platform) {
       return {
         id: _platforms[platform].id,
         name: _platforms[platform].name,
         universal: _platforms[platform].universal,
         color: _platforms[platform].color
       };
-    })
-    .sortBy(function(platform) {
+    }),
+    function(platform) {
       return platform.name != null ? platform.name : platform.id;
-    })
-    .value();
+    }
+  );
 };
 
 /**
@@ -1199,9 +1229,9 @@ ChatExpress.getPlatforms = function() {
 ChatExpress.isSupported = function(platform, type) {
   if (type == null) {
     const platforms = ChatExpress.getPlatforms();
-    return _(platforms).findWhere({ id: platform }) != null;
+    return _.find(platforms, { id: platform }) != null;
   } else {
-    const messageType = _(_messageTypes).findWhere({ type: type });
+    const messageType = _.find(_messageTypes, { type: type });
     return messageType != null && messageType.platforms[platform];
   }
 };
@@ -1219,7 +1249,7 @@ ChatExpress.isSupported = function(platform, type) {
  * @return {String} Null if no errors
  */
 ChatExpress.isValidFile = function(platform, type, file) {
-  const messageType = _(_messageTypes).findWhere({ type: type });
+  const messageType = _.find(_messageTypes, { type: type });
   if (messageType != null) {
     const validator = messageType.validators[platform];
     if (validator != null) {

package/helpers/lcd.js

@@ -1,7 +1,14 @@
 var clc = require('cli-color');
-var _ = require('underscore');
+var _ = require('lodash');
 var prettyjson = require('prettyjson');
-var moment = require('moment');
+
+var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+// Format a date as 'DD MMM HH:mm:ss' (e.g. '16 Jun 14:30:45')
+function formatTimestamp(date) {
+  var pad = function(n) { return n < 10 ? '0' + n : '' + n; };
+  return pad(date.getDate()) + ' ' + MONTHS[date.getMonth()] + ' '
+    + pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds());
+}
 
 var warn = clc.yellow;
 var grey = clc.blackBright;
@@ -22,7 +29,7 @@ var LCD = {
   red: red,
 
   timestamp() {
-    return LCD.white(moment().format('DD MMM HH:mm:ss') + ' - [info] ');
+    return LCD.white(formatTimestamp(new Date()) + ' - [info] ');
   },
 
   dump: function(e, title) {
@@ -54,7 +61,7 @@ var LCD = {
     _(payload).each(function(value, key) {
       if (value instanceof Buffer) {
         payload[key] = '<Buffer>';
-      } else if (value instanceof moment) {
+      } else if (value instanceof Date) {
         payload[key] = value.toString();
       }
     });

package/helpers/promises-queue.js

@@ -1,9 +1,9 @@
-var _ = require('underscore');
+var _ = require('lodash');
 
 var FileQueue = function() {
   var tasks = [];
   function removeTask(promise) {
-    tasks = _(tasks).reject(function(task) {
+    tasks = _.reject(tasks, function(task) {
       return task === promise;
     });
   }

package/helpers/utils.js

@@ -1,4 +1,4 @@
-const _ = require('underscore');
+const _ = require('lodash');
 
 module.exports = {
 

package/lib/lcd.js

@@ -1,7 +1,14 @@
 var clc = require('cli-color');
-var _ = require('underscore');
+var _ = require('lodash');
 var prettyjson = require('prettyjson');
-var moment = require('moment');
+
+var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+// Format a date as 'DD MMM HH:mm:ss' (e.g. '16 Jun 14:30:45')
+function formatTimestamp(date) {
+  var pad = function(n) { return n < 10 ? '0' + n : '' + n; };
+  return pad(date.getDate()) + ' ' + MONTHS[date.getMonth()] + ' '
+    + pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds());
+}
 
 var warn = clc.yellow;
 var grey = clc.blackBright;
@@ -22,7 +29,7 @@ var LCD = {
   red: red,
 
   timestamp() {
-    return LCD.white(moment().format('DD MMM HH:mm:ss') + ' - [info] ');
+    return LCD.white(formatTimestamp(new Date()) + ' - [info] ');
   },
 
   dump: function(e, title) {
@@ -57,7 +64,7 @@ var LCD = {
     _(payload).each(function(value, key) {
       if (value instanceof Buffer) {
         payload[key] = '<Buffer>';
-      } else if (value instanceof moment) {
+      } else if (value instanceof Date) {
         payload[key] = value.toString();
       }
     });

package/lib/red-stub.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-var _ = require('underscore');
+var _ = require('lodash');
 var ChatContextFactory = require('../chat-context-factory')({});
 var ChatContextProvider = ChatContextFactory.getProvider('memory', {});
 
@@ -38,7 +38,7 @@ module.exports = function() {
 
     environment: {
       chat: function(chatId, obj) {
-        _(obj).map(function(value, key) {
+        _.each(obj, function(value, key) {
           _chatContext.set(key, value);
         });
       }

package/lib/utils.js

@@ -1,4 +1,4 @@
-const _ = require('underscore');
+const _ = require('lodash');
 
 module.exports = {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chat-platform",
-  "version": "2.1.4",
+  "version": "3.0.0",
   "description": "Universal Chat Platform",
   "main": "index.js",
   "scripts": {
@@ -10,16 +10,16 @@
   },
   "author": "",
   "license": "ISC",
+  "engines": {
+    "node": ">=18"
+  },
   "dependencies": {
     "cli-color": "^1.4.0",
     "cli-table": "^0.3.1",
-    "moment": "^2.24.0",
+    "lodash": "^4.18.1",
     "prettyjson": "^1.2.1",
-    "request": "^2.88.0",
-    "sequelize": "^5.21.6",
-    "sqlite3": "^5.0.0",
-    "underscore": "^1.9.1",
-    "underscore.string": "^3.3.5"
+    "sequelize": "^6.37.8",
+    "sqlite3": "^5.1.7"
   },
   "devDependencies": {
     "chai": "^4.1.1",

package/providers/memory.js

@@ -1,4 +1,4 @@
-const _ = require('underscore');
+const _ = require('lodash');
 
 const isEmpty = value => value == null || value === '';
 

package/providers/plain-file.js

@@ -1,6 +1,5 @@
-const _ = require('underscore');
+const _ = require('lodash');
 const fs = require('fs');
-const moment = require('moment');
 const crypto = require('crypto');
 
 const lcd = require('../helpers/lcd');
@@ -20,7 +19,7 @@ const parse = content => {
   // go through every key/value to search for a date-like string
   _(obj).each(function(value, key) {
     if (_.isString(value) && value.match(date)) {
-      obj[key] = moment(value);
+      obj[key] = new Date(value);
     }
   });
 
@@ -241,7 +240,7 @@ _.extend(FileStore.prototype, {
       // go through every key/value to search for a date-like string
       _(obj).each((value, key) => {
         if (_.isString(value) && value.match(date)) {
-          obj[key] = moment(value);
+          obj[key] = new Date(value);
         }
       });
     } catch(e) {

package/providers/sqlite.js

@@ -1,4 +1,4 @@
-const _ = require('underscore');
+const _ = require('lodash');
 
 const _storeUserIds = {};
 const Sequelize = require('sequelize');

package/universal.js

@@ -1,8 +1,7 @@
-const moment = require('moment');
 const ChatExpress = require('./chat-platform');
 const utils = require('./lib/utils');
 const when = utils.when;
-const _ = require('underscore');
+const _ = require('lodash');
 
 const Universal = new ChatExpress({
   transport: 'universal',
@@ -14,7 +13,7 @@ const Universal = new ChatExpress({
     return payload.userId;
   },
   tsKey() {
-    return moment();
+    return new Date();
   },
   language() {
     return null;