cloudcms-server 3.3.1-beta.8 → 4.0.0-beta.1

package/middleware/stores/stores.js

@@ -28,6 +28,7 @@ var log = function(text, level)
  *   "cache"            the root of the cache
  *   "public"           the web host root (this might be public_build too)
  *   "templates"        the templates storage location (for client-side templates)
+ *   "themes"           the themes storage location (for client-side themes)
  *   "modules"          the deployed modules storage location (for client-side modules)
  *   "config"           the configuration storage location for static config (for client-side config)
  *
@@ -45,7 +46,7 @@ exports = module.exports = function()
         var engineId = storeConfiguration[storeType];
 
         var engine = ENGINES[engineId];
-
+        
         var engineType = process.configuration.storeEngines[engineId].type;
         var engineConfiguration = process.configuration.storeEngines[engineId].config;
 
@@ -175,7 +176,7 @@ exports = module.exports = function()
             if (!stores) {
                 return afterCheck();
             }
-
+    
             return process.cache.read("module-descriptors-" + host, function(err, moduleDescriptorsForHost) {
 
                 if (err) {
@@ -208,6 +209,7 @@ exports = module.exports = function()
             // these will get overwritten in the binding methods below
             stores["config"] = buildStore("config", host, "config");
             stores["templates"] = buildStore("templates", host, "templates");
+            stores["themes"] = buildStore("themes", host, "themes");
 
             var bindWebStore = function(done) {
 
@@ -482,7 +484,43 @@ exports = module.exports = function()
                         callback();
                     });
                 };
-
+    
+                var bindThemeStores = function(moduleDescriptors, callback)
+                {
+                    // all theme stores
+                    var themeStores = [];
+                    for (var i = 0; i < moduleDescriptors.length; i++)
+                    {
+                        var moduleStoreType = moduleDescriptors[i].store;
+                        var modulePath = moduleDescriptors[i].path;
+            
+                        var storePath = path.join(modulePath, "themes");
+                        if (moduleStoreType === "modules")
+                        {
+                            storePath = path.join("modules", storePath);
+                        }
+            
+                        var themeStore = buildStore(moduleStoreType, host, storePath);
+                        themeStores.push(themeStore);
+                    }
+        
+                    // trim back and only keep stores that are allocated
+                    retainAllocatedStores(themeStores, function(err, allocatedStores) {
+            
+                        // all stores to be bound in
+                        var bindingStores = [];
+                        for (var i = 0; i < allocatedStores.length; i++) {
+                            bindingStores.push(allocatedStores[i]);
+                        }
+                        bindingStores.push(stores.themes);
+            
+                        // bind into a multi-store
+                        stores["themes"] = require("./multistore")(bindingStores);
+            
+                        callback();
+                    });
+                };
+    
                 process.cache.read("module-descriptors-" + host, function(err, moduleDescriptors) {
 
                     moduleDescriptors = null;
@@ -495,7 +533,9 @@ exports = module.exports = function()
 
                             bindConfigStores(moduleDescriptors, function () {
                                 bindTemplateStores(moduleDescriptors, function() {
-                                    done();
+                                    bindThemeStores(moduleDescriptors, function() {
+                                        done();
+                                    });
                                 });
                             });
 
@@ -505,7 +545,9 @@ exports = module.exports = function()
                     {
                         bindConfigStores(moduleDescriptors, function() {
                             bindTemplateStores(moduleDescriptors, function() {
-                                done();
+                                bindThemeStores(moduleDescriptors, function() {
+                                    done();
+                                });
                             });
                         });
                     }
@@ -566,6 +608,7 @@ exports = module.exports = function()
                 req.contentStore = stores["content"];
                 req.webStore = stores["web"];
                 req.templatesStore = stores["templates"];
+                req.themesStore = stores["themes"];
                 req.modulesStore = stores["modules"];
 
                 // sort the module descriptors by id

package/middleware/themes/themes.js

@@ -0,0 +1,49 @@
+var path = require('path');
+var util = require("../../util/util");
+
+exports = module.exports = function()
+{
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // RESULTING OBJECT
+    //
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    var r = {};
+
+    /**
+     * Retrieves themes for the application.
+     *
+     * @return {Function}
+     */
+    r.handler = function()
+    {
+        return util.createHandler("themes", function(req, res, next, stores, cache, configuration) {
+
+            var themeStore = stores.themes;
+
+            var handled = false;
+
+            if (req.method.toLowerCase() === "get") {
+
+                if (req.url.indexOf("/_themes") === 0)
+                {
+                    var filePath = req.path.substring(8);
+
+                    themeStore.sendFile(res, filePath, null, function(err) {
+                        next(err);
+                    });
+
+                    handled = true;
+                }
+            }
+
+            if (!handled)
+            {
+                next();
+            }
+        });
+    };
+
+    return r;
+}();

package/middleware/virtual-config/virtual-config.js

@@ -33,9 +33,12 @@ exports = module.exports = function()
             // force key to "virtualdriver"
             configuration.virtualDriver.key = VIRTUAL_DRIVER_CACHE_KEY;
 
+            console.log("a1: " + JSON.stringify(configuration.virtualDriver, null, 2));
+            
             // either connect anew or re-use an existing connection to Cloud CMS for this application
             Gitana.connect(configuration.virtualDriver, function(err) {
-
+    
+                console.log("a2:" + err);
                 if (err)
                 {
                     return callback(err);
@@ -83,7 +86,7 @@ exports = module.exports = function()
 
                 var URL = configuration.virtualDriver.baseURL;
                 if (!URL) {
-                    URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT);
+                    URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH);
                 }
                 URL += "/virtual/driver/config";
                 var requestConfig = {
@@ -143,10 +146,10 @@ exports = module.exports = function()
         }
     };
 
-    var _LOCK = function(lockKey, workFunction)
-    {
-        process.locks.lock(lockKey, workFunction);
-    };
+    // var _LOCK = function(lockKey, workFunction)
+    // {
+    //     process.locks.lock(lockKey, workFunction);
+    // };
 
     var r = {};
 
@@ -213,7 +216,7 @@ exports = module.exports = function()
                         }
                         if (!gitanaJson.baseURL)
                         {
-                            gitanaJson.baseURL = util.cleanupURL(util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT));
+                            gitanaJson.baseURL = util.cleanupURL(util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH));
                         }
 
                         // mark as retrieved from virtual driver
@@ -336,7 +339,7 @@ exports = module.exports = function()
             // defaults
             if (!configuration.baseURL)
             {
-                configuration.baseURL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT);
+                configuration.baseURL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH);
             }
             if (!configuration.key) {
                 configuration.key = "virtual";

package/middleware/wcm/wcm.js

@@ -309,7 +309,7 @@ exports = module.exports = function()
                     req.application(function (err, application) {
 
                         var loadingPagesCacheKey = application._doc + "-wcm-loading-pages";
-                        _LOCK(null, loadingPagesCacheKey, function (releaseLockFn) {
+                        _LOCK(null, loadingPagesCacheKey, function (err, releaseLockFn) {
                             
                             // check again inside lock in case another request preloaded this before we arrived
                             req.cache.read(WCM_PAGES, function (err, cachedPages) {
@@ -716,7 +716,7 @@ exports = module.exports = function()
         var cacheFilePath = cloudcms.toCacheFilePath(pageFilePath);
 
         // take out a lock so that only one "request" can write to cache at a time for this path
-        _LOCK(contentStore, _lock_identifier(pageBasePath), function(releaseLockFn) {
+        _LOCK(contentStore, _lock_identifier(pageBasePath), function(err, releaseLockFn) {
 
             // write page file
             contentStore.writeFile(pageFilePath, text, function (err) {
@@ -773,7 +773,7 @@ exports = module.exports = function()
         var cacheFilePath = cloudcms.toCacheFilePath(pageFilePath);
 
         // take out a lock so that only one "request" can read from cache at a time for this path
-        _LOCK(contentStore, _lock_identifier(pageBasePath), function(releaseLockFn) {
+        _LOCK(contentStore, _lock_identifier(pageBasePath), function(err, releaseLockFn) {
 
             contentStore.readFile(cacheFilePath, function(err, cacheInfoString) {
 
@@ -858,7 +858,7 @@ exports = module.exports = function()
 
     var _handleCachePageInvalidate = function(contentStore, pageBasePath, callback)
     {
-        _LOCK(contentStore, _lock_identifier(pageBasePath), function(releaseLockFn) {
+        _LOCK(contentStore, _lock_identifier(pageBasePath), function(err, releaseLockFn) {
 
             contentStore.existsDirectory(pageBasePath, function (exists) {
 

package/notifications/notifications.js

@@ -76,6 +76,7 @@ var handleNotificationMessages = function(items, callback) {
             return function(done) {
 
                 //logFn("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
+                console.log("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
 
                 var operation = item.operation;
 
@@ -183,7 +184,7 @@ var handleNotificationMessages = function(items, callback) {
                                         var platformId = obj.platformId;
                                         var applicationId = obj.applicationId;
                                         var themeId = obj.themeId;
-                                        var templateKey = obj.templateKey;
+                                        var themeKey = obj.themeKey;
 
                                         // broadcast the "invalidate_theme" event
                                         process.broadcast.publish("invalidate_theme", {
@@ -191,7 +192,29 @@ var handleNotificationMessages = function(items, callback) {
                                             "platformId": platformId,
                                             "applicationId": applicationId,
                                             "themeId": themeId,
-                                            "templateKey": templateKey
+                                            "themeKey": themeKey
+                                        }, z_done);
+                                    }
+                                    else if (type === "themeAssignment")
+                                    {
+                                        var platformId = obj.platformId;
+                                        var applicationId = obj.applicationId;
+                                        var projectId = obj.projectId;
+                                        var domainId = obj.domainId;
+                                        var principalId = obj.principalId;
+                                        var themeId = obj.themeId;
+                                        var operation = obj.operation;
+    
+                                        // broadcast the "invalidate_theme_assignment" event
+                                        process.broadcast.publish("invalidate_theme_assignment", {
+                                            "host": host,
+                                            "platformId": platformId,
+                                            "applicationId": applicationId,
+                                            "projectId": projectId,
+                                            "domainId": domainId,
+                                            "principalId": principalId,
+                                            "themeId": themeId,
+                                            "operation": operation
                                         }, z_done);
                                     }
                                     else if (type === "tenant")
@@ -636,7 +659,7 @@ module.exports = function()
     var r = {};
 
     r.start = function(callback) {
-
+    
         var config = process.configuration;
         if (!config["notifications"])
         {
@@ -663,7 +686,7 @@ module.exports = function()
                 notifications.enabled = true;
             }
         }
-
+        
         if (notifications.enabled)
         {
             if (process.env.CLOUDCMS_NOTIFICATIONS_TYPE)

package/package.json

@@ -6,51 +6,60 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.3.1-beta.8",
+  "version": "4.0.0-beta.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
   },
   "dependencies": {
-    "accepts": "^1.3.7",
-    "agentkeepalive": "^4.1.3",
+    "@socket.io/cluster-adapter": "^0.2.0",
+    "@socket.io/redis-adapter": "^7.2.0",
+    "@socket.io/sticky": "^1.0.1",
+    "accepts": "^1.3.8",
+    "agentkeepalive": "^4.2.1",
     "alpaca": "^1.5.27",
     "archiver": "^5.1.0",
-    "async": "^3.2.0",
-    "aws-sdk": "^2.807.0",
+    "async": "^3.2.3",
+    "async-lock": "^1.3.2",
+    "aws-sdk": "^2.1208.0",
     "axios": "^0.21.0",
     "basic-auth": "^2.0.1",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.20.0",
     "bytes": "^3.1.0",
     "canoe": "^0.3.3",
     "clone": "^2.1.2",
     "connect-flash": "^0.1.1",
     "connect-multiparty": "^2.2.0",
-    "connect-redis": "^5.0.0",
+    "connect-redis": "^6.1.3",
     "consolidate": "^0.16.0",
     "cookie-parser": "^1.4.5",
     "debug": "^4.3.1",
     "dustjs-helpers": "^1.7.4",
-    "dustjs-linkedin": "^2.7.5",
+    "dustjs-linkedin": "^3.0.1",
     "errorhandler": "^1.5.1",
-    "express": "^4.17.1",
-    "express-session": "^1.17.1",
+    "express": "^4.18.1",
+    "express-session": "^1.17.3",
     "express-useragent": "^1.0.15",
     "extend-with-super": "^2.0.0",
-    "gitana": "^1.0.320",
+    "finalhandler": "^1.2.0",
+    "form-data": "^2.3.3",
+    "gitana": "^1.0.322",
     "handlebars": "^4.7.6",
     "hbs": "^4.1.1",
-    "http-proxy": "^1.18.1",
+    "helmet": "^4.6.0",
+    "http2-proxy": "^5.0.53",
+    "ioredis": "4.28.5",
     "json5": "^2.1.3",
     "jsonwebtoken": "^8.5.1",
     "klaw": "^3.0.0",
     "lru-cache": "^6.0.0",
-    "marked": "^1.2.5",
+    "marked": "^4.0.14",
+    "memored": "^1.1.1",
     "memorystore": "^1.6.4",
     "mime": "^2.4.6",
+    "mkdirp": "^0.5.1",
     "moment": "^2.29.1",
     "morgan": "^1.10.0",
-    "node-redis-pubsub": "^4.0.0",
     "object-hash": "^2.0.3",
     "object-merge": "^2.5.1",
     "on-headers": "^1.0.2",
@@ -62,31 +71,27 @@
     "passport-linkedin": "^1.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
-    "passport-saml": "^2.0.2",
-    "passport-twitter": "^1.0.4",
+    "passport-saml": "^2.2.0",
+    "passport-twitter": "^0.1.5",
     "pkginfo": "^0.4.1",
-    "q": "^1.5.1",
     "random-js": "^2.1.0",
     "recursive-readdir": "^2.2.2",
-    "redis": "^3.0.2",
-    "redislock": "^1.3.0",
+    "redis": "^4.2.0",
+    "redlock": "4.2.0",
     "request-param": "^1.0.1",
     "response-time": "^2.3.2",
-    "rwlock": "^5.0.0",
-    "semver": "^7.3.4",
+    "semver": "^7.3.7",
     "serve-favicon": "^2.5.0",
     "session-file-store": "^1.5.0",
     "sha1": "^1.1.1",
-    "socket.io": "4.1.2",
+    "socket.io": "^4.5.1",
     "ssl-root-cas": "^1.3.1",
-    "sticky-session": "^1.1.2",
     "stomp-client": "^0.9.0",
     "targz": "^1.0.1",
     "temp": "^0.9.4",
-    "toobusy-js": "^0.5.1",
     "uuid": "^8.3.2",
     "vm2": "^3.9.2",
-    "watch": "^1.0.2",
+    "watch": "^0.13.0",
     "winston": "^3.3.3"
   },
   "contributors": [