zcatalyst-cli 1.11.1 → 1.13.0

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;
 });

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

@@ -23,6 +23,7 @@ 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);
@@ -31,7 +32,7 @@ function prepareScriptFile(dir, port) {
         }
         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');
+        const scriptFilePath = (0, path_1.join)(dir, 'reload-script.js');
         yield index_js_2.ASYNC.writeFile(scriptFilePath, scriptReady);
         return scriptFilePath;
     });
@@ -39,8 +40,8 @@ function prepareScriptFile(dir, port) {
 function stringInjector(source, anchorIdx, marker, inject) {
     const headLastIdx = anchorIdx + marker.length;
     const scriptPrefix = source.slice(0, headLastIdx);
-    const scriptSufix = source.slice(headLastIdx + 1);
-    return scriptPrefix + inject + scriptSufix;
+    const scriptSuffix = source.slice(headLastIdx);
+    return scriptPrefix + inject + scriptSuffix;
 }
 function injectScript(scriptLocale, indexHtml) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -55,19 +56,19 @@ function injectScript(scriptLocale, indexHtml) {
     });
 }
 function reloadApp(event, path, liveSockets) {
-    logger_js_1.info(ansi_colors_1.cyan(`${event} detected in ${path} of the Web-Client.`));
+    (0, logger_js_1.info)((0, 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 eventListner = new events_1.EventEmitter();
-        const catalystTempDir = path_1.join(source, '.catalyst');
+        const eventListener = new events_1.EventEmitter();
+        const catalystTempDir = (0, 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))
+            ? (0, path_1.relative)(source, yield prepareScriptFile(catalystTempDir, socketServerPort))
             : undefined;
         if (reloadScriptSrc) {
-            const clientWatcher = chokidar_1.watch(source, {
+            const clientWatcher = (0, chokidar_1.watch)(source, {
                 ignoreInitial: true,
                 ignored: ['node_modules/**/*']
             });
@@ -75,7 +76,7 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
             let watcherReady = false;
             clientWatcher.on('error', (err) => {
                 watcherReady = false;
-                eventListner.emit('error', new error_js_1.default('client watcher error', {
+                eventListener.emit('error', new error_js_1.default('client watcher error', {
                     original: err,
                     exit: 1,
                     skipHelp: true
@@ -100,21 +101,21 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
                     liveSockets.push(clientSocket);
                     clientSocket.send('connected');
                 })
-                    .on('error', (err) => logger_js_1.debug(err));
+                    .on('error', (err) => (0, logger_js_1.debug)(err));
                 setTimeout(() => {
                     clientWatcher.on('change', (path) => {
-                        reloadApp('Change(s) is', path_1.relative(source, path), liveSockets);
+                        reloadApp('Change(s) is', (0, path_1.relative)(source, path), liveSockets);
                     });
                     clientWatcher.on('add', (path) => {
-                        reloadApp('Addition of file(s) is', path_1.relative(source, path), liveSockets);
+                        reloadApp('Addition of file(s) is', (0, path_1.relative)(source, path), liveSockets);
                     });
                     clientWatcher.on('unlink', (path) => {
-                        reloadApp('Deletion of file(s) is', path_1.relative(source, path), liveSockets);
+                        reloadApp('Deletion of file(s) is', (0, path_1.relative)(source, path), liveSockets);
                     });
                 }, 1000);
-                eventListner.addListener('close', () => socketServer === null || socketServer === void 0 ? void 0 : socketServer.close());
+                eventListener.addListener('close', () => socketServer === null || socketServer === void 0 ? void 0 : socketServer.close());
             });
-            eventListner.addListener('close', () => {
+            eventListener.addListener('close', () => {
                 if (clientWatcher) {
                     clientWatcher.close();
                 }
@@ -122,15 +123,15 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
                 index_js_2.SYNC.deleteDir(catalystTempDir);
             });
         }
-        const app = express_1.default();
+        const app = (0, 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));
+                const homepageFile = yield index_js_2.ASYNC.readFile((0, path_1.join)(source, homepage));
                 if (!homepageFile) {
-                    eventListner.emit('error', new error_js_1.default('Unable to read the homepage file', {
+                    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)]
@@ -145,27 +146,29 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
                 res.send(injectedHomePage || homepageFile);
                 return;
             }
-            res.sendFile(path_1.join(source, requestedFile), (err) => {
+            res.sendFile((0, 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);
+                    (0, logger_js_1.error)('Unable to serve the requested file: ' + (0, path_1.join)(source, requestedFile));
+                    (0, logger_js_1.debug)(err.stack || err.message);
                     res.status(404);
                     res.send('Resource not found');
                 }
             });
         }));
         const server = app.listen(httpPort).on('error', (err) => {
-            eventListner.emit('error', err);
+            eventListener.emit('error', err);
         });
-        eventListner.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');
-            eventListner.emit('close');
+        const expressDestroyer = new server_js_1.ConnectionDestroyer(server);
+        eventListener.on('error', (err) => {
+            (0, logger_js_1.error)('Error when serving the web-client: ' + err.message);
+            (0, logger_js_1.info)('Please exit the command to get more info');
+            eventListener.emit('close');
         });
-        eventListner.on('close', () => {
-            server.close(() => logger_js_1.debug('client server closed'));
-        });
-        return new Promise((res) => server.on('listening', () => res(eventListner)));
+        eventListener.on('close', () => __awaiter(this, void 0, void 0, function* () {
+            yield expressDestroyer.destroy();
+            (0, logger_js_1.debug)('client server closed');
+        }));
+        return new Promise((res) => server.on('listening', () => res(eventListener)));
     });
 }
 exports.default = webClientServer;

package/lib/shell/dependencies/http-functions.js

@@ -31,21 +31,22 @@ const logger_2 = require("../../util_modules/logger");
 const project_2 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
 const logUrl = (name, pthName, httpPort, masterPort) => {
-    logger_2.labeled(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
+    (0, logger_2.labeled)(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
 };
 class HttpFunctions {
-    constructor(repl) {
+    constructor({ repl, primary = true } = {}) {
         this.repl = repl;
-        this.app = express_1.default();
+        this.app = (0, express_1.default)();
+        this.app.locals.primary = primary;
         this.nodeInvoker = {
-            [constants_1.FN_TYPE.basic]: path_1.normalize(path_1.join(__dirname, './invoker', constants_1.FN_TYPE.basic, 'node.js'))
+            [constants_1.FN_TYPE.basic]: (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', constants_1.FN_TYPE.basic, 'node.js'))
         };
         this.javaInvoker = {
-            [constants_1.FN_TYPE.basic]: path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'Java' + constants_1.FN_TYPE.basic + 'Invoker')
+            [constants_1.FN_TYPE.basic]: (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'Java' + constants_1.FN_TYPE.basic + 'Invoker')
         };
-        this.requestFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_req_body');
-        this.responseFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
-        this.metaFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
+        this.requestFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_req_body');
+        this.responseFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
+        this.metaFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
         this.runningSlaves = [];
         this.targets = [];
         this.q = new better_queue_1.default((opts, cb) => {
@@ -61,25 +62,26 @@ class HttpFunctions {
                     'content-length': opts.req.headers['content-length']
                 }
             }));
-            const slave = shell_1.spawn(opts.command, opts.options, {
+            const slave = (0, shell_1.spawn)(opts.command, opts.options, {
                 cwd: opts.pth,
                 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();
             (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                logger_2.info(Buffer.isBuffer(data) ? data.toString() : data);
+                (0, logger_2.info)(Buffer.isBuffer(data) ? data.toString() : data);
             });
             (_b = slave.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
                 const errorStr = data.toString().trim();
-                logger_2.info(errorStr);
+                (0, logger_2.info)(errorStr);
             });
             slave.on('uncaughtException', (err, origin) => {
                 const errorString = `Caught exception: ${err}\n` + `Exception origin: ${origin}`;
-                logger_2.error(errorString);
+                (0, logger_2.error)(errorString);
                 cb(errorString, null);
             });
             slave.on('exit', (code) => {
@@ -112,20 +114,22 @@ class HttpFunctions {
             const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
             if (this.repl !== undefined) {
                 this.app.use((_req, _res, next) => {
-                    shell_1.clearLine(process.stdout);
+                    (0, shell_1.clearLine)(process.stdout);
                     next();
                 });
             }
-            this.app.use(logger_1.default);
-            this.app.use(cookie_parser_1.default);
-            this.app.use(authenticator_1.default);
-            this.app.use(project_1.default({
-                id: project_2.getProjectId(),
-                domain_prefix: project_2.getDomainPrefix(),
-                domain: constants_1.ORIGIN.app.replace('https://', ''),
-                key: project_2.getDomainKey(),
-                env_name: project_2.getEnvName()
-            }));
+            if (this.app.locals.primary) {
+                this.app.use(logger_1.default);
+                this.app.use(cookie_parser_1.default);
+                this.app.use((0, project_1.default)({
+                    id: (0, project_2.getProjectId)(),
+                    domain_prefix: (0, project_2.getDomainPrefix)(),
+                    domain: constants_1.ORIGIN.app.replace('https://', ''),
+                    key: (0, project_2.getDomainKey)(),
+                    env_name: (0, project_2.getEnvName)()
+                }));
+                this.app.use(authenticator_1.default);
+            }
             const reqHandler = (fnTarget) => (request, response, next) => {
                 var _a, _b;
                 const urlParts = new url_1.URL(request.originalUrl, request.protocol + '://' + request.get('host')).searchParams;
@@ -155,9 +159,10 @@ class HttpFunctions {
                         'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
                         'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
                         'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
-                        'x-zc-cookie': request.headers['x-zc-cookie']
+                        'x-zc-cookie': request.headers['x-zc-cookie'],
+                        'x-zc-user-type': request.headers['x-zc-user-type']
                     }));
-                    slaveOptions.push(JSON.stringify(path_1.join(runtime_store_1.default.get('cwd'), '.build')));
+                    slaveOptions.push(JSON.stringify((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')));
                     slave = this.q.push({
                         command: 'node',
                         options: slaveOptions,
@@ -167,18 +172,18 @@ class HttpFunctions {
                     });
                 }
                 else if ((_b = fnTarget.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
-                    const javaInvokerDir = path_1.parse(this.javaInvoker[fnTarget.type]).dir;
+                    const javaInvokerDir = (0, path_1.parse)(this.javaInvoker[fnTarget.type]).dir;
                     slaveOptions.push('-cp');
                     slaveOptions.push(javaInvokerDir +
                         fn_utils_1.fnUtils.java.classPathSep +
-                        path_1.join(javaInvokerDir, 'lib', '*'));
+                        (0, path_1.join)(javaInvokerDir, 'lib', '*'));
                     if (debugPort !== -1) {
                         slaveOptions.push('-Xdebug');
                         slaveOptions.push('-Xrunjdwp:transport=dt_socket,address=' +
                             debugPort +
                             ',server=y,suspend=y');
                     }
-                    slaveOptions.push(path_1.basename(this.javaInvoker[fnTarget.type]));
+                    slaveOptions.push((0, path_1.basename)(this.javaInvoker[fnTarget.type]));
                     slaveOptions.push(javaInvokerDir);
                     slaveOptions.push(JSON.stringify(fnTarget));
                     slaveOptions.push(query);
@@ -233,7 +238,7 @@ class HttpFunctions {
                     }
                 });
             };
-            shell_1.clearLine(process.stdout);
+            (0, shell_1.clearLine)(process.stdout);
             const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
             const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
             fnTargets
@@ -245,7 +250,7 @@ class HttpFunctions {
                 .forEach((t) => {
                 var _a;
                 if ((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
-                    fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker[t.type], path_1.normalize(path_1.join(__dirname, './invoker', t.type, 'java', 'Java' + t.type + 'Invoker.java')));
+                    fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker[t.type], (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', t.type, 'java', 'Java' + t.type + 'Invoker.java')));
                 }
                 const pthName = new url_1.URL(t.url).pathname;
                 if (pthName !== null) {
@@ -269,7 +274,7 @@ class HttpFunctions {
                             }
                         });
                         (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => {
-                            logger_2.labeled(`functions(${target.name})`, 'ready!').MESSAGE();
+                            (0, logger_2.labeled)(`functions(${target.name})`, 'ready!').MESSAGE();
                             logUrl(target.name, new url_1.URL(target.url).pathname, httpPort, masterPort);
                             if (this.repl && this.repl.paused) {
                                 this.repl.resume();
@@ -292,7 +297,7 @@ class HttpFunctions {
     start() {
         return __awaiter(this, void 0, void 0, function* () {
             const server = yield this._spinUpServer();
-            logger_2.info();
+            (0, logger_2.info)();
             server.on('connection', (socket) => {
                 socket.unref();
             });
@@ -310,7 +315,7 @@ class HttpFunctions {
                     yield Promise.all(this.targets.map((target) => __awaiter(this, void 0, void 0, function* () { var _a; return (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.close(); })));
                     if (HttpFunctions.server !== null) {
                         HttpFunctions.server.close((err) => {
-                            logger_2.debug(err);
+                            (0, logger_2.debug)(err);
                             res();
                         });
                     }

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

@@ -18,6 +18,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 org.json.JSONException;
 import org.json.JSONObject;
@@ -41,7 +42,7 @@ public class JavabioInvoker {
 				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);
 				}
@@ -94,10 +95,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();
 	}
@@ -158,9 +165,13 @@ public class JavabioInvoker {
 
 			clientAuth.put((userAuthHeaderType.equals("token")) ? "access_token" : "ticket", userAuthToken); // No I18N
 		}
+		if(auth.containsKey("x-zc-user-type")) { // No I18N
+			String userType = auth.get("x-zc-user-type").toString(); // No I18N
+			clientAuth.put("user_type", userType); // No I18N
+		}
 		catalystAuth.put("client_cred", clientAuth);
-
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
+
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N

package/lib/shell/dependencies/invoker/bio/node.js

@@ -11,8 +11,11 @@ const buildDir = JSON.parse(args[4]);
 const requestFile = path.join(buildDir, '.catalyst', 'user_req_body');
 const responseFile = path.join(buildDir, '.catalyst', 'user_res_body');
 const metaFile = path.join(buildDir, '.catalyst', 'user_meta.json');
-const writeToFile = (resp, metaJson) => {
-    fs.writeFileSync(responseFile, JSON.stringify(resp));
+const writeToFile = (respJson, metaJson) => {
+    const respStr = JSON.stringify(respJson);
+    fs.writeFileSync(responseFile, respStr);
+    metaJson.response['Content-Type'] = 'application/json';
+    metaJson.response['Content-Length'] = respStr.length;
     fs.writeFileSync(metaFile, JSON.stringify(metaJson));
 };
 let body = {};

package/lib/shell/dependencies/invoker/cron/java/JavacronInvoker.java

@@ -18,6 +18,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 org.json.JSONException;
 import org.json.JSONObject;
@@ -42,7 +43,7 @@ public class JavacronInvoker {
 				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);
 				}
@@ -139,9 +140,13 @@ public class JavacronInvoker {
 
 			clientAuth.put((userAuthHeaderType.equals("token")) ? "access_token" : "ticket", userAuthToken); // No I18N
 		}
+		if(auth.containsKey("x-zc-user-type")) { // No I18N
+			String userType = auth.get("x-zc-user-type").toString(); // No I18N
+			clientAuth.put("user_type", userType); // No I18N
+		}
 		catalystAuth.put("client_cred", clientAuth);
-
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
+
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N

package/lib/shell/dependencies/invoker/event/java/JavaeventInvoker.java

@@ -18,6 +18,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 org.json.JSONException;
 import org.json.JSONObject;
@@ -42,7 +43,7 @@ public class JavaeventInvoker {
 				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);
 				}
@@ -139,9 +140,13 @@ public class JavaeventInvoker {
 
 			clientAuth.put((userAuthHeaderType.equals("token")) ? "access_token" : "ticket", userAuthToken); // No I18N
 		}
+		if(auth.containsKey("x-zc-user-type")) { // No I18N
+			String userType = auth.get("x-zc-user-type").toString(); // No I18N
+			clientAuth.put("user_type", userType); // No I18N
+		}
 		catalystAuth.put("client_cred", clientAuth);
-
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
+
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N