zcatalyst-cli 1.15.0-beta.5 → 1.15.0-beta.7

package/lib/serve/server/index.js

@@ -26,13 +26,23 @@ 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();
+const bioLogUrl = (details, masterPort, addSpaces) => {
+    var _a, _b, _c, _d;
+    const labelMap = {
+        bio: 'BasicIO',
+        browserlogic: 'Browser Logic'
+    };
+    const label = addSpaces
+        ? ((_a = details.target) === null || _a === void 0 ? void 0 : _a.name) + ''
+        : `${labelMap[(_b = details.target) === null || _b === void 0 ? void 0 : _b.type]}[${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}]`;
+    (0, logger_1.labeled)(label + ' '.repeat((addSpaces || label.length) - label.length), 'http://localhost:' +
+        (masterPort === -1 ? details.httpPort : masterPort) +
+        new URL(((_d = details.target) === null || _d === void 0 ? void 0 : _d.url) || '').pathname).MESSAGE();
 };
-const aioLogUrl = (details, masterPort) => {
-    var _a, _b;
-    (0, logger_1.labeled)(`${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`, `URL : http://localhost:${masterPort}/server/${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}/`).MESSAGE();
-    (0, logger_1.info)();
+const aioLogUrl = (details, masterPort, addSpaces) => {
+    var _a, _b, _c;
+    const label = addSpaces ? ((_a = details.target) === null || _a === void 0 ? void 0 : _a.name) + '' : `AdvancedIO[${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}]`;
+    (0, logger_1.labeled)(label + ' '.repeat((addSpaces || label.length) - label.length), `http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`).MESSAGE();
 };
 class Server {
     constructor() {
@@ -43,7 +53,7 @@ class Server {
             appSail: []
         };
     }
-    _addBasicFnDetails() {
+    _addBasicFnDetails(bioUrlLogs) {
         const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
         if (fnTargets.length === 0) {
             (0, logger_1.debug)('No basic functions to add');
@@ -60,12 +70,18 @@ class Server {
             })
                 .map((t) => js_1.JS.omit(t, ['zip_stream', 'localFn']))
                 .forEach((t) => {
-                this.targetsMap.functions.push({
+                const target = {
                     type: 'functions',
                     httpPort,
                     debugPort,
                     target: t
-                });
+                };
+                this.targetsMap.functions.push(target);
+                bioUrlLogs.targs.push(target);
+                bioUrlLogs.nameMaxLength =
+                    t.name.length > bioUrlLogs.nameMaxLength
+                        ? t.name.length
+                        : bioUrlLogs.nameMaxLength;
             });
         }
     }
@@ -101,148 +117,326 @@ class Server {
             });
     }
     startServer(details, masterPort) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (details.target === undefined) {
-                return;
+                return details;
             }
-            let currentProcess;
-            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);
+            try {
+                let currentProcess;
+                switch (details.type) {
+                    case 'appsail': {
+                        currentProcess = yield (0, index_js_5.default)(details);
+                        break;
                     }
-                    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);
+                    case 'client': {
+                        currentProcess = yield (0, index_js_4.default)(details, masterPort);
+                        break;
                     }
-                    else {
-                        currentProcess = yield (0, index_js_3.default)(details);
+                    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 });
                     }
-                    break;
                 }
-                default: {
-                    throw new error_1.default('Invalid feature type', { exit: 2 });
+                details.process = currentProcess;
+                const stdout = currentProcess.stdout;
+                if (stdout) {
+                    stdout.on('data', (chunk) => {
+                        process.stdout.write(chunk.toString());
+                    });
                 }
+                const stderr = currentProcess.stderr;
+                if (stderr) {
+                    stderr.on('data', (chunk) => {
+                        process.stderr.write(chunk.toString());
+                    });
+                }
+                return new Promise((res) => setTimeout(() => res(details), 100));
             }
-            details.process = currentProcess;
-            const stdout = currentProcess.stdout;
-            if (stdout) {
-                stdout.on('data', (chunk) => {
-                    process.stdout.write(chunk.toString());
-                });
-            }
-            const stderr = currentProcess.stderr;
-            if (stderr) {
-                stderr.on('data', (chunk) => {
-                    process.stderr.write(chunk.toString());
-                });
+            catch (er) {
+                const error = 'Unable to start the server: ' + error_1.default.getErrorInstance(er).message;
+                if (details.type === 'appsail') {
+                    const target = details.target;
+                    target.validity.valid = false;
+                    (0, logger_1.labeled)(`AppSail[${(_c = target.appSail) === null || _c === void 0 ? void 0 : _c.name}]`, error).ERROR();
+                }
+                else if (details.type === 'client') {
+                    const target = details.target;
+                    target.valid = false;
+                    (0, logger_1.labeled)(`WebClient[${details.target}]`, error).ERROR();
+                }
+                else {
+                    const target = details.target;
+                    target.valid = false;
+                    (0, logger_1.labeled)(`${target.type}[${target.name}]`, error).ERROR();
+                }
+                return details;
             }
-            return new Promise((res) => setTimeout(res, 100));
         });
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {
-            const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
-            if (masterPort === -1) {
-                throw new error_1.default('master port cannot be undefined', { exit: 2 });
-            }
-            const serveTargets = Object.values(this.targetsMap);
-            yield Promise.all(serveTargets.map((targetDetails) => Promise.all(targetDetails.map((details) => this.startServer(details, masterPort)))));
-            this._addBasicFnDetails();
-            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.targetsMap);
-            this.masterServer = server;
-            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.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());
-                    return true;
+            const logUrls = {
+                functions: {
+                    bio: { targs: [], nameMaxLength: 0 },
+                    aio: { targs: [], nameMaxLength: 0 },
+                    browserlogic: { targs: [], nameMaxLength: 0 }
+                },
+                appsail: { targs: [], nameMaxLength: 0 },
+                client: {}
+            };
+            this._addBasicFnDetails(logUrls.functions.bio);
+            const masterTargets = ['functions', 'client', 'server'].reduce((_masterTargets, targ) => {
+                if (this.targetsMap[targ]) {
+                    _masterTargets.targets[targ] = this.targetsMap[targ];
+                    _masterTargets.length += this.targetsMap[targ].length;
                 }
-                return false;
+                return _masterTargets;
+            }, {
+                targets: {},
+                length: 0
             });
-            this.targetsMap.functions.forEach((t) => {
-                const target = t.target;
-                if (!target.url) {
-                    throw new error_1.default('Target URL not found', { exit: 2 });
+            const serveTargets = Object.values(masterTargets.targets);
+            const serveTargetsArr = serveTargets.flat();
+            const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
+            let startPromise = Promise.resolve();
+            if (masterTargets.length > 0) {
+                if (masterPort === -1) {
+                    throw new error_1.default('master port cannot be undefined', { exit: 2 });
                 }
-                bioLogUrl(target.name, new URL(target.url).pathname, t.httpPort, masterPort);
-            });
-            (0, logger_1.info)();
-            this.targetsMap.server.forEach((t) => {
-                aioLogUrl(t, masterPort);
-            });
-            return new Promise((res) => {
-                server.on('listening', () => {
-                    serveTargetsArr.forEach((targetDetails) => {
-                        var _a;
-                        if (targetDetails.process &&
-                            'send' in targetDetails.process) {
-                            targetDetails.process.send('start');
+                yield Promise.all(serveTargets.map((targetDetails) => Promise.all(targetDetails.map((details) => {
+                    var _a, _b;
+                    const _details = details;
+                    if (((_a = _details.target) === null || _a === void 0 ? void 0 : _a.type) === 'bio' &&
+                        !((_b = _details.target.stack) === null || _b === void 0 ? void 0 : _b.includes('python'))) {
+                        return;
+                    }
+                    return this.startServer(_details, masterPort).then((t) => {
+                        var _a, _b, _c, _d;
+                        const serverDetails = t;
+                        if (!((_a = serverDetails.target) === null || _a === void 0 ? void 0 : _a.valid)) {
                             return;
                         }
-                        (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start');
+                        if (serverDetails.type === 'client') {
+                            logUrls.client = serverDetails;
+                        }
+                        else {
+                            const _details = serverDetails;
+                            const targType = (_b = _details.target) === null || _b === void 0 ? void 0 : _b.type;
+                            logUrls.functions[targType].targs.push(_details);
+                            logUrls.functions[targType].nameMaxLength =
+                                ((_c = _details.target) === null || _c === void 0 ? void 0 : _c.name) &&
+                                    _details.target.name.length >
+                                        logUrls.functions[targType].nameMaxLength
+                                    ? (_d = _details.target) === null || _d === void 0 ? void 0 : _d.name.length
+                                    : logUrls.functions[targType].nameMaxLength;
+                        }
+                    });
+                }))));
+                if (serveTargetsArr.length === 0) {
+                    throw new error_1.default('Trying to start master server before other server', {
+                        exit: 2
                     });
-                    res();
+                }
+                this.masterServer =
+                    masterTargets.length > 0
+                        ? yield (0, master_1.default)(masterPort, masterTargets.targets)
+                        : undefined;
+                startPromise = new Promise((res) => {
+                    this.masterServer
+                        ? this.masterServer.on('listening', () => {
+                            serveTargetsArr.forEach((targetDetails) => {
+                                var _a;
+                                if (targetDetails.process &&
+                                    'send' in targetDetails.process) {
+                                    targetDetails.process.send('start');
+                                    return;
+                                }
+                                (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start');
+                            });
+                            res();
+                        })
+                        : res();
+                });
+                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.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());
+                        return true;
+                    }
+                    return false;
                 });
-            });
-        });
-    }
-    wait() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
-            if (!this.masterServer) {
-                (0, logger_1.debug)('Master server is not started yet.');
-                throw new error_1.default('Server cannot be put to wait state.', { exit: 2 });
             }
-            Object.values(this.targetsMap).forEach((details) => {
-                details.forEach((targetdetails) => {
-                    var _a, _b;
-                    const target = targetdetails.target;
-                    if (!target || !targetdetails.process) {
+            if (this.targetsMap.appSail.length > 0) {
+                yield Promise.all(this.targetsMap.appSail.map((targSail) => this.startServer(targSail, -1).then((details) => {
+                    var _a, _b, _c, _d, _e, _f;
+                    const serverDetails = details;
+                    if (!((_a = serverDetails.target) === null || _a === void 0 ? void 0 : _a.validity.valid)) {
                         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(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
-                                });
+                    logUrls.appsail.targs.push(targSail);
+                    logUrls.appsail.nameMaxLength =
+                        ((_c = (_b = targSail.target) === null || _b === void 0 ? void 0 : _b.appSail) === null || _c === void 0 ? void 0 : _c.name) &&
+                            ((_e = (_d = targSail.target) === null || _d === void 0 ? void 0 : _d.appSail) === null || _e === void 0 ? void 0 : _e.name.length) > logUrls.appsail.nameMaxLength
+                            ? (_f = targSail.target) === null || _f === void 0 ? void 0 : _f.appSail.name.length
+                            : logUrls.appsail.nameMaxLength;
+                })));
+            }
+            let loggedEntries = 0;
+            Object.entries(logUrls).forEach(([targType, logTarg]) => {
+                var _a;
+                switch (targType) {
+                    case 'functions': {
+                        Object.entries(logTarg).forEach((x) => {
+                            const [_targType, _logTarg] = x;
+                            if (_logTarg.targs.length === 0) {
+                                return;
                             }
-                            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);
+                            loggedEntries++;
+                            switch (_targType) {
+                                case 'bio': {
+                                    (0, logger_1.info)();
+                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
+                                    _logTarg.targs.forEach((t) => {
+                                        var _a;
+                                        const target = t;
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                            throw new error_1.default('Target URL not found', {
+                                                exit: 2
+                                            });
+                                        }
+                                        bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
+                                    });
+                                    (0, logger_1.info)();
+                                    break;
+                                }
+                                case 'aio': {
+                                    (0, logger_1.info)();
+                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
+                                    _logTarg.targs.forEach((t) => {
+                                        var _a;
+                                        const _target = t;
+                                        if (!((_a = _target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                            throw new error_1.default('Target URL not found', {
+                                                exit: 2
+                                            });
+                                        }
+                                        aioLogUrl(_target, masterPort, _logTarg.nameMaxLength);
+                                    });
+                                    (0, logger_1.info)();
+                                    break;
+                                }
+                                case 'browserlogic': {
+                                    (0, logger_1.info)();
+                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
+                                    _logTarg.targs.forEach((t) => {
+                                        var _a;
+                                        const target = t;
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                            throw new error_1.default('Target URL not found', {
+                                                exit: 2
+                                            });
+                                        }
+                                        bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
+                                    });
+                                    (0, logger_1.info)();
+                                    break;
+                                }
+                            }
+                        });
+                        break;
+                    }
+                    case 'appsail': {
+                        const _logTarg = logTarg;
+                        if (_logTarg.targs.length === 0) {
+                            return;
                         }
-                        setTimeout(() => {
+                        loggedEntries++;
+                        (0, logger_1.info)();
+                        (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                        _logTarg.targs.forEach((t) => {
                             var _a;
-                            (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
-                        }, 1000);
-                    }));
-                }, this);
+                            const targetSail = t.target;
+                            const targName = ((_a = targetSail.appSail) === null || _a === void 0 ? void 0 : _a.name) + '';
+                            (0, logger_1.labeled)(targName +
+                                ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), `http://localhost:${targetSail.port.proxy}`).MESSAGE();
+                        });
+                        (0, logger_1.info)();
+                        break;
+                    }
+                    case 'client': {
+                        if (Object.keys(logTarg).length === 0) {
+                            return;
+                        }
+                        loggedEntries++;
+                        (0, logger_1.info)();
+                        const targApp = logTarg;
+                        const appUrl = 'http://localhost:' + masterPort;
+                        const label = `client[${(_a = targApp.target) === null || _a === void 0 ? void 0 : _a.name}]`;
+                        (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> Web Client <<<<<<<<<<<<'));
+                        (0, logger_1.labeled)(label, `${appUrl}/app/`).MESSAGE();
+                        (0, logger_1.info)();
+                        break;
+                    }
+                }
             });
+            return loggedEntries > 0
+                ? startPromise
+                : Promise.reject(new error_1.default('No Resources served', { exit: 1, errorId: 'SERVE-IDX-2' }));
+        });
+    }
+    wait() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.masterServer) {
+                const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
+                Object.values(this.targetsMap).forEach((details) => {
+                    details.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(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(targetdetails, masterPort);
+                            }
+                            else if (target.type === constants_1.FN_TYPE.advanced) {
+                                (0, logger_1.labeled)(`AdvancedIO[${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));
             });

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

@@ -23,6 +23,8 @@ 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");
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -42,21 +44,29 @@ const startAppSail = (port, opts) => {
         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* () {
+exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
     let child;
-    if (!targetSail.appSail) {
+    const targetSail = serverDetails.target;
+    if (!targetSail || !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))
+    if (!(yield fs_1.ASYNC.isPathExists(targetSail.appSail.buildPath))) {
+        throw new error_1.default(`Build path does not exists [${targetSail.appSail.buildPath}]`, {
+            exit: 1,
+            errorId: 'SERVE-APPSAIL-1',
+            arg: [ansi_colors_1.italic.red(targetSail.appSail.buildPath), (0, ansi_colors_1.bold)(targetSail.appSail.name)]
+        });
+    }
+    const target = (yield fs_1.ASYNC.fileExists(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, {
+            child = startAppSail(targetSail.port.appsail, {
                 type: 'nodejs',
                 target,
                 command: targetSail.appSail.command,
@@ -66,7 +76,7 @@ exports.default = (targetSail, masterPort) => __awaiter(void 0, void 0, void 0,
             break;
         }
         case targetSail.appSail.stack.startsWith('python'): {
-            child = startAppSail(targetSail.port, {
+            child = startAppSail(targetSail.port.appsail, {
                 type: 'python',
                 target,
                 command: targetSail.appSail.command,
@@ -96,8 +106,8 @@ exports.default = (targetSail, masterPort) => __awaiter(void 0, void 0, void 0,
                         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, {
+                const jettyCommand = `java -jar "${(0, path_1.join)(jettyPath, 'start.jar')}" -Djetty.deploy.monitoredPath="${(0, project_1.resolveProjectPath)(target)}" -Djetty.http.port=${targetSail.port.appsail}`;
+                child = startAppSail(targetSail.port.appsail, {
                     target,
                     type: 'war',
                     command: jettyCommand,
@@ -106,7 +116,7 @@ exports.default = (targetSail, masterPort) => __awaiter(void 0, void 0, void 0,
                 });
                 break;
             }
-            child = startAppSail(targetSail.port, {
+            child = startAppSail(targetSail.port.appsail, {
                 target,
                 command: targetSail.appSail.command,
                 type: 'javase',
@@ -119,8 +129,16 @@ exports.default = (targetSail, masterPort) => __awaiter(void 0, void 0, void 0,
             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)();
+    const masterServe = yield (0, master_1.default)(targetSail.port.proxy, {
+        appSail: [serverDetails]
+    });
+    child.once('exit', () => {
+        masterServe.close((err) => {
+            if (err) {
+                (0, logger_1.debug)('Error stopping the AppSail proxy server: ', err);
+            }
+        });
+    });
     if ((_c = targetSail.appSail.scripts) === null || _c === void 0 ? void 0 : _c.postserve) {
         child.once('exit', () => {
             var _a, _b, _c, _d;

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

@@ -7,7 +7,6 @@ const JAVASE = 'javase';
 const NODEJS = 'nodejs';
 const PYTHON = 'python';
 
-// const WAR_DEFAULT = "";
 const JAVASE_DEFAULT = 'java Main';
 const NODEJS_DEFAULT = 'node main.js';
 const PYTHON_DEFAULT = 'python main.py';
@@ -33,28 +32,18 @@ function parseCmdArg() {
 	return args;
 }
 
-function getWarCommand(command) {
-	if (process.env.JAVA_OPTS) {
-		command += ` ${process.env.JAVA_OPTS}`;
-	}
-
-	const DRYRUN_OUTPUT = EXEC_SYNC(command.toString(), {
-		stdio: 'pipe',
-		cwd: process.env.JETTY_BASE
-	}).toString();
-	return `java ${DRYRUN_OUTPUT}`;
-}
-
 function main() {
 	const CMD_ARGS = parseCmdArg();
 
 	let command = '';
+	let cwd = process.cwd();
 	switch (CMD_ARGS.rtType) {
 		case WAR:
 			if (!CMD_ARGS.command) {
 				throw new Error(`command not found`);
 			}
-			command = getWarCommand(CMD_ARGS.command);
+			command = CMD_ARGS.command;
+			cwd = process.env.JETTY_BASE;
 			break;
 		case JAVASE:
 			command = CMD_ARGS.command || JAVASE_DEFAULT;
@@ -69,7 +58,7 @@ function main() {
 			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
 	}
 
-	EXEC_SYNC(command.toString(), { stdio: 'inherit' });
+	EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
 }
 
 main();