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

package/lib/internal/api.js

@@ -47,15 +47,19 @@ const project_1 = require("../util_modules/project");
 const fs_1 = require("fs");
 const throbber_1 = __importDefault(require("../throbber"));
 class API {
-    constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, showWarning = true, envId = (0, project_1.getEnvId)() } = {}) {
+    constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, showWarning = true, envId = (0, project_1.getEnvId)(), printError = true } = {}) {
         this.requestOpts = {
             url: origin,
             method: 'GET',
             json: true,
             headers
         };
+        const projectSecretKey = process.env.CATALYST_PROJECT_SECRET_KEY;
         if (!isExternal) {
             this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { Accept: 'application/vnd.catalyst.v2+json', 'X-CATALYST-Environment': env });
+            if (projectSecretKey) {
+                this.requestOpts.headers['X-ZC-PROJECT-SECRET-KEY'] = projectSecretKey;
+            }
             if (envId) {
                 this.requestOpts.headers['CATALYST-ORG'] = envId;
             }
@@ -69,6 +73,7 @@ class API {
         this.maxRetryCount = maxRetry;
         this.retryCount = 0;
         this.showWarning = showWarning;
+        this.printError = printError;
     }
     _logReq() {
         let qs = this.requestOpts.qs
@@ -92,17 +97,26 @@ class API {
             '\n');
     }
     _logResp(resp) {
+        const ignoreHeaders = [
+            'content-security-policy-report-only',
+            'set-cookie',
+            'content-security-policy'
+        ];
+        const logHeaders = Object.assign({}, resp.headers);
+        ignoreHeaders.forEach((header) => delete logHeaders[header]);
         (0, logger_1.debug)('<<<< HTTP RESPONSE : ' +
             resp.statusCode +
             '\n' +
             'Response Headers: ' +
-            JSON.stringify(resp.headers) +
+            JSON.stringify(logHeaders) +
             '\n');
         if (!js_1.JS.isUndefined(resp.timings)) {
             (0, logger_1.debug)('TOTAL TIME TAKEN : ' + Number(resp.timings.end.toFixed(3)) + ' ms\n');
             (0, logger_1.debug)('REQUEST PHASES : ' + resp.timingPhases);
         }
-        if (this.logOpts.progress !== undefined) {
+        if (resp.statusCode >= 200 &&
+            resp.statusCode < 300 &&
+            this.logOpts.progress !== undefined) {
             js_1.JS.set(this.logOpts, 'progress.total', resp.headers['content-length']);
             this.downloadProgress = new progress_1.default(this.logOpts.progress);
         }
@@ -142,11 +156,11 @@ class API {
         if (resp.statusCode >= 400 && !this.logOpts.skipRespBody) {
             (0, logger_1.debug)('Response Body : ' + JSON.stringify(resp.body) + '\n');
             if (!this.resolveOnHTTPError) {
-                const errRes = (0, errorResponse_1.default)(resp, body);
+                const errRes = (0, errorResponse_1.default)(resp, body, !this.printError);
                 this._logDownloadProgress({ error: errRes });
                 throw errRes;
             }
-            this._logDownloadProgress({ error: (0, errorResponse_1.default)(resp, body, true) });
+            this._logDownloadProgress({ error: (0, errorResponse_1.default)(resp, body, !this.printError) });
         }
         return {
             status: resp.statusCode,
@@ -177,6 +191,7 @@ class API {
             return new Promise((resolve, reject) => {
                 const responseBuffer = [];
                 let isJSONResponse = false;
+                let isErrorPage = false;
                 const throbber = throbber_1.default.getInstance();
                 if (this.logOpts.uploadProgress !== undefined &&
                     this.logOpts.stream instanceof fs_1.ReadStream) {
@@ -219,6 +234,7 @@ class API {
                 }))
                     .on('response', (resp) => {
                     isJSONResponse = js_1.JS.includes(resp.headers['content-type'], 'json');
+                    isErrorPage = !(resp.statusCode >= 200 && resp.statusCode < 300);
                     this._logResp(resp);
                 })
                     .on('complete', (resp, body) => __awaiter(this, void 0, void 0, function* () {
@@ -233,7 +249,9 @@ class API {
                     if (isJSONResponse) {
                         responseBuffer.push(data);
                     }
-                    this._logDownloadProgress({ chunk: data });
+                    if (!isErrorPage) {
+                        this._logDownloadProgress({ chunk: data });
+                    }
                 });
             });
         });
@@ -241,6 +259,7 @@ class API {
     fire(method, path, options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.resolveOnHTTPError = js_1.JS.get(options, 'resolveOnError', this.resolveOnHTTPError);
+            this.printError = (options === null || options === void 0 ? void 0 : options.printError) || this.printError;
             this.maxRetryCount = js_1.JS.get(options, 'maxRetry', this.maxRetryCount);
             this.authNeeded = js_1.JS.get(options, 'authNeeded', this.authNeeded);
             this.logOpts = js_1.JS.get(options, 'log', this.logOpts);

package/lib/internal/command.js

@@ -46,9 +46,12 @@ const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
 const project_1 = require("../util_modules/project");
+const env_1 = require("../util_modules/env");
 class Command {
     constructor(cmd) {
+        this.subCommand = [];
         this.isSubCommand = false;
+        this.isCICommand = true;
         this.command = cmd;
         this.cmdName = cmd.split(' ')[0];
         this.aliasName = null;
@@ -88,9 +91,15 @@ class Command {
         this.helpText = text;
         return this;
     }
-    addSubCommand(command) {
-        this.subCommand = command;
-        command.isSubCommand = true;
+    addSubCommand(...commands) {
+        commands.forEach((command) => {
+            this.subCommand.push(command);
+            command.isSubCommand = true;
+        });
+        return this;
+    }
+    ci(value) {
+        this.isCICommand = value;
         return this;
     }
     helpConfig(config) {
@@ -110,9 +119,14 @@ class Command {
         return this;
     }
     register(client, cli) {
+        var _a;
         this.client = client;
         const program = cli || client.cli;
-        const cmd = program.command(this.command);
+        let opts = {};
+        if (env_1.isCI && !this.isCICommand) {
+            opts = { hidden: true };
+        }
+        const cmd = program.command(this.command, opts);
         if (this.aliasName !== null) {
             cmd.alias(this.aliasName);
         }
@@ -140,6 +154,13 @@ class Command {
             const runner = this.runner();
             const start = Date.now();
             const argCount = cmd._args.length;
+            if (!this.isCICommand && env_1.isCI) {
+                return (0, errorOut_1.default)(new error_1.default('Environment not supported', {
+                    exit: 1,
+                    errorId: 'CMD-2',
+                    arg: [(0, ansi_colors_1.bold)(cmd.name()), (0, ansi_colors_1.bold)('CI=true catalyst help')]
+                }));
+            }
             if (programArgs.slice(-1)[0].args.length > argCount &&
                 !this.allowUnknownOptions) {
                 return (0, errorOut_1.default)(new error_1.default('Too many arguments', {
@@ -163,7 +184,9 @@ class Command {
             }
         }));
         if (this.subCommand) {
-            this.subCommand.register(client, cmd);
+            (_a = this.subCommand) === null || _a === void 0 ? void 0 : _a.forEach((subCmd) => {
+                subCmd.register(client, cmd);
+            });
         }
         return cmd;
     }
@@ -206,7 +229,8 @@ class Command {
                 (0, logger_1.debug)(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
-                const beforeModule = (yield Promise.resolve().then(() => __importStar(require('../command_needs/' + before.fn)))).default;
+                var _a;
+                const beforeModule = (yield (_a = '../command_needs/' + before.fn, Promise.resolve().then(() => __importStar(require(_a))))).default;
                 return beforeModule.call(this, before.args);
             })));
             return this.cmdAction.call(this, ...args);

package/lib/migration/index.js

@@ -44,6 +44,7 @@ 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();
     }
@@ -54,7 +55,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
         return runMigration(rc, migFiles, ++idx);
     }
     try {
-        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
+        const migModule = yield (_a = migFile, Promise.resolve().then(() => __importStar(require(_a))));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();
@@ -83,6 +84,7 @@ 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;
     }
@@ -96,7 +98,7 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
         return runGlobalMigration(migFiles);
     }
     try {
-        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
+        const migModule = yield (_b = migFile, Promise.resolve().then(() => __importStar(require(_b))));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();

package/lib/optional-import.js

@@ -42,6 +42,7 @@ 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);
@@ -53,7 +54,7 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
             });
         }
         app_module_path_1.default.addPath(projectModulePath);
-        return Promise.resolve().then(() => __importStar(require(projectModulePath)));
+        return _a = projectModulePath, Promise.resolve().then(() => __importStar(require(_a)));
     }
     const projectModulePath = (0, project_js_1.resolveProjectPath)(name);
     const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -65,5 +66,5 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
         });
     }
     app_module_path_1.default.addPath(projectModulePath);
-    return Promise.resolve().then(() => __importStar(require(projectModulePath)));
+    return _b = projectModulePath, Promise.resolve().then(() => __importStar(require(_b)));
 });

package/lib/prompt/types/file-path.js

@@ -36,7 +36,7 @@ class InquirerFilePath extends inquirer_autocomplete_prompt_1.default {
     constructor(question, rl, answers) {
         const { rootPath = '.', exclude = [] } = question;
         const questionBase = Object.assign({
-            emptyText: 'No valid file inside current directory!. Try giving the entire path and press ' +
+            emptyText: 'No valid file path inside current directory!. Try giving the entire path and press ' +
                 (0, ansi_colors_1.cyan)('<return> ') +
                 'key'
         }, question, {

package/lib/prompt/types/tree.js

@@ -26,6 +26,9 @@ 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;
@@ -36,9 +39,6 @@ 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

@@ -27,19 +27,18 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const validated = (0, appsail_utils_1.validateAppSail)(optionTargets);
     const filledTargets = yield Promise.all(validated.map((targ) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
         if (!targ.validity.valid) {
             return targ;
         }
         const proxyPort = yield port_resolver_1.default.getPort('appsail', 'http', {
-            name: ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) + '_proxy',
+            name: targ.name + '_proxy',
             searchSpan: 10,
             server: 'master'
         }).catch((err) => {
             throw new error_1.default('No free ports between 3000 and 3010. AppSail needs the ports within this range to function properly', { original: err });
         });
         const appsailPort = yield port_resolver_1.default.getPort('appsail', 'http', {
-            name: ((_b = targ.appSail) === null || _b === void 0 ? void 0 : _b.name) + '_proxy',
+            name: targ.name + '_proxy',
             server: 'service'
         });
         return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort } });

package/lib/serve/index.js

@@ -108,10 +108,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         if (serveTargets.includes('appsail')) {
             const appSail = runtime_store_1.default.get('context.appsail.targets', []);
             const validAppSail = appSail.filter((sail) => {
-                var _a;
                 if (!sail.validity.valid) {
                     (0, logger_1.warning)('skipping serve of AppSail service [' +
-                        ((_a = sail.appSail) === null || _a === void 0 ? void 0 : _a.name) +
+                        sail.name +
                         '] since ' +
                         sail.validity.reason);
                     return false;

package/lib/serve/server/index.js

@@ -117,7 +117,7 @@ class Server {
             });
     }
     startServer(details, masterPort) {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (details.target === undefined) {
                 return details;
@@ -170,7 +170,7 @@ class Server {
                 if (details.type === 'appsail') {
                     const target = details.target;
                     target.validity.valid = false;
-                    (0, logger_1.labeled)(`AppSail[${(_c = target.appSail) === null || _c === void 0 ? void 0 : _c.name}]`, error).ERROR();
+                    (0, logger_1.labeled)(`AppSail[${target.name}]`, error).ERROR();
                 }
                 else if (details.type === 'client') {
                     const target = details.target;
@@ -252,7 +252,7 @@ class Server {
                 }
                 this.masterServer =
                     masterTargets.length > 0
-                        ? yield (0, master_1.default)(masterPort, masterTargets.targets)
+                        ? yield (0, master_1.default)(masterPort, { otherServerDetails: masterTargets.targets })
                         : undefined;
                 startPromise = new Promise((res) => {
                     this.masterServer
@@ -284,16 +284,16 @@ class Server {
             }
             if (this.targetsMap.appSail.length > 0) {
                 yield Promise.all(this.targetsMap.appSail.map((targSail) => this.startServer(targSail, -1).then((details) => {
-                    var _a, _b, _c, _d, _e, _f;
+                    var _a, _b, _c, _d;
                     const serverDetails = details;
                     if (!((_a = serverDetails.target) === null || _a === void 0 ? void 0 : _a.validity.valid)) {
                         return;
                     }
                     logUrls.appsail.targs.push(targSail);
                     logUrls.appsail.nameMaxLength =
-                        ((_c = (_b = targSail.target) === null || _b === void 0 ? void 0 : _b.appSail) === null || _c === void 0 ? void 0 : _c.name) &&
-                            ((_e = (_d = targSail.target) === null || _d === void 0 ? void 0 : _d.appSail) === null || _e === void 0 ? void 0 : _e.name.length) > logUrls.appsail.nameMaxLength
-                            ? (_f = targSail.target) === null || _f === void 0 ? void 0 : _f.appSail.name.length
+                        ((_b = targSail.target) === null || _b === void 0 ? void 0 : _b.name) &&
+                            ((_c = targSail.target) === null || _c === void 0 ? void 0 : _c.name.length) > logUrls.appsail.nameMaxLength
+                            ? (_d = targSail.target) === null || _d === void 0 ? void 0 : _d.name.length
                             : logUrls.appsail.nameMaxLength;
                 })));
             }
@@ -370,9 +370,8 @@ class Server {
                         (0, logger_1.info)();
                         (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
                         _logTarg.targs.forEach((t) => {
-                            var _a;
                             const targetSail = t.target;
-                            const targName = ((_a = targetSail.appSail) === null || _a === void 0 ? void 0 : _a.name) + '';
+                            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,7 +24,6 @@ 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");
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -41,53 +40,46 @@ const startAppSail = (port, opts) => {
     return (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, 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_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
     }).RAW();
 };
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d;
     let child;
     const targetSail = serverDetails.target;
-    if (!targetSail || !targetSail.appSail) {
+    if (!targetSail || !targetSail.config) {
         throw new error_1.default('AppSail details not found');
     }
-    if ((_a = targetSail.appSail.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
-        executeHook(targetSail.appSail.scripts.preserve, `AppSail [PRESERVE] [${(_b = targetSail.appSail) === null || _b === void 0 ? void 0 : _b.name}]`, targetSail.appSail.source);
-    }
-    const buildPath = targetSail.appSail.buildPath
-        ? targetSail.appSail.buildPath
-        : (_c = targetSail.appSail) === null || _c === void 0 ? void 0 : _c.build_path;
-    if (!(yield fs_1.ASYNC.isPathExists(buildPath))) {
-        throw new error_1.default(`Build path does not exists [${buildPath}]`, {
-            exit: 1,
-            errorId: 'SERVE-APPSAIL-1',
-            arg: [ansi_colors_1.italic.red(buildPath), (0, ansi_colors_1.bold)(targetSail.appSail.name)]
-        });
+    if ((_a = targetSail.config.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
+        executeHook(targetSail.config.scripts.preserve, `AppSail [PRESERVE] [${targetSail.name}]`, targetSail.source);
     }
+    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;
     switch (true) {
-        case targetSail.appSail.stack.startsWith('node'): {
+        case targetSail.config.stack.startsWith('node'): {
             child = startAppSail(targetSail.port.appsail, {
                 type: 'nodejs',
                 target,
-                command: targetSail.appSail.command,
-                memory: targetSail.appSail.memory || 256,
-                env: targetSail.appSail.env_variables
+                command: targetSail.config.command,
+                memory: targetSail.config.memory || 256,
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
-        case targetSail.appSail.stack.startsWith('python'): {
+        case targetSail.config.stack.startsWith('python'): {
             child = startAppSail(targetSail.port.appsail, {
                 type: 'python',
                 target,
-                command: targetSail.appSail.command,
-                memory: targetSail.appSail.memory || 256,
-                env: targetSail.appSail.env_variables
+                command: targetSail.config.command,
+                memory: targetSail.config.memory || 256,
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
-        case targetSail.appSail.stack.startsWith('java'): {
-            if (targetSail.appSail.platform === 'war') {
+        case targetSail.config.stack.startsWith('java'): {
+            if (targetSail.config.platform === 'war') {
                 const jettyPath = (0, path_1.join)(constants_1.ENVPATH.runtimes.data, 'jetty');
                 if (!(yield fs_1.ASYNC.fileExists((0, path_1.join)(jettyPath, 'start.jar')).catch((err) => (0, logger_1.debug)(err)))) {
                     try {
@@ -112,17 +104,19 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     target,
                     type: 'war',
                     command: jettyCommand,
-                    memory: targetSail.appSail.memory || 256,
-                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.appSail.env_variables)
+                    memory: targetSail.config.memory || 256,
+                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
+                    name: targetSail.name
                 });
                 break;
             }
             child = startAppSail(targetSail.port.appsail, {
                 target,
-                command: targetSail.appSail.command,
+                command: targetSail.config.command,
                 type: 'javase',
-                memory: targetSail.appSail.memory || 256,
-                env: targetSail.appSail.env_variables
+                memory: targetSail.config.memory || 256,
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
@@ -131,7 +125,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
         }
     }
     const masterServe = yield (0, master_1.default)(targetSail.port.proxy, {
-        appSail: [serverDetails]
+        appSailDetails: serverDetails
     });
     child.once('exit', () => {
         masterServe.close((err) => {
@@ -140,13 +134,13 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             }
         });
     });
-    if ((_d = targetSail.appSail.scripts) === null || _d === void 0 ? void 0 : _d.postserve) {
+    if ((_d = (_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.scripts) === null || _d === void 0 ? void 0 : _d.postserve) {
         child.once('exit', () => {
-            var _a, _b, _c, _d;
-            if (!((_a = targetSail.appSail) === null || _a === void 0 ? void 0 : _a.scripts)) {
+            var _a, _b, _c;
+            if (!((_a = targetSail.config) === null || _a === void 0 ? void 0 : _a.scripts)) {
                 return;
             }
-            executeHook((_b = targetSail.appSail.scripts) === null || _b === void 0 ? void 0 : _b.postserve, `AppSail [POSTSERVE] [${(_c = targetSail.appSail) === null || _c === void 0 ? void 0 : _c.name}]`, (_d = targetSail.appSail) === null || _d === void 0 ? void 0 : _d.source);
+            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);
         });
     }
     return child;

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

@@ -23,7 +23,7 @@ const logger_1 = require("../../../../util_modules/logger");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const projectRoot = runtime_store_1.default.get('project.root');
     const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
     const targetDir = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
@@ -54,6 +54,6 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     return (0, shell_1.spawn)(spawnCommand, opts, {
         cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep, X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep, X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_f = details.target) === null || _f === void 0 ? void 0 : _f.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();
 });

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

@@ -0,0 +1,53 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAppSailRoutes = void 0;
+const utils_1 = require("./utils");
+function addAppSailRoutes(app, details, proxy, unknownProxy) {
+    var _a, _b;
+    app.use('/__catalyst/sdk/init.js', (req, res) => __awaiter(this, void 0, void 0, function* () {
+        const initJs = yield (0, utils_1.appsailInitJs)();
+        const _write = res.write;
+        res.write = () => {
+            res.setHeader('Content-Length', initJs.length);
+            return _write.call(res, initJs, 'utf-8');
+        };
+        req.url = req.originalUrl;
+        unknownProxy(req, res);
+    }));
+    app.use('/baas/logout', (req, res) => {
+        req.url = req.originalUrl;
+        unknownProxy(req, res);
+    });
+    ((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true &&
+        app.use(['/__catalyst', '/accounts', '/oauthorize'], (req, res) => {
+            if (req.url.includes('/appsail/logout_redirect')) {
+                res.redirect(typeof req.query.service_url === 'string' ? req.query.service_url : '/');
+                return;
+            }
+            req.url = req.originalUrl;
+            unknownProxy(req, res);
+        });
+    app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+        var _c, _d;
+        if (req.header('catalyst-component') === 'true') {
+            ((_d = (_c = details.target) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.catalyst_auth) === true
+                ? unknownProxy(req, res)
+                : res.sendStatus(400);
+            return;
+        }
+        proxy.web(req, res, {
+            target: `http://127.0.0.1:${details.target.port.appsail}`,
+            ws: true
+        });
+    }));
+}
+exports.addAppSailRoutes = addAppSailRoutes;

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addFnRoutes = void 0;
+const constants_1 = require("../../../../util_modules/constants");
+function addFnRoutes(app, details, proxy) {
+    const fnTarget = details.target;
+    app.use(`/server/${fnTarget.name}`, (req, res) => {
+        proxy.web(req, res, {
+            target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
+            ws: true
+        });
+    });
+    app.use(`/baas/v1/project/:projectId/function/${fnTarget.name}`, (req, res) => {
+        proxy.web(req, res, {
+            target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
+            ws: true
+        });
+    });
+    if (fnTarget.id) {
+        app.use(`/server/${fnTarget.id}`, (req, res) => {
+            proxy.web(req, res, {
+                target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.id}/execute` : ''}`,
+                ws: true
+            });
+        });
+        app.use(`/baas/v1/project/:projectId/function/${fnTarget.id}`, (req, res) => {
+            proxy.web(req, res, {
+                target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.id}/execute` : ''}`,
+                ws: true
+            });
+        });
+    }
+}
+exports.addFnRoutes = addFnRoutes;