zcatalyst-cli 1.25.2 → 1.26.0

package/lib/pull/features/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {

package/lib/repl-server.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { REPLServer } from 'repl';
 declare class Repl {
     prompt: string;

package/lib/repl-server.js

@@ -51,6 +51,10 @@ class Repl {
             });
         }
         if (!this.closed) {
+            const pos = this.server.getCursorPos();
+            if (pos.cols > 0) {
+                this.server.write('\n');
+            }
             this.server.displayPrompt();
         }
     }
@@ -73,9 +77,11 @@ class Repl {
         this.server.close();
     }
     pause() {
+        var _a;
         if (this.paused) {
             return;
         }
+        (_a = this.server) === null || _a === void 0 ? void 0 : _a.setPrompt('');
         this.pureEmit = stdin.emit;
         stdin.emit = (event, ...args) => {
             if (event === 'keypress') {
@@ -90,10 +96,12 @@ class Repl {
         this.paused = true;
     }
     resume() {
+        var _a;
         if (this.paused) {
             stdin.emit = this.pureEmit;
         }
         this.paused = false;
+        (_a = this.server) === null || _a === void 0 ? void 0 : _a.setPrompt(this.prompt);
     }
     wait() {
         return new Promise((res) => {
@@ -114,7 +122,7 @@ class Repl {
         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, index_1.info)(str);
+        (0, index_1.info)('\n' + str);
         (_c = this.server) === null || _c === void 0 ? void 0 : _c.prompt();
     }
 }

package/lib/serve/features/apig.js

@@ -8,13 +8,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 apig_utils_1 = require("../../apig-utils");
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
 const index_1 = require("../../util_modules/logger/index");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const compiledRules = runtime_store_1.default.get('context.apig.local.config');
+    if (compiledRules === null)
+        return;
+    if (typeof compiledRules === 'object') {
+        (0, index_1.debug)('Using cached API Gateway rules');
+        return compiledRules;
+    }
+    if (!config_1.apigConfig.exists()) {
+        (0, index_1.debug)('No API Gateway configuration found. Skipping API Gateway rules');
+        return;
+    }
     if (!config_1.apigConfig.enabled()) {
-        (0, index_1.info)('Skipping API Gateway rules');
+        runtime_store_1.default.set('context.apig.local.config', null);
+        (0, index_1.info)();
+        (0, index_1.info)('Skipping API Gateway rules as API Gateway is disabled in local');
+        (0, index_1.info)();
         return;
     }
     yield apig_utils_1.apigUtils.executeHook({ prefix: 'pre', command: 'serve' });

package/lib/serve/features/appsail.d.ts

@@ -1,5 +1,6 @@
 import { TAppSailDetails } from '../../util_modules/config/lib/appsail';
 export type TAppSailServerDetails = TAppSailDetails & {
+    binPath: string;
     port: {
         appsail: {
             host: number;

package/lib/serve/features/appsail.js

@@ -12,8 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
 const appsail_utils_1 = require("../../appsail-utils");
 const error_1 = __importDefault(require("../../error"));
+const java_1 = require("../../fn-utils/lib/java");
+const node_1 = require("../../fn-utils/lib/node");
+const ensure_python_1 = require("../../init/dependencies/python/ensure-python");
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
@@ -27,8 +31,48 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         return [];
     }
     const validated = yield (0, appsail_utils_1.validateAppSail)(optionTargets);
+    const binPathMap = {};
+    yield Promise.all(validated.map((target) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        try {
+            const stack = (_a = target.config) === null || _a === void 0 ? void 0 : _a.stack;
+            if (!stack) {
+                throw new error_1.default(`Stack is not defined for AppSail target ${target.name}`, {
+                    exit: 2
+                });
+            }
+            if (binPathMap[stack]) {
+                return;
+            }
+            switch (true) {
+                case stack.startsWith('node'): {
+                    binPathMap[stack] = yield (0, node_1.ensureNodeVersion)(stack, true);
+                    break;
+                }
+                case stack.startsWith('java'): {
+                    const javaBinPath = yield (0, java_1.ensureJava)(stack);
+                    if (!javaBinPath) {
+                        throw new error_1.default(`Invalid bin path for ${stack}`, { exit: 1 });
+                    }
+                    binPathMap[stack] = javaBinPath;
+                    break;
+                }
+                case stack.startsWith('python'): {
+                    const stackVersion = stack.replace('python_', '');
+                    const pyExe = yield (0, ensure_python_1.ensurePython)(stackVersion.replace('_', '.'), false, true);
+                    binPathMap[stack] = (0, path_1.dirname)(pyExe);
+                    break;
+                }
+            }
+        }
+        catch (err) {
+            const error = error_1.default.getErrorInstance(err);
+            target.validity.valid = false;
+            target.validity.reason = error.message;
+        }
+    })));
     const filledTargets = yield Promise.all(validated.map((targ) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (!targ.validity.valid) {
             return targ;
         }
@@ -39,19 +83,19 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }).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 AppSailServerDetails = Object.assign(Object.assign({}, targ), { port: {
+        const AppSailServerDetails = Object.assign(Object.assign({}, targ), { binPath: ((_a = targ.config) === null || _a === void 0 ? void 0 : _a.stack) ? binPathMap[targ.config.stack] : '', port: {
                 appsail: {
                     host: -1
                 },
                 proxy: proxyPort,
                 debug: {
                     host: runtime_store_1.default.get(`context.port.debug.appsail.${targ.name}`, -1),
-                    container: (_b = (_a = targ.config) === null || _a === void 0 ? void 0 : _a.port) === null || _b === void 0 ? void 0 : _b.debug
+                    container: (_c = (_b = targ.config) === null || _b === void 0 ? void 0 : _b.port) === null || _c === void 0 ? void 0 : _c.debug
                 }
             } });
         if (targ.runtime === 'catalyst') {
             try {
-                const appsailPort = ((_d = (_c = targ.config) === null || _c === void 0 ? void 0 : _c.port) === null || _d === void 0 ? void 0 : _d.http)
+                const appsailPort = ((_e = (_d = targ.config) === null || _d === void 0 ? void 0 : _d.port) === null || _e === void 0 ? void 0 : _e.http)
                     ? yield port_resolver_1.default.getFreePort(targ.config.port.http)
                     : yield port_resolver_1.default.getPort('appsail', 'http', {
                         name: targ.name + '_proxy',
@@ -61,8 +105,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 AppSailServerDetails.port.appsail.host = appsailPort;
             }
             catch (er) {
-                throw new error_1.default(((_f = (_e = targ.config) === null || _e === void 0 ? void 0 : _e.port) === null || _f === void 0 ? void 0 : _f.http)
-                    ? `The port ${(_h = (_g = targ.config) === null || _g === void 0 ? void 0 : _g.port) === null || _h === void 0 ? void 0 : _h.http} configured for the AppSail ${targ.name} is not available`
+                throw new error_1.default(((_g = (_f = targ.config) === null || _f === void 0 ? void 0 : _f.port) === null || _g === void 0 ? void 0 : _g.http)
+                    ? `The port ${(_j = (_h = targ.config) === null || _h === void 0 ? void 0 : _h.port) === null || _j === void 0 ? void 0 : _j.http} configured for the AppSail ${targ.name} is not available`
                     : 'Unable to find a free port to serve the AppSail: ' + targ.name, {
                     exit: 1,
                     original: er
@@ -77,7 +121,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
                 });
                 AppSailServerDetails.port.appsail.host = hostBindPort;
-                AppSailServerDetails.port.appsail.container = (_k = (_j = targ.config) === null || _j === void 0 ? void 0 : _j.port) === null || _k === void 0 ? void 0 : _k.http;
+                AppSailServerDetails.port.appsail.container = (_l = (_k = targ.config) === null || _k === void 0 ? void 0 : _k.port) === null || _l === void 0 ? void 0 : _l.http;
             }
             catch (er) {
                 throw new error_1.default('Unable to find a host port to bind with the AppSail container for serving the AppSail: ' +

package/lib/serve/features/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {
@@ -35,7 +45,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.slate = exports.appsail = exports.apig = exports.functions = exports.client = void 0;
+exports.client = client;
+exports.functions = functions;
+exports.apig = apig;
+exports.appsail = appsail;
+exports.slate = slate;
 const index_js_1 = __importDefault(require("../../error/index.js"));
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
@@ -62,32 +76,27 @@ function client() {
         runtime_store_1.default.set('context.port.http.client.' + clientName, finalPort);
     });
 }
-exports.client = client;
 function functions() {
     return __awaiter(this, void 0, void 0, function* () {
         const fnModule = yield Promise.resolve().then(() => __importStar(require('../../shell/prepare')));
         return fnModule.default([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.advanced, constants_1.FN_TYPE.browserLogic]);
     });
 }
-exports.functions = functions;
 function apig() {
     return __awaiter(this, void 0, void 0, function* () {
         const apigModule = yield Promise.resolve().then(() => __importStar(require('./apig')));
         yield apigModule.default();
     });
 }
-exports.apig = apig;
 function appsail() {
     return __awaiter(this, void 0, void 0, function* () {
         const appSailModule = yield Promise.resolve().then(() => __importStar(require('./appsail.js')));
         return appSailModule.default();
     });
 }
-exports.appsail = appsail;
 function slate() {
     return __awaiter(this, void 0, void 0, function* () {
         const slateModule = yield Promise.resolve().then(() => __importStar(require('./slate.js')));
         return slateModule.default();
     });
 }
-exports.slate = slate;

package/lib/serve/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {
@@ -168,6 +178,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 serveTargets.splice(serveTargets.indexOf('client'), 1);
             }
         }
+        if (serveTargets.includes('apig')) {
+            yield features.apig();
+        }
         if (serveTargets.length === 0 ||
             (serveTargets.length === 1 && serveTargets[0] === 'apig')) {
             throw new index_js_1.default('No components to serve', { exit: 0, errorId: 'SERVE-1' });

package/lib/serve/server/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 import { EventEmitter } from 'events';
 import { IFnTarget } from '../../fn-utils/lib/common';

package/lib/serve/server/index.js

@@ -30,6 +30,7 @@ const container_1 = require("../../util_modules/container");
 const index_js_6 = __importDefault(require("./lib/slate/index.js"));
 const ansi_colors_1 = require("ansi-colors");
 const env_1 = require("../../util_modules/env");
+const server_1 = require("../../util_modules/server");
 const bioUrl = (details, masterPort, addSpaces) => {
     var _a, _b, _c, _d;
     const labelMap = {
@@ -40,8 +41,7 @@ const bioUrl = (details, masterPort, addSpaces) => {
         ? ((_a = details.target) === null || _a === void 0 ? void 0 : _a.name) + ''
         : `${labelMap[(_b = details.target) === null || _b === void 0 ? void 0 : _b.type]}[${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}]`;
     const printLabel = label + ' '.repeat((addSpaces || label.length) - label.length);
-    const printUrl = 'http://localhost:' +
-        (masterPort === -1 ? details.httpPort : masterPort) +
+    const printUrl = (0, env_1.getLocalAccessDomain)(masterPort === -1 ? details.httpPort : masterPort) +
         new URL(((_d = details.target) === null || _d === void 0 ? void 0 : _d.url) || '').pathname;
     return {
         printUrl,
@@ -55,7 +55,7 @@ const aioUrl = (details, masterPort, addSpaces) => {
     var _a, _b, _c;
     const label = addSpaces ? ((_a = details.target) === null || _a === void 0 ? void 0 : _a.name) + '' : `AdvancedIO[${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}]`;
     const printLabel = label + ' '.repeat((addSpaces || label.length) - label.length);
-    const printUrl = `http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`;
+    const printUrl = `${(0, env_1.getLocalAccessDomain)(masterPort)}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`;
     return {
         printUrl,
         printLabel,
@@ -155,8 +155,8 @@ class Server {
             });
     }
     startServer(details, masterPort) {
-        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f;
             if (details.target === undefined) {
                 return details;
             }
@@ -214,7 +214,7 @@ class Server {
                         : (_b = target.target) === null || _b === void 0 ? void 0 : _b.name;
                 };
                 'stdout' in currentProcess &&
-                    (env_1.isVsCode
+                    (env_1.isExtension
                         ? (_c = currentProcess.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (chunk) => {
                             const logs = Buffer.isBuffer(chunk)
                                 ? chunk.toString().split('\n')
@@ -223,7 +223,7 @@ class Server {
                         })
                         : (_d = currentProcess.stdout) === null || _d === void 0 ? void 0 : _d.pipe(process.stdout));
                 'stderr' in currentProcess &&
-                    (env_1.isVsCode
+                    (env_1.isExtension
                         ? (_e = currentProcess.stderr) === null || _e === void 0 ? void 0 : _e.on('data', (chunk) => {
                             const logs = Buffer.isBuffer(chunk)
                                 ? chunk.toString().split('\n')
@@ -485,7 +485,7 @@ class Server {
                             }
                             const targName = targetSail.name + '';
                             (0, index_1.labeled)(targName +
-                                ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), `http://localhost:${targetSail.port.proxy}`).MESSAGE();
+                                ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), (0, env_1.getLocalAccessDomain)(targetSail.port.proxy)).MESSAGE();
                         });
                         (0, index_1.info)();
                         break;
@@ -497,7 +497,7 @@ class Server {
                         loggedEntries++;
                         (0, index_1.info)();
                         const targApp = logTarg;
-                        const appUrl = `http://localhost:${masterPort}/app/`;
+                        const appUrl = `${(0, env_1.getLocalAccessDomain)(masterPort)}/app/`;
                         const label = `client[${(_a = targApp.target) === null || _a === void 0 ? void 0 : _a.name}]`;
                         (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> Web Client <<<<<<<<<<<<'));
                         (0, index_1.labeled)(label, appUrl).MESSAGE();
@@ -545,10 +545,10 @@ class Server {
                     var _a, _b;
                     const target = targetdetails.target;
                     (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => __awaiter(this, void 0, void 0, function* () {
-                        var _c;
+                        var _a;
                         targetdetails.restarting = true;
                         (0, container_1.isContainer)()
-                            ? (_c = targetdetails.process) === null || _c === void 0 ? void 0 : _c.emit('preparing', targetdetails)
+                            ? (_a = targetdetails.process) === null || _a === void 0 ? void 0 : _a.emit('preparing', targetdetails)
                             : yield this.kill(targetdetails);
                     }));
                     (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => __awaiter(this, void 0, void 0, function* () {
@@ -603,8 +603,8 @@ class Server {
         });
     }
     kill(target) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const serverProcess = target.process;
             if (!serverProcess) {
                 throw new error_1.default('Unable to kill. Process empty: ' + ((_a = target.target) === null || _a === void 0 ? void 0 : _a.name), {
@@ -628,7 +628,21 @@ class Server {
                         const signal = serverProcess.spawnfile.includes('python')
                             ? 'SIGTERM'
                             : 'SIGINT';
-                        serverProcess.kill(signal);
+                        switch (target.type) {
+                            case 'functions':
+                            case 'server': {
+                                serverProcess.pid
+                                    ? (0, server_1.killProcessTree)(serverProcess.pid, signal)
+                                    : serverProcess.kill(signal);
+                                break;
+                            }
+                            case 'appsail':
+                            case 'slate':
+                            case 'client': {
+                                serverProcess.kill(signal);
+                                break;
+                            }
+                        }
                         serverProcess.once('close', resolve);
                     }
                     else {