cloudcms-server 3.2.321 → 3.2.324

package/old_package.json

@@ -0,0 +1,119 @@
+{
+  "author": {
+    "name": "Gitana Software, Inc.",
+    "email": "info@gitana.io",
+    "url": "https://gitana.io"
+  },
+  "name": "cloudcms-server",
+  "description": "Cloud CMS Application Server Module",
+  "version": "3.2.323",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/gitana/cloudcms-server.git"
+  },
+  "dependencies": {
+    "@socket.io/cluster-adapter": "^0.2.2",
+    "@socket.io/redis-adapter": "^8.3.0",
+    "@socket.io/sticky": "^1.0.4",
+    "accepts": "^1.3.8",
+    "agentkeepalive": "^4.5.0",
+    "alpaca": "^1.5.27",
+    "archiver": "^7.0.1",
+    "async": "^3.2.6",
+    "async-lock": "^1.4.1",
+    "aws-sdk": "^2.1692.0",
+    "axios": "^1.7.9",
+    "basic-auth": "^2.0.1",
+    "body-parser": "^1.20.3",
+    "bytes": "^3.1.2",
+    "cacheable-lookup": "^6.1.0",
+    "canoe": "^0.3.3",
+    "clone": "^2.1.2",
+    "connect-flash": "^0.1.1",
+    "connect-multiparty": "^2.2.0",
+    "connect-redis": "^8.0.1",
+    "cookie-parser": "^1.4.7",
+    "debug": "^4.4.0",
+    "errorhandler": "^1.5.1",
+    "express": "^4.21.2",
+    "express-session": "^1.18.1",
+    "express-useragent": "^1.0.15",
+    "fast-proxy": "^2.2.0",
+    "gitana": "^1.0.330",
+    "handlebars": "^4.7.8",
+    "hbs": "^4.2.0",
+    "helmet": "^8.0.0",
+    "ioredis": "5.4.1",
+    "json5": "^2.2.3",
+    "jsonwebtoken": "^9.0.2",
+    "klaw": "^4.1.0",
+    "lru-cache": "^7.14.0",
+    "marked": "^15.0.4",
+    "memored": "^1.1.1",
+    "memorystore": "^1.6.4",
+    "mime": "^2.4.6",
+    "moment": "^2.30.1",
+    "morgan": "^1.10.0",
+    "object-hash": "^3.0.0",
+    "object-merge": "^2.5.1",
+    "on-headers": "^1.0.2",
+    "passport": "^0.7.0",
+    "passport-cas": "^0.1.1",
+    "passport-facebook": "^3.0.0",
+    "passport-github": "^1.1.0",
+    "passport-google-oauth": "^2.0.0",
+    "passport-linkedin": "^1.0.0",
+    "passport-local": "^1.0.0",
+    "passport-oauth": "^1.0.0",
+    "passport-saml": "^2.2.0",
+    "passport-twitter": "^1.0.4",
+    "random-js": "^2.1.0",
+    "recursive-readdir": "^2.2.3",
+    "redis": "^4.7.0",
+    "redlock": "4.2.0",
+    "request-param": "^1.0.1",
+    "response-time": "^2.3.3",
+    "semver": "^7.6.3",
+    "serve-favicon": "^2.5.0",
+    "session-file-store": "^1.5.0",
+    "sha1": "^1.1.1",
+    "socket.io": "^4.8.1",
+    "ssl-root-cas": "^1.3.1",
+    "stomp-client": "^0.9.0",
+    "targz": "^1.0.1",
+    "temp": "^0.9.4",
+    "uuid": "^11.0.3",
+    "vm2": "^3.9.19",
+    "watch": "^1.0.2",
+    "winston": "^3.17.0"
+  },
+  "contributors": [
+    {
+      "name": "Michael Uzquiano",
+      "email": "uzi@cloudcms.com"
+    },
+    {
+      "name": "Harry Moore",
+      "email": "harry.moore@cloudcms.com"
+    }
+  ],
+  "keywords": [
+    "wcm",
+    "web",
+    "cloudcms",
+    "cms",
+    "content",
+    "json",
+    "rest",
+    "mobile",
+    "content management",
+    "javascript",
+    "nodejs",
+    "api",
+    "jsoncms",
+    "baas",
+    "caching",
+    "renditions"
+  ],
+  "main": "index"
+}

package/package.json

@@ -6,92 +6,81 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.321",
+  "version": "3.2.324",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
   },
   "dependencies": {
-    "@socket.io/cluster-adapter": "^0.2.0",
-    "@socket.io/redis-adapter": "^7.2.0",
-    "@socket.io/sticky": "^1.0.1",
+    "@socket.io/cluster-adapter": "^0.2.2",
+    "@socket.io/redis-adapter": "^8.3.0",
+    "@socket.io/sticky": "^1.0.4",
     "accepts": "^1.3.8",
     "agentkeepalive": "^4.5.0",
     "alpaca": "^1.5.27",
-    "archiver": "^1.3.0",
-    "async": "^3.2.3",
+    "archiver": "^7.0.1",
+    "async": "^3.2.6",
     "async-lock": "^1.4.1",
-    "aws-sdk": "^2.1208.0",
-    "axios": "^1.5.0",
+    "aws-sdk": "^2.1692.0",
+    "axios": "^1.7.9",
     "basic-auth": "^2.0.1",
-    "body-parser": "^1.20.0",
-    "bytes": "^2.5.0",
+    "body-parser": "^1.20.3",
+    "bytes": "^3.1.2",
     "cacheable-lookup": "^6.1.0",
     "canoe": "^0.3.3",
     "clone": "^2.1.2",
     "connect-flash": "^0.1.1",
     "connect-multiparty": "^2.2.0",
-    "connect-redis": "^6.1.3",
-    "consolidate": "^0.14.5",
-    "cookie-parser": "^1.4.4",
-    "debug": "^2.6.9",
-    "dustjs-helpers": "1.7.4",
-    "dustjs-linkedin": "3.0.1",
+    "connect-redis": "^8.0.1",
+    "cookie-parser": "^1.4.7",
+    "debug": "^4.4.0",
     "errorhandler": "^1.5.1",
-    "express": "^4.18.2",
-    "express-session": "^1.17.3",
+    "express": "^4.21.2",
+    "express-session": "^1.18.1",
     "express-useragent": "^1.0.15",
-    "extend-with-super": "^2.0.0",
     "fast-proxy": "^2.2.0",
-    "gitana": "^1.0.326",
-    "handlebars": "^4.4.2",
-    "hbs": "^4.0.5",
-    "helmet": "^4.6.0",
-    "ioredis": "4.28.5",
-    "json5": "^1.0.1",
-    "jsonwebtoken": "^8.5.1",
-    "klaw": "^1.3.1",
+    "gitana": "^1.0.330",
+    "handlebars": "^4.7.8",
+    "hbs": "^4.2.0",
+    "helmet": "^8.0.0",
+    "ioredis": "5.4.1",
+    "isolated-vm": "5.0.3",
+    "json5": "^2.2.3",
+    "jsonwebtoken": "^9.0.2",
+    "klaw": "^4.1.0",
     "lru-cache": "^7.14.0",
-    "marked": "^4.0.14",
+    "marked": "^15.0.4",
     "memored": "^1.1.1",
-    "memorystore": "^1.6.1",
-    "mime": "^1.6.0",
-    "mkdirp": "^0.5.1",
-    "moment": "^2.24.0",
-    "morgan": "^1.9.1",
-    "object-hash": "^1.3.1",
+    "memorystore": "^1.6.4",
+    "mime": "^2.4.6",
+    "moment": "^2.30.1",
+    "morgan": "^1.10.0",
+    "object-hash": "^3.0.0",
     "object-merge": "^2.5.1",
     "on-headers": "^1.0.2",
-    "passport": "^0.4.0",
-    "passport-cas": "^0.0.3",
-    "passport-facebook": "^2.1.1",
-    "passport-github": "^1.1.0",
-    "passport-google-oauth": "^1.0.0",
-    "passport-linkedin": "^1.0.0",
+    "passport": "^0.7.0",
+    "passport-google-oauth": "^2.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
-    "passport-saml": "^2.2.0",
-    "passport-twitter": "^0.1.5",
-    "pkginfo": "^0.4.1",
-    "random-js": "^1.0.8",
-    "recursive-readdir": "^2.2.2",
-    "redis": "^4.2.0",
+    "@node-saml/passport-saml": "5.0.0",
+    "random-js": "^2.1.0",
+    "recursive-readdir": "^2.2.3",
+    "redis": "^4.7.0",
     "redlock": "4.2.0",
     "request-param": "^1.0.1",
-    "response-time": "^2.3.2",
-    "semver": "^7.3.7",
+    "response-time": "^2.3.3",
+    "semver": "^7.6.3",
     "serve-favicon": "^2.5.0",
-    "session-file-store": "^0.2.2",
+    "session-file-store": "^1.5.0",
     "sha1": "^1.1.1",
-    "socket.io": "^4.5.1",
+    "socket.io": "^4.8.1",
     "ssl-root-cas": "^1.3.1",
     "stomp-client": "^0.9.0",
     "targz": "^1.0.1",
-    "temp": "^0.8.3",
-    "uuid": "^3.3.2",
-    "vm2": "^3.8.4",
-    "watch": "^0.13.0",
-    "winston": "^3.3.3"
+    "temp": "^0.9.4",
+    "uuid": "^11.0.3",
+    "underscore": "^1.13.7",
+    "winston": "^3.17.0"
   },
   "contributors": [
     {

package/server/index.js

@@ -33,11 +33,6 @@ var requestParam = require("request-param")();
 // cloudcms app server support
 var main = require("../index");
 
-// duster service
-var duster = require("../duster/index");
-
-var coreHelpers = require("../duster/helpers/core/index");
-
 var helmet = require("helmet");
 
 var responseTime = require("response-time");
@@ -71,7 +66,6 @@ var SETTINGS = {
     "beforeFunctions": [],
     "afterFunctions": [],
     "reportFunctions": [],
-    "dustFunctions": [],
     "initFunctions": [],
     "filterFunctions": [],
     "driverFunctions": [],
@@ -175,11 +169,6 @@ var SETTINGS = {
             "modules": "hosts_s3fs"
         }
     },
-    "duster": {
-        "fragments": {
-            "cache": true
-        }
-    },
     "virtualHost": {
         "enabled": false
     },
@@ -317,9 +306,6 @@ var SETTINGS = {
     }
 };
 
-// always push core tag helpers to the front
-SETTINGS.dustFunctions.unshift(coreHelpers);
-
 // if SETTINGS.errorFunctions is empty, plug in a default error handler
 if (SETTINGS.errorFunctions.length === 0)
 {
@@ -441,17 +427,6 @@ exports.error = function (fn) {
     SETTINGS.errorFunctions.push(fn);
 };
 
-/**
- * Adds an initialization function to set up dust.
- *
- * The function must have signature fn(app, dust)
- *
- * @param helperFn
- */
-var dust = exports.dust = function(fn) {
-    SETTINGS.dustFunctions.push(fn);
-};
-
 /**
  * Registers a function to run before the server starts.
  *
@@ -821,7 +796,6 @@ var startServer = function(config, startServerFinishedFn)
                 //
                 // BASE CONFIGURATION
                 //
-                // Configures NodeJS app server using dustjs templating engine
                 // Runs on port 3000 by default
                 //
                 ////////////////////////////////////////////////////////////////////////////
@@ -830,16 +804,7 @@ var startServer = function(config, startServerFinishedFn)
                 app.set('port', process.env.PORT);
                 app.set('views', process.env.CLOUDCMS_APPSERVER_BASE_PATH + "/views");
     
-                if (config.viewEngine === "dust")
-                {
-                    var cons = require('consolidate');
-    
-                    app.set('view engine', 'html');
-                    app.set('view engine', 'dust');
-                    app.engine('html', cons.dust);
-                    app.engine('dust', cons.dust);
-                }
-                else if (config.viewEngine === "handlebars" || config.viewEngine === "hbs")
+                if (config.viewEngine === "handlebars" || config.viewEngine === "hbs")
                 {
                     var hbs = require('hbs');
     
@@ -1359,52 +1324,48 @@ var configureServer = function(config, app, httpServer, configureServerFinishedF
     // SET INITIAL VALUE FOR SERVER TIMESTAMP
     process.env.CLOUDCMS_APPSERVER_TIMESTAMP = Date.now();
     
-    // DUST
-    runFunctions(config.dustFunctions, [app, duster.getDust()], function (err) {
-        
-        // APPLY SERVER BEFORE START FUNCTIONS
-        runFunctions(config.beforeFunctions, [app], function (err) {
-            
-            // AFTER SERVER START
-            runFunctions(config.afterFunctions, [app], function (err) {
-                
-                function cleanup() {
-                    
-                    if (cluster.isMaster)
-                    {
-                        console.log("");
-                        console.log("");
-                        
-                        console.log("Cloud CMS Module shutting down");
-                        
-                        // close server connections as cleanly as we can
-                        console.log(" -> Closing server connections");
-                    }
-                    
-                    try
-                    {
-                        httpServer.close();
-                    }
-                    catch (e)
-                    {
-                        console.log("Server.close produced error: " + JSON.stringify(e));
-                    }
-                    
-                    if (cluster.isMaster)
-                    {
-                        console.log("");
-                    }
-                    
-                    // tell the process to exit
-                    process.exit();
+    // APPLY SERVER BEFORE START FUNCTIONS
+    runFunctions(config.beforeFunctions, [app], function (err) {
+
+        // AFTER SERVER START
+        runFunctions(config.afterFunctions, [app], function (err) {
+
+            function cleanup() {
+
+                if (cluster.isMaster)
+                {
+                    console.log("");
+                    console.log("");
+
+                    console.log("Cloud CMS Module shutting down");
+
+                    // close server connections as cleanly as we can
+                    console.log(" -> Closing server connections");
                 }
-                
-                // listen for kill or interrupt so that we can shut down cleanly
-                process.on('SIGINT', cleanup);
-                process.on('SIGTERM', cleanup);
-                
-                configureServerFinishedFn();
-            });
+
+                try
+                {
+                    httpServer.close();
+                }
+                catch (e)
+                {
+                    console.log("Server.close produced error: " + JSON.stringify(e));
+                }
+
+                if (cluster.isMaster)
+                {
+                    console.log("");
+                }
+
+                // tell the process to exit
+                process.exit();
+            }
+
+            // listen for kill or interrupt so that we can shut down cleanly
+            process.on('SIGINT', cleanup);
+            process.on('SIGTERM', cleanup);
+
+            configureServerFinishedFn();
         });
     });
 };

package/server/standalone.js

@@ -104,11 +104,6 @@ server.start({
     },
     "insight": {
         "enabled": true
-    },
-    "duster": {
-        "fragments": {
-            "cache": true
-        }
     }
 }, function() {
     // all done

package/util/util.js

@@ -1,8 +1,10 @@
+var mime = require("mime");
+const { v4: uuidv4 } = require("uuid");
+
 var fs = require("fs");
 var path = require("path");
-var mkdirp = require('mkdirp');
-var mime = require("mime");
-var uuidv4 = require("uuid/v4");
+//var mime = require("mime");
+//var uuidv4 = require("uuid/v4");
 var os = require("os");
 var async = require("async");
 var temp = require("temp");
@@ -544,7 +546,9 @@ var rmdir = exports.rmdir = function(directoryPath)
 
 var mkdirs = exports.mkdirs = function(directoryPath, callback)
 {
-    mkdirp(directoryPath, function(err) {
+    fs.mkdir(directoryPath, {
+        recursive: true
+    }, function(err) {
         callback(err);
     });
 };
@@ -1205,7 +1209,9 @@ var handleSendFileError = exports.handleSendFileError = function(req, res, fileP
 
 var createDirectory = exports.createDirectory = function(directoryPath, callback)
 {
-    mkdirp(directoryPath, function(err) {
+    fs.mkdir(directoryPath, {
+        "recursive": true
+    }, function(err) {
 
         if (err) {
             return callback(err);
@@ -1376,7 +1382,7 @@ var isUndefined = exports.isUndefined = function(obj) {
 var lookupMimeType = exports.lookupMimeType = function(ext) {
 
     // rely on the mimetype library for base handling
-    var mimetype = mime.lookup(ext);
+    var mimetype = mime.getType(ext);
 
     var extension = ext;
     if (extension && extension.indexOf(".") === 0)

package/duster/helpers/core/cloudcms/associations.js

@@ -1,34 +0,0 @@
-/**
- * @associations
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    var engine = require("../engine")(app, dust);
-
-    /**
-     * ASSOCIATIONS
-     *
-     * Finds associations around a node.
-     *
-     * Syntax:
-     *
-     *    {@associations node="<nodeId>" type="<association_type>" limit="" skip="" as=""}
-     *       {+templateIdentifier/}
-     *    {/associations}
-     *
-     * @param chunk
-     * @param context
-     * @param bodies
-     * @param params
-     */
-    dust.helpers.associations = function(chunk, context, bodies, params)
-    {
-        return engine.handleAssociations(chunk, context, bodies, params);
-    };
-
-    callback();
-};

package/duster/helpers/core/cloudcms/beta/markdown.js

@@ -1,46 +0,0 @@
-var marked = require("marked");
-marked.setOptions({
-    renderer: new marked.Renderer(),
-    gfm: true,
-    tables: true,
-    breaks: false,
-    pedantic: false,
-    sanitize: true,
-    smartLists: true,
-    smartypants: false
-});
-
-/**
- * @markdown
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    /**
-     * Renders markdown into the Dust template.
-     *
-     * @param chunk
-     * @param context
-     * @param bodies
-     * @param params
-     * @returns {*}
-     */
-    dust.helpers.markdown = function(chunk, context, bodies, params) {
-
-        params = params || {};
-
-        var text = context.resolve(params.text);
-        if (!text) {
-            return chunk;
-        }
-
-        text = marked(text);
-
-        return chunk.write(text);
-    };
-
-    callback();
-};

package/duster/helpers/core/cloudcms/beta/nodeAttachmentText.js

@@ -1,46 +0,0 @@
-/**
- * @nodeAttachmentText
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    var engine = require("../../engine")(app, dust);
-
-    var map = engine.map;
-    var end = engine.end;
-
-    dust.helpers.nodeAttachmentText = dust.helpers.nodeAttachmentValue = function(chunk, context, bodies, params)
-    {
-        params = params || {};
-
-        var nodeId = context.resolve(params.node);
-        var attachmentId = context.resolve(params.attachment);
-        if (!attachmentId)
-        {
-            attachmentId = "default";
-        }
-
-        return map(chunk, function(chunk) {
-
-            var req = context.get("req");
-            req.branch(function(err, branch) {
-
-                if (err) {
-                    return end(chunk, context);
-                }
-
-                branch.readNode(nodeId).attachment(attachmentId).download(function(text) {
-
-                    chunk.write(text);
-
-                    end(chunk, context);
-                });
-            });
-        });
-    };
-
-    callback();
-};

package/duster/helpers/core/cloudcms/beta/params.js

@@ -1,33 +0,0 @@
-/**
- * @params
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    /**
-     * Allows parameters to be passed into blocks or partials
-     */
-    dust.helpers.params = function( chunk, context, bodies, params ){
-
-        var partial = {};
-        if( params)
-        {
-            for (var key in params)
-            {
-                partial[key] = params[key];
-            }
-        }
-
-        // render
-        var newContext = context.push(partial);
-
-        //return bodies.block(chunk, dust.makeBase(partial))
-        return bodies.block(chunk, newContext);
-    };
-    dust.helpers.parameters = dust.helpers.params;
-
-    callback();
-};