cloudcms-server 0.9.253 → 0.9.256

package/locks/providers/redis.js

@@ -1,6 +1,7 @@
 var path = require("path");
 var redis = require("redis");
 var logFactory = require("../../util/logger");
+var redisHelper = require("../../util/redis");
 
 /**
  * Redis lock service.
@@ -38,31 +39,9 @@ exports = module.exports = function(locksConfig)
 
     r.init = function(callback)
     {
-        var redisPort = locksConfig.port;
-        if (typeof(redisPort) === "undefined" || !redisPort)
-        {
-            redisPort = process.env.CLOUDCMS_LOCKS_REDIS_PORT;
-        }
-        if (typeof(redisPort) === "undefined" || !redisPort)
-        {
-            redisPort = process.env.CLOUDCMS_REDIS_PORT;
-        }
-
-        var redisEndpoint = locksConfig.endpoint;
-        if (typeof(redisEndpoint) === "undefined" || !redisEndpoint)
-        {
-            redisEndpoint = process.env.CLOUDCMS_LOCKS_REDIS_ENDPOINT;
-        }
-        if (typeof(redisEndpoint) === "undefined" || !redisEndpoint)
-        {
-            redisEndpoint = process.env.CLOUDCMS_REDIS_ENDPOINT;
-        }
-
-        var redisOptions = {};
-
-        //redis.debug_mode = true;
-
-        client = redis.createClient(redisPort, redisEndpoint, redisOptions);
+        var redisOptions = redisHelper.redisOptions(locksConfig, "CLOUDCMS_LOCKS");
+
+        client = redis.createClient(redisOptions);
 
         callback();
     };

package/middleware/awareness/providers/redis.js

@@ -4,6 +4,7 @@ var redis = require("redis");
 var async = require("async");
 
 var logFactory = require("../../../util/logger");
+var redisHelper = require("../../../util/redis");
 
 class RedisProvider extends AbstractAsyncProvider
 {
@@ -30,30 +31,10 @@ class RedisProvider extends AbstractAsyncProvider
     init(callback)
     {
         var self = this;
+        
+        var redisOptions = redisHelper.redisOptions(this.config, "CLOUDCMS_AWARENESS");
 
-        var redisPort = this.config.port;
-        if (typeof(redisPort) === "undefined" || !redisPort)
-        {
-            redisPort = process.env.CLOUDCMS_AWARENESS_REDIS_PORT;
-        }
-        if (typeof(redisPort) === "undefined" || !redisPort)
-        {
-            redisPort = process.env.CLOUDCMS_REDIS_PORT;
-        }
-
-        var redisHost = this.config.host;
-        if (typeof(redisHost) === "undefined" || !redisHost)
-        {
-            redisHost = process.env.CLOUDCMS_AWARENESS_REDIS_ENDPOINT;
-        }
-        if (typeof(redisHost) === "undefined" || !redisHost)
-        {
-            redisHost = process.env.CLOUDCMS_REDIS_ENDPOINT;
-        }
-
-        var redisOptions = {};
-
-        this.client = redis.createClient(redisPort, redisHost, redisOptions);
+        this.client = redis.createClient(redisOptions);
 
         callback();
     }

package/middleware/cache/providers/redis.js

@@ -2,6 +2,7 @@ var path = require("path");
 
 var redis = require("redis");
 var logFactory = require("../../../util/logger");
+const redisHelper = require("../../../util/redis");
 
 /**
  * Redis distributed cache.
@@ -29,32 +30,12 @@ exports = module.exports = function(cacheConfig)
 
     r.init = function(callback)
     {
-        var redisPort = cacheConfig.port;
-        if (typeof(redisPort) === "undefined" || !redisPort)
-        {
-            redisPort = process.env.CLOUDCMS_CACHE_REDIS_PORT;
-        }
-        if (typeof(redisPort) === "undefined" || !redisPort)
-        {
-            redisPort = process.env.CLOUDCMS_REDIS_PORT;
-        }
-
-        var redisEndpoint = cacheConfig.endpoint;
-        if (typeof(redisEndpoint) === "undefined" || !redisEndpoint)
-        {
-            redisEndpoint = process.env.CLOUDCMS_CACHE_REDIS_ENDPOINT;
-        }
-        if (typeof(redisEndpoint) === "undefined" || !redisEndpoint)
-        {
-            redisEndpoint = process.env.CLOUDCMS_REDIS_ENDPOINT;
-        }
-
-        var redisOptions = {};
-
-        //redis.debug_mode = true;
-
-        client = redis.createClient(redisPort, redisEndpoint, redisOptions);
+        var self = this;
+    
+        var redisOptions = redisHelper.redisOptions(cacheConfig, "CLOUDCMS_CACHE");
 
+        client = redis.createClient(redisOptions);
+        
         callback();
     };
 

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.253",
+  "version": "0.9.256",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,7 +16,7 @@
     "agentkeepalive": "^4.1.3",
     "alpaca": "^1.5.27",
     "archiver": "^1.3.0",
-    "async": "^1.5.2",
+    "async": "^3.2.3",
     "aws-sdk": "^2.544.0",
     "basic-auth": "^1.1.0",
     "body-parser": "^1.19.0",
@@ -25,12 +25,12 @@
     "clone": "^2.1.2",
     "connect-flash": "^0.1.1",
     "connect-multiparty": "^2.2.0",
-    "connect-redis": "^3.4.2",
+    "connect-redis": "^6.1.3",
     "consolidate": "^0.14.5",
     "cookie-parser": "^1.4.4",
     "debug": "^2.6.9",
-    "dustjs-helpers": "^1.7.4",
-    "dustjs-linkedin": "^2.7.5",
+    "dustjs-helpers": "^1.6.3",
+    "dustjs-linkedin": "^3.0.1",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
     "express-session": "^1.16.2",
@@ -45,13 +45,13 @@
     "jsonwebtoken": "^8.5.1",
     "klaw": "^1.3.1",
     "lru-cache": "^4.1.5",
-    "marked": "^1.2.8",
+    "marked": "^4.0.14",
     "memorystore": "^1.6.1",
     "mime": "^1.6.0",
     "mkdirp": "^0.5.1",
     "moment": "^2.24.0",
     "morgan": "^1.9.1",
-    "node-redis-pubsub": "^1.0.3",
+    "node-redis-pubsub": "^5.0.0",
     "object-hash": "^1.3.1",
     "object-merge": "^2.5.1",
     "on-headers": "^1.0.2",
@@ -63,13 +63,13 @@
     "passport-linkedin": "^1.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
-    "passport-saml": "^2.0.4",
-    "passport-twitter": "^1.0.4",
+    "passport-saml": "^3.2.1",
+    "passport-twitter": "^0.1.5",
     "pkginfo": "^0.4.1",
     "q": "^1.5.1",
     "random-js": "^1.0.8",
     "recursive-readdir": "^2.2.2",
-    "redis": "^2.8.0",
+    "redis": "^4.0.6",
     "redislock": "^1.3.0",
     "request": "^2.88.0",
     "request-param": "^1.0.1",
@@ -79,7 +79,7 @@
     "serve-favicon": "^2.5.0",
     "session-file-store": "^0.2.2",
     "sha1": "^1.1.1",
-    "socket.io": "2.0.3",
+    "socket.io": "^4.4.1",
     "ssl-root-cas": "^1.3.1",
     "sticky-session": "^1.1.2",
     "stomp-client": "^0.9.0",
@@ -88,7 +88,7 @@
     "toobusy-js": "^0.5.1",
     "uuid": "^3.3.2",
     "vm2": "^3.8.4",
-    "watch": "^1.0.2",
+    "watch": "^0.13.0",
     "winston": "^3.3.3"
   },
   "contributors": [

package/server/index.js

@@ -23,6 +23,7 @@ const connectRedis = require('connect-redis');
 var Passport = require("passport").Passport;
 
 var util = require("../util/util");
+var redisHelper = require("../util/redis");
 
 var launchPad = require("../launchpad/index");
 var cluster = require("cluster");
@@ -313,12 +314,12 @@ var SETTINGS = {
 process.env.PORT = process.env.PORT || 2999;
 
 // allows for specification of alternative transports
-SETTINGS.socketTransports = [
-    'websocket',
-    'xhr-polling',
-    'jsonp-polling',
-    'polling'
-];
+// SETTINGS.socketTransports = [
+//     'websocket',
+//     'xhr-polling',
+//     'jsonp-polling',
+//     'polling'
+// ];
 
 var exports = module.exports;
 
@@ -683,8 +684,8 @@ var startSlave = function(config, afterStartFn)
                 }
                 else
                 {
-                    var redisOptions = {};
-                    var redisClient = redis.createClient(redisPort, redisHost, redisOptions);
+                    var redisOptions = redisHelper.redisOptions();
+                    var redisClient = redis.createClient(redisOptions);
                     
                     var RedisStore = connectRedis(session);
                     sessionConfig.store = new RedisStore({ client: redisClient });
@@ -1118,15 +1119,15 @@ var startSlave = function(config, afterStartFn)
 
 
                                         // create the server (either HTTP or HTTPS)
-                                        var server = null;
+                                        var httpServer = null;
                                         if (process.configuration.https) {
                                             // configure helmet to support auto-upgrade of http->https
                                             app.use(helmet());
                                             // create https server
-                                            server = https.createServer(process.configuration.https, app);
+                                            httpServer = https.createServer(process.configuration.https, app);
                                         } else {
                                             // legacy
-                                            server = http.Server(app);
+                                            httpServer = http.Server(app);
                                         }
 
                                         // request timeout
@@ -1135,14 +1136,15 @@ var startSlave = function(config, afterStartFn)
                                         {
                                             requestTimeout = process.configuration.timeout;
                                         }
-                                        server.setTimeout(requestTimeout);
+                                        httpServer.setTimeout(requestTimeout);
 
                                         // socket
-                                        server.on("connection", function (socket) {
+                                        httpServer.on("connection", function (socket) {
                                             socket.setNoDelay(true);
                                         });
-                                        var io = process.IO = require("socket.io")(server);
-                                        io.set('transports', config.socketTransports);
+                                        const { Server } = require("socket.io");
+                                        var io = process.IO = new Server(httpServer);
+                                        //io.set('transports', config.socketTransports);
                                         io.use(function (socket, next) {
 
                                             // console.log("New socket being initialized");
@@ -1234,7 +1236,7 @@ var startSlave = function(config, afterStartFn)
                                             // APPLY SERVER BEFORE START FUNCTIONS
                                             runFunctions(config.beforeFunctions, [app], function (err) {
 
-                                                server._listenPort = app.get("port");
+                                                httpServer._listenPort = app.get("port");
 
                                                 // AFTER SERVER START
                                                 runFunctions(config.afterFunctions, [app], function (err) {
@@ -1254,7 +1256,7 @@ var startSlave = function(config, afterStartFn)
 
                                                         try
                                                         {
-                                                            server.close();
+                                                            httpServer.close();
                                                         }
                                                         catch (e)
                                                         {
@@ -1295,7 +1297,7 @@ var startSlave = function(config, afterStartFn)
                                                         process.send("server-startup");
                                                     }
 
-                                                    afterStartFn(app, server);
+                                                    afterStartFn(app, httpServer);
 
                                                 });
                                             });

package/util/redis.js

@@ -0,0 +1,63 @@
+exports = module.exports;
+
+var redisOptions = exports.redisOptions = function(config, prefix)
+{
+    if (!config) {
+        config = {};
+    }
+    
+    // redis port
+    var redisPort = config.port;
+    if (prefix)
+    {
+        if (typeof(redisPort) === "undefined" || !redisPort)
+        {
+            // CLOUDCMS_LOCKS_REDIS_PORT;
+            redisPort = process.env[prefix + "_REDIS_PORT"];
+        }
+    }
+    if (typeof(redisPort) === "undefined" || !redisPort)
+    {
+        redisPort = process.env.CLOUDCMS_REDIS_PORT;
+    }
+    
+    // redis host
+    var redisEndpoint = config.endpoint;
+    if (prefix)
+    {
+        if (typeof(redisEndpoint) === "undefined" || !redisEndpoint)
+        {
+            redisEndpoint = process.env[prefix + "_REDIS_ENDPOINT"];
+        }
+    }
+    if (typeof(redisEndpoint) === "undefined" || !redisEndpoint)
+    {
+        redisEndpoint = process.env.CLOUDCMS_REDIS_ENDPOINT;
+    }
+    
+    // redis url
+    var redisUrl = config.url;
+    if (prefix)
+    {
+        if (typeof(redisUrl) === "undefined" || !redisUrl)
+        {
+            redisUrl = process.env[prefix + "_REDIS_URL"];
+        }
+    }
+    if (typeof(redisUrl) === "undefined" || !redisUrl)
+    {
+        redisUrl = process.env.CLOUDCMS_REDIS_URL;
+    }
+   
+    // build redis URL from components if not otherwise provided
+    if (!redisUrl)
+    {
+        redisUrl = "redis://" + redisEndpoint + ":" + redisPort;
+    }
+    
+    var redisOptions = {};
+    redisOptions.url = redisUrl;
+    redisOptions.legacyMode = true;
+    
+    return redisOptions;
+}