zcatalyst-cli 1.18.0-beta.0 → 1.18.0-beta.10

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

@@ -0,0 +1,93 @@
+'use strict';
+
+import * as path from 'path';
+import * as fs from 'fs';
+import { pathToFileURL } from 'url';
+
+const args = process.argv.slice(2);
+const target = JSON.parse(args[0]);
+const userData = JSON.parse(args[1]);
+const projectJson = JSON.parse(args[2]);
+const authJson = JSON.parse(args[3]);
+const buildDir = JSON.parse(args[4]);
+
+const requestFile = path.join(buildDir, '.catalyst', 'user_req_body');
+const responseFile = path.join(buildDir, '.catalyst', 'user_res_body');
+const metaFile = path.join(buildDir, '.catalyst', 'user_meta.json');
+
+const writeToFile = (resp, status) => {
+	fs.writeFileSync(responseFile, resp);
+	fs.writeFileSync(metaFile, JSON.stringify({ response: { statusCode: status } }));
+};
+
+let body = {};
+
+if (fs.existsSync(requestFile)) {
+	const content = fs.readFileSync(requestFile);
+	try {
+		body = JSON.parse(content.toString());
+	} catch (err) {
+		body = {};
+	}
+}
+
+/**
+ * execution timeout 15 minutes
+ */
+const timeout = 15 * 60 * 1000;
+const endTime = timeout + Date.now();
+
+// exit on timeout
+process.env.DEBUG === 'false' &&
+	setTimeout(() => {
+		writeToFile('TIMEOUT', 408);
+		process.exit(0);
+	}, timeout);
+
+const context = {
+	catalystHeaders: Object.assign(projectJson, authJson),
+	getMaxExecutionTimeMs: () => timeout,
+	getRemainingExecutionTimeMs: () => endTime - Date.now(),
+	closeWithSuccess: () => {
+		writeToFile('SUCCESS', 200);
+		process.exit(0);
+	},
+	closeWithFailure: () => {
+		writeToFile('FAILURE', 530);
+		process.exit(0);
+	}
+};
+
+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 || {},
+	getJobCapacityAttributes: () => jobReq.getJobDetails()?.capacity || {},
+	getAllJobParams: () => jobReq.getJobMetaDetails()?.params || {},
+	getJobParam: (key) => (jobReq.getAllJobParams() || {})[key]
+};
+
+import(pathToFileURL(target.index))
+	.then((module) => {
+		try {
+			if (!('default' in module)) {
+				throw new Error('Could not find any default export');
+			}
+			if (typeof module.default !== 'function') {
+				throw new Error('The default export is not a function');
+			}
+			module.default(jobReq, context);
+		} catch (e) {
+			// eslint-disable-next-line no-console
+			console.error(e);
+			writeToFile('CODE_EXCEPTION', 532);
+			process.exit(0);
+		}
+	})
+	.catch((e) => {
+		// eslint-disable-next-line no-console
+		console.error(e);
+		writeToFile('INTERNAL_SERVER_ERROR', 500);
+		process.exit(0);
+	});

package/lib/shell/dependencies/local-function.js

@@ -1,4 +1,27 @@
 '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) {
@@ -13,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const http_1 = __importDefault(require("http"));
+const http_1 = __importStar(require("http"));
 const error_1 = __importDefault(require("../../error"));
 const fn_utils_1 = require("../../fn-utils");
 const credential_1 = __importDefault(require("../../internal/credential"));
@@ -30,6 +53,7 @@ const shell_1 = require("../../util_modules/shell");
 const http_functions_1 = require("../dependencies/http-functions");
 const events_1 = __importDefault(require("events"));
 const ensure_java_userconfig_1 = require("../../fn-utils/lib/ensure-java-userconfig");
+const server_1 = require("../../util_modules/server");
 class LocalFunction {
     constructor(repl, target) {
         var _a, _b, _c;
@@ -73,15 +97,44 @@ class LocalFunction {
                 return new error_1.default('Invalid input');
             }
             return (() => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e, _f;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                 const projectRoot = runtime_store_1.default.get('project.root');
                 const accessToken = yield credential_1.default.getAccessToken();
                 const slaveOptions = [];
                 const debugPort = runtime_store_1.default.get('context.port.debug.' + constants_1.FN_TYPE.basic, null);
                 yield fs_1.ASYNC.ensureFile(this.responseFile, true);
                 yield fs_1.ASYNC.ensureFile(this.metaFile, true);
+                if (this.target.type === constants_1.FN_TYPE.job) {
+                    const jobData = data;
+                    const jobMetaDetails = {
+                        headers: Object.assign(Object.assign({}, (_b = (_a = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _a === void 0 ? void 0 : _a.job_meta_details) === null || _b === void 0 ? void 0 : _b.headers), {
+                            'x-zc-projectid': (0, project_1.getProjectId)(),
+                            'x-zc-project-domain': (0, project_1.getDomainPrefix)() + '.' + constants_1.ORIGIN.app.replace('https://', ''),
+                            'x-zc-project-key': (0, project_1.getDomainKey)(),
+                            'x-zc-environment': (0, project_1.getEnvName)(),
+                            'x-zc-user-cred-type': 'token',
+                            'x-zc-user-cred-token': accessToken,
+                            'x-zc-admin-cred-type': 'token',
+                            'x-zc-admin-cred-token': accessToken,
+                            'x-zc-user-type': 'admin'
+                        }),
+                        params: ((_d = (_c = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _c === void 0 ? void 0 : _c.job_meta_details) === null || _d === void 0 ? void 0 : _d.params) || {},
+                        jobpool_details: ((_f = (_e = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _e === void 0 ? void 0 : _e.job_meta_details) === null || _f === void 0 ? void 0 : _f.jobpool_details) || {
+                            type: 'Function',
+                            project_details: {
+                                project_name: (0, project_1.getProjectName)(),
+                                id: (0, project_1.getProjectId)()
+                            }
+                        }
+                    };
+                    jobData.job_details = Object.assign(Object.assign({}, jobData.job_details), { job_meta_details: jobMetaDetails });
+                    jobData.capacity = jobData.capacity || {
+                        memory: '256'
+                    };
+                    data = jobData;
+                }
                 const slaveFnTarget = { index: this.target.index, name: this.target.name };
-                if ((_a = this.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
+                if ((_g = this.target.stack) === null || _g === void 0 ? void 0 : _g.startsWith(runtime_1.default.language.node.value)) {
                     if (debugPort !== null) {
                         slaveOptions.push('--inspect-brk=' + debugPort);
                     }
@@ -105,10 +158,10 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)('node', slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         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, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.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: (_h = this.target) === null || _h === void 0 ? void 0 : _h.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
-                else if ((_b = this.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
+                else if ((_j = this.target.stack) === null || _j === void 0 ? void 0 : _j.startsWith(runtime_1.default.language.java.value)) {
                     const javaInvokerDir = (0, path_1.parse)(this.javaInvoker).dir;
                     slaveOptions.push('-cp');
                     slaveOptions.push(javaInvokerDir +
@@ -143,11 +196,11 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)(spawnCommand, slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         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, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.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: (_k = this.target) === null || _k === void 0 ? void 0 : _k.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
-                else if ((_c = this.target.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
-                    const stackVersion = (_d = this.target.stack) === null || _d === void 0 ? void 0 : _d.replace('python_', '');
+                else if ((_l = this.target.stack) === null || _l === void 0 ? void 0 : _l.startsWith(runtime_1.default.language.python.value)) {
+                    const stackVersion = (_m = this.target.stack) === null || _m === void 0 ? void 0 : _m.replace('python_', '');
                     const runtimesDir = constants_1.ENVPATH.runtimes.data;
                     const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
                     const runTimePort = yield port_resolver_1.default.getFreePort(httpPort, 20, false);
@@ -158,17 +211,72 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         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_CATALYST_CODE_LOCATION: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.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: (_o = this.target) === null || _o === void 0 ? void 0 : _o.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, X_ZOHO_CATALYST_CODE_LOCATION: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), X_ZOHO_DATA_URL: `http://localhost:${runTimePort}/data`, X_ZOHO_CALLBACK_URL: `http://localhost:${runTimePort}/callback`, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_ADMIN_CRED_TOKEN: 'dummy', X_ZOHO_PROJECT_SECRET_KEY: 'dummy', X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_CATALYST_ENVIRONMENT: 'Local', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[this.target.type] }, this.target.env_var)
                     }).RAW();
                     this.slave.once('spawn', () => __awaiter(this, void 0, void 0, function* () {
+                        var _r;
                         const jsonData = data;
                         jsonData.timestamp = Date.now();
-                        const reqJson = JSON.stringify(jsonData);
-                        yield (0, http_functions_1.checkIfRuntimeServerRunning)(runTimePort.toString());
                         const writeResponse = (response, status) => {
                             fs_1.SYNC.writeFile(this.responseFile, response);
                             fs_1.SYNC.writeFile(this.metaFile, JSON.stringify({ response: { statusCode: status } }));
                         };
+                        if (this.target.type === constants_1.FN_TYPE.job) {
+                            const jobDetailsServer = new http_1.Server((serverReq, serverRes) => __awaiter(this, void 0, void 0, function* () {
+                                var _s, _t, _u;
+                                if ((_s = serverReq.url) === null || _s === void 0 ? void 0 : _s.includes('data')) {
+                                    serverRes.writeHead(200);
+                                    serverRes.write(JSON.stringify({
+                                        data: jsonData
+                                    }));
+                                    serverRes.end();
+                                }
+                                else if ((_t = serverReq.url) === null || _t === void 0 ? void 0 : _t.includes('callback')) {
+                                    const reqData = yield new Promise((resolve) => {
+                                        const data = [];
+                                        serverReq.on('data', (chunk) => data.push(chunk));
+                                        serverReq.on('end', () => resolve(JSON.parse(Buffer.concat(data).toString())));
+                                    });
+                                    switch (reqData.job_status) {
+                                        case 200: {
+                                            writeResponse('SUCCESS', 200);
+                                            break;
+                                        }
+                                        case 532: {
+                                            writeResponse('CODE_EXCEPTION', 532);
+                                            break;
+                                        }
+                                        case 530: {
+                                            writeResponse('FAILURE', 530);
+                                            break;
+                                        }
+                                        case 500: {
+                                            writeResponse('INTERNAL_SERVER_ERROR', 500);
+                                            break;
+                                        }
+                                    }
+                                    serverRes.writeHead(200);
+                                    serverRes.end();
+                                    return;
+                                }
+                                else {
+                                    (0, logger_1.debug)(`Invalid request: (${serverReq.method}) ${serverReq.url}`);
+                                    writeResponse('INTERNAL_SERVER_ERROR', 500);
+                                    (_u = this.slave) === null || _u === void 0 ? void 0 : _u.kill('SIGINT');
+                                    return;
+                                }
+                            }));
+                            const jobConnDestroyer = new server_1.ConnectionDestroyer(jobDetailsServer);
+                            jobDetailsServer.listen(runTimePort, () => {
+                                (0, logger_1.debug)('server listening on port :' + runTimePort);
+                            });
+                            (_r = this.slave) === null || _r === void 0 ? void 0 : _r.once('exit', () => {
+                                jobConnDestroyer.destroy();
+                            });
+                            return;
+                        }
+                        const reqJson = JSON.stringify(jsonData);
+                        yield (0, http_functions_1.checkIfRuntimeServerRunning)(runTimePort.toString());
                         const req = http_1.default
                             .request(`http://127.0.0.1:${runTimePort}`, {
                             headers: {
@@ -239,11 +347,11 @@ class LocalFunction {
                         exit: 2
                     });
                 }
-                (_e = this.slave.stdout) === null || _e === void 0 ? void 0 : _e.on('data', (message) => {
+                (_p = this.slave.stdout) === null || _p === void 0 ? void 0 : _p.on('data', (message) => {
                     (0, shell_1.clearLine)(process.stdout);
                     (0, logger_1.info)(message.toString());
                 });
-                (_f = this.slave.stderr) === null || _f === void 0 ? void 0 : _f.on('data', (message) => {
+                (_q = this.slave.stderr) === null || _q === void 0 ? void 0 : _q.on('data', (message) => {
                     const errorStr = js_1.JS.trim(message.toString());
                     (0, shell_1.clearLine)(process.stdout);
                     (0, logger_1.info)(errorStr);
@@ -271,6 +379,7 @@ class LocalFunction {
                                 });
                                 break;
                             case constants_1.FN_TYPE.cron:
+                            case constants_1.FN_TYPE.job:
                             case constants_1.FN_TYPE.event:
                                 (0, logger_1.info)(`[status - ${this.target.name}] ${response || 'Unknown'}`);
                                 if (!response) {

package/lib/shell/dependencies/tunnel-server.js

@@ -33,6 +33,7 @@ const server_1 = require("../../util_modules/server");
 const ansi_colors_1 = require("ansi-colors");
 const util_1 = require("util");
 const project_1 = require("../../util_modules/project");
+const endpoints_1 = require("../../endpoints");
 class TunnelServer {
     constructor(repel) {
         _TunnelServer_contextMap.set(this, {});
@@ -42,6 +43,29 @@ class TunnelServer {
         _TunnelServer_projectId.set(this, (0, project_1.getProjectId)());
         __classPrivateFieldSet(this, _TunnelServer_repel, repel, "f");
     }
+    isAsyncFn(fnType) {
+        switch (fnType) {
+            case 'cron':
+            case 'event':
+            case 'job': {
+                return true;
+            }
+        }
+        return false;
+    }
+    send(req, res, status = 200, data, contentType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const body = req.body;
+            if (this.isAsyncFn(body.function_details.function_type)) {
+                const tunnelAPI = yield (0, endpoints_1.tunnelAPI)();
+                yield tunnelAPI.tunnelCallback(status, body.default, data);
+                return;
+            }
+            contentType && res.contentType(contentType);
+            res.status(status);
+            res.send(data);
+        });
+    }
     startServer() {
         return __awaiter(this, void 0, void 0, function* () {
             const tunnelPortOpt = Number.parseInt(runtime_store_1.default.get('context.port.tunnel'));
@@ -59,23 +83,33 @@ class TunnelServer {
             const app = (0, express_1.default)();
             app.use(express_1.default.json());
             app.all('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+                if (req.method !== 'POST') {
+                    res.status(200);
+                    res.send();
+                    return;
+                }
+                const body = req.body;
+                if (!body.function_details ||
+                    !body.function_data ||
+                    (body.function_details.function_type !== 'integration' && !body.default)) {
+                    res.status(400);
+                    res.send();
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid tunnel request: ' + (0, util_1.inspect)(body));
+                    return;
+                }
+                if (this.isAsyncFn(body.function_details.function_type)) {
+                    res.status(200);
+                    res.send();
+                }
                 try {
-                    const body = req.body;
-                    if (!body.function_details || !body.function_data) {
-                        res.status(400);
-                        res.send();
-                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
-                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid tunnel request: ' + (0, util_1.inspect)(body));
-                        return;
-                    }
                     __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                     __classPrivateFieldGet(this, _TunnelServer_repel, "f").write((0, ansi_colors_1.bold)(`Received tunnel request from ${body.function_details.function_name}(${body.function_details.function_id})`));
                     const target = body.function_details.function_id in __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")
                         ? __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")[body.function_details.function_id]
-                        : (() => {
+                        : yield (() => __awaiter(this, void 0, void 0, function* () {
                             if (__classPrivateFieldGet(this, _TunnelServer_projectId, "f") !== body.function_details.project_id) {
-                                res.status(403);
-                                res.send();
+                                yield this.send(req, res, 403);
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid access: the tunnel is trying to access the functions from a different project');
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
@@ -87,15 +121,14 @@ class TunnelServer {
                             if (namedFn) {
                                 return namedFn;
                             }
-                            res.status(404);
-                            res.send();
+                            yield this.send(req, res, 404);
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write(`The tunneled function ${(0, ansi_colors_1.bold)(body.function_details.function_name)} is not present in local project directory`);
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('[STATUS]');
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('NOT_FOUND');
                             return;
-                        }).bind(this)();
+                        })).bind(this)();
                     if (!target) {
                         return;
                     }
@@ -103,11 +136,10 @@ class TunnelServer {
                         ? JSON.parse(body.function_data)
                         : body.function_data;
                     target.call(false)(fnData);
-                    const errorHandler = (e) => {
-                        res.status(500);
-                        res.send();
+                    const errorHandler = (e) => __awaiter(this, void 0, void 0, function* () {
+                        yield this.send(req, res, 500);
                         (0, logger_1.debug)('Target error: ' + e);
-                    };
+                    });
                     target.once('error', errorHandler);
                     const response = yield new Promise((resolve, reject) => {
                         target.once('response', (response) => {
@@ -118,13 +150,10 @@ class TunnelServer {
                             resolve(response);
                         });
                     });
-                    response.ContentType && res.setHeader('Content-Type', response.ContentType);
-                    res.status(response.status || 200);
-                    res.send(response.responseBody);
+                    yield this.send(req, res, response.status, response.responseBody, response.ContentType);
                 }
                 catch (e) {
-                    res.status(500);
-                    res.send();
+                    yield this.send(req, res, 500);
                     (0, logger_1.debug)(e);
                 }
             }));

package/lib/shell/index.js

@@ -49,29 +49,29 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const httpServer = new http_functions_1.default({ repl: replServer });
     const tunnelServer = new tunnel_server_1.default(replServer);
     const projectRoot = runtime_store_1.default.get('project.root');
-    try {
-        yield (0, 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) => {
-            if (!target.valid) {
-                (0, logger_js_1.warning)('target [' +
-                    target.name +
-                    '] is not a valid one reason : ' +
-                    target.failure_reason);
-                Array.isArray(target.compilationError) &&
-                    target.compilationError.forEach((er) => (0, logger_js_1.error)(er));
-                Array.isArray(target.compilationWarning) &&
-                    target.compilationWarning.forEach((warn) => (0, logger_js_1.warning)(warn));
-            }
-            return target.valid;
-        });
-        if (targets.length === 0) {
-            throw new error_1.default('No functions are ready for serving', {
-                exit: 0,
-                errorId: 'SHELL-IDX-1'
-            });
+    yield (0, prepare_1.default)([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration, constants_1.FN_TYPE.job]);
+    const targets = runtime_store_1.default
+        .get('context.functions.targets', [])
+        .filter((target) => {
+        if (!target.valid) {
+            (0, logger_js_1.warning)('target [' +
+                target.name +
+                '] is not a valid one reason : ' +
+                target.failure_reason);
+            Array.isArray(target.compilationError) &&
+                target.compilationError.forEach((er) => (0, logger_js_1.error)(er));
+            Array.isArray(target.compilationWarning) &&
+                target.compilationWarning.forEach((warn) => (0, logger_js_1.warning)(warn));
         }
+        return target.valid;
+    });
+    if (targets.length === 0) {
+        throw new error_1.default('No functions are ready for serving', {
+            exit: 0,
+            errorId: 'SHELL-IDX-1'
+        });
+    }
+    try {
         replServer.start();
         yield tunnelServer.startServer();
         const tunnelUrl = runtime_store_1.default.get('context.fn_shell.enable_tunnel', undefined);

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

@@ -47,17 +47,17 @@ function java(targets) {
         return (yield Promise.resolve().then(() => __importStar(require('./java')))).default(targets);
     });
 }
-function python(targets, fnWatchEvent) {
+function python(targets) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield Promise.resolve().then(() => __importStar(require('./python')))).default(targets, fnWatchEvent);
+        return (yield Promise.resolve().then(() => __importStar(require('./python')))).default(targets);
     });
 }
-function prepareFunctions(targets, fnWatchEvent) {
+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.node.value)) && 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.value)) && target.valid; })),
-            python(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value)) && target.valid; }), fnWatchEvent)
+            python(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value)) && target.valid; }))
         ]);
     });
 }

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

@@ -18,7 +18,6 @@ const java_1 = require("../../../fn-utils/lib/java");
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const constants_1 = require("../../../util_modules/constants");
 const fs_1 = require("../../../util_modules/fs");
-const fs_2 = require("fs");
 const throbber_1 = __importDefault(require("../../../throbber"));
 const error_1 = __importDefault(require("../../../error"));
 exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
@@ -56,7 +55,7 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
             const serverFiles = yield fs_1.ASYNC.walk((0, path_1.dirname)(javaServer));
             yield Promise.all(serverFiles.map((file) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
-                    return fs_1.ASYNC.copyFile(file.path, (0, path_1.join)(targetBuildPath, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.path.replace('lib' + path_1.sep, ''))), fs_2.constants.COPYFILE_EXCL);
+                    return fs_1.ASYNC.copyFile(file.path, (0, path_1.join)(targetBuildPath, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.path.replace('lib' + path_1.sep, ''))), false);
                 }
                 catch (e) {
                     const err = error_1.default.getErrorInstance(e).original;

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

@@ -21,7 +21,7 @@ const pip_install_1 = require("../../../init/dependencies/python/pip-install");
 const error_1 = __importDefault(require("../../../error"));
 const fs_extra_1 = require("fs-extra");
 const throbber_1 = __importDefault(require("../../../throbber"));
-exports.default = (targets, fnWatchEvent) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
     if (targets === undefined || targets.length === 0) {
         return;
     }
@@ -42,22 +42,16 @@ exports.default = (targets, fnWatchEvent) => __awaiter(void 0, void 0, void 0, f
         var _a;
         const buildPath = (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name);
         const reqFile = (0, path_1.join)(target.source, constants_1.FILENAME.functions.python_requirements);
-        const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
-        const watch = fnWatchEvent
-            ? fnWatchEvent.pth === constants_1.FILENAME.functions.python_requirements
-            : true;
-        if (requirementsExists && watch) {
-            yield (0, fs_extra_1.ensureDir)(buildPath);
-            try {
-                yield (0, pip_install_1.installRequirements)(reqFile, buildPath, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''));
-            }
-            catch (err) {
-                const error = error_1.default.getErrorInstance(err);
-                target.valid = false;
-                target.failure_reason = error.message;
-            }
-        }
+        yield (0, fs_extra_1.ensureDir)(buildPath);
         yield fs_1.ASYNC.emptyDir(buildPath);
+        try {
+            yield (0, pip_install_1.installRequirements)(reqFile, buildPath, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''));
+        }
+        catch (err) {
+            const error = error_1.default.getErrorInstance(err);
+            target.valid = false;
+            target.failure_reason = error.message;
+        }
         yield fs_1.ASYNC.copyDir(target.source, buildPath);
         throbber.remove('function_serve_' + target.name);
         return target;

package/lib/throbber/index.js

@@ -42,7 +42,9 @@ class Throbber {
             options.text = name;
         }
         const spinnerProperties = Object.assign(Object.assign({}, this.options), options);
-        this.spinners[name] = spinnerProperties;
+        if (this.spin) {
+            this.spinners[name] = spinnerProperties;
+        }
         this.updateSpinnerState();
         return spinnerProperties;
     }
@@ -94,6 +96,9 @@ class Throbber {
         return !!Object.values(this.spinners).find(({ status }) => status === 'spinning');
     }
     setSpinnerProperties(name, options, status = 'spinning') {
+        if (!this.spin) {
+            return;
+        }
         if (!this.spinners[name]) {
             throw new error_js_1.default(`No spinner initialized with name ${name}`);
         }

package/lib/userConfig.js

@@ -9,7 +9,13 @@ const path_1 = __importDefault(require("path"));
 const error_1 = __importDefault(require("./error"));
 class UserConfig {
     constructor() {
-        this.validKeys = ['python3_9.bin', 'java8.bin', 'java11.bin', 'java17.bin'];
+        this.validKeys = [
+            'python3_9.bin',
+            'java8.bin',
+            'java11.bin',
+            'java17.bin',
+            'javac.disable_warnings'
+        ];
         this.configFilePath = path_1.default.join(constants_1.ENVPATH.userConfig.config, '.zcconfig');
         this.config = fs_1.SYNC.readJSONFile(this.configFilePath, { checkpath: true }) || {};
     }

package/lib/util_modules/config/index.js

@@ -30,5 +30,5 @@ const clientConfig = __importStar(require("./lib/client"));
 exports.clientConfig = clientConfig;
 const functionsConfig = __importStar(require("./lib/functions"));
 exports.functionsConfig = functionsConfig;
-const appSailConfig = __importStar(require("./lib/appSail.js"));
+const appSailConfig = __importStar(require("./lib/appsail"));
 exports.appSailConfig = appSailConfig;