cloudcms-server 4.0.0-beta.5 → 4.0.0-beta.7

package/cloudcms-server.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

package/middleware/awareness/awareness.js

@@ -16,7 +16,8 @@ exports = module.exports = function()
 
     var pluginPaths = [
         "./plugins/editorial",
-        "./plugins/resources"
+        "./plugins/resources",
+        "./plugins/api_event"
     ];
     var plugins = {};
 
@@ -149,21 +150,21 @@ exports = module.exports = function()
             var r = {};
 
             // allow plugins to bind on("connection") handlers
-            r.bindOnSocketConnection = function(socket, provider, callback)
+            r.bindOnSocketConnection = function(socket, provider, io, callback)
             {
                 var fns = [];
                 for (var pluginPath in plugins)
                 {
                     var plugin = plugins[pluginPath];
 
-                    var fn = function(pluginPath, plugin, socket) {
+                    var fn = function(pluginPath, plugin, socket, io) {
                         return function(done) {
-
-                            plugin.bindSocket(socket, provider);
+    
+                            plugin.bindSocket(socket, provider, io);
 
                             done();
                         }
-                    }(pluginPath, plugin, socket);
+                    }(pluginPath, plugin, socket, io);
                     fns.push(fn);
                 }
 
@@ -309,7 +310,7 @@ exports = module.exports = function()
             });
 
             // allow plugins to register more on() handlers if they wish
-            pluginProxy.bindOnSocketConnection(socket, provider, function() {
+            pluginProxy.bindOnSocketConnection(socket, provider, io, function() {
                 // done
             });
 

package/middleware/awareness/plugins/api_event.js

@@ -0,0 +1,105 @@
+/*
+
+this awareness plugin adds support for general purpose API events
+the API in 4.0 supports passing API events forward via the message queue to the app server
+the app server then converts these into notifications
+
+the UI can register and event listener via socket.io ("onApiEvent").
+a listener binds to an event type + an optional reference
+
+when an event is received by the API, it triggers to socket.io emits (one for the general event and the other for the
+event + the reference being acted upon)
+ */
+exports = module.exports = {};
+
+var util = require("../../../util/util");
+var socketUtil = require("../../../util/socket");
+
+var subscriptionsBound = false;
+
+var bindSubscriptions = function(io)
+{
+    if (subscriptionsBound) {
+        return;
+    }
+
+    subscriptionsBound = true;
+    
+    // LISTEN: "api_event"
+    process.broadcast.subscribe("api_event", function (message, channel, done) {
+        
+        if (!done) {
+            done = function () {};
+        }
+    
+        // the message
+        // {
+        //     "applicationId": applicationId,
+        //     "deploymentKey": deploymentKey,
+        //     "host": host,
+        //     "eventType": eventType,
+        //     "eventId": eventId,
+        //     "objectType": objectType,
+        //     "objectId": objectId,
+        //     "objectRef": objectRef,
+        //     "object": object.object
+        // };
+    
+        var apiEvent = {};
+        apiEvent.type = message.eventType;
+        apiEvent.id = message.eventId;
+        apiEvent.objectType = message.objectType;
+        apiEvent.objectId = message.objectId;
+        apiEvent.objectRef = message.objectRef;
+        apiEvent.object = message.object;
+        
+        // dispatch for event + reference
+        if (apiEvent.objectRef)
+        {
+            try {
+                apiEvent.channelId = "apiEvent-" + apiEvent.type + "_" + apiEvent.objectRef;
+                //console.log("api_event -> " + apiEvent.channelId);
+                io.to(apiEvent.channelId).emit("apiEvent", apiEvent);
+            } catch (e) {
+                console.log(e);
+            }
+        }
+    
+        // dispatch for event
+        try {
+            apiEvent.channelId = "apiEvent-" + apiEvent.type;
+            //console.log("apiEvent -> " + apiEvent.channelId);
+            io.to(apiEvent.channelId).emit("apiEvent", apiEvent);
+        } catch (e) {
+            console.log(e);
+        }
+        
+        done();
+    });
+};
+
+exports.bindSocket = function(socket, provider, io)
+{
+    bindSubscriptions(io);
+
+    socketUtil.bindGitana(socket, function() {
+
+        socket.on("onApiEvent", function(eventName, reference, callback) {
+
+            if (eventName)
+            {
+                var channelId = "apiEvent-" + eventName;
+                
+                if (reference)
+                {
+                    channelId = eventName + "-" + reference;
+                }
+                
+                // join room for this event
+                socket.join(channelId);
+            }
+
+            callback();
+        });
+    });
+};

package/middleware/awareness/plugins/editorial.js

@@ -5,7 +5,7 @@ var socketUtil = require("../../../util/socket");
 
 var request = require("../../../util/request");
 
-exports.bindSocket = function(socket, provider)
+exports.bindSocket = function(socket, provider, io)
 {
     socketUtil.bindGitana(socket, function() {
 
@@ -231,10 +231,11 @@ exports.bindSocket = function(socket, provider)
                 var x1 = cookieValue.indexOf("GITANA_TICKET=");
                 if (x1 > -1)
                 {
-                    var x2 = cookieValue.indexOf(";", x1 + 14);
+                    ticket = cookieValue.substring(x1 + 14);
+                    var x2 = ticket.indexOf(";");
                     if (x2 > -1)
                     {
-                        ticket = cookieValue.substring(x1 + 14, x2);
+                        ticket = ticket.substring(0, x2);
                     }
                 }
             }

package/middleware/awareness/plugins/resources.js

@@ -5,7 +5,7 @@ var socketUtil = require("../../../util/socket");
 
 var subscriptionsBound = false;
 
-var bindSubscriptions = function()
+var bindSubscriptions = function(io)
 {
     if (subscriptionsBound) {
         return;
@@ -45,14 +45,14 @@ var bindSubscriptions = function()
             // fire to reference
             try {
                 if (reference) {
-                    process.IO.to(reference).emit("watchResource", reference, watchObject);
+                    io.to(reference).emit("watchResource", reference, watchObject);
                 }
             } catch (e) { }
 
             // fire to head reference
             try {
                 if (headReference) {
-                    process.IO.to(headReference).emit("watchResource", headReference, watchObject);
+                    io.to(headReference).emit("watchResource", headReference, watchObject);
                 }
             } catch (e) { }
         }
@@ -61,9 +61,9 @@ var bindSubscriptions = function()
     });
 };
 
-exports.bindSocket = function(socket, provider)
+exports.bindSocket = function(socket, provider, io)
 {
-    bindSubscriptions();
+    bindSubscriptions(io);
 
     socketUtil.bindGitana(socket, function() {
 

package/middleware/driver-config/driver-config.js

@@ -1,10 +1,4 @@
-var path = require('path');
-var http = require('http');
-var request = require('request');
 var util = require("../../util/util");
-var Gitana = require("gitana");
-
-var fs = require("fs");
 
 /**
  * Retrieves local driver configuration for hosts from Cloud CMS.

package/middleware/modules/modules.js

@@ -55,14 +55,20 @@ exports = module.exports = function()
             });
         }
 
-        if (!moduleConfig.source)
+        var source = moduleConfig.source40;
+        if (!source)
+        {
+            source = moduleConfig.source;
+        }
+
+        if (!source)
         {
             return callback({
                 "message": "Missing module config source settings"
             });
         }
 
-        var sourceType = moduleConfig.source.type;
+        var sourceType = source.type;
         if (!sourceType)
         {
             return callback({
@@ -70,7 +76,7 @@ exports = module.exports = function()
             });
         }
 
-        var sourceUrl = moduleConfig.source.uri;
+        var sourceUrl = source.uri;
         if (!sourceUrl)
         {
             return callback({
@@ -78,12 +84,12 @@ exports = module.exports = function()
             });
         }
 
-        var sourcePath = moduleConfig.source.path;
+        var sourcePath = source.path;
         if (!sourcePath) {
             sourcePath = "/";
         }
 
-        var sourceBranch = moduleConfig.source.branch;
+        var sourceBranch = source.branch;
         if (!sourceBranch) {
             sourceBranch = "master";
         }

package/middleware/stores/store.js

@@ -1,4 +1,3 @@
-var request = require('request');
 var path = require('path');
 
 var util = require("../../util/util");

package/middleware/stores/stores.js

@@ -520,7 +520,7 @@ exports = module.exports = function()
                         callback();
                     });
                 };
-    
+
                 process.cache.read("module-descriptors-" + host, function(err, moduleDescriptors) {
 
                     moduleDescriptors = null;

package/middleware/virtual-config/virtual-config.js

@@ -1,6 +1,3 @@
-//var path = require('path');
-//var http = require('http');
-//var request = require('request');
 var util = require("../../util/util");
 
 /**

package/middleware/virtual-files/virtual-files.js

@@ -1,6 +1,3 @@
-var path = require('path');
-var http = require('http');
-var request = require('request');
 var util = require("../../util/util");
 
 /**

package/middleware/welcome/welcome.js

@@ -1,7 +1,4 @@
 var path = require('path');
-var fs = require('fs');
-var http = require('http');
-var request = require('request');
 var util = require("../../util/util");
 
 /**

package/notifications/notifications.js

@@ -72,11 +72,11 @@ var handleNotificationMessages = function(items, callback) {
     var fns = [];
     for (var i = 0; i < items.length; i++)
     {
-        var fn = function(item, i) {
+        var fn = function(item, index) {
             return function(done) {
 
                 //logFn("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
-                console.log("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
+                console.log("WORKING ON ITEM: " + index + ", item: " + JSON.stringify(item, null, "  "));
 
                 var operation = item.operation;
 
@@ -540,6 +540,8 @@ var handleNotificationMessages = function(items, callback) {
 
                     var host = determineHost(item);
 
+                    var _fns = [];
+                    
                     var deployments = item.deployments;
                     if (deployments && deployments.length > 0)
                     {
@@ -554,17 +556,77 @@ var handleNotificationMessages = function(items, callback) {
                                 "host": host,
                                 "deployment": deployment
                             };
-
-                            // broadcast event
-                            process.broadcast.publish("deployment_synced", message, function(err) {
-                                if (err) {
-                                    logInfo("published deployment_synced message. err:" + err + "\nmessage: " + JSON.stringify(message,null,2));
+                            
+                            var _fn = function(message) {
+                                return function(d) {
+                                    // broadcast event
+                                    process.broadcast.publish("deployment_synced", message, function(err) {
+                                        if (err) {
+                                            logInfo("published deployment_synced message. err:" + err + "\nmessage: " + JSON.stringify(message,null,2));
+                                        }
+                                        return done(err);
+                                    });
                                 }
-                                return done(err);
-                            });
-
+                            }(message);
+                            _fns.push(_fn);
                         }
                     }
+                    
+                    async.parallelLimit(_fns, 4, function(err) {
+                        done(err);
+                    });
+                }
+                else if (operation === "api_event")
+                {
+                    var eventType = item.type;
+                    var eventId = item.id;
+                    var objects = item.objects;
+    
+                    var host = determineHost(item);
+                    
+                    var _fns = [];
+                    if (objects && objects.length > 0)
+                    {
+                        for (var z = 0; z < objects.length; z++)
+                        {
+                            var object = objects[z];
+    
+                            var applicationId = object.applicationId;
+                            var deploymentKey = item.deploymentKey;
+                            
+                            var objectType = object.type; // sidekickMessage
+                            var objectId = object.id;
+                            var objectRef = object.ref;
+    
+                            var publishMessage = {
+                                "applicationId": applicationId,
+                                "deploymentKey": deploymentKey,
+                                "host": host,
+                                "eventType": eventType,
+                                "eventId": eventId,
+                                "objectType": objectType,
+                                "objectId": objectId,
+                                "objectRef": objectRef,
+                                "object": object.object
+                            };
+                            
+                            var _fn = function(publishMessage) {
+                                return function(d) {
+                                    // broadcast event
+                                    process.broadcast.publish("api_event", publishMessage, function(err) {
+                                        if (err) {
+                                            logInfo("published api_event message. err:" + err + "\nmessage: " + JSON.stringify(publishMessage,null,2));
+                                        }
+                                        return d(err);
+                                    });
+                                }
+                            }(publishMessage);
+                            _fns.push(_fn);
+                        }
+                    }
+                    async.parallelLimit(_fns, 4, function(err) {
+                        done(err);
+                    });
                 }
                 else
                 {

package/notifications/providers/kafka.js

@@ -0,0 +1,182 @@
+const { Kafka } = require("kafkajs");
+const util = require("../../util/util");
+
+var holder = {};
+
+module.exports = {};
+module.exports.start = function(configuration, callback)
+{
+    // clientId
+    if (!configuration.clientId)
+    {
+        if (process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_CLIENT_ID)
+        {
+            configuration.clientId = process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_CLIENT_ID;
+        }
+    }
+    if (!configuration.clientId)
+    {
+        configuration.clientId = "cloudcms-ui-kafka-notifications-client";
+    }
+
+    // topic
+    if (!configuration.topic)
+    {
+        if (process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_TOPIC)
+        {
+            configuration.topic = process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_TOPIC;
+        }
+    }
+    if (!configuration.topic)
+    {
+        configuration.topic = "cloudcms.ui.topic";
+    }
+    
+    // group
+    if (!configuration.group)
+    {
+        if (process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_GROUP)
+        {
+            configuration.group = process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_GROUP;
+        }
+    }
+    if (!configuration.group) {
+        configuration.group = "cloudcms-ui-kafka-notifications-group";
+    }
+    
+    // brokers
+    if (!configuration.brokers)
+    {
+        if (process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_BROKERS)
+        {
+            configuration.brokers = process.env.CLOUDCMS_NOTIFICATIONS_KAFKA_BROKERS;
+        }
+    }
+    
+    var clientId = configuration.clientId;
+    var brokers = configuration.brokers.split(",");
+    var topic = configuration.topic;
+    var group = configuration.group;
+
+    process.log("Connecting to kafka, client ID: " + clientId + ", brokers: " + brokers + ", topic: " + topic + ", group: " + group);
+
+    if (holder.consumer)
+    {
+        return callback();
+    }
+    
+    // console.log("a1");
+    var kafka = new Kafka({
+        clientId: clientId,
+        brokers: brokers
+    });
+    // console.log("a2: " + kafka);
+    // console.log("a3: " + kafka.consumer);
+    
+    var consumer = holder.consumer = kafka.consumer({ groupId: group });
+ 
+    // connect
+    (async function() {
+        await consumer.connect()
+    }());
+    
+    (async function() {
+        await consumer.subscribe({topic: topic, fromBeginning: true})
+    }());
+    
+    callback();
+};
+
+module.exports.process = function(callback)
+{
+    var consumer = holder.consumer;
+    if (!consumer)
+    {
+        return callback();
+    }
+    
+    (async function() {
+        await consumer.run({
+            eachMessage: async ({ topic, partition, message, heartbeat, pause }) => {
+                handleMessage(topic, partition, message, heartbeat, pause, callback);
+            }
+        });
+    }());
+};
+
+var handleMessage = function(topic, partition, messageObject, heartbeat, pause, callback)
+{
+    // console.log("Topic: " + topic);
+    // console.log("Partition: " + partition);
+    // console.log("Message: " + JSON.stringify(messageObject, null, 2));
+    
+    if (!messageObject || !messageObject.value)
+    {
+        return;
+    }
+    
+    //var key = message.key.toString();
+    var valueString = messageObject.value.toString();
+    var headers = messageObject.headers || {};
+    
+    var json = null;
+    if (valueString) {
+        json = JSON.parse("" + valueString);
+    }
+    
+    // console.log("b1: " + valueString);
+    // console.log("b2: " + data);
+    
+    if (json)
+    {
+        console.log("JSON: " + JSON.stringify(json));
+        console.log("HEADERS: " + JSON.stringify(headers));
+    
+        /**
+         * kafka1-ui-1  | VAL: {"subject":"invalidate_objects:aea334cb8accb0bd698e","message":"","data":"{\"operation\":\"invalidate_objects\",\"invalidations\":[{\"applicationId\":\"1785c4b13f74b3aa4b31\",\"ref\":\"application://826a3ebefe4c1e006a60/1785c4b13f74b3aa4b31\",\"id\":\"1785c4b13f74b3aa4b31\",\"type\":\"application\",\"stackId\":\"a17879ca0923f6d9696b\",\"stackMembers\":{\"archives\":{\"typeId\":\"vault\",\"id\":\"385e37eb07bc3d16dca1\"},\"console\":{\"typeId\":\"application\",\"id\":\"1785c4b13f74b3aa4b31\"},\"content\":{\"typeId\":\"repository\",\"id\":\"9904550a6b2a2a71f015\"},\"hosting\":{\"typeId\":\"webhost\",\"id\":\"5d2db66ced26608dc355\"},\"oneteam\":{\"typeId\":\"application\",\"id\":\"8d5ba57420ce31a3172c\"},\"principals\":{\"typeId\":\"domain\",\"id\":\"32cbffafe9f2de4d1b9a\"},\"root\":{\"typeId\":\"directory\",\"id\":\"6db38348323d001c2c10\"}}}]}"}
+         * kafka1-ui-1  | HEADERS: [object Object]
+         * @type {*[]}
+         */
+        
+        var subject = json.subject;
+        var message = json.message;
+        
+        // build out the notification message items
+        var items = [];
+    
+        if (json.data)
+        {
+            var data = JSON.parse("" + json.data);
+
+            // timestamp from headers
+            //var timestamp = parseInt(headers.timestamp);
+            var timestamp = new Date().getTime();
+        
+            // copy data as item
+            var item = util.clone(data, true);
+            if (!item)
+            {
+                item = {};
+            }
+        
+            // other properties
+            item.timestamp = timestamp;
+            item.sentTimestamp = timestamp;
+            item.subject = subject;
+        
+            // raw message
+            item.rawMessage = json.data; // string
+        
+            items.push(item);
+        
+            //console.log("ITEM: " + JSON.stringify(item));
+        }
+    }
+    
+    // call back to notifications engine to process these items
+    // when they're done processing, our callback is fired so that we can handle deletes and things
+    // we call the done() method when we're finished
+    callback(null, items, function(err, items, done) {
+        done(err, items, items);
+    });
+};

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,13 +16,13 @@
     "@socket.io/redis-adapter": "^7.2.0",
     "@socket.io/sticky": "^1.0.1",
     "accepts": "^1.3.8",
-    "agentkeepalive": "^4.2.1",
+    "agentkeepalive": "^4.5.0",
     "alpaca": "^1.5.27",
     "archiver": "^5.1.0",
     "async": "^3.2.3",
     "async-lock": "^1.3.2",
     "aws-sdk": "^2.1208.0",
-    "axios": "^0.21.0",
+    "axios": "^1.5.0",
     "basic-auth": "^2.0.1",
     "body-parser": "^1.20.0",
     "bytes": "^3.1.0",
@@ -37,22 +37,21 @@
     "dustjs-helpers": "^1.7.4",
     "dustjs-linkedin": "^3.0.1",
     "errorhandler": "^1.5.1",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "express-session": "^1.17.3",
     "express-useragent": "^1.0.15",
     "extend-with-super": "^2.0.0",
-    "finalhandler": "^1.2.0",
-    "form-data": "^2.3.3",
-    "gitana": "^1.0.323",
+    "fast-proxy": "^2.2.0",
+    "gitana": "^1.0.324",
     "handlebars": "^4.7.6",
     "hbs": "^4.1.1",
     "helmet": "^4.6.0",
-    "http2-proxy": "^5.0.53",
     "ioredis": "4.28.5",
     "json5": "^2.1.3",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.2",
+    "kafkajs": "^2.2.4",
     "klaw": "^3.0.0",
-    "lru-cache": "^6.0.0",
+    "lru-cache": "^7.14.0",
     "marked": "^4.0.14",
     "memored": "^1.1.1",
     "memorystore": "^1.6.4",

package/util/proxy-factory.js

@@ -1,15 +1,13 @@
-var http = require("http");
-var https = require("https");
+// var http = require("http");
+// var https = require("https");
 var path = require("path");
 
 var auth = require("./auth");
-var util = require("./util");
+// var util = require("./util");
 
 var oauth2 = require("./oauth2")();
 
-var urlTool = require("url");
-
-var LRUCache = require("lru-cache");
+var LRU = require("lru-cache");
 
 var exports = module.exports;
 
@@ -19,9 +17,9 @@ var _LOCK = function(lockIdentifiers, workFunction)
     process.locks.lock(name, workFunction);
 };
 
-var NAMED_PROXY_HANDLERS_CACHE = new LRUCache({
+var NAMED_PROXY_HANDLERS_CACHE = new LRU({
     max: 200,
-    maxAge: 1000 * 60 * 60 // 60 minutes
+    ttl: 1000 * 60 * 60 // 60 minutes
 });
 
 var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pathPrefix, callback)
@@ -35,36 +33,40 @@ var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pa
     {
         return callback(null, _cachedHandler);
     }
-    
-    // take out a thread lock
-    _LOCK(["acquireProxyHandler", name], function(err, releaseLockFn) {
-        
-        if (err)
-        {
-            console.log("Failed to acquire proxy handler: " + name + ", err: ", err);
-            
-            // failed to acquire lock
-            return callback(err);
-        }
-
-        // second check to make sure another thread didn't create the handler in the meantime
-        _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name];
-        if (_cachedHandler)
-        {
-            releaseLockFn();
-            return callback(null, _cachedHandler);
-        }
-
-        // create the proxy handler and cache it into LRU cache
-        //console.log("Acquiring proxy handler: " + name + ", for target: " + proxyTarget + " and prefix: " + pathPrefix);
-        _cachedHandler = createProxyHandler(proxyTarget, pathPrefix);
-    
-        // store back into LRU cache
-        NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
 
-        releaseLockFn();
-        callback(null, _cachedHandler);
-    });
+    // // take out a thread lock
+    // _LOCK(["acquireProxyHandler", name], function(err, releaseLockFn) {
+    //
+    //     if (err)
+    //     {
+    //         console.log("Failed to acquire proxy handler: " + name + ", err: ", err);
+    //
+    //         // failed to acquire lock
+    //         return callback(err);
+    //     }
+    //
+    //     // second check to make sure another thread didn't create the handler in the meantime
+    //     _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name];
+    //     if (_cachedHandler)
+    //     {
+    //         releaseLockFn();
+    //         return callback(null, _cachedHandler);
+    //     }
+    //
+    //     // create the proxy handler and cache it into LRU cache
+    //     //console.log("Acquiring proxy handler: " + name + ", for target: " + proxyTarget + " and prefix: " + pathPrefix);
+    //     _cachedHandler = createProxyHandler(proxyTarget, pathPrefix);
+    //
+    //     // store back into LRU cache
+    //     NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
+    //
+    //     releaseLockFn();
+    //     callback(null, _cachedHandler);
+    // });
+
+    _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name] = createProxyHandler(proxyTarget, pathPrefix);
+
+    callback(null, _cachedHandler);
 };
 
 
@@ -72,70 +74,106 @@ var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pa
 
 var createProxyHandler = function(proxyTarget, pathPrefix)
 {
-    const proxy = require("http2-proxy");
-    const finalhandler = require('finalhandler')
-    
-    const defaultWebHandler = function(err, req, res) {
-        if (err)
+    const { proxy, close } = require('fast-proxy')({
+        base: proxyTarget,
+        cacheURLs: 0,
+        //http2: true,
+        //undici: true
+    });
+
+    var proxyOptions = {};
+    proxyOptions.onResponse = function(req, res, stream) {
+
+        if (req.gitana_user)
         {
-            console.log("A web proxy error was caught, path: " + req.path + ", err: ", err);
-            try { res.status(500); } catch (e) { }
-            try { res.end('Something went wrong while proxying the request.'); } catch (e) { }
-        }
-    
-        finalhandler(req, res)(err);
-    };
-    
-    // const defaultWsHandler = function(err, req, socket, head) {
-    //     if (err) {
-    //         console.error('proxy error (ws)', err);
-    //         socket.destroy();
-    //     }
-    // };
-    
-    //console.log("Proxy Target: " + proxyTarget);
-    
-    var hostname = urlTool.parse(proxyTarget).hostname;
-    var port = urlTool.parse(proxyTarget).port;
-    var protocol = urlTool.parse(proxyTarget).protocol;
-    
-    // web
-    var webConfig = {};
-    webConfig.hostname = hostname;
-    webConfig.port = port;
-    webConfig.protocol = protocol;
-    //webConfig.path = null;
-    webConfig.timeout = 120000;
-    webConfig.proxyTimeout = 120000;
-    webConfig.proxyName = "Cloud CMS UI Proxy";
-    webConfig.onReq = function(req, options) {
-
-        if (!options.headers) {
-            options.headers = {};
-        }
-        var headers = options.headers;
+            var chunks = [];
+
+            // triggers on data receive
+            stream.on('data', function(chunk) {
+                console.log("DATA!");
+                // add received chunk to chunks array
+                chunks.push(chunk);
+            });
+
+            stream.on("end", function () {
+
+                if (stream.statusCode === 401)
+                {
+                    var text = "" + Buffer.concat(chunks);
+                    if (text && (text.indexOf("invalid_token") > -1) || (text.indexOf("invalid_grant") > -1))
+                    {
+                        var identifier = req.identity_properties.provider_id + "/" + req.identity_properties.user_identifier;
+
+                        _LOCK([identifier], function(err, releaseLockFn) {
+
+                            if (err)
+                            {
+                                // failed to acquire lock
+                                console.log("FAILED TO ACQUIRE LOCK", err);
+                                req.log("FAILED TO ACQUIRE LOCK", err);
+                                try { releaseLockFn(); } catch (e) { }
+                                return;
+                            }
+
+                            var cleanup = function (full)
+                            {
+                                delete Gitana.APPS[req.identity_properties.token];
+                                delete Gitana.PLATFORM_CACHE[req.identity_properties.token];
+
+                                if (full) {
+                                    auth.removeUserCacheEntry(identifier);
+                                }
+                            };
+
+                            // null out the access token
+                            // this will force the refresh token to be used to get a new one on the next request
+                            req.gitana_user.getDriver().http.refresh(function (err) {
+
+                                if (err) {
+                                    cleanup(true);
+                                    req.log("Invalidated auth state for gitana user: " + req.identity_properties.token);
+                                    return releaseLockFn();
+                                }
 
-        if (options.path && options.path.startsWith("/proxy")) {
-            options.path = options.path.substring(6);
+                                req.gitana_user.getDriver().reloadAuthInfo(function () {
+                                    cleanup(true);
+                                    req.log("Refreshed token for gitana user: " + req.identity_properties.token);
+                                    releaseLockFn();
+                                });
+                            });
+                        });
+                    }
+
+                }
+            });
         }
-    
-        if (pathPrefix) {
-            options.path = path.join(pathPrefix, options.path);
+
+        //res.setHeader('x-powered-by', 'cloudcms');
+        if (stream.statusCode && stream.headers) {
+            res.writeHead(stream.statusCode, stream.headers)
         }
-        
+
+        stream.pipe(res)
+    };
+    proxyOptions.rewriteRequestHeaders = function(req, headers)
+    {
         // used to auto-assign the client header for /oauth/token requests
         oauth2.autoProxy(req);
-    
+        if (req.headers && req.headers.authorization)
+        {
+            headers["authorization"] = req.headers.authorization;
+        }
+
         // copy domain host into "x-cloudcms-domainhost"
         if (req.domainHost) {
             headers["x-cloudcms-domainhost"] = req.domainHost; // this could be "localhost"
         }
-    
+
         // copy virtual host into "x-cloudcms-virtualhost"
         if (req.virtualHost) {
             headers["x-cloudcms-virtualhost"] = req.virtualHost; // this could be "root.cloudcms.net" or "abc.cloudcms.net"
         }
-    
+
         // copy deployment descriptor info
         if (req.descriptor)
         {
@@ -145,27 +183,27 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
                 {
                     headers["x-cloudcms-tenant-id"] = req.descriptor.tenant.id;
                 }
-            
+
                 if (req.descriptor.tenant.title)
                 {
                     headers["x-cloudcms-tenant-title"] = req.descriptor.tenant.title;
                 }
             }
-        
+
             if (req.descriptor.application)
             {
                 if (req.descriptor.application.id)
                 {
                     headers["x-cloudcms-application-id"] = req.descriptor.application.id;
                 }
-            
+
                 if (req.descriptor.application.title)
                 {
                     headers["x-cloudcms-application-title"] = req.descriptor.application.title;
                 }
             }
         }
-    
+
         // set optional "x-cloudcms-origin" header
         var cloudcmsOrigin = null;
         if (req.virtualHost)
@@ -176,13 +214,13 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
         {
             headers["x-cloudcms-origin"] = cloudcmsOrigin;
         }
-    
+
         // set x-cloudcms-server-version header
         headers["x-cloudcms-server-version"] = process.env.CLOUDCMS_APPSERVER_PACKAGE_VERSION;
-    
+
         // keep alive
         //req.headers["connection"] = "keep-alive";
-    
+
         // if the incoming request didn't have an "Authorization" header
         // and we have a logged in Gitana User via Auth, then set authorization header to Bearer Access Token
         if (!req.headers["authorization"])
@@ -196,85 +234,22 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
                 headers["authorization"] = "Bearer " + req.gitana_proxy_access_token;
             }
         }
-    };
-    webConfig.onRes = function(req, res, proxyRes) {
-    
-        if (req.gitana_user)
-        {
-            var chunks = [];
-            
-            // triggers on data receive
-            proxyRes.on('data', function(chunk) {
-                // add received chunk to chunks array
-                chunks.push(chunk);
-            });
-
-            proxyRes.on("end", function () {
-
-                if (proxyRes.statusCode === 401)
-                {
-                    var text = "" + Buffer.concat(chunks);
-                    if (text && (text.indexOf("invalid_token") > -1) || (text.indexOf("invalid_grant") > -1))
-                    {
-                        var identifier = req.identity_properties.provider_id + "/" + req.identity_properties.user_identifier;
 
-                        _LOCK([identifier], function(err, releaseLockFn) {
-
-                            if (err)
-                            {
-                                // failed to acquire lock
-                                console.log("FAILED TO ACQUIRE LOCK", err);
-                                req.log("FAILED TO ACQUIRE LOCK", err);
-                                try { releaseLockFn(); } catch (e) { }
-                                return;
-                            }
-
-                            var cleanup = function (full)
-                            {
-                                delete Gitana.APPS[req.identity_properties.token];
-                                delete Gitana.PLATFORM_CACHE[req.identity_properties.token];
-
-                                if (full) {
-                                    auth.removeUserCacheEntry(identifier);
-                                }
-                            };
-
-                            // null out the access token
-                            // this will force the refresh token to be used to get a new one on the next request
-                            req.gitana_user.getDriver().http.refresh(function (err) {
-
-                                if (err) {
-                                    cleanup(true);
-                                    req.log("Invalidated auth state for gitana user: " + req.identity_properties.token);
-                                    return releaseLockFn();
-                                }
+        return headers;
+    };
+    // rewrite response headers
+    proxyOptions.rewriteHeaders = function(headers)
+    {
+        return headers;
+    };
+    // request invoke settings
+    //proxyOptions.request = {};
 
-                                req.gitana_user.getDriver().reloadAuthInfo(function () {
-                                    cleanup(true);
-                                    req.log("Refreshed token for gitana user: " + req.identity_properties.token);
-                                    releaseLockFn();
-                                });
-                            });
-                        });
-                    }
+    //////////////////////////////////////////////////////////////////////////
 
-                }
-            });
-        }
-        
-        //res.setHeader('x-powered-by', 'cloudcms');
-        res.writeHead(proxyRes.statusCode, proxyRes.headers)
-        proxyRes.pipe(res)
-    };
-    
     var proxyRequestHandler = function(req, res) {
-        proxy.web(req, res, webConfig, function(err, req, res) {
-            defaultWebHandler(err, req, res);
-        });
+        proxy(req, res, pathPrefix, proxyOptions);
     };
-    
-    // cookie domain rewrite?
-    // not needed - this is handled intrinsically by http2-proxy
 
     return proxyRequestHandler;
 };

package/.last_command

@@ -1,7 +0,0 @@
-{
-  "command": {
-    "group": "server",
-    "name": "start"
-  },
-  "arguments": {}
-}