cloudcms-server 4.0.0-beta.21 → 4.0.0-beta.22

package/index.js

@@ -60,27 +60,38 @@ process.logInfo = process.log = function(text, level)
 // by default, set up Gitana driver so that it limits to five concurrent HTTP requests back to Cloud CMS API at at time
 var Gitana = require("gitana");
 
+// default http timeout (10 minutes)
+process.defaultHttpTimeoutMs = 10 * 60 * 1000;
+if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
+{
+    try {
+        process.defaultHttpTimeoutMs = parseInt(process.env.DEFAULT_HTTP_TIMEOUT_MS);
+    } catch (e) { }
+}
+
 // default keep alive (3 minutes)
 process.defaultKeepAliveMs = (3 * 60 * 1000);
-
-// default http timeout (2 minutes)
-process.defaultHttpTimeoutMs = 2 * 60 * 1000;
+if (process.env.DEFAULT_KEEP_ALIVE_MS)
+{
+    try {
+        process.defaultKeepAliveMs = parseInt(process.env.DEFAULT_KEEP_ALIVE_MS);
+    } catch (e) { }
+}
 
 // default exclusive lock timeout (2 minutes)
 process.defaultExclusiveLockTimeoutMs = 2 * 60 * 1000;
-
-if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
+if (process.env.DEFAULT_EXCLUSIVE_LOCK_TIMEOUT_MS)
 {
-    try
-    {
-        process.defaultHttpTimeoutMs = parseInt(process.env.DEFAULT_HTTP_TIMEOUT_MS);
-    }
-    catch (e)
-    {
-
-    }
+    try {
+        process.defaultExclusiveLockTimeoutMs = parseInt(process.env.DEFAULT_EXCLUSIVE_LOCK_TIMEOUT_MS);
+    } catch (e) { }
 }
 
+// some reporting
+console.log("process.defaultHttpTimeoutMs: " + process.defaultHttpTimeoutMs);
+console.log("process.defaultKeepAliveMs: " + process.defaultKeepAliveMs);
+console.log("process.defaultExclusiveLockTimeoutMs: " + process.defaultExclusiveLockTimeoutMs);
+
 // dns fix for Node 17 +
 // see: https://nodejs.org/api/dns.html#dnssetdefaultresultorderorder
 var dns = require("dns");
@@ -94,18 +105,18 @@ var HttpsKeepAliveAgent = require('agentkeepalive').HttpsAgent;
 http.globalAgent = new HttpKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: process.defaultKeepAliveMs,
-    maxSockets: 1024,
-    maxFreeSockets: 256,
+    maxSockets: 2048,
+    maxFreeSockets: 64,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 5000
+    freeSocketTimeout: 30000
 });
 https.globalAgent = new HttpsKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: process.defaultKeepAliveMs,
-    maxSockets: 1024,
-    maxFreeSockets: 256,
+    maxSockets: 2048,
+    maxFreeSockets: 64,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 5000
+    freeSocketTimeout: 30000
 });
 
 // install dns cache

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "4.0.0-beta.21",
+  "version": "4.0.0-beta.22",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,7 +16,7 @@
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/sticky": "^1.0.4",
     "accepts": "^1.3.8",
-    "agentkeepalive": "^4.5.0",
+    "agentkeepalive": "^4.6.0",
     "alpaca": "^1.5.27",
     "archiver": "^7.0.1",
     "async": "^3.2.6",

package/server/index.js

@@ -587,42 +587,11 @@ var _start = function(overrides, callback) {
         process.env.CLOUDCMS_STANDALONE_HOST = "local";
     }
 
-    // http timeout
-    // default http timeout (2 minutes)
-    process.defaultHttpTimeoutMs = 2 * 60 * 1000;
-    if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
-    {
-        try {
-            process.defaultHttpTimeoutMs = parseInt(process.env.DEFAULT_HTTP_TIMEOUT_MS);
-        } catch (e) { }
-    }
-    else if (process.configuration.timeout)
-    {
-        process.defaultHttpTimeoutMs = process.configuration.timeout;
-    }
-
-    // socket keep alive (3 minutes)
-    process.defaultKeepAliveMs = (3 * 60 * 1000);
-    if (process.env.DEFAULT_KEEP_ALIVE_MS)
-    {
-        try {
-            process.defaultKeepAliveMs = parseInt(process.env.DEFAULT_KEEP_ALIVE_MS);
-        } catch (e) { }
-    }
-    else if (process.configuration.keepAliveMs)
-    {
-        process.defaultKeepAliveMs = process.configuration.keepAliveMs;
-    }
 
-
-    ///////////////////////
     // auto-configuration for HTTPS
-    ///////////////////////
-
     if (!process.configuration.https) {
         process.configuration.https = {};
     }
-
     if (process.env.CLOUDCMS_HTTPS) {
         process.configuration.https = JSON.parse(process.env.CLOUDCMS_HTTPS);
     }

package/util/proxy-factory.js

@@ -77,6 +77,13 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
     const { proxy, close } = require('fast-proxy')({
         base: proxyTarget,
         cacheURLs: 0,
+        keepAlive: true,
+        keepAliveMsecs: process.defaultKeepAliveMs,
+        maxSockets: 2048,
+        maxFreeSockets: 64,
+        timeout: process.defaultHttpTimeoutMs,
+        freeSocketTimeout: 30000
+
         //http2: true,
         //undici: true
     });