zcatalyst-cli 1.25.3 → 1.26.1

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -38,7 +48,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const http_functions_1 = require("../../../../shell/dependencies/http-functions");
-const userConfig_1 = __importDefault(require("../../../../userConfig"));
 const constants_1 = require("../../../../util_modules/constants");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
@@ -83,22 +92,22 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
     }
     opts.unshift('-u');
     return new Promise((resolve, reject) => {
-        var _a, _b;
-        const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
+        var _a, _b, _c, _d;
+        const child = (0, shell_1.spawn)(((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.additionalInfo) === null || _b === void 0 ? void 0 : _b.binPath) || 'python', opts, {
             cwd: codeLocation,
             stdio: 'pipe',
             detached: true,
-            env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_a = details.target) === null || _a === void 0 ? void 0 : _a.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+            env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_c = details.target) === null || _c === void 0 ? void 0 : _c.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
         }).RAW();
         child.on('spawn', () => __awaiter(void 0, void 0, void 0, function* () {
-            var _c;
+            var _a;
             yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());
             debugConfig &&
-                (0, index_1.info)(`\nPython debugger for function ${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name} listening on port: ${details.debugPort}`);
+                (0, index_1.info)(`\nPython debugger for function ${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name} listening on port: ${details.debugPort}`);
             resolve(child);
         }));
         const errData = [];
-        (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (chunk) => {
+        (_d = child.stderr) === null || _d === void 0 ? void 0 : _d.on('data', (chunk) => {
             errData.push(chunk);
         });
         child.on('error', (err) => {

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

@@ -51,6 +51,13 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
     }
     else {
         const configFile = (0, path_1.join)(targetSlate.source, file_names_1.default.cli_config);
+        if (!(yield (0, async_1.fileExists)(configFile))) {
+            throw new error_1.default('cli-config.json file not found in source directory', {
+                exit: 1,
+                errorId: 'SERVE-SLATE-4',
+                arg: [targetSlate.source]
+            });
+        }
         const configJson = yield (0, async_1.readJSONFile)(configFile);
         const installDeps = (0, shell_1.spawn)('npm', ['install'], {
             cwd: targetSlate.source

package/lib/serve/server/lib/slate/static-server.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 export default function slateServer(httpPort: number, source: string, { homepage, enableWatch, notFoundPage }?: {
     homepage?: string;

package/lib/serve/server/lib/slate/static-server.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = slateServer;
 const express_1 = __importDefault(require("express"));
 const events_1 = require("events");
 const chokidar_1 = require("chokidar");
@@ -24,13 +25,14 @@ const ws_1 = require("ws");
 const port_resolver_js_1 = __importDefault(require("../../../../port-resolver.js"));
 const ansi_colors_1 = require("ansi-colors");
 const server_js_1 = require("../../../../util_modules/server.js");
+const env_1 = require("../../../../util_modules/env");
 function prepareScriptFile(dir, port) {
     return __awaiter(this, void 0, void 0, function* () {
         const scriptFile = yield index_js_1.ASYNC.readFile(constants_1.TEMPLATE.client.basic.socket);
         if (!scriptFile) {
             throw new error_1.default('Unable to read the script file', { exit: 2 });
         }
-        const scriptReady = scriptFile.replace(new RegExp(constants_1.PLACEHOLDER.client.port, 'g'), port + '');
+        const scriptReady = scriptFile.replace(new RegExp(constants_1.PLACEHOLDER.client.domain, 'g'), (0, env_1.getLocalAccessDomain)(port, 'ws'));
         yield index_js_1.ASYNC.ensureDir(dir);
         const scriptFilePath = (0, path_1.join)(dir, 'reload-script.js');
         yield index_js_1.ASYNC.writeFile(scriptFilePath, scriptReady);
@@ -59,8 +61,8 @@ function reloadApp(event, path, liveSockets) {
     (0, logger_1.info)((0, ansi_colors_1.cyan)(`${event} detected in ${path} of the Web-Client.`));
     liveSockets.forEach((socket) => socket.send('reload'));
 }
-function slateServer(httpPort, source, { homepage = '/index.html', enableWatch = true, notFoundPage } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function slateServer(httpPort_1, source_1) {
+    return __awaiter(this, arguments, void 0, function* (httpPort, source, { homepage = '/index.html', enableWatch = true, notFoundPage } = {}) {
         const eventListener = new events_1.EventEmitter();
         const catalystTempDir = (0, path_1.join)(source, '.catalyst');
         const socketServerPort = yield port_resolver_js_1.default.getFreePort(httpPort, 20, true);
@@ -191,4 +193,3 @@ function slateServer(httpPort, source, { homepage = '/index.html', enableWatch =
         return new Promise((res) => server.on('listening', () => res(eventListener)));
     });
 }
-exports.default = slateServer;

package/lib/serve/server/lib/web_client/server.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 export default function webClientServer(httpPort: number, source: string, { homepage, enableWatch, notFoundPage }?: {
     homepage?: string;

package/lib/serve/server/lib/web_client/server.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = webClientServer;
 const express_1 = __importDefault(require("express"));
 const events_1 = require("events");
 const chokidar_1 = require("chokidar");
@@ -24,13 +25,14 @@ const ws_1 = require("ws");
 const port_resolver_js_1 = __importDefault(require("../../../../port-resolver.js"));
 const ansi_colors_1 = require("ansi-colors");
 const server_js_1 = require("../../../../util_modules/server.js");
+const env_1 = require("../../../../util_modules/env");
 function prepareScriptFile(dir, port) {
     return __awaiter(this, void 0, void 0, function* () {
         const scriptFile = yield index_js_3.ASYNC.readFile(index_js_1.TEMPLATE.client.basic.socket);
         if (!scriptFile) {
             throw new index_js_2.default('Unable to read the script file', { exit: 2 });
         }
-        const scriptReady = scriptFile.replace(new RegExp(index_js_1.PLACEHOLDER.client.port, 'g'), port + '');
+        const scriptReady = scriptFile.replace(new RegExp(index_js_1.PLACEHOLDER.client.domain, 'g'), (0, env_1.getLocalAccessDomain)(port, 'ws'));
         yield index_js_3.ASYNC.ensureDir(dir);
         const scriptFilePath = (0, path_1.join)(dir, 'reload-script.js');
         yield index_js_3.ASYNC.writeFile(scriptFilePath, scriptReady);
@@ -59,8 +61,8 @@ function reloadApp(event, path, liveSockets) {
     (0, index_1.info)((0, ansi_colors_1.cyan)(`${event} detected in ${path} of the Web-Client.`));
     liveSockets.forEach((socket) => socket.send('reload'));
 }
-function webClientServer(httpPort, source, { homepage = 'index.html', enableWatch = true, notFoundPage } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function webClientServer(httpPort_1, source_1) {
+    return __awaiter(this, arguments, void 0, function* (httpPort, source, { homepage = 'index.html', enableWatch = true, notFoundPage } = {}) {
         const eventListener = new events_1.EventEmitter();
         const catalystTempDir = (0, path_1.join)(source, '.catalyst');
         const socketServerPort = yield port_resolver_js_1.default.getFreePort(httpPort, 20, true);
@@ -191,4 +193,3 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
         return new Promise((res) => server.on('listening', () => res(eventListener)));
     });
 }
-exports.default = webClientServer;

package/lib/shell/dependencies/http-functions.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import queue from 'better-queue';
 import { ChildProcess } from 'child_process';
 import express from 'express';

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

@@ -41,8 +41,8 @@ const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const logUrl = (name, pthName, httpPort, masterPort) => {
     (0, index_1.labeled)(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
 };
-const checkIfRuntimeServerRunning = (port, itr = 0) => __awaiter(void 0, void 0, void 0, function* () {
-    if (itr > 50) {
+const checkIfRuntimeServerRunning = (port_1, ...args_1) => __awaiter(void 0, [port_1, ...args_1], void 0, function* (port, itr = 0) {
+    if (itr > 100) {
         throw new error_1.default('Unable to spin up python runtime server. Max retry reached', {
             exit: 2
         });
@@ -212,7 +212,7 @@ class HttpFunctions {
                 this.app.use(authenticator_1.default);
             }
             const reqHandler = (fnTarget) => (request, response, next) => {
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e;
                 const urlParts = new url_1.URL(request.originalUrl, request.protocol + '://' + request.get('host')).searchParams;
                 const query = JSON.stringify(Object.fromEntries(urlParts.entries()));
                 const slaveOptions = [];
@@ -250,7 +250,7 @@ class HttpFunctions {
                     }));
                     slaveOptions.push(JSON.stringify((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)));
                     slave = this.q.push({
-                        command: 'node',
+                        command: ((_c = fnTarget.additionalInfo) === null || _c === void 0 ? void 0 : _c.binPath) || 'node',
                         options: slaveOptions,
                         pth: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, fnTarget.name),
                         req: request,
@@ -259,7 +259,7 @@ class HttpFunctions {
                         envVars: fnTarget.env_var
                     });
                 }
-                else if ((_c = fnTarget.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.java.value)) {
+                else if ((_d = fnTarget.stack) === null || _d === void 0 ? void 0 : _d.startsWith(runtime_1.default.language.java.value)) {
                     const invoker = fnTarget.type === constants_1.FN_TYPE.basic
                         ? this.javaInvoker[fnTarget.type] + `/${fnTarget.stack}/JavabioInvoker`
                         : this.javaInvoker[fnTarget.type];
@@ -292,7 +292,7 @@ class HttpFunctions {
                         'x-zc-cookie': request.headers['x-zc-cookie'],
                         'x-zc-user-type': request.headers['x-zc-user-type']
                     }));
-                    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)('java', (_d = fnTarget.additionalInfo) === null || _d === void 0 ? void 0 : _d.binPath);
+                    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)('java', (_e = fnTarget.additionalInfo) === null || _e === void 0 ? void 0 : _e.binPath);
                     slave = this.q.push({
                         command: spawnCommand,
                         options: slaveOptions,
@@ -421,7 +421,7 @@ class HttpFunctions {
                 });
                 this.q.destroy(() => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    yield Promise.all(this.targets.map((target) => __awaiter(this, void 0, void 0, function* () { var _b; return (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.close(); })));
+                    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(); })));
                     yield ((_a = this.connDestroyer) === null || _a === void 0 ? void 0 : _a.destroy());
                     res();
                 }));

package/lib/shell/dependencies/non-http-function/fn-execution-handler.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 import { IFnTarget } from '../../../fn-utils/lib/common';
 import { IServerDetails } from '../../../serve/server';

package/lib/shell/dependencies/non-http-function/fn-execution-handler.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -60,8 +70,8 @@ class FnExecutionHandler extends fn_handler_1.FnHandler {
         super(serverDetails, localFnEvents);
     }
     execute(data, accessToken) {
-        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
             const projectRoot = (0, project_1.getProjectRoot)();
             const slaveFnTarget = {
                 index: (_b = (_a = this.fn.target) === null || _a === void 0 ? void 0 : _a.index) === null || _b === void 0 ? void 0 : _b.replace((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.functions, this.fn.target.name) + path_1.sep, ''),
@@ -70,6 +80,7 @@ class FnExecutionHandler extends fn_handler_1.FnHandler {
             switch (this.stack) {
                 case 'node': {
                     this.slave = (0, node_1.default)(this.fn, JSON.stringify(data), { slaveFnTarget, accessToken });
+                    this.slave.once('spawn', () => utils_1.serverEvent.emit('connection'));
                     break;
                 }
                 case 'java': {
@@ -80,11 +91,10 @@ class FnExecutionHandler extends fn_handler_1.FnHandler {
                         slaveFnTarget,
                         accessToken
                     });
+                    this.slave.once('spawn', () => utils_1.serverEvent.emit('connection'));
                     break;
                 }
                 case 'python': {
-                    const pyFn = this.fn;
-                    this.slave = yield (0, python_1.default)(pyFn);
                     const attachVsCodeDebugger = (port) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             yield (0, server_1.isPortListening)(port, 25, env_1.isWindows ? 1000 : 500).catch((er) => (0, logger_1.debug)('error listening for port: ' + port, er));
@@ -103,27 +113,48 @@ class FnExecutionHandler extends fn_handler_1.FnHandler {
                             return;
                         }
                     });
+                    const pyFn = this.fn;
+                    const debugConfig = (_d = pyFn.target.additionalInfo) === null || _d === void 0 ? void 0 : _d.debug;
+                    const httpPort = yield port_resolver_1.default.getFreePort(constants_1.DEFAULT.serve_port.http[(_e = this.fn.target) === null || _e === void 0 ? void 0 : _e.type], 200);
+                    if (pyFn.target.type === 'job') {
+                        const jobServer = yield this.processFlowHandler(data, httpPort);
+                        this.slave = yield (0, python_1.default)(pyFn, httpPort);
+                        if (!(this.slave instanceof child_process_1.ChildProcess)) {
+                            jobServer.kill();
+                            throw new error_1.default('Slave not an instance of Child process', {
+                                context: this.slave,
+                                exit: 2
+                            });
+                        }
+                        this.slave.once('exit', () => jobServer.kill());
+                        this.slave.once('error', () => jobServer.kill());
+                        if (debugConfig && env_1.isExtension) {
+                            yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                                var _a, _b;
+                                (_a = this.slave) === null || _a === void 0 ? void 0 : _a.once('spawn', () => {
+                                    resolve();
+                                });
+                                (_b = this.slave) === null || _b === void 0 ? void 0 : _b.once('error', (er) => {
+                                    reject(er);
+                                });
+                            }));
+                            yield attachVsCodeDebugger(debugConfig.port);
+                        }
+                        break;
+                    }
+                    this.slave = yield (0, python_1.default)(pyFn, httpPort);
                     if (!(this.slave instanceof child_process_1.ChildProcess)) {
                         throw new error_1.default('Slave not an instance of Child process', {
                             context: this.slave,
                             exit: 2
                         });
                     }
-                    const debugConfig = (_d = pyFn.target.additionalInfo) === null || _d === void 0 ? void 0 : _d.debug;
-                    if (this.fn.target.type === 'job') {
-                        if (debugConfig && env_1.isVsCode) {
-                            yield attachVsCodeDebugger(debugConfig.port);
-                        }
-                        const httpPort = yield port_resolver_1.default.getFreePort(constants_1.DEFAULT.serve_port.http[(_e = this.fn.target) === null || _e === void 0 ? void 0 : _e.type], 200);
-                        this.processFlowHandler(data, httpPort);
-                        break;
-                    }
                     new Promise((resolve, reject) => {
                         var _a;
                         (_a = this.slave) === null || _a === void 0 ? void 0 : _a.once('spawn', () => __awaiter(this, void 0, void 0, function* () {
                             try {
                                 if (debugConfig) {
-                                    if (env_1.isVsCode) {
+                                    if (env_1.isExtension) {
                                         yield attachVsCodeDebugger(debugConfig.port);
                                     }
                                     else {
@@ -177,8 +208,8 @@ class FnExecutionHandler extends fn_handler_1.FnHandler {
         });
     }
     executeWithContainer(data, accessToken) {
-        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
             (0, logger_1.debug)('using container to serve the function: ' + ((_a = this.fn.target) === null || _a === void 0 ? void 0 : _a.name));
             const container = yield Promise.resolve().then(() => __importStar(require('@zcatalyst/container-plugin')));
             const httpPort = yield port_resolver_1.default.getFreePort(constants_1.DEFAULT.serve_port.http[(_b = this.fn.target) === null || _b === void 0 ? void 0 : _b.type], 200);
@@ -222,13 +253,13 @@ class FnExecutionHandler extends fn_handler_1.FnHandler {
             });
             pluginEvent.emit('start', this.fn);
             pluginEvent.once('ready', () => __awaiter(this, void 0, void 0, function* () {
-                var _f, _g;
+                var _a, _b;
                 try {
-                    if (((_f = this.fn.target) === null || _f === void 0 ? void 0 : _f.type) === 'job') {
+                    if (((_a = this.fn.target) === null || _a === void 0 ? void 0 : _a.type) === 'job') {
                         yield this.processFlowHandler(data, httpPort).finally(() => this.kill());
                         return;
                     }
-                    if (((_g = this.fn.target) === null || _g === void 0 ? void 0 : _g.type) === 'cron') {
+                    if (((_b = this.fn.target) === null || _b === void 0 ? void 0 : _b.type) === 'cron') {
                         const cronData = {
                             project_details: {},
                             cron_details: {},

package/lib/shell/dependencies/non-http-function/fn-handler.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import EventEmitter from 'events';
 import { IFnTarget } from '../../../fn-utils/lib/common';
 import { IServerDetails } from '../../../serve/server';
@@ -18,7 +16,9 @@ export declare class FnHandler {
     constructor(fn: IServerDetails<IFnTarget>, localFnEvents: EventEmitter);
     writeResponse(response: string, status: number): void;
     responseProcessor(statusCode: number, message?: string): void;
-    processFlowHandler(data: Record<string, unknown>, listenPort: number): Promise<void>;
+    processFlowHandler(data: Record<string, unknown>, listenPort: number): Promise<{
+        kill: () => void;
+    }>;
     fnRequestHandler({ httpPort, data, accessToken }: {
         httpPort: number;
         data?: Record<string, unknown>;

package/lib/shell/dependencies/non-http-function/fn-handler.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHandler = void 0;
-const child_process_1 = require("child_process");
 const fs_1 = require("../../../util_modules/fs");
 const constants_1 = require("../../../util_modules/constants");
 const http_1 = require("http");
@@ -22,6 +21,7 @@ const server_1 = require("../../../util_modules/server");
 const project_1 = require("../../../util_modules/project");
 const error_1 = __importDefault(require("../../../error"));
 const path_1 = require("path");
+const utils_1 = require("@zcatalyst/container-plugin/out/utils");
 class FnHandler {
     constructor(fn, localFnEvents) {
         this.closed = false;
@@ -81,10 +81,15 @@ class FnHandler {
     processFlowHandler(data, listenPort) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                var _a;
                 const jobDetailsServer = new http_1.Server((serverReq, serverRes) => __awaiter(this, void 0, void 0, function* () {
-                    var _b, _c;
-                    if ((_b = serverReq.url) === null || _b === void 0 ? void 0 : _b.includes('data')) {
+                    var _a, _b, _c;
+                    (0, logger_1.debug)(`[JOB_SERVER] [${serverReq.method}] ${serverReq.url}`);
+                    if ((_a = serverReq.url) === null || _a === void 0 ? void 0 : _a.includes('/ruok')) {
+                        serverRes.writeHead(200);
+                        serverRes.write('Iam Ok!');
+                        serverRes.end();
+                    }
+                    else if ((_b = serverReq.url) === null || _b === void 0 ? void 0 : _b.includes('data')) {
                         serverRes.writeHead(200);
                         serverRes.write(JSON.stringify({
                             data
@@ -101,29 +106,28 @@ class FnHandler {
                         serverRes.writeHead(200);
                         serverRes.write(JSON.stringify({}));
                         serverRes.end();
-                        resolve();
-                        return;
                     }
                     else {
                         (0, logger_1.debug)(`Invalid request: (${serverReq.method}) ${serverReq.url}`);
                         this.writeResponse('INTERNAL_SERVER_ERROR', 500);
                         reject(`Invalid request: (${serverReq.method}) ${serverReq.url}`);
-                        return;
                     }
                 }));
                 const jobConnDestroyer = new server_1.ConnectionDestroyer(jobDetailsServer);
                 jobDetailsServer.listen(listenPort, '127.0.0.1', () => {
-                    (0, logger_1.debug)('server listening on port :' + listenPort);
+                    (0, logger_1.debug)('job server listening on port :' + listenPort);
+                    resolve({
+                        kill: () => {
+                            jobConnDestroyer.destroy();
+                        }
+                    });
                 });
                 jobDetailsServer.on('error', reject);
-                (_a = this.slave) === null || _a === void 0 ? void 0 : _a.once('exit', () => {
-                    jobConnDestroyer.destroy();
-                });
             });
         });
     }
-    fnRequestHandler({ httpPort, data = {}, accessToken }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    fnRequestHandler(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ httpPort, data = {}, accessToken }) {
             data.project_details = Object.assign({ id: (0, project_1.getProjectId)(), project_name: (0, project_1.getProjectName)() }, (data.project_details || {}));
             const reqJson = JSON.stringify(data);
             return new Promise((resolve, reject) => {
@@ -176,9 +180,10 @@ class FnHandler {
         });
     }
     fnResponseHandler(code, sig) {
-        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
             if (code === 0) {
+                (0, logger_1.info)();
                 (0, logger_1.info)(`[CLI] Function ${(_a = this.fn.target) === null || _a === void 0 ? void 0 : _a.name} execution complete`);
                 (0, logger_1.info)();
                 const response = yield fs_1.ASYNC.readFile(this.responseFile);
@@ -203,7 +208,9 @@ class FnHandler {
                     case constants_1.FN_TYPE.event:
                         (0, logger_1.info)(`[status - ${this.fn.target.name}] ${response || 'Unknown'}`);
                         if (!response) {
+                            (0, logger_1.info)();
                             (0, logger_1.info)(`[CLI] Make sure to close the ${this.fn.target.name} (${this.fn.target.type}) function.`);
+                            (0, logger_1.info)();
                         }
                         this.localFnEvents.emit('response', {
                             status: meta.statusCode
@@ -221,10 +228,16 @@ class FnHandler {
                 }
             }
             else {
-                (code === 130 || sig === 'SIGINT') &&
+                if (code === 130 || sig === 'SIGINT') {
+                    (0, logger_1.info)();
                     (0, logger_1.info)(`[CLI] Function ${(_c = this.fn.target) === null || _c === void 0 ? void 0 : _c.name} interrupted`);
-                (code === 143 || sig === 'SIGTERM' || sig === 'SIGQUIT' || sig === 'SIGKILL') &&
+                    (0, logger_1.info)();
+                }
+                if (code === 143 || sig === 'SIGTERM' || sig === 'SIGQUIT' || sig === 'SIGKILL') {
+                    (0, logger_1.info)();
                     (0, logger_1.info)(`[CLI] Function ${(_d = this.fn.target) === null || _d === void 0 ? void 0 : _d.name} process killed`);
+                    (0, logger_1.info)();
+                }
                 this.localFnEvents.listenerCount('error') > 0 &&
                     this.localFnEvents.emit('error', new error_1.default(`Function(${(_e = this.fn.target) === null || _e === void 0 ? void 0 : _e.name}) process exited with ${code ? 'status: ' + code : 'signal: ' + sig}`, {
                         skipHelp: true
@@ -247,12 +260,33 @@ class FnHandler {
         });
     }
     kill() {
-        if (!this.slave) {
+        var _a;
+        if (!this.slave || ((_a = this.slave) === null || _a === void 0 ? void 0 : _a.killed)) {
+            return;
+        }
+        (0, logger_1.info)();
+        (0, logger_1.info)('Terminating Function');
+        if (this.slave instanceof utils_1.ContainerEvents) {
+            this.slave.emit('close', this.fn);
             return;
         }
-        this.slave instanceof child_process_1.ChildProcess
-            ? !this.slave.killed && this.slave.kill('SIGTERM')
-            : this.slave.emit('close', this.fn);
+        let isChildExited = false;
+        this.slave.kill('SIGTERM');
+        this.slave.once('exit', () => {
+            isChildExited = true;
+        });
+        setTimeout(() => {
+            if (!this.slave || this.slave instanceof utils_1.ContainerEvents) {
+                return;
+            }
+            if (!isChildExited) {
+                (0, logger_1.debug)(`Emitting SIGKILL to PID: ${this.slave.pid}`);
+                this.slave.kill('SIGKILL');
+            }
+            else {
+                (0, logger_1.debug)(`Fn child process kill confirmed PID: ${this.slave.pid}`);
+            }
+        }, 500);
     }
 }
 exports.FnHandler = FnHandler;

package/lib/shell/dependencies/non-http-function/node.js

@@ -5,7 +5,7 @@ const project_1 = require("../../../util_modules/project");
 const constants_1 = require("../../../util_modules/constants");
 const path_1 = require("path");
 exports.default = (fn, data, { slaveFnTarget, accessToken }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const slaveOptions = [];
     const nodeInvoker = (0, path_1.normalize)((0, path_1.join)(__dirname, '../invoker', (_a = fn.target) === null || _a === void 0 ? void 0 : _a.type, 'node.mjs'));
     if (fn.debugPort !== -1) {
@@ -28,9 +28,9 @@ exports.default = (fn, data, { slaveFnTarget, accessToken }) => {
         'x-zc-user-type': 'admin'
     }));
     slaveOptions.push(JSON.stringify((0, path_1.join)((0, project_1.getProjectRoot)(), constants_1.FOLDERNAME.build)));
-    return (0, shell_1.spawn)('node', slaveOptions, {
-        cwd: (_b = fn.target) === null || _b === void 0 ? void 0 : _b.build,
+    return (0, shell_1.spawn)(((_c = (_b = fn.target) === null || _b === void 0 ? void 0 : _b.additionalInfo) === null || _c === void 0 ? void 0 : _c.binPath) || 'node', slaveOptions, {
+        cwd: (_d = fn.target) === null || _d === void 0 ? void 0 : _d.build,
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_c = fn.target) === null || _c === void 0 ? void 0 : _c.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (_d = fn.target) === null || _d === void 0 ? void 0 : _d.env_var)
+        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_e = fn.target) === null || _e === void 0 ? void 0 : _e.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (_f = fn.target) === null || _f === void 0 ? void 0 : _f.env_var)
     }).RAW();
 };

package/lib/shell/dependencies/non-http-function/python.d.ts

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process';
 import { IServerDetails } from '../../../serve/server';
 import { IFnTarget, PythonFn } from '../../../fn-utils/lib/common';
-declare const _default: (fn: IServerDetails<IFnTarget<PythonFn>>) => Promise<ChildProcess>;
+declare const _default: (fn: IServerDetails<IFnTarget<PythonFn>>, runTimePort: number) => Promise<ChildProcess>;
 export default _default;