zcatalyst-cli 1.21.0 → 1.22.1

package/lib/serve/server/index.js

@@ -12,22 +12,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
 const error_1 = __importDefault(require("../../error"));
 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 index_1 = require("../../util_modules/logger/index");
 const master_1 = __importDefault(require("./lib/master"));
 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 utils_1 = require("./lib/master/utils");
+const container_1 = require("../../util_modules/container");
 const index_js_6 = __importDefault(require("./lib/slate/index.js"));
-const cli_table_1 = require("../../cli_table");
 const ansi_colors_1 = require("ansi-colors");
-const bioLogUrl = (details, masterPort, addSpaces) => {
+const env_1 = require("../../util_modules/env");
+const bioUrl = (details, masterPort, addSpaces) => {
     var _a, _b, _c, _d;
     const labelMap = {
         bio: 'BasicIO',
@@ -36,14 +39,30 @@ const bioLogUrl = (details, masterPort, addSpaces) => {
     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:' +
+    const printLabel = label + ' '.repeat((addSpaces || label.length) - label.length);
+    const printUrl = 'http://localhost:' +
         (masterPort === -1 ? details.httpPort : masterPort) +
-        new URL(((_d = details.target) === null || _d === void 0 ? void 0 : _d.url) || '').pathname).MESSAGE();
+        new URL(((_d = details.target) === null || _d === void 0 ? void 0 : _d.url) || '').pathname;
+    return {
+        printUrl,
+        printLabel,
+        log: () => {
+            (0, index_1.labeled)(printLabel, printUrl).MESSAGE();
+        }
+    };
 };
-const aioLogUrl = (details, masterPort, addSpaces) => {
+const aioUrl = (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();
+    const printLabel = label + ' '.repeat((addSpaces || label.length) - label.length);
+    const printUrl = `http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`;
+    return {
+        printUrl,
+        printLabel,
+        log: () => {
+            (0, index_1.labeled)(printLabel, printUrl).MESSAGE();
+        }
+    };
 };
 class Server {
     constructor() {
@@ -58,7 +77,7 @@ class Server {
     _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');
+            (0, index_1.debug)('No basic functions to add');
         }
         const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.FN_TYPE.basic), 10);
         const debugPort = parseInt(runtime_store_1.default.get('context.port.debug.' + constants_1.FN_TYPE.basic, '-1'), 10);
@@ -88,12 +107,15 @@ class Server {
         }
     }
     add(type, target) {
+        const debugPort = runtime_store_1.default.get(`context.port.debug.${type === 'server' ? 'functions' : type}.${target.name}`, -1);
         if (type === 'appsail') {
             this.targetsMap.appSail.push({
                 type,
                 target: target,
-                httpPort: -1,
-                debugPort: -1
+                httpPort: undefined,
+                debugPort: undefined,
+                isAlive: null,
+                restarting: false
             });
             return;
         }
@@ -101,13 +123,14 @@ class Server {
             this.targetsMap.slate.push({
                 type,
                 target: target,
-                httpPort: -1,
-                debugPort: -1
+                httpPort: undefined,
+                debugPort: undefined,
+                isAlive: null,
+                restarting: false
             });
             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 +
@@ -118,17 +141,21 @@ class Server {
                 type,
                 target: target,
                 httpPort,
-                debugPort
+                debugPort: undefined,
+                isAlive: null,
+                restarting: false
             })
             : this.targetsMap.server.push({
                 type,
                 target: target,
                 httpPort,
-                debugPort
+                debugPort,
+                isAlive: null,
+                restarting: false
             });
     }
     startServer(details, masterPort) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             if (details.target === undefined) {
                 return details;
@@ -151,10 +178,10 @@ class Server {
                     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);
+                            currentProcess = yield (0, index_js_1.default)(details);
                         }
                         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);
+                            currentProcess = yield (0, index_js_2.default)(details);
                         }
                         else {
                             currentProcess = yield (0, index_js_3.default)(details);
@@ -166,41 +193,69 @@ class Server {
                     }
                 }
                 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());
-                    });
-                }
+                currentProcess.on('error', (er) => {
+                    const error = error_1.default.getErrorInstance(er);
+                    const _details = details;
+                    if (_details.target) {
+                        _details.target.valid = false;
+                        _details.target.failure_reason = error;
+                    }
+                    (0, index_1.debug)('Function serve error: ', error);
+                    this.kill(details);
+                });
+                currentProcess.on('exit', () => {
+                    details.isAlive = false;
+                    utils_1.serverEvent.emit('child-exit', details);
+                });
+                const getTargetName = (target) => {
+                    var _a, _b;
+                    return target.type === 'appsail'
+                        ? (_a = target.target) === null || _a === void 0 ? void 0 : _a.name
+                        : (_b = target.target) === null || _b === void 0 ? void 0 : _b.name;
+                };
+                'stdout' in currentProcess &&
+                    (env_1.isVsCode
+                        ? (_c = currentProcess.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (chunk) => {
+                            const logs = Buffer.isBuffer(chunk)
+                                ? chunk.toString().split('\n')
+                                : [chunk];
+                            logs.forEach((logStr) => (0, index_1.log)('info', `[${(0, ansi_colors_1.bold)(getTargetName(details) || details.type)}] ${logStr}`, true));
+                        })
+                        : (_d = currentProcess.stdout) === null || _d === void 0 ? void 0 : _d.pipe(process.stdout));
+                'stderr' in currentProcess &&
+                    (env_1.isVsCode
+                        ? (_e = currentProcess.stderr) === null || _e === void 0 ? void 0 : _e.on('data', (chunk) => {
+                            const logs = Buffer.isBuffer(chunk)
+                                ? chunk.toString().split('\n')
+                                : [chunk];
+                            logs.forEach((logStr) => (0, index_1.log)('error', `[${(0, ansi_colors_1.bold)(getTargetName(details) || details.type)}] ${logStr}`, true));
+                        })
+                        : (_f = currentProcess.stderr) === null || _f === void 0 ? void 0 : _f.pipe(process.stderr));
+                details.isAlive = true;
                 return new Promise((res) => setTimeout(() => res(details), 100));
             }
             catch (er) {
                 const error = 'Unable to start the server: ' + error_1.default.getErrorInstance(er).message;
+                (0, index_1.debug)('Start server error: ' + er);
                 if (details.type === 'appsail') {
                     const target = details.target;
                     target.validity.valid = false;
-                    (0, logger_1.labeled)(`AppSail[${target.name}]`, error).ERROR();
+                    (0, index_1.labeled)(`AppSail[${target.name}]`, error).ERROR();
                 }
                 else if (details.type === 'client') {
                     const target = details.target;
                     target.valid = false;
-                    (0, logger_1.labeled)(`WebClient[${details.target}]`, error).ERROR();
+                    (0, index_1.labeled)(`WebClient[${details.target}]`, error).ERROR();
                 }
                 else if (details.type === 'slate') {
                     const target = details.target;
                     target.validity.valid = false;
-                    (0, logger_1.labeled)(`Slate[${target.name}]`, error).ERROR();
+                    (0, index_1.labeled)(`Slate[${target.name}]`, error).ERROR();
                 }
                 else {
                     const target = details.target;
                     target.valid = false;
-                    (0, logger_1.labeled)(`${target.type}[${target.name}]`, error).ERROR();
+                    (0, index_1.labeled)(`${target.type}[${target.name}]`, error).ERROR();
                 }
                 return details;
             }
@@ -238,12 +293,7 @@ class Server {
                     throw new error_1.default('master port cannot be undefined', { exit: 2 });
                 }
                 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;
@@ -285,23 +335,13 @@ class Server {
                                     targetDetails.process.send('start');
                                     return;
                                 }
-                                (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start');
+                                (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start', targetDetails);
+                                utils_1.serverEvent.emit('start', targetDetails);
                             });
                             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;
-                });
             }
             if (this.targetsMap.appSail.length > 0) {
                 yield Promise.all(this.targetsMap.appSail.map((targSail) => this.startServer(targSail, -1).then((details) => {
@@ -363,13 +403,15 @@ class Server {
                                             });
                                         }
                                         if (headersDisplayed.bio === false) {
-                                            (0, logger_1.info)();
-                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
+                                            (0, index_1.info)();
+                                            (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> Basic I/O <<<<<<<<<<<<< '));
                                             headersDisplayed.bio = true;
                                         }
-                                        bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
+                                        const _bioUrl = bioUrl(target, masterPort, _logTarg.nameMaxLength);
+                                        target.target.local_url = _bioUrl.printUrl;
+                                        _bioUrl.log();
                                     });
-                                    (0, logger_1.info)();
+                                    (0, index_1.info)();
                                     break;
                                 }
                                 case 'aio': {
@@ -385,13 +427,15 @@ class Server {
                                             });
                                         }
                                         if (headersDisplayed.aio === false) {
-                                            (0, logger_1.info)();
-                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
+                                            (0, index_1.info)();
+                                            (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> Advanced I/O <<<<<<<<<<< '));
                                             headersDisplayed.aio = true;
                                         }
-                                        aioLogUrl(_target, masterPort, _logTarg.nameMaxLength);
+                                        const _aioUrl = aioUrl(_target, masterPort, _logTarg.nameMaxLength);
+                                        _target.target.local_url = _aioUrl.printUrl;
+                                        _aioUrl.log();
                                     });
-                                    (0, logger_1.info)();
+                                    (0, index_1.info)();
                                     break;
                                 }
                                 case 'browserlogic': {
@@ -407,13 +451,15 @@ class Server {
                                             });
                                         }
                                         if (headersDisplayed.blo === false) {
-                                            (0, logger_1.info)();
-                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
+                                            (0, index_1.info)();
+                                            (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> Browser Logic <<<<<<<<<< '));
                                             headersDisplayed.blo = true;
                                         }
-                                        bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
+                                        const bloUrl = bioUrl(target, masterPort, _logTarg.nameMaxLength);
+                                        target.target.local_url = bloUrl.printUrl;
+                                        bloUrl.log();
                                     });
-                                    (0, logger_1.info)();
+                                    (0, index_1.info)();
                                     break;
                                 }
                             }
@@ -433,15 +479,15 @@ class Server {
                                 return;
                             }
                             if (isHeaderDisplayed === false) {
-                                (0, logger_1.info)();
-                                (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                                (0, index_1.info)();
+                                (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
                                 isHeaderDisplayed = true;
                             }
                             const targName = targetSail.name + '';
-                            (0, logger_1.labeled)(targName +
+                            (0, index_1.labeled)(targName +
                                 ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), `http://localhost:${targetSail.port.proxy}`).MESSAGE();
                         });
-                        (0, logger_1.info)();
+                        (0, index_1.info)();
                         break;
                     }
                     case 'client': {
@@ -449,13 +495,15 @@ class Server {
                             return;
                         }
                         loggedEntries++;
-                        (0, logger_1.info)();
+                        (0, index_1.info)();
                         const targApp = logTarg;
-                        const appUrl = 'http://localhost:' + masterPort;
+                        const appUrl = `http://localhost:${masterPort}/app/`;
                         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)();
+                        (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> Web Client <<<<<<<<<<<<'));
+                        (0, index_1.labeled)(label, appUrl).MESSAGE();
+                        if (targApp.target)
+                            targApp.target.local_url = appUrl;
+                        (0, index_1.info)();
                         break;
                     }
                     case 'slate': {
@@ -471,15 +519,15 @@ class Server {
                                 return;
                             }
                             if (isHeaderDisplayed === false) {
-                                (0, logger_1.info)();
-                                (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> Slate <<<<<<<<<<<<<< '));
+                                (0, index_1.info)();
+                                (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> Slate <<<<<<<<<<<<<< '));
                                 isHeaderDisplayed = true;
                             }
                             const targName = targetSlate.name + '';
-                            (0, logger_1.labeled)(targName +
+                            (0, index_1.labeled)(targName +
                                 ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), `http://localhost:${targetSlate.port.proxy}`).MESSAGE();
                         });
-                        (0, logger_1.info)();
+                        (0, index_1.info)();
                         break;
                     }
                 }
@@ -491,61 +539,102 @@ class Server {
     }
     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);
+            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;
+                    (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => __awaiter(this, void 0, void 0, function* () {
+                        var _c;
+                        targetdetails.restarting = true;
+                        (0, container_1.isContainer)()
+                            ? (_c = targetdetails.process) === null || _c === void 0 ? void 0 : _c.emit('preparing', targetdetails)
+                            : yield this.kill(targetdetails);
+                    }));
+                    (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => __awaiter(this, void 0, void 0, function* () {
+                        yield this.restart(targetdetails);
+                        targetdetails.restarting = false;
+                        if (target.type === constants_1.FN_TYPE.basic || target.type === constants_1.FN_TYPE.browserLogic) {
+                            (0, index_1.labeled)(`functions[${target.name}]`, 'ready!').MESSAGE();
+                            if (!target.url) {
+                                throw new error_1.default('Target URL not found while restarting server', {
+                                    exit: 2
+                                });
                             }
-                            setTimeout(() => {
-                                var _a;
-                                (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
-                            }, 1000);
-                        }));
-                    }, this);
+                            bioUrl(targetdetails, masterPort).log();
+                        }
+                        else if (target.type === constants_1.FN_TYPE.advanced) {
+                            (0, index_1.labeled)(`AdvancedIO[${target.name}]`, 'ready!').MESSAGE();
+                            aioUrl(targetdetails, masterPort).log();
+                        }
+                        setTimeout(() => {
+                            var _a;
+                            (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
+                        }, 1000);
+                    }));
+                }, this);
+            });
+            return new Promise((_res) => {
+                let isResolved = false;
+                const res = () => {
+                    isResolved = true;
+                    _res();
+                };
+                utils_1.serverEvent.on('child-exit', () => {
+                    if (Object.values(this.targetsMap)
+                        .flat()
+                        .some((targ) => targ.isAlive !== false || targ.restarting)) {
+                        return;
+                    }
+                    if (isResolved)
+                        return;
+                    (0, index_1.info)();
+                    (0, index_1.warning)((0, ansi_colors_1.yellow)('No serve components alive. Initiating catalyst serve shutdown.'));
+                    (0, index_1.info)();
+                    utils_1.serverEvent.emit('stop');
+                    utils_1.serverEvent.removeAllListeners('child-exit');
                 });
-            }
-            return new Promise((res) => {
-                ['SIGINT', 'SIGTERM'].forEach((sig) => process.on(sig, res));
+                utils_1.serverEvent.once('stop', () => {
+                    ['SIGINT', 'SIGTERM'].forEach((sig) => process.removeListener(sig, res));
+                    res();
+                });
+                ['SIGINT', 'SIGTERM'].forEach((sig) => process.once(sig, res));
             });
         });
     }
-    kill(serverProcess) {
+    kill(target) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => {
+            const serverProcess = target.process;
+            if (!serverProcess) {
+                throw new error_1.default('Unable to kill. Process empty: ' + ((_a = target.target) === null || _a === void 0 ? void 0 : _a.name), {
+                    exit: 2
+                });
+            }
+            yield new Promise((resolve) => {
                 if (serverProcess.pid === undefined) {
                     try {
                         serverProcess.close(() => resolve());
                     }
                     catch (e) {
-                        serverProcess.emit('close');
+                        serverProcess.emit('close', target);
+                        resolve();
                     }
                 }
-                if (serverProcess.exitCode === null) {
-                    serverProcess.kill('SIGINT');
+                if (serverProcess instanceof child_process_1.ChildProcess) {
+                    if (serverProcess.exitCode === null &&
+                        (serverProcess.signalCode === null ||
+                            !['SIGINT', 'SIGTERM', 'SIGKILL'].includes(serverProcess.signalCode))) {
+                        const signal = serverProcess.spawnfile.includes('python')
+                            ? 'SIGTERM'
+                            : 'SIGINT';
+                        serverProcess.kill(signal);
+                        serverProcess.once('close', resolve);
+                    }
+                    else {
+                        resolve();
+                    }
                 }
-                resolve();
             });
         });
     }
@@ -554,8 +643,13 @@ class Server {
             if (!target.process) {
                 throw new error_1.default('Process is not defined for this target.', { exit: 2 });
             }
-            yield this.kill(target.process);
+            if ((0, container_1.isContainer)()) {
+                target.process.emit('restart', target);
+                return;
+            }
+            yield this.kill(target);
             yield this.startServer(target, runtime_store_1.default.get(`context.port.http.master`, -1));
+            utils_1.serverEvent.emit('restart', target);
         });
     }
     stop() {
@@ -568,15 +662,15 @@ class Server {
                 }
                 yield ((_a = target.watcher) === null || _a === void 0 ? void 0 : _a.close());
                 if (targetdetails.process) {
-                    return this.kill(targetdetails.process);
+                    return this.kill(targetdetails);
                 }
-            }))))).catch((err) => (0, logger_1.debug)('Error stopping the servers: ', err));
+            }))))).catch((err) => (0, index_1.debug)('Error stopping the servers: ', err));
             if (this.masterServer) {
                 const masterServer = this.masterServer;
                 return new Promise((res, rej) => {
                     masterServer.close((err) => {
                         if (err) {
-                            (0, logger_1.debug)('Error stopping the master server: ', err);
+                            (0, index_1.debug)('Error stopping the master server: ', err);
                             return rej(err);
                         }
                         res();

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

@@ -0,0 +1,6 @@
+import { ChildProcess } from 'child_process';
+import { TAppSailServerDetails } from '../../../features/appsail';
+import { IServerDetails } from '../..';
+import { ContainerEvents } from '@zcatalyst/container-plugin';
+declare const _default: (serverDetails: IServerDetails<TAppSailServerDetails>) => Promise<ChildProcess | ContainerEvents>;
+export default _default;