zcatalyst-cli 1.17.6 → 1.18.0-beta.1

package/lib/endpoints/lib/job-scheduling.js

@@ -0,0 +1,61 @@
+"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 ansi_colors_1 = require("ansi-colors");
+const error_1 = __importDefault(require("../../error"));
+const api_1 = __importDefault(require("../../internal/api"));
+const logger_1 = require("../../util_modules/logger");
+class JobScheduling {
+    constructor(projectId, opts) {
+        this.opts = opts;
+        this.projectId = projectId;
+    }
+    getJobpoolDetails(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/${this.projectId}/job_scheduling/jobpool${id ? '/' + id : ''}`, {
+                resolveOnError: true
+            });
+            if (res.status === 200) {
+                if (res.body && res.body.data) {
+                    return res.body.data;
+                }
+                (0, logger_1.debug)(`get jobpool details response from server for (${id}): ${res.body}`);
+                throw new error_1.default('Server Error: Unexpected Response from server.', {
+                    exit: 2
+                });
+            }
+            if (res.status === 404 && id) {
+                const allJobpools = yield this.getJobpoolDetails();
+                throw new error_1.default(`The provided jobpool identifier (${id}) is invalid`, {
+                    exit: 1,
+                    context: res.body,
+                    status: res.status,
+                    errorId: 'JOB-SCHEDULING-1',
+                    arg: [
+                        (0, ansi_colors_1.bold)(id),
+                        (0, ansi_colors_1.bold)(allJobpools
+                            .map((pool) => `${(0, ansi_colors_1.green)('*')} ${pool.name} [${pool.id}]`)
+                            .join('\n'))
+                    ]
+                });
+            }
+            throw new error_1.default('Error when feting details of the jobpool: ' + id, {
+                exit: 2,
+                context: res.body,
+                status: res.status
+            });
+        });
+    }
+}
+exports.default = JobScheduling;

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/express_middlewares/logger.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 exports.default = (appSailDetails) => (req, _RES, next) => {
-    var _a, _b;
+    var _a;
     console.log('[' +
         new Date().getTime() +
         '] ' +
-        (appSailDetails
-            ? (0, ansi_colors_1.cyan)(` Appsail[${(_b = (_a = appSailDetails === null || appSailDetails === void 0 ? void 0 : appSailDetails.target) === null || _a === void 0 ? void 0 : _a.appSail) === null || _b === void 0 ? void 0 : _b.name}] `)
-            : '') +
+        (appSailDetails ? (0, ansi_colors_1.cyan)(` Appsail[${(_a = appSailDetails === null || appSailDetails === void 0 ? void 0 : appSailDetails.target) === null || _a === void 0 ? void 0 : _a.name}] `) : '') +
         ' "' +
         (0, ansi_colors_1.cyan)(req.method) +
         '" ' +

package/lib/fn-utils/lib/common.js

@@ -32,7 +32,6 @@ 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 fs_2 = require("fs");
 const os_1 = require("os");
 const pip_install_1 = require("../../init/dependencies/python/pip-install");
 function validate() {
@@ -318,7 +317,7 @@ function pack(target) {
                     const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', target.name + Date.now().toString());
                     yield fs_1.ASYNC.ensureDir(tmpDir);
                     yield fs_1.ASYNC.emptyDir(tmpDir);
-                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), true);
+                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), (0, os_1.platform)() === 'linux');
                     const files = yield fs_1.ASYNC.walk(tmpDir);
                     files.forEach((file) => {
                         zip.add(file.path.replace(tmpDir + path_1.sep, ''), file.stats.isSymbolicLink()
@@ -578,7 +577,7 @@ function copyModDirPerm(src, dest, perm, { replace = true } = {}) {
                         return res();
                     }
                     const destFile = (0, path_1.join)(dest, (0, path_1.basename)(content.path));
-                    yield fs_1.ASYNC.copyFile(content.path, destFile, replace ? fs_2.constants.COPYFILE_FICLONE : fs_2.constants.COPYFILE_EXCL).catch((err) => {
+                    yield fs_1.ASYNC.copyFile(content.path, destFile, replace).catch((err) => {
                         if (!replace && err.code === 'EEXIST') {
                             return;
                         }

package/lib/fn-utils/lib/java.js

@@ -287,7 +287,7 @@ function compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outpu
                 '*' + module.exports.classPathSep + '.',
                 '-g',
                 '-Xprefer:source',
-                '-Xlint',
+                userConfig_1.default.get('javac.disable_warnings') === 'true' ? '-Xlint:none' : '-Xlint',
                 file.replace(targetSource, outputFolder)
             ], {
                 cwd: outputFolder,

package/lib/fn-utils/lib/python.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeRequirements = exports.validate = void 0;
 const ansi_colors_1 = require("ansi-colors");
-const os_1 = require("os");
+const os_1 = __importStar(require("os"));
 const path_1 = __importStar(require("path"));
 const error_1 = __importDefault(require("../../error"));
 const ensure_python_1 = require("../../init/dependencies/python/ensure-python");
@@ -111,7 +111,7 @@ function removeRequirements(reqFile, target) {
         const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', Date.now().toString());
         yield fs_1.ASYNC.ensureDir(tmpDir);
         yield fs_1.ASYNC.emptyDir(tmpDir);
-        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''), true);
+        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''), os_1.default.platform() === 'linux');
         const files = yield fs_1.ASYNC.walk(tmpDir, { depth: 1, includeDirPaths: true });
         yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () {
             yield fs_1.ASYNC.deleteFile((0, path_1.join)(target.source, path_1.default.basename(file.path)));

package/lib/fn-watcher.js

@@ -35,7 +35,7 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
             target.valid = true;
             target.compilationError = undefined;
             target.compilationWarning = undefined;
-            yield (0, languages_1.prepareFunctions)([target], latestEvent);
+            yield (0, languages_1.prepareFunctions)([target]);
             if (currentLatestEvent.at === latestEvent.at) {
                 latestEvent = undefined;
             }

package/lib/init/dependencies/python/ensure-python.js

@@ -99,14 +99,12 @@ function validateCommand(version, spawnCommand, skipHelp) {
                     const data = Buffer.concat(dataBuf).toString();
                     return resolve(data);
                 }
-                else {
-                    reject(new error_1.default(`unable to locate python${version} with the given binary path`, {
-                        exit: 1,
-                        errorId: 'PY-1',
-                        arg: [version, (0, ansi_colors_1.bold)(spawnCommand)],
-                        skipHelp
-                    }));
-                }
+                reject(new error_1.default(`unable to locate python${version} with the given binary path`, {
+                    exit: 1,
+                    errorId: 'PY-1',
+                    arg: [version, (0, ansi_colors_1.bold)(spawnCommand)],
+                    skipHelp
+                }));
             });
             child.on('error', (err) => {
                 reject(new error_1.default(`unable to locate python${version} with the given binary path`, {

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

@@ -36,7 +36,7 @@ function getAppSailZip() {
                         api: _gitHubAPI.appsailNodejs.bind(_gitHubAPI),
                         command: 'node index.js',
                         source: (0, project_1.resolveProjectPath)('appsail-nodejs'),
-                        build: (0, project_1.resolveProjectPath)('appsail-nodejs'),
+                        build: './',
                         stack: {
                             runtime: 'node16',
                             lang: 'node'
@@ -54,7 +54,7 @@ function getAppSailZip() {
                         api: _gitHubAPI.appsailJava.bind(_gitHubAPI),
                         command: 'java -jar demo-0.0.1-SNAPSHOT.jar',
                         source: (0, project_1.resolveProjectPath)('appsail-java'),
-                        build: (0, project_1.resolveProjectPath)('appsail-java', 'target', 'demo-0.0.1-SNAPSHOT.jar'),
+                        build: (0, path_1.join)('target', 'demo-0.0.1-SNAPSHOT.jar'),
                         stack: {
                             runtime: 'java8',
                             lang: 'java'
@@ -73,7 +73,7 @@ function getAppSailZip() {
                         api: _gitHubAPI.appsailPython.bind(_gitHubAPI),
                         command: 'python3 app.py',
                         source: (0, project_1.resolveProjectPath)('appsail-python'),
-                        build: (0, project_1.resolveProjectPath)('appsail-python'),
+                        build: './',
                         stack: {
                             runtime: 'python_3_9',
                             lang: 'python'
@@ -148,15 +148,14 @@ 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)(process.cwd(), pth.value);
+            const buildPath = (0, path_1.resolve)(runtime_store_1.default.get('cwd'), pth.value);
             if ((yield fs_1.ASYNC.dirExists(buildPath)) || (yield fs_1.ASYNC.fileExists(buildPath))) {
                 return true;
             }
             return 'Path does not exists';
         }),
-        when: !_appSailConfig.build,
-        rootPath: _appSailConfig.source
-    }), prompt_1.default.question('name', 'Please provide the name for your AppSail service: ', {
+        when: !_appSailConfig.build
+    }), prompt_1.default.question('name', 'Please provide the name for your AppSail: ', {
         type: 'input',
         default: 'AppSail',
         validate: (name) => {
@@ -165,7 +164,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 : true;
             const match = name.match(constants_1.REGEX.functions.package.name)
                 ? true
-                : `Invalid function name. It should be in the following format: ${constants_1.REGEX.functions.package.name}`;
+                : `Invalid AppSail name. It should be in the following format: ${constants_1.REGEX.functions.package.name}`;
             return typeof exists === 'string'
                 ? exists
                 : typeof match === 'string'
@@ -182,7 +181,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',
-        build_path: _appSailConfig.build || appSail.buildPath,
+        build_path: _appSailConfig.build || './' + (0, path_1.relative)(_appSailConfig.source, appSail.buildPath),
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,
@@ -209,5 +208,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
     runtime_store_1.default.set('payload.appsail.targets', [payload]);
-    !isAppConfig && (yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig));
+    if (isAppConfig) {
+        (0, logger_1.message)((0, ansi_colors_1.bold)(`app-config.json`) + ` file already exist in ${(0, ansi_colors_1.underline)(_appSailConfig.source)}`);
+    }
+    else {
+        yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig);
+    }
 });

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

@@ -72,6 +72,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         prompt_1.default.choice('Browser Logic', {
             value: constants_1.FN_TYPE.browserLogic,
             short: 'browser logic'
+        }),
+        prompt_1.default.choice('Job', {
+            value: constants_1.FN_TYPE.job,
+            short: 'job'
         })
     ];
     const integServicesRes = yield integServicesPromise;

package/lib/init/features/functions/languages/python.js

@@ -79,15 +79,31 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     const pyRespJson = fnType === constants_1.FN_TYPE.integration
         ? yield (0, pip_install_1.pypiRes)('zcatalyst-cliq')
         : yield (0, pip_install_1.pypiRes)('zcatalyst-sdk');
+    const latestVersion = (() => {
+        const releases = pyRespJson.releases;
+        const latest = Object.entries(releases).reduce((latest, [version, details]) => {
+            var _a;
+            const whlDetails = details.at(0);
+            if (!(whlDetails === null || whlDetails === void 0 ? void 0 : whlDetails.upload_time)) {
+                return latest;
+            }
+            const uploadTime = new Date(whlDetails.upload_time).getTime();
+            if (!((_a = latest.details) === null || _a === void 0 ? void 0 : _a.upload_time) ||
+                uploadTime > new Date(latest.details.upload_time).getTime()) {
+                latest = {
+                    version,
+                    details: whlDetails
+                };
+            }
+            return latest;
+        }, {});
+        return latest.version;
+    })();
     yield fs_1.ASYNC.findAndReplace(targetPath)([
         constants_1.PLACEHOLDER.functions.python_package.name,
         constants_1.PLACEHOLDER.functions.python_package.main,
         constants_1.PLACEHOLDER.functions.python_package.sdkVersion
-    ], [
-        functionAns.name,
-        functionAns.main,
-        pyRespJson.info.version
-    ]);
+    ], [functionAns.name, functionAns.main, latestVersion]);
     yield fs_1.ASYNC.rename((0, path_1.join)(targetPath, constants_1.FILENAME.functions.python_main), () => functionAns.main);
     const integ_config = runtime_store_1.default.get('context.functions.integration.config', '');
     yield fn_utils_1.fnUtils.common.findAndReplaceConfigProps(targetPath, {

package/lib/internal/api.js

@@ -54,8 +54,12 @@ class API {
             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;
             }
@@ -92,11 +96,18 @@ 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');
@@ -279,5 +290,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/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;
     }

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/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();
                         });