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

package/lib/serve/server/index.js

@@ -302,6 +302,11 @@ class Server {
                 var _a;
                 switch (targType) {
                     case 'functions': {
+                        const headersDisplayed = {
+                            bio: false,
+                            aio: false,
+                            blo: false
+                        };
                         Object.entries(logTarg).forEach((x) => {
                             const [_targType, _logTarg] = x;
                             if (_logTarg.targs.length === 0) {
@@ -310,48 +315,66 @@ class Server {
                             loggedEntries++;
                             switch (_targType) {
                                 case 'bio': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const target = t;
-                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.bio === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
+                                            headersDisplayed.bio = true;
+                                        }
                                         bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
                                     break;
                                 }
                                 case 'aio': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const _target = t;
-                                        if (!((_a = _target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = _target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = _target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.aio === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
+                                            headersDisplayed.aio = true;
+                                        }
                                         aioLogUrl(_target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
                                     break;
                                 }
                                 case 'browserlogic': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const target = t;
-                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.blo === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
+                                            headersDisplayed.blo = true;
+                                        }
                                         bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
@@ -367,10 +390,17 @@ class Server {
                             return;
                         }
                         loggedEntries++;
-                        (0, logger_1.info)();
-                        (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                        let isHeaderDisplayed = false;
                         _logTarg.targs.forEach((t) => {
                             const targetSail = t.target;
+                            if (!targetSail.validity.valid) {
+                                return;
+                            }
+                            if (isHeaderDisplayed === false) {
+                                (0, logger_1.info)();
+                                (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                                isHeaderDisplayed = true;
+                            }
                             const targName = targetSail.name + '';
                             (0, logger_1.labeled)(targName +
                                 ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), `http://localhost:${targetSail.port.proxy}`).MESSAGE();

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

@@ -24,6 +24,8 @@ const archiver_1 = __importDefault(require("../../../../archiver"));
 const option_1 = require("../../../../util_modules/option");
 const execute_script_1 = require("../../../../execute-script");
 const master_1 = __importDefault(require("../master"));
+const ansi_colors_1 = require("ansi-colors");
+const common_1 = require("../../../../init/util/common");
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -37,14 +39,18 @@ const startAppSail = (port, opts) => {
     if (opts.command) {
         _opts.push('-c', opts.command);
     }
-    return (0, shell_1.spawn)('node', _opts, {
+    const child = (0, shell_1.spawn)('node', _opts, {
         cwd: opts.target,
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', 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) }, (opts.env || {}))
+        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
     }).RAW();
+    return new Promise((_res, _rej) => {
+        child.on('spawn', () => _res(child));
+        child.on('error', (reason) => _rej(reason));
+    });
 };
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     let child;
     const targetSail = serverDetails.target;
     if (!targetSail || !targetSail.config) {
@@ -55,24 +61,45 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
     }
     const buildPath = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path;
     const target = (yield fs_1.ASYNC.fileExists(buildPath)) ? (0, path_1.dirname)(buildPath) : buildPath;
+    if (!(yield fs_1.ASYNC.isPathExists(target))) {
+        if ((0, path_1.isAbsolute)(((_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.raw.build_path) || '')) {
+            throw new error_1.default('The given AppSail build path does not exists', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-1',
+                arg: [ansi_colors_1.italic.underline.red(target), (0, ansi_colors_1.bold)(targetSail.name)]
+            });
+        }
+        throw new error_1.default('The given AppSail build path does not exists: ' + targetSail.name, {
+            exit: 1,
+            errorId: 'SERVE-APPSAIL-2',
+            arg: [
+                (0, ansi_colors_1.underline)(((_d = targetSail.config) === null || _d === void 0 ? void 0 : _d.raw.build_path) || ''),
+                ansi_colors_1.italic.underline(targetSail.config.raw.source_path || ''),
+                ansi_colors_1.italic.underline(((_e = targetSail.config) === null || _e === void 0 ? void 0 : _e.raw.build_path) || ''),
+                ansi_colors_1.italic.underline(target)
+            ]
+        });
+    }
     switch (true) {
         case targetSail.config.stack.startsWith('node'): {
-            child = startAppSail(targetSail.port.appsail, {
+            child = yield startAppSail(targetSail.port.appsail, {
                 type: 'nodejs',
                 target,
                 command: targetSail.config.command,
                 memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
         case targetSail.config.stack.startsWith('python'): {
-            child = startAppSail(targetSail.port.appsail, {
+            child = yield startAppSail(targetSail.port.appsail, {
                 type: 'python',
                 target,
                 command: targetSail.config.command,
                 memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
@@ -98,26 +125,37 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     }
                 }
                 const jettyCommand = `java -jar "${(0, path_1.join)(jettyPath, 'start.jar')}" -Djetty.deploy.monitoredPath="${(0, project_1.resolveProjectPath)(target)}" -Djetty.http.port=${targetSail.port.appsail}`;
-                child = startAppSail(targetSail.port.appsail, {
+                child = yield startAppSail(targetSail.port.appsail, {
                     target,
                     type: 'war',
                     command: jettyCommand,
                     memory: targetSail.config.memory || 256,
-                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables)
+                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
+                    name: targetSail.name
                 });
                 break;
             }
-            child = startAppSail(targetSail.port.appsail, {
+            child = yield startAppSail(targetSail.port.appsail, {
                 target,
                 command: targetSail.config.command,
                 type: 'javase',
                 memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
         default: {
-            throw new error_1.default('Invalid AppSail stack');
+            const appSailRuntime = yield (0, common_1.getRuntimeDetails)();
+            throw new error_1.default('Invalid AppSail stack', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-4',
+                arg: [
+                    (0, ansi_colors_1.bold)(targetSail.name),
+                    ansi_colors_1.bold.red(targetSail.config.stack),
+                    appSailRuntime.runtimes.map((val) => (0, ansi_colors_1.bold)(`* ${val}`)).join('\n')
+                ]
+            });
         }
     }
     const masterServe = yield (0, master_1.default)(targetSail.port.proxy, {
@@ -130,7 +168,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             }
         });
     });
-    if ((_d = (_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.scripts) === null || _d === void 0 ? void 0 : _d.postserve) {
+    if ((_g = (_f = targetSail.config) === null || _f === void 0 ? void 0 : _f.scripts) === null || _g === void 0 ? void 0 : _g.postserve) {
         child.once('exit', () => {
             var _a, _b, _c;
             if (!((_a = targetSail.config) === null || _a === void 0 ? void 0 : _a.scripts)) {
@@ -139,5 +177,27 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             executeHook((_c = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.scripts) === null || _c === void 0 ? void 0 : _c.postserve, `AppSail [POSTSERVE] [${targetSail.name}]`, targetSail.source);
         });
     }
+    process.on('SIGINT', () => {
+        targetSail.trigger.kill = true;
+    });
+    child.once('exit', (code) => {
+        var _a, _b, _c;
+        if (code === 150) {
+            targetSail.validity = {
+                valid: false,
+                reason: 'Unable to start the AppSail'
+            };
+            throw new error_1.default('Unable to start the AppSail', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-3',
+                arg: [
+                    (0, ansi_colors_1.bold)(targetSail.name),
+                    ((_a = targetSail.config) === null || _a === void 0 ? void 0 : _a.command) || '',
+                    (0, ansi_colors_1.underline)(((_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path) || ''),
+                    ((_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.stack) || ''
+                ]
+            });
+        }
+    });
     return child;
 });

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

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 /* eslint-disable @typescript-eslint/no-var-requires */
+
+// exit codes
+// 150 - start up command failure
+
 const EXEC_SYNC = require('child_process').execSync;
 
 const WAR = 'war';
@@ -58,7 +62,11 @@ function main() {
 			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
 	}
 
-	EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
+	try {
+		EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
+	} catch (er) {
+		process.exit(150);
+	}
 }
 
 main();

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

@@ -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, 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)
+        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, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();
 });

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

@@ -23,12 +23,12 @@ function addAppSailRoutes(app, details, proxy, unknownProxy) {
         req.url = req.originalUrl;
         unknownProxy(req, res);
     }));
-    app.use('/baas/logout', (req, res) => {
+    app.use('/__catalyst', (req, res) => __awaiter(this, void 0, void 0, function* () {
         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) => {
+        app.use(['/accounts', '/oauthorize'], (req, res) => {
             if (req.url.includes('/appsail/logout_redirect')) {
                 res.redirect(typeof req.query.service_url === 'string' ? req.query.service_url : '/');
                 return;

package/lib/serve/server/lib/master/unknown-req-proxy.js

@@ -9,7 +9,7 @@ exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
     if (req.url.length === 1 && req.url.startsWith('/')) {
         res.redirect('/app/');
     }
-    else if (req.url.match(/accounts\/p\/[0-9]+\/clientidprequest/g)) {
+    else if (req.url.startsWith('/accounts') && req.url.endsWith('clientidprequest')) {
         res.redirect(308, `https://${req.headers['x-zc-project-domain']}${req.url}`);
         return;
     }
@@ -30,7 +30,7 @@ exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
     }
     else {
         const headers = {};
-        if (req.url.match(/accounts\/p\/[0-9]+\/webclient\/v1\/captcha/g)) {
+        if (req.url.startsWith('/accounts') && req.url.endsWith('captcha')) {
             headers['origin'] = `https://${req.headers['x-zc-project-domain']}`;
         }
         if (req.url.includes('/__catalyst/auth/')) {
@@ -39,6 +39,9 @@ exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
         proxyInstance.web(req, res, {
             target: `https://${req.headers['x-zc-project-domain']}`,
             changeOrigin: true,
+            cookieDomainRewrite: {
+                [req.headers['x-zc-project-domain'] + '']: 'localhost'
+            },
             ws: true,
             headers
         });

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

@@ -20,10 +20,21 @@ 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 iam_cookies = [
+    'ZD_CSRF_TOKEN',
+    '_iamadt_client',
+    '_iambdt_client',
+    '_zcsr_tmp',
+    'iamcsr',
+    'zalb',
+    'stk',
+    'JSESSIONID'
+];
+const isIamCookie = (cookieStr) => iam_cookies.some((val) => cookieStr.startsWith(val));
 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) {
+    if (req.headers['cookie'] !== undefined) {
         res.writeHead(302, { Location: redirectUrl });
         res.end();
     }
@@ -68,17 +79,16 @@ const createProxyServer = (port) => {
 };
 exports.createProxyServer = createProxyServer;
 const proxyResponseHandler = ({ systemRoutes, signInRedirect = '/app/local-redirect' }) => (proxyRes, req, res) => {
+    var _a, _b;
     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')) {
+    proxyRes.headers['set-cookie'] = (_a = proxyRes.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a.map((cookie) => {
+        if (isIamCookie(cookie))
+            return (0, exports.removeSecure)(cookie);
+        return cookie;
+    });
+    if (req.url.startsWith('/baas') || req.url.startsWith('/__catalyst')) {
         if (req.url.includes('/signin-redirect')) {
             if (systemRoutes === undefined) {
                 (0, exports.redirectByAuth)(req, res, signInRedirect);
@@ -108,11 +118,7 @@ const proxyResponseHandler = ({ systemRoutes, signInRedirect = '/app/local-redir
         }
     }
     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;
+        (_b = proxyRes.headers['set-cookie']) === null || _b === void 0 ? void 0 : _b.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/');
     }
 };
 exports.proxyResponseHandler = proxyResponseHandler;
@@ -121,7 +127,13 @@ const appsailInitJs = () => __awaiter(void 0, void 0, void 0, function* () {
     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)()];
+    const feed = [
+        (0, project_1.getProjectId)(),
+        (0, project_1.getDomainKey)(),
+        constants_1.ORIGIN.iamPortal,
+        (0, project_1.getEnvId)(),
+        `-development${constants_1.ORIGIN.stratusSuffix}`
+    ];
     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]);
     });

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

@@ -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, 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)
+        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, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();
 });

package/lib/serve/server/lib/node/server/package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "catalyst-cli-node-runtime",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "catalyst-cli-node-runtime",
+      "version": "1.0.0"
+    }
+  }
+}

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

@@ -36,7 +36,7 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
         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_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)
+            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_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, 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_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, 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());

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

@@ -117,7 +117,7 @@ class HttpFunctions {
             const slave = (0, shell_1.spawn)(opts.command, opts.options, {
                 cwd: opts.pth,
                 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, CATALYST_PROJECT_TIMEZONE: (0, project_2.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, opts.envVars)
+                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_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_2.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, opts.envVars)
             }).RAW();
             (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                 (0, logger_2.info)(Buffer.isBuffer(data) ? data.toString() : data);

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

@@ -276,7 +276,7 @@ public class JavacronInvoker {
 			Method runner = cls.getMethod("handleCronExecute", CronRequest.class, Context.class);
 			CRON_STATUS cronStatus = 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/integ/java/JavaintegInvoker.java

@@ -14,6 +14,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -120,6 +123,7 @@ public class JavaintegInvoker {
 		catalystConfig.put("project_key", project.get("x-zc-project-key").toString());
 		catalystConfig.put("project_domain", project.get("x-zc-project-domain").toString());
 		catalystConfig.put("environment", project.get("x-zc-environment").toString());
+								
 
 		ZCThreadLocal.putValue("CATALYST_CONFIG", catalystConfig.toString());
 	}
@@ -231,6 +235,17 @@ public class JavaintegInvoker {
 
 			Method runner = cls.getMethod("runner", ZCIntegRequest.class);
 			ZCIntegResponse integResponse = null;
+
+			if(System.getenv("DEBUG") != null && System.getenv("DEBUG").equals("false")) {
+				Timer executionTimer = new Timer(true);
+				executionTimer.schedule(new TimerTask() {
+					@Override
+					public void run() {
+						throwAndExit(new TimeoutException("function execution timeout"), 408, invokerDir);
+					}
+				}, 900000L); // 15 mins
+			}
+
 			try {
 				integResponse = (ZCIntegResponse) runner.invoke(cls.getDeclaredConstructor().newInstance(), integRequest);
 			} catch (Exception e) {

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

@@ -20,6 +20,19 @@ const writeAndExit = (resp) => {
 	process.exit(0);
 };
 
+/**
+ * execution timeout of 15 minutes
+ */
+const timeout = 15 * 60 * 1000;
+// const endTime = timeout + Date.now();
+
+// exit on timeout
+process.env.DEBUG === 'false' &&
+	setTimeout(() => {
+		writeToFile('TIMEOUT', 408);
+		process.exit(0);
+	}, timeout);
+
 const integrationRequest = data || {};
 
 integrationRequest.catalystHeaders = Object.assign(projectJson, authJson);

package/lib/shell/dependencies/invoker/job/java/JavajobInvoker.java

@@ -10,6 +10,9 @@ import java.net.URLClassLoader;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -214,7 +217,7 @@ public class JavajobInvoker {
 			JSONObject jobMetaDetails = jobDetails.getJSONObject("job_meta_details");
 			JSONObject jobpoolDetails = jobMetaDetails.getJSONObject("jobpool_details");
 			JSONObject projectDetails = jobpoolDetails.getJSONObject("project_details");
-			JSONObject capacity = jobDetails.getJSONObject("capacity");
+			JSONObject capacity = userData.getJSONObject("capacity");
 			JSONObject params = jobMetaDetails.getJSONObject("params");
 
 			defaultJob.setJobDetails(jobDetails != null ? (JSONObject) jobDetails : new JSONObject());
@@ -233,6 +236,17 @@ public class JavajobInvoker {
 
 			Method runner = cls.getMethod("handleJobExecute", JobRequest.class, Context.class);
 			JOB_STATUS jobStatus = null;
+
+			if(System.getenv("DEBUG") != null && System.getenv("DEBUG").equals("false")) {
+				Timer executionTimer = new Timer(true);
+				executionTimer.schedule(new TimerTask() {
+					@Override
+					public void run() {
+						throwAndExit(new TimeoutException("function execution timeout"), 408, invokerDir);
+					}
+				}, defaultContext.getMaxExecutionTimeMs());
+			}
+
 			try {
 				jobStatus = (JOB_STATUS) runner.invoke(cls.getDeclaredConstructor().newInstance(), jobRequest, context);
 			} catch (Exception e) {