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

package/util/request.js

@@ -1,7 +1,9 @@
 var axios = require("axios");
 
-var http = require("http");
-var https = require("https");
+// var http = require("http");
+// var https = require("https");
+//
+// var FormData = require("form-data");
 
 /**
  * Incoming config:
@@ -30,30 +32,64 @@ module.exports = function(config, callback)
     var requestConfig = {};
     requestConfig.url = config.uri || config.url;
     requestConfig.method = config.method || "get";
+    requestConfig.headers = {};
 
+    if (!config) {
+        config = {};
+    }
     if (!config.headers) {
         config.headers = {};
     }
-
-    if (config.headers) {
-        requestConfig.headers = config.headers;
+    for (var k in config.headers)
+    {
+        var v = config.headers[k];
+        if (v)
+        {
+            requestConfig.headers[k.trim().toLowerCase()] = v;
+        }
     }
-
+    // support for FormData headers
+    // copy form data headers
+    if (config.data && config.data.getHeaders)
+    {
+        var formDataHeaders = config.data.getHeaders();
+        for (var k in formDataHeaders)
+        {
+            var v = formDataHeaders[k];
+            requestConfig.headers[k] = v;
+        }
+    }
+    
     if (config.qs) {
         requestConfig.params = config.qs;
     }
 
     if (config.json) {
         requestConfig.data = config.json;
-        requestConfig.headers["content-type"] = "application/json";
+        
+        if (!requestConfig.headers["content-type"]) {
+            requestConfig.headers["content-type"] = "application/json";
+        }
     }
 
-    if (config.data) {
+    if (config.data)
+    {
         requestConfig.data = config.data;
-
-        if (requestConfig.data !== null && typeof requestConfig.data === 'object')
+    
+        if (!requestConfig.headers["content-type"])
         {
-            requestConfig.headers["content-type"] = "application/json";
+            if (!requestConfig.data)
+            {
+                if (requestConfig.data.getHeaders)
+                {
+                    // assume this is a FormData and skip
+                }
+                else if (typeof(requestConfig.data) === "object")
+                {
+                    // send as json
+                    requestConfig.headers["content-type"] = "application/json";
+                }
+            }
         }
     }
 
@@ -72,7 +108,7 @@ module.exports = function(config, callback)
         requestConfig.httpAgent = http.globalAgent;
     }
     */
-
+    
     axios.request(requestConfig).then(function(response) {
         callback(null, response, response.data);
     }, function(error) {

package/util/util.js

@@ -603,7 +603,7 @@ var executeFunction = exports.executeFunction = function(identifier, fn, afterFn
     // take out a lock to ensure that the first thread to pass through here is the only one
     // and gets to run by itself on the cluster
     var exclusiveLockKey = "exclusiveLock-" + identifier;
-    process.locks.lock(exclusiveLockKey, function (releaseLockFn) {
+    process.locks.lock(exclusiveLockKey, function (err, releaseLockFn) {
 
         var firstRunCacheKey = "firstRun-" + identifier;
         process.cache.read(firstRunCacheKey, function(err, value) {
@@ -1777,10 +1777,11 @@ var zip = exports.zip = function(directoryPath, writableStream)
  * @param {string} protocol
  * @param {string} host
  * @param [number|string] port
+ * @param {string} path
  *
  * @type {Function}
  */
-var asURL = exports.asURL = function(protocol, host, port)
+var asURL = exports.asURL = function(protocol, host, port, path)
 {
     // protocol lower case
     protocol = protocol.toLowerCase();
@@ -1806,6 +1807,19 @@ var asURL = exports.asURL = function(protocol, host, port)
         }
     }
 
+    // include url "path" if defined
+    if (path) {
+        path = '/' + path;
+        path = path.replace(/\/+/g, '/'); // ensure no extra '/' characters
+        if (path.endsWith('/')) {
+            // remove trailing '/' character
+            path = path.substring(0, path.length - 1);
+        }
+        if (path) {
+            url += path;
+        }
+    }
+
     return url;
 };
 

package/launchpad/launchers/sticky-cluster.js

@@ -1,43 +0,0 @@
-var clusterlock = require("../../temp/clusterlock");
-
-// use sticky-session library
-var sticky = require('sticky-session');
-
-module.exports = function(options) {
-
-    var factoryCallback = options.factory;
-    var reportCallback = options.report;
-    if (!reportCallback)
-    {
-        reportCallback = function () {
-        };
-    }
-    var completionCallback = options.complete;
-    if (!completionCallback)
-    {
-        completionCallback = function () {
-        };
-    }
-
-    factoryCallback(function (server) {
-
-        if (!sticky.listen(server, server._listenPort))
-        {
-            // master code
-
-            // start up cluster locks
-            clusterlock.setup();
-
-            // wait 5 seconds, then fire callbacks
-            setTimeout(function () {
-                reportCallback();
-                completionCallback();
-            }, 5000);
-        }
-        else
-        {
-            // worker code
-        }
-
-    });
-};

package/temp/memored/.jshintrc

@@ -1,4 +0,0 @@
-{
-	"node": true,
-	"unused": true
-}

package/temp/memored/README.md

@@ -1,240 +0,0 @@
-# Memored
-
-Memored implements an in-memory shared cache to use in nodejs applications which uses [cluster](http://nodejs.org/api/cluster.html) module.
-
-Let's say you want your application to take advantage of multi-core CPUs using nodejs cluster module; you will be able to run several _isolated_ processes which shared nothing but a communication channel with parent process.
-If you need a fast volatile cache, common solutions would create an in-memory map for every process you run, so you end up with the same data stored several times in your machine RAM.
-
-Memored uses communication channel between master process and its workers to use a unique in-memory storage, reducing the amount of memory your application would use.
-
-## Getting Started
-Install this module with _npm_:
-```javascript
-npm install memored
-```
-
-Store and read values is straightforward:
-```javascript
-var cluster = require('cluster'),
-	memored = require('memored');
-
-if (cluster.isMaster) {
-	cluster.fork();
-} else {
-	var han = {
-			firstname: 'Han',
-			lastname: 'Solo'
-		},
-		luke = {
-			firstname: 'Luke',
-			lastname: 'Skywalker'
-		};
-
-	// Store and read
-	memored.store('character1', han, function() {
-		console.log('Value stored!');
-
-		memored.read('character1', function(err, value) {
-			console.log('Read value:', value);
-		});
-	});
-
-	// You can also set a ttl (milliseconds)
-	memored.store('character2', luke, 1000, function(err, expirationTime) {
-		console.log('Value stored until:', new Date(expirationTime));
-
-		setTimeout(function() {
-			memored.read('character2', function(err, value) {
-				console.log('Value is gone?', value === undefined);
-
-				process.exit();
-			});
-		}, 1050);
-	});
-}
-```
-
-## Invalidation management
-By default, _memored_ will evict cache entries (stored with _ttl_) passively. This is, when you read an expired entry, you will get no value on return and _memored_ will delete the value from its internal cache.
-
-You can also configure _memored_ to actively evict expired entries every N milliseconds. For this to work, you need to pass the attribute *purgeInterval* to the *setup* function.
-This will trigger an internal function which looks for expired entries and deletes them from its internal cache.
-
-Example:
-```javascript
-var cluster = require('cluster'),
-	async = require('async'),
-	memored = require('memored');
-
-if (cluster.isMaster) {
-
-	cluster.fork();
-	memored.setup({ purgeInterval: 500});
-
-} else {
-
-	async.series({
-		storeValue: function(next) {
-			memored.store('key1', 'My simple string value', 100, next);
-		},
-		readCacheSize: function(next) {
-			memored.size(function(err, size) {
-				console.log('Current size is 1?', size === 1);
-				next();
-			});
-		},
-		wait: function(next) {
-			setTimeout(next, 600);
-		},
-		readCacheSizeAgain: function(next) {
-			memored.size(function(err, size) {
-				console.log('Current size is 0?', size === 0);
-				next();
-			});
-		}
-	}, process.exit);
-}
-```
-
-## API
-Documentation for every module function:
-
-
-### setup(options)
-
-This function is used to configure _memored_.
-
-**Arguments**:
-
-- **purgeInterval** {Number} (optional): Configures and triggers _memored_ expired entries auto deletion. Value expressed in milliseconds. _It's only used when called this method from the master process of your application_.
-- **logger** {Object} (optional): In you want _memored_ to log something, you must provide an object implementing *log* and *warn* functions.
-
-**Example**:
-```javascript
-memored.setup({
-	purgeInterval: 15000,
-	logger: console
-});
-```
-
-### store(key, value, [ttl], callback)
-
-This function stores a value in the cache.
-_It is intended to be called from a worker process_.
-
-**Arguments**:
-
-- **key** {String} (required): Key used to lookup the entry
-- **value** {Mixed} (required): Whatever you want to store
-- **ttl** {Number} (optional): Time to live for this value in the cache (milliseconds)
-- **callback** {Function} (optional): Function to be call on store completion. Callback arguments:
-	- _err_ {Error}: Optional error
-	- _expirationTime_ {Number}: The timestamp of the moment when this entry will expire. If _ttl_ is not used, this value will be undefined.
-
-**Examples**:
-```javascript
-memored.store('key1', {firstname: 'Han', lastname: 'Solo'}, function() {
-	console.log('Value stored!');
-});
-
-memored.store('key2', ['a', 'b', 'c'], 15000, function(err, expirationTime) {
-	console.log('This value will expire on:', new Date(expirationTime));
-});
-```
-
-### read(key, callback)
-
-This function reads a value from the cache.
-_It is intended to be called from a worker process_.
-
-**Arguments**:
-
-- **key** {String} (required): Key used to lookup the entry
-- **callback** {Function} (required): Function to be called on read completion. Callback arguments:
-	- _err_ {Error}: Optional error
-	- _value_ {Mixed}: Contents of the cached entry. If the value is not found or is expired, it will be undefined.
-
-**Example**:
-```javascript
-memored.read('key1', function(err, value) {
-	console.log('Key1 value:', value);
-});
-
-memored.read('key1', function(err, value, expirationTime) {
-	console.log('Key1 value:', value);
-	console.log('Key1 expiration time:', new Date(expirationTime));
-});
-
-memored.read('unknownKey', function(err, value) {
-	console.log('No data read?', value === undefined);
-});
-```
-
-### remove(key, callback)
-
-This function removes an entry from the cache.
-_It is intended to be called from a worker process_.
-
-**Arguments**:
-
-- **key** {String} (required): Key used to lookup the entry
-- **callback** {Function} (optional): Function to be called on read completion.
-
-**Example**:
-```javascript
-memored.remove('key1', function() {
-	console.log('Key removed from the cache.');
-});
-```
-
-### clean(callback)
-
-This function removes all the entries from the cache.
-_It is intended to be called from a worker process_.
-
-**Arguments**:
-
-- **callback** {Function} (optional): Function to be called on read completion.
-
-**Example**:
-```javascript
-memored.clean(function() {
-	console.log('All cache entries have been deleted.');
-});
-```
-
-### size(callback)
-
-This function returns the number of entries in the cache.
-
-**Arguments**:
-
-- **callback** {Function} (required): Function to be called on size calculation is complete. Callback arguments:
-	- _err_ {Error}: Optional error
-	- _size_ {Number}: The number of entries in the cache.
-
-**Example**:
-
-```javascript
-memored.size(function(err, size) {
-	console.log('Cache size:', size);
-});
-```
-
-### version
-
-This is an attribute wich provides module's version number
-
-
-# Final note
-All the callbacks first parameter is an optional error object. Actually, this param will never be an error because there is no expected error in the internal code. There's no function call that can possible throw an expected error that this module would deal with.
-The existence of this param is to follow the *convention* about libraries callbacks in nodejs. As everybody expects this first callback parameter to be an optional one, I decided to include it.
-
-- [Nodeguide](http://nodeguide.com/style.html#callbacks)
-- [Nodejitsu](http://docs.nodejitsu.com/articles/errors/what-are-the-error-conventions)
-- [GoSquared](https://engineering.gosquared.com/node-js-error-handling-callbacks-vs-promises)
-
-
-## License
-Copyright (c) 2014 PaquitoSoft  
-Licensed under the MIT license.

package/temp/memored/demo/demo1.js

@@ -1,37 +0,0 @@
-var cluster = require('cluster'),
-	memored = require('../index');
-
-if (cluster.isMaster) {
-	cluster.fork();
-} else {
-	var han = {
-			firstname: 'Han',
-			lastname: 'Solo'
-		},
-		luke = {
-			firstname: 'Luke',
-			lastname: 'Skywalker'
-		};
-
-	// Store and read
-	memored.store('character1', han, function() {
-		console.log('Value stored!');
-
-		memored.read('character1', function(err, value) {
-			console.log('Read value:', value);
-		});
-	});
-
-	// You can also set a ttl (milliseconds)
-	memored.store('character2', luke, 1000, function(err, expirationTime) {
-		console.log('Value stored until:', new Date(expirationTime));
-
-		setTimeout(function() {
-			memored.read('character2', function(err, value) {
-				console.log('Value is gone?', value === undefined);
-
-				process.exit();
-			});
-		}, 1050);
-	});
-}

package/temp/memored/demo/demo2.js

@@ -1,32 +0,0 @@
-var cluster = require('cluster'),
-	async = require('async'),
-	memored = require('../index');
-
-if (cluster.isMaster) {
-
-	cluster.fork();
-	memored.setup({ purgeInterval: 500});
-
-} else {
-
-	async.series({
-		storeValue: function(next) {
-			memored.store('key1', 'My simple string value', 100, next);
-		},
-		readCacheSize: function(next) {
-			memored.size(function(err, size) {
-				console.log('Current size is 1?', size === 1);
-				next();
-			});
-		},
-		wait: function(next) {
-			setTimeout(next, 600);
-		},
-		readCacheSizeAgain: function(next) {
-			memored.size(function(err, size) {
-				console.log('Current size is 0?', size === 0);
-				next();
-			});
-		}
-	}, process.exit);
-}

package/temp/memored/gulpfile.js

@@ -1,8 +0,0 @@
-var gulp = require('gulp'),
-	mocha = require('gulp-mocha')/*,
-	plumber = require('gulp-plumber')*/;
-
-gulp.task('default', function() {
-	return gulp.src('spec/*.spec.js', {read: true})
-		.pipe(mocha({ui: 'bdd', reporter: 'spec'}));
-});