zcatalyst-cli 1.13.2 → 1.14.0

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

@@ -13,9 +13,12 @@ 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 error_1 = __importDefault(require("../../error"));
 const fn_utils_1 = require("../../fn-utils");
 const credential_1 = __importDefault(require("../../internal/credential"));
+const port_resolver_1 = __importDefault(require("../../port-resolver"));
+const userConfig_1 = __importDefault(require("../../userConfig"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
@@ -24,6 +27,7 @@ const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const project_1 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
+const http_functions_1 = require("../dependencies/http-functions");
 class LocalFunction {
     constructor(repl, target) {
         var _a, _b, _c;
@@ -34,13 +38,14 @@ class LocalFunction {
         this.watcher = target.watcher;
         this.target = js_1.JS.omit(target, ['zip_stream', 'watcher']);
         this.slave = null;
-        this.nodeInvoker = (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', target.type, 'node.js'));
-        this.javaInvoker = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'Java' + target.type + 'Invoker');
+        this.nodeInvoker = (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', target.type, 'node.mjs'));
+        const projectRoot = runtime_store_1.default.get('project.root');
+        this.javaInvoker = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'Java' + target.type + 'Invoker');
         if ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
             fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker, (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', target.type, 'java', 'Java' + target.type + 'Invoker.java')));
         }
-        this.responseFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
-        this.metaFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
+        this.responseFile = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'user_res_body');
+        this.metaFile = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'user_meta.json');
         this.call = this._call.bind(this);
         (_b = this.watcher) === null || _b === void 0 ? void 0 : _b.on('preparing', () => {
             if (!this.repl.paused) {
@@ -81,7 +86,8 @@ class LocalFunction {
             return new error_1.default('Event bus details missing');
         }
         return (() => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
+            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.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], null);
@@ -107,16 +113,11 @@ class LocalFunction {
                     'x-zc-admin-cred-token': accessToken,
                     'x-zc-user-type': 'admin'
                 }));
-                slaveOptions.push(JSON.stringify((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')));
+                slaveOptions.push(JSON.stringify((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)));
                 this.slave = (0, shell_1.spawn)('node', slaveOptions, {
-                    cwd: this.target.source,
+                    cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                     stdio: 'pipe',
-                    env: {
-                        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
-                    }
+                    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)
                 }).RAW();
             }
             else if ((_b = this.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
@@ -145,26 +146,77 @@ class LocalFunction {
                     'x-zc-user-type': 'admin'
                 }));
                 this.slave = (0, shell_1.spawn)('java', slaveOptions, {
-                    cwd: this.target.source,
+                    cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                     stdio: 'pipe',
-                    env: {
-                        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
-                    }
+                    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)
+                }).RAW();
+            }
+            else if ((_c = this.target.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python)) {
+                const stackVersion = (_d = this.target.stack) === null || _d === void 0 ? void 0 : _d.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);
+                yield fs_1.ASYNC.ensureFile(this.responseFile, true);
+                yield fs_1.ASYNC.ensureFile(this.metaFile, true);
+                slaveOptions.push('-u');
+                slaveOptions.push('main.py');
+                this.slave = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), slaveOptions, {
+                    cwd: (0, path_1.join)(runtimesDir, runtime_1.default.language.python, `zcatalyst_runtime_${stackVersion.replace('_', '')}`),
+                    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)
                 }).RAW();
+                this.slave.on('spawn', () => __awaiter(this, void 0, void 0, function* () {
+                    const jsonData = JSON.parse(data);
+                    jsonData.timestamp = Date.now();
+                    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: {
+                            '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',
+                            'Content-Length': reqJson.length
+                        }
+                    }, (resp) => {
+                        resp.on('data', (data) => {
+                            const respStr = data.toString();
+                            fs_1.SYNC.writeFile(this.responseFile, respStr);
+                        });
+                        resp.on('close', () => {
+                            var _a;
+                            const metaJson = { response: { statusCode: resp.statusCode } };
+                            fs_1.SYNC.writeFile(this.metaFile, JSON.stringify(metaJson));
+                            (_a = this.slave) === null || _a === void 0 ? void 0 : _a.kill('SIGINT');
+                        });
+                    })
+                        .on('error', (err) => {
+                        var _a;
+                        console.log(err);
+                        (_a = this.slave) === null || _a === void 0 ? void 0 : _a.kill('SIGINT');
+                    });
+                    req.write(reqJson);
+                    req.end();
+                }));
             }
             if (this.slave === null) {
                 throw new error_1.default('Slave listening started before initialising', {
                     exit: 2
                 });
             }
-            (_c = this.slave.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (message) => {
+            (_e = this.slave.stdout) === null || _e === void 0 ? void 0 : _e.on('data', (message) => {
                 (0, shell_1.clearLine)(process.stdout);
                 (0, logger_1.info)(message.toString());
             });
-            (_d = this.slave.stderr) === null || _d === void 0 ? void 0 : _d.on('data', (message) => {
+            (_f = this.slave.stderr) === null || _f === void 0 ? void 0 : _f.on('data', (message) => {
                 const errorStr = js_1.JS.trim(message.toString());
                 (0, shell_1.clearLine)(process.stdout);
                 (0, logger_1.info)(errorStr);

package/lib/shell/index.js

@@ -44,6 +44,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     });
     const httpServer = new http_functions_1.default({ repl: 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
@@ -87,14 +88,22 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 return target.localFn.shutdown();
             }
         })));
-        yield fs_1.ASYNC.deleteDir((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch();
+        yield fs_1.ASYNC.chmod((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions), '755', {
+            recursive: true,
+            checkPath: false
+        }).catch((err) => (0, logger_js_1.debug)('Error modifying permissions: ', err));
+        yield fs_1.ASYNC.deleteDir((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)).catch();
         fn_utils_1.fnUtils.common.executeHook({ prefix: 'post', command: 'serve' });
         (0, logger_js_1.info)();
         (0, logger_js_1.success)('shell complete');
     }
     catch (e) {
+        yield fs_1.ASYNC.chmod((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions), '755', {
+            recursive: true,
+            checkPath: false
+        }).catch((err) => (0, logger_js_1.debug)('Error modifying permissions: ', err));
         yield Promise.all([
-            fs_1.ASYNC.deleteDir((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch(),
+            fs_1.ASYNC.deleteDir((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)).catch(),
             httpServer ? httpServer.stop() : undefined
         ]);
         throw e;

package/lib/shell/prepare/index.js

@@ -14,11 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fn_utils_1 = require("../../fn-utils");
 const common_1 = require("../../fn-utils/lib/common");
+const pip_install_1 = require("../../init/dependencies/python/pip-install");
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const throbber_1 = __importDefault(require("../../throbber"));
 const constants_1 = require("../../util_modules/constants");
+const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const languages_1 = require("./languages");
 exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
     fn_utils_1.fnUtils.common.executeHook({ prefix: 'pre', command: 'serve' });
+    const throbber = throbber_1.default.getInstance();
     const targets = yield fn_utils_1.fnUtils.common.validate();
     let refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets(targets);
     refinedTargets = refinedTargets.map((target) => {
@@ -29,10 +33,27 @@ exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
                     fnTypes.map((t) => constants_1.REMOTE_REF.functions.type[t]).join(',') +
                     ' are supported.';
         }
+        else if (target.valid) {
+            throbber.add('function_serve_' + target.name, {
+                text: `preparing function [${target.name}]`
+            });
+        }
         return target;
     });
     runtime_store_1.default.set('context.functions.targets', refinedTargets);
     yield (0, languages_1.prepareFunctions)(refinedTargets);
+    const pyStacks = [];
+    refinedTargets.filter((target) => {
+        var _a;
+        if (((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python)) &&
+            !pyStacks.includes(target.stack) &&
+            target.valid) {
+            pyStacks.push(target.stack);
+        }
+    });
+    yield Promise.all(pyStacks.map((stack) => __awaiter(void 0, void 0, void 0, function* () {
+        yield (0, pip_install_1.ensurePyRuntime)(constants_1.ENVPATH.runtimes.data, stack);
+    })));
     yield (0, common_1.resolveAllFnPorts)(refinedTargets);
     return refinedTargets;
 });

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

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

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

@@ -14,21 +14,58 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fn_utils_1 = require("../../../fn-utils");
+const common_1 = require("../../../fn-utils/lib/common");
+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"));
 exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
     if (targets === undefined || targets.length === 0) {
         return;
     }
+    const throbber = throbber_1.default.getInstance();
     yield fn_utils_1.fnUtils.java.validate(targets, 0);
     const javaTargets = targets
-        .filter((target) => target.valid)
+        .filter((target) => {
+        if (!target.valid) {
+            throbber.remove('function_serve_' + target.name);
+        }
+        return target.valid;
+    })
         .map((target) => {
         fn_utils_1.fnUtils.common.generateUrlForTarget(target);
         return target;
     });
+    const projectRoot = runtime_store_1.default.get('project.root');
     return Promise.all(javaTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
-        yield fs_1.ASYNC.copyDir((0, path_1.join)(target.source, '.output'), (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', (0, path_1.basename)(target.source)));
+        if (!target.valid) {
+            return target;
+        }
+        const targetBuildPath = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name);
+        if (yield fs_1.ASYNC.isPathExists(targetBuildPath)) {
+            yield fs_1.ASYNC.chmod(targetBuildPath, '755', { recursive: true });
+            yield fs_1.ASYNC.deleteDir(targetBuildPath);
+        }
+        if (target.type === constants_1.FN_TYPE.advanced || target.type === constants_1.FN_TYPE.applogic) {
+            const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
+            const javaInvoker = (0, path_1.join)(__dirname, '../../../serve/server/lib/java/JavaaioServer.java');
+            (0, java_1.ensureJavaInvoker)(javaServer, javaInvoker);
+            const serverFiles = yield fs_1.ASYNC.walk((0, path_1.dirname)(javaServer));
+            yield Promise.all(serverFiles.map((file) => {
+                return fs_1.ASYNC.copyFile(file, (0, path_1.join)(targetBuildPath, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.replace('lib' + path_1.sep, ''))), fs_2.constants.COPYFILE_EXCL).catch((err) => {
+                    if (err.code !== 'EEXIST') {
+                        throbber.remove('function_serve_' + target.name);
+                        throw err;
+                    }
+                });
+            }));
+        }
+        yield (0, common_1.copyModDirPerm)((0, path_1.join)(target.source, constants_1.FOLDERNAME.output), targetBuildPath, '555', {
+            replace: false
+        });
+        throbber.remove('function_serve_' + target.name);
         return target;
     })));
 });

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

@@ -8,17 +8,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
 const fn_utils_1 = require("../../../fn-utils");
+const common_1 = require("../../../fn-utils/lib/common");
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const throbber_1 = __importDefault(require("../../../throbber"));
+const constants_1 = require("../../../util_modules/constants");
 exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
     if (targets === undefined || targets.length === 0) {
         return;
     }
+    const throbber = throbber_1.default.getInstance();
     yield fn_utils_1.fnUtils.node.validate(targets, 0);
-    return targets
-        .filter((target) => target.valid)
+    const nodeTargets = targets
+        .filter((target) => {
+        if (!target.valid) {
+            throbber.remove('function_serve_' + target.name);
+        }
+        return target.valid;
+    })
         .map((target) => {
         fn_utils_1.fnUtils.common.generateUrlForTarget(target);
         return target;
     });
+    return Promise.all(nodeTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
+        yield (0, common_1.copyModDirPerm)(target.source, (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name), '555');
+        throbber.remove('function_serve_' + target.name);
+        return target;
+    })));
 });

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

@@ -0,0 +1,65 @@
+'use strict';
+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 });
+const path_1 = require("path");
+const fn_utils_1 = require("../../../fn-utils");
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const common_1 = require("../../../fn-utils/lib/common");
+const constants_1 = require("../../../util_modules/constants");
+const fs_1 = require("../../../util_modules/fs");
+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* () {
+    if (targets === undefined || targets.length === 0) {
+        return;
+    }
+    const throbber = throbber_1.default.getInstance();
+    yield fn_utils_1.fnUtils.python.validate(targets, 0);
+    const pyTargets = targets
+        .filter((target) => {
+        if (!target.valid) {
+            throbber.remove('function_serve_' + target.name);
+        }
+        return target.valid;
+    })
+        .map((target) => {
+        fn_utils_1.fnUtils.common.generateUrlForTarget(target);
+        return target;
+    });
+    return Promise.all(pyTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
+        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, common_1.copyModDirPerm)(target.source, buildPath, '555');
+        throbber.remove('function_serve_' + target.name);
+        return target;
+    })));
+});

package/lib/throbber/index.js

@@ -197,9 +197,11 @@ class Throbber {
     }
     bindSigint() {
         process.prependOnceListener('SIGINT', () => {
+            if (!this.hasActiveSpinners()) {
+                return;
+            }
             cli_cursor_1.default.show();
             (0, readline_1.moveCursor)(process.stderr, 0, this.lineCount);
-            process.exit(0);
         });
     }
 }

package/lib/userConfig.js

@@ -0,0 +1,48 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("./util_modules/fs");
+const constants_1 = require("./util_modules/constants");
+const path_1 = __importDefault(require("path"));
+const error_1 = __importDefault(require("./error"));
+class UserConfig {
+    constructor() {
+        this.validKeys = ['python3_9.bin'];
+        this.configFilePath = path_1.default.join(constants_1.ENVPATH.userConfig.config, '.zcconfig');
+        this.config = fs_1.SYNC.readJSONFile(this.configFilePath, { checkpath: true }) || {};
+    }
+    set(key, value) {
+        if (!this.validKeys.includes(key)) {
+            throw new error_1.default('Invalid key provided', {
+                exit: 1
+            });
+        }
+        fs_1.SYNC.ensureFile(this.configFilePath);
+        this.config[key] = value;
+        const content = JSON.stringify(this.config, null, 2) + '\n';
+        fs_1.SYNC.writeFile(this.configFilePath, content, 'utf8');
+        return this.config;
+    }
+    get(key) {
+        return this.config[key];
+    }
+    delete(key) {
+        if (!this.config[key]) {
+            return false;
+        }
+        delete this.config[key];
+        const content = JSON.stringify(this.config, null, 2) + '\n';
+        fs_1.SYNC.writeFile(this.configFilePath, content, 'utf8');
+        return true;
+    }
+    list() {
+        let result = '';
+        this.validKeys.forEach((entry) => {
+            result += `${entry}=${this.config[entry] || ''}\n`;
+        });
+        return result.trim();
+    }
+}
+exports.default = new UserConfig();

package/lib/util_modules/constants/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IAC = exports.PLUGIN = exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
+exports.ENVPATH = exports.IAC = exports.PLUGIN = exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
 var apig_rules_1 = require("./lib/apig-rules");
 Object.defineProperty(exports, "APIG_RULES", { enumerable: true, get: function () { return __importDefault(apig_rules_1).default; } });
 var auth_1 = require("./lib/auth");
@@ -44,3 +44,5 @@ var plugin_1 = require("./lib/plugin");
 Object.defineProperty(exports, "PLUGIN", { enumerable: true, get: function () { return __importDefault(plugin_1).default; } });
 var iac_1 = require("./lib/iac");
 Object.defineProperty(exports, "IAC", { enumerable: true, get: function () { return __importDefault(iac_1).default; } });
+var env_path_1 = require("./lib/env-path");
+Object.defineProperty(exports, "ENVPATH", { enumerable: true, get: function () { return __importDefault(env_path_1).default; } });

package/lib/util_modules/constants/lib/apig-rules.js

@@ -121,6 +121,14 @@ exports.default = Object.freeze([
         authentication: undefined,
         status: true
     },
+    {
+        name: 'catalyst_default_delete_rows',
+        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/table/{tableId:[A-Za-z0-9_]+}/row',
+        target_endpoint: '/baas/v1/project/{projectId}/table/{tableId}/row',
+        method: 'DELETE',
+        authentication: undefined,
+        status: true
+    },
     {
         name: 'catalyst_default_signup',
         source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/project-user/signup',

package/lib/util_modules/constants/lib/cliq-handlers.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const file_names_1 = __importDefault(require("./file-names"));
-const { node_main, node_package, java_main, java_classpath, java_project } = file_names_1.default.functions;
+const { node_main, node_package, java_main, java_classpath, java_project, python_main, python_requirements } = file_names_1.default.functions;
 const template_root = (0, path_1.join)(__dirname, '../../../../templates');
 const handlers = {
     bot_handler: 'bot_handler',
@@ -20,8 +20,10 @@ exports.default = Object.freeze({
     event_template_dir: (0, path_1.join)(template_root, './event/integ/cliq/'),
     node_handlers_template_dir: './handlers',
     java_handlers_template_dir: './com/handlers',
+    python_handlers_template_dir: './handlers',
     node_handlers_path: 'handlers/',
     java_handlers_path: 'com.handlers.',
+    python_handlers_path: 'handlers/',
     node_template_contents_initial_copy: [node_main, node_package, file_names_1.default.catalyst_config],
     java_template_contents_initial_copy: [
         java_main,
@@ -29,6 +31,11 @@ exports.default = Object.freeze({
         java_project,
         file_names_1.default.catalyst_config
     ],
+    python_template_contents_initial_copy: [
+        python_main,
+        file_names_1.default.catalyst_config,
+        python_requirements
+    ],
     component_handlers: Object.keys(handlers),
     node_handler_file_mapping: {
         [handlers.bot_handler]: 'bot-handler.js',
@@ -48,6 +55,15 @@ exports.default = Object.freeze({
         [handlers.installation_handler]: 'InstallationHandler.java',
         [handlers.installation_validator]: 'InstallationValidator.java'
     },
+    python_handler_file_mapping: {
+        [handlers.bot_handler]: 'bot_handler.py',
+        [handlers.command_handler]: 'command_handler.py',
+        [handlers.messageaction_handler]: 'message_action_handler.py',
+        [handlers.widget_handler]: 'widget_handler.py',
+        [handlers.function_handler]: 'function_handler.py',
+        [handlers.installation_handler]: 'installation_handler.py',
+        [handlers.installation_validator]: 'installation_validator.py'
+    },
     handlers_event_template: {
         ['bot']: [
             'welcome_handler',

package/lib/util_modules/constants/lib/dc-type.js

@@ -24,5 +24,13 @@ exports.default = Object.freeze({
         w_auth: 'us',
         m_auth: 'us',
         ext: '.in'
+    },
+    au: {
+        loc: 'Australia',
+        ref: 'au',
+        value: 'au',
+        w_auth: 'us',
+        m_auth: 'us',
+        ext: '.com.au'
     }
 });

package/lib/util_modules/constants/lib/default.js

@@ -13,8 +13,8 @@ exports.default = Object.freeze({
         http: {
             master: 3000,
             advancedio: 3010,
-            basicio: 3020,
-            client: 3030
+            basicio: 3040,
+            client: 3050
         },
         debug: {
             master: -1,

package/lib/util_modules/constants/lib/env-path.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const env_paths_1 = __importDefault(require("env-paths"));
+exports.default = Object.freeze({
+    runtimes: (0, env_paths_1.default)('zcatalyst-cli-runtimes', {
+        suffix: ''
+    }),
+    userConfig: (0, env_paths_1.default)('zcatalyst-cli')
+});

package/lib/util_modules/constants/lib/file-names.js

@@ -6,9 +6,12 @@ exports.default = Object.freeze({
     rc: '.catalystrc',
     config: 'catalyst.json',
     client: {
-        package_json: 'client-package.json'
+        package_json: 'client-package.json',
+        notFoundPage: '404.html'
     },
     functions: {
+        python_main: 'sample.py',
+        python_requirements: 'requirements.txt',
         node_main: 'sample.js',
         node_package: 'package.json',
         java_main: 'sample.java',

package/lib/util_modules/constants/lib/folder-names.js

@@ -3,5 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Object.freeze({
     client: 'client',
     functions: 'functions',
-    java_fn_lib: 'lib'
+    java_fn_lib: 'lib',
+    build: '.build',
+    output: '.output'
 });