cloudcms-server 0.9.272 → 0.9.276

package/middleware/proxy/proxy.js

@@ -211,7 +211,7 @@ exports = module.exports = function()
                 contentStore.writeFile(filePath + ".cache", JSON.stringify(cacheInfo), function() {
                     _end.call(res, data, encoding);
                 });
-``            };
+            };
 
             callback();
         });
@@ -235,16 +235,16 @@ exports = module.exports = function()
                 }
                 
                 // caching scenario
-                _handleCacheRead(req, function (err, readStream) {
+                // _handleCacheRead(req, function (err, readStream) {
+                //
+                //     if (!err && readStream)
+                //     {
+                //         return util.sendFile(res, readStream, function (err) {
+                //             // done!
+                //         });
+                //     }
 
-                    if (!err && readStream)
-                    {
-                        return util.sendFile(res, readStream, function (err) {
-                            // done!
-                        });
-                    }
-
-                    _handleWrapCacheWriter(req, res, function(err) {
+                    // _handleWrapCacheWriter(req, res, function(err) {
 
                         // acquire the proxy handler
                         var proxyTarget = req.gitanaConfig.baseURL;
@@ -261,8 +261,8 @@ exports = module.exports = function()
 
                             proxyHandler(req, res);
                         });
-                    });
-                });
+                    // });
+                //});
             }
             else
             {

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.272",
+  "version": "0.9.276",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -33,8 +33,8 @@
     "consolidate": "^0.14.5",
     "cookie-parser": "^1.4.4",
     "debug": "^2.6.9",
-    "dustjs-helpers": "^1.7.4",
-    "dustjs-linkedin": "^3.0.1",
+    "dustjs-helpers": "1.7.4",
+    "dustjs-linkedin": "3.0.1",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
     "express-session": "^1.17.3",
@@ -44,7 +44,6 @@
     "handlebars": "^4.4.2",
     "hbs": "^4.0.5",
     "helmet": "^4.6.0",
-    "http-proxy": "file:./temp/http-proxy",
     "install": "^0.13.0",
     "ioredis": "4.28.5",
     "json5": "^1.0.1",
@@ -80,7 +79,7 @@
     "request": "^2.88.0",
     "request-param": "^1.0.1",
     "response-time": "^2.3.2",
-    "semver": "^5.7.1",
+    "semver": "^7.3.7",
     "serve-favicon": "^2.5.0",
     "session-file-store": "^0.2.2",
     "sha1": "^1.1.1",
@@ -94,9 +93,9 @@
     "vm2": "^3.8.4",
     "watch": "^0.13.0",
     "winston": "^3.3.3",
-    "eventemitter3": "^4.0.0",
+    "eventemitter3": "^4.0.7",
     "requires-port": "^1.0.0",
-    "follow-redirects": "^1.0.0"
+    "follow-redirects": "^1.15.1"
   },
   "contributors": [
     {

package/temp/http-proxy/package.json

@@ -17,25 +17,30 @@
     "follow-redirects": "^1.0.0"
   },
   "devDependencies": {
-    "async": "^3.0.0",
-    "auto-changelog": "^1.15.0",
+    "@types/follow-redirects": "^1.14.1",
+    "@types/node": "^18.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.31.0",
+    "@typescript-eslint/parser": "^5.31.0",
+    "async": "^3.2.3",
     "concat-stream": "^2.0.0",
-    "expect.js": "~0.3.1",
-    "mocha": "^3.5.3",
-    "nyc": "^14.0.0",
-    "semver": "^5.0.3",
-    "socket.io": "^2.1.0",
-    "socket.io-client": "^2.1.0",
+    "eslint": "^8.21.0",
+    "eslint-config-prettier": "^8.5.0",
+    "prettier": "^2.7.1",
+    "semver": "^7.0.0",
+    "socket.io": "^4.5.1",
+    "socket.io-client": "^4.5.1",
     "sse": "0.0.8",
-    "ws": "^3.0.0"
+    "typescript": "^4.8.2",
+    "vitest": "^0.20.3",
+    "ws": "^8.8.1"
   },
   "scripts": {
-    "mocha": "mocha test/*-test.js",
-    "test": "nyc --reporter=text --reporter=lcov npm run mocha",
-    "version": "auto-changelog -p && git add CHANGELOG.md"
+    "format": "prettier --write ./lib",
+    "lint": "eslint --fix ./lib",
+    "test": "vitest run"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=14.0.0"
   },
   "license": "MIT"
 }

package/temp/node-http-proxy/package.json

@@ -12,8 +12,8 @@
   ],
   "main": "lib/index.js",
   "dependencies": {
-    "eventemitter3": "^4.0.0",
-    "follow-redirects": "^1.0.0",
+    "eventemitter3": "^4.0.7",
+    "follow-redirects": "^1.15.1",
     "requires-port": "^1.0.0"
   },
   "devDependencies": {
@@ -21,18 +21,18 @@
     "@types/node": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^5.31.0",
     "@typescript-eslint/parser": "^5.31.0",
-    "async": "^3.0.0",
+    "async": "^3.2.3",
     "concat-stream": "^2.0.0",
     "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.7.1",
     "semver": "^7.0.0",
-    "socket.io": "^4.0.0",
-    "socket.io-client": "^4.0.0",
+    "socket.io": "^4.5.1",
+    "socket.io-client": "^4.5.1",
     "sse": "0.0.8",
     "typescript": "^4.8.2",
     "vitest": "^0.20.3",
-    "ws": "^8.0.0"
+    "ws": "^8.8.1"
   },
   "scripts": {
     "build": "npx tsc -p ./tsconfig.build.json",

package/util/proxy-factory.js

@@ -2,7 +2,7 @@ var http = require("http");
 var https = require("https");
 var path = require("path");
 
-var httpProxy = require("http-proxy");
+var httpProxy = require("../temp/http-proxy");
 
 var auth = require("./auth");
 var util = require("./util");
@@ -87,6 +87,7 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
         "agent": http.globalAgent,
         "xfwd": false,
         "proxyTimeout": process.defaultHttpTimeoutMs,
+        "timeout": process.defaultHttpTimeoutMs,
         //"changeOrigin": true
         "headers": {
             "host": proxyHost
@@ -102,12 +103,15 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
             "agent": https.globalAgent,
             "xfwd": false,
             "proxyTimeout": process.defaultHttpTimeoutMs,
+            "timeout": process.defaultHttpTimeoutMs,
             "headers": {
                 "host": proxyHost
             },
             "cookieDomainRewrite": true
         };
     }
+    
+    console.log("Using proxy config: " + proxyConfig);
 
     // create proxy server instance
     var proxyServer = new httpProxy.createProxyServer(proxyConfig);