zcatalyst-cli 1.7.1 → 1.9.1

package/lib/serve/server/index.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -18,6 +29,7 @@ const fn_utils_1 = require("../../fn-utils");
 const plugin_loader_1 = __importDefault(require("../../plugin-loader"));
 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 fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
@@ -27,26 +39,26 @@ class Server {
     constructor() {
         this.targetDetailsArr = [];
     }
-    _spinUpMaster(masterPort) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
-            const debugPort = parseInt(runtime_store_1.default.get('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], '-1'), 10);
-            if (!isNaN(httpPort)) {
-                const fnTargets = runtime_store_1.default.get('context.functions.targets');
-                fnTargets
-                    .filter((t) => t.url !== undefined && t.type === constants_1.FN_TYPE.basic)
-                    .map((t) => js_1.JS.omit(t, ['zip_stream', 'watcher', 'localFn']))
-                    .forEach((t) => {
-                    this.targetDetailsArr.push({
-                        type: 'functions',
-                        httpPort,
-                        debugPort,
-                        target: t
-                    });
+    _addBasicFnDetails() {
+        const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
+        if (fnTargets.length === 0) {
+            logger_1.debug('No basic functions to add');
+        }
+        const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
+        const debugPort = parseInt(runtime_store_1.default.get('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], '-1'), 10);
+        if (!isNaN(httpPort)) {
+            fnTargets
+                .filter((t) => t.url !== undefined && t.type === constants_1.FN_TYPE.basic)
+                .map((t) => js_1.JS.omit(t, ['zip_stream', 'localFn']))
+                .forEach((t) => {
+                this.targetDetailsArr.push({
+                    type: 'functions',
+                    httpPort,
+                    debugPort,
+                    target: t
                 });
-            }
-            return master_1.default(masterPort, this.targetDetailsArr);
-        });
+            });
+        }
     }
     _spinUpJavaServer(details, masterPort) {
         var _a, _b, _c, _d;
@@ -97,10 +109,11 @@ class Server {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
+            const _d = details.target, { ['watcher']: _ } = _d, serialisableTarget = __rest(_d, ['watcher']);
             const opts = [
                 path_1.join(__dirname, 'lib', details.type === 'client' ? 'client.js' : 'node.js'),
                 details.httpPort + '',
-                JSON.stringify(details.target)
+                JSON.stringify(serialisableTarget)
             ];
             if (details.debugPort !== -1) {
                 logger_1.labeled(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
@@ -141,43 +154,49 @@ class Server {
             debugPort
         });
     }
+    startServer(details, masterPort) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (details.target === undefined) {
+                return;
+            }
+            let currentProcess;
+            if ((_a = details.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
+                currentProcess = yield this._spinUpJavaServer(details, masterPort);
+            }
+            else {
+                currentProcess = yield this._spinUpProcess(details, masterPort);
+            }
+            details.process = currentProcess;
+            const stdout = currentProcess.stdout;
+            if (stdout && typeof stdout.pipe === 'function') {
+                stdout.pipe(process.stdout);
+            }
+            const stderr = currentProcess.stderr;
+            if (stderr && typeof stderr.pipe === 'function') {
+                stderr.pipe(process.stderr);
+            }
+            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 });
             }
-            yield Promise.all(this.targetDetailsArr.map((details) => __awaiter(this, void 0, void 0, function* () {
-                if (details.target === undefined) {
-                    return;
-                }
-                let currentProcess;
-                switch (details.target.stack) {
-                    case constants_1.STACK.java8:
-                        currentProcess = yield this._spinUpJavaServer(details, masterPort);
-                        break;
-                    default:
-                        currentProcess = yield this._spinUpProcess(details, masterPort);
-                        break;
-                }
-                Server.process = [...Server.process, currentProcess];
-                const stdout = currentProcess.stdout;
-                if (stdout && typeof stdout.pipe === 'function') {
-                    stdout.pipe(process.stdout);
-                }
-                const stderr = currentProcess.stderr;
-                if (stderr && typeof stderr.pipe === 'function') {
-                    stderr.pipe(process.stderr);
-                }
-            })));
-            const masterServer = yield this._spinUpMaster(masterPort);
+            yield Promise.all(this.targetDetailsArr.map((details) => __awaiter(this, void 0, void 0, function* () { return this.startServer(details, masterPort); })));
+            this._addBasicFnDetails();
             if (this.targetDetailsArr.length === 0) {
-                throw new error_1.default('master server started before other server', { exit: 2 });
+                throw new error_1.default('Trying to start master server before other server', {
+                    exit: 2
+                });
             }
-            Server.process.push(masterServer);
+            const server = yield master_1.default(masterPort, this.targetDetailsArr);
+            this.masterServer = server;
             return new Promise((res) => {
-                masterServer.on('listening', () => {
-                    Server.process.forEach((process) => process.emit('start'));
+                server.on('listening', () => {
+                    this.targetDetailsArr.forEach((targetDetails) => { var _a; return (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start'); });
                     res();
                 });
             });
@@ -185,30 +204,88 @@ class Server {
     }
     wait() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (Server.process.length === 0) {
-                logger_1.debug('The server is not started yet.');
+            if (!this.masterServer) {
+                logger_1.debug('Master server is not started yet.');
                 throw new error_1.default('Server cannot be put to wait state.', { exit: 2 });
             }
+            this.targetDetailsArr.forEach((targetdetails) => {
+                var _a, _b;
+                const target = targetdetails.target;
+                if (targetdetails.type === 'functions' || !target || !targetdetails.process) {
+                    return;
+                }
+                (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => __awaiter(this, void 0, void 0, function* () {
+                    yield this.kill(targetdetails.process);
+                }));
+                (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => __awaiter(this, void 0, void 0, function* () {
+                    yield this.restart(target);
+                    logger_1.labeled(`server[${target.name}]`, 'ready!').MESSAGE();
+                    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));
             });
         });
     }
-    stop() {
-        Server.process.forEach((serverProcess) => {
-            if (serverProcess.pid === undefined) {
-                try {
-                    serverProcess.close();
+    kill(serverProcess) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => {
+                if (serverProcess.pid === undefined) {
+                    try {
+                        serverProcess.close(() => resolve());
+                    }
+                    catch (e) {
+                        serverProcess.emit('close');
+                    }
                 }
-                catch (e) {
-                    serverProcess.emit('close');
+                if (serverProcess.exitCode === null) {
+                    serverProcess.kill('SIGINT');
                 }
+                resolve();
+            });
+        });
+    }
+    restart(target) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const targetIdx = this.targetDetailsArr.findIndex((targetDetails) => { var _a; return target.source === ((_a = targetDetails.target) === null || _a === void 0 ? void 0 : _a.source); });
+            if (targetIdx === -1) {
+                throw new error_1.default('Unknown target given for restart.', { exit: 2 });
             }
-            else {
-                serverProcess.kill('SIGINT');
+            if (this.targetDetailsArr[targetIdx].type === 'functions') {
+                return;
+            }
+            const targetProcess = this.targetDetailsArr[targetIdx].process;
+            if (!targetProcess) {
+                throw new error_1.default('Process is not defined for this target.', { exit: 2 });
+            }
+            yield this.kill(targetProcess);
+            yield this.startServer(this.targetDetailsArr[targetIdx], runtime_store_1.default.get(`context.port.http.master`, -1));
+        });
+    }
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield Promise.all(this.targetDetailsArr.map((targetdetails) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const target = targetdetails.target;
+                if (!target) {
+                    return;
+                }
+                yield ((_a = target.watcher) === null || _a === void 0 ? void 0 : _a.close());
+                if (targetdetails.process) {
+                    return this.kill(targetdetails.process);
+                }
+            })));
+            if (this.masterServer) {
+                const masterServer = this.masterServer;
+                return new Promise((res, rej) => {
+                    masterServer.close((err) => (err ? rej(err) : res()));
+                });
             }
         });
     }
 }
-Server.process = [];
 exports.default = Server;

package/lib/serve/server/lib/client.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

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

@@ -29,6 +29,7 @@ const constants_1 = require("../../../util_modules/constants");
 const js_1 = require("../../../util_modules/js");
 const logger_2 = require("../../../util_modules/logger");
 const project_2 = require("../../../util_modules/project");
+const option_1 = require("../../../util_modules/option");
 const removeSecure = (str) => str.replace(/;\s?Secure/i, '').replace(/;\s?SameSite=None/i, '');
 const redirectByAuth = (req, res, redirectUrl) => {
     if (req.headers['x-zc-user-cred-token'] === undefined) {
@@ -90,9 +91,10 @@ function spinUpMaster(listenPort, otherServerDetails) {
             key: project_2.getDomainKey(),
             env_name: project_2.getEnvName()
         };
-        const bindPort = parseInt(runtime_store_1.default.get('context.port.bind', '-1'), 10);
         const rules = runtime_store_1.default.get('context.apig.local.config', -1);
+        const customProxyUrl = option_1.getOptionValue('proxy');
         const app = express_1.default();
+        const connections = {};
         let systemRoutes;
         app.use(logger_1.default);
         app.use(cookie_parser_1.default);
@@ -132,7 +134,8 @@ function spinUpMaster(listenPort, otherServerDetails) {
                     const appTarget = `http://127.0.0.1:${serverDetail.httpPort}/app/`;
                     app.use('/app', (req, res) => {
                         var _a;
-                        if (req.url.startsWith('/local-redirect') && ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.login_redirect)) {
+                        if (req.url.startsWith('/local-redirect') &&
+                            ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.login_redirect)) {
                             const isUrl = serverDetail.target.login_redirect.startsWith('/');
                             if (isUrl) {
                                 res.redirect(serverDetail.target.login_redirect);
@@ -204,7 +207,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
                     });
             }
         });
-        app.use('/', unknownReqProxy_1.default(proxy, { listenPort, bindPort, systemRules: systemRoutes }));
+        app.use('/', unknownReqProxy_1.default(proxy, customProxyUrl));
         app.use(error_handler_1.default);
         const expressServer = app.listen(listenPort).on('error', (err) => {
             if (proxy) {
@@ -212,6 +215,16 @@ function spinUpMaster(listenPort, otherServerDetails) {
             }
             console.error(err);
         });
+        expressServer.maxConnections = 100;
+        process.once('SIGINT', () => Object.keys(connections).forEach((sokcetId) => { var _a; return (_a = connections[sokcetId]) === null || _a === void 0 ? void 0 : _a.destroy(); }));
+        expressServer.on('connection', (socket) => {
+            const offset = Math.floor(Math.random() * 10);
+            const id = Date.now() + offset + '';
+            connections[id] = socket;
+            socket.on('close', () => {
+                delete connections[id];
+            });
+        });
         expressServer.on('close', () => {
             logger_2.info('Shutting down server');
             proxy.close();

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

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

package/lib/shell/dependencies/http-functions.js

@@ -24,11 +24,15 @@ const project_1 = __importDefault(require("../../express_middlewares/project"));
 const fn_utils_1 = require("../../fn-utils");
 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 fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 const logger_2 = require("../../util_modules/logger");
 const project_2 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
+const logUrl = (name, pthName, httpPort, masterPort) => {
+    logger_2.labeled(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
+};
 class HttpFunctions {
     constructor(repl) {
         this.repl = repl;
@@ -43,6 +47,7 @@ class HttpFunctions {
         this.responseFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
         this.metaFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
         this.runningSlaves = [];
+        this.targets = [];
         this.q = new better_queue_1.default((opts, cb) => {
             var _a, _b;
             fs_1.SYNC.ensureFile(this.responseFile, true);
@@ -66,7 +71,7 @@ class HttpFunctions {
                 }
             }).RAW();
             (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                logger_2.info(data);
+                logger_2.info(Buffer.isBuffer(data) ? data.toString() : data);
             });
             (_b = slave.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
                 const errorStr = data.toString().trim();
@@ -105,6 +110,12 @@ class HttpFunctions {
         return __awaiter(this, void 0, void 0, function* () {
             const debugPort = parseInt(runtime_store_1.default.get('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], '-1'), 10);
             const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
+            if (this.repl !== undefined) {
+                this.app.use((_req, _res, next) => {
+                    shell_1.clearLine(process.stdout);
+                    next();
+                });
+            }
             this.app.use(logger_1.default);
             this.app.use(cookie_parser_1.default);
             this.app.use(authenticator_1.default);
@@ -116,83 +127,86 @@ class HttpFunctions {
                 env_name: project_2.getEnvName()
             }));
             const reqHandler = (fnTarget) => (request, response, next) => {
+                var _a, _b;
                 const urlParts = new url_1.URL(request.originalUrl, request.protocol + '://' + request.get('host')).searchParams;
                 const query = JSON.stringify(Object.fromEntries(urlParts.entries()));
                 const slaveOptions = [];
                 let slave = null;
                 if (fnTarget.type === undefined) {
-                    throw new error_1.default('Function target type is not defined', { exit: 2 });
+                    throw new error_1.default('Function target type is not defined', {
+                        exit: 2
+                    });
                 }
-                switch (fnTarget.stack) {
-                    case constants_1.STACK.node10:
-                        if (debugPort !== -1) {
-                            slaveOptions.push('--inspect-brk=' + debugPort);
-                        }
-                        slaveOptions.push(this.nodeInvoker[fnTarget.type]);
-                        slaveOptions.push(JSON.stringify(fnTarget));
-                        slaveOptions.push(query);
-                        slaveOptions.push(JSON.stringify({
-                            'x-zc-projectid': request.headers['x-zc-projectid'],
-                            'x-zc-project-domain': request.headers['x-zc-project-domain'],
-                            'x-zc-project-key': request.headers['x-zc-project-key'],
-                            'x-zc-environment': request.headers['x-zc-environment']
-                        }));
-                        slaveOptions.push(JSON.stringify({
-                            'x-zc-user-cred-type': request.headers['x-zc-user-cred-type'],
-                            'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
-                            'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
-                            'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
-                            'x-zc-cookie': request.headers['x-zc-cookie']
-                        }));
-                        slaveOptions.push(JSON.stringify(path_1.join(runtime_store_1.default.get('cwd'), '.build')));
-                        slave = this.q.push({
-                            command: 'node',
-                            options: slaveOptions,
-                            pth: fnTarget.source,
-                            req: request,
-                            id: fnTarget.name
-                        });
-                        break;
-                    case constants_1.STACK.java8:
-                        const javaInvokerDir = path_1.parse(this.javaInvoker[fnTarget.type]).dir;
-                        slaveOptions.push('-cp');
-                        slaveOptions.push(javaInvokerDir +
-                            fn_utils_1.fnUtils.java.classPathSep +
-                            path_1.join(javaInvokerDir, 'lib', '*'));
-                        if (debugPort !== -1) {
-                            slaveOptions.push('-Xdebug');
-                            slaveOptions.push('-Xrunjdwp:transport=dt_socket,address=' +
-                                debugPort +
-                                ',server=y,suspend=y');
-                        }
-                        slaveOptions.push(path_1.basename(this.javaInvoker[fnTarget.type]));
-                        slaveOptions.push(javaInvokerDir);
-                        slaveOptions.push(JSON.stringify(fnTarget));
-                        slaveOptions.push(query);
-                        slaveOptions.push(JSON.stringify({
-                            'x-zc-projectid': request.headers['x-zc-projectid'],
-                            'x-zc-project-domain': request.headers['x-zc-project-domain'],
-                            'x-zc-project-key': request.headers['x-zc-project-key'],
-                            'x-zc-environment': request.headers['x-zc-environment']
-                        }));
-                        slaveOptions.push(JSON.stringify({
-                            'x-zc-user-cred-type': request.headers['x-zc-user-cred-type'],
-                            'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
-                            'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
-                            'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
-                            'x-zc-cookie': request.headers['x-zc-cookie']
-                        }));
-                        slave = this.q.push({
-                            command: 'java',
-                            options: slaveOptions,
-                            pth: fnTarget.source,
-                            req: request,
-                            id: fnTarget.name
-                        });
-                        break;
+                if ((_a = fnTarget.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
+                    if (debugPort !== -1) {
+                        slaveOptions.push('--inspect-brk=' + debugPort);
+                    }
+                    slaveOptions.push(this.nodeInvoker[fnTarget.type]);
+                    slaveOptions.push(JSON.stringify(fnTarget));
+                    slaveOptions.push(query);
+                    slaveOptions.push(JSON.stringify({
+                        'x-zc-projectid': request.headers['x-zc-projectid'],
+                        'x-zc-project-domain': request.headers['x-zc-project-domain'],
+                        'x-zc-project-key': request.headers['x-zc-project-key'],
+                        'x-zc-environment': request.headers['x-zc-environment']
+                    }));
+                    slaveOptions.push(JSON.stringify({
+                        'x-zc-user-cred-type': request.headers['x-zc-user-cred-type'],
+                        'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
+                        'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
+                        'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
+                        'x-zc-cookie': request.headers['x-zc-cookie']
+                    }));
+                    slaveOptions.push(JSON.stringify(path_1.join(runtime_store_1.default.get('cwd'), '.build')));
+                    slave = this.q.push({
+                        command: 'node',
+                        options: slaveOptions,
+                        pth: fnTarget.source,
+                        req: request,
+                        id: fnTarget.name
+                    });
+                }
+                else if ((_b = fnTarget.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
+                    const javaInvokerDir = path_1.parse(this.javaInvoker[fnTarget.type]).dir;
+                    slaveOptions.push('-cp');
+                    slaveOptions.push(javaInvokerDir +
+                        fn_utils_1.fnUtils.java.classPathSep +
+                        path_1.join(javaInvokerDir, 'lib', '*'));
+                    if (debugPort !== -1) {
+                        slaveOptions.push('-Xdebug');
+                        slaveOptions.push('-Xrunjdwp:transport=dt_socket,address=' +
+                            debugPort +
+                            ',server=y,suspend=y');
+                    }
+                    slaveOptions.push(path_1.basename(this.javaInvoker[fnTarget.type]));
+                    slaveOptions.push(javaInvokerDir);
+                    slaveOptions.push(JSON.stringify(fnTarget));
+                    slaveOptions.push(query);
+                    slaveOptions.push(JSON.stringify({
+                        'x-zc-projectid': request.headers['x-zc-projectid'],
+                        'x-zc-project-domain': request.headers['x-zc-project-domain'],
+                        'x-zc-project-key': request.headers['x-zc-project-key'],
+                        'x-zc-environment': request.headers['x-zc-environment']
+                    }));
+                    slaveOptions.push(JSON.stringify({
+                        'x-zc-user-cred-type': request.headers['x-zc-user-cred-type'],
+                        'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
+                        'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
+                        'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
+                        'x-zc-cookie': request.headers['x-zc-cookie']
+                    }));
+                    slave = this.q.push({
+                        command: 'java',
+                        options: slaveOptions,
+                        pth: fnTarget.source,
+                        req: request,
+                        id: fnTarget.name
+                    });
                 }
                 if (slave === null) {
-                    throw new error_1.default('Slave is null event after pushing opts', { exit: 2 });
+                    throw new error_1.default('Slave is null event after pushing opts', {
+                        exit: 2
+                    });
                 }
                 slave
                     .on('finish', (result) => {
@@ -224,17 +238,19 @@ class HttpFunctions {
             const fnTargets = runtime_store_1.default.get('context.functions.targets');
             fnTargets
                 .filter((t) => t.url !== undefined && t.type === constants_1.FN_TYPE.basic)
-                .map((t) => js_1.JS.omit(t, ['zip_stream', 'watcher', 'localFn']))
+                .map((t) => {
+                this.targets.push(t);
+                return js_1.JS.omit(t, ['zip_stream', 'watcher', 'localFn']);
+            })
                 .forEach((t) => {
-                if (t.stack === constants_1.STACK.java8) {
+                var _a;
+                if ((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
                     fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker[t.type], path_1.normalize(path_1.join(__dirname, './invoker', t.type, 'java', 'Java' + t.type + 'Invoker.java')));
                 }
                 const pthName = new url_1.URL(t.url).pathname;
                 if (pthName !== null) {
                     this.app.use(pthName, reqHandler(t));
-                    logger_2.labeled(`functions(${t.name})`, 'URL => http://localhost:' +
-                        (masterPort === -1 ? httpPort : masterPort) +
-                        pthName).MESSAGE();
+                    logUrl(t.name, pthName, httpPort, masterPort);
                 }
                 if (t.url_with_id !== undefined) {
                     const pathWithId = new url_1.URL(t.url_with_id).pathname;
@@ -245,6 +261,26 @@ class HttpFunctions {
             });
             return new Promise((res) => {
                 const server = this.app.listen(httpPort, () => {
+                    this.targets.forEach((target) => {
+                        var _a, _b;
+                        (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => {
+                            if (this.repl && !this.repl.paused) {
+                                this.repl.pause();
+                            }
+                        });
+                        (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => {
+                            logger_2.labeled(`functions(${target.name})`, 'ready!').MESSAGE();
+                            logUrl(target.name, new url_1.URL(target.url).pathname, httpPort, masterPort);
+                            if (this.repl && this.repl.paused) {
+                                this.repl.resume();
+                                this.repl.showPrompt();
+                            }
+                            setTimeout(() => {
+                                var _a;
+                                (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
+                            }, 1000);
+                        });
+                    });
                     if (this.repl !== undefined) {
                         this.repl.showPrompt();
                     }
@@ -266,28 +302,22 @@ class HttpFunctions {
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => {
+            return new Promise((res) => {
                 this.runningSlaves.forEach((slave) => {
                     slave.kill('SIGINT');
                 });
-                this.q.destroy(() => {
+                this.q.destroy(() => __awaiter(this, void 0, void 0, function* () {
+                    yield Promise.all(this.targets.map((target) => __awaiter(this, void 0, void 0, function* () { var _a; return (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.close(); })));
                     if (HttpFunctions.server !== null) {
-                        if (HttpFunctions.server.pid === undefined) {
-                            try {
-                                HttpFunctions.server.close(() => resolve());
-                            }
-                            catch (e) {
-                                HttpFunctions.server.emit('close');
-                            }
-                        }
-                        else {
-                            HttpFunctions.server.kill('SIGINT');
-                        }
+                        HttpFunctions.server.close((err) => {
+                            logger_2.debug(err);
+                            res();
+                        });
                     }
                     else {
-                        resolve();
+                        res();
                     }
-                });
+                }));
             });
         });
     }

package/lib/shell/dependencies/invoker/integ/node.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };