cloudcms-server 3.3.1-beta.1 → 3.3.1-beta.10

package/middleware/cache/providers/redis.js

@@ -1,7 +1,11 @@
-var path = require("path");
+//var path = require("path");
 
-var redis = require("redis");
+//var redis = require("redis");
 var logFactory = require("../../../util/logger");
+//const redisHelper = require("../../../util/redis");
+
+var redisClientFactory = require("../../../clients/redis");
+const redisHelper = require("../../../util/redis");
 
 /**
  * Redis distributed cache.
@@ -11,123 +15,161 @@ var logFactory = require("../../../util/logger");
 exports = module.exports = function(cacheConfig)
 {
     var client = null;
-
-    var logger = this.logger = logFactory("REDIS CACHE");
-    logger.setLevel("error");
-
-    // allow for global redis default
-    // allow for redis broadcast specific
-    // otherwise default to error
-    if (typeof(process.env.CLOUDCMS_REDIS_DEBUG_LEVEL) !== "undefined") {
-        logger.setLevel(("" + process.env.CLOUDCMS_REDIS_DEBUG_LEVEL).toLowerCase(), true);
-    }
-    else if (typeof(process.env.CLOUDCMS_CACHE_REDIS_DEBUG_LEVEL) !== "undefined") {
-        logger.setLevel(("" + process.env.CLOUDCMS_CACHE_REDIS_DEBUG_LEVEL).toLowerCase(), true);
-    }
-
+    
+    var logger = redisHelper.redisLogger("REDIS_CACHE", "CLOUDCMS_CACHE_", "error")
+    
     var r = {};
-
+    
     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);
-
-        callback();
+        redisClientFactory.create(cacheConfig, function(err, _client) {
+            
+            if (err) {
+                return callback(err);
+            }
+            
+            client = _client;
+            
+            return callback();
+            
+        });
     };
-
+    
     r.write = function(key, value, seconds, callback)
     {
-        if (seconds <= -1)
-        {
-            client.set([key, JSON.stringify(value)], function(err, reply) {
-                if (err) {
-                    logger.error("write error. key: " + key + " value: " + JSON.stringify(value) + ". error:" + err);
+        logger.info('write, key = ' + key + ', value = ' + value + '', seconds = ' + seconds');
+        (async function() {
+            
+            var reply = null;
+            var err = null;
+            
+            try
+            {
+                if (seconds <= -1)
+                {
+                    reply = await client.set([key, JSON.stringify(value)]);
                 }
-                logger.info("write -> reply = " + reply);
-                callback(err, reply);
-            });
-        }
-        else
-        {
-            client.set([key, JSON.stringify(value), "EX", seconds], function(err, reply) {
-                if (err) {
-                    logger.error("write.ex error. key: " + key + " value: " + JSON.stringify(value) + ". error:" + err);
+                else
+                {
+                    reply = await client.set([key, JSON.stringify(value), "EX", seconds]);
                 }
-                logger.info("write.ex -> reply = " + reply);
-                callback(err, reply);
-            });
-        }
+            }
+            catch (e)
+            {
+                err = e;
+            }
+            
+            if (reply) {
+                logger.info("write -> reply = " + reply);
+            }
+            
+            if (err) {
+                logger.error("write error. key: " + key + " value: " + JSON.stringify(value) + ". error:" + err);
+            }
+            
+            callback(err, reply);
+            
+        })();
     };
-
-    r.read = function(key, callback)
-    {
-        client.get([key], function(err, reply) {
-
+    
+    r.read = function(key, callback)
+    {
+        logger.info('read, key = ' + key);
+        
+        (async function() {
+            
+            var err = null;
+            var reply = null;
+            
+            try
+            {
+                reply = await client.get([key]);
+            }
+            catch (e)
+            {
+                err = e;
+            }
+            
             if (err) {
                 logger.error("read error. key: " + key + ". error:" + err);
             }
-            logger.info("read. key: " + key + " -> reply = " + reply);
-            
+            
+            if (reply) {
+                logger.info("read. key: " + key + " -> reply = " + reply);
+            }
+            
             var result = null;
-            try
+            try
             {
-                result = JSON.parse(reply);
-            }
+                result = JSON.parse(reply);
+            }
             catch (ex)
             {
-                result = null;
-                err = ex;
-                if (err) {
+                result = null;
+                err = ex;
+                
+                if (err)
+                {
                     logger.error("error parsing reply. key: " + key + ". error:" + err);
                 }
-            }
-
+            }
+            
             callback(err, result);
-        });
-    };
-
+        })();
+    };
+    
     r.remove = function(key, callback)
     {
-        logger.info("remove. key: " + key);
-        client.del([key], function(err) {
+        logger.info('remove, key = ' + key);
+        
+        (async function() {
+            
+            var err = null;
+            
+            try
+            {
+                await client.del([key]);
+                logger.info("remove. key: " + key);
+            }
+            catch (e)
+            {
+                err = e;
+            }
+            
             callback(err);
-        });
+        })();
     };
     
     r.keys = function(prefix, callback)
-    {
-        logger.info('keys. prefix = ' + prefix);
-        client.keys([prefix + '*'], function(err, reply) {
+    {
+        logger.info('keys, prefix = ' + prefix);
+        
+        (async function() {
+            
+            var err = null;
+            var reply = null;
+            
+            try
+            {
+                reply = await client.keys([prefix + '*']);
+            }
+            catch (e)
+            {
+                err = e;
+            }
+            
             if (err) {
                 logger.error("error reading prefix: " + prefix + ". error:" + err);
             }
-            logger.info("[keys -> reply = " + reply);
-            callback(err, reply);
-        });
-    };
-
+            
+            if (reply) {
+                logger.info("[keys -> reply = " + reply);
+            }
+            
+            callback(err, reply);
+            
+        })();
+    };
+    
     return r;
 };

package/middleware/config/config.js

@@ -21,8 +21,7 @@ exports = module.exports = function()
 
                 if (err)
                 {
-                    callback(err);
-                    return;
+                    return callback(err);
                 }
 
                 ADAPTERS[configStore.id] = adapter;
@@ -842,6 +841,46 @@ exports = module.exports = function()
         });
     };
 
+    /**
+     * Invalidates cached adapter.
+     *
+     * @return {Function}
+     */
+    r.invalidateConfigHandler = function()
+    {
+        if (!process.configuration.config) {
+            process.configuration.config = {};
+        }
+
+        // config handler
+        return util.createHandler("invalidateConfig", "config", function(req, res, next, stores, cache, configuration) {
+
+            var configStore = stores.config;
+
+            var handled = false;
+
+            if (req.method.toLowerCase() === "post") {
+
+                if (req.url.indexOf("/_config/invalidate") === 0)
+                {
+                    invalidateAdapter(configStore);
+
+                    res.send({
+                        "ok": true
+                    });
+                    res.end();
+
+                    handled = true;
+                }
+            }
+
+            if (!handled)
+            {
+                next();
+            }
+        });
+    };
+
     var invalidateAdapter = r.invalidateAdapter = function(configStore)
     {
         var adapter = ADAPTERS[configStore.id];

package/middleware/deployment/deployment.js

@@ -348,39 +348,36 @@ exports = module.exports = function()
                 var rootStore = stores.root;
                 rootStore.allocated(function(allocated) {
 
-                    console.log("H2: " + allocated);
                     if (!allocated) {
-                        callback({
+                        return callback({
                             "message": "The application cannot be started because it is not deployed."
                         });
                     }
-                    else
-                    {
-                        rootStore.readFile("descriptor.json", function (err, data) {
 
-                            if (err) {
-                                return callback(err);
-                            }
+                    rootStore.readFile("descriptor.json", function (err, data) {
 
-                            data = JSON.parse(data);
+                        if (err) {
+                            return callback(err);
+                        }
 
-                            // is it already started?
-                            if (data.active) {
-                                return callback({
-                                    "message": "The application is already started"
-                                });
-                            }
+                        data = JSON.parse(data);
 
-                            data.active = true;
+                        // is it already started?
+                        if (data.active) {
+                            return callback({
+                                "message": "The application is already started"
+                            });
+                        }
 
-                            logFn("Starting application: " + data.application.id + " with host: " + host);
+                        data.active = true;
 
-                            rootStore.writeFile("descriptor.json", JSON.stringify(data, null, "  "), function (err) {
-                                console.log("Start error: "+ err);
-                                callback(err);
-                            });
+                        logFn("Starting application: " + data.application.id + " with host: " + host);
+
+                        rootStore.writeFile("descriptor.json", JSON.stringify(data, null, "  "), function (err) {
+                            console.log("Start error: "+ err);
+                            callback(err);
                         });
-                    }
+                    });
                 });
             });
         });

package/middleware/form/form.js

@@ -1,11 +1,10 @@
-var path = require("path");
-var fs = require("fs");
 var util = require("../../util/util");
-var request = require("request");
 
 var http = require("http");
 var https = require("https");
 
+var request = require("../../util/request");
+
 /**
  * Form middleware.
  *
@@ -121,46 +120,37 @@ exports = module.exports = function()
             }
 
             // post form to Cloud CMS using public method
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + url;
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + url;
 
             var headers = {};
             headers["Authorization"] = req.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
 
-            var agent = http.globalAgent;
-            if (process.env.GITANA_PROXY_SCHEME === "https")
-            {
-                agent = https.globalAgent;
-            }
-
             request({
                 "method": "POST",
                 "url": URL,
                 "qs": {},
                 "json": form,
                 "headers": headers,
-                "agent": agent,
                 "timeout": process.defaultHttpTimeoutMs
-            }, function(err, response, body) {
+            }, function(err, response, json) {
 
                 console.log("Response error: " + JSON.stringify(err));
                 console.log("Response: " + JSON.stringify(response,null,2));
-                console.log("Body: " + JSON.stringify(body,null,2));
+                console.log("Body: " + JSON.stringify(json,null,2));
 
-                if (err || (response && response.body && response.body.error))
+                if (err || (json && json.error))
                 {
                     if (failureUrl)
                     {
                         return res.redirect(failureUrl);
                     }
-                    else
-                    {
-                        res.status(500);
-                        res.json({
-                            "ok": false,
-                            "err": err || response.body.message,
-                            "message": body
-                        });
-                    }
+
+                    res.status(500);
+                    res.json({
+                        "ok": false,
+                        "err": err || json.message,
+                        "message": json
+                    });
 
                     return;
                 }
@@ -193,27 +183,22 @@ exports = module.exports = function()
         req.branch(function(err, branch) {
 
             var url = branch.getUri() + "/alpaca/datasource";
-
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + url;
+    
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + url;
 
             var headers = {};
             headers["Authorization"] = req.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
 
-            var agent = http.globalAgent;
-            if (process.env.GITANA_PROXY_SCHEME === "https")
-            {
-                agent = https.globalAgent;
-            }
-
             request({
                 "method": "POST",
                 "url": URL,
                 "qs": {},
                 "json": form,
                 "headers": headers,
-                "agent": agent,
                 "timeout": process.defaultHttpTimeoutMs
-            }).pipe(res);
+            }, function(err, response, json) {
+                response.data.pipe(res);''
+            });
 
         });
     };

package/middleware/modules/modules.js

@@ -39,6 +39,13 @@ exports = module.exports = function()
 
     var doDeploy = function(host, moduleId, moduleConfig, callback)
     {
+        // broadcast: module_before_deploy
+        process.broadcast.publish("module_before_deploy", {
+            "host": host,
+            "moduleId": moduleId,
+            "moduleConfig": moduleConfig
+        });
+        
         logFn("Start doDeploy, host: " + host + ", module ID: " + moduleId + ", module config: " + JSON.stringify(moduleConfig, null, 2));;
 
         if (!moduleConfig)
@@ -94,16 +101,26 @@ exports = module.exports = function()
 
                 var targetStore = stores["modules"];
                 var targetOffsetPath = moduleId;
-
+    
+                //logFn("From: " + sourceType + ", " + sourceUrl + ", " + sourcePath + ", " + sourceBranch);
+                //logFn("To: " + targetStore + ", path: " + targetOffsetPath);
+                
                 util.gitCheckout(host, sourceType, sourceUrl, sourcePath, sourceBranch, targetStore, targetOffsetPath, false, logFn, function (err) {
 
-                    //logFn("After util.gitCheckout: " + JSON.stringify(err));
+                    logFn("After util.gitCheckout: " + JSON.stringify(err));
 
                     // invalidate any caching within the stores layer
                     storeService.invalidate(host);
 
-                    //logFn("After store.invalidate");
-
+                    logFn("After store.invalidate");
+    
+                    // broadcast: module_after_deploy
+                    process.broadcast.publish("module_after_deploy", {
+                        "host": host,
+                        "moduleId": moduleId,
+                        "moduleConfig": moduleConfig
+                    });
+    
                     callback(err);
                 });
             });
@@ -116,10 +133,17 @@ exports = module.exports = function()
 
     var doUndeploy = function(host, moduleId, moduleConfig, cacheOnly, callback)
     {
+        // broadcast: module_before_undeploy
+        process.broadcast.publish("module_before_undeploy", {
+            "host": host,
+            "moduleId": moduleId,
+            "moduleConfig": moduleConfig
+        });
+    
         var logFn = function(text) {
             console.log(text);
         };
-
+    
         logFn("Start doUndeploy, host: " + host + ", module ID: " + moduleId + ", module config: " + JSON.stringify(moduleConfig, null, 2));;
 
         storeService.produce(host, function(err, stores) {
@@ -156,12 +180,19 @@ exports = module.exports = function()
     var doRefresh = function(host, moduleId, moduleConfig, callback)
     {
         //logFn("Start doRefresh, host: " + host + ", module ID: " + moduleId + ", module config: " + JSON.stringify(moduleConfig, null, 2));;
-
+    
+        // broadcast: module_before_refresh
+        process.broadcast.publish("module_before_refresh", {
+            "host": host,
+            "moduleId": moduleId,
+            "moduleConfig": moduleConfig
+        });
+        
         storeService.produce(host, function(err, stores) {
 
             var options = {};
             options.host = host;
-
+            
             var modulesStore = stores.modules;
             modulesStore.refresh(options, function(err) {
 
@@ -169,7 +200,20 @@ exports = module.exports = function()
                     return callback(err);
                 }
 
-                doInvalidate(host, moduleId, moduleConfig, callback);
+                doInvalidate(host, moduleId, moduleConfig, function(err) {
+    
+                    if (!err)
+                    {
+                        // broadcast: module_after_refresh
+                        process.broadcast.publish("module_after_refresh", {
+                            "host": host,
+                            "moduleId": moduleId,
+                            "moduleConfig": moduleConfig
+                        });
+                    }
+                    
+                    callback(err);
+                });
             });
         });
     };
@@ -210,7 +254,7 @@ exports = module.exports = function()
                 var moduleId = message.moduleId;
                 var moduleConfig = message.moduleConfig;
                 var messageId = message.id;
-
+                
                 var identifier = acquireMessageConcurrencyLockIdentifier(messageId);
                 util.executeFunction(identifier, function(exclusiveFirst, doneFn) {
 
@@ -236,6 +280,7 @@ exports = module.exports = function()
 
                     // invalidate this server
                     doInvalidate(host, moduleId, moduleConfig, function() {
+    
                         finished(err);
                     });
 
@@ -255,7 +300,7 @@ exports = module.exports = function()
                 var moduleId = message.moduleId;
                 var moduleConfig = message.moduleConfig;
                 var messageId = message.id;
-
+                
                 var identifier = acquireMessageConcurrencyLockIdentifier(messageId);
                 util.executeFunction(identifier, function(exclusiveFirst, doneFn) {
 
@@ -278,6 +323,14 @@ exports = module.exports = function()
 
                     // invalidate this server
                     doInvalidate(host, moduleId, moduleConfig, function() {
+
+                        // broadcast: module_after_undeploy
+                        process.broadcast.publish("module_after_undeploy", {
+                            "host": host,
+                            "moduleId": moduleId,
+                            "moduleConfig": moduleConfig
+                        });
+                        
                         finished(err);
                     });
 
@@ -511,7 +564,7 @@ exports = module.exports = function()
 
                     handled = true;
                 }
-                else if (req.url.indexOf("/oneteam") === 0 && req.url.indexOf("/modules") > -1 && req.url.indexOf("app/") !== 0)
+                else if (req.url.indexOf("/modules") > -1 && req.url.indexOf("app/") !== 0)
                 {
                     // this route handling is provided for support of local modules within OneTeam
                     // the full url is /oneteam-XYZ/modules/{moduleId}/something.jpg

package/middleware/proxy/proxy.js

@@ -215,8 +215,7 @@ exports = module.exports = function()
                 contentStore.writeFile(filePath + ".cache", JSON.stringify(cacheInfo), function() {
                     _end.call(res, data, encoding);
                 });
-
-            };
+``            };
 
             callback();
         });

package/middleware/stores/engines/s3.js

@@ -279,9 +279,7 @@ exports = module.exports = function(engineConfig)
             for (var i = 0; i < data.Contents.length; i++)
             {
                 var contentKey = data.Contents[i].Key;
-                console.log("contentKey: " + contentKey);
                 var cdr = contentKey.substring(params.Prefix.length);
-                console.log("cdr.1: " + cdr);
 
                 if (cdr.indexOf("/") === 0)
                 {