cloudcms-server 3.3.1-beta.0 → 3.3.1-beta.11

package/middleware/awareness/plugins/editorial.js

@@ -3,34 +3,31 @@ exports = module.exports = {};
 var util = require("../../../util/util");
 var socketUtil = require("../../../util/socket");
 
-var request = require("request");
-
-var http = require("http");
-var https = require("https");
+var request = require("../../../util/request");
 
 exports.bindSocket = function(socket, provider)
 {
     socketUtil.bindGitana(socket, function() {
 
-        socket.on("acquireEditorialSession", function(sessionKey, repositoryId, branchId, force, callback) {
-            acquireEditorialSession(socket, provider, sessionKey, repositoryId, branchId, force, callback);
+        socket.on("acquireEditorialWorkspace", function(sessionKey, repositoryId, branchId, type, force, callback) {
+            acquireEditorialWorkspace(socket, provider, sessionKey, repositoryId, branchId, type, force, callback);
         });
 
-        socket.on("releaseEditorialSession", function(sessionKey, repositoryId, branchId, callback) {
-            releaseEditorialSession(socket, provider, sessionKey, repositoryId, branchId, callback);
+        socket.on("releaseEditorialWorkspace", function(sessionKey, repositoryId, branchId, callback) {
+            releaseEditorialWorkspace(socket, provider, sessionKey, repositoryId, branchId, callback);
         });
 
-        socket.on("commitEditorialSession", function(sessionKey, repositoryId, branchId, callback) {
-            commitEditorialSession(socket, provider, sessionKey, repositoryId, branchId, callback);
+        socket.on("commitEditorialWorkspace", function(sessionKey, repositoryId, branchId, callback) {
+            commitEditorialWorkspace(socket, provider, sessionKey, repositoryId, branchId, callback);
         });
 
-        socket.on("editorialSessionInfo", function(sessionKey, repositoryId, branchId, callback) {
-            editorialSessionInfo(socket, provider, sessionKey, repositoryId, branchId, callback);
+        socket.on("editorialWorkspaceInfo", function(sessionKey, repositoryId, branchId, callback) {
+            editorialWorkspaceInfo(socket, provider, sessionKey, repositoryId, branchId, callback);
         });
 
         /**
-         * Acquires an editorial session.  If a session doesn't already exists, it is created.
-         * If a session already exists, it is reused unless `force` is set true.
+         * Acquires an editorial workspace.  If a workspace doesn't already exists, it is created.
+         * If a workspace already exists, it is reused unless `force` is set true.
          *
          * @param socket
          * @param provider
@@ -38,12 +35,13 @@ exports.bindSocket = function(socket, provider)
          * @param repositoryId
          * @param branchId
          * @param force
+         * @param type (either "TEMPORARY" or "AUTOSAVE", assume "TEMPORARY" if not provided)
          * @param callback
          */
-        var acquireEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, force, callback)
+        var acquireEditorialWorkspace = function(socket, provider, sessionKey, repositoryId, branchId, type, force, callback)
         {
-            // send an HTTP command to acquire an editorial session for this repository and branch
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/acquire";
+            // send an HTTP command to acquire an editorial workspace for this repository and branch
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/workspace/acquire";
 
             var headers = {};
             //headers["Authorization"] = socket.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
@@ -57,39 +55,37 @@ exports.bindSocket = function(socket, provider)
             json.repositoryId = repositoryId;
             json.branchId = branchId;
             json.key = sessionKey;
+            json.type = type;
+
+            if (!json.type) {
+                json.type = "TEMPORARY";
+            }
 
             var qs = {};
             if (force) {
                 qs["force"] = true;
             }
 
-            var agent = http.globalAgent;
-            if (process.env.GITANA_PROXY_SCHEME === "https")
-            {
-                agent = https.globalAgent;
-            }
-
             request({
                 "method": "POST",
                 "url": URL,
                 "qs": {},
                 "json": json,
                 "headers": headers,
-                "agent": agent,
                 "timeout": process.defaultHttpTimeoutMs
-            }, function(err, response, body) {
+            }, function(err, response, json) {
 
-                if (err || (response && response.body && response.body.error)) {
+                if (err || (json && json.error)) {
                     return callback(err);
                 }
 
-                callback(null, body._doc, body.branchId);
+                callback(null, json._doc, json.branchId);
             });
         };
     });
 
     /**
-     * Releases an editorial session, deleting the session branch and erasing any accumulated work.
+     * Releases an editorial workspace, deleting the workspace branch and erasing any accumulated work.
      *
      * @param socket
      * @param provider
@@ -98,10 +94,10 @@ exports.bindSocket = function(socket, provider)
      * @param branchId
      * @param callback
      */
-    var releaseEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, callback)
+    var releaseEditorialWorkspace = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
         // send an HTTP command to release the session
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/release";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/workspace/release";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -115,23 +111,16 @@ exports.bindSocket = function(socket, provider)
             headers["GITANA_TICKET"] = gitanaTicket;
         }
 
-        var agent = http.globalAgent;
-        if (process.env.GITANA_PROXY_SCHEME === "https")
-        {
-            agent = https.globalAgent;
-        }
-
         request({
             "method": "POST",
             "url": URL,
             "qs": {},
             "json": json,
             "headers": headers,
-            "agent": agent,
             "timeout": process.defaultHttpTimeoutMs
-        }, function(err, response, body) {
+        }, function(err, response, json) {
 
-            if (err || (response && response.body && response.body.error)) {
+            if (err || (json && json.error)) {
                 return callback(err);
             }
 
@@ -140,7 +129,7 @@ exports.bindSocket = function(socket, provider)
     };
 
     /**
-     * Sends an HTTP request back to the API to commit the contents of an editorial session branch back to its
+     * Sends an HTTP request back to the API to commit the contents of an editorial workspace branch back to its
      * parent branch.
      *
      * @param socket
@@ -150,9 +139,9 @@ exports.bindSocket = function(socket, provider)
      * @param branchId
      * @param callback
      */
-    var commitEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, callback)
+    var commitEditorialWorkspace = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/commit";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/workspace/commit";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -166,32 +155,25 @@ exports.bindSocket = function(socket, provider)
             headers["GITANA_TICKET"] = gitanaTicket;
         }
 
-        var agent = http.globalAgent;
-        if (process.env.GITANA_PROXY_SCHEME === "https")
-        {
-            agent = https.globalAgent;
-        }
-
         request({
             "method": "POST",
             "url": URL,
             "qs": {},
             "json": json,
             "headers": headers,
-            "agent": agent,
             "timeout": process.defaultHttpTimeoutMs
-        }, function(err, response, body) {
+        }, function(err, response, json) {
 
-            if (err || (response && response.body && response.body.error)) {
+            if (err || (json && json.error)) {
                 return callback(err);
             }
 
-            callback(null, body);
+            callback(null, json);
         });
     };
 
     /**
-     * Sends an HTTP request back to the API to request information about an existing editorial session.
+     * Sends an HTTP request back to the API to request information about an existing editorial workspace.
      *
      * @param socket
      * @param provider
@@ -200,9 +182,9 @@ exports.bindSocket = function(socket, provider)
      * @param branchId
      * @param callback
      */
-    var editorialSessionInfo = function(socket, provider, sessionKey, repositoryId, branchId, callback)
+    var editorialWorkspaceInfo = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/info";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/workspace/info";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -216,31 +198,24 @@ exports.bindSocket = function(socket, provider)
             headers["GITANA_TICKET"] = gitanaTicket;
         }
 
-        var agent = http.globalAgent;
-        if (process.env.GITANA_PROXY_SCHEME === "https")
-        {
-            agent = https.globalAgent;
-        }
-
         request({
             "method": "POST",
             "url": URL,
             "qs": {},
             "json": json,
             "headers": headers,
-            "agent": agent,
             "timeout": process.defaultHttpTimeoutMs
-        }, function(err, response, body) {
+        }, function(err, response, json) {
 
-            if (err || (response && response.body && response.body.error)) {
+            if (err || (json && json.error)) {
                 return callback(err);
             }
 
-            if (!body.exists) {
+            if (!json.exists) {
                 return callback(null, false);
             }
 
-            callback(null, true, body.session);
+            callback(null, true, json.workspace);
         });
     };
 

package/middleware/awareness/plugins/resources.js

@@ -0,0 +1,74 @@
+exports = module.exports = {};
+
+var util = require("../../../util/util");
+var socketUtil = require("../../../util/socket");
+
+var subscriptionsBound = false;
+
+var bindSubscriptions = function()
+{
+    if (subscriptionsBound) {
+        return;
+    }
+
+    subscriptionsBound = true;
+
+    // LISTEN: "deployment_synced"
+    process.broadcast.subscribe("deployment_synced", function (message, channel, done) {
+
+        if (!done) {
+            done = function () {};
+        }
+
+        var deployment = message.deployment;
+
+        var resources = deployment.resources;
+        for (var k in resources)
+        {
+            var resourceObject = resources[k]; // state, operation, reference, headReference
+
+            var reference = resourceObject.reference;
+            var headReference = resourceObject.headReference;
+
+            var deploymentObject = JSON.parse(JSON.stringify(deployment));
+            delete deploymentObject.reference;
+            delete deploymentObject.headReference;
+            delete deploymentObject.resources;
+            delete deploymentObject.targetSummaries;
+
+            var watchObject = {
+                "type": "deployment_synced",
+                "resource": resourceObject,
+                "deployment": deploymentObject
+            };
+
+            // fire to reference
+            process.IO.to(reference).emit("watchResource", reference, watchObject);
+
+            // fire to head reference
+            process.IO.to(headReference).emit("watchResource", headReference, watchObject);
+        }
+
+        done();
+    });
+};
+
+exports.bindSocket = function(socket, provider)
+{
+    bindSubscriptions();
+
+    socketUtil.bindGitana(socket, function() {
+
+        socket.on("watchResource", function(reference, callback) {
+
+            if (reference)
+            {
+                // join room for this reference
+                //console.log("watchResource, room: " + reference);
+                socket.join(reference);
+            }
+
+            callback();
+        });
+    });
+};