zcatalyst-cli 1.18.0-beta.2 → 1.18.0-beta.3

package/docs/serve/server/lib/appsail/index.toml

@@ -1,4 +1,25 @@
 [SERVE-APPSAIL-1]
-context = '''The provided build path (${arg[0]}) for the AppSail ${arg[1]} does not exists.'''
+context = '''The provided build path ${arg[0]} for the AppSail ${arg[1]} does not exists.'''
 aid = '''Please provide a valid build path'''
 link = ''
+
+[SERVE-APPSAIL-2]
+context = '''The build path resolved from the provided relative path "${arg[0]}" does not exists.
+Source path   : ${arg[1]}
+Build path    : ${arg[2]}
+Resolved Path : ${arg[3]}'''
+aid = '''Please provide a valid relative path as build path'''
+link = ''
+
+[SERVE-APPSAIL-3]
+context = '''Unable to start the ${arg[0]} AppSail server with the below parameters.
+Command    : ${arg[1]}
+Build path : ${arg[2]}
+Runtime    : ${arg[3]}'''
+aid = '''Please fix the errors if any'''
+link = ''
+
+[SERVE-APPSAIL-4]
+context = '''Invalid AppSail Stack/Runtime for AppSail ${arg[0]}: ${arg[1]}'''
+aid = '''Please use a supported Stack/Runtime from the below list: \n${arg[2]}'''
+link = ''

package/lib/commands/event/generate/index.js

@@ -54,7 +54,6 @@ exports.default = new command_1.default('event:generate <source> <action>')
     .needs('auth')
     .action(function generate(source, action) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const unknownArgs = (0, option_1.getUnknownOpts)([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
@@ -176,7 +175,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     break;
             }
         });
-        const sourceModule = (yield (_a = '../../../event_generate/' + source, Promise.resolve().then(() => __importStar(require(_a))))).default;
+        const sourceModule = (yield Promise.resolve().then(() => __importStar(require('../../../event_generate/' + source)))).default;
         eventJsonContent = yield sourceModule(eventJsonContent, optionMap, action);
         const jsonContent = JSON.parse(eventJsonContent);
         Object.keys(jsonContent).forEach((key) => {

package/lib/commands/event/generate/integ.js

@@ -46,7 +46,6 @@ exports.default = new command_1.default('event:generate:integ <service>')
     .needs('rc')
     .needs('auth')
     .action((service) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     const availableServices = Object.keys(constants_1.INTEG.service_map);
     if (!availableServices.includes(service)) {
         throw new error_1.default('Unknown service requested', {
@@ -57,7 +56,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     }
     const inputs = (0, option_1.getOptionValue)('inputs', '');
     const serviceValue = constants_1.INTEG.service_map[service];
-    const serviceModule = (yield (_a = `../../../event_generate/integration/${serviceValue}`, Promise.resolve().then(() => __importStar(require(_a)))))
+    const serviceModule = (yield Promise.resolve().then(() => __importStar(require(`../../../event_generate/integration/${serviceValue}`))))
         .default;
     const payload = yield serviceModule(inputs);
     process.stdout.write(payload + '\n');

package/lib/commands/index.js

@@ -36,8 +36,7 @@ exports.default = (client) => {
     function loadCommand(name) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const cmd = (yield (_a = './' + name.split(':').join('/'), Promise.resolve().then(() => __importStar(require(_a))))).default;
+                const cmd = (yield Promise.resolve().then(() => __importStar(require('./' + name.split(':').join('/'))))).default;
                 try {
                     cmd.register(client);
                     resolve();

package/lib/endpoints/lib/tunnel.js

@@ -62,5 +62,23 @@ class TunnelAPI {
             });
         });
     }
+    tunnelCallback(status, details, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).post(`/baas/v1/project/${this.projectId}/tunneling/callback`, {
+                body: {
+                    status,
+                    content: Object.assign({}, details),
+                    data
+                }
+            });
+            if (res.status >= 200 && res.status <= 299) {
+                return;
+            }
+            (0, logger_1.debug)(`tunnel callback response from server ::: status=${res.status} ::: body=${res.body}`);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
 }
 exports.default = TunnelAPI;

package/lib/init/features/appsail/index.js

@@ -196,7 +196,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,
-        scripts: _appSailConfig.scripts || {}
+        scripts: _appSailConfig.scripts || {},
+        raw: {}
     };
     if (appSailStack.lang === 'java') {
         const platform = yield prompt_1.default.ask(prompt_1.default.question('value', 'Please choose a platform for your AppSail: ', {

package/lib/init/features/client/index.js

@@ -38,7 +38,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("../../../prompt/index.js"));
 const index_js_2 = require("../../../util_modules/constants/index.js");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question('clientFlavour', 'Choose the type of client to initialise: ', {
         type: 'list',
         choices: index_js_2.PLUGIN.client.map((plugin) => {
@@ -48,5 +47,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         })
     }));
-    return (yield (_a = './initializers/' + clientInitAnswer.clientFlavour, Promise.resolve().then(() => __importStar(require(_a))))).default();
+    return (yield Promise.resolve().then(() => __importStar(require('./initializers/' + clientInitAnswer.clientFlavour)))).default();
 });

package/lib/internal/command.js

@@ -229,8 +229,7 @@ class Command {
                 (0, logger_1.debug)(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const beforeModule = (yield (_a = '../command_needs/' + before.fn, Promise.resolve().then(() => __importStar(require(_a))))).default;
+                const beforeModule = (yield Promise.resolve().then(() => __importStar(require('../command_needs/' + before.fn)))).default;
                 return beforeModule.call(this, before.args);
             })));
             return this.cmdAction.call(this, ...args);

package/lib/migration/index.js

@@ -44,7 +44,6 @@ const rc_1 = __importDefault(require("../internal/rc"));
 const fs_1 = require("../util_modules/fs");
 const logger_1 = require("../util_modules/logger");
 const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     if (migFiles.length <= idx) {
         return Promise.resolve();
     }
@@ -55,7 +54,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
         return runMigration(rc, migFiles, ++idx);
     }
     try {
-        const migModule = yield (_a = migFile, Promise.resolve().then(() => __importStar(require(_a))));
+        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();
@@ -84,7 +83,6 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
     return runMigration(rc, migFiles, ++idx);
 });
 const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b;
     if (migFiles.length === 0) {
         return;
     }
@@ -98,7 +96,7 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
         return runGlobalMigration(migFiles);
     }
     try {
-        const migModule = yield (_b = migFile, Promise.resolve().then(() => __importStar(require(_b))));
+        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();

package/lib/optional-import.js

@@ -42,7 +42,6 @@ const async_js_1 = require("./util_modules/fs/lib/async.js");
 const error_js_1 = __importDefault(require("./error.js"));
 const ansi_colors_1 = require("ansi-colors");
 exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
     if (name === (0, path_1.basename)(name)) {
         const projectModulePath = (0, project_js_1.resolveProjectPath)((0, path_1.join)(source, 'node_modules', name));
         const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -54,7 +53,7 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
             });
         }
         app_module_path_1.default.addPath(projectModulePath);
-        return _a = projectModulePath, Promise.resolve().then(() => __importStar(require(_a)));
+        return Promise.resolve().then(() => __importStar(require(projectModulePath)));
     }
     const projectModulePath = (0, project_js_1.resolveProjectPath)(name);
     const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -66,5 +65,5 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
         });
     }
     app_module_path_1.default.addPath(projectModulePath);
-    return _b = projectModulePath, Promise.resolve().then(() => __importStar(require(_b)));
+    return Promise.resolve().then(() => __importStar(require(projectModulePath)));
 });

package/lib/prompt/types/tree.js

@@ -26,9 +26,6 @@ var ETreeState;
     ETreeState[ETreeState["EXPANDED"] = 3] = "EXPANDED";
 })(ETreeState || (ETreeState = {}));
 class TreeNode {
-    get indent() {
-        return this.level * 2;
-    }
     constructor(root) {
         _TreeNode_instances.add(this);
         this.open = false;
@@ -39,6 +36,9 @@ class TreeNode {
         this.level = 1;
         this.root = root;
     }
+    get indent() {
+        return this.level * 2;
+    }
     addNode(node) {
         if (node instanceof TreeNode) {
             this.leaves.push(node);

package/lib/serve/features/appsail.js

@@ -41,7 +41,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             name: targ.name + '_proxy',
             server: 'service'
         });
-        return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort } });
+        return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort }, trigger: { kill: false } });
     })));
     runtime_store_1.default.set('context.appsail.targets', filledTargets);
 });

package/lib/serve/server/index.js

@@ -302,6 +302,11 @@ class Server {
                 var _a;
                 switch (targType) {
                     case 'functions': {
+                        const headersDisplayed = {
+                            bio: false,
+                            aio: false,
+                            blo: false
+                        };
                         Object.entries(logTarg).forEach((x) => {
                             const [_targType, _logTarg] = x;
                             if (_logTarg.targs.length === 0) {
@@ -310,48 +315,66 @@ class Server {
                             loggedEntries++;
                             switch (_targType) {
                                 case 'bio': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const target = t;
-                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.bio === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
+                                            headersDisplayed.bio = true;
+                                        }
                                         bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
                                     break;
                                 }
                                 case 'aio': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const _target = t;
-                                        if (!((_a = _target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = _target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = _target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.aio === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
+                                            headersDisplayed.aio = true;
+                                        }
                                         aioLogUrl(_target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
                                     break;
                                 }
                                 case 'browserlogic': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const target = t;
-                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.blo === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
+                                            headersDisplayed.blo = true;
+                                        }
                                         bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
@@ -367,10 +390,17 @@ class Server {
                             return;
                         }
                         loggedEntries++;
-                        (0, logger_1.info)();
-                        (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                        let isHeaderDisplayed = false;
                         _logTarg.targs.forEach((t) => {
                             const targetSail = t.target;
+                            if (!targetSail.validity.valid) {
+                                return;
+                            }
+                            if (isHeaderDisplayed === false) {
+                                (0, logger_1.info)();
+                                (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                                isHeaderDisplayed = true;
+                            }
                             const targName = targetSail.name + '';
                             (0, logger_1.labeled)(targName +
                                 ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), `http://localhost:${targetSail.port.proxy}`).MESSAGE();

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

@@ -24,6 +24,8 @@ const archiver_1 = __importDefault(require("../../../../archiver"));
 const option_1 = require("../../../../util_modules/option");
 const execute_script_1 = require("../../../../execute-script");
 const master_1 = __importDefault(require("../master"));
+const ansi_colors_1 = require("ansi-colors");
+const common_1 = require("../../../../init/util/common");
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -37,14 +39,18 @@ const startAppSail = (port, opts) => {
     if (opts.command) {
         _opts.push('-c', opts.command);
     }
-    return (0, shell_1.spawn)('node', _opts, {
+    const child = (0, shell_1.spawn)('node', _opts, {
         cwd: opts.target,
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
+        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
     }).RAW();
+    return new Promise((_res, _rej) => {
+        child.on('spawn', () => _res(child));
+        child.on('error', (reason) => _rej(reason));
+    });
 };
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     let child;
     const targetSail = serverDetails.target;
     if (!targetSail || !targetSail.config) {
@@ -55,9 +61,28 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
     }
     const buildPath = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path;
     const target = (yield fs_1.ASYNC.fileExists(buildPath)) ? (0, path_1.dirname)(buildPath) : buildPath;
+    if (!(yield fs_1.ASYNC.isPathExists(target))) {
+        if ((0, path_1.isAbsolute)(((_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.raw.build_path) || '')) {
+            throw new error_1.default('The given AppSail build path does not exists', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-1',
+                arg: [ansi_colors_1.italic.underline.red(target), (0, ansi_colors_1.bold)(targetSail.name)]
+            });
+        }
+        throw new error_1.default('The given AppSail build path does not exists: ' + targetSail.name, {
+            exit: 1,
+            errorId: 'SERVE-APPSAIL-2',
+            arg: [
+                (0, ansi_colors_1.underline)(((_d = targetSail.config) === null || _d === void 0 ? void 0 : _d.raw.build_path) || ''),
+                ansi_colors_1.italic.underline(targetSail.config.raw.source_path || ''),
+                ansi_colors_1.italic.underline(((_e = targetSail.config) === null || _e === void 0 ? void 0 : _e.raw.build_path) || ''),
+                ansi_colors_1.italic.underline(target)
+            ]
+        });
+    }
     switch (true) {
         case targetSail.config.stack.startsWith('node'): {
-            child = startAppSail(targetSail.port.appsail, {
+            child = yield startAppSail(targetSail.port.appsail, {
                 type: 'nodejs',
                 target,
                 command: targetSail.config.command,
@@ -68,7 +93,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             break;
         }
         case targetSail.config.stack.startsWith('python'): {
-            child = startAppSail(targetSail.port.appsail, {
+            child = yield startAppSail(targetSail.port.appsail, {
                 type: 'python',
                 target,
                 command: targetSail.config.command,
@@ -100,7 +125,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     }
                 }
                 const jettyCommand = `java -jar "${(0, path_1.join)(jettyPath, 'start.jar')}" -Djetty.deploy.monitoredPath="${(0, project_1.resolveProjectPath)(target)}" -Djetty.http.port=${targetSail.port.appsail}`;
-                child = startAppSail(targetSail.port.appsail, {
+                child = yield startAppSail(targetSail.port.appsail, {
                     target,
                     type: 'war',
                     command: jettyCommand,
@@ -110,7 +135,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                 });
                 break;
             }
-            child = startAppSail(targetSail.port.appsail, {
+            child = yield startAppSail(targetSail.port.appsail, {
                 target,
                 command: targetSail.config.command,
                 type: 'javase',
@@ -121,7 +146,16 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             break;
         }
         default: {
-            throw new error_1.default('Invalid AppSail stack');
+            const appSailRuntime = yield (0, common_1.getRuntimeDetails)();
+            throw new error_1.default('Invalid AppSail stack', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-4',
+                arg: [
+                    (0, ansi_colors_1.bold)(targetSail.name),
+                    ansi_colors_1.bold.red(targetSail.config.stack),
+                    appSailRuntime.runtimes.map((val) => (0, ansi_colors_1.bold)(`* ${val}`)).join('\n')
+                ]
+            });
         }
     }
     const masterServe = yield (0, master_1.default)(targetSail.port.proxy, {
@@ -134,7 +168,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             }
         });
     });
-    if ((_d = (_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.scripts) === null || _d === void 0 ? void 0 : _d.postserve) {
+    if ((_g = (_f = targetSail.config) === null || _f === void 0 ? void 0 : _f.scripts) === null || _g === void 0 ? void 0 : _g.postserve) {
         child.once('exit', () => {
             var _a, _b, _c;
             if (!((_a = targetSail.config) === null || _a === void 0 ? void 0 : _a.scripts)) {
@@ -143,5 +177,27 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             executeHook((_c = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.scripts) === null || _c === void 0 ? void 0 : _c.postserve, `AppSail [POSTSERVE] [${targetSail.name}]`, targetSail.source);
         });
     }
+    process.on('SIGINT', () => {
+        targetSail.trigger.kill = true;
+    });
+    child.once('exit', (code) => {
+        var _a, _b, _c;
+        if (code === 150) {
+            targetSail.validity = {
+                valid: false,
+                reason: 'Unable to start the AppSail'
+            };
+            throw new error_1.default('Unable to start the AppSail', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-3',
+                arg: [
+                    (0, ansi_colors_1.bold)(targetSail.name),
+                    ((_a = targetSail.config) === null || _a === void 0 ? void 0 : _a.command) || '',
+                    (0, ansi_colors_1.underline)(((_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path) || ''),
+                    ((_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.stack) || ''
+                ]
+            });
+        }
+    });
     return child;
 });

package/lib/serve/server/lib/appsail/start.js

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 /* eslint-disable @typescript-eslint/no-var-requires */
+
+// exit codes
+// 150 - start up command failure
+
 const EXEC_SYNC = require('child_process').execSync;
 
 const WAR = 'war';
@@ -58,7 +62,11 @@ function main() {
 			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
 	}
 
-	EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
+	try {
+		EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
+	} catch (er) {
+		process.exit(150);
+	}
 }
 
 main();

package/lib/serve/server/lib/master/unknown-req-proxy.js

@@ -39,6 +39,9 @@ exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
         proxyInstance.web(req, res, {
             target: `https://${req.headers['x-zc-project-domain']}`,
             changeOrigin: true,
+            cookieDomainRewrite: {
+                [req.headers['x-zc-project-domain'] + '']: 'localhost'
+            },
             ws: true,
             headers
         });

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

@@ -107,12 +107,12 @@ const proxyResponseHandler = ({ systemRoutes, signInRedirect = '/app/local-redir
             }
         }
     }
-    else if (req.url.startsWith('/accounts') && req.url.includes('/signin')) {
-        const set = proxyRes.headers['set-cookie'];
-        set
-            ? set.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/')
-            : ['IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/'];
-        proxyRes.headers['set-cookie'] = set;
+    else if (req.url.startsWith('/accounts')) {
+        const set = proxyRes.headers['set-cookie'] || [];
+        if (req.url.includes('/signin')) {
+            set.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/');
+        }
+        proxyRes.headers['set-cookie'] = set.map(exports.removeSecure);
     }
 };
 exports.proxyResponseHandler = proxyResponseHandler;

package/lib/shell/dependencies/invoker/job/java/JavajobInvoker.java

@@ -217,7 +217,7 @@ public class JavajobInvoker {
 			JSONObject jobMetaDetails = jobDetails.getJSONObject("job_meta_details");
 			JSONObject jobpoolDetails = jobMetaDetails.getJSONObject("jobpool_details");
 			JSONObject projectDetails = jobpoolDetails.getJSONObject("project_details");
-			JSONObject capacity = jobDetails.getJSONObject("capacity");
+			JSONObject capacity = userData.getJSONObject("capacity");
 			JSONObject params = jobMetaDetails.getJSONObject("params");
 
 			defaultJob.setJobDetails(jobDetails != null ? (JSONObject) jobDetails : new JSONObject());

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

@@ -97,7 +97,7 @@ class LocalFunction {
                 return new error_1.default('Invalid input');
             }
             return (() => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                 const projectRoot = runtime_store_1.default.get('project.root');
                 const accessToken = yield credential_1.default.getAccessToken();
                 const slaveOptions = [];
@@ -105,9 +105,9 @@ class LocalFunction {
                 yield fs_1.ASYNC.ensureFile(this.responseFile, true);
                 yield fs_1.ASYNC.ensureFile(this.metaFile, true);
                 if (this.target.type === constants_1.FN_TYPE.job) {
-                    const jobDetails = data;
+                    const jobData = data;
                     const jobMetaDetails = {
-                        headers: Object.assign(Object.assign({}, (_a = jobDetails.job_meta_details) === null || _a === void 0 ? void 0 : _a.headers), {
+                        headers: Object.assign(Object.assign({}, (_b = (_a = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _a === void 0 ? void 0 : _a.job_meta_details) === null || _b === void 0 ? void 0 : _b.headers), {
                             'x-zc-projectid': (0, project_1.getProjectId)(),
                             'x-zc-project-domain': (0, project_1.getDomainPrefix)() + '.' + constants_1.ORIGIN.app.replace('https://', ''),
                             'x-zc-project-key': (0, project_1.getDomainKey)(),
@@ -118,8 +118,8 @@ class LocalFunction {
                             'x-zc-admin-cred-token': accessToken,
                             'x-zc-user-type': 'admin'
                         }),
-                        params: ((_b = jobDetails.job_meta_details) === null || _b === void 0 ? void 0 : _b.params) || {},
-                        jobpool_details: ((_c = jobDetails.job_meta_details) === null || _c === void 0 ? void 0 : _c.jobpool_details) || {
+                        params: ((_d = (_c = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _c === void 0 ? void 0 : _c.job_meta_details) === null || _d === void 0 ? void 0 : _d.params) || {},
+                        jobpool_details: ((_f = (_e = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _e === void 0 ? void 0 : _e.job_meta_details) === null || _f === void 0 ? void 0 : _f.jobpool_details) || {
                             type: 'Function',
                             project_details: {
                                 project_name: (0, project_1.getProjectName)(),
@@ -127,14 +127,14 @@ class LocalFunction {
                             }
                         }
                     };
-                    jobDetails.job_meta_details = jobMetaDetails;
-                    jobDetails.capacity = jobDetails.capacity || {
+                    jobData.job_details = Object.assign(Object.assign({}, jobData.job_details), { job_meta_details: jobMetaDetails });
+                    jobData.capacity = jobData.capacity || {
                         memory: '256'
                     };
-                    data = jobDetails;
+                    data = jobData;
                 }
                 const slaveFnTarget = { index: this.target.index, name: this.target.name };
-                if ((_d = this.target.stack) === null || _d === void 0 ? void 0 : _d.startsWith(runtime_1.default.language.node.value)) {
+                if ((_g = this.target.stack) === null || _g === void 0 ? void 0 : _g.startsWith(runtime_1.default.language.node.value)) {
                     if (debugPort !== null) {
                         slaveOptions.push('--inspect-brk=' + debugPort);
                     }
@@ -158,10 +158,10 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)('node', 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, X_ZOHO_CATALYST_RESOURCE_ID: (_e = this.target) === null || _e === void 0 ? void 0 : _e.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_h = this.target) === null || _h === void 0 ? void 0 : _h.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
-                else if ((_f = this.target.stack) === null || _f === void 0 ? void 0 : _f.startsWith(runtime_1.default.language.java.value)) {
+                else if ((_j = this.target.stack) === null || _j === void 0 ? void 0 : _j.startsWith(runtime_1.default.language.java.value)) {
                     const javaInvokerDir = (0, path_1.parse)(this.javaInvoker).dir;
                     slaveOptions.push('-cp');
                     slaveOptions.push(javaInvokerDir +
@@ -196,11 +196,11 @@ class LocalFunction {
                     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, X_ZOHO_CATALYST_RESOURCE_ID: (_g = this.target) === null || _g === void 0 ? void 0 : _g.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_k = this.target) === null || _k === void 0 ? void 0 : _k.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
-                else if ((_h = this.target.stack) === null || _h === void 0 ? void 0 : _h.startsWith(runtime_1.default.language.python.value)) {
-                    const stackVersion = (_j = this.target.stack) === null || _j === void 0 ? void 0 : _j.replace('python_', '');
+                else if ((_l = this.target.stack) === null || _l === void 0 ? void 0 : _l.startsWith(runtime_1.default.language.python.value)) {
+                    const stackVersion = (_m = this.target.stack) === null || _m === void 0 ? void 0 : _m.replace('python_', '');
                     const runtimesDir = constants_1.ENVPATH.runtimes.data;
                     const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
                     const runTimePort = yield port_resolver_1.default.getFreePort(httpPort, 20, false);
@@ -211,10 +211,10 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), 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, X_ZOHO_CATALYST_RESOURCE_ID: (_k = this.target) === null || _k === void 0 ? void 0 : _k.id, 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(), X_ZOHO_DATA_URL: `http://localhost:${runTimePort}/data`, X_ZOHO_CALLBACK_URL: `http://localhost:${runTimePort}/callback`, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_ADMIN_CRED_TOKEN: 'dummy', X_ZOHO_PROJECT_SECRET_KEY: 'dummy', X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_CATALYST_ENVIRONMENT: 'Local', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[this.target.type] }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_o = this.target) === null || _o === void 0 ? void 0 : _o.id, 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(), X_ZOHO_DATA_URL: `http://localhost:${runTimePort}/data`, X_ZOHO_CALLBACK_URL: `http://localhost:${runTimePort}/callback`, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_ADMIN_CRED_TOKEN: 'dummy', X_ZOHO_PROJECT_SECRET_KEY: 'dummy', X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_CATALYST_ENVIRONMENT: 'Local', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[this.target.type] }, this.target.env_var)
                     }).RAW();
                     this.slave.once('spawn', () => __awaiter(this, void 0, void 0, function* () {
-                        var _o;
+                        var _r;
                         const jsonData = data;
                         jsonData.timestamp = Date.now();
                         const writeResponse = (response, status) => {
@@ -223,15 +223,15 @@ class LocalFunction {
                         };
                         if (this.target.type === constants_1.FN_TYPE.job) {
                             const jobDetailsServer = new http_1.Server((serverReq, serverRes) => __awaiter(this, void 0, void 0, function* () {
-                                var _p, _q, _r;
-                                if ((_p = serverReq.url) === null || _p === void 0 ? void 0 : _p.includes('data')) {
+                                var _s, _t, _u;
+                                if ((_s = serverReq.url) === null || _s === void 0 ? void 0 : _s.includes('data')) {
                                     serverRes.writeHead(200);
                                     serverRes.write(JSON.stringify({
                                         data: jsonData
                                     }));
                                     serverRes.end();
                                 }
-                                else if ((_q = serverReq.url) === null || _q === void 0 ? void 0 : _q.includes('callback')) {
+                                else if ((_t = serverReq.url) === null || _t === void 0 ? void 0 : _t.includes('callback')) {
                                     const reqData = yield new Promise((resolve) => {
                                         const data = [];
                                         serverReq.on('data', (chunk) => data.push(chunk));
@@ -262,7 +262,7 @@ class LocalFunction {
                                 else {
                                     (0, logger_1.debug)(`Invalid request: (${serverReq.method}) ${serverReq.url}`);
                                     writeResponse('INTERNAL_SERVER_ERROR', 500);
-                                    (_r = this.slave) === null || _r === void 0 ? void 0 : _r.kill('SIGINT');
+                                    (_u = this.slave) === null || _u === void 0 ? void 0 : _u.kill('SIGINT');
                                     return;
                                 }
                             }));
@@ -270,7 +270,7 @@ class LocalFunction {
                             jobDetailsServer.listen(runTimePort, () => {
                                 (0, logger_1.debug)('server listening on port :' + runTimePort);
                             });
-                            (_o = this.slave) === null || _o === void 0 ? void 0 : _o.once('exit', () => {
+                            (_r = this.slave) === null || _r === void 0 ? void 0 : _r.once('exit', () => {
                                 jobConnDestroyer.destroy();
                             });
                             return;
@@ -347,11 +347,11 @@ class LocalFunction {
                         exit: 2
                     });
                 }
-                (_l = this.slave.stdout) === null || _l === void 0 ? void 0 : _l.on('data', (message) => {
+                (_p = this.slave.stdout) === null || _p === void 0 ? void 0 : _p.on('data', (message) => {
                     (0, shell_1.clearLine)(process.stdout);
                     (0, logger_1.info)(message.toString());
                 });
-                (_m = this.slave.stderr) === null || _m === void 0 ? void 0 : _m.on('data', (message) => {
+                (_q = this.slave.stderr) === null || _q === void 0 ? void 0 : _q.on('data', (message) => {
                     const errorStr = js_1.JS.trim(message.toString());
                     (0, shell_1.clearLine)(process.stdout);
                     (0, logger_1.info)(errorStr);
@@ -379,6 +379,7 @@ class LocalFunction {
                                 });
                                 break;
                             case constants_1.FN_TYPE.cron:
+                            case constants_1.FN_TYPE.job:
                             case constants_1.FN_TYPE.event:
                                 (0, logger_1.info)(`[status - ${this.target.name}] ${response || 'Unknown'}`);
                                 if (!response) {

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

@@ -33,6 +33,7 @@ const server_1 = require("../../util_modules/server");
 const ansi_colors_1 = require("ansi-colors");
 const util_1 = require("util");
 const project_1 = require("../../util_modules/project");
+const endpoints_1 = require("../../endpoints");
 class TunnelServer {
     constructor(repel) {
         _TunnelServer_contextMap.set(this, {});
@@ -42,6 +43,29 @@ class TunnelServer {
         _TunnelServer_projectId.set(this, (0, project_1.getProjectId)());
         __classPrivateFieldSet(this, _TunnelServer_repel, repel, "f");
     }
+    isAsyncFn(fnType) {
+        switch (fnType) {
+            case 'cron':
+            case 'event':
+            case 'job': {
+                return true;
+            }
+        }
+        return false;
+    }
+    send(req, res, status = 200, data, contentType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const body = req.body;
+            if (this.isAsyncFn(body.function_details.function_type)) {
+                const tunnelAPI = yield (0, endpoints_1.tunnelAPI)();
+                yield tunnelAPI.tunnelCallback(status, body.default, data);
+                return;
+            }
+            contentType && res.contentType(contentType);
+            res.status(status);
+            res.send(data);
+        });
+    }
     startServer() {
         return __awaiter(this, void 0, void 0, function* () {
             const tunnelPortOpt = Number.parseInt(runtime_store_1.default.get('context.port.tunnel'));
@@ -59,23 +83,33 @@ class TunnelServer {
             const app = (0, express_1.default)();
             app.use(express_1.default.json());
             app.all('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+                if (req.method !== 'POST') {
+                    res.status(200);
+                    res.send();
+                    return;
+                }
+                const body = req.body;
+                if (!body.function_details ||
+                    !body.function_data ||
+                    (body.function_details.function_type !== 'integration' && !body.default)) {
+                    res.status(400);
+                    res.send();
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid tunnel request: ' + (0, util_1.inspect)(body));
+                    return;
+                }
+                if (this.isAsyncFn(body.function_details.function_type)) {
+                    res.status(200);
+                    res.send();
+                }
                 try {
-                    const body = req.body;
-                    if (!body.function_details || !body.function_data) {
-                        res.status(400);
-                        res.send();
-                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
-                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid tunnel request: ' + (0, util_1.inspect)(body));
-                        return;
-                    }
                     __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                     __classPrivateFieldGet(this, _TunnelServer_repel, "f").write((0, ansi_colors_1.bold)(`Received tunnel request from ${body.function_details.function_name}(${body.function_details.function_id})`));
                     const target = body.function_details.function_id in __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")
                         ? __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")[body.function_details.function_id]
-                        : (() => {
+                        : yield (() => __awaiter(this, void 0, void 0, function* () {
                             if (__classPrivateFieldGet(this, _TunnelServer_projectId, "f") !== body.function_details.project_id) {
-                                res.status(403);
-                                res.send();
+                                yield this.send(req, res, 403);
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid access: the tunnel is trying to access the functions from a different project');
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
@@ -87,15 +121,14 @@ class TunnelServer {
                             if (namedFn) {
                                 return namedFn;
                             }
-                            res.status(404);
-                            res.send();
+                            yield this.send(req, res, 404);
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write(`The tunneled function ${(0, ansi_colors_1.bold)(body.function_details.function_name)} is not present in local project directory`);
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('[STATUS]');
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('NOT_FOUND');
                             return;
-                        }).bind(this)();
+                        })).bind(this)();
                     if (!target) {
                         return;
                     }
@@ -103,11 +136,10 @@ class TunnelServer {
                         ? JSON.parse(body.function_data)
                         : body.function_data;
                     target.call(false)(fnData);
-                    const errorHandler = (e) => {
-                        res.status(500);
-                        res.send();
+                    const errorHandler = (e) => __awaiter(this, void 0, void 0, function* () {
+                        yield this.send(req, res, 500);
                         (0, logger_1.debug)('Target error: ' + e);
-                    };
+                    });
                     target.once('error', errorHandler);
                     const response = yield new Promise((resolve, reject) => {
                         target.once('response', (response) => {
@@ -118,13 +150,10 @@ class TunnelServer {
                             resolve(response);
                         });
                     });
-                    response.ContentType && res.setHeader('Content-Type', response.ContentType);
-                    res.status(response.status || 200);
-                    res.send(response.responseBody);
+                    yield this.send(req, res, response.status, response.responseBody, response.ContentType);
                 }
                 catch (e) {
-                    res.status(500);
-                    res.send();
+                    yield this.send(req, res, 500);
                     (0, logger_1.debug)(e);
                 }
             }));

package/lib/shell/index.js

@@ -49,35 +49,29 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const httpServer = new http_functions_1.default({ repl: replServer });
     const tunnelServer = new tunnel_server_1.default(replServer);
     const projectRoot = runtime_store_1.default.get('project.root');
-    try {
-        yield (0, prepare_1.default)([
-            constants_1.FN_TYPE.basic,
-            constants_1.FN_TYPE.cron,
-            constants_1.FN_TYPE.event,
-            constants_1.FN_TYPE.integration,
-            constants_1.FN_TYPE.job
-        ]);
-        const targets = runtime_store_1.default
-            .get('context.functions.targets', [])
-            .filter((target) => {
-            if (!target.valid) {
-                (0, logger_js_1.warning)('target [' +
-                    target.name +
-                    '] is not a valid one reason : ' +
-                    target.failure_reason);
-                Array.isArray(target.compilationError) &&
-                    target.compilationError.forEach((er) => (0, logger_js_1.error)(er));
-                Array.isArray(target.compilationWarning) &&
-                    target.compilationWarning.forEach((warn) => (0, logger_js_1.warning)(warn));
-            }
-            return target.valid;
-        });
-        if (targets.length === 0) {
-            throw new error_1.default('No functions are ready for serving', {
-                exit: 0,
-                errorId: 'SHELL-IDX-1'
-            });
+    yield (0, prepare_1.default)([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration, constants_1.FN_TYPE.job]);
+    const targets = runtime_store_1.default
+        .get('context.functions.targets', [])
+        .filter((target) => {
+        if (!target.valid) {
+            (0, logger_js_1.warning)('target [' +
+                target.name +
+                '] is not a valid one reason : ' +
+                target.failure_reason);
+            Array.isArray(target.compilationError) &&
+                target.compilationError.forEach((er) => (0, logger_js_1.error)(er));
+            Array.isArray(target.compilationWarning) &&
+                target.compilationWarning.forEach((warn) => (0, logger_js_1.warning)(warn));
         }
+        return target.valid;
+    });
+    if (targets.length === 0) {
+        throw new error_1.default('No functions are ready for serving', {
+            exit: 0,
+            errorId: 'SHELL-IDX-1'
+        });
+    }
+    try {
         replServer.start();
         yield tunnelServer.startServer();
         const tunnelUrl = runtime_store_1.default.get('context.fn_shell.enable_tunnel', undefined);

package/lib/util_modules/config/lib/appsail.js

@@ -26,6 +26,8 @@ function validateConfig(source, configJson) {
             reason: 'Config file is empty'
         };
     }
+    const sourcePath = (0, path_1.join)((0, project_1.getProjectRoot)(), source);
+    configJson.raw.source_path = sourcePath;
     if (configJson.buildPath || configJson.build_path) {
         const buildPath = configJson.build_path || configJson.buildPath;
         if (!buildPath) {
@@ -34,8 +36,9 @@ function validateConfig(source, configJson) {
                 reason: 'Build Path not present'
             };
         }
-        const absolutePath = (0, path_1.isAbsolute)(buildPath) ? buildPath : (0, path_1.resolve)(source, buildPath);
+        const absolutePath = (0, path_1.isAbsolute)(buildPath) ? buildPath : (0, path_1.resolve)(sourcePath, buildPath);
         configJson.build_path = absolutePath;
+        configJson.raw.build_path = buildPath;
     }
     if (configJson.catalyst_auth === true) {
         if (configJson.login_redirect === undefined) {
@@ -121,6 +124,7 @@ function getAllTargetDetails(throwErr = true) {
             resArr.push(new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const configJson = yield fs_1.ASYNC.readJSONFile(catalystConfigPth);
+                    configJson && (configJson.raw = {});
                     const validity = validateConfig(target.source, configJson);
                     return res(Object.assign({ config: configJson, validity }, target));
                 }

package/package.json

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