zcatalyst-cli 1.21.0 → 1.22.1

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

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 __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) {
@@ -20,41 +43,73 @@ const constants_1 = require("../../../../util_modules/constants");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 const error_1 = __importDefault(require("../../../../error"));
-const logger_1 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
+const container_1 = require("../../../../util_modules/container");
+const container_plugin_1 = require("@zcatalyst/container-plugin");
 exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    if (!details.target) {
+        throw new error_1.default('Invalid Python function target', { exit: 2 });
+    }
     const projectRoot = runtime_store_1.default.get('project.root');
     const targetSource = (_a = details.target) === null || _a === void 0 ? void 0 : _a.source;
-    const runtimesDir = constants_1.ENVPATH.runtimes.data;
     const stackVersion = (_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.replace('python_', '');
+    const codeLocation = details.target.build;
+    const debugConfig = details.debugPort !== -1 ? (_d = (_c = details.target) === null || _c === void 0 ? void 0 : _c.additionalInfo) === null || _d === void 0 ? void 0 : _d.debug : undefined;
+    if (!codeLocation) {
+        throw new error_1.default('Invalid code location for python function', {
+            exit: 2,
+            context: details
+        });
+    }
+    if ((0, container_1.isContainer)()) {
+        (0, index_1.debug)('using container to serve the function: ' + ((_e = details.target) === null || _e === void 0 ? void 0 : _e.name));
+        details.target.env_var = Object.assign({ X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_f = details.target) === null || _f === void 0 ? void 0 : _f.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: '/catalyst', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_ADMIN_CRED_TOKEN: 'Unknown', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[(_g = details.target) === null || _g === void 0 ? void 0 : _g.type] }, (_h = details.target) === null || _h === void 0 ? void 0 : _h.env_var);
+        const container = yield Promise.resolve().then(() => __importStar(require('@zcatalyst/container-plugin')));
+        return container.start({
+            details: details,
+            projectId: (0, project_1.getProjectId)(),
+            ruok: details.debugPort !== undefined && details.debugPort !== -1
+                ? container_plugin_1.RUOK.SKIP
+                : container_plugin_1.RUOK.FINITE
+        });
+    }
+    const runtimesDir = constants_1.ENVPATH.runtimes.data;
     const opts = [
-        '-u',
         (0, path_1.join)(runtimesDir, constants_1.RUNTIME.language.python.value, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`, 'main.py')
     ];
+    if (debugConfig) {
+        opts.unshift('-m', debugConfig === null || debugConfig === void 0 ? void 0 : debugConfig.debugger, '--listen', details.debugPort + '');
+    }
+    opts.unshift('-u');
     return new Promise((resolve, reject) => {
         var _a, _b;
         const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
-            cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
+            cwd: codeLocation,
             stdio: 'pipe',
+            detached: true,
             env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_a = details.target) === null || _a === void 0 ? void 0 : _a.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
         }).RAW();
         child.on('spawn', () => __awaiter(void 0, void 0, void 0, function* () {
+            var _c;
             yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());
+            debugConfig &&
+                (0, index_1.info)(`\nPython debugger for function ${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name} listening on port: ${details.debugPort}`);
+            resolve(child);
         }));
         const errData = [];
         (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (chunk) => {
             errData.push(chunk);
         });
         child.on('error', (err) => {
-            (0, logger_1.info)(Buffer.concat(errData).toString());
+            (0, index_1.info)(Buffer.concat(errData).toString());
             reject(new error_1.default(`Error while starting python runtime server`, {
                 original: err,
                 exit: 2
             }));
         });
         child.on('exit', (code, signal) => {
-            (0, logger_1.debug)(`Python child exit: ${code}, ${signal}`);
+            (0, index_1.debug)(`Python child exit: ${code}, ${signal}`);
         });
-        resolve(child);
     });
 });

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

@@ -0,0 +1,6 @@
+import { ChildProcess } from 'child_process';
+import { IServerDetails } from '../..';
+import { TSlateServerDetails } from '../../../features/slate';
+import EventEmitter from 'events';
+declare const _default: (serverDetails: IServerDetails<TSlateServerDetails>) => Promise<ChildProcess | EventEmitter>;
+export default _default;

package/lib/serve/server/lib/slate/static-server.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+export default function slateServer(httpPort: number, source: string, { homepage, enableWatch, notFoundPage }?: {
+    homepage?: string;
+    enableWatch?: boolean;
+    notFoundPage?: string;
+}): Promise<EventEmitter>;

package/lib/serve/server/lib/slate/static-server.js

@@ -15,10 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const events_1 = require("events");
 const chokidar_1 = require("chokidar");
-const logger_js_1 = require("../../../../util_modules/logger.js");
-const index_js_1 = require("../../../../util_modules/constants/index.js");
-const error_js_1 = __importDefault(require("../../../../error.js"));
-const index_js_2 = require("../../../../util_modules/fs/index.js");
+const logger_1 = require("../../../../util_modules/logger");
+const constants_1 = require("../../../../util_modules/constants");
+const error_1 = __importDefault(require("../../../../error"));
+const index_js_1 = require("../../../../util_modules/fs/index.js");
 const path_1 = require("path");
 const ws_1 = require("ws");
 const port_resolver_js_1 = __importDefault(require("../../../../port-resolver.js"));
@@ -26,14 +26,14 @@ const ansi_colors_1 = require("ansi-colors");
 const server_js_1 = require("../../../../util_modules/server.js");
 function prepareScriptFile(dir, port) {
     return __awaiter(this, void 0, void 0, function* () {
-        const scriptFile = yield index_js_2.ASYNC.readFile(index_js_1.TEMPLATE.client.basic.socket);
+        const scriptFile = yield index_js_1.ASYNC.readFile(constants_1.TEMPLATE.client.basic.socket);
         if (!scriptFile) {
-            throw new error_js_1.default('Unable to read the script file', { exit: 2 });
+            throw new error_1.default('Unable to read the script file', { exit: 2 });
         }
-        const scriptReady = scriptFile.replace(new RegExp(index_js_1.PLACEHOLDER.client.port, 'g'), port + '');
-        yield index_js_2.ASYNC.ensureDir(dir);
+        const scriptReady = scriptFile.replace(new RegExp(constants_1.PLACEHOLDER.client.port, 'g'), port + '');
+        yield index_js_1.ASYNC.ensureDir(dir);
         const scriptFilePath = (0, path_1.join)(dir, 'reload-script.js');
-        yield index_js_2.ASYNC.writeFile(scriptFilePath, scriptReady);
+        yield index_js_1.ASYNC.writeFile(scriptFilePath, scriptReady);
         return scriptFilePath;
     });
 }
@@ -56,7 +56,7 @@ function injectScript(scriptLocale, indexHtml) {
     });
 }
 function reloadApp(event, path, liveSockets) {
-    (0, logger_js_1.info)((0, ansi_colors_1.cyan)(`${event} detected in ${path} of the Web-Client.`));
+    (0, logger_1.info)((0, ansi_colors_1.cyan)(`${event} detected in ${path} of the Web-Client.`));
     liveSockets.forEach((socket) => socket.send('reload'));
 }
 function slateServer(httpPort, source, { homepage = '/index.html', enableWatch = true, notFoundPage } = {}) {
@@ -76,7 +76,7 @@ function slateServer(httpPort, source, { homepage = '/index.html', enableWatch =
             let watcherReady = false;
             clientWatcher.on('error', (err) => {
                 watcherReady = false;
-                eventListener.emit('error', new error_js_1.default('slate watcher error', {
+                eventListener.emit('error', new error_1.default('slate watcher error', {
                     original: err,
                     exit: 1,
                     skipHelp: true
@@ -101,7 +101,7 @@ function slateServer(httpPort, source, { homepage = '/index.html', enableWatch =
                     liveSockets.push(clientSocket);
                     clientSocket.send('connected');
                 })
-                    .on('error', (err) => (0, logger_js_1.debug)(err));
+                    .on('error', (err) => (0, logger_1.debug)(err));
                 setTimeout(() => {
                     clientWatcher.on('change', (path) => {
                         reloadApp('Change(s) is', (0, path_1.relative)(source, path), liveSockets);
@@ -120,19 +120,19 @@ function slateServer(httpPort, source, { homepage = '/index.html', enableWatch =
                     clientWatcher.close();
                 }
                 liveSockets.forEach((socket) => socket.close());
-                index_js_2.SYNC.deleteDir(reloadScriptSrc);
+                index_js_1.SYNC.deleteDir(reloadScriptSrc);
             });
         }
         const app = (0, express_1.default)();
         app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
             const requestedFile = req.url === '/' ? homepage : decodeURIComponent(req.path);
             if (enableWatch && (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
-                const htmlFile = yield index_js_2.ASYNC.readFile((0, path_1.join)(source, requestedFile));
+                const htmlFile = yield index_js_1.ASYNC.readFile((0, path_1.join)(source, requestedFile));
                 if (!htmlFile) {
                     res.contentType('text/html');
                     res.status(404);
                     res.end();
-                    eventListener.emit('error', new error_js_1.default('Unable to read the html file', {
+                    eventListener.emit('error', new error_1.default('Unable to read the html file', {
                         exit: 1,
                         errorId: 'SL-SERVER-1',
                         arg: [ansi_colors_1.red.italic(requestedFile)]
@@ -153,24 +153,24 @@ function slateServer(httpPort, source, { homepage = '/index.html', enableWatch =
                 }
                 if (err.code &&
                     err.code === 'ENOENT') {
-                    (0, logger_js_1.error)((0, ansi_colors_1.red)('[404 - Resource not found]: ') + (0, ansi_colors_1.bold)(requestedFile));
-                    (0, logger_js_1.info)();
-                    (0, logger_js_1.debug)(err.stack || err.message);
+                    (0, logger_1.error)((0, ansi_colors_1.red)('[404 - Resource not found]: ') + (0, ansi_colors_1.bold)(requestedFile));
+                    (0, logger_1.info)();
+                    (0, logger_1.debug)(err.stack || err.message);
                     res.status(404);
                     notFoundPage
                         ? res.sendFile(notFoundPage, (e) => {
                             if (!e) {
                                 return;
                             }
-                            (0, logger_js_1.debug)('Unable to send the 404 page to server: ', e);
+                            (0, logger_1.debug)('Unable to send the 404 page to server: ', e);
                             res.status(500);
                             res.send('Error sending 404 page to server: ' + e.stack);
                         })
                         : res.send('Resource not found');
                     return;
                 }
-                (0, logger_js_1.error)('Error fetching the resource: ' + err);
-                (0, logger_js_1.debug)(err.stack);
+                (0, logger_1.error)('Error fetching the resource: ' + err);
+                (0, logger_1.debug)(err.stack);
                 res.status(500);
                 res.send('Error fetching the resource');
             });
@@ -180,13 +180,13 @@ function slateServer(httpPort, source, { homepage = '/index.html', enableWatch =
         });
         const expressDestroyer = new server_js_1.ConnectionDestroyer(server);
         eventListener.on('error', (err) => {
-            (0, logger_js_1.error)('Error when serving the web-client: ' + err.message);
-            (0, logger_js_1.info)('Please exit the command to get more info');
+            (0, logger_1.error)('Error when serving the web-client: ' + err.message);
+            (0, logger_1.info)('Please exit the command to get more info');
             eventListener.emit('close');
         });
         eventListener.on('close', () => __awaiter(this, void 0, void 0, function* () {
             yield expressDestroyer.destroy();
-            (0, logger_js_1.debug)('client server closed');
+            (0, logger_1.debug)('client server closed');
         }));
         return new Promise((res) => server.on('listening', () => res(eventListener)));
     });

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

@@ -0,0 +1,5 @@
+import type { IServerDetails } from '../../index.js';
+import type { IClientTarget } from './types';
+import type { EventEmitter } from 'events';
+declare const _default: (details: IServerDetails<IClientTarget>, masterPort: number) => Promise<EventEmitter>;
+export default _default;

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

@@ -13,31 +13,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const open_1 = __importDefault(require("open"));
-const logger_1 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
 const server_js_1 = __importDefault(require("./server.js"));
 const plugin_loader_1 = __importDefault(require("../../../../plugin-loader"));
 const stream_1 = require("stream");
 const error_1 = __importDefault(require("../../../../error"));
 const ansi_colors_1 = require("ansi-colors");
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const utils_1 = require("../master/utils");
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const target = details.target;
-    const servePlugin = yield (0, plugin_loader_1.default)('client', 'start', target.source).catch((err) => (0, logger_1.debug)(err));
+    const servePlugin = yield (0, plugin_loader_1.default)('client', 'start', target.source).catch((err) => (0, index_1.debug)(err));
     if (typeof servePlugin === 'function') {
         process.env.X_CATALYST_WEBAPP_PATH = target.source;
-        const logStreamPlugin = yield (0, plugin_loader_1.default)('client', 'logs', target.source).catch((err) => (0, logger_1.debug)(err));
+        const logStreamPlugin = yield (0, plugin_loader_1.default)('client', 'logs', target.source).catch((err) => (0, index_1.debug)(err));
         if (typeof logStreamPlugin === 'function') {
             const stream = yield logStreamPlugin();
             if (stream instanceof stream_1.Stream) {
-                const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
+                const streamLogFn = (chunk) => (0, index_1.log)('info', chunk.toString(), true);
                 stream.on('data', streamLogFn);
+                utils_1.serverEvent.on('close', () => {
+                    stream.removeListener('data', streamLogFn);
+                });
             }
         }
         const event = servePlugin(details, masterPort).catch((e) => {
             var _a;
             const err = error_1.default.getErrorInstance(e, {
-                fileName: __filename,
                 skipHelp: false
             });
             err.errorId = 'SERVE-IDX-1';
@@ -48,9 +51,9 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
             ];
             throw err;
         });
-        (0, logger_1.info)();
-        (0, logger_1.labeled)(`Client[${target.name}]`, `Plugin : "${runtime_store_1.default.get(`context.client.plugins.start${target.source ? '.' + target.source : ''}`)}" is used for ${details.type} serve`).MESSAGE();
-        (0, logger_1.info)();
+        (0, index_1.info)();
+        (0, index_1.labeled)(`Client[${target.name}]`, `Plugin : "${runtime_store_1.default.get(`context.client.plugins.start${target.source ? '.' + target.source : ''}`)}" is used for ${details.type} serve`).MESSAGE();
+        (0, index_1.info)();
         return event;
     }
     const clientListener = yield (0, server_js_1.default)(details.httpPort, target.source, {

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

@@ -0,0 +1,7 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+export default function webClientServer(httpPort: number, source: string, { homepage, enableWatch, notFoundPage }?: {
+    homepage?: string;
+    enableWatch?: boolean;
+    notFoundPage?: string;
+}): Promise<EventEmitter>;

package/lib/serve/server/lib/web_client/server.js

@@ -15,10 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const events_1 = require("events");
 const chokidar_1 = require("chokidar");
-const logger_js_1 = require("../../../../util_modules/logger.js");
+const index_1 = require("../../../../util_modules/logger/index");
 const index_js_1 = require("../../../../util_modules/constants/index.js");
-const error_js_1 = __importDefault(require("../../../../error.js"));
-const index_js_2 = require("../../../../util_modules/fs/index.js");
+const index_js_2 = __importDefault(require("../../../../error/index.js"));
+const index_js_3 = require("../../../../util_modules/fs/index.js");
 const path_1 = require("path");
 const ws_1 = require("ws");
 const port_resolver_js_1 = __importDefault(require("../../../../port-resolver.js"));
@@ -26,14 +26,14 @@ const ansi_colors_1 = require("ansi-colors");
 const server_js_1 = require("../../../../util_modules/server.js");
 function prepareScriptFile(dir, port) {
     return __awaiter(this, void 0, void 0, function* () {
-        const scriptFile = yield index_js_2.ASYNC.readFile(index_js_1.TEMPLATE.client.basic.socket);
+        const scriptFile = yield index_js_3.ASYNC.readFile(index_js_1.TEMPLATE.client.basic.socket);
         if (!scriptFile) {
-            throw new error_js_1.default('Unable to read the script file', { exit: 2 });
+            throw new index_js_2.default('Unable to read the script file', { exit: 2 });
         }
         const scriptReady = scriptFile.replace(new RegExp(index_js_1.PLACEHOLDER.client.port, 'g'), port + '');
-        yield index_js_2.ASYNC.ensureDir(dir);
+        yield index_js_3.ASYNC.ensureDir(dir);
         const scriptFilePath = (0, path_1.join)(dir, 'reload-script.js');
-        yield index_js_2.ASYNC.writeFile(scriptFilePath, scriptReady);
+        yield index_js_3.ASYNC.writeFile(scriptFilePath, scriptReady);
         return scriptFilePath;
     });
 }
@@ -56,7 +56,7 @@ function injectScript(scriptLocale, indexHtml) {
     });
 }
 function reloadApp(event, path, liveSockets) {
-    (0, logger_js_1.info)((0, ansi_colors_1.cyan)(`${event} detected in ${path} of the Web-Client.`));
+    (0, index_1.info)((0, ansi_colors_1.cyan)(`${event} detected in ${path} of the Web-Client.`));
     liveSockets.forEach((socket) => socket.send('reload'));
 }
 function webClientServer(httpPort, source, { homepage = 'index.html', enableWatch = true, notFoundPage } = {}) {
@@ -76,7 +76,7 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
             let watcherReady = false;
             clientWatcher.on('error', (err) => {
                 watcherReady = false;
-                eventListener.emit('error', new error_js_1.default('client watcher error', {
+                eventListener.emit('error', new index_js_2.default('client watcher error', {
                     original: err,
                     exit: 1,
                     skipHelp: true
@@ -101,7 +101,7 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
                     liveSockets.push(clientSocket);
                     clientSocket.send('connected');
                 })
-                    .on('error', (err) => (0, logger_js_1.debug)(err));
+                    .on('error', (err) => (0, index_1.debug)(err));
                 setTimeout(() => {
                     clientWatcher.on('change', (path) => {
                         reloadApp('Change(s) is', (0, path_1.relative)(source, path), liveSockets);
@@ -120,19 +120,19 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
                     clientWatcher.close();
                 }
                 liveSockets.forEach((socket) => socket.close());
-                index_js_2.SYNC.deleteDir(catalystTempDir);
+                index_js_3.SYNC.deleteDir(catalystTempDir);
             });
         }
         const app = (0, express_1.default)();
         app.use('/app', (req, res) => __awaiter(this, void 0, void 0, function* () {
             const requestedFile = req.url === '/' ? homepage : decodeURIComponent(req.path);
             if (enableWatch && (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
-                const htmlFile = yield index_js_2.ASYNC.readFile((0, path_1.join)(source, requestedFile));
+                const htmlFile = yield index_js_3.ASYNC.readFile((0, path_1.join)(source, requestedFile));
                 if (!htmlFile) {
                     res.contentType('text/html');
                     res.status(404);
                     res.end();
-                    eventListener.emit('error', new error_js_1.default('Unable to read the html file', {
+                    eventListener.emit('error', new index_js_2.default('Unable to read the html file', {
                         exit: 1,
                         errorId: 'WEB-CLIENT-SERVER-1',
                         arg: [ansi_colors_1.red.italic(requestedFile)]
@@ -153,24 +153,24 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
                 }
                 if (err.code &&
                     err.code === 'ENOENT') {
-                    (0, logger_js_1.error)((0, ansi_colors_1.red)('[404 - Resource not found]: ') + (0, ansi_colors_1.bold)(requestedFile));
-                    (0, logger_js_1.info)();
-                    (0, logger_js_1.debug)(err.stack || err.message);
+                    (0, index_1.error)((0, ansi_colors_1.red)('[404 - Resource not found]: ') + (0, ansi_colors_1.bold)(requestedFile));
+                    (0, index_1.info)();
+                    (0, index_1.debug)(err.stack || err.message);
                     res.status(404);
                     notFoundPage
                         ? res.sendFile(notFoundPage, (e) => {
                             if (!e) {
                                 return;
                             }
-                            (0, logger_js_1.debug)('Unable to send the 404 page to server: ', e);
+                            (0, index_1.debug)('Unable to send the 404 page to server: ', e);
                             res.status(500);
                             res.send('Error sending 404 page to server: ' + e.stack);
                         })
                         : res.send('Resource not found');
                     return;
                 }
-                (0, logger_js_1.error)('Error fetching the resource: ' + err);
-                (0, logger_js_1.debug)(err.stack);
+                (0, index_1.error)('Error fetching the resource: ' + err);
+                (0, index_1.debug)(err.stack);
                 res.status(500);
                 res.send('Error fetching the resource');
             });
@@ -180,13 +180,13 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
         });
         const expressDestroyer = new server_js_1.ConnectionDestroyer(server);
         eventListener.on('error', (err) => {
-            (0, logger_js_1.error)('Error when serving the web-client: ' + err.message);
-            (0, logger_js_1.info)('Please exit the command to get more info');
+            (0, index_1.error)('Error when serving the web-client: ' + err.message);
+            (0, index_1.info)('Please exit the command to get more info');
             eventListener.emit('close');
         });
         eventListener.on('close', () => __awaiter(this, void 0, void 0, function* () {
             yield expressDestroyer.destroy();
-            (0, logger_js_1.debug)('client server closed');
+            (0, index_1.debug)('client server closed');
         }));
         return new Promise((res) => server.on('listening', () => res(eventListener)));
     });

package/lib/serve/server/lib/web_client/types.d.ts

@@ -0,0 +1,15 @@
+export interface IClientTarget {
+    name: string;
+    homepage: string;
+    source: string;
+    login_redirect: string;
+    package_json: string;
+    valid: boolean;
+    plugins?: Record<string, unknown>;
+    notFoundPage: string;
+    local_url?: string;
+    opts?: {
+        open: boolean;
+        watch: boolean;
+    };
+}

package/lib/serve/server/lib/web_client/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/shell/dependencies/http-functions.d.ts

@@ -0,0 +1,35 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import queue from 'better-queue';
+import { ChildProcess } from 'child_process';
+import express from 'express';
+import http from 'http';
+import { IFnTarget } from '../../fn-utils/lib/common';
+import Repl from '../../repl-server';
+import { ConnectionDestroyer } from '../../util_modules/server';
+export declare const checkIfRuntimeServerRunning: (port: string, itr?: number) => Promise<boolean>;
+declare class HttpFunctions {
+    repl: Repl | undefined;
+    app: express.Application;
+    nodeInvoker: {
+        [x: string]: string;
+    };
+    javaInvoker: {
+        [x: string]: string;
+    };
+    requestFile: string;
+    responseFile: string;
+    metaFile: string;
+    runningSlaves: Array<ChildProcess>;
+    q: queue<unknown, unknown>;
+    targets: Array<IFnTarget>;
+    connDestroyer?: ConnectionDestroyer;
+    constructor({ repl, primary }?: {
+        repl?: Repl;
+        primary?: boolean;
+    });
+    _spinUpServer(): Promise<http.Server>;
+    start(): Promise<http.Server>;
+    stop(): Promise<void>;
+}
+export default HttpFunctions;