zcatalyst-cli 1.8.0 → 1.10.0

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 };
 };
@@ -28,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;
@@ -98,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();
@@ -142,44 +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* () {
-                var _a;
-                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);
-                }
-                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', {
+                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();
                 });
             });
@@ -187,35 +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() {
+    kill(serverProcess) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all(Server.process.map((serverProcess) => {
-                return new Promise((resolve) => {
-                    if (serverProcess.pid === undefined) {
-                        try {
-                            serverProcess.close(() => resolve());
-                        }
-                        catch (e) {
-                            serverProcess.emit('close');
-                        }
+            return new Promise((resolve) => {
+                if (serverProcess.pid === undefined) {
+                    try {
+                        serverProcess.close(() => resolve());
                     }
-                    else {
-                        serverProcess.kill('SIGINT');
+                    catch (e) {
+                        serverProcess.emit('close');
                     }
-                    resolve();
+                }
+                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 });
+            }
+            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/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,11 +91,11 @@ 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();
-        let systemRoutes;
         const connections = {};
+        let systemRoutes;
         app.use(logger_1.default);
         app.use(cookie_parser_1.default);
         app.use(authenticator_1.default);
@@ -206,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) {
@@ -215,7 +216,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
             console.error(err);
         });
         expressServer.maxConnections = 100;
-        process.once('SIGINT', () => Object.keys(connections).forEach((sokcetId) => connections[sokcetId].destroy()));
+        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 + '';

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

@@ -30,6 +30,9 @@ 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;
@@ -44,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);
@@ -67,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();
@@ -106,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);
@@ -225,10 +235,13 @@ class HttpFunctions {
             };
             shell_1.clearLine(process.stdout);
             const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
-            const fnTargets = runtime_store_1.default.get('context.functions.targets');
+            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) => {
                 var _a;
                 if ((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
@@ -237,9 +250,7 @@ class HttpFunctions {
                 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;
@@ -250,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();
                     }
@@ -271,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/local-function.js

@@ -24,26 +24,14 @@ const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const project_1 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
-const languages_1 = require("../prepare/languages");
-function prepareTarget(target) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        if ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
-            return languages_1.java([target]);
-        }
-        if ((_b = target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.nodejs)) {
-            return languages_1.node([target]);
-        }
-        throw new error_1.default('Unknown stack received', { exit: 2 });
-    });
-}
 class LocalFunction {
     constructor(repl, target) {
-        var _a;
+        var _a, _b, _c;
         if (target.type === undefined || !Object.values(constants_1.FN_TYPE).includes(target.type)) {
             throw new error_1.default('target type is not defined', { exit: 2 });
         }
         this.repl = repl;
+        this.watcher = target.watcher;
         this.target = js_1.JS.omit(target, ['zip_stream', 'watcher']);
         this.slave = null;
         this.nodeInvoker = path_1.normalize(path_1.join(__dirname, './invoker', target.type, 'node.js'));
@@ -54,38 +42,22 @@ class LocalFunction {
         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.call = this._call.bind(this);
-        if (target.watcher) {
-            this.watcher = target.watcher;
-            target.watcher.on('all', (eventName, pth) => __awaiter(this, void 0, void 0, function* () {
+        (_b = this.watcher) === null || _b === void 0 ? void 0 : _b.on('preparing', () => {
+            if (!this.repl.paused) {
                 this.repl.pause();
-                shell_1.clearLine(process.stdout);
-                logger_1.info(`\n${eventName} of ${pth} in ${target.name} detected. Preparing your function, please wait...`);
-                const finalTargets = yield prepareTarget(target);
-                if (finalTargets === undefined || finalTargets.length === 0) {
-                    logger_1.warning('target [' +
-                        target.name +
-                        '] is not a valid one reason : ' +
-                        target.failure_reason);
-                    logger_1.info('Waiting for correction..');
-                    if (this.exitTimer) {
-                        this.exitTimer.refresh();
-                    }
-                    else {
-                        this.exitTimer = setTimeout(() => {
-                            logger_1.info('\n(To exit, press ^C)');
-                        }, 2000);
-                    }
-                }
-                else {
-                    logger_1.labeled(`functions(${target.name})`, 'ready!').MESSAGE();
-                    if (this.exitTimer) {
-                        clearTimeout(this.exitTimer);
-                    }
-                    this.repl.resume();
-                    this.repl.showPrompt();
-                }
-            }));
-        }
+            }
+        });
+        (_c = this.watcher) === null || _c === void 0 ? void 0 : _c.on('compiled', () => {
+            logger_1.labeled(`functions(${target.name})`, 'ready!').MESSAGE();
+            if (this.repl.paused) {
+                repl.resume();
+                repl.showPrompt();
+            }
+            setTimeout(() => {
+                var _a;
+                (_a = this.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
+            }, 1000);
+        });
     }
     _call(rawData = {}) {
         let data;
@@ -236,9 +208,6 @@ class LocalFunction {
                 if (this.slave) {
                     this.slave.kill('SIGINT');
                 }
-                if (this.exitTimer) {
-                    clearTimeout(this.exitTimer);
-                }
                 if (this.watcher) {
                     this.watcher.close().then(res).catch(res);
                 }

package/lib/shell/index.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const chokidar_1 = require("chokidar");
 const path_1 = require("path");
 const util_1 = require("util");
 const repl_server_1 = __importDefault(require("../repl-server"));
@@ -27,6 +26,7 @@ const option_1 = require("../util_modules/option");
 const http_functions_1 = __importDefault(require("./dependencies/http-functions"));
 const local_function_1 = __importDefault(require("./dependencies/local-function"));
 const prepare_1 = __importDefault(require("./prepare"));
+const fn_watcher_1 = __importDefault(require("../fn-watcher"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const replServer = new repl_server_1.default({
         prompt: 'functions > ',
@@ -46,7 +46,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const httpServer = new http_functions_1.default(replServer);
     try {
         yield prepare_1.default([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration]);
-        const targets = runtime_store_1.default.get('context.functions.targets', []).filter((target) => {
+        const targets = runtime_store_1.default
+            .get('context.functions.targets', [])
+            .filter((target) => {
             if (!target.valid) {
                 logger_1.warning('target [' +
                     target.name +
@@ -62,18 +64,15 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         }
         replServer.start();
-        targets.forEach((target) => {
-            if (option_1.getOptionValue('watch', false)) {
-                target.watcher = chokidar_1.watch(target.source, {
-                    ignored: /(^|[\/\\])\../,
-                    cwd: target.source,
-                    ignoreInitial: true
-                });
+        const watchOpt = option_1.getOptionValue('watch', false);
+        yield Promise.all(targets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
+            if (watchOpt) {
+                yield fn_watcher_1.default(target);
             }
             const localFn = new local_function_1.default(replServer, target);
             replServer.setContext(target.name, localFn.call);
             target.localFn = localFn;
-        });
+        })));
         if (runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], false)) {
             yield httpServer.start();
         }

package/lib/shell/prepare/index.js

@@ -16,7 +16,6 @@ const fn_utils_1 = require("../../fn-utils");
 const common_1 = require("../../fn-utils/lib/common");
 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 languages_1 = require("./languages");
 exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
     fn_utils_1.fnUtils.common.executeHook({ prefix: 'pre', command: 'serve' });
@@ -33,10 +32,7 @@ exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
         return target;
     });
     runtime_store_1.default.set('context.functions.targets', refinedTargets);
-    yield Promise.all([
-        languages_1.node(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) && target.valid; })),
-        languages_1.java(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) && target.valid; }))
-    ]);
+    yield languages_1.prepareFunctions(refinedTargets);
     yield common_1.resolveAllFnPorts(refinedTargets);
     return refinedTargets;
 });

package/lib/shell/prepare/languages/index.js

@@ -27,17 +27,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.java = exports.node = void 0;
+exports.prepareFunctions = void 0;
+const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/runtime"));
 function node(targets) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield Promise.resolve().then(() => __importStar(require('./node')))).default(targets);
     });
 }
-exports.node = node;
 function java(targets) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield Promise.resolve().then(() => __importStar(require('./java')))).default(targets);
     });
 }
-exports.java = java;
+function prepareFunctions(targets) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return Promise.all([
+            node(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) && target.valid; })),
+            java(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) && target.valid; }))
+        ]);
+    });
+}
+exports.prepareFunctions = prepareFunctions;

package/lib/track.js

@@ -16,6 +16,7 @@ const path_1 = require("path");
 const readline_1 = require("readline");
 const config_store_1 = __importDefault(require("./config-store"));
 const endpoints_1 = require("./endpoints");
+const error_1 = __importDefault(require("./error"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const fs_1 = require("./util_modules/fs");
 const logger_1 = require("./util_modules/logger");
@@ -52,7 +53,8 @@ exports.default = (event, message, duration) => __awaiter(void 0, void 0, void 0
             yield httpLogger.log(logInput);
         }
     }
-    catch (err) {
+    catch (e) {
+        const err = error_1.default.getErrorInstance(e);
         logger_1.debug('Unable to send debug log to server: ' + err.message);
     }
 });