zcatalyst-cli 1.15.0-beta.2 → 1.15.0-beta.4

package/lib/serve/server/lib/web_client/server.js

@@ -129,6 +129,9 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
             if (enableWatch && (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
                 const htmlFile = yield index_js_2.ASYNC.readFile((0, path_1.join)(source, requestedFile));
                 if (!htmlFile) {
+                    res.contentType('text/html');
+                    res.status(404);
+                    res.end();
                     eventListener.emit('error', new error_js_1.default('Unable to read the html file', {
                         exit: 1,
                         errorId: 'WEB-CLIENT-SERVER-1',

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

@@ -172,7 +172,7 @@ class HttpFunctions {
                         exit: 2
                     });
                 }
-                if ((_a = fnTarget.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
+                if ((_a = fnTarget.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
                     if (debugPort !== -1) {
                         slaveOptions.push('--inspect-brk=' + debugPort);
                     }
@@ -203,7 +203,7 @@ class HttpFunctions {
                         envVars: fnTarget.env_var
                     });
                 }
-                else if ((_b = fnTarget.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
+                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;
                     slaveOptions.push('-cp');
                     slaveOptions.push(javaInvokerDir +
@@ -280,15 +280,15 @@ class HttpFunctions {
                 var _a;
                 return t.url !== undefined &&
                     t.type === constants_1.FN_TYPE.basic &&
-                    !((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python));
+                    !((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value));
             })
                 .map((t) => {
                 this.targets.push(t);
                 return js_1.JS.omit(t, ['zip_stream', 'watcher', 'localFn']);
             })
-                .forEach((t) => __awaiter(this, void 0, void 0, function* () {
+                .forEach((t) => {
                 var _a;
-                if ((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
+                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 pthName = new url_1.URL(t.url).pathname;
@@ -301,7 +301,7 @@ class HttpFunctions {
                         this.app.use(pathWithId, reqHandler(t));
                     }
                 }
-            }));
+            });
             return new Promise((res) => {
                 const server = this.app.listen(httpPort, () => {
                     this.targets.forEach((target) => {
@@ -312,7 +312,7 @@ class HttpFunctions {
                             }
                         });
                         (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => {
-                            (0, logger_2.labeled)(`functions(${target.name})`, 'ready!').MESSAGE();
+                            (0, logger_2.labeled)(`functions[${target.name}]`, 'ready!').MESSAGE();
                             logUrl(target.name, new url_1.URL(target.url).pathname, httpPort, masterPort);
                             if (this.repl && this.repl.paused) {
                                 this.repl.resume();

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

@@ -42,7 +42,7 @@ class LocalFunction {
         this.nodeInvoker = (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', target.type, 'node.mjs'));
         const projectRoot = runtime_store_1.default.get('project.root');
         this.javaInvoker = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'Java' + target.type + 'Invoker');
-        if ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
+        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')));
         }
         this.responseFile = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'user_res_body');
@@ -54,7 +54,7 @@ class LocalFunction {
             }
         });
         (_c = this.watcher) === null || _c === void 0 ? void 0 : _c.on('compiled', () => {
-            (0, logger_1.labeled)(`functions(${target.name})`, 'ready!').MESSAGE();
+            (0, logger_1.labeled)(`functions[${target.name}]`, 'ready!').MESSAGE();
             if (this.repl.paused) {
                 repl.resume();
                 repl.showPrompt();
@@ -94,7 +94,7 @@ class LocalFunction {
             const debugPort = runtime_store_1.default.get('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], null);
             yield fs_1.ASYNC.ensureFile(this.responseFile, true);
             yield fs_1.ASYNC.ensureFile(this.metaFile, true);
-            if ((_a = this.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
+            if ((_a = this.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
                 if (debugPort !== null) {
                     slaveOptions.push('--inspect-brk=' + debugPort);
                 }
@@ -121,7 +121,7 @@ class LocalFunction {
                     env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                 }).RAW();
             }
-            else if ((_b = this.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
+            else if ((_b = this.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
                 const javaInvokerDir = (0, path_1.parse)(this.javaInvoker).dir;
                 slaveOptions.push('-cp');
                 slaveOptions.push(javaInvokerDir + fn_utils_1.fnUtils.java.classPathSep + (0, path_1.join)(javaInvokerDir, 'lib', '*'));
@@ -152,7 +152,7 @@ class LocalFunction {
                     env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                 }).RAW();
             }
-            else if ((_c = this.target.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python)) {
+            else if ((_c = this.target.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
                 const stackVersion = (_d = this.target.stack) === null || _d === void 0 ? void 0 : _d.replace('python_', '');
                 const runtimesDir = constants_1.ENVPATH.runtimes.data;
                 const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
@@ -162,7 +162,7 @@ class LocalFunction {
                 slaveOptions.push('-u');
                 slaveOptions.push('main.py');
                 this.slave = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), slaveOptions, {
-                    cwd: (0, path_1.join)(runtimesDir, runtime_1.default.language.python, `zcatalyst_runtime_${stackVersion.replace('_', '')}`),
+                    cwd: (0, path_1.join)(runtimesDir, runtime_1.default.language.python.value, `zcatalyst_runtime_${stackVersion.replace('_', '')}`),
                     stdio: 'pipe',
                     env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_CODE_LOCATION: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                 }).RAW();

package/lib/shell/prepare/index.js

@@ -45,7 +45,7 @@ exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
     const pyStacks = [];
     refinedTargets.filter((target) => {
         var _a;
-        if (((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python)) &&
+        if (((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value)) &&
             !pyStacks.includes(target.stack) &&
             target.valid) {
             pyStacks.push(target.stack);

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

@@ -55,9 +55,9 @@ function python(targets, fnWatchEvent) {
 function prepareFunctions(targets, fnWatchEvent) {
     return __awaiter(this, void 0, void 0, function* () {
         return Promise.all([
-            node(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) && target.valid; })),
-            java(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) && target.valid; })),
-            python(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python)) && target.valid; }), fnWatchEvent)
+            node(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) && target.valid; })),
+            java(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java.value)) && target.valid; })),
+            python(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value)) && target.valid; }), fnWatchEvent)
         ]);
     });
 }

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

@@ -50,9 +50,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) {
+            target.type === constants_1.FN_TYPE.browserLogic) {
             const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
-            const javaInvoker = (0, path_1.join)(__dirname, '../../../serve/server/lib/java/JavaaioServer.java');
+            const javaInvoker = (0, path_1.join)(__dirname, '../../../serve/server/lib/java/aio_server/JavaaioServer.java');
             (0, java_1.ensureJavaInvoker)(javaServer, javaInvoker);
             const serverFiles = yield fs_1.ASYNC.walk((0, path_1.dirname)(javaServer));
             yield Promise.all(serverFiles.map((file) => {

package/lib/util_modules/config/index.js

@@ -23,10 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apigConfig = exports.functionsConfig = exports.clientConfig = void 0;
+exports.appSailConfig = exports.apigConfig = exports.functionsConfig = exports.clientConfig = void 0;
 const apigConfig = __importStar(require("./lib/apig"));
 exports.apigConfig = apigConfig;
 const clientConfig = __importStar(require("./lib/client"));
 exports.clientConfig = clientConfig;
 const functionsConfig = __importStar(require("./lib/functions"));
 exports.functionsConfig = functionsConfig;
+const appSailConfig = __importStar(require("./lib/appSail.js"));
+exports.appSailConfig = appSailConfig;

package/lib/util_modules/config/lib/appSail.js

@@ -0,0 +1,89 @@
+"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.getAllTargetDetails = exports.getTargetDetails = exports.raw = void 0;
+const error_1 = __importDefault(require("../../../error"));
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const constants_1 = require("../../constants");
+const fs_1 = require("../../fs");
+const logger_1 = require("../../logger");
+const project_1 = require("../../project");
+function raw(throwError = false) {
+    const config = runtime_store_1.default.get('config', null);
+    if (config === null) {
+        if (throwError) {
+            throw new error_1.default(constants_1.FILENAME.config + ' file is required', { exit: 2 });
+        }
+        return;
+    }
+    return config.get('appsail');
+}
+exports.raw = raw;
+function getTargetDetails(name) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rawTargets = raw();
+        const target = rawTargets === null || rawTargets === void 0 ? void 0 : rawTargets.find((tar) => tar.name === name);
+        if (!target) {
+            return;
+        }
+        const appConfigPth = (0, project_1.resolveProjectPath)(target.source, constants_1.FILENAME.app_config);
+        const isPath = yield fs_1.ASYNC.fileExists(appConfigPth);
+        if (!isPath) {
+            return Object.assign({ validity: { valid: false, reason: 'Config file not present' } }, target);
+        }
+        const appConfigJson = yield fs_1.ASYNC.readJSONFile(appConfigPth);
+        if (!appConfigJson) {
+            return Object.assign({ validity: { valid: false, reason: 'Config file is empty' } }, target);
+        }
+        return Object.assign(Object.assign(Object.assign({}, target), appConfigJson), { validity: { valid: true } });
+    });
+}
+exports.getTargetDetails = getTargetDetails;
+function getAllTargetDetails(throwErr = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rawTargets = raw();
+        if (!rawTargets) {
+            if (throwErr) {
+                throw new error_1.default('No AppSail targets found');
+            }
+            return;
+        }
+        return Promise.all(rawTargets.reduce((resArr, target) => {
+            const catalystConfigPth = (0, project_1.resolveProjectPath)(target.source, constants_1.FILENAME.app_config);
+            const isPath = fs_1.SYNC.fileExists(catalystConfigPth);
+            if (!isPath) {
+                resArr.push(Promise.resolve(Object.assign({ validity: {
+                        valid: false,
+                        reason: 'Config file not present'
+                    } }, target)));
+                return resArr;
+            }
+            resArr.push(new Promise((res) => __awaiter(this, void 0, void 0, function* () {
+                const configJson = yield fs_1.ASYNC.readJSONFile(catalystConfigPth).catch((err) => (0, logger_1.debug)('Unable to read config file: ', err));
+                if (!configJson) {
+                    return res(Object.assign({ validity: {
+                            valid: false,
+                            reason: 'Config file is empty'
+                        } }, target));
+                }
+                return res({
+                    appSail: Object.assign(Object.assign({}, target), configJson),
+                    validity: { valid: true }
+                });
+            })));
+            return resArr;
+        }, []));
+    });
+}
+exports.getAllTargetDetails = getAllTargetDetails;

package/lib/util_modules/constants/index.js

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

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

@@ -14,7 +14,8 @@ exports.default = Object.freeze({
             master: 3000,
             advancedio: 3010,
             basicio: 3040,
-            client: 3070,
+            client: 3050,
+            appsail: 3060,
             browser_logic: 3100
         },
         debug: {
@@ -22,7 +23,8 @@ exports.default = Object.freeze({
             advancedio: 8000,
             basicio: 8010,
             client: -1,
-            browser_logic: 8020
+            appsail: 8020,
+            browser_logic: 8040
         }
     },
     event_bus: {

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

@@ -24,5 +24,8 @@ exports.default = Object.freeze({
     },
     catalyst_config: 'catalyst-config.json',
     command_log: '.command.log',
-    node_modules: 'node_modules'
+    node_modules: 'node_modules',
+    app_config: 'app-config.json',
+    package_json: 'package.json',
+    catalyst_ignore: '.catalystignore'
 });

package/lib/util_modules/constants/lib/runtime.js

@@ -2,9 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const RUNTIME = Object.freeze({
     language: {
-        nodejs: 'node',
-        java: 'java',
-        python: 'python'
+        node: {
+            value: 'node',
+            label: 'NodeJS'
+        },
+        java: {
+            value: 'java',
+            label: 'Java'
+        },
+        python: {
+            value: 'python',
+            label: 'Python'
+        }
     },
     memory: [128, 256, 512]
 });

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

@@ -51,6 +51,10 @@ exports.default = Object.freeze({
     circuits_exe_read: 'ZohoCatalyst.circuits.execution.READ',
     circuits_exe_delete: 'ZohoCatalyst.circuits.execution.DELETE',
     cli_logs: 'ZohoCatalyst.cli.logs.CREATE',
+    appsail_read: 'ZohoCatalyst.appsail.Read',
+    appsail_create: 'ZohoCatalyst.appsail.Create',
+    appsail_update: 'ZohoCatalyst.appsail.Update',
+    appsail_delete: 'ZohoCatalyst.appsail.Delete',
     iam_profile: 'AaaServer.profile.READ',
     stratus_create: 'Stratus.sdkop.CREATE',
     stratus_read: 'Stratus.sdkop.READ'

package/lib/util_modules/constants/lib/template.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const constants_1 = require("../../constants");
 const TEMPLATE_ROOT = (0, path_1.resolve)(__dirname, '../../../../templates');
+const FUNCTIONS_NODE_ROOT = (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node');
+const FUNCTIONS_JAVA_ROOT = (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java');
+const FUNCTIONS_PYTHON_ROOT = (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'python');
 exports.default = Object.freeze({
     banner: (0, path_1.join)(TEMPLATE_ROOT, 'banner.txt'),
     login_success: (0, path_1.join)(TEMPLATE_ROOT, 'loginSuccess.html'),
@@ -23,39 +26,39 @@ exports.default = Object.freeze({
     },
     functions: {
         node: {
-            bio: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'bio'),
-            event: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'event'),
-            cron: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'cron'),
-            aio: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'aio'),
+            bio: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'bio'),
+            event: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'event'),
+            cron: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'cron'),
+            aio: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'aio'),
             integ: {
-                [constants_1.INTEG.services.cliq]: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'integ', 'cliq')
+                [constants_1.INTEG.services.cliq.toLowerCase()]: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'integ', 'cliq')
             },
             browserlogic: {
-                playwright: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'browserlogic', 'playwright'),
-                puppeteer: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'browserlogic', 'puppeteer'),
-                selenium: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'node', 'browserlogic', 'selenium')
+                playwright: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'browserlogic', 'playwright'),
+                puppeteer: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'browserlogic', 'puppeteer'),
+                selenium: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'browserlogic', 'selenium')
             }
         },
         java: {
-            bio: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java', 'bio'),
-            event: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java', 'event'),
-            cron: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java', 'cron'),
-            aio: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java', 'aio'),
+            bio: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'bio'),
+            event: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'event'),
+            cron: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'cron'),
+            aio: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'aio'),
             integ: {
-                [constants_1.INTEG.services.cliq]: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java', 'integ', 'cliq')
+                [constants_1.INTEG.services.cliq.toLowerCase()]: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'integ', 'cliq')
             },
             browserlogic: {
-                selenium: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java', 'browserlogic', 'selenium'),
-                playwright: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'java', 'browserlogic', 'playwright')
+                selenium: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'browserlogic', 'selenium'),
+                playwright: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'browserlogic', 'playwright')
             }
         },
         python: {
-            bio: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'python', 'bio'),
-            event: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'python', 'event'),
-            cron: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'python', 'cron'),
-            aio: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'python', 'aio'),
+            bio: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'bio'),
+            event: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'event'),
+            cron: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'cron'),
+            aio: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'aio'),
             integ: {
-                [constants_1.INTEG.services.cliq]: (0, path_1.join)(TEMPLATE_ROOT, 'init', 'functions', 'python', 'integ', 'cliq')
+                [constants_1.INTEG.services.cliq]: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'integ', 'cliq')
             }
         }
     },

package/lib/util_modules/constants/lib/urls.js

@@ -49,3 +49,8 @@ URL._admin = (0, env_js_1.envOverride)('CATALYST_ADMIN_URL', 'https://api.cataly
 URL._app = (0, env_js_1.envOverride)('CATALYST_APP_URL', 'https://catalystserverless.com');
 URL._zohoStatic = (0, env_js_1.envOverride)('ZOHO_STATIC', 'https://www.zoho.com/catalyst');
 URL._console = (0, env_js_1.envOverride)('CATALYST_CONSOLE_URL', 'https://console.catalyst.zoho.com');
+URL.zohoCDN = (0, env_js_1.envOverride)('ZOHO_CDN', 'https://static.zohocdn.com');
+URL.external = Object.freeze({
+    gitHubAPI: 'https://api.github.com',
+    gitHubWeb: 'https://github.com'
+});

package/lib/util_modules/context-help.js

@@ -28,6 +28,9 @@ function help() {
     logKeys.forEach((key) => {
         var _a;
         const errQueue = logs[key];
+        if (errQueue.length === 0) {
+            return;
+        }
         if (key === 'faultyError') {
             errQueue.forEach((err) => {
                 exitCode = err.exit > exitCode ? err.exit : exitCode;

package/lib/util_modules/fs/lib/async.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chmod = exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.findAndReplace = exports.rename = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteDir = exports.deleteFile = exports.ensureDir = exports.ensureFile = exports.walk = exports.dirList = exports.writeFile = exports.tempFile = exports.readFile = exports.fileExists = exports.dirExists = exports.isPathExists = void 0;
+exports.chmod = exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.findAndReplace = exports.rename = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteDir = exports.deleteFile = exports.ensureDir = exports.ensureFile = exports.walk = exports.dirList = exports.writeFile = exports.tempFile = exports.readFile = exports.isFile = exports.fileExists = exports.dirExists = exports.isPathExists = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const minimatch_1 = __importDefault(require("minimatch"));
 const os_1 = __importDefault(require("os"));
@@ -39,6 +39,13 @@ function fileExists(pth) {
     });
 }
 exports.fileExists = fileExists;
+function isFile(pth) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const stats = yield fs_extra_1.default.stat((0, utils_js_1.untildify)(pth)).catch(() => false);
+        return stats && stats.isFile();
+    });
+}
+exports.isFile = isFile;
 function readFile(pth, type) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!(yield fileExists(pth))) {
@@ -52,11 +59,11 @@ function readFile(pth, type) {
     });
 }
 exports.readFile = readFile;
-function tempFile(name = Date.now().toString()) {
+function tempFile(name = Date.now().toString(), content) {
     return __awaiter(this, void 0, void 0, function* () {
         const tempDir = path_1.default.join(os_1.default.tmpdir(), '.catalyst');
         const tempFilePth = path_1.default.join(tempDir, name);
-        yield ensureFile(tempFilePth);
+        content === undefined ? yield ensureFile(tempFilePth) : yield writeFile(tempFilePth, content);
         return tempFilePth;
     });
 }

package/lib/util_modules/fs/lib/sync.js

@@ -7,8 +7,8 @@ exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.copyDi
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-function getWriteStream(pth) {
-    return fs_extra_1.default.createWriteStream(pth);
+function getWriteStream(pth, mode) {
+    return fs_extra_1.default.createWriteStream(pth, { mode });
 }
 exports.getWriteStream = getWriteStream;
 function getReadStream(pth) {

package/lib/util_modules/js.js

@@ -48,5 +48,9 @@ exports.JS = lodash_1.default.mixin({
             return JSON.parse(str);
         }
         catch (e) { }
+    },
+    camelToTitleCase: (str) => {
+        str = str.replace(/([A-Z])/g, ' $1');
+        return str.charAt(0).toUpperCase() + str.slice(1);
     }
 });

package/lib/util_modules/project.js

@@ -291,9 +291,9 @@ function upsertProject(projectObj, { base = false, active = false }) {
     });
 }
 exports.upsertProject = upsertProject;
-function resolveProjectPath(filePath) {
+function resolveProjectPath(...filePath) {
     let root = runtime_store_1.default.get('project.root', runtime_store_1.default.get('cwd'));
     root = root !== undefined ? root : getProjectRoot();
-    return path_1.default.normalize(path_1.default.resolve(root, filePath));
+    return path_1.default.normalize(path_1.default.resolve(root, ...filePath));
 }
 exports.resolveProjectPath = resolveProjectPath;

package/lib/util_modules/server.js

@@ -42,7 +42,8 @@ class ConnectionDestroyer {
                         return this.server.close(() => resolve());
                     }
                     else {
-                        return this.server.close((err) => err instanceof Error ? reject(err) : resolve());
+                        return (this.server.listening &&
+                            this.server.close((err) => (err instanceof Error ? reject(err) : resolve())));
                     }
                 }
                 resolve();

package/package.json

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

package/scripts/postInstall.js

@@ -10,23 +10,32 @@ try {
 	const cliTable = require('../lib/cli_table');
 	const packageJson = require('../package.json');
 
-	if (semver.satisfies(process.version, packageJson.engines.node)) {
-		console.log(ansi.green.bold('Installation successful.'));
-		process.exit(0);
-	}
-
-	const table = new cliTable({ style: { border: [], header: [] } });
-	table.push(
-		{
-			'Current version: ': [ansi.red(semver.clean(process.version))]
-		},
-		{
-			'Compatible version: ': [ansi.green(packageJson.engines.node)]
+	const promise = new Promise(async (res) => {
+		if (semver.satisfies(process.version, packageJson.engines.node)) {
+			console.log(ansi.green.bold('Installation successful.'));
+			return res(0);
 		}
+
+		const table = new cliTable({ style: { border: [], header: [] } });
+		table.push(
+			{
+				'Current version: ': [ansi.red(semver.clean(process.version))]
+			},
+			{
+				'Compatible version: ': [ansi.green(packageJson.engines.node)]
+			}
+		);
+		console.error(ansi.red('Node.js version is incompatible !!!'));
+		console.error(table.toString());
+		console.error('\n' + ansi.yellow.bold('Please update Node.js to a compatible version.'));
+		console.error(ansi.bold('Reference: ') + ansi.underline('https://nodejs.org/') + '\n');
+		res(1);
+	});
+
+	promise.then(
+		(code) => process.exit(code),
+		() => process.exit(1)
 	);
-	console.error(ansi.red('Node.js version is incompatible !!!'));
-	console.error(table.toString());
-	console.error('\n' + ansi.yellow.bold('Please update Node.js to a compatible version.'));
-	console.error(ansi.bold('Reference: ') + ansi.underline('https://nodejs.org/') + '\n');
-	process.exit(1);
-} catch (err) {}
+} catch (err) {
+	console.error(err);
+}

package/templates/init/functions/java/browserLogic/playwright/sample.java

@@ -19,7 +19,7 @@ public class {{_CLASS_}} implements PlaywrightHandler {
 	public void runner(HttpServletRequest request, HttpServletResponse response,Page page) throws Exception {
 		try {
 			//Fetches the endpoint and method to which the call was made
-			page.navigate("https://www.example.com");
+			page.navigate("https://catalyst.zoho.com");
 			responseData.put("message", "Title of the page "+page.title());
 			
 			//Sends the response back to the Client

package/templates/init/functions/java/browserLogic/selenium/sample.java

@@ -19,7 +19,7 @@ public class {{_CLASS_}} implements SeleniumHandler {
 	public void runner(HttpServletRequest request, HttpServletResponse response,ChromeDriver driver) throws Exception {
 		try {
 			//Fetches the endpoint and method to which the call was made
-			driver.get("https://www.example.com");
+			driver.get("https://catalyst.zoho.com");
 			responseData.put("message", "Title of the page "+driver.getTitle());
 
 			//Sends the response back to the Client

package/templates/init/functions/node/browserlogic/playwright/sample.js

@@ -2,7 +2,7 @@
 // Read the `url` from request, goto the page, extract title and return the results
 
 module.exports.playwright = async (request, response, page) => {
-    await page.goto('https://example.com/');
+    await page.goto('https://catalyst.zoho.com');
     const pageTitle = await page.title();
     response.setHeader('Content-Type', 'application/json');
     response.write(JSON.stringify({ output: pageTitle }));

package/templates/init/functions/node/browserlogic/puppeteer/sample.js

@@ -2,7 +2,7 @@
 // Read the `url` from request, goto the page, extract title and return the results
 
 module.exports.puppeteer = async (request, response, page) => {
-    await page.goto('https://example.com/',{waitUntil: "domcontentloaded"});
+    await page.goto('https://catalyst.zoho.com',{waitUntil: "domcontentloaded"});
     const pageTitle = await page.title();
     response.setHeader('Content-Type', 'application/json');
     response.write(JSON.stringify({ output: pageTitle }));