zcatalyst-cli 1.21.0 → 1.22.0

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

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkIfRuntimeServerRunning = void 0;
+const ansi_colors_1 = require("ansi-colors");
 const better_queue_1 = __importDefault(require("better-queue"));
 const express_1 = __importDefault(require("express"));
 const path_1 = require("path");
@@ -24,20 +25,21 @@ const logger_1 = __importDefault(require("../../express_middlewares/logger"));
 const project_1 = __importDefault(require("../../express_middlewares/project"));
 const fn_utils_1 = require("../../fn-utils");
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const utils_1 = require("../../serve/server/lib/master/utils");
 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 userConfig_1 = __importDefault(require("../../userConfig"));
-const logger_2 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 const project_2 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
 const request_1 = __importDefault(require("request"));
-const ensure_java_userconfig_1 = require("../../fn-utils/lib/ensure-java-userconfig");
+const ensure_java_userconfig_1 = require("../../fn-utils/lib/java/ensure-java-userconfig");
 const option_1 = require("../../util_modules/option");
 const server_1 = require("../../util_modules/server");
+const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const logUrl = (name, pthName, httpPort, masterPort) => {
-    (0, logger_2.labeled)(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
+    (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) {
@@ -45,7 +47,7 @@ const checkIfRuntimeServerRunning = (port, itr = 0) => __awaiter(void 0, void 0,
             exit: 2
         });
     }
-    return new Promise((res) => {
+    return new Promise((res, reject) => {
         request_1.default
             .get(`http://127.0.0.1:${port}/ruok`, {
             headers: {
@@ -53,13 +55,15 @@ const checkIfRuntimeServerRunning = (port, itr = 0) => __awaiter(void 0, void 0,
             }
         })
             .on('response', (_response) => __awaiter(void 0, void 0, void 0, function* () {
-            (0, logger_2.debug)(`ruok response: ${_response.statusCode}: ${_response.statusMessage}`);
+            (0, index_1.debug)(`ruok response: ${_response.statusCode}: ${_response.statusMessage}`);
             if (_response.statusCode === 200) {
                 res(true);
             }
             else if (_response.statusCode === 503) {
                 yield js_1.JS.sleep(100);
-                yield (0, exports.checkIfRuntimeServerRunning)(port, ++itr).then((x) => res(x));
+                yield (0, exports.checkIfRuntimeServerRunning)(port, ++itr)
+                    .then((x) => res(x))
+                    .catch((er) => reject(er));
             }
             else {
                 yield js_1.JS.sleep(500);
@@ -73,7 +77,9 @@ const checkIfRuntimeServerRunning = (port, itr = 0) => __awaiter(void 0, void 0,
             const incomingError = error_1.default.getErrorInstance(error).original;
             if (incomingError.code === 'ECONNREFUSED' || incomingError.code === 'ECONNRESET') {
                 yield js_1.JS.sleep(100);
-                yield (0, exports.checkIfRuntimeServerRunning)(port, ++itr).then((x) => res(x));
+                yield (0, exports.checkIfRuntimeServerRunning)(port, ++itr)
+                    .then((x) => res(x))
+                    .catch((er) => reject(er));
             }
             else {
                 throw new error_1.default('Unable to spin up python runtime server. ErrorCode: ' + incomingError.code, {
@@ -102,7 +108,7 @@ class HttpFunctions {
         this.runningSlaves = [];
         this.targets = [];
         this.q = new better_queue_1.default((opts, cb) => {
-            var _a, _b;
+            var _a, _b, _c, _d;
             fs_1.SYNC.ensureFile(this.responseFile, true);
             fs_1.SYNC.ensureFile(this.requestFile, true);
             fs_1.SYNC.ensureFile(this.metaFile, true);
@@ -119,21 +125,22 @@ class HttpFunctions {
                 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, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_2.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, opts.envVars)
             }).RAW();
-            (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                (0, logger_2.info)(Buffer.isBuffer(data) ? data.toString() : data);
+            (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
+                const logs = Buffer.isBuffer(chunk) ? chunk.toString().split('\n') : [chunk];
+                logs.forEach((logStr) => (0, index_1.log)('info', `[${(0, ansi_colors_1.bold)(opts.id || 'function')}] ${logStr}`, true));
             });
-            (_b = slave.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                const errorStr = data.toString().trim();
-                (0, logger_2.info)(errorStr);
+            (_b = slave.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (chunk) => {
+                const logs = Buffer.isBuffer(chunk) ? chunk.toString().split('\n') : [chunk];
+                logs.forEach((logStr) => (0, index_1.log)('error', `[${(0, ansi_colors_1.bold)(opts.id || 'function')}] ${logStr}`, true));
             });
             slave.on('uncaughtException', (err, origin) => {
                 const errorString = `Caught exception: ${err}\n` + `Exception origin: ${origin}`;
-                (0, logger_2.error)(errorString);
+                (0, index_1.error)(errorString);
                 cb(errorString, null);
             });
             slave.on('exit', (code) => {
                 if (!fs_1.SYNC.fileExists(this.responseFile)) {
-                    (0, logger_2.debug)(`${this.responseFile} not present`);
+                    (0, index_1.debug)(`${this.responseFile} not present`);
                     cb(new Error('File does not exists: ' + this.responseFile));
                     return;
                 }
@@ -157,10 +164,29 @@ class HttpFunctions {
                         break;
                 }
             });
+            if (opts.debug) {
+                const debugListener = (data) => {
+                    const str = Buffer.isBuffer(data) ? data.toString() : data;
+                    if (opts.command.endsWith('node')) {
+                        str.includes('Debugger listening') && startDebug();
+                    }
+                    else if (opts.command.endsWith('java')) {
+                        str.includes('Listening for transport dt_socket') && startDebug();
+                    }
+                };
+                const startDebug = () => {
+                    var _a, _b;
+                    utils_1.serverEvent.emit('connection');
+                    (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.removeListener('data', debugListener);
+                    (_b = slave.stderr) === null || _b === void 0 ? void 0 : _b.removeListener('data', debugListener);
+                };
+                (_c = slave.stdout) === null || _c === void 0 ? void 0 : _c.once('data', debugListener);
+                (_d = slave.stderr) === null || _d === void 0 ? void 0 : _d.once('data', debugListener);
+            }
             this.runningSlaves.push(slave);
         }, { batchSize: 1, concurrent: 1, maxTimeout: Infinity }).on('task_failed', (targetName, err) => {
-            (0, logger_2.debug)('Unable to serve the function: ' + targetName);
-            (0, logger_2.debug)(err);
+            (0, index_1.debug)('Unable to serve the function: ' + targetName);
+            (0, index_1.debug)(err);
         });
     }
     _spinUpServer() {
@@ -186,7 +212,7 @@ class HttpFunctions {
                 this.app.use(authenticator_1.default);
             }
             const reqHandler = (fnTarget) => (request, response, next) => {
-                var _a, _b;
+                var _a, _b, _c, _d;
                 const urlParts = new url_1.URL(request.originalUrl, request.protocol + '://' + request.get('host')).searchParams;
                 const query = JSON.stringify(Object.fromEntries(urlParts.entries()));
                 const slaveOptions = [];
@@ -197,8 +223,11 @@ class HttpFunctions {
                         exit: 2
                     });
                 }
-                const slaveFnTarget = { index: fnTarget.index, name: fnTarget.name };
-                if ((_a = fnTarget.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
+                const slaveFnTarget = {
+                    index: (_a = fnTarget.index) === null || _a === void 0 ? void 0 : _a.replace((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.functions, fnTarget.name) + path_1.sep, ''),
+                    name: fnTarget.name
+                };
+                if ((_b = fnTarget.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.node.value)) {
                     if (debugPort !== -1) {
                         slaveOptions.push('--inspect-brk=' + debugPort);
                     }
@@ -226,10 +255,11 @@ class HttpFunctions {
                         pth: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, fnTarget.name),
                         req: request,
                         id: fnTarget.name,
+                        debug: debugPort !== -1,
                         envVars: fnTarget.env_var
                     });
                 }
-                else if ((_b = fnTarget.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
+                else if ((_c = fnTarget.stack) === null || _c === void 0 ? void 0 : _c.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];
@@ -262,9 +292,7 @@ class HttpFunctions {
                         'x-zc-cookie': request.headers['x-zc-cookie'],
                         'x-zc-user-type': request.headers['x-zc-user-type']
                     }));
-                    const configKey = `${fnTarget.stack}.bin`;
-                    const userConfigCmd = userConfig_1.default.get(configKey);
-                    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'java', fnTarget.stack);
+                    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)('java', (_d = fnTarget.additionalInfo) === null || _d === void 0 ? void 0 : _d.binPath);
                     slave = this.q.push({
                         command: spawnCommand,
                         options: slaveOptions,
@@ -272,6 +300,7 @@ class HttpFunctions {
                         pth: (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, fnTarget.name),
                         req: request,
                         id: fnTarget.name,
+                        debug: debugPort !== -1,
                         envVars: fnTarget.env_var
                     });
                 }
@@ -349,7 +378,7 @@ class HttpFunctions {
                             }
                         });
                         (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => {
-                            (0, logger_2.labeled)(`functions[${target.name}]`, 'ready!').MESSAGE();
+                            (0, index_1.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();
@@ -367,6 +396,10 @@ class HttpFunctions {
                     if (this.repl !== undefined) {
                         this.repl.showPrompt();
                     }
+                    server.once('close', () => {
+                        port_resolver_1.default.freePort(httpPort);
+                        port_resolver_1.default.freePort(debugPort);
+                    });
                     res(server);
                 });
             });

package/lib/shell/dependencies/invoker/cron/java/JavacronInvoker.java

@@ -266,7 +266,7 @@ public class JavacronInvoker {
 
 			defaultCron.setCronDetails(userData.get("cron_details") != null ? (JSONObject) userData.get("cron_details") : null);
 			defaultCron.setRemainingExecutionCount(userData.get("remaining_count") != null ? (Integer) userData.get("remaining_count") : -1);
-			defaultCron.setCronParam(jsonToMap(userData.get("data")));
+			defaultCron.setCronParam(jsonToMap(userData.get("data") != null ? userData.get("data") : new JSONObject()));
 			defaultCron.setProjectDetails(userData.get("project_details") != null ? (JSONObject) userData.get("project_details") : new JSONObject(projectData));
 			CronRequest cronRequest = defaultCron;
 

package/lib/shell/dependencies/invoker/job/java/JavajobInvoker.java

@@ -19,6 +19,7 @@ import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.catalyst.Context;
@@ -29,6 +30,38 @@ import com.catalyst.impl.DefaultContext;
 import com.catalyst.job.JobRequest;
 import com.catalyst.job.impl.DefaultJobRequest;
 
+class ZcJSONObject extends JSONObject {
+
+	ZcJSONObject(String jsonString) throws JSONException {
+		super(jsonString);
+	}
+
+	public long getLong(String key, boolean throwErr) throws JSONException {
+		try {
+			return super.getLong(key);
+		} catch (JSONException ex) {
+			if(throwErr) {
+				throw ex;
+			}
+			return 0;
+		}
+	}
+
+	public ZcJSONObject getJSONObject(String key) throws JSONException {
+		return this.getJSONObject(key, false);
+	}
+	public ZcJSONObject getJSONObject(String key, boolean throwErr) throws JSONException {
+		try {
+			return new ZcJSONObject(super.getJSONObject(key).toString());
+		} catch(JSONException ex) {
+			if(throwErr) {
+				throw ex;
+			}
+			return null;
+		}
+	}
+}
+
 public class JavajobInvoker {
 
 	private static final Integer MESSAGE_LENGTH = 1500;
@@ -186,7 +219,12 @@ public class JavajobInvoker {
 			String fnName = (String) target.get("name");
 			String fnExePath = Paths.get(invokerDir, "../../", "functions", fnName).normalize().toString();
 
-			JSONObject userData = new JSONObject(args[2]);
+			ZcJSONObject userData = null;
+			try {
+				userData = new ZcJSONObject(args[2]);
+			} catch (JSONException jsonEx) {
+				// do not handle the exception
+			}
 			HashMap<String, Object> projectData = jsonToMap(args[3]);
 			HashMap<String, Object> authData = jsonToMap(args[4]);
 
@@ -211,21 +249,24 @@ public class JavajobInvoker {
 			setZCThreadLocalProject(projectData);
 			setZCThreadLocalAuth(authData);
 
+			
+			// construct job details from input data
+			ZcJSONObject jobDetails = userData.getJSONObject("job_details");
+			ZcJSONObject jobMetaDetails = jobDetails != null ? jobDetails.getJSONObject("job_meta_details") : null;
+			ZcJSONObject jobpoolDetails = jobMetaDetails != null ? jobMetaDetails.getJSONObject("jobpool_details") : null;
+			ZcJSONObject projectDetails = jobpoolDetails != null ? jobpoolDetails.getJSONObject("project_details") : null;
+			ZcJSONObject capacity = userData.getJSONObject("capacity");
+			ZcJSONObject params = jobMetaDetails != null ? jobMetaDetails.getJSONObject("params") : null;
+			
+			// construct default job request from input job details
 			DefaultJobRequest defaultJob = new DefaultJobRequest();
 
-			JSONObject jobDetails = userData.getJSONObject("job_details");
-			JSONObject jobMetaDetails = jobDetails.getJSONObject("job_meta_details");
-			JSONObject jobpoolDetails = jobMetaDetails.getJSONObject("jobpool_details");
-			JSONObject projectDetails = jobpoolDetails.getJSONObject("project_details");
-			JSONObject capacity = userData.getJSONObject("capacity");
-			JSONObject params = jobMetaDetails.getJSONObject("params");
-
 			defaultJob.setJobDetails(jobDetails != null ? (JSONObject) jobDetails : new JSONObject());
 			defaultJob.setJobMetaDetails(jobMetaDetails != null ? (JSONObject) jobDetails : new JSONObject());
 			defaultJob.setJobpoolDetails(jobpoolDetails != null ? (JSONObject) jobpoolDetails : new JSONObject());
-			defaultJob.setProjectDetails(projectDetails);
+			defaultJob.setProjectDetails(projectDetails != null ? (JSONObject) projectDetails : new JSONObject());
 			CapacityAttributes capacityAttributes = CapacityAttributes.getInstance();
-			capacityAttributes.setMemory(capacity.getLong("memory"));
+			capacityAttributes.setMemory(capacity != null ? capacity.getLong("memory") : 0l);
 			defaultJob.setJobCapacity(capacityAttributes);
 			defaultJob.setJobParams(jsonToMap(params != null ? params.toString() : new JSONObject().toString()));
 

package/lib/shell/dependencies/invoker/job/node.mjs

@@ -61,8 +61,8 @@ const context = {
 const jobReq = {
 	getJobDetails: () => ('job_details' in userData ? userData.job_details : {}),
 	getJobMetaDetails: () => jobReq.getJobDetails()?.job_meta_details || {},
-	getJobpoolDetails: () => jobReq.getJobMetaDetails()?.jobpool_details || {},
-	getProjectDetails: () => jobReq.getJobpoolDetails()?.project_details || {},
+	getJobPoolDetails: () => jobReq.getJobMetaDetails()?.jobpool_details || {},
+	getProjectDetails: () => jobReq.getJobPoolDetails()?.project_details || {},
 	getJobCapacityAttributes: () => jobReq.getJobDetails()?.capacity || {},
 	getAllJobParams: () => jobReq.getJobMetaDetails()?.params || {},
 	getJobParam: (key) => (jobReq.getAllJobParams() || {})[key]

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

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { ChildProcess } from 'child_process';
+import { IFnTarget } from '../../../fn-utils/lib/common';
+import { IServerDetails } from '../../../serve/server';
+import { FnHandler } from './fn-handler';
+import { EventEmitter } from 'stream';
+import { ContainerEvents } from '@zcatalyst/container-plugin';
+export declare class FnExecutionHandler extends FnHandler {
+    constructor(serverDetails: IServerDetails<IFnTarget>, localFnEvents: EventEmitter);
+    execute(data: Record<string, unknown>, accessToken: string): Promise<ChildProcess>;
+    executeWithContainer(data: Record<string, unknown>, accessToken: string): Promise<ContainerEvents>;
+}

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

@@ -0,0 +1,260 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 __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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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.FnExecutionHandler = void 0;
+const child_process_1 = require("child_process");
+const fn_handler_1 = require("./fn-handler");
+const fn_utils_1 = require("../../../fn-utils");
+const path_1 = require("path");
+const node_1 = __importDefault(require("./node"));
+const java_1 = __importDefault(require("./java"));
+const python_1 = __importDefault(require("./python"));
+const project_1 = require("../../../util_modules/project");
+const constants_1 = require("../../../util_modules/constants");
+const error_1 = __importDefault(require("../../../error"));
+const port_resolver_1 = __importDefault(require("../../../port-resolver"));
+const http_functions_1 = require("../http-functions");
+const logger_1 = require("../../../util_modules/logger");
+const container_plugin_1 = require("@zcatalyst/container-plugin");
+const ansi_colors_1 = require("ansi-colors");
+const env_1 = require("../../../util_modules/env");
+const server_1 = require("../../../util_modules/server");
+const utils_1 = require("../../../serve/server/lib/master/utils");
+const readline_1 = __importDefault(require("readline"));
+class FnExecutionHandler extends fn_handler_1.FnHandler {
+    constructor(serverDetails, localFnEvents) {
+        super(serverDetails, localFnEvents);
+    }
+    execute(data, accessToken) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function* () {
+            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, ''),
+                name: (_c = this.fn.target) === null || _c === void 0 ? void 0 : _c.name
+            };
+            switch (this.stack) {
+                case 'node': {
+                    this.slave = (0, node_1.default)(this.fn, JSON.stringify(data), { slaveFnTarget, accessToken });
+                    break;
+                }
+                case 'java': {
+                    const javaInvoker = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', this.fn.target.stack, 'Java' + this.fn.target.type + 'Invoker');
+                    fn_utils_1.fnUtils.java.ensureJavaInvoker(javaInvoker, (0, path_1.normalize)((0, path_1.join)(__dirname, '../invoker', this.fn.target.type, 'java', 'Java' + this.fn.target.type + 'Invoker.java')), this.fn.target);
+                    this.slave = (0, java_1.default)(this.fn, JSON.stringify(data), {
+                        javaInvoker,
+                        slaveFnTarget,
+                        accessToken
+                    });
+                    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));
+                            utils_1.serverEvent.emit('connection');
+                            yield new Promise((res, rej) => {
+                                const connTimeout = setTimeout(() => rej('debugger connection timeout'), 10000);
+                                utils_1.serverEvent.once('attach', () => {
+                                    clearTimeout(connTimeout);
+                                    res();
+                                });
+                            });
+                        }
+                        catch (er) {
+                            utils_1.serverEvent.emit('error', er);
+                            this.kill();
+                            return;
+                        }
+                    });
+                    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) {
+                                        yield attachVsCodeDebugger(debugConfig.port);
+                                    }
+                                    else {
+                                        yield new Promise((res, rej) => {
+                                            try {
+                                                const rl = readline_1.default.createInterface({
+                                                    input: process.stdin,
+                                                    output: process.stdout,
+                                                    terminal: true
+                                                });
+                                                rl.on('line', () => {
+                                                    rl.close();
+                                                    res();
+                                                });
+                                                (0, logger_1.info)();
+                                                (0, logger_1.info)(`${(0, ansi_colors_1.dim)('>> ')} Please attach a ${(0, ansi_colors_1.bold)('DEBUGGER')} and press ${(0, ansi_colors_1.bold)('ANY KEY')} to continue executing the ${(0, ansi_colors_1.bold)(pyFn.target.name)} function`);
+                                                (0, logger_1.info)();
+                                            }
+                                            catch (er) {
+                                                rej(er);
+                                            }
+                                        });
+                                    }
+                                }
+                                yield (0, http_functions_1.checkIfRuntimeServerRunning)(this.fn.httpPort.toString());
+                                yield this.fnRequestHandler({
+                                    httpPort: this.fn.httpPort,
+                                    data,
+                                    accessToken
+                                }).finally(() => this.kill());
+                                resolve();
+                            }
+                            catch (er) {
+                                const _er = error_1.default.getErrorInstance(er);
+                                reject(_er);
+                            }
+                        }));
+                    }).catch((err) => {
+                        (0, logger_1.debug)('Error with fnRequestHandling flow: ', err);
+                        this.localFnEvents.emit('error', err);
+                    });
+                    break;
+                }
+                default: {
+                    throw new error_1.default('Invalid stack for fn execution handling: ' + this.stack, {
+                        exit: 2
+                    });
+                }
+            }
+            return this.slave;
+        });
+    }
+    executeWithContainer(data, accessToken) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function* () {
+            (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);
+            this.fn.target.env_var = Object.assign({ X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_c = this.fn.target) === null || _c === void 0 ? void 0 : _c.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: '/catalyst/', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_ADMIN_CRED_TOKEN: accessToken, CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[(_d = this.fn.target) === null || _d === void 0 ? void 0 : _d.type] }, (_e = this.fn.target) === null || _e === void 0 ? void 0 : _e.env_var);
+            if (this.fn.target.type === 'job') {
+                const hostIp = 'host.docker.internal';
+                const sysEnvs = {
+                    X_ZOHO_DATA_URL: `http://${hostIp}:${httpPort}/data`,
+                    X_ZOHO_CALLBACK_URL: `http://${hostIp}:${httpPort}/callback`,
+                    X_ZOHO_ADMIN_CRED_TYPE: 'token',
+                    X_ZOHO_ADMIN_CRED_TOKEN: accessToken,
+                    X_ZOHO_USER_CRED_TYPE: 'token',
+                    X_ZOHO_USER_CRED_TOKEN: accessToken,
+                    X_ZOHO_USER_TYPE: 'admin',
+                    X_ZOHO_PROJECT_KEY: (0, project_1.getDomainKey)(),
+                    X_ZOHO_PROJECTID: (0, project_1.getProjectId)(),
+                    X_ZOHO_PROJECT_DOMAIN: (0, project_1.getDomainPrefix)() + '.' + constants_1.ORIGIN.app.replace('https://', ''),
+                    X_ZOHO_CATALYST_ENVIRONMENT: 'Development',
+                    CATALYST_API_DOMAIN: constants_1.ORIGIN.admin
+                };
+                this.fn.target.env_var = Object.assign(Object.assign({}, this.fn.target.env_var), sysEnvs);
+            }
+            else {
+                this.fn.httpPort = httpPort;
+            }
+            const pluginEvent = yield container.start({
+                details: this.fn,
+                projectId: (0, project_1.getProjectId)(),
+                ruok: this.fn.target.type === 'job'
+                    ? container_plugin_1.RUOK.SKIP
+                    : this.fn.debugPort !== undefined && this.fn.debugPort !== -1
+                        ? container_plugin_1.RUOK.INFINITE
+                        : container_plugin_1.RUOK.FINITE
+            });
+            pluginEvent.on('error', (er) => {
+                var _a;
+                (0, logger_1.debug)('Container Error: ', er);
+                (0, logger_1.info)();
+                (0, logger_1.error)(`Error running the function ${(0, ansi_colors_1.bold)(((_a = this.fn.target) === null || _a === void 0 ? void 0 : _a.name) + '')} in container`);
+                (0, logger_1.info)();
+            });
+            pluginEvent.emit('start', this.fn);
+            pluginEvent.once('ready', () => __awaiter(this, void 0, void 0, function* () {
+                var _f, _g;
+                try {
+                    if (((_f = this.fn.target) === null || _f === void 0 ? void 0 : _f.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') {
+                        const cronData = {
+                            project_details: {},
+                            cron_details: {},
+                            data,
+                            remaining_count: 0
+                        };
+                        data = cronData;
+                    }
+                    yield this.fnRequestHandler({
+                        httpPort: this.fn.httpPort,
+                        data,
+                        accessToken
+                    }).finally(() => this.kill());
+                }
+                catch (er) {
+                    pluginEvent.emit('error', er instanceof error_1.default
+                        ? er
+                        : error_1.default.getErrorInstance(er, {
+                            message: 'Error when communicating with the container function ',
+                            skipHelp: true
+                        }));
+                }
+            }));
+            this.slave = pluginEvent;
+            return this.slave;
+        });
+    }
+}
+exports.FnExecutionHandler = FnExecutionHandler;

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

@@ -0,0 +1,30 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import EventEmitter from 'events';
+import { IFnTarget } from '../../../fn-utils/lib/common';
+import { IServerDetails } from '../../../serve/server';
+import { FSWatcher } from 'chokidar';
+import { ChildProcess } from 'child_process';
+import { ContainerEvents } from '@zcatalyst/container-plugin/out/utils';
+export declare class FnHandler {
+    fn: IServerDetails<IFnTarget>;
+    stack: string;
+    responseFile: string;
+    metaFile: string;
+    closed: boolean;
+    localFnEvents: EventEmitter;
+    watcher?: FSWatcher;
+    slave?: ChildProcess | ContainerEvents;
+    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>;
+    fnRequestHandler({ httpPort, data, accessToken }: {
+        httpPort: number;
+        data?: Record<string, unknown>;
+        accessToken: string;
+    }): Promise<void>;
+    fnResponseHandler(code?: number, sig?: string): Promise<void>;
+    shutdown(): Promise<void>;
+    kill(): void;
+}