zcatalyst-cli 1.15.2 → 1.16.1

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,26 @@ 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;
+            req.url = '/.catalyst%2Freload-script.js';
+            (_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 +146,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 +267,17 @@ 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;
+                            if ((_a = req.url) === null || _a === void 0 ? void 0 : _a.includes('/__catalyst/sdk/init.js')) {
+                                (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;
@@ -265,7 +290,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
         });
         app.use('/', (0, unknownReqProxy_1.default)(proxy, customProxyUrl));
         app.use(error_handler_1.default);
-        const expressServer = app.listen(listenPort).on('error', (err) => {
+        const expressServer = app.listen(listenPort, '127.0.0.1').on('error', (err) => {
             if (proxy) {
                 proxyDestroyer.destroy();
             }

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

@@ -69,7 +69,7 @@ const browserLogicHandler = async (req, res) => {
 
 const server = createServer(type === 'browserlogic' ? browserLogicHandler : aioHandler);
 
-server.listen(listenPort).on('error', (err) => {
+server.listen(listenPort, '127.0.0.1').on('error', (err) => {
 	// eslint-disable-next-line no-console
 	console.error(err);
 });

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/serve/server/lib/web_client/server.js

@@ -174,7 +174,7 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
                 res.send('Error fetching the resource');
             });
         }));
-        const server = app.listen(httpPort).on('error', (err) => {
+        const server = app.listen(httpPort, '127.0.0.1').on('error', (err) => {
             eventListener.emit('error', err);
         });
         const expressDestroyer = new server_js_1.ConnectionDestroyer(server);

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) {
@@ -313,7 +326,7 @@ class HttpFunctions {
                 }
             });
             return new Promise((res) => {
-                const server = this.app.listen(httpPort, () => {
+                const server = this.app.listen(httpPort, '127.0.0.1', () => {
                     this.targets.forEach((target) => {
                         var _a, _b;
                         (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => {

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/lib/util_modules/constants/lib/plugin.js

@@ -23,6 +23,6 @@ exports.default = Object.freeze({
         plugin: 'zcatalyst-cli-plugin-angular',
         runner_command: ['ng', 'new'],
         collection_name: 'zcatalyst-angular-schematics',
-        runner_package: '@angular/cli@v12-lts'
+        runner_package: '@angular/cli@v15-lts'
     }
 });

package/lib/util_modules/constants/lib/scopes.js

@@ -47,7 +47,9 @@ exports.default = Object.freeze({
     notification_web: 'ZohoCatalyst.notifications.web',
     search_read: 'ZohoCatalyst.search.READ',
     zia: 'ZohoCatalyst.mlkit.READ',
-    zia_hub: 'ZiaHub.deployment.READ',
+    quick_ml: 'QuickML.deployment.READ',
+    pdf_shot: 'ZohoCatalyst.pdfshot.execute',
+    dataverse: 'ZohoCatalyst.dataverse.execute',
     circuits_execute: 'ZohoCatalyst.circuits.execute',
     circuits_exe_read: 'ZohoCatalyst.circuits.execution.READ',
     circuits_exe_delete: 'ZohoCatalyst.circuits.execution.DELETE',