zcatalyst-cli 1.17.4 → 1.18.0-beta.0

package/docs/command_needs/rc.toml

@@ -1,6 +1,6 @@
 [RC-1]
-context = '''The project(${arg[0]}) provided with the ${arg[1]} option is not available in the Catalyst remote console'''
-aid = '''Please use one of the available projects with the ${arg[1]} option. \nThe available projects are: \n${arg[2]}'''
+context = '''The project(${arg[0]}) provided with the ${arg[1]} option is not available is not available in the ${arg[3]} org.'''
+aid = '''Please use one of the available projects with the ${arg[1]} option or specify the correct org \nThe available projects in the ${arg[3]} org are: \n${arg[2]}'''
 link = 'https://www.zoho.com/catalyst/help/cli-options.html#Project'
 
 [RC-2]

package/docs/commands/functions/shell.toml

@@ -0,0 +1,4 @@
+[FSHELL-1]
+context = '''Tunneling has not yet been configured for your project ${arg[0]}.'''
+aid = '''Please visit this link to get started: ${arg[1]}'''
+link = ''

package/docs/endpoints/lib/env.toml

@@ -0,0 +1,3 @@
+[ENV-1]
+context = '''The ${arg[0]} environment for the project ${arg[1]} has been ${arg[2]}.'''
+aid = '''Please contact catalyst support at ${arg[3]}'''

package/docs/shell/dependencies/tunnel-server.toml

@@ -0,0 +1,4 @@
+[TUNNEL-1]
+context = '''The port ${arg[0]} provided with the option ${arg[1]} is not available for use.'''
+aid = '''Please specify a different port with the ${arg[1]} option to start the tunneling server.'''
+link = ''

package/docs/shell/index.toml

@@ -2,3 +2,10 @@
 context = '''No valid functions to Serve!'''
 aid = '''Please rectify the above errors, if any and try once again.'''
 link = 'https://www.zoho.com/catalyst/help/cli-functions.html#Shell'
+
+[SHELL-IDX-2]
+context = '''Cannot enable Tunneling from ZCatalyst CLI.
+Reason: ${arg[0]}
+Error Code: ${arg[1]}'''
+aid = '''Please rectify the above errors and try once again.'''
+link = 'https://www.zoho.com/catalyst/help/cli-functions.html#Shell'

package/lib/appsail-utils.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAppSail = exports.filterTargets = void 0;
+exports.getDomainPrefix = exports.validateAppSail = exports.filterTargets = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const error_1 = __importDefault(require("./error"));
 const constants_1 = require("./util_modules/constants");
 const logger_1 = require("./util_modules/logger");
 const option_1 = require("./util_modules/option");
+const project_1 = require("./util_modules/project");
 function getAppSailFilters(targetStr) {
     return targetStr.split(',').reduce((filterArr, target) => {
         const opts = target.split(':');
@@ -82,3 +83,8 @@ function validateAppSail(targDetails) {
     return targDetails;
 }
 exports.validateAppSail = validateAppSail;
+function getDomainPrefix(targetDetail) {
+    var _a;
+    return `${(_a = targetDetail.appSail) === null || _a === void 0 ? void 0 : _a.name}-${(0, project_1.getDomainKey)()}.development`;
+}
+exports.getDomainPrefix = getDomainPrefix;

package/lib/command_needs/rc.js

@@ -34,11 +34,6 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
     const projectOpt = globProjectOpt
         ? globProjectOpt
         : (0, env_1.getEnvVariable)('CATALYST_PROJECT', null);
-    if (projectOpt !== null && orgOpt === null) {
-        throw new error_1.default('Org option is needed when project option is supplied', {
-            exit: 2
-        });
-    }
     const orgApi = yield (0, endpoints_1.orgAPI)();
     if (orgOpt !== null) {
         const orgList = yield orgApi.getAllOrgs();
@@ -50,8 +45,8 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         }
         runtime_store_1.default.set('project.env.id', orgOpt + '');
     }
-    let projectApi = orgOpt !== null ? yield (0, endpoints_1.projectAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.projectAPI)();
-    let envApi = orgOpt !== null ? yield (0, endpoints_1.envAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.envAPI)();
+    let projectApi = yield (0, endpoints_1.projectAPI)();
+    let envApi = yield (0, endpoints_1.envAPI)();
     const convertProjectToProperties = (project) => {
         project = (0, project_2.transformProject)(project);
         runtime_store_1.default.set('project.name', project.name);
@@ -81,6 +76,9 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
             const projectArr = (yield projectApi.getAllProjects());
             const project = js_1.JS.find(projectArr, { project_name: projectOpt });
             if (project === undefined) {
+                const allOrgs = yield orgApi.getAllOrgs();
+                const orgId = (0, project_2.getEnvId)();
+                const orgDetails = allOrgs.find((org) => (!orgId && org.is_default) || org.name === orgId || org.id === orgId);
                 throw new error_1.default('invalid project provided with the --project option', {
                     exit: 1,
                     errorId: 'RC-1',
@@ -91,7 +89,9 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
                             .filter((proj) => proj.project_type &&
                             project_1.default.accepted_types.includes(proj.project_type))
                             .map((project) => '* ' + project.project_name)
-                            .join('\n'))
+                            .join('\n')),
+                        `${orgDetails === null || orgDetails === void 0 ? void 0 : orgDetails.name}(${orgDetails === null || orgDetails === void 0 ? void 0 : orgDetails.id})` +
+                            ((orgDetails === null || orgDetails === void 0 ? void 0 : orgDetails.is_default) ? ' [DEFAULT]' : '')
                     ]
                 });
             }

package/lib/commands/functions/shell.js

@@ -35,22 +35,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
+const endpoints_1 = require("../../endpoints");
+const error_1 = __importDefault(require("../../error"));
 const command_1 = __importDefault(require("../../internal/command"));
+const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
+const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
+const project_1 = require("../../util_modules/project");
 exports.default = new command_1.default('functions:shell')
     .description('Launch a node shell to test emulated functions of any stack or type, other than Advanced I/O functions')
     .option('--http [port]', 'enables http mode for the basicIO functions and start server at specified port' +
     `(default: ${constants_1.DEFAULT.serve_port.http.basicio})`)
     .option('--debug [port]', 'the functions are invoked from local environment enabling debugging options on provided port.' +
     `(default: ${constants_1.DEFAULT.serve_port.debug.basicio})`)
+    .option('--tunnel <port>', 'start tunneling functions at the specified port')
+    .option('--enable-tunnel [tunnel-url]', 'enable tunneling for this particular command execution')
     .option('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
     .option('--watch', 'watch for file and directory changes and enable hot reload' +
     '\n' +
     '(deprecated: The watch mode will be enabled by default. To disable watch mode use the --no-watch option)')
     .option('--no-watch', 'disable watching the files for changes')
-    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution])
+    .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,5 +70,93 @@ exports.default = new command_1.default('functions:shell')
     if (debugOpt && typeof debugOpt !== 'boolean') {
         runtime_store_1.default.set('context.port.debug.bio', debugOpt);
     }
+    const tunnelOpt = (0, option_1.getOptionValue)('tunnel', false);
+    if (tunnelOpt && typeof tunnelOpt !== 'boolean') {
+        runtime_store_1.default.set('context.port.tunnel', tunnelOpt);
+    }
+    const enableTunnelOpt = (0, option_1.getOptionValue)('enableTunnel', false);
+    if (!tunnelOpt && enableTunnelOpt) {
+        throw new error_1.default('Invalid Command. Use --enable-tunnel option with the -—tunnel option.', { exit: 1 });
+    }
+    if (enableTunnelOpt) {
+        const _tunnelAPI = yield (0, endpoints_1.tunnelAPI)();
+        const tunnelDetails = yield _tunnelAPI.getTunnel().catch((er) => {
+            const _er = error_1.default.getErrorInstance(er);
+            if (_er.status === 404) {
+                throw new error_1.default('Tunneling not configured', {
+                    exit: 1,
+                    errorId: 'FSHELL-1',
+                    arg: [
+                        (0, ansi_colors_1.bold)(`${(0, project_1.getProjectName)()}(${(0, project_1.getProjectId)()})`),
+                        ansi_colors_1.italic.underline(`${constants_1.ORIGIN.console}/baas/${(0, project_1.getEnvId)()}/project/${(0, project_1.getProjectId)()}/Development#/settings/project/tunneling`)
+                    ]
+                });
+            }
+            throw _er;
+        });
+        if (tunnelDetails.tunnel_status === 'Disabled') {
+            runtime_store_1.default.set('context.fn_shell.enable_tunnel', enableTunnelOpt);
+            (0, logger_1.info)();
+            (0, logger_1.info)((0, ansi_colors_1.yellow)('Tunneling will be disabled at the end of this command execution'));
+            (0, logger_1.info)();
+        }
+        else {
+            (0, logger_1.info)();
+            (0, logger_1.info)(`Tunneling is already enabled for the project ${(0, ansi_colors_1.bold)((0, project_1.getProjectName)())}(${(0, project_1.getProjectId)()}) with the configurations below:`);
+            (0, logger_1.info)();
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Tunneling URL: ') + ansi_colors_1.italic.underline(tunnelDetails.tunnel_url));
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Tunneled functions: '));
+            tunnelDetails.function_details.forEach((fn) => {
+                (0, logger_1.info)('* ' + fn.name);
+            });
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Enabled by: ') + (0, ansi_colors_1.italic)(tunnelDetails.created_by.email_id));
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Enabled on: ') + tunnelDetails.enabled_time);
+            (0, logger_1.info)();
+            if (typeof enableTunnelOpt === 'boolean') {
+                const continueAsIs = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to continue ?', {
+                    type: 'list',
+                    choices: [
+                        prompt_1.default.choice('continue', { value: true, short: 'continue' }),
+                        prompt_1.default.choice('abort', { value: false, short: 'aborted' })
+                    ]
+                }));
+                if (continueAsIs.consent === false) {
+                    return;
+                }
+                (0, logger_1.info)();
+                (0, logger_1.info)('Ignoring `--enable-tunnel` option since tunneling is already enabled');
+                (0, logger_1.info)();
+            }
+            else if (enableTunnelOpt !== tunnelDetails.tunnel_url) {
+                (0, logger_1.info)('Tunneling has already been enabled with a different tunneling URL.');
+                (0, logger_1.info)('Do you wish to update the tunnel request with the tunneling URL entered in the --enable-tunnel option?');
+                (0, logger_1.info)();
+                (0, logger_1.info)((0, ansi_colors_1.red)('- ' + tunnelDetails.tunnel_url));
+                (0, logger_1.info)((0, ansi_colors_1.green)('+ ' + enableTunnelOpt));
+                (0, logger_1.info)();
+                const updateCont = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to update and continue', {
+                    type: 'list',
+                    choices: [
+                        prompt_1.default.choice('continue', { value: true, short: 'continue' }),
+                        prompt_1.default.choice('abort', { value: false, short: 'aborted' })
+                    ]
+                }));
+                if (updateCont.consent === false) {
+                    return;
+                }
+                yield (yield (0, endpoints_1.tunnelAPI)()).disableTunnel();
+                runtime_store_1.default.set('context.fn_shell.enable_tunnel', enableTunnelOpt);
+                (0, logger_1.info)();
+                (0, logger_1.info)((0, ansi_colors_1.yellow)('Tunneling will be disabled at the end of this command execution'));
+                (0, logger_1.info)();
+            }
+            else {
+                (0, logger_1.info)();
+                (0, logger_1.info)('Ignoring `--enable-tunnel` option since a tunnel already exists with the same tunnel url provided: ' +
+                    ansi_colors_1.italic.underline(enableTunnelOpt));
+                (0, logger_1.info)();
+            }
+        }
+    }
     return (yield Promise.resolve().then(() => __importStar(require('../../shell')))).default();
 }));

package/lib/commands/serve.js

@@ -49,7 +49,7 @@ exports.default = new command_1.default('serve')
     .option('--except <targets>', 'serve all targets except specified (e.g. "client")')
     .option('--ignore-scripts', 'ignore the pre and post lifescycle scripts')
     .option('--no-open', 'disable opening the client automatically when served')
-    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution, constants_1.SCOPE.webapp, constants_1.SCOPE.pdf_shot])
+    .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

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

@@ -45,7 +45,7 @@ function getConfigJsonInputs() {
         const stack = yield (0, utils_1.validateOptions)(utils_1.validateStack, 'stack', runtimeDetailsPromise);
         const platform = yield (0, utils_1.validateOptions)(utils_1.validatePlatform, 'platform', stack);
         const optValues = {
-            buildPath: yield (0, utils_1.validateOptions)(utils_1.validateBuildPath, 'buildPath'),
+            build_path: yield (0, utils_1.validateOptions)(utils_1.validateBuildPath, 'buildPath'),
             stack,
             platform,
             command: (0, option_1.getOptionValue)('command', false)
@@ -54,7 +54,7 @@ function getConfigJsonInputs() {
         yield prompt_1.default.register('file-path');
         const appConfigAns = yield prompt_1.default.ask(prompt_1.default.question('buildPath', 'Please provide the build directory of your AppSail service', {
             type: 'file-path',
-            when: () => optValues.buildPath === false,
+            when: () => optValues.build_path === false,
             rootPath: cwd,
             validate: ({ value }) => __awaiter(this, void 0, void 0, function* () {
                 const pathRes = (0, utils_1.validateBuildPath)(value);
@@ -190,7 +190,8 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
                 text: `Preparing AppSail[${targ.name}]`
             });
             const zip = new archiver_1.default();
-            const folderPath = (0, project_1.resolveProjectPath)(targ.buildPath);
+            const buildPath = targ.buildPath ? targ.buildPath : targ.build_path;
+            const folderPath = (0, project_1.resolveProjectPath)(buildPath);
             const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(folderPath, constants_1.FILENAME.catalyst_ignore));
             const folderContents = yield fs_1.ASYNC.walk(folderPath, {
                 filter: {

package/lib/deploy/features/appsail/utils.js

@@ -36,7 +36,7 @@ function validateOptions(validationFn, option, ...args) {
 exports.validateOptions = validateOptions;
 function validateBuildPath(path) {
     return __awaiter(this, void 0, void 0, function* () {
-        const cwd = runtime_store_1.default.get('cwd');
+        const cwd = process.cwd();
         if (path) {
             const buildPath = (0, path_1.isAbsolute)(path) ? path : (0, path_1.resolve)(cwd, path);
             return (yield fs_1.ASYNC.dirExists(buildPath)) ? path : false;

package/lib/endpoints/index.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonAPI = exports.codeDeck = exports.gitHubAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
+exports.tunnelAPI = exports.commonAPI = exports.codeDeck = exports.gitHubAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
 const project_1 = require("../util_modules/project");
 function orgAPI({ auth = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -177,3 +177,10 @@ function commonAPI() {
     });
 }
 exports.commonAPI = commonAPI;
+function tunnelAPI({ auth = true, projectId = (0, project_1.getProjectId)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tunnel = (yield Promise.resolve().then(() => __importStar(require('./lib/tunnel')))).default;
+        return new tunnel(projectId, { authNeeded: auth });
+    });
+}
+exports.tunnelAPI = tunnelAPI;

package/lib/endpoints/lib/env.js

@@ -12,19 +12,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
 const error_1 = __importDefault(require("../../error"));
 const api_1 = __importDefault(require("../../internal/api"));
+const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 class Env {
     constructor(opts, org) {
         this.opts = opts;
         this.opts.envId = org;
     }
-    getEnvs(projectId) {
+    getEnvs(projectId, throwErr = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield new api_1.default(this.opts).get('/baas/v1/project/' + projectId + '/environment');
             if (res.body && res.body.data) {
-                return res.body.data;
+                const data = res.body.data;
+                if (throwErr) {
+                    const devEnv = data.find((env) => env.env_name === constants_1.DEFAULT.env_name);
+                    if ((devEnv === null || devEnv === void 0 ? void 0 : devEnv.env_status) === 'Blocked') {
+                        throw new error_1.default('Environment blocked', {
+                            exit: 1,
+                            errorId: 'ENV-1',
+                            arg: [
+                                (0, ansi_colors_1.bold)(constants_1.DEFAULT.env_name),
+                                (0, ansi_colors_1.bold)(projectId),
+                                ansi_colors_1.bold.red('blocked'),
+                                ansi_colors_1.italic.underline('support@zohocatalyst.com')
+                            ]
+                        });
+                    }
+                }
+                return data;
             }
             (0, logger_1.debug)('get environment response from server : ' + JSON.stringify(res.body));
             throw new error_1.default('Server Error: Unexpected Response from server.', {

package/lib/endpoints/lib/sdk.js

@@ -29,10 +29,10 @@ class SDK {
                 if (service === constants_1.INTEG.services.cliq) {
                     return `/downloads/sdk/java/${constants_1.INTEG.service_map[service]}/${constants_1.INTEG.java_dependencies[service]}_latest.zip`;
                 }
-                return '/downloads/sdk/java/catalyst_java_sdk_latest.zip';
+                return '/downloads/sdk/java/catalyst_java_sdk_beta.zip';
             }
             default: {
-                return '/downloads/sdk/java/catalyst_java_sdk_latest.zip';
+                return '/downloads/sdk/java/catalyst_java_sdk_beta.zip';
             }
         }
     }

package/lib/endpoints/lib/tunnel.js

@@ -0,0 +1,66 @@
+"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 });
+const error_1 = __importDefault(require("../../error"));
+const api_1 = __importDefault(require("../../internal/api"));
+const logger_1 = require("../../util_modules/logger");
+class TunnelAPI {
+    constructor(projectId, opts) {
+        this.projectId = projectId;
+        this.opts = opts;
+    }
+    getTunnel() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/${this.projectId}/tunneling`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('get tunnel response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    enableTunnel(tunnelUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const qs = {};
+            if (tunnelUrl) {
+                qs.tunnel_url = tunnelUrl;
+            }
+            const res = yield new api_1.default(this.opts).patch(`/baas/v1/project/${this.projectId}/tunneling`, {
+                qs
+            });
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('enable tunnel response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    disableTunnel() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).patch(`/baas/v1/project/${this.projectId}/tunneling`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('disable tunnel response from server : ' + 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

@@ -148,7 +148,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const appSail = yield prompt_1.default.ask(prompt_1.default.question('buildPath', 'Please provide the build path of your AppSail service: ', {
         type: 'file-path',
         validate: (pth) => __awaiter(void 0, void 0, void 0, function* () {
-            const buildPath = (0, path_1.resolve)(runtime_store_1.default.get('cwd'), pth.value);
+            const buildPath = (0, path_1.resolve)(process.cwd(), pth.value);
             if ((yield fs_1.ASYNC.dirExists(buildPath)) || (yield fs_1.ASYNC.fileExists(buildPath))) {
                 return true;
             }
@@ -182,7 +182,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const appConfig = {
         command: _appSailConfig.command ||
             'echo Please specify the start-up command in the app-config.json file under the key command',
-        buildPath: _appSailConfig.build || appSail.buildPath,
+        build_path: _appSailConfig.build || appSail.buildPath,
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,

package/lib/internal/api.js

@@ -55,7 +55,10 @@ class API {
             headers
         };
         if (!isExternal) {
-            this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { Accept: 'application/vnd.catalyst.v2+json', 'X-CATALYST-Environment': env, 'CATALYST-ORG': envId });
+            this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { Accept: 'application/vnd.catalyst.v2+json', 'X-CATALYST-Environment': env });
+            if (envId) {
+                this.requestOpts.headers['CATALYST-ORG'] = envId;
+            }
         }
         this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { 'User-Agent': runtime_store_1.default.get('context.cli.package.name') +
                 '/' +
@@ -276,5 +279,10 @@ class API {
             return this.fire('HEAD', path);
         });
     }
+    patch(path, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.fire('PATCH', path, options);
+        });
+    }
 }
 exports.default = API;

package/lib/port-resolver.js

@@ -33,7 +33,7 @@ const featureRef = {
     browserlogic: 'browser_logic'
 };
 class PortResolver {
-    static getFreePort(startPort, searchSpan, dupCheck) {
+    static getFreePort(startPort, searchSpan = 0, dupCheck = false) {
         return __awaiter(this, void 0, void 0, function* () {
             if (searchSpan < 0) {
                 throw new Error('unable to find port. searchSpan has reached the bottom line');

package/lib/repl-server.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const repl_1 = require("repl");
 const util_1 = require("util");
 const error_1 = __importDefault(require("./error"));
+const logger_1 = require("./util_modules/logger");
 const stdin = process.stdin;
 const ASCII_ETX_CODE = 0x03;
 class Repl {
@@ -108,5 +109,13 @@ class Repl {
             });
         });
     }
+    write(str = '') {
+        var _a, _b, _c;
+        if (((_a = this.server) === null || _a === void 0 ? void 0 : _a.getCursorPos().cols) !== this.prompt.length) {
+            (_b = this.server) === null || _b === void 0 ? void 0 : _b.prompt();
+        }
+        (0, logger_1.info)(str);
+        (_c = this.server) === null || _c === void 0 ? void 0 : _c.prompt();
+    }
 }
 exports.default = Repl;

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

@@ -45,7 +45,7 @@ const startAppSail = (port, opts) => {
     }).RAW();
 };
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let child;
     const targetSail = serverDetails.target;
     if (!targetSail || !targetSail.appSail) {
@@ -54,16 +54,17 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
     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);
     }
-    if (!(yield fs_1.ASYNC.isPathExists(targetSail.appSail.buildPath))) {
-        throw new error_1.default(`Build path does not exists [${targetSail.appSail.buildPath}]`, {
+    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(targetSail.appSail.buildPath), (0, ansi_colors_1.bold)(targetSail.appSail.name)]
+            arg: [ansi_colors_1.italic.red(buildPath), (0, ansi_colors_1.bold)(targetSail.appSail.name)]
         });
     }
-    const target = (yield fs_1.ASYNC.fileExists(targetSail.appSail.buildPath))
-        ? (0, path_1.dirname)(targetSail.appSail.buildPath)
-        : targetSail.appSail.buildPath;
+    const target = (yield fs_1.ASYNC.fileExists(buildPath)) ? (0, path_1.dirname)(buildPath) : buildPath;
     switch (true) {
         case targetSail.appSail.stack.startsWith('node'): {
             child = startAppSail(targetSail.port.appsail, {
@@ -139,7 +140,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             }
         });
     });
-    if ((_c = targetSail.appSail.scripts) === null || _c === void 0 ? void 0 : _c.postserve) {
+    if ((_d = targetSail.appSail.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)) {

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

@@ -32,6 +32,7 @@ const project_2 = require("../../../util_modules/project");
 const option_1 = require("../../../util_modules/option");
 const server_js_1 = require("../../../util_modules/server.js");
 const http_proxy_1 = require("http-proxy");
+const appsail_utils_1 = require("../../../appsail-utils");
 const removeSecure = (str) => str.replace(/;\s?Secure/i, '').replace(/;\s?SameSite=None/i, '');
 const redirectByAuth = (req, res, redirectUrl) => {
     if (req.headers['x-zc-user-cred-token'] === undefined) {
@@ -92,21 +93,29 @@ const proxyResponseHandler = (systemRoutes) => (proxyRes, req, res) => {
     }
 };
 function spinUpMaster(listenPort, otherServerDetails) {
-    var _a;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        const projectDetails = {
-            id: (0, project_2.getProjectId)(),
-            domain_prefix: (0, project_2.getDomainPrefix)(),
-            domain: constants_1.ORIGIN.app.replace('https://', ''),
-            key: (0, project_2.getDomainKey)(),
-            env_name: (0, project_2.getEnvName)()
-        };
+        const projectDetails = ((_b = (_a = otherServerDetails.appSail) === null || _a === void 0 ? void 0 : _a.at(0)) === null || _b === void 0 ? void 0 : _b.target) !== undefined
+            ? {
+                id: (0, project_2.getProjectId)(),
+                domain_prefix: (0, appsail_utils_1.getDomainPrefix)((_c = otherServerDetails.appSail.at(0)) === null || _c === void 0 ? void 0 : _c.target),
+                domain: constants_1.ORIGIN.appSailDomain.replace('https://', ''),
+                key: (0, project_2.getDomainKey)(),
+                env_name: (0, project_2.getEnvName)()
+            }
+            : {
+                id: (0, project_2.getProjectId)(),
+                domain_prefix: (0, project_2.getDomainPrefix)(),
+                domain: constants_1.ORIGIN.app.replace('https://', ''),
+                key: (0, project_2.getDomainKey)(),
+                env_name: (0, project_2.getEnvName)()
+            };
         const rules = runtime_store_1.default.get('context.apig.local.config', -1);
         const customProxyUrl = (0, option_1.getOptionValue)('proxy');
         const app = (0, express_1.default)();
         let systemRoutes;
         const nonApigURL = ['/accounts', '/clientoauth', '/_wms', '/wmssrv'];
-        app.use((0, logger_1.default)((_a = otherServerDetails.appSail) === null || _a === void 0 ? void 0 : _a.at(0)));
+        app.use((0, logger_1.default)((_d = otherServerDetails.appSail) === null || _d === void 0 ? void 0 : _d.at(0)));
         app.use(cookie_parser_1.default);
         app.use((0, project_1.default)(projectDetails));
         app.use(authenticator_1.default);

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

@@ -52,6 +52,9 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
                 exit: 2
             }));
         });
+        child.on('exit', (code, signal) => {
+            (0, logger_1.debug)(`Python child exit: ${code}, ${signal}`);
+        });
         resolve(child);
     });
 });