zcatalyst-cli 1.15.0-beta.2 → 1.15.0-beta.4

package/lib/serve/server/index.js

@@ -1,27 +1,4 @@
 'use strict';
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,38 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
 const error_1 = __importDefault(require("../../error"));
-const fn_utils_1 = require("../../fn-utils");
-const plugin_loader_1 = __importDefault(require("../../plugin-loader"));
-const userConfig_1 = __importDefault(require("../../userConfig"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
-const shell_1 = require("../../util_modules/shell");
 const master_1 = __importDefault(require("./lib/master"));
-const ansi_colors_1 = require("ansi-colors");
-const stream_1 = require("stream");
-const project_1 = require("../../util_modules/project");
-const http_functions_1 = require("../../shell/dependencies/http-functions");
+const index_js_1 = __importDefault(require("./lib/java/index.js"));
+const index_js_2 = __importDefault(require("./lib/node/index.js"));
+const index_js_3 = __importDefault(require("./lib/python/index.js"));
+const index_js_4 = __importDefault(require("./lib/web_client/index.js"));
+const index_js_5 = __importDefault(require("./lib/appsail/index.js"));
 const cli_table_1 = require("../../cli_table");
+const ansi_colors_1 = require("ansi-colors");
 const bioLogUrl = (name, pthName, httpPort, masterPort) => {
     (0, logger_1.labeled)(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
 };
@@ -73,7 +36,12 @@ const aioLogUrl = (details, masterPort) => {
 };
 class Server {
     constructor() {
-        this.targetDetailsArr = [];
+        this.targetsMap = {
+            functions: [],
+            server: [],
+            client: [],
+            appSail: []
+        };
     }
     _addBasicFnDetails() {
         const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
@@ -88,11 +56,11 @@ class Server {
                 var _a;
                 return t.url !== undefined &&
                     t.type === constants_1.FN_TYPE.basic &&
-                    !((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python));
+                    !((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value));
             })
                 .map((t) => js_1.JS.omit(t, ['zip_stream', 'localFn']))
                 .forEach((t) => {
-                this.targetDetailsArr.push({
+                this.targetsMap.functions.push({
                     type: 'functions',
                     httpPort,
                     debugPort,
@@ -101,138 +69,36 @@ class Server {
             });
         }
     }
-    _spinUpJavaServer(details, masterPort) {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            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);
-            const label = `${details.type}[${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}]`;
-            const opts = [
-                '-cp',
-                (0, path_1.join)(targetDir, '*') + fn_utils_1.fnUtils.java.classPathSep + targetDir + path_1.sep,
-                `-DCATALYST_FUNCTION_TYPE=${constants_1.REMOTE_REF.functions.type[details.target.type]}`
-            ];
-            if (details.debugPort !== -1) {
-                (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
-                opts.push('-Xdebug');
-                opts.push('-Xrunjdwp:transport=dt_socket,address=' + details.debugPort + ',server=y,suspend=y');
-            }
-            opts.push((0, path_1.basename)(javaServer));
-            opts.push(details.httpPort + '');
-            const targetSource = (_c = details.target) === null || _c === void 0 ? void 0 : _c.source;
-            const configType = details.type === 'server' ? 'functions' : details.type;
-            const servePlugin = yield (0, plugin_loader_1.default)(configType, 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
-            if (typeof servePlugin === 'function') {
-                const event = servePlugin(details, masterPort);
-                (0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
-                return event;
-            }
-            if (details.target.type === constants_1.FN_TYPE.browserLogic) {
-                details.target.env_var = Object.assign({ PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: true }, details.target.env_var);
-            }
-            const child = (0, shell_1.spawn)('java', 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)
-            }).RAW();
-            return child;
-        });
-    }
-    _spinUpProcess(details, masterPort) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
-            const _c = details.target, { ['watcher']: _ } = _c, serialisableTarget = __rest(_c, ['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))
-                : undefined;
-            const opts = [
-                (0, path_1.join)(__dirname, 'lib', 'node'),
-                details.httpPort + '',
-                JSON.stringify(serialisableTarget)
-            ];
-            if (details.debugPort !== -1) {
-                (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
-                opts.unshift('--inspect=' + details.debugPort);
-            }
-            const targetSource = (_b = details.target) === null || _b === void 0 ? void 0 : _b.source;
-            const configType = details.type === 'server' ? 'functions' : details.type;
-            const servePlugin = yield (0, plugin_loader_1.default)(configType, 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
-            if (typeof servePlugin === 'function') {
-                if (configType === 'client') {
-                    process.env.X_CATALYST_WEBAPP_PATH = targetSource;
-                }
-                const logStreamPlugin = yield (0, plugin_loader_1.default)(configType, 'logs', targetSource).catch((err) => (0, logger_1.debug)(err));
-                if (typeof logStreamPlugin === 'function') {
-                    const stream = yield logStreamPlugin();
-                    if (stream instanceof stream_1.Stream) {
-                        const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
-                        stream.on('data', streamLogFn);
-                    }
-                }
-                const event = servePlugin(details, masterPort).catch((e) => {
-                    var _a, _b;
-                    const err = error_1.default.getErrorInstance(e, {
-                        fileName: __filename,
-                        skipHelp: false
-                    });
-                    err.errorId = 'SERVE-IDX-1';
-                    err.arg = [
-                        configType,
-                        (0, ansi_colors_1.bold)(((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.start)[targetSource] || 'start'),
-                        (0, ansi_colors_1.bold)('Error: ') + ansi_colors_1.italic.red(err.message)
-                    ];
-                    throw err;
-                });
-                (0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
-                return event;
-            }
-            if (details.type === 'client') {
-                return yield (yield Promise.resolve().then(() => __importStar(require('./lib/web_client/index.js')))).default(details, masterPort);
-            }
-            const child = (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)
-            }).RAW();
-            return child;
-        });
-    }
-    _spinUpPythonServer(details) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectRoot = runtime_store_1.default.get('project.root');
-            const opts = ['-u', 'main.py'];
-            const targetSource = (_a = details.target) === null || _a === void 0 ? void 0 : _a.source;
-            const runtimesDir = constants_1.ENVPATH.runtimes.data;
-            const stackVersion = (_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.replace('python_', '');
-            return new Promise((res) => {
-                const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
-                    cwd: (0, path_1.join)(runtimesDir, runtime_1.default.language.python, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`),
-                    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)
-                }).RAW();
-                child.on('spawn', () => __awaiter(this, void 0, void 0, function* () {
-                    yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());
-                }));
-                res(child);
-            });
-        });
-    }
     add(type, target) {
+        if (type === 'appsail') {
+            this.targetsMap.appSail.push({
+                type,
+                target: target,
+                httpPort: -1,
+                debugPort: -1
+            });
+            return;
+        }
         const httpPort = runtime_store_1.default.get(`context.port.http.${type === 'server' ? 'functions' : type}.${target.name}`, -1);
         const debugPort = runtime_store_1.default.get(`context.port.debug.${type === 'server' ? 'functions' : type}.${target.name}`, -1);
         if (httpPort === -1) {
-            throw new error_1.default('http port is mandatory for target : ' + target.name + ' to start advanced server', { exit: 2 });
+            throw new error_1.default('http port is mandatory for target : ' +
+                target.name +
+                ' to start advanced server', { exit: 2 });
         }
-        this.targetDetailsArr.push({
-            type,
-            target,
-            httpPort,
-            debugPort
-        });
+        type === 'client'
+            ? this.targetsMap.client.push({
+                type,
+                target: target,
+                httpPort,
+                debugPort
+            })
+            : this.targetsMap.server.push({
+                type,
+                target: target,
+                httpPort,
+                debugPort
+            });
     }
     startServer(details, masterPort) {
         var _a, _b;
@@ -241,14 +107,31 @@ class Server {
                 return;
             }
             let currentProcess;
-            if ((_a = details.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
-                currentProcess = yield this._spinUpJavaServer(details, masterPort);
-            }
-            else if ((_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.python)) {
-                currentProcess = yield this._spinUpPythonServer(details);
-            }
-            else {
-                currentProcess = yield this._spinUpProcess(details, masterPort);
+            switch (details.type) {
+                case 'appsail': {
+                    currentProcess = yield (0, index_js_5.default)(details.target, masterPort);
+                    break;
+                }
+                case 'client': {
+                    currentProcess = yield (0, index_js_4.default)(details, masterPort);
+                    break;
+                }
+                case 'functions':
+                case 'server': {
+                    if ((_a = details.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java.value)) {
+                        currentProcess = yield (0, index_js_1.default)(details, masterPort);
+                    }
+                    else if ((_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.node.value)) {
+                        currentProcess = yield (0, index_js_2.default)(details, masterPort);
+                    }
+                    else {
+                        currentProcess = yield (0, index_js_3.default)(details);
+                    }
+                    break;
+                }
+                default: {
+                    throw new error_1.default('Invalid feature type', { exit: 2 });
+                }
             }
             details.process = currentProcess;
             const stdout = currentProcess.stdout;
@@ -272,19 +155,21 @@ class Server {
             if (masterPort === -1) {
                 throw new error_1.default('master port cannot be undefined', { exit: 2 });
             }
-            yield Promise.all(this.targetDetailsArr.map((details) => __awaiter(this, void 0, void 0, function* () { return this.startServer(details, masterPort); })));
+            const serveTargets = Object.values(this.targetsMap);
+            yield Promise.all(serveTargets.map((targetDetails) => Promise.all(targetDetails.map((details) => this.startServer(details, masterPort)))));
             this._addBasicFnDetails();
-            if (this.targetDetailsArr.length === 0) {
+            const serveTargetsArr = serveTargets.flat();
+            if (serveTargetsArr.length === 0) {
                 throw new error_1.default('Trying to start master server before other server', {
                     exit: 2
                 });
             }
-            const server = yield (0, master_1.default)(masterPort, this.targetDetailsArr);
+            const server = yield (0, master_1.default)(masterPort, this.targetsMap);
             this.masterServer = server;
-            this.targetDetailsArr.some((t) => {
+            this.targetsMap.server.every((t) => {
                 var _a;
-                if (t.debugPort != -1 &&
-                    ((_a = t.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python))) {
+                if (t.debugPort !== -1 &&
+                    ((_a = t.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value))) {
                     const table = (0, cli_table_1.getCustomColourTable)(ansi_colors_1.yellow);
                     table.push(['As of now, local debugging for python is not supported']);
                     (0, logger_1.info)(table.toString());
@@ -292,9 +177,7 @@ class Server {
                 }
                 return false;
             });
-            this.targetDetailsArr
-                .filter((t) => t.type == 'functions')
-                .forEach((t) => {
+            this.targetsMap.functions.forEach((t) => {
                 const target = t.target;
                 if (!target.url) {
                     throw new error_1.default('Target URL not found', { exit: 2 });
@@ -302,14 +185,12 @@ class Server {
                 bioLogUrl(target.name, new URL(target.url).pathname, t.httpPort, masterPort);
             });
             (0, logger_1.info)();
-            this.targetDetailsArr
-                .filter((t) => t.type == 'server')
-                .forEach((t) => {
+            this.targetsMap.server.forEach((t) => {
                 aioLogUrl(t, masterPort);
             });
             return new Promise((res) => {
                 server.on('listening', () => {
-                    this.targetDetailsArr.forEach((targetDetails) => {
+                    serveTargetsArr.forEach((targetDetails) => {
                         var _a;
                         if (targetDetails.process &&
                             'send' in targetDetails.process) {
@@ -330,36 +211,38 @@ class Server {
                 (0, logger_1.debug)('Master server is not started yet.');
                 throw new error_1.default('Server cannot be put to wait state.', { exit: 2 });
             }
-            this.targetDetailsArr.forEach((targetdetails) => {
-                var _a, _b;
-                const target = targetdetails.target;
-                if (!target || !targetdetails.process) {
-                    return;
-                }
-                (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => __awaiter(this, void 0, void 0, function* () {
-                    yield this.kill(targetdetails.process);
-                }));
-                (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => __awaiter(this, void 0, void 0, function* () {
-                    yield this.restart(target);
-                    if (target.type === constants_1.FN_TYPE.basic) {
-                        (0, logger_1.labeled)(`functions(${target.name})`, 'ready!').MESSAGE();
-                        if (!target.url) {
-                            throw new error_1.default('Target URL not found while restarting server', {
-                                exit: 2
-                            });
-                        }
-                        bioLogUrl(target.name, new URL(target.url).pathname, targetdetails.httpPort, masterPort);
-                    }
-                    else if (target.type === constants_1.FN_TYPE.advanced) {
-                        (0, logger_1.labeled)(`server[${target.name}]`, 'ready!').MESSAGE();
-                        aioLogUrl(targetdetails, masterPort);
+            Object.values(this.targetsMap).forEach((details) => {
+                details.forEach((targetdetails) => {
+                    var _a, _b;
+                    const target = targetdetails.target;
+                    if (!target || !targetdetails.process) {
+                        return;
                     }
-                    setTimeout(() => {
-                        var _a;
-                        (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
-                    }, 1000);
-                }));
-            }, this);
+                    (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => __awaiter(this, void 0, void 0, function* () {
+                        yield this.kill(targetdetails.process);
+                    }));
+                    (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => __awaiter(this, void 0, void 0, function* () {
+                        yield this.restart(targetdetails);
+                        if (target.type === constants_1.FN_TYPE.basic) {
+                            (0, logger_1.labeled)(`functions[${target.name}]`, 'ready!').MESSAGE();
+                            if (!target.url) {
+                                throw new error_1.default('Target URL not found while restarting server', {
+                                    exit: 2
+                                });
+                            }
+                            bioLogUrl(target.name, new URL(target.url).pathname, targetdetails.httpPort, masterPort);
+                        }
+                        else if (target.type === constants_1.FN_TYPE.advanced) {
+                            (0, logger_1.labeled)(`server[${target.name}]`, 'ready!').MESSAGE();
+                            aioLogUrl(targetdetails, masterPort);
+                        }
+                        setTimeout(() => {
+                            var _a;
+                            (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
+                        }, 1000);
+                    }));
+                }, this);
+            });
             return new Promise((res) => {
                 ['SIGINT', 'SIGTERM'].forEach((sig) => process.on(sig, res));
             });
@@ -385,21 +268,16 @@ class Server {
     }
     restart(target) {
         return __awaiter(this, void 0, void 0, function* () {
-            const targetIdx = this.targetDetailsArr.findIndex((targetDetails) => { var _a; return target.source === ((_a = targetDetails.target) === null || _a === void 0 ? void 0 : _a.source); });
-            if (targetIdx === -1) {
-                throw new error_1.default('Unknown target given for restart.', { exit: 2 });
-            }
-            const targetProcess = this.targetDetailsArr[targetIdx].process;
-            if (!targetProcess) {
+            if (!target.process) {
                 throw new error_1.default('Process is not defined for this target.', { exit: 2 });
             }
-            yield this.kill(targetProcess);
-            yield this.startServer(this.targetDetailsArr[targetIdx], runtime_store_1.default.get(`context.port.http.master`, -1));
+            yield this.kill(target.process);
+            yield this.startServer(target, runtime_store_1.default.get(`context.port.http.master`, -1));
         });
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all(this.targetDetailsArr.map((targetdetails) => __awaiter(this, void 0, void 0, function* () {
+            yield Promise.all(Object.values(this.targetsMap).map((details) => Promise.all(details.map((targetdetails) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 const target = targetdetails.target;
                 if (!target) {
@@ -409,7 +287,7 @@ class Server {
                 if (targetdetails.process) {
                     return this.kill(targetdetails.process);
                 }
-            }))).catch((err) => (0, logger_1.debug)('Error stopping the servers: ', err));
+            }))))).catch((err) => (0, logger_1.debug)('Error stopping the servers: ', err));
             if (this.masterServer) {
                 const masterServer = this.masterServer;
                 return new Promise((res, rej) => {

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

@@ -0,0 +1,134 @@
+"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 path_1 = require("path");
+const error_1 = __importDefault(require("../../../../error"));
+const constants_1 = require("../../../../util_modules/constants");
+const fs_1 = require("../../../../util_modules/fs");
+const logger_1 = require("../../../../util_modules/logger");
+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");
+function executeHook(script, name, moduleSource) {
+    if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
+        (0, logger_1.debug)(`skipping ${name} hook`);
+        return;
+    }
+    (0, execute_script_1.executeCommand)(script, { moduleSource, feature: name });
+}
+const startAppSail = (port, opts) => {
+    const startScriptPath = (0, path_1.join)(__dirname, 'start.js');
+    const _opts = [startScriptPath, '-t', opts.type];
+    if (opts.command) {
+        _opts.push('-c', opts.command);
+    }
+    return (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 || {}))
+    }).RAW();
+};
+exports.default = (targetSail, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    let child;
+    if (!targetSail.appSail) {
+        throw new error_1.default('AppSail details not found');
+    }
+    if ((_a = targetSail.appSail.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
+        executeHook(targetSail.appSail.scripts.preserve, `AppSail [PRESERVE] [${(_b = targetSail.appSail) === null || _b === void 0 ? void 0 : _b.name}]`, targetSail.appSail.source);
+    }
+    const target = (yield fs_1.ASYNC.isFile(targetSail.appSail.buildPath))
+        ? (0, path_1.dirname)(targetSail.appSail.buildPath)
+        : targetSail.appSail.buildPath;
+    switch (true) {
+        case targetSail.appSail.stack.startsWith('node'): {
+            child = startAppSail(targetSail.port, {
+                type: 'nodejs',
+                target,
+                command: targetSail.appSail.command,
+                memory: targetSail.appSail.memory || 256,
+                env: targetSail.appSail.env_variables
+            });
+            break;
+        }
+        case targetSail.appSail.stack.startsWith('python'): {
+            child = startAppSail(targetSail.port, {
+                type: 'python',
+                target,
+                command: targetSail.appSail.command,
+                memory: targetSail.appSail.memory || 256,
+                env: targetSail.appSail.env_variables
+            });
+            break;
+        }
+        case targetSail.appSail.stack.startsWith('java'): {
+            if (targetSail.appSail.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, logger_1.debug)(err)))) {
+                    try {
+                        yield fs_1.ASYNC.ensureDir(jettyPath);
+                        const appxAPI = yield (0, endpoints_1.appSailAPI)();
+                        const jettyZip = yield appxAPI.downloadJetty();
+                        const zip = new archiver_1.default();
+                        zip.load(jettyZip);
+                        zip.extract(jettyPath, '/', {
+                            ignoreInitial: false,
+                            isFolder: true
+                        });
+                        yield zip.finalize();
+                    }
+                    catch (err) {
+                        (0, logger_1.debug)('Unable to ensure Jetty Runtime');
+                        throw err;
+                    }
+                }
+                const jettyCommand = `java -jar ${(0, path_1.join)(jettyPath.replace(/ /g, '\\ '), 'start.jar')} -Djetty.deploy.monitoredPath=${(0, project_1.resolveProjectPath)(targetSail.appSail.buildPath)} -Djetty.http.port=${targetSail.port} --dry-run=opts,path,main,args`;
+                child = startAppSail(targetSail.port, {
+                    target,
+                    type: 'war',
+                    command: jettyCommand,
+                    memory: targetSail.appSail.memory || 256,
+                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.appSail.env_variables)
+                });
+                break;
+            }
+            child = startAppSail(targetSail.port, {
+                target,
+                command: targetSail.appSail.command,
+                type: 'javase',
+                memory: targetSail.appSail.memory || 256,
+                env: targetSail.appSail.env_variables
+            });
+            break;
+        }
+        default: {
+            throw new error_1.default('Invalid AppSail stack');
+        }
+    }
+    (0, logger_1.labeled)(`AppSail(${targetSail.appSail.name})`, `URL : http://localhost:${masterPort}/appsail/${targetSail.appSail.name}/`).MESSAGE();
+    (0, logger_1.info)();
+    if ((_c = targetSail.appSail.scripts) === null || _c === void 0 ? void 0 : _c.postserve) {
+        child.once('exit', () => {
+            var _a, _b, _c, _d;
+            if (!((_a = targetSail.appSail) === null || _a === void 0 ? void 0 : _a.scripts)) {
+                return;
+            }
+            executeHook((_b = targetSail.appSail.scripts) === null || _b === void 0 ? void 0 : _b.postserve, `AppSail [POSTSERVE] [${(_c = targetSail.appSail) === null || _c === void 0 ? void 0 : _c.name}]`, (_d = targetSail.appSail) === null || _d === void 0 ? void 0 : _d.source);
+        });
+    }
+    return child;
+});