cloudcms-server 4.0.0-beta.4 → 4.0.0-beta.6

package/middleware/awareness/awareness.js

@@ -16,7 +16,8 @@ exports = module.exports = function()
 
     var pluginPaths = [
         "./plugins/editorial",
-        "./plugins/resources"
+        "./plugins/resources",
+        "./plugins/api_event"
     ];
     var plugins = {};
 
@@ -149,21 +150,21 @@ exports = module.exports = function()
             var r = {};
 
             // allow plugins to bind on("connection") handlers
-            r.bindOnSocketConnection = function(socket, provider, callback)
+            r.bindOnSocketConnection = function(socket, provider, io, callback)
             {
                 var fns = [];
                 for (var pluginPath in plugins)
                 {
                     var plugin = plugins[pluginPath];
 
-                    var fn = function(pluginPath, plugin, socket) {
+                    var fn = function(pluginPath, plugin, socket, io) {
                         return function(done) {
-
-                            plugin.bindSocket(socket, provider);
+    
+                            plugin.bindSocket(socket, provider, io);
 
                             done();
                         }
-                    }(pluginPath, plugin, socket);
+                    }(pluginPath, plugin, socket, io);
                     fns.push(fn);
                 }
 
@@ -309,7 +310,7 @@ exports = module.exports = function()
             });
 
             // allow plugins to register more on() handlers if they wish
-            pluginProxy.bindOnSocketConnection(socket, provider, function() {
+            pluginProxy.bindOnSocketConnection(socket, provider, io, function() {
                 // done
             });
 

package/middleware/awareness/plugins/api_event.js

@@ -0,0 +1,105 @@
+/*
+
+this awareness plugin adds support for general purpose API events
+the API in 4.0 supports passing API events forward via the message queue to the app server
+the app server then converts these into notifications
+
+the UI can register and event listener via socket.io ("onApiEvent").
+a listener binds to an event type + an optional reference
+
+when an event is received by the API, it triggers to socket.io emits (one for the general event and the other for the
+event + the reference being acted upon)
+ */
+exports = module.exports = {};
+
+var util = require("../../../util/util");
+var socketUtil = require("../../../util/socket");
+
+var subscriptionsBound = false;
+
+var bindSubscriptions = function(io)
+{
+    if (subscriptionsBound) {
+        return;
+    }
+
+    subscriptionsBound = true;
+    
+    // LISTEN: "api_event"
+    process.broadcast.subscribe("api_event", function (message, channel, done) {
+        
+        if (!done) {
+            done = function () {};
+        }
+    
+        // the message
+        // {
+        //     "applicationId": applicationId,
+        //     "deploymentKey": deploymentKey,
+        //     "host": host,
+        //     "eventType": eventType,
+        //     "eventId": eventId,
+        //     "objectType": objectType,
+        //     "objectId": objectId,
+        //     "objectRef": objectRef,
+        //     "object": object.object
+        // };
+    
+        var apiEvent = {};
+        apiEvent.type = message.eventType;
+        apiEvent.id = message.eventId;
+        apiEvent.objectType = message.objectType;
+        apiEvent.objectId = message.objectId;
+        apiEvent.objectRef = message.objectRef;
+        apiEvent.object = message.object;
+        
+        // dispatch for event + reference
+        if (apiEvent.objectRef)
+        {
+            try {
+                apiEvent.channelId = "apiEvent-" + apiEvent.type + "_" + apiEvent.objectRef;
+                //console.log("api_event -> " + apiEvent.channelId);
+                io.to(apiEvent.channelId).emit("apiEvent", apiEvent);
+            } catch (e) {
+                console.log(e);
+            }
+        }
+    
+        // dispatch for event
+        try {
+            apiEvent.channelId = "apiEvent-" + apiEvent.type;
+            //console.log("apiEvent -> " + apiEvent.channelId);
+            io.to(apiEvent.channelId).emit("apiEvent", apiEvent);
+        } catch (e) {
+            console.log(e);
+        }
+        
+        done();
+    });
+};
+
+exports.bindSocket = function(socket, provider, io)
+{
+    bindSubscriptions(io);
+
+    socketUtil.bindGitana(socket, function() {
+
+        socket.on("onApiEvent", function(eventName, reference, callback) {
+
+            if (eventName)
+            {
+                var channelId = "apiEvent-" + eventName;
+                
+                if (reference)
+                {
+                    channelId = eventName + "-" + reference;
+                }
+                
+                // join room for this event
+                socket.join(channelId);
+            }
+
+            callback();
+        });
+    });
+};

package/middleware/awareness/plugins/editorial.js

@@ -5,7 +5,7 @@ var socketUtil = require("../../../util/socket");
 
 var request = require("../../../util/request");
 
-exports.bindSocket = function(socket, provider)
+exports.bindSocket = function(socket, provider, io)
 {
     socketUtil.bindGitana(socket, function() {
 

package/middleware/awareness/plugins/resources.js

@@ -5,7 +5,7 @@ var socketUtil = require("../../../util/socket");
 
 var subscriptionsBound = false;
 
-var bindSubscriptions = function()
+var bindSubscriptions = function(io)
 {
     if (subscriptionsBound) {
         return;
@@ -45,14 +45,14 @@ var bindSubscriptions = function()
             // fire to reference
             try {
                 if (reference) {
-                    process.IO.to(reference).emit("watchResource", reference, watchObject);
+                    io.to(reference).emit("watchResource", reference, watchObject);
                 }
             } catch (e) { }
 
             // fire to head reference
             try {
                 if (headReference) {
-                    process.IO.to(headReference).emit("watchResource", headReference, watchObject);
+                    io.to(headReference).emit("watchResource", headReference, watchObject);
                 }
             } catch (e) { }
         }
@@ -61,9 +61,9 @@ var bindSubscriptions = function()
     });
 };
 
-exports.bindSocket = function(socket, provider)
+exports.bindSocket = function(socket, provider, io)
 {
-    bindSubscriptions();
+    bindSubscriptions(io);
 
     socketUtil.bindGitana(socket, function() {
 

package/middleware/perf/perf.js

@@ -194,8 +194,9 @@ exports = module.exports = function()
                             car = filename;
                         }
                         var regex1 = new RegExp("-[0-9a-f]{32}$"); // md5
-                        var regex2 = new RegExp("-[0-9]{13}$"); // timestamp
-                        if (regex1.test(car) || regex2.test(car))
+                        var regex2 = new RegExp("-[0-9]{13}$"); // timestamp?
+                        var regex3 = new RegExp("-[0-9]{10}$"); // epoch millis
+                        if (regex1.test(car) || regex2.test(car) || regex3.test(car))
                         {
                             var x = car.lastIndexOf("-");
 

package/middleware/stores/stores.js

@@ -417,7 +417,7 @@ exports = module.exports = function()
                         var moduleStoreType = moduleDescriptors[i].store;
                         var modulePath = moduleDescriptors[i].path;
 
-                        //console.log("Config Store - Module Path: " + modulePath + ", type: " + moduleStoreType);
+                        console.log("Config Store - Module Path: " + modulePath + ", type: " + moduleStoreType);
 
                         var storePath = path.join(modulePath, "config");
                         if (moduleStoreType === "modules")

package/notifications/notifications.js

@@ -72,11 +72,11 @@ var handleNotificationMessages = function(items, callback) {
     var fns = [];
     for (var i = 0; i < items.length; i++)
     {
-        var fn = function(item, i) {
+        var fn = function(item, index) {
             return function(done) {
 
                 //logFn("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
-                console.log("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
+                console.log("WORKING ON ITEM: " + index + ", item: " + JSON.stringify(item, null, "  "));
 
                 var operation = item.operation;
 
@@ -540,6 +540,8 @@ var handleNotificationMessages = function(items, callback) {
 
                     var host = determineHost(item);
 
+                    var _fns = [];
+                    
                     var deployments = item.deployments;
                     if (deployments && deployments.length > 0)
                     {
@@ -554,17 +556,77 @@ var handleNotificationMessages = function(items, callback) {
                                 "host": host,
                                 "deployment": deployment
                             };
-
-                            // broadcast event
-                            process.broadcast.publish("deployment_synced", message, function(err) {
-                                if (err) {
-                                    logInfo("published deployment_synced message. err:" + err + "\nmessage: " + JSON.stringify(message,null,2));
+                            
+                            var _fn = function(message) {
+                                return function(d) {
+                                    // broadcast event
+                                    process.broadcast.publish("deployment_synced", message, function(err) {
+                                        if (err) {
+                                            logInfo("published deployment_synced message. err:" + err + "\nmessage: " + JSON.stringify(message,null,2));
+                                        }
+                                        return done(err);
+                                    });
                                 }
-                                return done(err);
-                            });
-
+                            }(message);
+                            _fns.push(_fn);
                         }
                     }
+                    
+                    async.parallelLimit(_fns, 4, function(err) {
+                        done(err);
+                    });
+                }
+                else if (operation === "api_event")
+                {
+                    var eventType = item.type;
+                    var eventId = item.id;
+                    var objects = item.objects;
+    
+                    var host = determineHost(item);
+                    
+                    var _fns = [];
+                    if (objects && objects.length > 0)
+                    {
+                        for (var z = 0; z < objects.length; z++)
+                        {
+                            var object = objects[z];
+    
+                            var applicationId = object.applicationId;
+                            var deploymentKey = item.deploymentKey;
+                            
+                            var objectType = object.type; // sidekickMessage
+                            var objectId = object.id;
+                            var objectRef = object.ref;
+    
+                            var publishMessage = {
+                                "applicationId": applicationId,
+                                "deploymentKey": deploymentKey,
+                                "host": host,
+                                "eventType": eventType,
+                                "eventId": eventId,
+                                "objectType": objectType,
+                                "objectId": objectId,
+                                "objectRef": objectRef,
+                                "object": object.object
+                            };
+                            
+                            var _fn = function(publishMessage) {
+                                return function(d) {
+                                    // broadcast event
+                                    process.broadcast.publish("api_event", publishMessage, function(err) {
+                                        if (err) {
+                                            logInfo("published api_event message. err:" + err + "\nmessage: " + JSON.stringify(publishMessage,null,2));
+                                        }
+                                        return d(err);
+                                    });
+                                }
+                            }(publishMessage);
+                            _fns.push(_fn);
+                        }
+                    }
+                    async.parallelLimit(_fns, 4, function(err) {
+                        done(err);
+                    });
                 }
                 else
                 {

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.6",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"

package/util/auth.js

@@ -324,6 +324,12 @@ var syncProfile = exports.syncProfile = function(req, res, strategy, domainId, p
                 }
 
                 _LOCK([CACHE_IDENTIFIER], function(err, releaseLockFn) {
+                    
+                    if (err) {
+                        try { releaseLockFn(); } catch (e) { }
+                        return callback(err);
+                    }
+                    
                     _handleSyncUser(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, groupsArray, function (err, gitanaUser) {
 
                         if (err) {
@@ -333,14 +339,14 @@ var syncProfile = exports.syncProfile = function(req, res, strategy, domainId, p
 
                         // no user found
                         if (!gitanaUser) {
-                            releaseLockFn();
+                            try { releaseLockFn(); } catch (e) { }
                             return callback();
                         }
 
                         _handleConnectAsUser(req, key, gitanaUser, function (err, platform, appHelper, key) {
 
                             if (err) {
-                                releaseLockFn();
+                                try { releaseLockFn(); } catch (e) { }
                                 return callback(err);
                             }
 
@@ -351,8 +357,8 @@ var syncProfile = exports.syncProfile = function(req, res, strategy, domainId, p
                                 "appHelper": appHelper,
                                 "key": key
                             });
-
-                            releaseLockFn();
+    
+                            try { releaseLockFn(); } catch (e) { }
 
                             callback(err, gitanaUser, platform, appHelper, key, platform.getDriver());
                         }, gitanaUser);

package/util/cloudcms.js

@@ -555,7 +555,7 @@ exports = module.exports = function()
     var downloadNode = function(contentStore, gitana, repositoryId, branchId, nodeId, attachmentId, nodePath, locale, forceReload, callback)
     {
         // ensure path starts with "/"
-        if (nodePath && nodePath.substring(0, 1) !== "/") {
+        if (nodePath && !nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;
         }
 
@@ -666,7 +666,7 @@ exports = module.exports = function()
         }
 
         // ensure path starts with "/"
-        if (nodePath && nodePath.substring(0, 1) !== "/") {
+        if (nodePath && !nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;
         }