zcatalyst-cli 1.20.2 → 1.22.0

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

@@ -16,7 +16,7 @@ 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 index_1 = require("../../../../util_modules/logger/index");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 const endpoints_1 = require("../../../../endpoints");
@@ -26,14 +26,25 @@ 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");
+const utils_1 = require("../master/utils");
+const port_resolver_1 = __importDefault(require("../../../../port-resolver"));
+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) {
-    if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
-        (0, logger_1.debug)(`skipping ${name} hook`);
-        return;
-    }
-    (0, execute_script_1.executeCommand)(script, { moduleSource, feature: name });
+    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 startAppSail = (port, opts) => {
+    if (port === -1) {
+        throw new error_1.default('The AppSail Http port value is invalid: ' + port, { exit: 2 });
+    }
     const startScriptPath = (0, path_1.join)(__dirname, 'start.js');
     const _opts = [startScriptPath, '-t', opts.type];
     if (opts.command) {
@@ -42,6 +53,7 @@ const startAppSail = (port, opts) => {
     const child = (0, shell_1.spawn)('node', _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 || {}))
     }).RAW();
     return new Promise((_res, _rej) => {
@@ -49,139 +61,221 @@ const startAppSail = (port, opts) => {
         child.on('error', (reason) => _rej(reason));
     });
 };
-exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
+function startAppSailWithContainer(serverDetails) {
     var _a, _b, _c, _d, _e, _f, _g;
+    return __awaiter(this, void 0, void 0, function* () {
+        const targetSail = serverDetails.target;
+        if (!targetSail || !targetSail.config) {
+            throw new error_1.default('Invalid AppSail target', { exit: 2 });
+        }
+        (0, index_1.debug)('Using container to serve the AppSail: ' + targetSail.name);
+        targetSail.config.env_variables = Object.assign({ X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: targetSail.name, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: '/catalyst', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)() || '', X_ZOHO_ADMIN_CRED_TOKEN: 'Unknown' }, (_a = targetSail === null || targetSail === void 0 ? void 0 : targetSail.config) === null || _a === void 0 ? void 0 : _a.env_variables);
+        if (!((_b = serverDetails.target) === null || _b === void 0 ? void 0 : _b.source)) {
+            throw new error_1.default('Invalid AppSail source: ' + targetSail.source, {
+                exit: 1
+            });
+        }
+        let child;
+        switch (true) {
+            case (_c = serverDetails.target) === null || _c === void 0 ? void 0 : _c.source.startsWith(appsail_1.CONTAINER_IMAGE_PROTOCOLS.dockerArchive): {
+                const tarPath = serverDetails.target.source.replace(appsail_1.CONTAINER_IMAGE_PROTOCOLS.dockerArchive, '');
+                const appsailTar = yield fs_1.ASYNC.fileExists(tarPath);
+                if (!appsailTar) {
+                    throw new error_1.default('Invalid AppSail source: ' + targetSail.source, {
+                        exit: 1
+                    });
+                }
+                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));
+                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));
+                });
+                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));
+                });
+                break;
+            }
+            case serverDetails.target.runtime === 'catalyst': {
+                const projectRoot = (0, project_1.getProjectRoot)();
+                if (!((_f = (_e = serverDetails.target.config) === null || _e === void 0 ? void 0 : _e.build_path) === null || _f === void 0 ? void 0 : _f.startsWith(projectRoot))) {
+                    throw new error_1.default('AppSail source outside project directory. For security reasons, Catalyst' +
+                        'runtime AppSails served within containers should have the source withing the project root directory', {
+                        exit: 1,
+                        context: {
+                            targetSource: serverDetails.target.source,
+                            projectRoot
+                        }
+                    });
+                }
+            }
+            case (_g = serverDetails.target) === null || _g === void 0 ? void 0 : _g.source.startsWith(appsail_1.CONTAINER_IMAGE_PROTOCOLS.docker): {
+                child = yield (0, container_plugin_1.start)({
+                    details: serverDetails,
+                    projectId: (0, project_1.getProjectId)(),
+                    ruok: container_plugin_1.RUOK.SKIP
+                });
+                break;
+            }
+            default: {
+                throw new error_1.default('Invalid AppSail runtime/docker image', {
+                    exit: 2,
+                    context: serverDetails
+                });
+            }
+        }
+        child.emit('start', serverDetails);
+        return child;
+    });
+}
+exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     let child;
     const targetSail = serverDetails.target;
     if (!targetSail || !targetSail.config) {
         throw new error_1.default('AppSail details not found');
     }
-    if ((_a = targetSail.config.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
-        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;
-    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)]
-            });
+    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);
         }
-        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 = yield startAppSail(targetSail.port.appsail, {
-                type: 'nodejs',
-                target,
-                command: targetSail.config.command,
-                memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables,
-                name: targetSail.name
+        const buildPath = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path;
+        if (!buildPath) {
+            throw new error_1.default('Invalid AppSail config: invalid build path :: ' + buildPath, {
+                exit: 2
             });
-            break;
         }
-        case targetSail.config.stack.startsWith('python'): {
-            child = yield startAppSail(targetSail.port.appsail, {
-                type: 'python',
-                target,
-                command: targetSail.config.command,
-                memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables,
-                name: targetSail.name
+        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)
+                ]
             });
-            break;
         }
-        case targetSail.config.stack.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, 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, '/', {
-                            ignoreLevel: 0,
-                            isFolder: true
-                        });
-                        yield zip.finalize();
-                    }
-                    catch (err) {
-                        (0, logger_1.debug)('Unable to ensure Jetty Runtime');
-                        throw err;
+        switch (true) {
+            case (0, container_1.isContainer)(): {
+                child = yield startAppSailWithContainer(serverDetails);
+                break;
+            }
+            case (_g = (_f = targetSail.config) === null || _f === void 0 ? void 0 : _f.stack) === null || _g === void 0 ? void 0 : _g.startsWith('node'): {
+                child = yield startAppSail(targetSail.port.appsail.host, {
+                    type: 'nodejs',
+                    target,
+                    command: targetSail.config.command,
+                    memory: targetSail.config.memory || 256,
+                    env: targetSail.config.env_variables,
+                    name: targetSail.name
+                });
+                break;
+            }
+            case (_j = (_h = targetSail.config) === null || _h === void 0 ? void 0 : _h.stack) === null || _j === void 0 ? void 0 : _j.startsWith('python'): {
+                child = yield startAppSail(targetSail.port.appsail.host, {
+                    type: 'python',
+                    target,
+                    command: targetSail.config.command,
+                    memory: targetSail.config.memory || 256,
+                    env: targetSail.config.env_variables,
+                    name: targetSail.name
+                });
+                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)))) {
+                        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, '/', {
+                                isFolder: true
+                            });
+                            yield zip.finalize();
+                        }
+                        catch (err) {
+                            (0, index_1.debug)('Unable to ensure Jetty Runtime');
+                            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,
+                        memory: targetSail.config.memory || 256,
+                        env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
+                        name: targetSail.name
+                    });
+                    break;
                 }
-                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 = yield startAppSail(targetSail.port.appsail, {
+                child = yield startAppSail(targetSail.port.appsail.host, {
                     target,
-                    type: 'war',
-                    command: jettyCommand,
+                    command: targetSail.config.command,
+                    type: 'javase',
                     memory: targetSail.config.memory || 256,
-                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
+                    env: targetSail.config.env_variables,
                     name: targetSail.name
                 });
                 break;
             }
-            child = yield startAppSail(targetSail.port.appsail, {
-                target,
-                command: targetSail.config.command,
-                type: 'javase',
-                memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables,
-                name: targetSail.name
-            });
-            break;
-        }
-        default: {
-            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')
-                ]
-            });
+            default: {
+                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(((_m = targetSail.config) === null || _m === void 0 ? void 0 : _m.stack) + ''),
+                        appSailRuntime.runtimes.map((val) => (0, ansi_colors_1.bold)(`* ${val}`)).join('\n')
+                    ]
+                });
+            }
         }
     }
+    else if (targetSail.runtime === 'custom') {
+        child = yield startAppSailWithContainer(serverDetails);
+    }
+    else {
+        throw new error_1.default('Invalid runtime value for AppSail: ' + targetSail.runtime, {
+            exit: 2
+        });
+    }
     const masterServe = yield (0, master_1.default)(targetSail.port.proxy, {
         appSailDetails: serverDetails
     });
-    child.once('exit', () => {
-        masterServe.close((err) => {
-            if (err) {
-                (0, logger_1.debug)('Error stopping the AppSail proxy server: ', err);
-            }
-        });
+    masterServe.on('listening', () => {
+        utils_1.serverEvent.emit('start', serverDetails);
     });
-    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)) {
-                return;
-            }
-            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;
+    masterServe.on('error', (err) => {
+        (0, index_1.debug)('Error with the AppSail proxy server: ', err);
     });
-    child.once('exit', (code) => {
-        var _a, _b, _c;
+    child.once('exit', (code) => __awaiter(void 0, void 0, void 0, function* () {
+        var _o, _p, _q, _r, _s, _t, _u;
+        typeof targetSail.port.appsail === 'number' &&
+            port_resolver_1.default.freePort(targetSail.port.appsail);
+        port_resolver_1.default.freePort(targetSail.port.proxy);
         if (code === 150) {
             targetSail.validity = {
                 valid: false,
@@ -192,12 +286,15 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                 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) || ''
+                    ((_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) || ''
                 ]
             });
         }
-    });
+        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);
+        }
+    }));
     return child;
 });

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

@@ -4,7 +4,7 @@
 // exit codes
 // 150 - start up command failure
 
-const EXEC_SYNC = require('child_process').execSync;
+const EXEC = require('child_process').exec;
 
 const WAR = 'war';
 const JAVASE = 'javase';
@@ -62,11 +62,20 @@ function main() {
 			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
 	}
 
-	try {
-		EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
-	} catch (er) {
+	const _process = EXEC(command.toString(), { cwd });
+
+	_process.on('error', (error) => {
+		// eslint-disable-next-line no-console
+		console.log(error);
 		process.exit(150);
-	}
+	});
+
+	_process.stdout.pipe(process.stdout);
+	_process.stderr.pipe(process.stderr);
+
+	process.once('SIGINT', () => {
+		_process.kill('SIGINT');
+	});
 }
 
 main();

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

@@ -0,0 +1,6 @@
+import { ChildProcess } from 'child_process';
+import { IServerDetails } from '../..';
+import { IFnTarget } from '../../../../fn-utils/lib/common';
+import { ContainerEvents } from '@zcatalyst/container-plugin';
+declare const _default: (details: IServerDetails<IFnTarget>) => Promise<ChildProcess | ContainerEvents>;
+export default _default;

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

@@ -1,4 +1,27 @@
 "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) {
@@ -14,46 +37,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fn_utils_1 = require("../../../../fn-utils");
-const ensure_java_userconfig_1 = require("../../../../fn-utils/lib/ensure-java-userconfig");
-const plugin_loader_1 = __importDefault(require("../../../../plugin-loader"));
+const ensure_java_userconfig_1 = require("../../../../fn-utils/lib/java/ensure-java-userconfig");
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
-const userConfig_1 = __importDefault(require("../../../../userConfig"));
 const constants_1 = require("../../../../util_modules/constants");
-const logger_1 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
-exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f;
+const container_1 = require("../../../../util_modules/container");
+const container_plugin_1 = require("@zcatalyst/container-plugin");
+const error_1 = __importDefault(require("../../../../error"));
+exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    if (!details.target) {
+        throw new error_1.default('Invalid java function target ', { exit: 2, context: details });
+    }
     const projectRoot = runtime_store_1.default.get('project.root');
+    const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
+    const targetSource = (_b = details.target) === null || _b === void 0 ? void 0 : _b.source;
+    const targetDir = details.target.build;
+    if ((0, container_1.isContainer)()) {
+        (0, index_1.debug)('using container to serve the function: ' + ((_c = details.target) === null || _c === void 0 ? void 0 : _c.name));
+        const container = yield Promise.resolve().then(() => __importStar(require('@zcatalyst/container-plugin')));
+        details.target.env_var = Object.assign({ X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_d = details.target) === null || _d === void 0 ? void 0 : _d.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: '/catalyst/', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_ADMIN_CRED_TOKEN: 'Unknown', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[(_e = details.target) === null || _e === void 0 ? void 0 : _e.type] }, details.target.env_var);
+        return container.start({
+            details: details,
+            projectId: (0, project_1.getProjectId)(),
+            ruok: details.debugPort !== undefined && details.debugPort !== -1
+                ? container_plugin_1.RUOK.SKIP
+                : container_plugin_1.RUOK.FINITE
+        });
+    }
     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();
+        (0, index_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('-Xrunjdwp:transport=dt_socket,address=' + details.debugPort + ',server=y,suspend=n');
     }
     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;
-    }
-    const configKey = `${(_d = details.target) === null || _d === void 0 ? void 0 : _d.stack}.bin`;
-    const userConfigCmd = userConfig_1.default.get(configKey);
-    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'java', (_e = details.target) === null || _e === void 0 ? void 0 : _e.stack);
+    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)('java', (_g = (_f = details.target) === null || _f === void 0 ? void 0 : _f.additionalInfo) === null || _g === void 0 ? void 0 : _g.binPath);
     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, 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)
+        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.d.ts

@@ -0,0 +1,5 @@
+import Server from 'http-proxy';
+import { IServerDetails } from '../..';
+import { Express, Request, Response } from 'express';
+import { TAppSailServerDetails } from '../../../features/appsail';
+export declare function addAppSailRoutes(app: Express, details: IServerDetails<TAppSailServerDetails>, proxy: Server, unknownProxy: (req: Request, res: Response) => void): void;

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

@@ -8,11 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAppSailRoutes = void 0;
 const utils_1 = require("./utils");
+const error_1 = __importDefault(require("../../../../error"));
 function addAppSailRoutes(app, details, proxy, unknownProxy) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f;
+    if (details.isAlive === false) {
+        return;
+    }
     app.use('/__catalyst/sdk/init.js', (req, res) => __awaiter(this, void 0, void 0, function* () {
         const initJs = yield (0, utils_1.appsailInitJs)();
         const _write = res.write;
@@ -36,11 +43,15 @@ function addAppSailRoutes(app, details, proxy, unknownProxy) {
             req.url = req.originalUrl;
             unknownProxy(req, res);
         });
-    const targetUrl = `http://127.0.0.1:${details.target.port.appsail}`;
+    const appsailPort = (_e = (_d = (_c = details.target) === null || _c === void 0 ? void 0 : _c.port) === null || _d === void 0 ? void 0 : _d.appsail) === null || _e === void 0 ? void 0 : _e.host;
+    if (!appsailPort || appsailPort === -1) {
+        throw new error_1.default(`Invalid AppSail port to proxy to for AppSail: ${(_f = details.target) === null || _f === void 0 ? void 0 : _f.name} ::: ${appsailPort}`);
+    }
+    const targetUrl = `http://127.0.0.1:${appsailPort}`;
     app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _c, _d;
-        if (req.header('catalyst-component') === 'true') {
-            ((_d = (_c = details.target) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.catalyst_auth) === true
+        var _g, _h;
+        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
                 ? unknownProxy(req, res)
                 : res.sendStatus(400);
             return;

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

@@ -0,0 +1,5 @@
+import { Express } from 'express';
+import { IServerDetails } from '../..';
+import Server from 'http-proxy';
+import { IFnTarget } from '../../../../fn-utils/lib/common';
+export declare function addFnRoutes(app: Express, details: IServerDetails<IFnTarget>, proxy: Server): void;