zcatalyst-cli 1.15.0-beta.5 → 1.15.0-beta.7

package/lib/internal/api.js

@@ -44,6 +44,8 @@ const constants_1 = require("../util_modules/constants");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
 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)() } = {}) {
         this.requestOpts = {
@@ -63,7 +65,6 @@ class API {
         this.logOpts = log;
         this.maxRetryCount = maxRetry;
         this.retryCount = 0;
-        this.progress = null;
         this.showWarning = showWarning;
     }
     _logReq() {
@@ -100,12 +101,21 @@ class API {
         }
         if (this.logOpts.progress !== undefined) {
             js_1.JS.set(this.logOpts, 'progress.total', resp.headers['content-length']);
-            this.progress = new progress_1.default(this.logOpts.progress);
+            this.downloadProgress = new progress_1.default(this.logOpts.progress);
         }
     }
-    _logProgress({ chunk, error } = {}) {
-        if (this.progress !== null) {
-            !chunk || error ? this.progress.error(error) : this.progress.tick(chunk.length);
+    _logUploadProgress({ chunk, error } = {}) {
+        if (this.uploadProgress) {
+            !chunk || error
+                ? this.uploadProgress.error(error)
+                : this.uploadProgress.tick(chunk.length);
+        }
+    }
+    _logDownloadProgress({ chunk, error } = {}) {
+        if (this.downloadProgress) {
+            !chunk || error
+                ? this.downloadProgress.error(error)
+                : this.downloadProgress.tick(chunk.length);
         }
     }
     _addAuthHeader() {
@@ -130,10 +140,10 @@ class API {
             (0, logger_1.debug)('Response Body : ' + JSON.stringify(resp.body) + '\n');
             if (!this.resolveOnHTTPError) {
                 const errRes = (0, errorResponse_1.default)(resp, body);
-                this._logProgress({ error: errRes });
+                this._logDownloadProgress({ error: errRes });
                 throw errRes;
             }
-            this._logProgress({ error: (0, errorResponse_1.default)(resp, body, true) });
+            this._logDownloadProgress({ error: (0, errorResponse_1.default)(resp, body, true) });
         }
         return {
             status: resp.statusCode,
@@ -164,7 +174,22 @@ class API {
             return new Promise((resolve, reject) => {
                 const responseBuffer = [];
                 let isJSONResponse = false;
+                const throbber = throbber_1.default.getInstance();
+                if (this.logOpts.uploadProgress !== undefined &&
+                    this.logOpts.stream instanceof fs_1.ReadStream) {
+                    const _stream = this.logOpts.stream;
+                    this.uploadProgress = new progress_1.default(this.logOpts.uploadProgress);
+                    _stream.on('data', (chunk) => {
+                        this._logUploadProgress({ chunk });
+                    });
+                }
+                if (this.logOpts.awaitingSpinner) {
+                    this.logOpts.stream
+                        ? this.logOpts.stream.on('end', () => throbber.add('response_await', { text: this.logOpts.awaitingSpinner }))
+                        : throbber.add('response_await', { text: this.logOpts.awaitingSpinner });
+                }
                 (0, request_1.default)(this.requestOpts, (err) => __awaiter(this, void 0, void 0, function* () {
+                    this.logOpts.awaitingSpinner && throbber.remove('response_await');
                     if (err) {
                         switch (err.code) {
                             case 'ETIMEDOUT':
@@ -205,7 +230,7 @@ class API {
                     if (isJSONResponse) {
                         responseBuffer.push(data);
                     }
-                    this._logProgress({ chunk: data });
+                    this._logDownloadProgress({ chunk: data });
                 });
             });
         });

package/lib/option-filter.js

@@ -141,7 +141,7 @@ function validateTargets() {
     return [];
 }
 function validatePorts() {
-    const customHttpPort = enrichOptsData('debug', (0, option_1.getOptionValue)('debug'), portTargets);
+    const customHttpPort = (0, option_1.getOptionValue)('http', undefined);
     const enrichedDebugOpts = enrichOptsData('debug', (0, option_1.getOptionValue)('debug'), portTargets);
     if (enrichedDebugOpts.some((opt) => {
         const noFilter = !opt.hasFilter;
@@ -185,11 +185,11 @@ function filterPorts() {
                 ]
             });
         }
-        else if (res.target.target === constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]) {
-            runtime_store_1.default.set(`context.port.debug.${res.target}`, res.filter);
+        else if (res.target.target === constants_1.REMOTE_REF.functions.type.bio) {
+            runtime_store_1.default.set(`context.port.debug.${constants_1.REMOTE_REF.functions.type.bio}`, res.filter);
         }
         else {
-            runtime_store_1.default.set(`context.port.debug.${res.target}.${res.filter}`, res.specific);
+            runtime_store_1.default.set(`context.port.debug.${res.target.target}.${res.filter}`, res.specific);
         }
     });
 }

package/lib/port-resolver.js

@@ -8,9 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a, _PortResolver_takenPorts, _PortResolver_isPortTaken;
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const portfinder_1 = require("portfinder");
@@ -19,9 +25,6 @@ const runtime_store_1 = __importDefault(require("./runtime-store"));
 const constants_1 = require("./util_modules/constants");
 const logger_1 = require("./util_modules/logger");
 class PortResolver {
-    static isPortTaken(port) {
-        return PortResolver.takenPorts.includes(port);
-    }
     static getFreePort(startPort, searchSpan, dupCheck) {
         return __awaiter(this, void 0, void 0, function* () {
             if (searchSpan < 0) {
@@ -31,20 +34,19 @@ class PortResolver {
                 port: startPort,
                 stopPort: startPort + searchSpan
             });
-            if (PortResolver.isPortTaken(port)) {
+            if (__classPrivateFieldGet(PortResolver, _a, "m", _PortResolver_isPortTaken).call(PortResolver, port)) {
                 if (dupCheck) {
                     return PortResolver.getFreePort(port + 1, searchSpan - (port - startPort), dupCheck);
                 }
                 return port;
             }
-            PortResolver.takenPorts.push(port);
+            __classPrivateFieldGet(PortResolver, _a, "f", _PortResolver_takenPorts).add(port);
             return port;
         });
     }
-    static getPort(feature, type, name = '', duplicateCheck = true, pythonBio = false, searchSpan = 20, fallbackNeeded = true) {
+    static getPort(feature, type, { name = '', duplicateCheck = true, searchSpan = 20, fallbackNeeded = true, server } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             let port = parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}.${name}`), 10);
-            feature = pythonBio ? 'advancedio' : feature;
             port = isNaN(port) ? parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}`), 10) : port;
             if (isNaN(port)) {
                 if (type === 'debug' && feature === 'client') {
@@ -53,7 +55,15 @@ class PortResolver {
                 if (!fallbackNeeded) {
                     return -1;
                 }
-                port = constants_1.DEFAULT.serve_port[type][feature];
+                if (feature === 'appsail') {
+                    if (!server || type !== 'http') {
+                        throw new error_1.default('Invalid appsail details', { exit: 2 });
+                    }
+                    port = constants_1.DEFAULT.serve_port['http']['appsail'][server];
+                }
+                else {
+                    port = constants_1.DEFAULT.serve_port[type][feature];
+                }
             }
             else {
                 searchSpan = 0;
@@ -65,7 +75,7 @@ class PortResolver {
             }
             let finalPort = port;
             try {
-                finalPort = yield PortResolver.getFreePort(port, searchSpan, duplicateCheck || pythonBio);
+                finalPort = yield PortResolver.getFreePort(port, searchSpan, duplicateCheck);
             }
             catch (e) {
                 if (searchSpan === 0) {
@@ -86,7 +96,7 @@ class PortResolver {
                 }
                 const cerr = error_1.default.getErrorInstance(e, {
                     message: `No ports from '${port}' to ${port + searchSpan} is free to use as a ${type} port.`,
-                    skipHelp: false,
+                    skipHelp: server ? true : false,
                     fileName: __filename
                 });
                 cerr.errorId = 'PORT-RESOLVER-2';
@@ -101,4 +111,7 @@ class PortResolver {
     }
 }
 exports.default = PortResolver;
-PortResolver.takenPorts = [];
+_a = PortResolver, _PortResolver_isPortTaken = function _PortResolver_isPortTaken(port) {
+    return __classPrivateFieldGet(PortResolver, _a, "f", _PortResolver_takenPorts).has(port);
+};
+_PortResolver_takenPorts = { value: new Set() };

package/lib/progress.js

@@ -7,7 +7,7 @@ const ansi_colors_1 = require("ansi-colors");
 const pretty_ms_1 = __importDefault(require("pretty-ms"));
 const throbber_1 = __importDefault(require("./throbber"));
 class Progress {
-    constructor({ title = '', fillChar = '·', bgChar = ' ', startingChar = '[', endingChar = ']', total = 10, failure } = {}) {
+    constructor({ title = '', fillChar = '·', bgChar = ' ', startingChar = '[', endingChar = ']', total = 10, failure, progressType = 'download' } = {}) {
         this.title = title;
         this.fillChar = fillChar;
         this.bgChar = bgChar;
@@ -19,6 +19,7 @@ class Progress {
         this.currentProgress = 0;
         this.currentProgressFrame = '';
         this.failure = failure;
+        this.progressType = progressType;
     }
     get MAX_SCREEN_LENGTH() {
         return 35;
@@ -57,7 +58,7 @@ class Progress {
             if (this.throbber.hasActiveSpinners()) {
                 const [totalSec] = process.hrtime(this.startTime);
                 this.throbber.succeed(this.title, {
-                    text: `${this.title} downloaded in ${totalSec} seconds`
+                    text: `${this.title} ${this.progressType}ed in ${totalSec} seconds`
                 });
             }
             return;

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

@@ -23,7 +23,9 @@ function getPaths(rootPath, pattern, exclude, defaultItem) {
             filter: { exclude, excludeDir: false },
             includeDirPaths: true
         });
-        const filteredNodes = fuzzy_1.default.filter(pattern || '', nodeList).map((e) => e.string);
+        const filteredNodes = fuzzy_1.default
+            .filter(pattern || '', nodeList, { extract: (node) => node.path })
+            .map((e) => e.string);
         if (!pattern && defaultItem) {
             filteredNodes.unshift(defaultItem);
         }

package/lib/serve/features/appsail.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const appsail_utils_1 = require("../../appsail-utils");
+const error_1 = __importDefault(require("../../error"));
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
@@ -26,12 +27,22 @@ 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;
+        var _a, _b;
         if (!targ.validity.valid) {
             return targ;
         }
-        const port = yield port_resolver_1.default.getPort('appsail', 'http', (_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name);
-        return Object.assign(Object.assign({}, targ), { port });
+        const proxyPort = yield port_resolver_1.default.getPort('appsail', 'http', {
+            name: ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.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',
+            server: 'service'
+        });
+        return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort } });
     })));
     runtime_store_1.default.set('context.appsail.targets', filledTargets);
 });

package/lib/serve/features/index.js

@@ -55,7 +55,7 @@ function client() {
             return;
         }
         const clientName = runtime_store_1.default.get('context.client.name');
-        const finalPort = yield port_resolver_1.default.getPort('client', 'http', clientName);
+        const finalPort = yield port_resolver_1.default.getPort('client', 'http', { name: clientName });
         runtime_store_1.default.set('context.port.http.client.' + clientName, finalPort);
     });
 }

package/lib/serve/index.js

@@ -59,7 +59,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const buildFolder = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build);
     if (yield fs_1.ASYNC.isPathExists(buildFolder)) {
         try {
-            (0, logger_1.debug)('Build folder already exists, staring cleanup');
+            (0, logger_1.debug)('Build folder already exists, starting cleanup');
             yield fs_1.ASYNC.chmod((0, path_1.join)(buildFolder, constants_1.FOLDERNAME.functions), '755', {
                 recursive: true
             });
@@ -75,7 +75,11 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
     try {
-        const masterPort = yield port_resolver_1.default.getPort('master', 'http', 'master', false);
+        const masterPort = yield port_resolver_1.default.getPort('master', 'http', {
+            name: 'master',
+            duplicateCheck: false,
+            searchSpan: 10
+        });
         runtime_store_1.default.set('context.port.http.master', masterPort);
         yield Promise.all(serveTargets.map((target) => features[target]()));
         const rawTargets = runtime_store_1.default.get('context.functions.targets', []);
@@ -165,6 +169,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 checkPath: false,
                 recursive: true
             }).catch((err) => (0, logger_1.debug)('Error modifying the permissions: ', err)));
+        (0, logger_1.info)('Shutting down server');
         yield Promise.all([
             fs_1.ASYNC.deleteDir(buildFolder).catch(),
             advancedServer ? advancedServer.stop() : undefined,