zcatalyst-cli 1.25.2 → 1.26.0

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

@@ -16,32 +16,30 @@ const port_resolver_1 = __importDefault(require("../../../port-resolver"));
 const constants_1 = require("../../../util_modules/constants");
 const path_1 = require("path");
 const shell_1 = require("../../../util_modules/shell");
-const userConfig_1 = __importDefault(require("../../../userConfig"));
 const project_1 = require("../../../util_modules/project");
-const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const logger_1 = require("../../../util_modules/logger");
-exports.default = (fn) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+exports.default = (fn, runTimePort) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const slaveOptions = [];
     const stackVersion = (_b = (_a = fn.target) === null || _a === void 0 ? void 0 : _a.stack) === null || _b === void 0 ? void 0 : _b.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], constants_1.DEFAULT.serve_port.http[(_c = fn.target) === null || _c === void 0 ? void 0 : _c.type] + ''), 10);
-    const runTimePort = yield port_resolver_1.default.getFreePort(httpPort, 20, false);
     fn.httpPort = runTimePort;
     slaveOptions.push((0, path_1.join)(runtimesDir, constants_1.RUNTIME.language.python.value, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`, 'main.py'));
-    const debugConfig = (_d = fn.target.additionalInfo) === null || _d === void 0 ? void 0 : _d.debug;
+    const debugConfig = (_c = fn.target.additionalInfo) === null || _c === void 0 ? void 0 : _c.debug;
     if (debugConfig) {
         const debugOpts = ['-m', debugConfig === null || debugConfig === void 0 ? void 0 : debugConfig.debugger, '--listen', debugConfig.port + ''];
-        ((_e = fn.target) === null || _e === void 0 ? void 0 : _e.type) === constants_1.FN_TYPE.job && debugOpts.push('--wait-for-client');
+        ((_d = fn.target) === null || _d === void 0 ? void 0 : _d.type) === constants_1.FN_TYPE.job && debugOpts.push('--wait-for-client');
         slaveOptions.unshift(...debugOpts);
     }
     slaveOptions.unshift('-u');
-    (0, logger_1.debug)(`Python Spawn command: ${userConfig_1.default.get(`python${stackVersion}.bin`)} ${slaveOptions.join(' ')}`);
-    return (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), slaveOptions, {
-        cwd: (_f = fn.target) === null || _f === void 0 ? void 0 : _f.build,
+    (0, logger_1.debug)(`Python Spawn command: ${((_e = fn.target.additionalInfo) === null || _e === void 0 ? void 0 : _e.binPath) || 'python'} ${slaveOptions.join(' ')}`);
+    (0, logger_1.debug)(`X_ZOHO_DATA_URL: http://localhost:${runTimePort}/data`);
+    (0, logger_1.debug)(`X_ZOHO_CALLBACK_URL: http://localhost:${runTimePort}/callback`);
+    return (0, shell_1.spawn)(((_f = fn.target.additionalInfo) === null || _f === void 0 ? void 0 : _f.binPath) || 'python', slaveOptions, {
+        cwd: (_g = fn.target) === null || _g === void 0 ? void 0 : _g.build,
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, X_ZOHO_CATALYST_RESOURCE_ID: (_g = fn.target) === null || _g === void 0 ? void 0 : _g.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: (_h = fn.target) === null || _h === void 0 ? void 0 : _h.build, 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: 'Development', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[(_j = fn.target) === null || _j === void 0 ? void 0 : _j.type] }, (_k = fn.target) === null || _k === void 0 ? void 0 : _k.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, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, X_ZOHO_CATALYST_RESOURCE_ID: (_h = fn.target) === null || _h === void 0 ? void 0 : _h.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: (_j = fn.target) === null || _j === void 0 ? void 0 : _j.build, 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: 'Development', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[(_k = fn.target) === null || _k === void 0 ? void 0 : _k.type] }, (_l = fn.target) === null || _l === void 0 ? void 0 : _l.env_var)
     })
         .RAW()
-        .on('exit', () => port_resolver_1.default.freePort(httpPort));
+        .on('exit', () => port_resolver_1.default.freePort(runTimePort));
 });

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

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 import CatalystError from '../../../error';
 import { IServerDetails } from '../../../serve/server';

package/lib/shell/dependencies/non-http-function/slave-manager.js

@@ -70,6 +70,10 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
                             }
                             break;
                         }
+                        case constants_1.FN_TYPE.integration: {
+                            data.timestamp = Date.now();
+                            break;
+                        }
                     }
                 }
                 else {
@@ -86,7 +90,7 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
                 return new error_1.default('Invalid input: ' + e);
             }
             return (() => __awaiter(this, void 0, void 0, function* () {
-                var _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                 if (!this.fn.target) {
                     throw new error_1.default('Invalid function target: ' + this.fn.target, {
                         exit: 2
@@ -95,7 +99,7 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
                 const accessToken = yield credential_1.default.getAccessToken();
                 yield fs_1.ASYNC.ensureFile(this.responseFile, true);
                 yield fs_1.ASYNC.ensureFile(this.metaFile, true);
-                if (((_b = this.fn.target) === null || _b === void 0 ? void 0 : _b.type) === constants_1.FN_TYPE.job) {
+                if (((_a = this.fn.target) === null || _a === void 0 ? void 0 : _a.type) === constants_1.FN_TYPE.job) {
                     if ('params' in data) {
                         data.job_details = Object.assign({
                             job_meta_details: {
@@ -106,7 +110,7 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
                     }
                     const jobData = data;
                     const jobMetaDetails = {
-                        headers: Object.assign(Object.assign({}, (_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.headers), {
+                        headers: Object.assign(Object.assign({}, (_c = (_b = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _b === void 0 ? void 0 : _b.job_meta_details) === null || _c === void 0 ? void 0 : _c.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)(),
@@ -117,11 +121,11 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
                             'x-zc-admin-cred-token': accessToken,
                             'x-zc-user-type': 'admin'
                         }),
-                        params: ((_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.params) || {},
+                        params: ((_e = (_d = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _d === void 0 ? void 0 : _d.job_meta_details) === null || _e === void 0 ? void 0 : _e.params) || {},
                         jobpool_details: Object.assign({ type: 'Function', project_details: {
                                 project_name: (0, project_1.getProjectName)(),
                                 id: (0, project_1.getProjectId)()
-                            } }, (_h = (_g = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _g === void 0 ? void 0 : _g.job_meta_details) === null || _h === void 0 ? void 0 : _h.jobpool_details)
+                            } }, (_g = (_f = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _f === void 0 ? void 0 : _f.job_meta_details) === null || _g === void 0 ? void 0 : _g.jobpool_details)
                     };
                     jobData.job_details = Object.assign(Object.assign({}, jobData.job_details), { capacity: jobData.capacity || {
                             memory: '256'
@@ -142,10 +146,10 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
                         exit: 2
                     });
                 }
-                (_j = this.slave.stdout) === null || _j === void 0 ? void 0 : _j.on('data', (message) => {
+                (_h = this.slave.stdout) === null || _h === void 0 ? void 0 : _h.on('data', (message) => {
                     process.stdout.write(message.toString());
                 });
-                (_k = this.slave.stderr) === null || _k === void 0 ? void 0 : _k.on('data', (message) => {
+                (_j = this.slave.stderr) === null || _j === void 0 ? void 0 : _j.on('data', (message) => {
                     process.stderr.write(message.toString());
                 });
                 this.slave.on('error', (err) => {

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

@@ -53,8 +53,8 @@ class TunnelServer {
         }
         return false;
     }
-    send(req, res, status = 200, data, contentType) {
-        return __awaiter(this, void 0, void 0, function* () {
+    send(req_1, res_1) {
+        return __awaiter(this, arguments, void 0, function* (req, res, status = 200, data, contentType) {
             const body = req.body;
             if (this.isAsyncFn(body.function_details.function_type)) {
                 const tunnelAPI = yield (0, endpoints_1.tunnelAPI)();
@@ -189,8 +189,8 @@ class TunnelServer {
         return this;
     }
     stopServer() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!__classPrivateFieldGet(this, _TunnelServer_server, "f")) {
                 return;
             }
@@ -198,5 +198,5 @@ class TunnelServer {
         });
     }
 }
-exports.default = TunnelServer;
 _TunnelServer_contextMap = new WeakMap(), _TunnelServer_server = new WeakMap(), _TunnelServer_destroyer = new WeakMap(), _TunnelServer_repel = new WeakMap(), _TunnelServer_projectId = new WeakMap();
+exports.default = TunnelServer;

package/lib/shell/index.js

@@ -1,4 +1,37 @@
 '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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -29,16 +62,30 @@ const prepare_1 = __importDefault(require("./prepare"));
 const fn_watcher_1 = __importDefault(require("../fn-watcher"));
 const tunnel_server_1 = __importDefault(require("./dependencies/tunnel-server"));
 const endpoints_1 = require("../endpoints");
+const child_process_1 = require("child_process");
+const container_plugin_1 = require("@zcatalyst/container-plugin");
+const userConfig_1 = __importStar(require("../userConfig"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const shellPrompt = userConfig_1.default.get(userConfig_1.CONFIG_KEYS.functionsShell_prompt);
     const replServer = new repl_server_1.default({
-        prompt: 'functions > ',
+        prompt: shellPrompt && typeof shellPrompt === 'string'
+            ? shellPrompt
+            : ansi_colors_1.bold.cyan('╭─ catalyst-functions-shell\n╰─> '),
         writer: (output) => {
             if (output !== undefined) {
                 if (output instanceof Promise) {
                     replServer.pause();
-                    output.finally(() => replServer.resume());
-                    return '[cli] Function has been invoked';
+                    output.then((_res) => {
+                        if (_res instanceof child_process_1.ChildProcess) {
+                            _res.once('close', replServer.resume);
+                        }
+                        else if (_res instanceof container_plugin_1.ContainerEvents) {
+                            _res.once('exit', replServer.resume);
+                            _res.once('error', replServer.resume);
+                        }
+                    });
+                    return '\n' + '[CLI] Function has been invoked' + '\n';
                 }
                 if (output instanceof Error) {
                     return ansi_colors_1.bold.red('Error: ') + output.message;

package/lib/shell/prepare/index.js

@@ -20,7 +20,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const throbber_1 = __importDefault(require("../../throbber"));
 const constants_1 = require("../../util_modules/constants");
 const languages_1 = require("./languages");
-exports.default = (fnTypes, skipFnFilter = false) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = (fnTypes_1, ...args_1) => __awaiter(void 0, [fnTypes_1, ...args_1], void 0, function* (fnTypes, skipFnFilter = false) {
     yield 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(skipFnFilter);
@@ -44,13 +44,14 @@ exports.default = (fnTypes, skipFnFilter = false) => __awaiter(void 0, void 0, v
     const [_nodeFns, javaFns, pythonFns] = yield (0, languages_1.prepareFunctions)(refinedTargets);
     javaFns && (0, compile_1.printCompilationLog)(javaFns);
     const pyStacks = [];
-    pythonFns === null || pythonFns === void 0 ? void 0 : pythonFns.filter((target) => {
+    pythonFns === null || pythonFns === void 0 ? void 0 : pythonFns.forEach((target) => {
         if (!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);
+        var _a, _b;
+        yield (0, pip_install_1.ensurePyRuntime)(constants_1.ENVPATH.runtimes.data, stack, (_b = (_a = pythonFns === null || pythonFns === void 0 ? void 0 : pythonFns.at(0)) === null || _a === void 0 ? void 0 : _a.additionalInfo) === null || _b === void 0 ? void 0 : _b.binPath);
     })));
     yield (0, common_1.resolveAllFnPorts)(refinedTargets);
     return refinedTargets;

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareFunctions = void 0;
+exports.prepareFunctions = prepareFunctions;
 const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/runtime"));
 function node(targets) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -76,4 +86,3 @@ function prepareFunctions(targets) {
         return Promise.all([node(nodeFns), java(javaFns), python(pythonFns)]);
     });
 }
-exports.prepareFunctions = prepareFunctions;

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

@@ -24,31 +24,41 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
     if (targets === undefined || targets.length === 0) {
         return;
     }
-    try {
-        yield fn_utils_1.fnUtils.node.checkNodePresence();
-    }
-    catch (err) {
-        (0, index_1.debug)('Check node presence error: ', err);
-        return targets.map((targ) => {
-            targ.valid = false;
-            targ.failure_reason = error_1.default.getErrorInstance(err).message;
-            return targ;
-        });
-    }
+    const reqNodeStacks = targets.reduce((stacks, target) => {
+        if (target.stack) {
+            stacks[target.stack] = '';
+        }
+        return stacks;
+    }, {});
+    yield Promise.all(Object.keys(reqNodeStacks).map((stack) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const binPath = yield fn_utils_1.fnUtils.node.ensureNodeVersion(stack);
+            reqNodeStacks[stack] = binPath;
+            (0, index_1.debug)(`Node binary for stack ${stack} is at ${binPath}`);
+        }
+        catch (er) {
+            (0, index_1.debug)('Ensure node version error: ', er);
+            targets.forEach((targ) => {
+                if (targ.stack === stack) {
+                    targ.valid = false;
+                    targ.failure_reason = error_1.default.getErrorInstance(er).message;
+                }
+            });
+        }
+    })));
     const throbber = throbber_1.default.getInstance();
     yield fn_utils_1.fnUtils.node.validate(targets);
-    const nodeTargets = targets
-        .filter((target) => {
+    return Promise.all(targets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
         if (!target.valid) {
             throbber.remove('function_serve_' + target.name);
+            return target;
         }
-        return target.valid;
-    })
-        .map((target) => {
+        target.additionalInfo = {
+            binPath: target.stack && reqNodeStacks[target.stack]
+                ? reqNodeStacks[target.stack]
+                : 'node'
+        };
         fn_utils_1.fnUtils.common.generateUrlForTarget(target);
-        return target;
-    });
-    return Promise.all(nodeTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
         const buildPath = (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name);
         yield fs_1.ASYNC.emptyDir(buildPath);
         yield fs_1.ASYNC.copyDir(target.source, buildPath);

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

@@ -27,29 +27,23 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
     }
     const throbber = throbber_1.default.getInstance();
     yield fn_utils_1.fnUtils.python.validate(targets);
-    const pyTargets = targets
-        .filter((target) => {
+    const _debugFns = runtime_store_1.default.get('context.port.debug', {});
+    return Promise.all(targets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
         if (!target.valid) {
             throbber.remove('function_serve_' + target.name);
+            return target;
         }
-        return target.valid;
-    })
-        .map((target) => {
         fn_utils_1.fnUtils.common.generateUrlForTarget(target);
-        return target;
-    });
-    const _debugFns = runtime_store_1.default.get('context.port.debug', {});
-    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);
         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_', ''));
+            yield (0, pip_install_1.installRequirements)(reqFile, buildPath, (_a = target.additionalInfo) === null || _a === void 0 ? void 0 : _a.binPath);
             const debugFns = _debugFns[target.type] || {};
             if (debugFns[target.name]) {
-                yield (0, pip_install_1.installPkgs)(['debugpy'], '3_9', buildPath);
+                yield (0, pip_install_1.installPkgs)(['debugpy'], (_b = target.additionalInfo) === null || _b === void 0 ? void 0 : _b.binPath, buildPath);
                 if (!target.additionalInfo)
                     target.additionalInfo = { binPath: '' };
                 target.additionalInfo.debug = {

package/lib/signals/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
+exports.generate = generate;
 const ansi_colors_1 = require("ansi-colors");
 const error_1 = __importDefault(require("../error"));
 const constants_1 = require("../util_modules/constants");
@@ -46,7 +56,6 @@ const js_1 = require("../util_modules/js");
 const option_1 = require("../util_modules/option");
 function generate(publisher, event) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const unknownArgs = (0, option_1.getUnknownOpts)([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
@@ -101,7 +110,7 @@ function generate(publisher, event) {
         }, {});
         let data = {};
         if (publisher !== 'custom') {
-            const publisherModule = yield (_a = '../event_generate/' + (publisher === 'authentication' ? 'user' : publisher), Promise.resolve().then(() => __importStar(require(_a))));
+            const publisherModule = yield Promise.resolve(`${'../event_generate/' + (publisher === 'authentication' ? 'user' : publisher)}`).then(s => __importStar(require(s)));
             data = yield publisherModule.getData(optionMap);
             if (publisher === 'datastore') {
                 data = Object.assign(Object.assign({}, data), { table_details: {
@@ -197,7 +206,6 @@ function generate(publisher, event) {
         return jsonContent;
     });
 }
-exports.generate = generate;
 function getPublisherType(publisher) {
     for (const [category, services] of Object.entries(constants_1.SIGNALS_PUBLISHERS_TYPE)) {
         if (services.includes(publisher)) {

package/lib/slate-utils.js

@@ -12,7 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateServeCommand = exports.slateUtils = void 0;
+exports.slateUtils = void 0;
+exports.validateServeCommand = validateServeCommand;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("./archiver"));
@@ -107,7 +108,8 @@ exports.slateUtils = {
             `**/${constants_1.FILENAME.config}`,
             `**/${constants_1.FILENAME.rc}`,
             `**/${constants_1.FILENAME.app_config}`,
-            `**/${constants_1.FILENAME.catalyst_ignore}`
+            `**/${constants_1.FILENAME.catalyst_ignore}`,
+            `**/${constants_1.FILENAME.cli_config}`
         ];
         const slateZip = yield fs_1.ASYNC.walk(source, {
             filter: {
@@ -150,4 +152,3 @@ function validateServeCommand(targDetails) {
     });
     return targDetails;
 }
-exports.validateServeCommand = validateServeCommand;

package/lib/throbber/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ISpinnerOptions, VALID_STATUSES } from './utils';
 import { TTYPassThrough } from '../util_modules/logger';
 interface IThrobbers {
@@ -25,6 +23,7 @@ declare class Throbber {
     remove(name: string): ISpinnerOptions;
     stopAll(newStatus?: string): IThrobbers;
     hasActiveSpinners(): boolean;
+    hasSpinner(name: string): boolean;
     setSpinnerProperties(name: string, options: ISpinnerOptions, status?: VALID_STATUSES): void;
     updateSpinnerState(): void;
     loopStream(): NodeJS.Timeout;

package/lib/throbber/index.js

@@ -20,13 +20,13 @@ class Throbber {
         this.spinners = {};
         this.isCursorHidden = false;
         this.currentInterval = null;
-        this.stream = env_1.isVsCode ? logger_1.LogStreamFactory.getStream() : process.stderr;
+        this.stream = env_1.isExtension ? logger_1.LogStreamFactory.getStream() : process.stderr;
         this.lineCount = 0;
         this.currentFrameIndex = 0;
         this.spin =
             !this.options.disableSpins &&
                 !process.env.CI &&
-                ((process.stderr && process.stderr.isTTY) || env_1.isVsCode);
+                ((process.stderr && process.stderr.isTTY) || env_1.isExtension);
         this.bindSigint();
         Throbber.instance = this;
     }
@@ -99,6 +99,9 @@ class Throbber {
     hasActiveSpinners() {
         return !!Object.values(this.spinners).find(({ status }) => status === 'spinning');
     }
+    hasSpinner(name) {
+        return this.spinners[name] !== undefined;
+    }
     setSpinnerProperties(name, options, status = 'spinning') {
         if (!this.spin) {
             return;

package/lib/throbber/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export type VALID_STATUSES = 'succeed' | 'fail' | 'spinning' | 'non-spinnable' | 'stopped';
 export type VALID_COLORS = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'grey' | 'redBright' | 'greenBright' | 'yellowBright' | 'blueBright' | 'magentaBright' | 'cyanBright' | 'whiteBright';
 export interface ISpinnerOptions {

package/lib/throbber/utils.js

@@ -3,7 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanStream = exports.writeStream = exports.getLinesLength = exports.breakText = void 0;
+exports.breakText = breakText;
+exports.getLinesLength = getLinesLength;
+exports.writeStream = writeStream;
+exports.cleanStream = cleanStream;
 const readline_1 = require("readline");
 const strip_ansi_1 = __importDefault(require("strip-ansi"));
 function breakText(text, prefixLength) {
@@ -12,7 +15,6 @@ function breakText(text, prefixLength) {
         .map((line, index) => (index === 0 ? breakLine(line, prefixLength) : breakLine(line, 0)))
         .join('\n');
 }
-exports.breakText = breakText;
 function breakLine(line, prefixLength) {
     const columns = process.stderr.columns || 95;
     return line.length >= columns - prefixLength
@@ -24,12 +26,10 @@ function getLinesLength(text, prefixLength) {
         .split('\n')
         .map((line, index) => (index === 0 ? line.length + prefixLength : line.length));
 }
-exports.getLinesLength = getLinesLength;
 function writeStream(stream, output, rawLines) {
     stream.write(output);
     (0, readline_1.moveCursor)(stream, 0, -rawLines.length);
 }
-exports.writeStream = writeStream;
 function cleanStream(stream, rawLines) {
     rawLines.forEach((lineLength, index) => {
         (0, readline_1.moveCursor)(stream, lineLength, index);
@@ -40,4 +40,3 @@ function cleanStream(stream, rawLines) {
     (0, readline_1.clearScreenDown)(stream);
     (0, readline_1.moveCursor)(stream, 0, -rawLines.length);
 }
-exports.cleanStream = cleanStream;

package/lib/userConfig.d.ts

@@ -1,10 +1,24 @@
 export declare const CONFIG_KEYS: {
+    node12_bin: string;
+    node14_bin: string;
+    node16_bin: string;
+    node18_bin: string;
+    node20_bin: string;
+    node22_bin: string;
+    node24_bin: string;
     python39_bin: string;
+    python310_bin: string;
+    python311_bin: string;
+    python312_bin: string;
+    python313_bin: string;
     java8_bin: string;
     java11_bin: string;
     java17_bin: string;
+    java21_bin: string;
+    java25_bin: string;
     javac_disableWarnings: string;
     serve_container: string;
+    functionsShell_prompt: string;
 };
 declare class UserConfig {
     private configFilePath;

package/lib/userConfig.js

@@ -9,12 +9,26 @@ const constants_1 = require("./util_modules/constants");
 const path_1 = __importDefault(require("path"));
 const error_1 = __importDefault(require("./error"));
 exports.CONFIG_KEYS = {
+    node12_bin: 'node12.bin',
+    node14_bin: 'node14.bin',
+    node16_bin: 'node16.bin',
+    node18_bin: 'node18.bin',
+    node20_bin: 'node20.bin',
+    node22_bin: 'node22.bin',
+    node24_bin: 'node24.bin',
     python39_bin: 'python3_9.bin',
+    python310_bin: 'python3_10.bin',
+    python311_bin: 'python3_11.bin',
+    python312_bin: 'python3_12.bin',
+    python313_bin: 'python3_13.bin',
     java8_bin: 'java8.bin',
     java11_bin: 'java11.bin',
     java17_bin: 'java17.bin',
+    java21_bin: 'java21.bin',
+    java25_bin: 'java25.bin',
     javac_disableWarnings: 'javac.disable_warnings',
-    serve_container: 'serve.container'
+    serve_container: 'serve.container',
+    functionsShell_prompt: 'functions_shell.prompt'
 };
 class UserConfig {
     constructor() {