zcatalyst-cli 1.18.0-beta.0 → 1.18.0-beta.1

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

@@ -23,7 +23,7 @@ const logger_1 = require("../../../../util_modules/logger");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const projectRoot = runtime_store_1.default.get('project.root');
     const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
     const targetDir = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
@@ -54,6 +54,6 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     return (0, shell_1.spawn)(spawnCommand, opts, {
         cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
         stdio: 'pipe',
-        env: Object.assign({ 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, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+        env: Object.assign({ 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, X_ZOHO_CATALYST_RESOURCE_ID: (_f = details.target) === null || _f === void 0 ? void 0 : _f.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();
 });

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

@@ -0,0 +1,53 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAppSailRoutes = void 0;
+const utils_1 = require("./utils");
+function addAppSailRoutes(app, details, proxy, unknownProxy) {
+    var _a, _b;
+    app.use('/__catalyst/sdk/init.js', (req, res) => __awaiter(this, void 0, void 0, function* () {
+        const initJs = yield (0, utils_1.appsailInitJs)();
+        const _write = res.write;
+        res.write = () => {
+            res.setHeader('Content-Length', initJs.length);
+            return _write.call(res, initJs, 'utf-8');
+        };
+        req.url = req.originalUrl;
+        unknownProxy(req, res);
+    }));
+    app.use('/baas/logout', (req, res) => {
+        req.url = req.originalUrl;
+        unknownProxy(req, res);
+    });
+    ((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true &&
+        app.use(['/__catalyst', '/accounts', '/oauthorize'], (req, res) => {
+            if (req.url.includes('/appsail/logout_redirect')) {
+                res.redirect(typeof req.query.service_url === 'string' ? req.query.service_url : '/');
+                return;
+            }
+            req.url = req.originalUrl;
+            unknownProxy(req, res);
+        });
+    app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+        var _c, _d;
+        if (req.header('catalyst-component') === 'true') {
+            ((_d = (_c = details.target) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.catalyst_auth) === true
+                ? unknownProxy(req, res)
+                : res.sendStatus(400);
+            return;
+        }
+        proxy.web(req, res, {
+            target: `http://127.0.0.1:${details.target.port.appsail}`,
+            ws: true
+        });
+    }));
+}
+exports.addAppSailRoutes = addAppSailRoutes;

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addFnRoutes = void 0;
+const constants_1 = require("../../../../util_modules/constants");
+function addFnRoutes(app, details, proxy) {
+    const fnTarget = details.target;
+    app.use(`/server/${fnTarget.name}`, (req, res) => {
+        proxy.web(req, res, {
+            target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
+            ws: true
+        });
+    });
+    app.use(`/baas/v1/project/:projectId/function/${fnTarget.name}`, (req, res) => {
+        proxy.web(req, res, {
+            target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
+            ws: true
+        });
+    });
+    if (fnTarget.id) {
+        app.use(`/server/${fnTarget.id}`, (req, res) => {
+            proxy.web(req, res, {
+                target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.id}/execute` : ''}`,
+                ws: true
+            });
+        });
+        app.use(`/baas/v1/project/:projectId/function/${fnTarget.id}`, (req, res) => {
+            proxy.web(req, res, {
+                target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.id}/execute` : ''}`,
+                ws: true
+            });
+        });
+    }
+}
+exports.addFnRoutes = addFnRoutes;

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

@@ -0,0 +1,155 @@
+'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 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"));
+const authenticator_1 = __importDefault(require("../../../../express_middlewares/authenticator"));
+const cookie_parser_1 = __importDefault(require("../../../../express_middlewares/cookie-parser"));
+const error_handler_1 = __importDefault(require("../../../../express_middlewares/error-handler"));
+const logger_1 = __importDefault(require("../../../../express_middlewares/logger"));
+const project_1 = __importDefault(require("../../../../express_middlewares/project"));
+const unknown_req_proxy_1 = __importDefault(require("./unknown-req-proxy"));
+const url_rewriter_1 = __importDefault(require("../../../../express_middlewares/url-rewriter"));
+const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const constants_1 = require("../../../../util_modules/constants");
+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 utils_1 = require("./utils");
+const appsail_1 = require("./appsail");
+const web_client_1 = require("./web-client");
+const functions_1 = require("./functions");
+function spinUpMaster(listenPort, { otherServerDetails, appSailDetails }) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        if ((otherServerDetails && appSailDetails) || (!otherServerDetails && !appSailDetails)) {
+            throw new error_1.default('Either functions/client or AppSail is need to start the master server. But both cannot use the same master', { exit: 2 });
+        }
+        const projectDetails = {
+            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)()
+        };
+        const rules = runtime_store_1.default.get('context.apig.local.config', -1);
+        const customProxyUrl = (0, option_1.getOptionValue)('proxy');
+        const app = (0, express_1.default)();
+        let systemRoutes;
+        const nonApigURL = ['/accounts', '/clientoauth', '/_wms', '/wmssrv'];
+        app.use((0, logger_1.default)(appSailDetails));
+        app.use(cookie_parser_1.default);
+        app.use((0, project_1.default)(projectDetails));
+        app.use(authenticator_1.default);
+        !appSailDetails &&
+            app.use(nonApigURL, (req, res) => {
+                req.url = req.originalUrl;
+                unknownProxy(req, res);
+            });
+        !appSailDetails &&
+            app.use('*/.catalyst%2Freload-script.js', (req, res) => {
+                var _a;
+                req.url = '/.catalyst%2Freload-script.js';
+                (_a = otherServerDetails === null || otherServerDetails === void 0 ? void 0 : otherServerDetails.client) === null || _a === void 0 ? void 0 : _a.forEach((clientDetails) => {
+                    const appTarget = `http://127.0.0.1:${clientDetails.httpPort}/app/`;
+                    proxy.web(req, res, {
+                        target: appTarget,
+                        changeOrigin: true
+                    });
+                });
+            });
+        if (rules !== -1 && !appSailDetails) {
+            for (const [sourceURL, methodByConfig] of Object.entries(rules)) {
+                const router = app.route(sourceURL);
+                for (const [method, config] of Object.entries(methodByConfig)) {
+                    if (config.system) {
+                        if (systemRoutes === undefined) {
+                            systemRoutes = {};
+                        }
+                        js_1.JS.set(systemRoutes, [sourceURL, method], config);
+                    }
+                    router[method]((req, res, next) => {
+                        if (res.locals.apigRules === undefined) {
+                            res.locals.apigRules = [];
+                        }
+                        res.locals.apigRules.push(Object.assign({ source_endpoint: sourceURL, params: req.params }, config));
+                        next();
+                    });
+                }
+            }
+            app.use('/', apig_matcher_1.default, auth_checker_1.default, url_rewriter_1.default);
+        }
+        const proxy = (0, utils_1.createProxyServer)(listenPort);
+        appSailDetails && ((_b = (_a = appSailDetails.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true
+            ? proxy.on('proxyRes', (0, utils_1.proxyResponseHandler)({
+                signInRedirect: appSailDetails.target.config.login_redirect || '/'
+            }))
+            : proxy.on('proxyRes', (0, utils_1.proxyResponseHandler)({ systemRoutes }));
+        const proxyDestroyer = new server_js_1.ConnectionDestroyer(proxy);
+        const unknownProxy = (0, unknown_req_proxy_1.default)(proxy, listenPort, customProxyUrl);
+        otherServerDetails &&
+            Object.keys(otherServerDetails).forEach((targ) => {
+                var _a, _b, _c;
+                switch (targ) {
+                    case 'client': {
+                        (_a = otherServerDetails.client) === null || _a === void 0 ? void 0 : _a.forEach((clientDetails) => (0, web_client_1.addWebClientRoutes)(app, clientDetails, proxy, unknownProxy));
+                        break;
+                    }
+                    case 'server': {
+                        (_b = otherServerDetails.server) === null || _b === void 0 ? void 0 : _b.forEach((serverDetail) => {
+                            var _a;
+                            app.use('/server/' + ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.name), (req, res) => {
+                                proxy.web(req, res, {
+                                    target: `http://127.0.0.1:${serverDetail.httpPort}`
+                                });
+                            });
+                        });
+                        break;
+                    }
+                    case 'functions': {
+                        (_c = otherServerDetails.functions) === null || _c === void 0 ? void 0 : _c.forEach((fnDetails) => (0, functions_1.addFnRoutes)(app, fnDetails, proxy));
+                        break;
+                    }
+                    default:
+                        throw new error_1.default('Unknown type provided to master server ' + targ, {
+                            exit: 2
+                        });
+                }
+            });
+        appSailDetails && (0, appsail_1.addAppSailRoutes)(app, appSailDetails, proxy, unknownProxy);
+        app.use('/', (0, unknown_req_proxy_1.default)(proxy, listenPort, customProxyUrl));
+        app.use(error_handler_1.default);
+        const expressServer = app.listen(listenPort, '127.0.0.1').on('error', (err) => {
+            if (proxy) {
+                proxyDestroyer.destroy();
+            }
+            console.error(err);
+        });
+        const expressDestroyer = new server_js_1.ConnectionDestroyer(expressServer);
+        expressServer.maxConnections = 100;
+        process.on('SIGINT', () => expressDestroyer.destroy(false));
+        expressServer.on('close', () => __awaiter(this, void 0, void 0, function* () {
+            yield proxyDestroyer.destroy().catch((err) => (0, logger_2.debug)(err));
+        }));
+        expressServer.on('upgrade', (...upgradeParam) => {
+            app.emit('upgrade', ...upgradeParam);
+        });
+        return expressServer;
+    });
+}
+exports.default = spinUpMaster;

package/lib/{express_middlewares/unknownReqProxy.js → serve/server/lib/master/unknown-req-proxy.js}

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const runtime_store_1 = __importDefault(require("../runtime-store"));
-const logger_1 = require("../util_modules/logger");
-exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
+const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const logger_1 = require("../../../../util_modules/logger");
+exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
     if (req.url.length === 1 && req.url.startsWith('/')) {
         res.redirect('/app/');
     }
@@ -34,16 +34,13 @@ exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
             headers['origin'] = `https://${req.headers['x-zc-project-domain']}`;
         }
         if (req.url.includes('/__catalyst/auth/')) {
-            const masterPort = runtime_store_1.default.get('context.port.http.master', 3000);
-            headers['catalyst-redirect-domain'] = `http://localhost:${masterPort}`;
+            headers['catalyst-redirect-domain'] = `http://localhost:${masterPort || 3000}`;
         }
         proxyInstance.web(req, res, {
             target: `https://${req.headers['x-zc-project-domain']}`,
             changeOrigin: true,
             ws: true,
             headers
-        }, (err) => {
-            (0, logger_1.debug)('Unknown proxy error: ', err);
         });
     }
 };

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

@@ -0,0 +1,130 @@
+"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 });
+exports.appsailInitJs = exports.proxyResponseHandler = exports.createProxyServer = exports.redirectByAuth = exports.removeSecure = void 0;
+const http_1 = require("http");
+const constants_1 = require("../../../../util_modules/constants");
+const fs_1 = require("../../../../util_modules/fs");
+const error_1 = __importDefault(require("../../../../error"));
+const project_1 = require("../../../../util_modules/project");
+const http_proxy_1 = require("http-proxy");
+const logger_1 = require("../../../../util_modules/logger");
+const removeSecure = (str) => str.replace(/;\s?Secure/i, '').replace(/;\s?SameSite=None/i, '');
+exports.removeSecure = removeSecure;
+const redirectByAuth = (req, res, redirectUrl) => {
+    if (req.headers['x-zc-user-cred-token'] === undefined) {
+        res.writeHead(302, { Location: redirectUrl });
+        res.end();
+    }
+    else {
+        res.writeHead(302, { Location: '/app/' });
+        res.end();
+    }
+};
+exports.redirectByAuth = redirectByAuth;
+const createProxyServer = (port) => {
+    const proxy = (0, http_proxy_1.createProxyServer)({
+        hostRewrite: `localhost:${port}`,
+        protocolRewrite: 'http'
+    })
+        .on('error', (err, req, res) => {
+        if (res.writableEnded) {
+            return;
+        }
+        if (res instanceof http_1.ServerResponse) {
+            res.writeHead(502, { 'Content-Type': 'json' });
+        }
+        res.end(JSON.stringify({ error: 'unable to serve the request' }));
+        console.log();
+        console.log('Unable to reach the servers to serve the request:  ', req.url);
+        console.error(err);
+    })
+        .on('econnreset', (err, req, res, targetUrl) => {
+        if (res.writableEnded) {
+            return;
+        }
+        if (res instanceof http_1.ServerResponse) {
+            res.writeHead(502, { 'Content-Type': 'json' });
+        }
+        res.end(JSON.stringify({ error: 'unable to serve the request. ECONNRESET.' }));
+        console.log();
+        console.log('Connection reset while trying to serve the request ', req.url);
+        (0, logger_1.debug)('Connection reset from target URL : ', targetUrl);
+        console.error(err);
+    })
+        .on('close', () => (0, logger_1.debug)('proxy closed'));
+    return proxy;
+};
+exports.createProxyServer = createProxyServer;
+const proxyResponseHandler = ({ systemRoutes, signInRedirect = '/app/local-redirect' }) => (proxyRes, req, res) => {
+    if (!req.url) {
+        return;
+    }
+    if (req.url.startsWith('/oauthorize')) {
+        const set = proxyRes.headers['set-cookie'];
+        if (set) {
+            const result = Array.isArray(set) ? set.map(exports.removeSecure) : (0, exports.removeSecure)(set);
+            proxyRes.headers['set-cookie'] = result;
+        }
+    }
+    else if (req.url.startsWith('/baas') || req.url.startsWith('/__catalyst')) {
+        if (req.url.includes('/signin-redirect')) {
+            if (systemRoutes === undefined) {
+                (0, exports.redirectByAuth)(req, res, signInRedirect);
+                return;
+            }
+            const sourceRedirectUrl = Object.keys(systemRoutes).find((sourceUrl) => {
+                const methodByConfig = systemRoutes ? systemRoutes[sourceUrl] : undefined;
+                if (methodByConfig) {
+                    return !!Object.values(methodByConfig).find((config) => {
+                        return config.name === 'Login Redirect';
+                    });
+                }
+                return false;
+            });
+            if (sourceRedirectUrl === undefined) {
+                res.end('INVALID_URL');
+                return;
+            }
+            (0, exports.redirectByAuth)(req, res, sourceRedirectUrl);
+        }
+        else if (req.url.includes('/logout')) {
+            const set = proxyRes.headers['set-cookie'];
+            if (set) {
+                const result = set.map((cookie) => cookie.replace(new RegExp('Domain=[\\S^;]*', 'g'), 'Domain=localhost;'));
+                proxyRes.headers['set-cookie'] = result;
+            }
+        }
+    }
+    else if (req.url.startsWith('/accounts') && req.url.includes('/signin')) {
+        const set = proxyRes.headers['set-cookie'];
+        set
+            ? set.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/')
+            : ['IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/'];
+        proxyRes.headers['set-cookie'] = set;
+    }
+};
+exports.proxyResponseHandler = proxyResponseHandler;
+const appsailInitJs = () => __awaiter(void 0, void 0, void 0, function* () {
+    let initJsStr = yield fs_1.ASYNC.readFile(constants_1.TEMPLATE.init_js);
+    if (!initJsStr) {
+        throw new error_1.default('Unable to read the init_js file', { exit: 2 });
+    }
+    const feed = [(0, project_1.getProjectId)(), (0, project_1.getDomainKey)(), constants_1.ORIGIN.iamPortal, (0, project_1.getEnvId)()];
+    Object.values(constants_1.PLACEHOLDER.init_js).forEach((holder, idx) => {
+        initJsStr = initJsStr === null || initJsStr === void 0 ? void 0 : initJsStr.replace(new RegExp(holder, 'g'), feed[idx]);
+    });
+    return initJsStr;
+});
+exports.appsailInitJs = appsailInitJs;

package/lib/serve/server/lib/master/web-client.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addWebClientRoutes = void 0;
+function addWebClientRoutes(app, details, proxy, unknownProxy) {
+    const appTarget = `http://127.0.0.1:${details.httpPort}/app/`;
+    app.use('/app', (req, res) => {
+        const target = details.target;
+        if (req.url === '/' && target.homepage.includes('/__catalyst')) {
+            req.url = target.homepage;
+            unknownProxy(req, res);
+        }
+        else if (req.url.startsWith('/local-redirect') && target.login_redirect) {
+            const isUrl = target.login_redirect.startsWith('/');
+            if (isUrl) {
+                res.redirect(target.login_redirect);
+            }
+            else {
+                res.redirect('/app/' + target.login_redirect);
+            }
+        }
+        else {
+            proxy.web(req, res, {
+                target: appTarget,
+                changeOrigin: true
+            });
+        }
+    });
+    const appTargetUrl = new URL(appTarget);
+    appTargetUrl.pathname = '';
+    appTargetUrl.protocol = 'ws';
+    app.addListener('upgrade', (...upgradeParam) => {
+        proxy.ws(upgradeParam[0], upgradeParam[1], upgradeParam[2], {
+            target: appTargetUrl.href,
+            ws: true,
+            changeOrigin: true
+        });
+    });
+}
+exports.addWebClientRoutes = addWebClientRoutes;

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

@@ -34,9 +34,9 @@ const logger_1 = require("../../../../util_modules/logger");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
-    const _g = details.target, { ['watcher']: _ } = _g, serialisableTarget = __rest(_g, ['watcher']);
+    const _h = details.target, { ['watcher']: _ } = _h, serialisableTarget = __rest(_h, ['watcher']);
     const projectRoot = runtime_store_1.default.get('project.root');
     serialisableTarget.index = serialisableTarget.index
         ? serialisableTarget.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
@@ -88,6 +88,6 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     return (0, shell_1.spawn)('node', opts, {
         cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
         stdio: 'pipe',
-        env: Object.assign({ NODE_PATH: targetSource + path_1.sep + 'node_modules', 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, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+        env: Object.assign({ NODE_PATH: targetSource + path_1.sep + 'node_modules', 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, X_ZOHO_CATALYST_RESOURCE_ID: (_g = details.target) === null || _g === void 0 ? void 0 : _g.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();
 });

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

@@ -32,17 +32,17 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
         (0, path_1.join)(runtimesDir, constants_1.RUNTIME.language.python.value, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`, 'main.py')
     ];
     return new Promise((resolve, reject) => {
-        var _a;
+        var _a, _b;
         const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
             cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
             stdio: 'pipe',
-            env: Object.assign({ 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, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+            env: Object.assign({ 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, X_ZOHO_CATALYST_RESOURCE_ID: (_a = details.target) === null || _a === void 0 ? void 0 : _a.id, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
         }).RAW();
         child.on('spawn', () => __awaiter(void 0, void 0, void 0, function* () {
             yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());
         }));
         const errData = [];
-        (_a = child.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
+        (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (chunk) => {
             errData.push(chunk);
         });
         child.on('error', (err) => {

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

@@ -259,6 +259,7 @@ public class JavaeventInvoker {
 			defaultEvent.setSource(String.valueOf(userData.get("source")));
 			defaultEvent.setSourceEntityId(sourceId == "null" ? null : Long.valueOf(sourceId));
 			defaultEvent.setTime(eventTime == "null" ? null : Long.valueOf(eventTime));
+			defaultEvent.setRawData(userData);
 			
 			EventRequest eventRequest = defaultEvent;
 
@@ -268,7 +269,7 @@ public class JavaeventInvoker {
 			Method runner = cls.getMethod("handleEvent", EventRequest.class, Context.class);
 			EVENT_STATUS eventStatus = null;
 			
-			if(System.getenv("DEBUG").equals("false")) {
+			if(System.getenv("DEBUG") != null && System.getenv("DEBUG").equals("false")) {
 				Timer executionTimer = new Timer(true);
 				executionTimer.schedule(new TimerTask() {
 					@Override

package/lib/shell/dependencies/invoker/event/node.mjs

@@ -55,6 +55,7 @@ const eventReq = {
 	getSourceEntityId: () => userData.source_entity_id,
 	getEventBusDetails: () => userData.event_bus_details,
 	getProjectDetails: () => userData.project_details,
+	getRawData: () => userData,
 	/**
 	 * @deprecated use individual get methods.
 	 */