zcatalyst-cli 1.15.1 → 1.16.0

package/README.md

@@ -80,6 +80,10 @@ Command | Description
 **project:reset** | Clear an active project selection and reset to the base project.
 **init** | Initialize a Catalyst project, function, and client resources in the local directory.
 **pull** | Pull resources of your project from the remote console to the local directory.
+**iac:pack** | Creates a import ready zip file.
+**iac:import** | Deploy the iac zip file to console and create a new project with it.
+**iac:export** | Create a zip file out of existing project in console.
+**iac:status** | Displays the status of iac schedule progress.
 **apig:status** | Obtain the current status of API Gateway for your project and the schedule progress.
 **apig:enable** | Enable API Gateway for your project. *In both Console and Local*.
 **apig:disable** | Disable API Gateway for your project. *In both Console and Local*.
@@ -93,14 +97,21 @@ Command | Description
 **functions:shell** | Launch a node shell to test emulated functions of any stack or type, other than Advanced I/O functions.
 **functions:config** | Perform advanced configurations such as memory allocation on a function in your project.
 **functions:delete** | Delete a function from the remote console or the local directory.
+**appsail:add** | Link an already existing AppSail service to Catalyst Project.
+**codelib:install** | Install the code library functionalities into your project.
 **event:generate \| generate:event** | Generate sample payloads from different components or custom event sources to test Event functions.
 **event:generate:integ** | Generate sample payloads for the required integration service to test Integration functions.
 **serve** | Serve Basic I/O and Advanced I/O functions, and the client, to test them locally.
 **deploy** | Deploy the Catalyst project and project resources to the remote console from the local directory.
 **help** | Display the command reference or help for a specific command.
 **run-script \| run** | Run a particular command script defined in *catalyst.json*.
+**config:set** |  Set catalyst configuration as a key value pair.
+**config:get** |  Get catalyst config value for the specified key.
+**config:delete** |  Delete a key from catalyst config.
+**config:list** |  List all your catalyst configurations.
 **logout** |  Log the CLI out of your Catalyst account.
 
+
 ---
 
 ## Migration

package/docs/fn-utils/lib/ensure-java-userconfig.toml

@@ -0,0 +1,15 @@
+[JAVACONFIG-1]
+context = '''Unable to check the javac version using the given binary path.'''
+aid = '''Please provide a valid java binary path for the config key ${arg[0]} to serve or deploy the function[${arg[1]}].'''
+
+[JAVACONFIG-2]
+context = '''Unable to locate the java binary path in your system.'''
+aid = '''Please provide a valid java binary path for the config key ${arg[0]} to serve or deploy the function[${arg[1]}].'''
+
+[JAVACONFIG-3]
+context = '''Provided JDK version[${arg[0]}] for the config key ${arg[1]} is lesser than the compatible JDK version[${arg[2]}]'''
+aid = '''Please provide a valid java binary path for the config key ${arg[1]} that is compatible with the JDK version[${arg[2]}] to serve or deploy the function[${arg[3]}].'''
+
+[JAVACONFIG-4]
+context = '''Unable to verify the java binary path'''
+aid = '''Please re-check and provide a valid java binary path for the config key ${arg[0]} to serve or deploy the function[${arg[1]}].'''

package/lib/commands/init.js

@@ -103,7 +103,9 @@ exports.default = new command_1.default('init [feature]')
         (0, logger_1.message)('Aborted by user.');
         return;
     }
-    yield (0, features_1.project)();
+    if (feature !== 'project') {
+        yield (0, features_1.project)();
+    }
     const featureAns = yield prompt_1.default.ask(prompt_1.default.question('features', 'Which are the features you want to setup for this folder?\n This step is optional! Press ' +
         (0, ansi_colors_1.cyan)('<return> ') +
         'to proceed.\n', {
@@ -130,7 +132,7 @@ exports.default = new command_1.default('init [feature]')
         return saveAndComplete(config);
     }
     if (typeof feature === 'string') {
-        featureAns.features = feature;
+        featureAns.features = [feature];
     }
     runtime_store_1.default.set('context.features', featureAns.features);
     yield (yield Promise.resolve().then(() => __importStar(require('../init')))).default();

package/lib/commands/project/use.js

@@ -27,6 +27,10 @@ const makeActive = (currentProjectId, optedProject) => __awaiter(void 0, void 0,
         active: true,
         base: js_1.JS.isNull(currentProjectId)
     });
+    const optedProjectEnv = optedProject.env_details;
+    yield (0, project_2.upsertEnv)(optedProject.id, optedProjectEnv[0], {
+        active: true
+    });
     (0, logger_1.success)('Successfully made project active');
 });
 exports.default = new command_1.default('project:use [name_or_project_id]')

package/lib/commands/pull.js

@@ -136,5 +136,12 @@ exports.default = new command_1.default('pull [feature]')
     yield config.save();
     (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully updated with feature details.');
     (0, logger_1.info)();
-    (0, logger_1.success)('Catalyst pull complete!');
+    if ((runtime_store_1.default.get('payload.functions.status') ||
+        runtime_store_1.default.get('payload.client.status') ||
+        runtime_store_1.default.get('payload.apig.status')) === 1) {
+        (0, logger_1.success)('Catalyst pull partially completed!');
+    }
+    else {
+        (0, logger_1.success)('Catalyst pull completed!');
+    }
 }));

package/lib/deploy/features/functions/index.js

@@ -99,6 +99,11 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         })));
     }
     const allTargets = refinedTargets.filter((target) => {
+        if (target.compilationWarning) {
+            target.compilationWarning.forEach((message) => {
+                (0, logger_1.warning)(message);
+            });
+        }
         if (!target.valid) {
             (0, logger_1.warning)('skipping deploy of target [' + target.name + '] since ' + target.failure_reason);
         }

package/lib/fn-utils/lib/common.js

@@ -253,11 +253,13 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
 }
 exports.refineTargets = refineTargets;
 function refineEnvVariables(vars) {
-    return Object.entries(vars || {}).reduce((envObj, curEntry) => {
-        envObj[curEntry[0]] =
-            typeof curEntry[1] === 'object' ? JSON.stringify(curEntry[1]) : curEntry[1];
-        return envObj;
-    }, {});
+    return !vars
+        ? undefined
+        : Object.entries(vars).reduce((envObj, curEntry) => {
+            envObj[curEntry[0]] =
+                typeof curEntry[1] === 'object' ? JSON.stringify(curEntry[1]) : curEntry[1];
+            return envObj;
+        }, {});
 }
 function executeHook({ prefix, command }) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {

package/lib/fn-utils/lib/ensure-java-userconfig.js

@@ -0,0 +1,151 @@
+'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 });
+exports.getJavaSpawnCommand = exports.ensureJava = exports.stackVsVersions = void 0;
+const semver_1 = require("semver");
+const error_1 = __importDefault(require("../../error"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const userConfig_1 = __importDefault(require("../../userConfig"));
+const env_1 = require("../../util_modules/env");
+const shell_1 = require("../../util_modules/shell");
+const java_1 = require("./java");
+exports.stackVsVersions = {
+    java8: {
+        version: '1.8.0',
+        target: '1.8'
+    },
+    java11: {
+        version: '11.0.0',
+        target: '11'
+    },
+    java17: {
+        version: '17.0.0',
+        target: '17'
+    }
+};
+function ensureJava(target) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const configKey = `${target.stack}.bin`;
+        const spawnCommand = userConfig_1.default.get(configKey);
+        let usingJavaDefaultPath = false;
+        if (!spawnCommand) {
+            runtime_store_1.default.set(`context.java.isUsingJavaDefaultPath_${target.stack}`, true);
+            usingJavaDefaultPath = true;
+        }
+        let javacVersion = '';
+        const currentStackVersion = exports.stackVsVersions[target.stack].version;
+        try {
+            const javacSpawnCommand = getJavaSpawnCommand(spawnCommand, 'javac', target.stack);
+            javacVersion = yield validateJavaPath(javacSpawnCommand);
+            if (!javacVersion) {
+                if (spawnCommand) {
+                    throw new error_1.default(`unable to check the javac version using the given binary path. Kindly re-check. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
+                        exit: 0,
+                        errorId: 'JAVACONFIG-1',
+                        arg: [
+                            target.stack,
+                            target.name,
+                            `jdk-${exports.stackVsVersions[target.stack]
+                                .target}`
+                        ]
+                    });
+                }
+                else {
+                    throw new error_1.default(`unable to locate the java binary path in your system. Kindly re-check. Please provide the valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
+                        exit: 0,
+                        errorId: 'JAVACONFIG-2',
+                        arg: [`${target.stack}.bin`, target.name]
+                    });
+                }
+            }
+        }
+        catch (_a) {
+            throw new error_1.default(`error while validating java binary path. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
+                exit: 0,
+                errorId: 'JAVACONFIG-4',
+                arg: [`${target.stack}.bin`, target.name]
+            });
+        }
+        if ((0, semver_1.satisfies)(currentStackVersion, `>${javacVersion}`)) {
+            if (usingJavaDefaultPath === false) {
+                throw new error_1.default(`provided JDK version[jdk-${javacVersion}] for the config key ${target.stack}.bin is lesser than the compatible JDK version[jdk-${exports.stackVsVersions[target.stack].target}]. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
+                    exit: 0,
+                    skipHelp: true,
+                    errorId: 'JAVACONFIG-3',
+                    arg: [
+                        `jdk-${javacVersion}`,
+                        target.stack,
+                        `jdk-${exports.stackVsVersions[target.stack].target}`,
+                        target.name
+                    ]
+                });
+            }
+            throw new error_1.default(`provided JDK version[jdk-${javacVersion}] is lesser than the compatible JDK version[jdk-${exports.stackVsVersions[target.stack].target}]. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
+                exit: 0,
+                skipHelp: true,
+                errorId: 'JAVACONFIG-3',
+                arg: [
+                    `jdk-${javacVersion}`,
+                    target.stack,
+                    `jdk-${exports.stackVsVersions[target.stack].target}`,
+                    target.name
+                ]
+            });
+        }
+        const majorVersion = target.stack === 'java8' ? '' : currentStackVersion.split('.')[0];
+        if (!(((0, semver_1.satisfies)(javacVersion, `>=${majorVersion}.0.0`) &&
+            (0, semver_1.satisfies)(javacVersion, `<=${majorVersion}.x.x`)) ||
+            (target.stack === 'java8' &&
+                (0, semver_1.satisfies)(javacVersion, '>=1.8.0') &&
+                (0, semver_1.satisfies)(javacVersion, '<=1.8.x')))) {
+            const warningMessage = [];
+            warningMessage.push(`Warning : Your function[${target.name}] stack is ${target.stack}. But you are using jdk ${javacVersion} to compile source files. Please use jdk ${exports.stackVsVersions[target.stack].target} for better compilation`);
+            target.compilationWarning = warningMessage;
+        }
+        if (!spawnCommand) {
+            runtime_store_1.default.set(`context.java.isUsingJavaDefaultPath_${target.stack}`, true);
+        }
+    });
+}
+exports.ensureJava = ensureJava;
+function validateJavaPath(spawnCommand) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const spawnOpts = ['-version'];
+        const javacVersionChild = (0, shell_1.spawn)(spawnCommand, spawnOpts, {
+            cwd: runtime_store_1.default.get('cwd'),
+            stdio: 'pipe'
+        }).RAW();
+        let javacVersionDetails = yield (0, java_1.extractAllData)(javacVersionChild, 'stdout');
+        javacVersionDetails =
+            javacVersionDetails === ''
+                ? yield (0, java_1.extractAllData)(javacVersionChild, 'stderr')
+                : javacVersionDetails;
+        const javacVersion = (0, semver_1.valid)((0, semver_1.coerce)(javacVersionDetails.split(' ')[1]));
+        return javacVersion;
+    });
+}
+function getJavaSpawnCommand(spawnCommand, process, stack) {
+    const isUsingJavaDefaultPath = runtime_store_1.default.get(`context.java.isUsingJavaDefaultPath_${stack}`);
+    if (isUsingJavaDefaultPath === true) {
+        return process;
+    }
+    if (env_1.isWindows) {
+        spawnCommand = `"${spawnCommand}\\${process}"`;
+    }
+    else {
+        spawnCommand = `${spawnCommand}/${process}`;
+    }
+    return spawnCommand;
+}
+exports.getJavaSpawnCommand = getJavaSpawnCommand;

package/lib/fn-utils/lib/java.js

@@ -12,10 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTemplatePath = exports.validate = exports.projectFileValidation = exports.ensureJavaInvoker = exports.compileTarget = exports.normaliseClasspath = exports.rewriteClasspath = exports.isValidClassName = exports.containsKeyWord = exports.classPathSep = void 0;
+exports.getTargetVersion = exports.getTemplatePath = exports.validate = exports.extractAllData = exports.projectFileValidation = exports.ensureJavaInvoker = exports.compileTarget = exports.normaliseClasspath = exports.rewriteClasspath = exports.isValidClassName = exports.containsKeyWord = exports.classPathSep = exports.FN_TYPE = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
-const semver_1 = require("semver");
 const xml2js_1 = __importDefault(require("xml2js"));
 const error_1 = __importDefault(require("../../error"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
@@ -24,9 +23,13 @@ const constants_1 = require("../../util_modules/constants");
 const env_1 = require("../../util_modules/env");
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
-const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 const shell_1 = require("../../util_modules/shell");
+const userConfig_1 = __importDefault(require("../../userConfig"));
+const logger_1 = require("../../util_modules/logger");
+const ensure_java_userconfig_1 = require("./ensure-java-userconfig");
+var constants_2 = require("../../util_modules/constants");
+Object.defineProperty(exports, "FN_TYPE", { enumerable: true, get: function () { return constants_2.FN_TYPE; } });
 const keyWords = [
     'abstract',
     'assert',
@@ -82,6 +85,10 @@ const keyWords = [
     'volatile',
     'while'
 ];
+const warningMessages = [
+    'warning: [options] bootstrap class path not set in conjunction with -source 8',
+    'warning: [options] system modules path not set in conjunction with -source 11'
+];
 exports.classPathSep = env_1.isWindows ? ';' : ':';
 function containsKeyWord(name) {
     return keyWords.some((keyWord) => {
@@ -200,6 +207,9 @@ function compileTarget(target) {
         const outputFolder = (0, path_1.join)(targetSource, constants_1.FOLDERNAME.output);
         const integ = target.integ_config;
         const entries = [(0, path_1.join)(targetSource, ((_a = target.index) === null || _a === void 0 ? void 0 : _a.replace(/\./g, path_1.sep)) + '.java')];
+        const configKey = `${target.stack}.bin`;
+        const userConfigCmd = userConfig_1.default.get(configKey);
+        const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'javac', target.stack);
         if (integ && integ.length > 0) {
             integ.forEach((integConf) => {
                 const handlers = integConf.handlers;
@@ -225,18 +235,20 @@ function compileTarget(target) {
                 return fs_1.ASYNC.copyFile(file.path, (0, path_1.join)(outputFolder, targetPth));
             }));
         }
-        yield Promise.all(entries.map((file) => {
-            (0, logger_1.info)('Compiling ' + file);
-            return (0, shell_1.spawn)('javac', [
-                '-cp',
-                '*' + module.exports.classPathSep + '.',
-                '-g',
-                '-Xprefer:source',
-                file.replace(targetSource, outputFolder)
-            ], {
-                cwd: outputFolder
-            }).ASYNC();
-        }));
+        const targetVersion = getTargetVersion(target.stack);
+        yield Promise.all(entries.map((file) => compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outputFolder)
+            .then((result) => {
+            const code = result[2];
+            if (code === 1) {
+                const error = [];
+                error === null || error === void 0 ? void 0 : error.push(result[1]);
+                target.valid = false;
+                target.compilationError = error;
+            }
+        })
+            .catch((error) => {
+            target.failure_reason = error.message;
+        })));
         const currentCommand = (0, option_1.getCurrentCommand)();
         switch (currentCommand) {
             case 'pull':
@@ -256,20 +268,84 @@ function compileTarget(target) {
     });
 }
 exports.compileTarget = compileTarget;
-function ensureJavaInvoker(pth, invoker) {
+function compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outputFolder) {
+    return __awaiter(this, void 0, void 0, function* () {
+        (0, logger_1.info)('Compiling ' + file);
+        return new Promise((resolve, reject) => {
+            var _a, _b;
+            const child = (0, shell_1.spawn)(spawnCommand, [
+                '-target',
+                targetVersion,
+                '-source',
+                targetVersion,
+                '-cp',
+                '*' + module.exports.classPathSep + '.',
+                '-g',
+                '-Xprefer:source',
+                file.replace(targetSource, outputFolder)
+            ], {
+                cwd: outputFolder,
+                stdio: 'pipe'
+            }).RAW();
+            let stdout = '';
+            let stderr = '';
+            (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                stdout += data.toString();
+            });
+            (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+                const err = data.toString();
+                let newErr = '';
+                warningMessages.forEach((element) => {
+                    if (err.includes(element)) {
+                        newErr += err.replace(element, '');
+                    }
+                });
+                if (!newErr) {
+                    newErr += err;
+                }
+                stderr += newErr;
+            });
+            child.on('error', (error) => {
+                reject(error);
+            });
+            child.on('close', (code) => {
+                resolve([stdout, stderr, code]);
+            });
+        });
+    });
+}
+function ensureJavaInvoker(pth, invoker, target) {
+    const configKey = `${target.stack}.bin`;
+    const userConfigCmd = userConfig_1.default.get(configKey);
+    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'javac', target.stack);
     const classPth = pth + '.class';
+    const targetVersion = getTargetVersion(target.stack);
     if (fs_1.SYNC.fileExists(classPth)) {
         return true;
     }
     fs_1.SYNC.ensureDir((0, path_1.dirname)(classPth));
-    (0, shell_1.spawn)('javac', [
+    const child = (0, shell_1.spawn)(spawnCommand, [
+        '-target',
+        targetVersion,
+        '-source',
+        targetVersion,
         '-cp',
         (0, path_1.join)('lib', '*') + module.exports.classPathSep + '.',
         '-g',
         '-d',
         (0, path_1.dirname)(classPth),
         (0, path_1.basename)(invoker)
-    ], { cwd: (0, path_1.dirname)(invoker) }).SYNC();
+    ], { cwd: (0, path_1.dirname)(invoker), stdio: 'pipe' }).SYNC();
+    if (child.status === 1) {
+        const errorResponse = [];
+        const err = child.stderr.toString();
+        warningMessages.forEach((element) => {
+            if (err.includes(element)) {
+                errorResponse.push(err.replace(element, ''));
+            }
+        });
+        target.compilationError = errorResponse;
+    }
     fs_1.SYNC.copyDir((0, path_1.join)((0, path_1.dirname)(invoker), 'lib'), (0, path_1.join)((0, path_1.dirname)(classPth), 'lib'));
     return true;
 }
@@ -316,34 +392,7 @@ function extractAllData(child, name) {
         });
     });
 }
-function checkJavaCompatibility() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const javacVersionChild = (0, shell_1.spawn)('javac', ['-version'], {
-            cwd: runtime_store_1.default.get('cwd'),
-            stdio: 'pipe'
-        }).RAW();
-        let javacVersionDetails = yield extractAllData(javacVersionChild, 'stdout');
-        javacVersionDetails =
-            javacVersionDetails === ''
-                ? yield extractAllData(javacVersionChild, 'stderr')
-                : javacVersionDetails;
-        const javacVersion = (0, semver_1.valid)((0, semver_1.coerce)(javacVersionDetails.split(' ')[1]));
-        if (javacVersion === '' || javacVersion === null) {
-            throw new error_1.default('Unable to check the javac version', {
-                exit: 0,
-                errorId: 'JAVA-4',
-                arg: [(0, ansi_colors_1.bold)('javac')]
-            });
-        }
-        if ((0, semver_1.gtr)(javacVersion, new semver_1.Range('<1.9', { includePrerelease: true }))) {
-            throw new error_1.default('javac version is above the compatible version', {
-                exit: 0,
-                errorId: 'JAVA-5',
-                arg: [(0, ansi_colors_1.bold)('javac'), (0, ansi_colors_1.bold)('1.8.x'), (0, ansi_colors_1.bold)('1.8')]
-            });
-        }
-    });
-}
+exports.extractAllData = extractAllData;
 function validate(targets, idx) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -377,7 +426,7 @@ function validate(targets, idx) {
             }
             yield normaliseClasspath(classpath, libFolder);
             yield projectFileValidation(projectPath, currentTarget);
-            yield checkJavaCompatibility();
+            yield (0, ensure_java_userconfig_1.ensureJava)(currentTarget);
             yield compileTarget(currentTarget).catch((err) => {
                 throw new error_1.default('there was a compilation error!', {
                     exit: 1,
@@ -386,8 +435,15 @@ function validate(targets, idx) {
                     skipHelp: !!(0, option_1.getOptionValue)('watch', false)
                 });
             });
-            currentTarget.valid = true;
-            return validate(targets, ++idx);
+            if (currentTarget.valid === true && !currentTarget.failure_reason) {
+                currentTarget.valid = true;
+                return validate(targets, ++idx);
+            }
+            throw new error_1.default('there was a compilation error!', {
+                exit: 1,
+                errorId: 'JAVA-7',
+                skipHelp: !!(0, option_1.getOptionValue)('watch', false)
+            });
         }
         catch (err) {
             currentTarget.valid = false;
@@ -452,3 +508,7 @@ function getTemplatePath(fnType, add) {
     }
 }
 exports.getTemplatePath = getTemplatePath;
+function getTargetVersion(stack) {
+    return ensure_java_userconfig_1.stackVsVersions[stack].target;
+}
+exports.getTargetVersion = getTargetVersion;

package/lib/pull/features/apig.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const apig_utils_1 = require("../../apig-utils");
 const endpoints_1 = require("../../endpoints");
+const error_1 = __importDefault(require("../../error"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
@@ -61,8 +62,20 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, logger_1.info)('No rules found in remote console');
         return;
     }
-    const fileContent = JSON.stringify(rulesArr, null, 2) + '\n';
-    yield fs_1.ASYNC.writeFile(apigDirPath, fileContent);
-    yield apig_utils_1.apigUtils.validate();
+    try {
+        const fileContent = JSON.stringify(rulesArr, null, 2) + '\n';
+        yield fs_1.ASYNC.writeFile(apigDirPath, fileContent);
+        yield apig_utils_1.apigUtils.validate();
+    }
+    catch (err) {
+        runtime_store_1.default.set('payload.apig.status', 1);
+        if (err instanceof error_1.default) {
+            throw new error_1.default(err.message, {
+                exit: err.exit,
+                errorId: err.errorId
+            });
+        }
+        throw err;
+    }
     runtime_store_1.default.set('payload.apig.source', apigDirPath);
 });

package/lib/pull/features/client.js

@@ -16,6 +16,7 @@ const ansi_colors_1 = require("ansi-colors");
 const archiver_1 = __importDefault(require("../../archiver"));
 const client_utils_1 = require("../../client-utils");
 const endpoints_1 = require("../../endpoints");
+const error_1 = __importDefault(require("../../error"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
@@ -58,9 +59,21 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         type: 'list',
         choices
     }));
-    const clientZip = (yield webappAPI.download(historyAns.history));
-    yield new archiver_1.default().load(clientZip).extract(clientDirPath).finalize();
-    yield client_utils_1.clientUtils.validate();
+    try {
+        const clientZip = (yield webappAPI.download(historyAns.history));
+        yield new archiver_1.default().load(clientZip).extract(clientDirPath).finalize();
+        yield client_utils_1.clientUtils.validate();
+    }
+    catch (err) {
+        runtime_store_1.default.set('payload.client.status', 1);
+        if (err instanceof error_1.default) {
+            throw new error_1.default(err.message, {
+                exit: err.exit,
+                errorId: err.errorId
+            });
+        }
+        throw err;
+    }
     runtime_store_1.default.set('payload.client', runtime_store_1.default.get('context.client'));
     runtime_store_1.default.set('payload.client.source', (0, project_1.resolveProjectPath)(clientDirName));
 });

package/lib/pull/features/functions/index.js

@@ -29,6 +29,7 @@ const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/r
 const error_1 = __importDefault(require("../../../error"));
 const python_1 = require("../../../fn-utils/lib/python");
 const throbber_1 = __importDefault(require("../../../throbber"));
+const ensure_java_userconfig_1 = require("../../../fn-utils/lib/ensure-java-userconfig");
 function selFnsPrompt(targs, fnDirPath) {
     return __awaiter(this, void 0, void 0, function* () {
         const choicesObj = targs.reduce((accumulator, fn) => {
@@ -134,54 +135,83 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
         });
     }));
     runtime_store_1.default.set('context.functions.targets', targets);
+    let isFnPulled = false;
+    let isFnPulledFailed = false;
     targets = yield Promise.all(targets.map((fn) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c;
-        yield fs_1.ASYNC.ensureDir(fn.source);
-        const buffer = (yield fnAPI.download(fn.id));
-        yield new archiver_1.default().load(buffer).extract((0, path_1.join)(fnDirPath, fn.name)).finalize();
-        if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
-            yield (0, languages_1.node)(fn);
-        }
-        else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
-            yield (0, languages_1.java)(fn);
-        }
-        else if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
-            yield (0, languages_1.python)(fn);
-            const reqFile = (0, path_1.join)(fn.source, constants_1.FILENAME.functions.python_requirements);
-            const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
-            if (requirementsExists && fn.valid) {
-                try {
-                    yield (0, python_1.removeRequirements)(reqFile, fn);
-                }
-                catch (e) {
-                    const err = error_1.default.getErrorInstance(e);
-                    (fn.valid = false), (fn.failure_reason = err.message);
+        try {
+            yield fs_1.ASYNC.ensureDir(fn.source);
+            const buffer = (yield fnAPI.download(fn.id));
+            yield new archiver_1.default().load(buffer).extract((0, path_1.join)(fnDirPath, fn.name)).finalize();
+            if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
+                yield (0, languages_1.node)(fn);
+            }
+            else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
+                yield (0, ensure_java_userconfig_1.ensureJava)(fn);
+                yield (0, languages_1.java)(fn);
+            }
+            else if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
+                yield (0, languages_1.python)(fn);
+                const reqFile = (0, path_1.join)(fn.source, constants_1.FILENAME.functions.python_requirements);
+                const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
+                if (requirementsExists && fn.valid) {
+                    try {
+                        yield (0, python_1.removeRequirements)(reqFile, fn);
+                    }
+                    catch (e) {
+                        const err = error_1.default.getErrorInstance(e);
+                        (fn.valid = false), (fn.failure_reason = err.message);
+                    }
                 }
             }
+            const catalystJsonPth = (0, path_1.join)(fn.source, constants_1.FILENAME.catalyst_config);
+            const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth);
+            const fnDetails = (yield fnAPI.getFunction(fn.id));
+            const envVariables = js_1.JS.get(fnDetails, 'configuration.environment.variables', false);
+            if (catalystJson && envVariables) {
+                catalystJson.deployment.env_variables = envVariables;
+                yield fs_1.ASYNC.writeJSONFile(catalystJsonPth, catalystJson);
+            }
+            isFnPulled = true;
         }
-        const catalystJsonPth = (0, path_1.join)(fn.source, constants_1.FILENAME.catalyst_config);
-        const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth);
-        const fnDetails = (yield fnAPI.getFunction(fn.id));
-        const envVariables = js_1.JS.get(fnDetails, 'configuration.environment.variables', false);
-        if (catalystJson && envVariables) {
-            catalystJson.deployment.env_variables = envVariables;
-            yield fs_1.ASYNC.writeJSONFile(catalystJsonPth, catalystJson);
+        catch (err) {
+            const error = err;
+            let message = error.message;
+            if (error instanceof error_1.default) {
+                if (error.errorId && error.errorId === 'JAVACONFIG-3') {
+                    message = `You are trying to pull a function of a higher stack version[${fn.stack}]. Please provide a valid java binary path for the config key ${fn.stack}.bin to pull function[${fn.name}].`;
+                }
+            }
+            throbber.remove('function_pull_' + fn.name);
+            (0, logger_1.warning)(`Skipping pull of function(${fn.name}). ${message}`);
+            fn.failure_reason = `there was an error while pulling function [${fn.name}]. ${message}`;
+            isFnPulledFailed = true;
         }
         throbber.remove('function_pull_' + fn.name);
         return fn;
     })));
     targets = targets.filter((target) => {
-        var _a, _b;
-        if (!target.valid && !((_a = target.failure_reason) === null || _a === void 0 ? void 0 : _a.startsWith('unable to locate python'))) {
+        var _a, _b, _c;
+        if (!target.valid &&
+            !((_a = target.failure_reason) === null || _a === void 0 ? void 0 : _a.startsWith('unable to locate python')) &&
+            !((_b = target.failure_reason) === null || _b === void 0 ? void 0 : _b.includes('You are trying to pull a function of a higher stack version'))) {
             (0, logger_1.debug)('Invalid target : ' + target.name + ' reason : ' + target.failure_reason);
             (0, logger_1.warning)(`skipping pull of function(${target.name}) since the package is invalid. \nContact catalyst support with debug log.`);
             new error_1.default('invalid package: ' + target.name, { exit: 2 });
         }
-        else if (!target.valid && ((_b = target.failure_reason) === null || _b === void 0 ? void 0 : _b.startsWith('unable to locate python'))) {
+        else if (!target.valid && ((_c = target.failure_reason) === null || _c === void 0 ? void 0 : _c.startsWith('unable to locate python'))) {
             (0, logger_1.warning)(`skipping pull of function(${target.name}) since ${target.failure_reason}`);
         }
         return target.valid;
     });
-    runtime_store_1.default.set('payload.functions.targets', targets);
-    runtime_store_1.default.set('payload.functions.source', fnDirName);
+    if (isFnPulled) {
+        runtime_store_1.default.set('payload.functions.targets', targets);
+        runtime_store_1.default.set('payload.functions.source', fnDirName);
+        if (isFnPulledFailed) {
+            runtime_store_1.default.set('payload.functions.status', 1);
+        }
+        else {
+            runtime_store_1.default.set('payload.functions.status', 2);
+        }
+    }
 });

package/lib/serve/index.js

@@ -51,6 +51,7 @@ const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
 const features = __importStar(require("./features"));
 const server_1 = __importDefault(require("./server"));
+const char_1 = require("../util_modules/char");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const serveTargets = runtime_store_1.default.get('context.targets', []);
     const advancedServer = new server_1.default();
@@ -89,6 +90,11 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         const functionTargets = rawTargets.filter((target) => {
             var _a;
+            if (target.compilationError) {
+                target.compilationError.forEach((error) => {
+                    console.log(`${(0, ansi_colors_1.red)(char_1.CHAR.error)} Error while compiling function[${target.name}] : ${error}`);
+                });
+            }
             if (!target.valid) {
                 (0, logger_1.warning)('skipping serve of function [' +
                     target.name +
@@ -96,6 +102,11 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     target.failure_reason);
                 return false;
             }
+            if (target.compilationWarning) {
+                target.compilationWarning.forEach((message) => {
+                    (0, logger_1.warning)(message);
+                });
+            }
             if (target.type === constants_1.FN_TYPE.advanced) {
                 advancedServer.add('server', target);
             }
@@ -171,7 +182,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             }).catch((err) => (0, logger_1.debug)('Error modifying the permissions: ', err)));
         (0, logger_1.info)('Shutting down server');
         yield Promise.all([
-            fs_1.ASYNC.deleteDir(buildFolder).catch(),
+            fs_1.ASYNC.deleteDir(buildFolder).catch((err) => (0, logger_1.debug)('Error while deleting directory ', err)),
             advancedServer ? advancedServer.stop() : undefined,
             basicFnServer ? basicFnServer.stop() : undefined
         ]);

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

@@ -14,14 +14,16 @@ 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 ensure_java_userconfig_1 = require("../../../../fn-utils/lib/ensure-java-userconfig");
 const plugin_loader_1 = __importDefault(require("../../../../plugin-loader"));
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const userConfig_1 = __importDefault(require("../../../../userConfig"));
 const constants_1 = require("../../../../util_modules/constants");
 const logger_1 = require("../../../../util_modules/logger");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const cwd = runtime_store_1.default.get('cwd');
     const javaServer = (0, path_1.join)(cwd, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
     const targetDir = (0, path_1.join)(cwd, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
@@ -46,7 +48,10 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
         (0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
         return event;
     }
-    return (0, shell_1.spawn)('java', opts, {
+    const configKey = `${(_d = details.target) === null || _d === void 0 ? void 0 : _d.stack}.bin`;
+    const userConfigCmd = userConfig_1.default.get(configKey);
+    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'java', (_e = details.target) === null || _e === void 0 ? void 0 : _e.stack);
+    return (0, shell_1.spawn)(spawnCommand, opts, {
         cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build)),
         stdio: 'pipe',
         env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep, 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) }, details.target.env_var)

package/lib/serve/server/lib/master.js

@@ -105,10 +105,25 @@ function spinUpMaster(listenPort, otherServerDetails) {
         const customProxyUrl = (0, option_1.getOptionValue)('proxy');
         const app = (0, express_1.default)();
         let systemRoutes;
+        const nonApigURL = ['/accounts', '/clientoauth', '/_wms', '/wmssrv'];
         app.use((0, logger_1.default)((_a = otherServerDetails.appSail) === null || _a === void 0 ? void 0 : _a.at(0)));
         app.use(cookie_parser_1.default);
         app.use((0, project_1.default)(projectDetails));
         app.use(authenticator_1.default);
+        app.use(nonApigURL, (req, res) => {
+            req.url = req.originalUrl;
+            (0, unknownReqProxy_1.default)(proxy, customProxyUrl)(req, res);
+        });
+        app.use('*/.catalyst%2Freload-script.js', (req, res) => {
+            var _a;
+            (_a = otherServerDetails.client) === null || _a === void 0 ? void 0 : _a.forEach((clientDetails) => {
+                const appTarget = `http://127.0.0.1:${clientDetails.httpPort}/app/`;
+                proxy.web(req, res, {
+                    target: appTarget,
+                    changeOrigin: true
+                });
+            });
+        });
         if (rules !== -1) {
             for (const [sourceURL, methodByConfig] of Object.entries(rules)) {
                 const router = app.route(sourceURL);
@@ -130,7 +145,10 @@ function spinUpMaster(listenPort, otherServerDetails) {
             }
             app.use('/', apig_matcher_1.default, auth_checker_1.default, url_rewriter_1.default);
         }
-        const proxy = (0, http_proxy_1.createProxyServer)()
+        const proxy = (0, http_proxy_1.createProxyServer)({
+            hostRewrite: `localhost:${listenPort}`,
+            protocolRewrite: 'http'
+        })
             .on('error', (err, req, res) => {
             if (res instanceof http_1.ServerResponse) {
                 res.writeHead(502, { 'Content-Type': 'json' });
@@ -248,11 +266,18 @@ function spinUpMaster(listenPort, otherServerDetails) {
                 case 'appSail': {
                     (_d = otherServerDetails.appSail) === null || _d === void 0 ? void 0 : _d.forEach((appSailDetails) => {
                         app.use('/', (req, res) => {
-                            proxy.web(req, res, {
-                                target: `http://127.0.0.1:${appSailDetails.target.port
-                                    .appsail}`,
-                                ws: true
-                            });
+                            var _a, _b, _c;
+                            if ((_b = (_a = appSailDetails.target) === null || _a === void 0 ? void 0 : _a.url) === null || _b === void 0 ? void 0 : _b.includes('/__catalyst/sdk/init.js')) {
+                                req.url = (_c = appSailDetails.target) === null || _c === void 0 ? void 0 : _c.url;
+                                (0, unknownReqProxy_1.default)(proxy, customProxyUrl)(req, res);
+                            }
+                            else {
+                                proxy.web(req, res, {
+                                    target: `http://127.0.0.1:${appSailDetails.target.port
+                                        .appsail}`,
+                                    ws: true
+                                });
+                            }
                         });
                     });
                     break;

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

@@ -24,13 +24,17 @@ const util_1 = require("util");
 exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const projectRoot = runtime_store_1.default.get('project.root');
-    const opts = ['-u', 'main.py'];
     const targetSource = (_a = details.target) === null || _a === void 0 ? void 0 : _a.source;
     const runtimesDir = constants_1.ENVPATH.runtimes.data;
+    const cwd = runtime_store_1.default.get('cwd');
     const stackVersion = (_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.replace('python_', '');
+    const opts = [
+        '-u',
+        (0, path_1.join)(runtimesDir, constants_1.RUNTIME.language.python.value, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`, 'main.py')
+    ];
     return new Promise((res) => {
         const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
-            cwd: (0, path_1.join)(runtimesDir, constants_1.RUNTIME.language.python.value, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`),
+            cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.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, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
         }).RAW();

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

@@ -28,10 +28,12 @@ const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
+const userConfig_1 = __importDefault(require("../../userConfig"));
 const logger_2 = require("../../util_modules/logger");
 const project_2 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
 const request_1 = __importDefault(require("request"));
+const ensure_java_userconfig_1 = require("../../fn-utils/lib/ensure-java-userconfig");
 const option_1 = require("../../util_modules/option");
 const server_1 = require("../../util_modules/server");
 const logUrl = (name, pthName, httpPort, masterPort) => {
@@ -79,7 +81,7 @@ class HttpFunctions {
             [constants_1.FN_TYPE.basic]: (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', constants_1.FN_TYPE.basic, 'node.mjs'))
         };
         this.javaInvoker = {
-            [constants_1.FN_TYPE.basic]: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'Java' + constants_1.FN_TYPE.basic + 'Invoker')
+            [constants_1.FN_TYPE.basic]: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst')
         };
         this.requestFile = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'user_req_body');
         this.responseFile = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'user_res_body');
@@ -214,7 +216,10 @@ class HttpFunctions {
                     });
                 }
                 else if ((_b = fnTarget.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
-                    const javaInvokerDir = (0, path_1.parse)(this.javaInvoker[fnTarget.type]).dir;
+                    const invoker = fnTarget.type === constants_1.FN_TYPE.basic
+                        ? this.javaInvoker[fnTarget.type] + `/${fnTarget.stack}/JavabioInvoker`
+                        : this.javaInvoker[fnTarget.type];
+                    const javaInvokerDir = (0, path_1.parse)(invoker).dir;
                     slaveOptions.push('-cp');
                     slaveOptions.push(javaInvokerDir +
                         fn_utils_1.fnUtils.java.classPathSep +
@@ -225,7 +230,7 @@ class HttpFunctions {
                             debugPort +
                             ',server=y,suspend=y');
                     }
-                    slaveOptions.push((0, path_1.basename)(this.javaInvoker[fnTarget.type]));
+                    slaveOptions.push((0, path_1.basename)(invoker));
                     slaveOptions.push(javaInvokerDir);
                     slaveOptions.push(JSON.stringify(fnTarget));
                     slaveOptions.push(query);
@@ -243,9 +248,13 @@ class HttpFunctions {
                         'x-zc-cookie': request.headers['x-zc-cookie'],
                         'x-zc-user-type': request.headers['x-zc-user-type']
                     }));
+                    const configKey = `${fnTarget.stack}.bin`;
+                    const userConfigCmd = userConfig_1.default.get(configKey);
+                    const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'java', fnTarget.stack);
                     slave = this.q.push({
-                        command: 'java',
+                        command: spawnCommand,
                         options: slaveOptions,
+                        target: fnTarget,
                         pth: (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, fnTarget.name),
                         req: request,
                         id: fnTarget.name,
@@ -299,7 +308,11 @@ class HttpFunctions {
                 .forEach((t) => {
                 var _a;
                 if ((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java.value)) {
-                    fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker[t.type], (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', t.type, 'java', 'Java' + t.type + 'Invoker.java')));
+                    const invoker = t.type === constants_1.FN_TYPE.basic
+                        ? this.javaInvoker[t.type] +
+                            `/${t.stack}/JavabioInvoker`
+                        : this.javaInvoker[t.type];
+                    fn_utils_1.fnUtils.java.ensureJavaInvoker(invoker, (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', t.type, 'java', 'Java' + t.type + 'Invoker.java')), t);
                 }
                 const pthName = new url_1.URL(t.url).pathname;
                 if (pthName !== null) {

package/lib/shell/dependencies/invoker/bio/java/JavabioInvoker.java

@@ -91,9 +91,8 @@ public class JavabioInvoker {
 	}
 
 	private static void writeResponse(JSONObject responseJson, JSONObject metaJson, String invokerDir) throws Exception {
-		String responseFilePath = Paths.get(invokerDir, "user_res_body").toString();
-		String responseMeta = Paths.get(invokerDir, "user_meta.json").toString();
-
+		String responseFilePath = Paths.get(invokerDir, "../user_res_body").toString();
+		String responseMeta = Paths.get(invokerDir, "../user_meta.json").toString();
 		BufferedWriter responseWriter = new BufferedWriter(new FileWriter(responseFilePath));
 		String responseStr = responseJson.toString();
 		responseWriter.write(responseStr);
@@ -194,7 +193,7 @@ public class JavabioInvoker {
 			LogHandler handler = new JavabioInvoker().new LogHandler();
 			rootLogger.addHandler(handler);
 
-			Path requestFilePath = Paths.get(invokerDir, "user_req_body");
+			Path requestFilePath = Paths.get(invokerDir, "../user_req_body");
 
 			HashMap<String, Object> userBody = new HashMap<String, Object>();
 
@@ -222,8 +221,7 @@ public class JavabioInvoker {
 			HashMap<String, Object> target = jsonToMap(args[1]);
 			String fnExeName = (String) target.get("index");
 			String fnName = (String) target.get("name");
-			String fnExePath = Paths.get(invokerDir, "..", "functions", fnName).normalize().toString();
-
+			String fnExePath = Paths.get(invokerDir, "../../", "functions", fnName).normalize().toString();
 			HashMap<String, Object> queryData = jsonToMap(args[2]);
 			HashMap<String, Object> projectData = jsonToMap(args[3]);
 			HashMap<String, Object> authData = jsonToMap(args[4]);

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

@@ -92,8 +92,7 @@ public class JavacronInvoker {
 	}
 
 	private static void writeResponse(String response, String invokerDir) throws Exception {
-		String responseFilePath = Paths.get(invokerDir, "user_res_body").toString();
-
+		String responseFilePath = Paths.get(invokerDir, "../user_res_body").toString();
 		BufferedWriter responseWriter = new BufferedWriter(new FileWriter(responseFilePath));
 		responseWriter.write(response);
 		responseWriter.close();
@@ -168,7 +167,7 @@ public class JavacronInvoker {
 			LogHandler handler = new JavacronInvoker().new LogHandler();
 			rootLogger.addHandler(handler);
 
-			Path requestFilePath = Paths.get(invokerDir, "user_req_body");
+			Path requestFilePath = Paths.get(invokerDir, "../user_req_body");
 
 			HashMap<String, Object> userBody = new HashMap<String, Object>();
 
@@ -196,7 +195,7 @@ public class JavacronInvoker {
 			HashMap<String, Object> target = jsonToMap(args[1]);
 			String fnExeName = (String) target.get("index");
 			String fnName = (String) target.get("name");
-			String fnExePath = Paths.get(invokerDir, "..", "functions", fnName).normalize().toString();
+			String fnExePath = Paths.get(invokerDir, "../../", "functions", fnName).normalize().toString();
 
 			HashMap<String, Object> queryData = jsonToMap(args[2]);
 			HashMap<String, Object> projectData = jsonToMap(args[3]);

package/lib/shell/dependencies/invoker/event/java/JavaeventInvoker.java

@@ -92,7 +92,7 @@ public class JavaeventInvoker {
 	}
 
 	private static void writeResponse(String response, String invokerDir) throws Exception {
-		String responseFilePath = Paths.get(invokerDir, "user_res_body").toString();
+		String responseFilePath = Paths.get(invokerDir, "../user_res_body").toString();
 
 		BufferedWriter responseWriter = new BufferedWriter(new FileWriter(responseFilePath));
 		responseWriter.write(response);
@@ -168,7 +168,7 @@ public class JavaeventInvoker {
 			LogHandler handler = new JavaeventInvoker().new LogHandler();
 			rootLogger.addHandler(handler);
 
-			Path requestFilePath = Paths.get(invokerDir, "user_req_body");
+			Path requestFilePath = Paths.get(invokerDir, "../user_req_body");
 
 			HashMap<String, Object> userBody = new HashMap<String, Object>();
 
@@ -196,12 +196,10 @@ public class JavaeventInvoker {
 			HashMap<String, Object> target = jsonToMap(args[1]);
 			String fnExeName = (String) target.get("index");
 			String fnName = (String) target.get("name");
-			String fnExePath = Paths.get(invokerDir, "..", "functions", fnName).normalize().toString();
-
+			String fnExePath = Paths.get(invokerDir, "../../", "functions", fnName).normalize().toString();
 			HashMap<String, Object> queryData = jsonToMap(args[2]);
 			HashMap<String, Object> projectData = jsonToMap(args[3]);
 			HashMap<String, Object> authData = jsonToMap(args[4]);
-
 			File[] jarFiles = new File(fnExePath).listFiles(new FilenameFilter() {
 				@Override
 				public boolean accept(File dir, String name) {

package/lib/shell/dependencies/invoker/integ/java/JavaintegInvoker.java

@@ -89,7 +89,7 @@ public class JavaintegInvoker {
 	}
 
 	private static void writeResponse(String responseString, String invokerDir) throws Exception {
-		String responseFilePath = Paths.get(invokerDir, "user_res_body").toString();
+		String responseFilePath = Paths.get(invokerDir, "../user_res_body").toString();
 
 		BufferedWriter responseWriter = new BufferedWriter(new FileWriter(responseFilePath));
 		responseWriter.write(responseString);
@@ -172,7 +172,7 @@ public class JavaintegInvoker {
 			HashMap<String, Object> target = jsonToMap(args[1]);
 			String fnExeName = (String) target.get("index");
 			String fnName = (String) target.get("name");
-			String fnExePath = Paths.get(invokerDir, "..", "functions", fnName).normalize().toString();
+			String fnExePath = Paths.get(invokerDir, "../../", "functions", fnName).normalize().toString();
 			
 			Path configJsonPath = Paths.get(fnExePath, "catalyst-config.json");
 

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

@@ -28,6 +28,7 @@ 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");
+const ensure_java_userconfig_1 = require("../../fn-utils/lib/ensure-java-userconfig");
 class LocalFunction {
     constructor(repl, target) {
         var _a, _b, _c;
@@ -41,9 +42,9 @@ class LocalFunction {
         this.slave = null;
         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');
+        this.javaInvoker = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', target.stack, 'Java' + target.type + 'Invoker');
         if ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java.value)) {
-            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')));
+            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')), target);
         }
         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');
@@ -146,7 +147,10 @@ class LocalFunction {
                     'x-zc-admin-cred-token': accessToken,
                     'x-zc-user-type': 'admin'
                 }));
-                this.slave = (0, shell_1.spawn)('java', slaveOptions, {
+                const configKey = `${this.target.stack}.bin`;
+                const userConfigCmd = userConfig_1.default.get(configKey);
+                const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'java', this.target.stack);
+                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)

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

@@ -52,9 +52,9 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
         if (target.type === constants_1.FN_TYPE.advanced ||
             target.type === constants_1.FN_TYPE.applogic ||
             target.type === constants_1.FN_TYPE.browserLogic) {
-            const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
+            const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', target.stack, 'aioserver', 'JavaaioServer');
             const javaInvoker = (0, path_1.join)(__dirname, '../../../serve/server/lib/java/aio_server/JavaaioServer.java');
-            (0, java_1.ensureJavaInvoker)(javaServer, javaInvoker);
+            (0, java_1.ensureJavaInvoker)(javaServer, javaInvoker, target);
             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 {

package/lib/userConfig.js

@@ -9,7 +9,7 @@ const path_1 = __importDefault(require("path"));
 const error_1 = __importDefault(require("./error"));
 class UserConfig {
     constructor() {
-        this.validKeys = ['python3_9.bin'];
+        this.validKeys = ['python3_9.bin', 'java8.bin', 'java11.bin', 'java17.bin'];
         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/constants/lib/apig-rules.js

@@ -163,7 +163,7 @@ exports.default = Object.freeze([
     },
     {
         name: 'catalyst_default_get_folder',
-        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:([0-9]+)}',
+        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:([A-Za-z0-9_]+)}',
         target_endpoint: '/baas/v1/project/{projectId}/folder/{folderId}',
         method: 'GET',
         authentication: undefined,
@@ -171,7 +171,7 @@ exports.default = Object.freeze([
     },
     {
         name: 'catalyst_default_upload_file',
-        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[0-9]+}/file',
+        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[A-Za-z0-9_]+}/file',
         target_endpoint: '/baas/v1/project/{projectId}/folder/{folderId}/file',
         method: 'POST',
         authentication: undefined,
@@ -179,7 +179,7 @@ exports.default = Object.freeze([
     },
     {
         name: 'catalyst_default_get_file',
-        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[0-9]+}/file/{fileId:[0-9]+}',
+        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[A-Za-z0-9_]+}/file/{fileId:[0-9]+}',
         target_endpoint: '/baas/v1/project/{projectId}/folder/{folderId}/file/{fileId}',
         method: 'GET',
         authentication: undefined,
@@ -187,7 +187,7 @@ exports.default = Object.freeze([
     },
     {
         name: 'catalyst_default_delete_file',
-        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[0-9]+}/file/{fileId:[0-9]+}',
+        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[A-Za-z0-9_]+}/file/{fileId:[0-9]+}',
         target_endpoint: '/baas/v1/project/{projectId}/folder/{folderId}/file/{fileId}',
         method: 'DELETE',
         authentication: undefined,
@@ -195,7 +195,7 @@ exports.default = Object.freeze([
     },
     {
         name: 'catalyst_default_download_file',
-        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[0-9]+}/file/{fileId:[0-9]+}/download',
+        source_endpoint: '/baas/v1/project/{projectId:[0-9]+}/folder/{folderId:[A-Za-z0-9_]+}/file/{fileId:[0-9]+}/download',
         target_endpoint: '/baas/v1/project/{projectId}/folder/{folderId}/file/{fileId}/download',
         method: 'GET',
         authentication: undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.15.1",
+	"version": "1.16.0",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {