zcatalyst-cli 1.12.0 → 1.13.1

package/lib/pull/index.js

@@ -31,17 +31,17 @@ function pull() {
                 errorId: 'PULL-1',
                 arg: [
                     ansi_colors_1.bold.red(feature),
-                    ansi_colors_1.bold(Object.keys(features_1.default)
+                    (0, ansi_colors_1.bold)(Object.keys(features_1.default)
                         .map((feat) => '* ' + feat)
                         .join('\n'))
                 ]
             });
         }
         const MODULE = features_1.default[feature];
-        logger_1.info(ansi_colors_1.bold('\n' + ansi_colors_1.white('===> ') + js_1.JS.capitalize(feature) + ' Setup'));
+        (0, logger_1.info)((0, ansi_colors_1.bold)('\n' + (0, ansi_colors_1.white)('===> ') + js_1.JS.capitalize(feature) + ' Setup'));
         yield MODULE().catch((err) => {
-            logger_1.info();
-            logger_1.warning(`Skipping pull of ${feature}. Since ${err.message}.\nContact Catalyst Support with catalyst-debug.log file.`);
+            (0, logger_1.info)();
+            (0, logger_1.warning)(`Skipping pull of ${feature}. Since ${err.message}.\nContact Catalyst Support with catalyst-debug.log file.`);
         });
         if (runtime_store_1.default.get('payload.' + feature, false)) {
             runtime_store_1.default.set('payload.features', runtime_store_1.default.get('payload.features', []).concat(feature));

package/lib/repl-server.js

@@ -9,7 +9,7 @@ const error_1 = __importDefault(require("./error"));
 const stdin = process.stdin;
 const ASCII_ETX_CODE = 0x03;
 class Repl {
-    constructor({ prompt = '>', writer = (output) => util_1.inspect(output), useColors = true, ignoreUndefined = false } = {}) {
+    constructor({ prompt = '>', writer = (output) => (0, util_1.inspect)(output), useColors = true, ignoreUndefined = false } = {}) {
         this.prompt = prompt;
         this.writer = writer;
         this.useColors = useColors;
@@ -21,7 +21,7 @@ class Repl {
         this.pureEmit = stdin.emit;
     }
     start() {
-        this.server = repl_1.start({
+        this.server = (0, repl_1.start)({
             prompt: this.prompt,
             writer: this.writer,
             useColors: this.useColors,

package/lib/serve/features/apig.js

@@ -14,7 +14,7 @@ const config_1 = require("../../util_modules/config");
 const logger_1 = require("../../util_modules/logger");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (!config_1.apigConfig.enabled()) {
-        logger_1.info('Skipping API Gateway rules');
+        (0, logger_1.info)('Skipping API Gateway rules');
         return;
     }
     apig_utils_1.apigUtils.executeHook({ prefix: 'pre', command: 'serve' });

package/lib/serve/features/index.js

@@ -1,7 +1,11 @@
 'use strict';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -45,9 +49,9 @@ function client() {
         }
         catch (e) {
             const err = error_1.default.getErrorInstance(e);
-            logger_1.info();
-            logger_1.warning('Skipping the serve of Client because of the error: ' + err.message);
-            logger_1.info();
+            (0, logger_1.info)();
+            (0, logger_1.warning)('Skipping the serve of Client because of the error: ' + err.message);
+            (0, logger_1.info)();
             return;
         }
         const clientName = runtime_store_1.default.get('context.client.name');

package/lib/serve/index.js

@@ -1,7 +1,11 @@
 'use strict';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -48,19 +52,19 @@ const server_1 = __importDefault(require("./server"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const serveTargets = runtime_store_1.default.get('context.targets', []);
     const advancedServer = new server_1.default();
-    const basicFnServer = new http_functions_1.default();
+    const basicFnServer = new http_functions_1.default({ primary: false });
     try {
         const masterPort = yield port_resolver_1.default.getPort('master', 'http', 'master', false);
         runtime_store_1.default.set('context.port.http.master', masterPort);
         yield Promise.all(serveTargets.map((target) => features[target]()));
         const rawTargets = runtime_store_1.default.get('context.functions.targets', []);
-        const watchOpt = option_1.getOptionValue('watch', false);
+        const watchOpt = (0, option_1.getOptionValue)('watch', false);
         if (watchOpt) {
-            yield Promise.all(rawTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () { return (target.valid ? fn_watcher_1.default(target) : undefined); })));
+            yield Promise.all(rawTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () { return (target.valid ? (0, fn_watcher_1.default)(target) : undefined); })));
         }
         const funtionTargets = rawTargets.filter((target) => {
             if (!target.valid) {
-                logger_1.warning('skipping serve of function [' +
+                (0, logger_1.warning)('skipping serve of function [' +
                     target.name +
                     '] since ' +
                     target.failure_reason);
@@ -75,7 +79,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             const client = runtime_store_1.default.get('context.client', false);
             if (client && client.valid) {
                 client.opts = {
-                    open: option_1.getOptionValue('open', false),
+                    open: (0, option_1.getOptionValue)('open', false),
                     watch: watchOpt
                 };
                 advancedServer.add('client', client);
@@ -85,7 +89,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             }
         }
         if (serveTargets.includes('functions') && funtionTargets.length === 0) {
-            logger_1.labeled('functions', 'No targets are ready to be served in local').WARN();
+            (0, logger_1.labeled)('functions', 'No targets are ready to be served in local').WARN();
             serveTargets.splice(serveTargets.indexOf('functions'), 1);
             runtime_store_1.default.set('context.targets', serveTargets);
         }
@@ -105,7 +109,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         yield advancedServer.start();
         yield advancedServer.wait();
         yield Promise.all([
-            fs_1.ASYNC.deleteDir(path_1.join(runtime_store_1.default.get('cwd'), '.build')).catch(),
+            fs_1.ASYNC.deleteDir((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch(),
             advancedServer ? advancedServer.stop() : undefined,
             basicFnServer ? basicFnServer.stop() : undefined
         ]);
@@ -121,12 +125,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 command: 'serve'
             });
         }
-        logger_1.info();
-        logger_1.success('Shutdown complete');
+        (0, logger_1.info)();
+        (0, logger_1.success)('Shutdown complete');
     }
     catch (e) {
         yield Promise.all([
-            fs_1.ASYNC.deleteDir(path_1.join(runtime_store_1.default.get('cwd'), '.build')).catch(),
+            fs_1.ASYNC.deleteDir((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch(),
             advancedServer ? advancedServer.stop() : undefined,
             basicFnServer ? basicFnServer.stop() : undefined
         ]);

package/lib/serve/server/index.js

@@ -1,7 +1,11 @@
 'use strict';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -62,7 +66,7 @@ class Server {
     _addBasicFnDetails() {
         const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
         if (fnTargets.length === 0) {
-            logger_1.debug('No basic functions to add');
+            (0, logger_1.debug)('No basic functions to add');
         }
         const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
         const debugPort = parseInt(runtime_store_1.default.get('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], '-1'), 10);
@@ -83,45 +87,47 @@ class Server {
     _spinUpJavaServer(details, masterPort) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const javaServer = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'aioserver', 'JavaaioServer');
-            const targetDir = path_1.join(runtime_store_1.default.get('cwd'), '.build', (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
+            const javaServer = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'aioserver', 'JavaaioServer');
+            const targetDir = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
             const label = `${details.type}[${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}]`;
-            fn_utils_1.fnUtils.java.ensureJavaInvoker(javaServer, path_1.normalize(path_1.join(__dirname, './lib', 'java', 'JavaaioServer.java')));
-            const serverFiles = yield fs_1.ASYNC.walk(path_1.dirname(javaServer));
+            fn_utils_1.fnUtils.java.ensureJavaInvoker(javaServer, (0, path_1.normalize)((0, path_1.join)(__dirname, './lib', 'java', 'JavaaioServer.java')));
+            const serverFiles = yield fs_1.ASYNC.walk((0, path_1.dirname)(javaServer));
             yield Promise.all(serverFiles.map((file) => __awaiter(this, void 0, void 0, function* () {
-                return fs_1.ASYNC.copyFile(file, path_1.join(targetDir, path_1.relative(path_1.dirname(javaServer), file.replace('lib' + path_1.sep, ''))));
+                return fs_1.ASYNC.copyFile(file, (0, path_1.join)(targetDir, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.replace('lib' + path_1.sep, ''))));
             })));
             const opts = [
                 '-cp',
-                path_1.join(targetDir, '*') + fn_utils_1.fnUtils.java.classPathSep + targetDir + path_1.sep,
+                (0, path_1.join)(targetDir, '*') + fn_utils_1.fnUtils.java.classPathSep + targetDir + path_1.sep,
                 '-DCATALYST_FUNCTION_TYPE=applogic'
             ];
             if (details.debugPort !== -1) {
-                logger_1.labeled(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
+                (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
                 opts.push('-Xdebug');
                 opts.push('-Xrunjdwp:transport=dt_socket,address=' + details.debugPort + ',server=y,suspend=y');
             }
-            opts.push(path_1.basename(javaServer));
+            opts.push((0, path_1.basename)(javaServer));
             opts.push(details.httpPort + '');
             const targetSource = (_c = details.target) === null || _c === void 0 ? void 0 : _c.source;
             const configType = details.type === 'server' ? 'functions' : details.type;
-            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource).catch((err) => logger_1.debug(err));
+            const servePlugin = yield (0, plugin_loader_1.default)(configType, 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
             if (typeof servePlugin === 'function') {
                 const event = servePlugin(details, masterPort);
-                logger_1.labeled(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
+                (0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
                 return event;
             }
-            const child = shell_1.spawn('java', opts, {
+            const child = (0, shell_1.spawn)('java', opts, {
                 cwd: targetSource,
                 stdio: 'pipe',
                 env: {
                     X_ZOHO_CATALYST_IS_LOCAL: 'true',
+                    X_ZOHO_CATALYST_FUNCTION_LOADED: 'true',
+                    X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep,
                     X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth,
                     X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin
                 }
             }).RAW();
-            logger_1.labeled(label, `URL : http://localhost:${masterPort}/server/${(_d = details.target) === null || _d === void 0 ? void 0 : _d.name}/`).MESSAGE();
-            logger_1.info();
+            (0, logger_1.labeled)(label, `URL : http://localhost:${masterPort}/server/${(_d = details.target) === null || _d === void 0 ? void 0 : _d.name}/`).MESSAGE();
+            (0, logger_1.info)();
             return child;
         });
     }
@@ -131,17 +137,17 @@ class Server {
             const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
             const _d = details.target, { ['watcher']: _ } = _d, serialisableTarget = __rest(_d, ['watcher']);
             const opts = [
-                path_1.join(__dirname, 'lib', 'node.js'),
+                (0, path_1.join)(__dirname, 'lib', 'node.js'),
                 details.httpPort + '',
                 JSON.stringify(serialisableTarget)
             ];
             if (details.debugPort !== -1) {
-                logger_1.labeled(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
+                (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
                 opts.unshift('--inspect=' + details.debugPort);
             }
             const targetSource = (_b = details.target) === null || _b === void 0 ? void 0 : _b.source;
             const configType = details.type === 'server' ? 'functions' : details.type;
-            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource).catch((err) => logger_1.debug(err));
+            const servePlugin = yield (0, plugin_loader_1.default)(configType, 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
             if (typeof servePlugin === 'function') {
                 const event = servePlugin(details, masterPort).catch((e) => {
                     var _a, _b;
@@ -152,28 +158,29 @@ class Server {
                     err.errorId = 'SERVE-IDX-1';
                     err.arg = [
                         configType,
-                        ansi_colors_1.bold(((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.start)[targetSource] || 'start'),
-                        ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(err.message)
+                        (0, ansi_colors_1.bold)(((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.start)[targetSource] || 'start'),
+                        (0, ansi_colors_1.bold)('Error: ') + ansi_colors_1.italic.red(err.message)
                     ];
                     throw err;
                 });
-                logger_1.labeled(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
+                (0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
                 return event;
             }
             if (details.type === 'client') {
                 return yield (yield Promise.resolve().then(() => __importStar(require('./lib/web_client/index.js')))).default(details, masterPort);
             }
-            const child = shell_1.spawn('node', opts, {
+            const child = (0, shell_1.spawn)('node', opts, {
                 cwd: targetSource,
                 stdio: 'pipe',
                 env: {
                     X_ZOHO_CATALYST_IS_LOCAL: 'true',
+                    X_ZOHO_CATALYST_FUNCTION_LOADED: 'true',
                     X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth,
                     X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin
                 }
             }).RAW();
-            logger_1.labeled(label, `URL : http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`).MESSAGE();
-            logger_1.info();
+            (0, logger_1.labeled)(label, `URL : http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`).MESSAGE();
+            (0, logger_1.info)();
             return child;
         });
     }
@@ -228,7 +235,7 @@ class Server {
                     exit: 2
                 });
             }
-            const server = yield master_1.default(masterPort, this.targetDetailsArr);
+            const server = yield (0, master_1.default)(masterPort, this.targetDetailsArr);
             this.masterServer = server;
             return new Promise((res) => {
                 server.on('listening', () => {
@@ -249,7 +256,7 @@ class Server {
     wait() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.masterServer) {
-                logger_1.debug('Master server is not started yet.');
+                (0, logger_1.debug)('Master server is not started yet.');
                 throw new error_1.default('Server cannot be put to wait state.', { exit: 2 });
             }
             this.targetDetailsArr.forEach((targetdetails) => {
@@ -263,7 +270,7 @@ class Server {
                 }));
                 (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => __awaiter(this, void 0, void 0, function* () {
                     yield this.restart(target);
-                    logger_1.labeled(`server[${target.name}]`, 'ready!').MESSAGE();
+                    (0, logger_1.labeled)(`server[${target.name}]`, 'ready!').MESSAGE();
                     setTimeout(() => {
                         var _a;
                         (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');

package/lib/serve/server/lib/java/JavaaioServer.java

@@ -4,6 +4,7 @@ import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 import com.cop.main.server.DefaultCoreServer;
 
@@ -21,7 +22,7 @@ public class JavaaioServer extends DefaultCoreServer {
 				if (record.getThrown() != null) {
 					exceptionMessage = getStackTraceAsString(record.getThrown());
 				}
-				String message = record.getMessage() + " " + exceptionMessage;
+				String message = new SimpleFormatter().format(record) + " " + exceptionMessage;
 				if (message.length() > MESSAGE_LENGTH) {
 					message = message.substring(0, MESSAGE_LENGTH);
 				}
@@ -67,11 +68,12 @@ public class JavaaioServer extends DefaultCoreServer {
 			LogManager manager = LogManager.getLogManager();
 			manager.reset();
 			Logger rootLogger = manager.getLogger("");
-			LogHandler handler = new JavaaioServer().new LogHandler();
+			JavaaioServer aioServer = new JavaaioServer();
+			LogHandler handler = aioServer.new LogHandler();
 			rootLogger.addHandler(handler);
 
 			port = Integer.parseInt(args[0]);
-			new JavaaioServer().start();
+			aioServer.start();
 		}
 		catch (Exception e) {
 			System.out.println(getStackTraceAsString(e));

package/lib/serve/server/lib/master.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
-const http_proxy_1 = require("http-proxy");
+const http_1 = require("http");
 const error_1 = __importDefault(require("../../../error"));
 const apig_matcher_1 = __importDefault(require("../../../express_middlewares/apig-matcher"));
 const auth_checker_1 = __importDefault(require("../../../express_middlewares/auth-checker"));
@@ -30,6 +30,8 @@ const js_1 = require("../../../util_modules/js");
 const logger_2 = require("../../../util_modules/logger");
 const project_2 = require("../../../util_modules/project");
 const option_1 = require("../../../util_modules/option");
+const server_js_1 = require("../../../util_modules/server.js");
+const http_proxy_1 = require("http-proxy");
 const removeSecure = (str) => str.replace(/;\s?Secure/i, '').replace(/;\s?SameSite=None/i, '');
 const redirectByAuth = (req, res, redirectUrl) => {
     if (req.headers['x-zc-user-cred-token'] === undefined) {
@@ -85,21 +87,20 @@ const proxyResponseHandler = (systemRoutes) => (proxyRes, req, res) => {
 function spinUpMaster(listenPort, otherServerDetails) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectDetails = {
-            id: project_2.getProjectId(),
-            domain_prefix: project_2.getDomainPrefix(),
+            id: (0, project_2.getProjectId)(),
+            domain_prefix: (0, project_2.getDomainPrefix)(),
             domain: constants_1.ORIGIN.app.replace('https://', ''),
-            key: project_2.getDomainKey(),
-            env_name: project_2.getEnvName()
+            key: (0, project_2.getDomainKey)(),
+            env_name: (0, project_2.getEnvName)()
         };
         const rules = runtime_store_1.default.get('context.apig.local.config', -1);
-        const customProxyUrl = option_1.getOptionValue('proxy');
-        const app = express_1.default();
-        const connections = {};
+        const customProxyUrl = (0, option_1.getOptionValue)('proxy');
+        const app = (0, express_1.default)();
         let systemRoutes;
         app.use(logger_1.default);
         app.use(cookie_parser_1.default);
+        app.use((0, project_1.default)(projectDetails));
         app.use(authenticator_1.default);
-        app.use(project_1.default(projectDetails));
         if (rules !== -1) {
             for (const [sourceURL, methodByConfig] of Object.entries(rules)) {
                 const router = app.route(sourceURL);
@@ -121,23 +122,27 @@ function spinUpMaster(listenPort, otherServerDetails) {
             }
             app.use('/', apig_matcher_1.default, auth_checker_1.default, url_rewriter_1.default);
         }
-        const proxy = http_proxy_1.createProxyServer()
+        const proxy = (0, http_proxy_1.createProxyServer)()
             .on('error', (err, req, res) => {
-            res.writeHead(503, { 'Content-Type': 'json' });
-            res.write(JSON.stringify({ error: 'unable to proxy request' }));
-            res.end();
+            if (res instanceof http_1.ServerResponse) {
+                res.writeHead(502, { 'Content-Type': 'json' });
+            }
+            res.end(JSON.stringify({ error: 'unable to proxy request' }));
             console.log('unable to proxy request ', req.url);
             console.error(err);
         })
-            .on('proxyRes', proxyResponseHandler(systemRoutes))
-            .on('proxyReq', (proxyReq) => {
-            const id = js_1.JS.randomNumber(4) + '';
-            connections[id] = proxyReq;
-            proxyReq.on('finish', () => {
-                delete connections[id];
-            });
+            .on('econnreset', (err, req, res, targetUrl) => {
+            if (res instanceof http_1.ServerResponse) {
+                res.writeHead(502, { 'Content-Type': 'json' });
+            }
+            res.end(JSON.stringify({ error: 'unable to proxy request. ECONNRESET.' }));
+            console.log('Connection reset while trying to proxy ', req.url);
+            (0, logger_2.debug)('Connection reset from target URL : ', targetUrl);
+            console.error(err);
         })
-            .on('close', () => logger_2.debug('proxy closed'));
+            .on('proxyRes', proxyResponseHandler(systemRoutes))
+            .on('close', () => (0, logger_2.debug)('proxy closed'));
+        const proxyDestroyer = new server_js_1.ConnectionDestroyer(proxy);
         otherServerDetails.forEach((serverDetail) => {
             var _a, _b, _c, _d, _e, _f;
             switch (serverDetail.type) {
@@ -218,29 +223,21 @@ function spinUpMaster(listenPort, otherServerDetails) {
                     });
             }
         });
-        app.use('/', unknownReqProxy_1.default(proxy, customProxyUrl));
+        app.use('/', (0, unknownReqProxy_1.default)(proxy, customProxyUrl));
         app.use(error_handler_1.default);
         const expressServer = app.listen(listenPort).on('error', (err) => {
             if (proxy) {
-                proxy.close();
+                proxyDestroyer.destroy();
             }
             console.error(err);
         });
+        const expressDestroyer = new server_js_1.ConnectionDestroyer(expressServer);
         expressServer.maxConnections = 100;
-        process.on('SIGINT', () => Object.keys(connections).forEach((connectionId) => {
-            connections[connectionId].destroy();
+        process.on('SIGINT', () => expressDestroyer.destroy(false));
+        expressServer.on('close', () => __awaiter(this, void 0, void 0, function* () {
+            (0, logger_2.info)('Shutting down server');
+            yield proxyDestroyer.destroy().catch((err) => (0, logger_2.debug)(err));
         }));
-        expressServer.on('connection', (socket) => {
-            const id = js_1.JS.randomNumber(4) + '';
-            connections[id] = socket;
-            socket.on('close', () => {
-                delete connections[id];
-            });
-        });
-        expressServer.on('close', () => {
-            logger_2.info('Shutting down server');
-            proxy.close();
-        });
         expressServer.on('upgrade', (...upgradeParam) => {
             app.emit('upgrade', ...upgradeParam);
         });

package/lib/serve/server/lib/node.js

@@ -1,7 +1,11 @@
 'use strict';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -36,7 +40,7 @@ const util_1 = require("util");
 const args = process.argv.slice(2);
 const listenPort = parseInt(args[0], 10);
 const fnDetails = JSON.parse(args[1]);
-const app = express_1.default();
+const app = (0, express_1.default)();
 const targetName = fnDetails.name;
 const index = fnDetails.index;
 app.use('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -47,7 +51,7 @@ app.use('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         (yield Promise.resolve().then(() => __importStar(require(index)))).default(req, res);
     }
     catch (e) {
-        const errorString = util_1.inspect(e);
+        const errorString = (0, util_1.inspect)(e);
         console.error('[' + targetName + '] ' + errorString);
         res.writeHead(500);
         res.end(errorString);

package/lib/serve/server/lib/web_client/index.js

@@ -18,13 +18,13 @@ const server_js_1 = __importDefault(require("./server.js"));
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const target = details.target;
-    const clientListner = yield server_js_1.default(details.httpPort, target.source, target.homepage, ((_a = target.opts) === null || _a === void 0 ? void 0 : _a.watch) || false);
+    const clientListner = yield (0, server_js_1.default)(details.httpPort, target.source, target.homepage, ((_a = target.opts) === null || _a === void 0 ? void 0 : _a.watch) || false);
     clientListner.addListener('start', () => {
         var _a, _b;
         const appUrl = 'http://localhost:' + masterPort;
         const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
-        logger_1.labeled(label, `URL : ${appUrl}/app/`).MESSAGE();
-        ((_b = details.target.opts) === null || _b === void 0 ? void 0 : _b.open) && open_1.default(appUrl).catch();
+        (0, logger_1.labeled)(label, `URL : ${appUrl}/app/`).MESSAGE();
+        ((_b = details.target.opts) === null || _b === void 0 ? void 0 : _b.open) && (0, open_1.default)(appUrl).catch();
     });
     return clientListner;
 });