zcatalyst-cli 1.25.2 → 1.26.0

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

@@ -21,8 +21,6 @@ const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 const endpoints_1 = require("../../../../endpoints");
 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");
@@ -32,15 +30,7 @@ const container_1 = require("../../../../util_modules/container");
 const container_plugin_1 = require("@zcatalyst/container-plugin");
 const appsail_1 = require("../../../../util_modules/config/lib/appsail");
 const image_1 = require("@zcatalyst/container-plugin/out/endpoints/image");
-function executeHook(script, name, moduleSource) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
-            (0, index_1.debug)(`skipping ${name} hook`);
-            return;
-        }
-        return (0, execute_script_1.executeCommand)(script, { moduleSource, feature: name });
-    });
-}
+const util_1 = require("./util");
 const startAppSail = (port, opts) => {
     if (port === -1) {
         throw new error_1.default('The AppSail Http port value is invalid: ' + port, { exit: 2 });
@@ -54,7 +44,7 @@ const startAppSail = (port, opts) => {
         cwd: opts.target,
         stdio: 'pipe',
         killSignal: 'SIGINT',
-        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 || {}))
+        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), PATH: opts.bin ? `${opts.bin}${path_1.delimiter}${process.env.PATH}` : process.env.PATH }, (opts.env || {}))
     }).RAW();
     return new Promise((_res, _rej) => {
         child.on('spawn', () => _res(child));
@@ -62,8 +52,8 @@ const startAppSail = (port, opts) => {
     });
 };
 function startAppSailWithContainer(serverDetails) {
-    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g;
         const targetSail = serverDetails.target;
         if (!targetSail || !targetSail.config) {
             throw new error_1.default('Invalid AppSail target', { exit: 2 });
@@ -88,18 +78,19 @@ function startAppSailWithContainer(serverDetails) {
                 const tarStream = fs_1.SYNC.getReadStream(tarPath);
                 const imgName = `${serverDetails.target.name}-tar`;
                 const imageInfo = yield (0, image_1.loadTempImageTar)(imgName, tarStream);
-                serverDetails.target.source = 'docker://' + ((_d = imageInfo.RepoTags) === null || _d === void 0 ? void 0 : _d.at(0));
+                const loadedImage = (_d = imageInfo.RepoTags) === null || _d === void 0 ? void 0 : _d.at(0);
+                serverDetails.target.source = `docker://${loadedImage}`;
                 child = yield (0, container_plugin_1.start)({
                     details: serverDetails,
                     projectId: (0, project_1.getProjectId)(),
                     ruok: container_plugin_1.RUOK.SKIP
                 });
                 child.once('exit', () => {
-                    (0, image_1.removeImages)(imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on exit: ', er));
+                    (0, image_1.removeImages)(loadedImage || imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on exit: ', er));
                 });
                 child.once('error', (err) => {
                     (0, index_1.debug)('Error with the AppSail container: ', err);
-                    (0, image_1.removeImages)(imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on error: ', er));
+                    (0, image_1.removeImages)(loadedImage || imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on error: ', er));
                 });
                 break;
             }
@@ -136,7 +127,7 @@ function startAppSailWithContainer(serverDetails) {
     });
 }
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     let child;
     const targetSail = serverDetails.target;
     if (!targetSail || !targetSail.config) {
@@ -144,7 +135,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
     }
     if ((targetSail === null || targetSail === void 0 ? void 0 : targetSail.runtime) === 'catalyst') {
         if ((_a = targetSail.config.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
-            yield executeHook(targetSail.config.scripts.preserve, `AppSail [PRESERVE] [${targetSail.name}]`, targetSail.source);
+            yield util_1.AppsailUtils.executeHook(targetSail.config.scripts.preserve, `AppSail [PRESERVE] [${targetSail.name}]`, targetSail.source);
         }
         const buildPath = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path;
         if (!buildPath) {
@@ -184,7 +175,8 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     command: targetSail.config.command,
                     memory: targetSail.config.memory || 256,
                     env: targetSail.config.env_variables,
-                    name: targetSail.name
+                    name: targetSail.name,
+                    bin: targetSail.binPath
                 });
                 break;
             }
@@ -195,21 +187,22 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     command: targetSail.config.command,
                     memory: targetSail.config.memory || 256,
                     env: targetSail.config.env_variables,
-                    name: targetSail.name
+                    name: targetSail.name,
+                    bin: targetSail.binPath
                 });
                 break;
             }
             case (_l = (_k = targetSail.config) === null || _k === void 0 ? void 0 : _k.stack) === null || _l === void 0 ? void 0 : _l.startsWith('java'): {
                 if (targetSail.config.platform === 'war') {
-                    const jettyPath = (0, path_1.join)(constants_1.ENVPATH.runtimes.data, 'jetty');
-                    if (!(yield fs_1.ASYNC.fileExists((0, path_1.join)(jettyPath, 'start.jar')).catch((err) => (0, index_1.debug)(err)))) {
+                    const jettyConfig = util_1.AppsailUtils.getJettyConfig(((_m = targetSail.config) === null || _m === void 0 ? void 0 : _m.stack) || '', target, targetSail.port.appsail.host);
+                    if (!(yield fs_1.ASYNC.fileExists((0, path_1.join)(jettyConfig.jettyPath, 'start.jar')).catch((err) => (0, index_1.debug)(err)))) {
                         try {
-                            yield fs_1.ASYNC.ensureDir(jettyPath);
+                            yield fs_1.ASYNC.ensureDir(jettyConfig.jettyPath);
                             const appxAPI = yield (0, endpoints_1.appSailAPI)();
-                            const jettyZip = yield appxAPI.downloadJetty();
+                            const jettyZip = yield appxAPI.downloadJetty(jettyConfig.jettyDownloadUrl);
                             const zip = new archiver_1.default();
                             zip.load(jettyZip);
-                            zip.extract(jettyPath, '/', {
+                            zip.extract(jettyConfig.jettyPath, '/', {
                                 isFolder: true
                             });
                             yield zip.finalize();
@@ -219,14 +212,14 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                             throw err;
                         }
                     }
-                    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.host}`;
                     child = yield startAppSail(targetSail.port.appsail.host, {
                         target,
                         type: 'war',
-                        command: jettyCommand,
+                        command: jettyConfig.jettyCommand,
                         memory: targetSail.config.memory || 256,
-                        env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
-                        name: targetSail.name
+                        env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyConfig.jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
+                        name: targetSail.name,
+                        bin: targetSail.binPath
                     });
                     break;
                 }
@@ -236,7 +229,8 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     type: 'javase',
                     memory: targetSail.config.memory || 256,
                     env: targetSail.config.env_variables,
-                    name: targetSail.name
+                    name: targetSail.name,
+                    bin: targetSail.binPath
                 });
                 break;
             }
@@ -247,7 +241,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     errorId: 'SERVE-APPSAIL-4',
                     arg: [
                         (0, ansi_colors_1.bold)(targetSail.name),
-                        ansi_colors_1.bold.red(((_m = targetSail.config) === null || _m === void 0 ? void 0 : _m.stack) + ''),
+                        ansi_colors_1.bold.red(((_o = targetSail.config) === null || _o === void 0 ? void 0 : _o.stack) + ''),
                         appSailRuntime.runtimes.map((val) => (0, ansi_colors_1.bold)(`* ${val}`)).join('\n')
                     ]
                 });
@@ -272,7 +266,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
         (0, index_1.debug)('Error with the AppSail proxy server: ', err);
     });
     child.once('exit', (code) => __awaiter(void 0, void 0, void 0, function* () {
-        var _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g;
         typeof targetSail.port.appsail === 'number' &&
             port_resolver_1.default.freePort(targetSail.port.appsail);
         port_resolver_1.default.freePort(targetSail.port.proxy);
@@ -286,14 +280,14 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                 errorId: 'SERVE-APPSAIL-3',
                 arg: [
                     (0, ansi_colors_1.bold)(targetSail.name),
-                    ((_o = targetSail.config) === null || _o === void 0 ? void 0 : _o.command) || '',
-                    (0, ansi_colors_1.underline)(((_p = targetSail.config) === null || _p === void 0 ? void 0 : _p.build_path) || ''),
-                    ((_q = targetSail.config) === null || _q === void 0 ? void 0 : _q.stack) || ''
+                    ((_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) || ''
                 ]
             });
         }
-        if ((_s = (_r = targetSail.config) === null || _r === void 0 ? void 0 : _r.scripts) === null || _s === void 0 ? void 0 : _s.postserve) {
-            yield executeHook((_u = (_t = targetSail.config) === null || _t === void 0 ? void 0 : _t.scripts) === null || _u === void 0 ? void 0 : _u.postserve, `AppSail [POSTSERVE] [${targetSail.name}]`, targetSail.source);
+        if ((_e = (_d = targetSail.config) === null || _d === void 0 ? void 0 : _d.scripts) === null || _e === void 0 ? void 0 : _e.postserve) {
+            yield util_1.AppsailUtils.executeHook((_g = (_f = targetSail.config) === null || _f === void 0 ? void 0 : _f.scripts) === null || _g === void 0 ? void 0 : _g.postserve, `AppSail [POSTSERVE] [${targetSail.name}]`, targetSail.source);
         }
     }));
     return child;

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

@@ -4,8 +4,7 @@
 // exit codes
 // 150 - start up command failure
 
-const EXEC = require('child_process').exec;
-
+const { spawn } = require('cross-spawn');
 const WAR = 'war';
 const JAVASE = 'javase';
 const NODEJS = 'nodejs';
@@ -62,7 +61,12 @@ function main() {
 			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
 	}
 
-	const _process = EXEC(command.toString(), { cwd });
+	const _process = spawn('sh', ['-c', command.toString()], {
+		cwd,
+		env: process.env,
+		stdio: 'pipe',
+		detached: true
+	});
 
 	_process.on('error', (error) => {
 		// eslint-disable-next-line no-console
@@ -73,8 +77,11 @@ function main() {
 	_process.stdout.pipe(process.stdout);
 	_process.stderr.pipe(process.stderr);
 
-	process.once('SIGINT', () => {
-		_process.kill('SIGINT');
+	['SIGINT', 'SIGTERM'].forEach((signal) => {
+		process.on(signal, () => {
+			process.kill(-_process.pid, signal);
+			process.exit();
+		});
 	});
 }
 

package/lib/serve/server/lib/appsail/util.d.ts

@@ -0,0 +1,11 @@
+export declare const AppsailUtils: {
+    executeHook(script: string, name: string, moduleSource: string): Promise<void>;
+    getVersion(stack: string): number;
+    getJettyVersion(javaVersion: number): number;
+    getJettyCommand(jettyPath: string, jettyVersion: string, target: string, port: number): string;
+    getJettyConfig(stack: string, target: string, port: number): {
+        jettyPath: string;
+        jettyCommand: string;
+        jettyDownloadUrl: string;
+    };
+};

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

@@ -0,0 +1,69 @@
+'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.AppsailUtils = void 0;
+const path_1 = require("path");
+const constants_1 = require("../../../../util_modules/constants");
+const project_1 = require("../../../../util_modules/project");
+const option_1 = require("../../../../util_modules/option");
+const console_1 = require("console");
+const execute_script_1 = require("../../../../execute-script");
+exports.AppsailUtils = {
+    executeHook(script, name, moduleSource) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
+                (0, console_1.debug)(`skipping ${name} hook`);
+                return;
+            }
+            return (0, execute_script_1.executeCommand)(script, { moduleSource, feature: name });
+        });
+    },
+    getVersion(stack) {
+        return parseInt(stack.replace(/\D/g, ''), 10);
+    },
+    getJettyVersion(javaVersion) {
+        const group1 = [8, 11, 17];
+        const group2 = [21, 25];
+        if (group1.includes(javaVersion))
+            return 1;
+        if (group2.includes(javaVersion))
+            return 2;
+        return 0;
+    },
+    getJettyCommand(jettyPath, jettyVersion, target, port) {
+        const command = [];
+        command.push('java -jar');
+        command.push(`"${(0, path_1.join)(jettyPath, 'start.jar')}"`);
+        switch (jettyVersion) {
+            case 'v1':
+                command.push(`-Djetty.http.port=${port}`);
+                command.push(`-Djetty.deploy.monitoredPath="${(0, project_1.resolveProjectPath)(target)}"`);
+                break;
+            case 'v2':
+                command.push(`jetty.http.port=${port}`);
+                command.push(`jetty.deploy.webappsDir="${(0, project_1.resolveProjectPath)(target)}"`);
+                break;
+        }
+        return command.join(' ');
+    },
+    getJettyConfig(stack, target, port) {
+        const javaVersion = this.getVersion(stack);
+        const jettyVersion = `v${this.getJettyVersion(javaVersion)}`;
+        const jettyPath = (0, path_1.join)(constants_1.ENVPATH.runtimes.data, 'jetty', jettyVersion);
+        const jettyCommand = this.getJettyCommand(jettyPath, jettyVersion, target, port);
+        const jettyDownloadUrl = `/catalyst/appsail/${jettyVersion}/jetty_runtime_dependency.zip`;
+        return {
+            jettyPath,
+            jettyCommand,
+            jettyDownloadUrl
+        };
+    }
+};

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -84,6 +94,7 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
     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',
+        detached: true,
         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: (_h = details.target) === null || _h === void 0 ? void 0 : _h.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), CHROME_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_EXECUTABLE', process.env.CHROME_EXECUTABLE_PATH), CHROMEDRIVER_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_DRIVER_EXECUTABLE', process.env.CHROMEDRIVER_EXECUTABLE_PATH) }, details.target.env_var)
     }).RAW();
 });

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

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAppSailRoutes = void 0;
+exports.addAppSailRoutes = addAppSailRoutes;
 const utils_1 = require("./utils");
 const error_1 = __importDefault(require("../../../../error"));
 function addAppSailRoutes(app, details, proxy, unknownProxy) {
@@ -49,9 +49,9 @@ function addAppSailRoutes(app, details, proxy, unknownProxy) {
     }
     const targetUrl = `http://127.0.0.1:${appsailPort}`;
     app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _g, _h;
+        var _a, _b;
         if (req.header('catalyst-component') === 'true' && req.url.length > 1) {
-            ((_h = (_g = details.target) === null || _g === void 0 ? void 0 : _g.config) === null || _h === void 0 ? void 0 : _h.catalyst_auth) === true
+            ((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true
                 ? unknownProxy(req, res)
                 : res.sendStatus(400);
             return;
@@ -66,4 +66,3 @@ function addAppSailRoutes(app, details, proxy, unknownProxy) {
         });
     });
 }
-exports.addAppSailRoutes = addAppSailRoutes;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addFnRoutes = void 0;
+exports.addFnRoutes = addFnRoutes;
 const constants_1 = require("../../../../util_modules/constants");
 function addFnRoutes(app, details, proxy) {
     if (details.isAlive === false) {
@@ -58,4 +58,3 @@ function addFnRoutes(app, details, proxy) {
         });
     }
 }
-exports.addFnRoutes = addFnRoutes;

package/lib/serve/server/lib/master/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Server } from 'http';
 import { IServerDetails, TServerTargets } from '../../index';
 import { TAppSailServerDetails } from '../../../features/appsail';

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

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = spinUpMaster;
 const express_1 = __importDefault(require("express"));
 const error_1 = __importDefault(require("../../../../error"));
 const apig_matcher_1 = __importDefault(require("../../../../express_middlewares/apig-matcher"));
@@ -35,9 +36,9 @@ const web_client_1 = require("./web-client");
 const functions_1 = require("./functions");
 const slate_1 = require("./slate");
 const apig_1 = __importDefault(require("../../../features/apig"));
-function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDetails }) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
+function spinUpMaster(listenPort_1, _a) {
+    return __awaiter(this, arguments, void 0, function* (listenPort, { otherServerDetails, appSailDetails, slateDetails }) {
+        var _b, _c;
         if ((otherServerDetails && appSailDetails && slateDetails) ||
             (!otherServerDetails && !appSailDetails && !slateDetails)) {
             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 });
@@ -98,7 +99,7 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
         }
         const proxy = (0, utils_1.createProxyServer)(listenPort);
         const signRedirectUrl = slateDetails ? '/' : '/app/local-redirect';
-        appSailDetails && ((_b = (_a = appSailDetails.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true
+        appSailDetails && ((_c = (_b = appSailDetails.target) === null || _b === void 0 ? void 0 : _b.config) === null || _c === void 0 ? void 0 : _c.catalyst_auth) === true
             ? proxy.on('proxyRes', (0, utils_1.proxyResponseHandler)({
                 signInRedirect: appSailDetails.target.config.login_redirect || '/'
             }))
@@ -164,4 +165,3 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
         return expressServer;
     });
 }
-exports.default = spinUpMaster;

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSlateRoutes = void 0;
+exports.addSlateRoutes = addSlateRoutes;
 function addSlateRoutes(app, details, proxy, unknownProxy) {
     if (!details.isAlive === false) {
         return;
@@ -29,4 +29,3 @@ function addSlateRoutes(app, details, proxy, unknownProxy) {
         });
     }));
 }
-exports.addSlateRoutes = addSlateRoutes;

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const index_1 = require("../../../../util_modules/logger/index");
+const env_1 = require("../../../../util_modules/env");
 exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
     if (req.url.length === 1 && req.url.startsWith('/')) {
         res.redirect('/app/');
@@ -32,13 +33,15 @@ exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
             headers['origin'] = `https://${req.headers['x-zc-project-domain']}`;
         }
         if (req.url.includes('/__catalyst/auth/')) {
-            headers['catalyst-redirect-domain'] = `http://localhost:${masterPort || 3000}`;
+            headers['catalyst-redirect-domain'] = (0, env_1.getLocalAccessDomain)(masterPort || 3000);
         }
         proxyInstance.web(req, res, {
             target: `https://${req.headers['x-zc-project-domain']}`,
             changeOrigin: true,
             cookieDomainRewrite: {
-                [req.headers['x-zc-project-domain'] + '']: 'localhost'
+                [req.headers['x-zc-project-domain'] + '']: env_1.isExtension
+                    ? (0, env_1.getLocalAccessDomain)(masterPort || 3000)
+                    : 'localhost'
             },
             ws: true,
             headers

package/lib/serve/server/lib/master/utils.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { IAPIGLocal, IAPIGRules } from '../../../../apig-utils';
 import Server from 'http-proxy';
-import EventEmitter from 'events';
+import { CatalystEventEmitter } from '../../../../util_modules/event-emitter';
 export interface IMatchRule extends IAPIGRules {
     target_endpoint: string;
     source_endpoint: string;
@@ -10,15 +9,12 @@ export interface IMatchRule extends IAPIGRules {
         [x: string]: string;
     };
 }
-declare class ServerEvent extends EventEmitter {
-}
-export declare const serverEvent: ServerEvent;
+export declare const serverEvent: CatalystEventEmitter;
 export declare const removeSecure: (str: string) => string;
 export declare const redirectByAuth: (req: IncomingMessage, res: ServerResponse, redirectUrl: string) => void;
 export declare const createProxyServer: (port: number) => Server;
 export declare const proxyResponseHandler: ({ systemRoutes, signInRedirect }: {
-    systemRoutes?: IAPIGLocal | undefined;
-    signInRedirect?: string | undefined;
+    systemRoutes?: IAPIGLocal;
+    signInRedirect?: string;
 }) => (proxyRes: IncomingMessage, req: IncomingMessage, res: ServerResponse) => void;
 export declare const appsailInitJs: () => Promise<string>;
-export {};

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

@@ -20,10 +20,8 @@ const error_1 = __importDefault(require("../../../../error"));
 const project_1 = require("../../../../util_modules/project");
 const http_proxy_1 = require("http-proxy");
 const index_1 = require("../../../../util_modules/logger/index");
-const events_1 = __importDefault(require("events"));
-class ServerEvent extends events_1.default {
-}
-exports.serverEvent = new ServerEvent();
+const event_emitter_1 = require("../../../../util_modules/event-emitter");
+exports.serverEvent = new event_emitter_1.CatalystEventEmitter();
 const iam_cookies = [
     'ZD_CSRF_TOKEN',
     '_iamadt_client',
@@ -118,13 +116,13 @@ const proxyResponseHandler = ({ systemRoutes, signInRedirect }) => (proxyRes, re
         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;'));
+                const result = set.map((cookie) => cookie.replace(new RegExp('Domain=[\\S^;]*', 'g'), 'Path=/'));
                 proxyRes.headers['set-cookie'] = result;
             }
         }
     }
     else if (req.url.startsWith('/accounts') && req.url.includes('/signin')) {
-        (_b = proxyRes.headers['set-cookie']) === null || _b === void 0 ? void 0 : _b.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/');
+        (_b = proxyRes.headers['set-cookie']) === null || _b === void 0 ? void 0 : _b.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Path=/');
     }
 };
 exports.proxyResponseHandler = proxyResponseHandler;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addWebClientRoutes = void 0;
+exports.addWebClientRoutes = addWebClientRoutes;
 function addWebClientRoutes(app, details, proxy, unknownProxy) {
     const appTarget = `http://127.0.0.1:${details.httpPort}/app/`;
     app.use('/app', (req, res) => {
@@ -36,4 +36,3 @@ function addWebClientRoutes(app, details, proxy, unknownProxy) {
         });
     });
 }
-exports.addWebClientRoutes = addWebClientRoutes;

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -56,7 +66,7 @@ const shell_1 = require("../../../../util_modules/shell");
 const container_1 = require("../../../../util_modules/container");
 const container_plugin_1 = require("@zcatalyst/container-plugin/");
 exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     if (!details.target) {
         throw new error_1.default('Invalid Node function target', { exit: 2 });
     }
@@ -76,7 +86,7 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
         });
     }
     const label = `${details.type}[${(_g = details.target) === null || _g === void 0 ? void 0 : _g.name}]`;
-    const _o = details.target, { ['watcher']: _ } = _o, serialisableTarget = __rest(_o, ['watcher']);
+    const _q = details.target, { ['watcher']: _ } = _q, serialisableTarget = __rest(_q, ['watcher']);
     serialisableTarget.index = serialisableTarget.index
         ? serialisableTarget.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
         : undefined;
@@ -96,9 +106,10 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
         (0, index_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
         opts.unshift('--inspect=' + details.debugPort);
     }
-    return (0, shell_1.spawn)('node', opts, {
+    return (0, shell_1.spawn)(((_o = (_m = details.target) === null || _m === void 0 ? void 0 : _m.additionalInfo) === null || _o === void 0 ? void 0 : _o.binPath) || 'node', opts, {
         cwd: codeLocation,
         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: (_m = details.target) === null || _m === void 0 ? void 0 : _m.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), CHROME_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_EXECUTABLE', process.env.CHROME_EXECUTABLE_PATH), CHROMEDRIVER_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_DRIVER_EXECUTABLE', process.env.CHROMEDRIVER_EXECUTABLE_PATH) }, details.target.env_var)
+        detached: true,
+        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: (_p = details.target) === null || _p === void 0 ? void 0 : _p.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), CHROME_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_EXECUTABLE', process.env.CHROME_EXECUTABLE_PATH), CHROMEDRIVER_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_DRIVER_EXECUTABLE', process.env.CHROMEDRIVER_EXECUTABLE_PATH) }, details.target.env_var)
     }).RAW();
 });

package/lib/serve/server/lib/node/server/browserlogic/utils/playwright-handler.js

@@ -19,7 +19,7 @@ async function getBrowser() {
     if ((!browser || !browser.isConnected()) && !browserlaunching) {
         browserPromise = new DEFERED_PROMISE();
         browserlaunching = true;
-        let args = ['--remote-debugging-port=9002'];// No I18N
+        let args = ['--remote-debugging-port=9002', '--no-sandbox', '--disable-setuid-sandbox'];// No I18N
         browser = await playwright.chromium.launch({ executablePath: CHROME_EXECUTABLE_PATH, args: args, headless: true });
         let version = await browser.version();
         console.log("Chrome started successfully " + version);

package/lib/serve/server/lib/node/server/browserlogic/utils/puppeteer-handler.js

@@ -20,7 +20,7 @@ async function getBrowser(path) {
     if ((!browser || !browser.isConnected()) && !browserlaunching) {
         browserPromise = new DEFERED_PROMISE();
         browserlaunching = true;
-        let args = ['--remote-debugging-port=9002'];// No I18N
+        let args = ['--remote-debugging-port=9002', '--no-sandbox', '--disable-setuid-sandbox'];// No I18N
         browser = await puppeteer.launch({ executablePath: CHROME_EXECUTABLE_PATH, args: args, headless: true });
         let version = await browser.version();
         console.log("Chrome started successfully " + version);