cloudcms-server 3.2.322 → 3.2.325

package/server/index.js

@@ -16,8 +16,7 @@ var session = require('express-session');
 var cookieParser = require('cookie-parser');
 var flash = require("connect-flash");
 
-//const redis = require('redis');
-const connectRedis = require('connect-redis');
+const {RedisStore} = require("connect-redis");
 
 // we don't bind a single passport - instead, we get the constructor here by hand
 var Passport = require("passport").Passport;
@@ -33,11 +32,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 +65,6 @@ var SETTINGS = {
     "beforeFunctions": [],
     "afterFunctions": [],
     "reportFunctions": [],
-    "dustFunctions": [],
     "initFunctions": [],
     "filterFunctions": [],
     "driverFunctions": [],
@@ -175,11 +168,6 @@ var SETTINGS = {
             "modules": "hosts_s3fs"
         }
     },
-    "duster": {
-        "fragments": {
-            "cache": true
-        }
-    },
     "virtualHost": {
         "enabled": false
     },
@@ -317,9 +305,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 +426,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.
  *
@@ -740,7 +714,6 @@ var initSession = function(initDone)
         var redisOptions = redisHelper.redisOptions();
         var redisClient = new IORedis(redisOptions.url);
     
-        var RedisStore = connectRedis(session);
         sessionConfig.store = new RedisStore({ client: redisClient });
         initDone(null, session(sessionConfig));
     }
@@ -821,7 +794,6 @@ var startServer = function(config, startServerFinishedFn)
                 //
                 // BASE CONFIGURATION
                 //
-                // Configures NodeJS app server using dustjs templating engine
                 // Runs on port 3000 by default
                 //
                 ////////////////////////////////////////////////////////////////////////////
@@ -830,16 +802,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 +1322,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();
-};

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

@@ -1,82 +0,0 @@
-/**
- * @processTemplate
- *
- * @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.processTemplate = function(chunk, context, bodies, params)
-    {
-        params = params || {};
-
-        var nodeId = context.resolve(params.node);
-        var attachmentId = context.resolve(params.attachment);
-        if (!attachmentId)
-        {
-            attachmentId = "default";
-        }
-        var propertyId = context.resolve(params.property);
-        var locale = context.resolve(params.locale);
-
-        return map(chunk, function(chunk) {
-
-            if (locale)
-            {
-                var gitana = context.get("gitana");
-                gitana.getDriver().setLocale(locale);
-            }
-
-            if (propertyId)
-            {
-                var req = context.get("req");
-                req.branch(function(err, branch) {
-
-                    if (err) {
-                        return end(chunk, context);
-                    }
-
-                    branch.readNode(nodeId).then(function() {
-
-                        resolveVariables([this[propertyId]], context, function (err, resolutions) {
-
-                            chunk.write(resolutions[0]);
-
-                            end(chunk, context);
-
-                        });
-                    });
-                });
-            }
-            else
-            {
-                var req = context.get("req");
-                req.branch(function(err, branch) {
-
-                    if (err) {
-                        return end(chunk, context);
-                    }
-
-                    branch.readNode(nodeId).attachment(attachmentId).download(function (text) {
-
-                        resolveVariables([text], context, function (err, resolutions) {
-
-                            chunk.write(resolutions[0]);
-
-                            end(chunk, context);
-
-                        });
-                    });
-                });
-            }
-        });
-    };
-
-    callback();
-};

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

@@ -1,34 +0,0 @@
-/**
- * @content
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    var engine = require("../engine")(app, dust);
-
-    /**
-     * CONTENT
-     *
-     * Selects a single content item.
-     *
-     * Syntax:
-     *
-     *    {@content id="GUID" path="/a/b/c" as=""}
-     *       {+templateIdentifier/}
-     *    {/content}
-     *
-     * @param chunk
-     * @param context
-     * @param bodies
-     * @param params
-     */
-    dust.helpers.content = function(chunk, context, bodies, params)
-    {
-        return engine.handleContent(chunk, context, bodies, params);
-    };
-
-    callback();
-};

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

@@ -1,38 +0,0 @@
-/**
- * @expand
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    var engine = require("../engine")(app, dust);
-
-    /**
-     * EXPAND
-     *
-     * Query for a list of nodes by their id (._doc).
-     * The list of id values can be supplied as an array of id values in
-     * the 'list' arg or as an array of node records in the 'list' arg
-     * along with a the name of a common key within each node that holds
-     * the id.
-     *
-     * Syntax:
-     *   ex. 1
-	 *      {@expand list="components" key="editorialpage.components" as="components"}
-     *          {+templateIdentifier/}
-     *      {/expand}
-     *
-     * @param chunk
-     * @param context
-     * @param bodies
-     * @param params
-     */
-    dust.helpers.expand = function(chunk, context, bodies, params)
-    {
-        return engine.handleExpand(chunk, context, bodies, params);
-    };
-
-    callback();
-};

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

@@ -1,34 +0,0 @@
-/**
- * @form
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    var engine = require("../engine")(app, dust);
-
-    /**
-     * FORM
-     *
-     * Renders a form.
-     *
-     * Syntax:
-     *
-     *    {@form definition="custom:type" form="formKey" list="listKeyOrId" successUrl="" errorUrl=""}
-     *       {+templateIdentifier/}
-     *    {/form}
-     *
-     * @param chunk
-     * @param context
-     * @param bodies
-     * @param params
-     */
-    dust.helpers.form = function(chunk, context, bodies, params)
-    {
-        return engine.handleForm(chunk, context, bodies, params);
-    };
-
-    callback();
-};

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

@@ -1,34 +0,0 @@
-/**
- * @query
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    var engine = require("../engine")(app, dust);
-
-    /**
-     * QUERY
-     *
-     * Queries for content from the content repository and renders.
-     *
-     * Syntax:
-     *
-     *    {@query sort="title" scope="page" type="custom:type" limit="" skip="" as=""}
-     *       {+templateIdentifier/}
-     *    {/query}
-     *
-     * @param chunk
-     * @param context
-     * @param bodies
-     * @param params
-     */
-    dust.helpers.query = function(chunk, context, bodies, params)
-    {
-        return engine.handleQuery(chunk, context, bodies, params, false);
-    };
-
-    callback();
-};

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

@@ -1,34 +0,0 @@
-/**
- * @queryOne
- *
- * @param app
- * @param dust
- * @param callback
- */
-module.exports = function(app, dust, callback)
-{
-    var engine = require("../engine")(app, dust);
-
-    /**
-     * QUERY AND KEEP ONE
-     *
-     * Queries for content from the content repository and renders.
-     *
-     * Syntax:
-     *
-     *    {@queryOne sort="title" scope="page" type="custom:type" limit="" skip="" as=""}
-     *       {+templateIdentifier/}
-     *    {/queryOne}
-     *
-     * @param chunk
-     * @param context
-     * @param bodies
-     * @param params
-     */
-    dust.helpers.queryOne = function(chunk, context, bodies, params)
-    {
-        return engine.handleQuery(chunk, context, bodies, params, true);
-    };
-
-    callback();
-};