zcatalyst-cli 1.10.1 → 1.12.1

package/lib/optional-import.js

@@ -31,34 +31,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
 const app_module_path_1 = __importDefault(require("app-module-path"));
-const logger_1 = require("./util_modules/logger");
-const project_1 = require("./util_modules/project");
-const global_dirs_1 = __importDefault(require("global-dirs"));
-exports.default = (name) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        if (name.startsWith('./')) {
-            const projectModulePath = project_1.resolveProjectPath(name);
-            app_module_path_1.default.addPath(projectModulePath);
-            return Promise.resolve().then(() => __importStar(require(projectModulePath)));
-        }
-        else {
-            for (const manager of ['npm', 'yarn']) {
-                try {
-                    const packageName = path_1.default.join(global_dirs_1.default[manager].packages, name);
-                    app_module_path_1.default.addPath(packageName);
-                    return Promise.resolve().then(() => __importStar(require(packageName)));
-                }
-                catch (e) {
-                    logger_1.debug(e);
-                }
-            }
-            return;
+const project_js_1 = require("./util_modules/project.js");
+const path_1 = require("path");
+const async_js_1 = require("./util_modules/fs/lib/async.js");
+const error_js_1 = __importDefault(require("./error.js"));
+const ansi_colors_1 = require("ansi-colors");
+exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function* () {
+    if (name === path_1.basename(name)) {
+        const projectModulePath = project_js_1.resolveProjectPath(path_1.join(source, 'node_modules', name));
+        const projectModulePathExists = yield async_js_1.dirExists(projectModulePath);
+        if (!projectModulePathExists) {
+            throw new error_js_1.default('Module path does not exists', {
+                errorId: 'OPT-IMP-1',
+                arg: [ansi_colors_1.bold(name), ansi_colors_1.italic.red(projectModulePath), ansi_colors_1.bold(source)],
+                exit: 1
+            });
         }
+        app_module_path_1.default.addPath(projectModulePath);
+        return Promise.resolve().then(() => __importStar(require(projectModulePath)));
     }
-    catch (err) {
-        logger_1.debug(err);
-        return;
+    const projectModulePath = project_js_1.resolveProjectPath(name);
+    const projectModulePathExists = yield async_js_1.dirExists(projectModulePath);
+    if (!projectModulePathExists) {
+        throw new error_js_1.default('Module path does not exists', {
+            errorId: 'OPT-IMP-2',
+            arg: [ansi_colors_1.bold(name), ansi_colors_1.italic.red(projectModulePath), ansi_colors_1.bold(source)],
+            exit: 1
+        });
     }
+    app_module_path_1.default.addPath(projectModulePath);
+    return Promise.resolve().then(() => __importStar(require(projectModulePath)));
 });

package/lib/plugin-loader.js

@@ -31,17 +31,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const optional_import_1 = __importDefault(require("./optional-import"));
-const runtime_store_1 = __importDefault(require("./runtime-store"));
-const config = __importStar(require("./util_modules/config"));
+const ansi_colors_1 = require("ansi-colors");
+const error_js_1 = __importDefault(require("./error.js"));
+const optional_import_js_1 = __importDefault(require("./optional-import.js"));
+const runtime_store_js_1 = __importDefault(require("./runtime-store.js"));
+const ClientConfig = __importStar(require("./util_modules/config/lib/client.js"));
+const FunctionsConfig = __importStar(require("./util_modules/config/lib/functions.js"));
+const config = {
+    client: {
+        plugin: ClientConfig.plugin,
+        source: ClientConfig.source
+    },
+    functions: {
+        plugin: FunctionsConfig.plugin,
+        source: FunctionsConfig.source
+    }
+};
 const loadedPlugins = {};
 function pluginLoader(feature, name, source) {
     return __awaiter(this, void 0, void 0, function* () {
-        const configModule = config[(feature + 'Config')];
-        if (configModule === undefined) {
+        const pluginConfig = config[feature];
+        if (pluginConfig === undefined) {
             return;
         }
-        const plugins = configModule.plugin(name, source);
+        const plugins = pluginConfig.plugin(name, source);
         let specificPlugin;
         if (typeof plugins === 'string') {
             specificPlugin = plugins;
@@ -57,18 +70,22 @@ function pluginLoader(feature, name, source) {
             pluginMod = loadedPlugins[specificPlugin];
         }
         else {
-            pluginMod = (yield optional_import_1.default(specificPlugin));
+            pluginMod = yield optional_import_js_1.default(specificPlugin, pluginConfig.source());
         }
         if (pluginMod === undefined) {
-            return;
+            throw new error_js_1.default(`Configured plugin could not be found for [${feature}:${name}] - ${specificPlugin}`, {
+                exit: 1,
+                errorId: 'PLG-LDR-1',
+                arg: [ansi_colors_1.italic.red(specificPlugin), ansi_colors_1.bold(name), ansi_colors_1.bold(feature)]
+            });
         }
         loadedPlugins[specificPlugin] = pluginMod;
         if (typeof pluginMod === 'function') {
-            runtime_store_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
+            runtime_store_js_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
             return pluginMod;
         }
         else if (typeof pluginMod[name] === 'function') {
-            runtime_store_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
+            runtime_store_js_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
             return pluginMod[name];
         }
         return;

package/lib/port-resolver.js

@@ -70,7 +70,8 @@ class PortResolver {
                 if (searchSpan === 0) {
                     const err = error_1.default.getErrorInstance(e, {
                         message: `Provided port '${port}' is not available`,
-                        skipHelp: false
+                        skipHelp: false,
+                        fileName: __filename
                     });
                     err.errorId = 'PORT-RESOLVER-1';
                     err.arg = [
@@ -84,7 +85,8 @@ class PortResolver {
                 }
                 const cerr = error_1.default.getErrorInstance(e, {
                     message: `No ports from '${port}' to ${port + searchSpan} is free to use as a ${type} port.`,
-                    skipHelp: false
+                    skipHelp: false,
+                    fileName: __filename
                 });
                 cerr.errorId = 'PORT-RESOLVER-2';
                 cerr.arg = [ansi_colors_1.bold(port + ''), ansi_colors_1.bold(port + searchSpan + ''), ansi_colors_1.bold('--' + type)];

package/lib/prompt/index.js

@@ -63,7 +63,7 @@ exports.default = {
                 throw new error_1.default('No such type registered', { exit: 2 });
         }
     }),
-    seperator: (line) => {
+    separator: (line) => {
         return new inquirer_1.default.Separator(line);
     },
     choice,

package/lib/pull/features/functions/index.js

@@ -57,7 +57,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         return accumulator;
     }, {});
     const choicesArr = js_1.JS.transform(choicesObj, (result, value, key) => {
-        result.push(prompt_1.default.seperator('----' + key + '----'));
+        result.push(prompt_1.default.separator('----' + key + '----'));
         result.push(...value);
         return result;
     }, []);

package/lib/serve/index.js

@@ -54,7 +54,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         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', []);
-        if (option_1.getOptionValue('watch', false)) {
+        const watchOpt = 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); })));
         }
         const funtionTargets = rawTargets.filter((target) => {
@@ -73,6 +74,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         if (serveTargets.includes('client')) {
             const client = runtime_store_1.default.get('context.client', false);
             if (client && client.valid) {
+                client.opts = {
+                    open: option_1.getOptionValue('open', false),
+                    watch: watchOpt
+                };
                 advancedServer.add('client', client);
             }
             else {

package/lib/serve/server/index.js

@@ -1,4 +1,23 @@
 '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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,6 +54,7 @@ const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const shell_1 = require("../../util_modules/shell");
 const master_1 = __importDefault(require("./lib/master"));
+const ansi_colors_1 = require("ansi-colors");
 class Server {
     constructor() {
         this.targetDetailsArr = [];
@@ -85,8 +105,8 @@ class Server {
             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);
-            if (servePlugin !== undefined) {
+            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource).catch((err) => 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();
                 return event;
@@ -111,7 +131,7 @@ 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', details.type === 'client' ? 'client.js' : 'node.js'),
+                path_1.join(__dirname, 'lib', 'node.js'),
                 details.httpPort + '',
                 JSON.stringify(serialisableTarget)
             ];
@@ -121,12 +141,28 @@ class Server {
             }
             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);
-            if (servePlugin !== undefined) {
-                const event = servePlugin(details, masterPort);
+            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource).catch((err) => logger_1.debug(err));
+            if (typeof servePlugin === 'function') {
+                const event = servePlugin(details, masterPort).catch((e) => {
+                    var _a, _b;
+                    const err = error_1.default.getErrorInstance(e, {
+                        fileName: __filename,
+                        skipHelp: false
+                    });
+                    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)
+                    ];
+                    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();
                 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, {
                 cwd: targetSource,
                 stdio: 'pipe',
@@ -136,7 +172,7 @@ class Server {
                     X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin
                 }
             }).RAW();
-            logger_1.labeled(label, `URL : http://localhost:${masterPort}/${details.type === 'client' ? 'app/' : 'server/' + ((_c = details.target) === null || _c === void 0 ? void 0 : _c.name) + '/'}`).MESSAGE();
+            logger_1.labeled(label, `URL : http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`).MESSAGE();
             logger_1.info();
             return child;
         });
@@ -196,7 +232,15 @@ class Server {
             this.masterServer = server;
             return new Promise((res) => {
                 server.on('listening', () => {
-                    this.targetDetailsArr.forEach((targetDetails) => { var _a; return (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start'); });
+                    this.targetDetailsArr.forEach((targetDetails) => {
+                        var _a;
+                        if (targetDetails.process &&
+                            'send' in targetDetails.process) {
+                            targetDetails.process.send('start');
+                            return;
+                        }
+                        (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start');
+                    });
                     res();
                 });
             });

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

@@ -67,11 +67,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,6 @@ 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 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 +29,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) {
@@ -94,7 +95,6 @@ function spinUpMaster(listenPort, otherServerDetails) {
         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 = {};
         let systemRoutes;
         app.use(logger_1.default);
         app.use(cookie_parser_1.default);
@@ -122,26 +122,30 @@ function spinUpMaster(listenPort, otherServerDetails) {
             app.use('/', apig_matcher_1.default, auth_checker_1.default, url_rewriter_1.default);
         }
         const proxy = http_proxy_1.createProxyServer()
-            .on('error', (err, req) => {
+            .on('error', (err, req, res) => {
+            res.writeHead(503, { 'Content-Type': 'json' });
+            res.write(JSON.stringify({ error: 'unable to proxy request' }));
+            res.end();
             console.log('unable to proxy request ', req.url);
             console.error(err);
         })
-            .on('proxyRes', proxyResponseHandler(systemRoutes));
+            .on('proxyRes', proxyResponseHandler(systemRoutes))
+            .on('close', () => 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) {
                 case 'client':
                     const appTarget = `http://127.0.0.1:${serverDetail.httpPort}/app/`;
                     app.use('/app', (req, res) => {
-                        var _a;
-                        if (req.url.startsWith('/local-redirect') &&
-                            ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.login_redirect)) {
-                            const isUrl = serverDetail.target.login_redirect.startsWith('/');
+                        const target = serverDetail.target;
+                        if (req.url.startsWith('/local-redirect') && target.login_redirect) {
+                            const isUrl = target.login_redirect.startsWith('/');
                             if (isUrl) {
-                                res.redirect(serverDetail.target.login_redirect);
+                                res.redirect(target.login_redirect);
                             }
                             else {
-                                res.redirect('/app/' + serverDetail.target.login_redirect);
+                                res.redirect('/app/' + target.login_redirect);
                             }
                         }
                         else {
@@ -192,7 +196,8 @@ function spinUpMaster(listenPort, otherServerDetails) {
                                 ws: true
                             });
                         });
-                        app.use('/baas/v1/project/:projectId/function/' + ((_f = serverDetail.target) === null || _f === void 0 ? void 0 : _f.id), (req, res) => {
+                        app.use('/baas/v1/project/:projectId/function/' +
+                            ((_f = serverDetail.target) === null || _f === void 0 ? void 0 : _f.id), (req, res) => {
                             var _a;
                             proxy.web(req, res, {
                                 target: `http://127.0.0.1:${serverDetail.httpPort}/server/${(_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.id}`,
@@ -211,24 +216,17 @@ function spinUpMaster(listenPort, otherServerDetails) {
         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.once('SIGINT', () => Object.keys(connections).forEach((sokcetId) => { var _a; return (_a = connections[sokcetId]) === null || _a === void 0 ? void 0 : _a.destroy(); }));
-        expressServer.on('connection', (socket) => {
-            const offset = Math.floor(Math.random() * 10);
-            const id = Date.now() + offset + '';
-            connections[id] = socket;
-            socket.on('close', () => {
-                delete connections[id];
-            });
-        });
-        expressServer.on('close', () => {
+        process.on('SIGINT', () => expressDestroyer.destroy(false));
+        expressServer.on('close', () => __awaiter(this, void 0, void 0, function* () {
             logger_2.info('Shutting down server');
-            proxy.close();
-        });
+            yield proxyDestroyer.destroy().catch((err) => logger_2.debug(err));
+        }));
         expressServer.on('upgrade', (...upgradeParam) => {
             app.emit('upgrade', ...upgradeParam);
         });

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

@@ -0,0 +1,30 @@
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const open_1 = __importDefault(require("open"));
+const logger_1 = require("../../../../util_modules/logger");
+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);
+    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();
+    });
+    return clientListner;
+});

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

@@ -0,0 +1,174 @@
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const events_1 = require("events");
+const chokidar_1 = require("chokidar");
+const logger_js_1 = require("../../../../util_modules/logger.js");
+const index_js_1 = require("../../../../util_modules/constants/index.js");
+const error_js_1 = __importDefault(require("../../../../error.js"));
+const index_js_2 = require("../../../../util_modules/fs/index.js");
+const path_1 = require("path");
+const ws_1 = require("ws");
+const port_resolver_js_1 = __importDefault(require("../../../../port-resolver.js"));
+const ansi_colors_1 = require("ansi-colors");
+const server_js_1 = require("../../../../util_modules/server.js");
+function prepareScriptFile(dir, port) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const scriptFile = yield index_js_2.ASYNC.readFile(index_js_1.TEMPLATE.client.basic.socket);
+        if (!scriptFile) {
+            throw new error_js_1.default('Unable to read the script file', { exit: 2 });
+        }
+        const scriptReady = scriptFile.replace(new RegExp(index_js_1.PLACEHOLDER.client.port, 'g'), port + '');
+        yield index_js_2.ASYNC.ensureDir(dir);
+        const scriptFilePath = path_1.join(dir, 'reload-script.js');
+        yield index_js_2.ASYNC.writeFile(scriptFilePath, scriptReady);
+        return scriptFilePath;
+    });
+}
+function stringInjector(source, anchorIdx, marker, inject) {
+    const headLastIdx = anchorIdx + marker.length;
+    const scriptPrefix = source.slice(0, headLastIdx);
+    const scriptSuffix = source.slice(headLastIdx);
+    return scriptPrefix + inject + scriptSuffix;
+}
+function injectScript(scriptLocale, indexHtml) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const headIdx = indexHtml.search(/<head>/gi);
+        const scriptTag = `\n<!--  Catalyst web client reload script -->\n<script type="text/javascript" src="${scriptLocale}"></script>\n`;
+        if (headIdx !== -1) {
+            return stringInjector(indexHtml, headIdx, '<head>', scriptTag);
+        }
+        const htmlIdx = indexHtml.search(/<html>/gi);
+        const headTag = `\n<head>${scriptTag}</head>\n`;
+        return stringInjector(indexHtml, htmlIdx, '<html>', headTag);
+    });
+}
+function reloadApp(event, path, liveSockets) {
+    logger_js_1.info(ansi_colors_1.cyan(`${event} detected in ${path} of the Web-Client.`));
+    liveSockets.forEach((socket) => socket.send('reload'));
+}
+function webClientServer(httpPort, source, homepage, enableWatch) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const eventListener = new events_1.EventEmitter();
+        const catalystTempDir = path_1.join(source, '.catalyst');
+        const socketServerPort = yield port_resolver_js_1.default.getFreePort(httpPort, 20, true);
+        const reloadScriptSrc = enableWatch
+            ? path_1.relative(source, yield prepareScriptFile(catalystTempDir, socketServerPort))
+            : undefined;
+        if (reloadScriptSrc) {
+            const clientWatcher = chokidar_1.watch(source, {
+                ignoreInitial: true,
+                ignored: ['node_modules/**/*']
+            });
+            const liveSockets = [];
+            let watcherReady = false;
+            clientWatcher.on('error', (err) => {
+                watcherReady = false;
+                eventListener.emit('error', new error_js_1.default('client watcher error', {
+                    original: err,
+                    exit: 1,
+                    skipHelp: true
+                }));
+            });
+            clientWatcher.on('ready', () => {
+                watcherReady = true;
+                const socketServer = new ws_1.WebSocketServer({
+                    port: socketServerPort,
+                    path: '/client-reload'
+                })
+                    .on('connection', (clientSocket) => {
+                    if (!watcherReady) {
+                        clientSocket.send('watcher not ready');
+                        clientSocket.close();
+                        return;
+                    }
+                    clientSocket.on('close', () => {
+                        const socketIdx = liveSockets.findIndex((socket) => socket === clientSocket);
+                        liveSockets.splice(socketIdx, 1);
+                    });
+                    liveSockets.push(clientSocket);
+                    clientSocket.send('connected');
+                })
+                    .on('error', (err) => logger_js_1.debug(err));
+                setTimeout(() => {
+                    clientWatcher.on('change', (path) => {
+                        reloadApp('Change(s) is', path_1.relative(source, path), liveSockets);
+                    });
+                    clientWatcher.on('add', (path) => {
+                        reloadApp('Addition of file(s) is', path_1.relative(source, path), liveSockets);
+                    });
+                    clientWatcher.on('unlink', (path) => {
+                        reloadApp('Deletion of file(s) is', path_1.relative(source, path), liveSockets);
+                    });
+                }, 1000);
+                eventListener.addListener('close', () => socketServer === null || socketServer === void 0 ? void 0 : socketServer.close());
+            });
+            eventListener.addListener('close', () => {
+                if (clientWatcher) {
+                    clientWatcher.close();
+                }
+                liveSockets.forEach((socket) => socket.close());
+                index_js_2.SYNC.deleteDir(catalystTempDir);
+            });
+        }
+        const app = express_1.default();
+        app.use('/app', (req, res) => __awaiter(this, void 0, void 0, function* () {
+            const requestedFile = req.url === '/' ? homepage : decodeURIComponent(req.path);
+            if (enableWatch &&
+                requestedFile === homepage &&
+                (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
+                const homepageFile = yield index_js_2.ASYNC.readFile(path_1.join(source, homepage));
+                if (!homepageFile) {
+                    eventListener.emit('error', new error_js_1.default('Unable to read the homepage file', {
+                        exit: 1,
+                        errorId: 'WEB-CLIENT-SERVER-1',
+                        arg: [ansi_colors_1.red.italic(homepage)]
+                    }));
+                    return;
+                }
+                const injectedHomePage = reloadScriptSrc
+                    ? yield injectScript(encodeURIComponent(reloadScriptSrc), homepageFile)
+                    : undefined;
+                res.contentType('text/html');
+                res.status(200);
+                res.send(injectedHomePage || homepageFile);
+                return;
+            }
+            res.sendFile(path_1.join(source, requestedFile), (err) => {
+                if (err) {
+                    logger_js_1.error('Unable to serve the requested file: ' + path_1.join(source, requestedFile));
+                    logger_js_1.debug(err.stack || err.message);
+                    res.status(404);
+                    res.send('Resource not found');
+                }
+            });
+        }));
+        const server = app.listen(httpPort).on('error', (err) => {
+            eventListener.emit('error', err);
+        });
+        const expressDestroyer = new server_js_1.ConnectionDestroyer(server);
+        eventListener.on('error', (err) => {
+            logger_js_1.error('Error when serving the web-client: ' + err.message);
+            logger_js_1.info('Please exit the command to get more info');
+            eventListener.emit('close');
+        });
+        eventListener.on('close', () => __awaiter(this, void 0, void 0, function* () {
+            yield expressDestroyer.destroy();
+            logger_js_1.debug('client server closed');
+        }));
+        return new Promise((res) => server.on('listening', () => res(eventListener)));
+    });
+}
+exports.default = webClientServer;

package/lib/shell/dependencies/invoker/bio/java/JavabioInvoker.java

@@ -94,10 +94,16 @@ public class JavabioInvoker {
 		String responseMeta = Paths.get(invokerDir, "user_meta.json").toString();
 
 		BufferedWriter responseWriter = new BufferedWriter(new FileWriter(responseFilePath));
-		responseWriter.write(responseJson.toString());
+		String responseStr = responseJson.toString();
+		responseWriter.write(responseStr);
 		responseWriter.close();
 
 		BufferedWriter metaWriter = new BufferedWriter(new FileWriter(responseMeta));
+		
+		JSONObject metaResp = ((JSONObject) metaJson.get("response"));
+		metaResp.put("Content-Type", "application/json");
+		metaResp.put("Content-Length", responseStr.length());
+		
 		metaWriter.write(metaJson.toString());
 		metaWriter.close();
 	}