cloudcms-server 0.9.267 → 0.9.268

package/launchpad/launchers/cluster.js

@@ -1,13 +1,12 @@
-var clusterlock = require("../../temp/clusterlock");
-
 const cluster = require("cluster");
 const { Server } = require("socket.io");
-const numCPUs = require("os").cpus().length;
 const { setupMaster, setupWorker } = require("@socket.io/sticky");
 const { createAdapter, setupPrimary } = require("@socket.io/cluster-adapter");
 
-// numCPUs = 1;
-// console.log("FORCE ONE CPU");
+var numCPUs = require("os").cpus().length;
+if (process.env.FORCE_SINGLE_CPU) {
+    numCPUs = 1;
+}
 
 module.exports = function(config) {
     
@@ -17,25 +16,23 @@ module.exports = function(config) {
     {
         // setup sticky sessions
         setupMaster(httpServer, {
-            loadBalancingMethod: "least-connection"
+            //loadBalancingMethod: "least-connection"
+            loadBalancingMethod: "round-robin"
         });
 
         // setup connections between the workers
         setupPrimary();
 
         // needed for packets containing buffers
-        cluster.setupPrimary({
-            serialization: "advanced"
-        });
+        // cluster.setupPrimary({
+        //     serialization: "advanced"
+        // });
 
         return callback();
     };
     
     r.afterStartCluster = function(httpServer, callback)
     {
-        // start up cluster locks
-        clusterlock.setup();
-        
         var startupCount = 0;
         
         var workers = [];

package/launchpad/launchers/redis.js

@@ -2,6 +2,7 @@ const { Server } = require("socket.io");
 const { setupWorker } = require("@socket.io/sticky");
 const { createAdapter } = require("@socket.io/redis-adapter");
 const redisHelper = require("../../util/redis");
+const IORedis = require("ioredis");
 
 const clusterLauncherFactory = require("./cluster");
 
@@ -23,61 +24,46 @@ module.exports = function(config) {
     
     r.afterStartServer = function(app, httpServer, callback)
     {
-        (async function(app, httpServer, callback) {
-            var redisOptions = redisHelper.redisOptions({}, "CLOUDCMS_CLUSTER");
-            await redisHelper.createAndConnect(redisOptions, function(err, _client) {
-    
-                const pubClient = _client;
-                const subClient = pubClient.duplicate();
-    
-                pubClient.on("error", function(err) {
-                    // something went wrong
-                    console.log("Pub Client caught error: ", err);
-                });
-    
-                subClient.on("error", function(err) {
-                    // something went wrong
-                    console.log("Sub Client caught error: ", err);
-                });
-    
-                const io = new Server(httpServer);
-                httpServer.io = io;
-    
-                io.engine.on("connection_error", function(err) {
-                    // console.log("CONNECTION ERROR");
-                    // console.log("REQUEST: " + err.req);      // the request object
-                    // console.log("CODE: " + err.code);     // the error code, for example 1
-                    // console.log("MESSAGE: " + err.message);  // the error message, for example "Session ID unknown"
-                    // console.log("CONTEXT: " + err.context);  // some additional error context
-                });
-    
-                // use the redis adapter
-                io.adapter(createAdapter(pubClient, subClient, {
-                    //publishOnSpecificResponseChannel: true
-                }));
-    
-                // setup connection with the primary process
-                setupWorker(io);
-                
-                // on connect
-                io.on("connection", (socket) => {
-                    //console.log("Redis Launcher on('connection') - socket id:" + socket.id);
-                    // socket.on('message', function(m) {
-                    //     console.log("Socket Connection message: " + m);
-                    // });
-                    //
-                    // // always catch err
-                    // socket.on("error", function(err) {
-                    //     console.log("Caught socket error");
-                    //     console.log(err.stack);
-                    // });
-                    
-                    // TODO
-                });
-                
-                return callback();
+        var redisOptions = redisHelper.redisOptions({}, "CLOUDCMS_CLUSTER");
+        var pubClient = new IORedis(redisOptions.url);
+        var subClient = pubClient.duplicate();
+
+        const io = new Server(httpServer);
+        httpServer.io = io;
+
+        io.engine.on("connection_error", function(err) {
+            console.log("CONNECTION ERROR");
+            // console.log("REQUEST: ", err.req);      // the request object
+            // console.log("CODE: " + err.code);     // the error code, for example 1
+            console.log("MESSAGE: ", err.message);  // the error message, for example "Session ID unknown"
+            // console.log("CONTEXT: ", err.context);  // some additional error context
+        });
+
+        // use the redis adapter
+        io.adapter(createAdapter(pubClient, subClient, {
+            //publishOnSpecificResponseChannel: true
+        }));
+
+        // setup connection with the primary process
+        setupWorker(io);
+
+        // on connect
+        io.on("connection", (socket) => {
+            console.log("Redis Launcher on('connection') - socket id:" + socket.id);
+            socket.on('message', function(m) {
+                console.log("Socket Connection message: " + m);
             });
-        })(app, httpServer, callback);
+
+            // always catch err
+            socket.on("error", function(err) {
+                console.log("Caught socket error");
+                console.log(err.stack);
+            });
+
+            // TODO
+        });
+
+        return callback();
     };
     
     return r;

package/locks/providers/cluster.js

@@ -13,6 +13,8 @@ exports = module.exports = function(lockConfig)
 
     r.init = function(callback)
     {
+        ClusterLock.setup();
+        
         callback();
     };
 

package/middleware/awareness/providers/abstract-async.js

@@ -52,21 +52,13 @@ class AbstractAsyncProvider extends AbstractProvider
     {
         var self = this;
         
-        //console.log("a1");
-        self._lock("channels", function(err, releaseLockFn) {
-            // console.log("a2: ", err);
-            // console.log("a3: ", releaseLockFn);
-            self.doRegister(channelId, user, function(err) {
-                // console.log("a4 ", err);
-                callback(err);
-                // console.log("a5: ", releaseLockFn);
-                return releaseLockFn();
-            });
+        self.doRegister(channelId, user, function(err) {
+            callback(err);
         });
     }
     
     /**
-     * Workhorse method.  The "channels" lock is taken out ahead of this being called.
+     * Workhorse method.
      *
      * @param channelId
      * @param user
@@ -163,21 +155,6 @@ class AbstractAsyncProvider extends AbstractProvider
     {
         var self = this;
         
-        self._lock("channels", function(err, releaseLockFn) {
-            self._expire(beforeMs, function(err) {
-                callback(err);
-                return releaseLockFn();
-            });
-        });
-    }
-    
-    /**
-     * @override
-     */
-    _expire(beforeMs, callback)
-    {
-        var self = this;
-        
         self.listChannelIds(function(err, channelIds) {
             
             if (err) {

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.267",
+  "version": "0.9.268",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -37,7 +37,7 @@
     "dustjs-linkedin": "^3.0.1",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
-    "express-session": "^1.16.2",
+    "express-session": "^1.17.3",
     "express-useragent": "^1.0.13",
     "extend-with-super": "^2.0.0",
     "gitana": "^1.0.322",
@@ -84,7 +84,7 @@
     "serve-favicon": "^2.5.0",
     "session-file-store": "^0.2.2",
     "sha1": "^1.1.1",
-    "socket.io": "^4.4.1",
+    "socket.io": "^4.5.1",
     "ssl-root-cas": "^1.3.1",
     "stomp-client": "^0.9.0",
     "targz": "^1.0.1",

package/server/index.js

@@ -740,17 +740,13 @@ var initSession = function(initDone)
     }
     else if (process.configuration.session.type === "redis")
     {
+        var IORedis = require("ioredis");
         var redisOptions = redisHelper.redisOptions();
-        return redisHelper.createAndConnect(redisOptions, function(err, redisClient) {
-            
-            if (err) {
-                return initDone(err);
-            }
-            
-            var RedisStore = connectRedis(session);
-            sessionConfig.store = new RedisStore({ client: redisClient });
-            initDone(null, session(sessionConfig));
-        });
+        var redisClient = new IORedis(redisOptions.url);
+    
+        var RedisStore = connectRedis(session);
+        sessionConfig.store = new RedisStore({ client: redisClient });
+        initDone(null, session(sessionConfig));
     }
     else if (process.configuration.session.type === "memory" || !process.configuration.session.type)
     {

package/server/standalone.js

@@ -36,6 +36,9 @@ server.after(function(app, callback) {
 server.report(function(callback) {
 
     var cpuCount = require('os').cpus().length;
+    if (process.env.FORCE_SINGLE_CPU) {
+        cpuCount = 1;
+    }
 
     var port = process.env.PORT;