zcatalyst-cli 1.13.3 → 1.14.0

package/lib/serve/server/index.js

@@ -50,16 +50,27 @@ const path_1 = require("path");
 const error_1 = __importDefault(require("../../error"));
 const fn_utils_1 = require("../../fn-utils");
 const plugin_loader_1 = __importDefault(require("../../plugin-loader"));
+const userConfig_1 = __importDefault(require("../../userConfig"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
-const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const shell_1 = require("../../util_modules/shell");
 const master_1 = __importDefault(require("./lib/master"));
 const ansi_colors_1 = require("ansi-colors");
 const stream_1 = require("stream");
+const project_1 = require("../../util_modules/project");
+const http_functions_1 = require("../../shell/dependencies/http-functions");
+const cli_table_1 = require("../../cli_table");
+const bioLogUrl = (name, pthName, httpPort, masterPort) => {
+    (0, logger_1.labeled)(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
+};
+const aioLogUrl = (details, masterPort) => {
+    var _a, _b;
+    (0, logger_1.labeled)(`${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`, `URL : http://localhost:${masterPort}/server/${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}/`).MESSAGE();
+    (0, logger_1.info)();
+};
 class Server {
     constructor() {
         this.targetDetailsArr = [];
@@ -73,7 +84,12 @@ class Server {
         const debugPort = parseInt(runtime_store_1.default.get('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], '-1'), 10);
         if (!isNaN(httpPort)) {
             fnTargets
-                .filter((t) => t.url !== undefined && t.type === constants_1.FN_TYPE.basic)
+                .filter((t) => {
+                var _a;
+                return t.url !== undefined &&
+                    t.type === constants_1.FN_TYPE.basic &&
+                    !((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python));
+            })
                 .map((t) => js_1.JS.omit(t, ['zip_stream', 'localFn']))
                 .forEach((t) => {
                 this.targetDetailsArr.push({
@@ -86,16 +102,12 @@ class Server {
         }
     }
     _spinUpJavaServer(details, masterPort) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const javaServer = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'aioserver', 'JavaaioServer');
-            const targetDir = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
+            const projectRoot = runtime_store_1.default.get('project.root');
+            const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
+            const targetDir = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
             const label = `${details.type}[${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}]`;
-            fn_utils_1.fnUtils.java.ensureJavaInvoker(javaServer, (0, path_1.normalize)((0, path_1.join)(__dirname, './lib', 'java', 'JavaaioServer.java')));
-            const serverFiles = yield fs_1.ASYNC.walk((0, path_1.dirname)(javaServer));
-            yield Promise.all(serverFiles.map((file) => __awaiter(this, void 0, void 0, function* () {
-                return fs_1.ASYNC.copyFile(file, (0, path_1.join)(targetDir, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.replace('lib' + path_1.sep, ''))));
-            })));
             const opts = [
                 '-cp',
                 (0, path_1.join)(targetDir, '*') + fn_utils_1.fnUtils.java.classPathSep + targetDir + path_1.sep,
@@ -117,28 +129,24 @@ class Server {
                 return event;
             }
             const child = (0, shell_1.spawn)('java', opts, {
-                cwd: targetSource,
+                cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
                 stdio: 'pipe',
-                env: {
-                    X_ZOHO_CATALYST_IS_LOCAL: 'true',
-                    X_ZOHO_CATALYST_FUNCTION_LOADED: 'true',
-                    X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep,
-                    X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth,
-                    X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin
-                }
+                env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep, X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
             }).RAW();
-            (0, logger_1.labeled)(label, `URL : http://localhost:${masterPort}/server/${(_d = details.target) === null || _d === void 0 ? void 0 : _d.name}/`).MESSAGE();
-            (0, logger_1.info)();
             return child;
         });
     }
     _spinUpProcess(details, masterPort) {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
-            const _d = details.target, { ['watcher']: _ } = _d, serialisableTarget = __rest(_d, ['watcher']);
+            const _c = details.target, { ['watcher']: _ } = _c, serialisableTarget = __rest(_c, ['watcher']);
+            const projectRoot = runtime_store_1.default.get('project.root');
+            serialisableTarget.index = serialisableTarget.index
+                ? serialisableTarget.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
+                : undefined;
             const opts = [
-                (0, path_1.join)(__dirname, 'lib', 'node.js'),
+                (0, path_1.join)(__dirname, 'lib', 'node.mjs'),
                 details.httpPort + '',
                 JSON.stringify(serialisableTarget)
             ];
@@ -150,6 +158,9 @@ class Server {
             const configType = details.type === 'server' ? 'functions' : details.type;
             const servePlugin = yield (0, plugin_loader_1.default)(configType, 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
             if (typeof servePlugin === 'function') {
+                if (configType === 'client') {
+                    process.env.X_CATALYST_WEBAPP_PATH = targetSource;
+                }
                 const logStreamPlugin = yield (0, plugin_loader_1.default)(configType, 'logs', targetSource).catch((err) => (0, logger_1.debug)(err));
                 if (typeof logStreamPlugin === 'function') {
                     const stream = yield logStreamPlugin();
@@ -179,20 +190,34 @@ class Server {
                 return yield (yield Promise.resolve().then(() => __importStar(require('./lib/web_client/index.js')))).default(details, masterPort);
             }
             const child = (0, shell_1.spawn)('node', opts, {
-                cwd: targetSource,
+                cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
                 stdio: 'pipe',
-                env: {
-                    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
-                }
+                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, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
             }).RAW();
-            (0, logger_1.labeled)(label, `URL : http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`).MESSAGE();
-            (0, logger_1.info)();
             return child;
         });
     }
+    _spinUpPythonServer(details) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const projectRoot = runtime_store_1.default.get('project.root');
+            const opts = ['-u', 'main.py'];
+            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_', '');
+            return new Promise((res) => {
+                const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
+                    cwd: (0, path_1.join)(runtimesDir, runtime_1.default.language.python, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`),
+                    stdio: 'pipe',
+                    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_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_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+                }).RAW();
+                child.on('spawn', () => __awaiter(this, void 0, void 0, function* () {
+                    yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());
+                }));
+                res(child);
+            });
+        });
+    }
     add(type, target) {
         const httpPort = runtime_store_1.default.get(`context.port.http.${type === 'server' ? 'functions' : type}.${target.name}`, -1);
         const debugPort = runtime_store_1.default.get(`context.port.debug.${type === 'server' ? 'functions' : type}.${target.name}`, -1);
@@ -207,7 +232,7 @@ class Server {
         });
     }
     startServer(details, masterPort) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (details.target === undefined) {
                 return;
@@ -216,17 +241,24 @@ class Server {
             if ((_a = details.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
                 currentProcess = yield this._spinUpJavaServer(details, masterPort);
             }
+            else if ((_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.python)) {
+                currentProcess = yield this._spinUpPythonServer(details);
+            }
             else {
                 currentProcess = yield this._spinUpProcess(details, masterPort);
             }
             details.process = currentProcess;
             const stdout = currentProcess.stdout;
-            if (stdout && typeof stdout.pipe === 'function') {
-                stdout.pipe(process.stdout);
+            if (stdout) {
+                stdout.on('data', (chunk) => {
+                    process.stdout.write(chunk.toString());
+                });
             }
             const stderr = currentProcess.stderr;
-            if (stderr && typeof stderr.pipe === 'function') {
-                stderr.pipe(process.stderr);
+            if (stderr) {
+                stderr.on('data', (chunk) => {
+                    process.stderr.write(chunk.toString());
+                });
             }
             return new Promise((res) => setTimeout(res, 100));
         });
@@ -246,6 +278,32 @@ class Server {
             }
             const server = yield (0, master_1.default)(masterPort, this.targetDetailsArr);
             this.masterServer = server;
+            this.targetDetailsArr.some((t) => {
+                var _a;
+                if (t.debugPort != -1 &&
+                    ((_a = t.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python))) {
+                    const table = (0, cli_table_1.getCustomColourTable)(ansi_colors_1.yellow);
+                    table.push(['As of now, local debugging for python is not supported']);
+                    (0, logger_1.info)(table.toString());
+                    return true;
+                }
+                return false;
+            });
+            this.targetDetailsArr
+                .filter((t) => t.type == 'functions')
+                .forEach((t) => {
+                const target = t.target;
+                if (!target.url) {
+                    throw new error_1.default('Target URL not found', { exit: 2 });
+                }
+                bioLogUrl(target.name, new URL(target.url).pathname, t.httpPort, masterPort);
+            });
+            (0, logger_1.info)();
+            this.targetDetailsArr
+                .filter((t) => t.type == 'server')
+                .forEach((t) => {
+                aioLogUrl(t, masterPort);
+            });
             return new Promise((res) => {
                 server.on('listening', () => {
                     this.targetDetailsArr.forEach((targetDetails) => {
@@ -264,6 +322,7 @@ class Server {
     }
     wait() {
         return __awaiter(this, void 0, void 0, function* () {
+            const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
             if (!this.masterServer) {
                 (0, logger_1.debug)('Master server is not started yet.');
                 throw new error_1.default('Server cannot be put to wait state.', { exit: 2 });
@@ -271,7 +330,7 @@ class Server {
             this.targetDetailsArr.forEach((targetdetails) => {
                 var _a, _b;
                 const target = targetdetails.target;
-                if (targetdetails.type === 'functions' || !target || !targetdetails.process) {
+                if (!target || !targetdetails.process) {
                     return;
                 }
                 (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => __awaiter(this, void 0, void 0, function* () {
@@ -279,7 +338,19 @@ class Server {
                 }));
                 (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => __awaiter(this, void 0, void 0, function* () {
                     yield this.restart(target);
-                    (0, logger_1.labeled)(`server[${target.name}]`, 'ready!').MESSAGE();
+                    if (target.type === constants_1.FN_TYPE.basic) {
+                        (0, logger_1.labeled)(`functions(${target.name})`, 'ready!').MESSAGE();
+                        if (!target.url) {
+                            throw new error_1.default('Target URL not found while restarting server', {
+                                exit: 2
+                            });
+                        }
+                        bioLogUrl(target.name, new URL(target.url).pathname, targetdetails.httpPort, masterPort);
+                    }
+                    else if (target.type === constants_1.FN_TYPE.advanced) {
+                        (0, logger_1.labeled)(`server[${target.name}]`, 'ready!').MESSAGE();
+                        aioLogUrl(targetdetails, masterPort);
+                    }
                     setTimeout(() => {
                         var _a;
                         (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
@@ -315,9 +386,6 @@ class Server {
             if (targetIdx === -1) {
                 throw new error_1.default('Unknown target given for restart.', { exit: 2 });
             }
-            if (this.targetDetailsArr[targetIdx].type === 'functions') {
-                return;
-            }
             const targetProcess = this.targetDetailsArr[targetIdx].process;
             if (!targetProcess) {
                 throw new error_1.default('Process is not defined for this target.', { exit: 2 });
@@ -338,11 +406,17 @@ class Server {
                 if (targetdetails.process) {
                     return this.kill(targetdetails.process);
                 }
-            })));
+            }))).catch((err) => (0, logger_1.debug)('Error stopping the servers: ', err));
             if (this.masterServer) {
                 const masterServer = this.masterServer;
                 return new Promise((res, rej) => {
-                    masterServer.close((err) => (err ? rej(err) : res()));
+                    masterServer.close((err) => {
+                        if (err) {
+                            (0, logger_1.debug)('Error stopping the master server: ', err);
+                            return rej(err);
+                        }
+                        res();
+                    });
                 });
             }
         });

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

@@ -83,6 +83,13 @@ const proxyResponseHandler = (systemRoutes) => (proxyRes, req, res) => {
             }
         }
     }
+    else if (req.url.startsWith('/accounts') && req.url.includes('/signin')) {
+        const set = proxyRes.headers['set-cookie'];
+        set
+            ? set.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/')
+            : ['IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/'];
+        proxyRes.headers['set-cookie'] = set;
+    }
 };
 function spinUpMaster(listenPort, otherServerDetails) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -127,16 +134,18 @@ function spinUpMaster(listenPort, otherServerDetails) {
             if (res instanceof http_1.ServerResponse) {
                 res.writeHead(502, { 'Content-Type': 'json' });
             }
-            res.end(JSON.stringify({ error: 'unable to proxy request' }));
-            console.log('unable to proxy request ', req.url);
+            res.end(JSON.stringify({ error: 'unable to serve the request' }));
+            console.log();
+            console.log('Unable to reach the servers to serve the request:  ', req.url);
             console.error(err);
         })
             .on('econnreset', (err, req, res, targetUrl) => {
             if (res instanceof http_1.ServerResponse) {
                 res.writeHead(502, { 'Content-Type': 'json' });
             }
-            res.end(JSON.stringify({ error: 'unable to proxy request. ECONNRESET.' }));
-            console.log('Connection reset while trying to proxy ', req.url);
+            res.end(JSON.stringify({ error: 'unable to serve the request. ECONNRESET.' }));
+            console.log();
+            console.log('Connection reset while trying to serve the request ', req.url);
             (0, logger_2.debug)('Connection reset from target URL : ', targetUrl);
             console.error(err);
         })
@@ -150,7 +159,11 @@ function spinUpMaster(listenPort, otherServerDetails) {
                     const appTarget = `http://127.0.0.1:${serverDetail.httpPort}/app/`;
                     app.use('/app', (req, res) => {
                         const target = serverDetail.target;
-                        if (req.url.startsWith('/local-redirect') && target.login_redirect) {
+                        if (req.url === '/' && target.homepage.includes('/__catalyst')) {
+                            req.url = target.homepage;
+                            (0, unknownReqProxy_1.default)(proxy, customProxyUrl)(req, res);
+                        }
+                        else if (req.url.startsWith('/local-redirect') && target.login_redirect) {
                             const isUrl = target.login_redirect.startsWith('/');
                             if (isUrl) {
                                 res.redirect(target.login_redirect);

package/lib/serve/server/lib/node.mjs

@@ -0,0 +1,41 @@
+'use strict';
+
+import express from 'express';
+import { inspect } from 'util';
+import { pathToFileURL } from 'url';
+
+const args = process.argv.slice(2);
+const listenPort = parseInt(args[0], 10);
+const fnDetails = JSON.parse(args[1]);
+
+const app = express();
+
+const targetName = fnDetails.name;
+const index = pathToFileURL(fnDetails.index);
+
+app.use('/', async (req, res) => {
+	try {
+		if (index === undefined) {
+			throw new Error('index of AIO function is undefined');
+		}
+		const userModule = await import(index);
+		if (!('default' in userModule)) {
+			throw new Error('Could not find any default export');
+		}
+		if (typeof userModule.default !== 'function') {
+			throw new Error('The default export is not a function');
+		}
+		userModule.default(req, res);
+	} catch (e) {
+		const errorString = inspect(e);
+		// eslint-disable-next-line no-console
+		console.error('[' + targetName + '] ' + errorString);
+		res.writeHead(500);
+		res.end(errorString);
+	}
+});
+
+app.listen(listenPort).on('error', (err) => {
+	// eslint-disable-next-line no-console
+	console.error(err);
+});

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

@@ -18,13 +18,17 @@ const server_js_1 = __importDefault(require("./server.js"));
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const target = details.target;
-    const clientListner = yield (0, server_js_1.default)(details.httpPort, target.source, target.homepage, ((_a = target.opts) === null || _a === void 0 ? void 0 : _a.watch) || false);
-    clientListner.addListener('start', () => {
+    const clientListener = yield (0, server_js_1.default)(details.httpPort, target.source, {
+        homepage: target.homepage,
+        enableWatch: ((_a = target.opts) === null || _a === void 0 ? void 0 : _a.watch) || false,
+        notFoundPage: target.notFoundPage
+    });
+    clientListener.addListener('start', () => {
         var _a, _b;
         const appUrl = 'http://localhost:' + masterPort;
         const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
         (0, logger_1.labeled)(label, `URL : ${appUrl}/app/`).MESSAGE();
         ((_b = details.target.opts) === null || _b === void 0 ? void 0 : _b.open) && (0, open_1.default)(appUrl).catch();
     });
-    return clientListner;
+    return clientListener;
 });

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

@@ -59,7 +59,7 @@ function reloadApp(event, path, liveSockets) {
     (0, logger_js_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, enableWatch) {
+function webClientServer(httpPort, source, { homepage = 'index.html', enableWatch = true, notFoundPage } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const eventListener = new events_1.EventEmitter();
         const catalystTempDir = (0, path_1.join)(source, '.catalyst');
@@ -70,7 +70,7 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
         if (reloadScriptSrc) {
             const clientWatcher = (0, chokidar_1.watch)(source, {
                 ignoreInitial: true,
-                ignored: ['node_modules/**/*']
+                ignored: ['node_modules/**/*', `/**/${index_js_1.FILENAME.client.package_json}`]
             });
             const liveSockets = [];
             let watcherReady = false;
@@ -126,33 +126,49 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
         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 === homepage &&
-                (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
-                const homepageFile = yield index_js_2.ASYNC.readFile((0, path_1.join)(source, homepage));
-                if (!homepageFile) {
-                    eventListener.emit('error', new error_js_1.default('Unable to read the homepage file', {
+            if (enableWatch && (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
+                const htmlFile = yield index_js_2.ASYNC.readFile((0, path_1.join)(source, requestedFile));
+                if (!htmlFile) {
+                    eventListener.emit('error', new error_js_1.default('Unable to read the html file', {
                         exit: 1,
                         errorId: 'WEB-CLIENT-SERVER-1',
-                        arg: [ansi_colors_1.red.italic(homepage)]
+                        arg: [ansi_colors_1.red.italic(requestedFile)]
                     }));
                     return;
                 }
-                const injectedHomePage = reloadScriptSrc
-                    ? yield injectScript(encodeURIComponent(reloadScriptSrc), homepageFile)
+                const injectedHtml = reloadScriptSrc
+                    ? yield injectScript(encodeURIComponent(reloadScriptSrc), htmlFile)
                     : undefined;
                 res.contentType('text/html');
                 res.status(200);
-                res.send(injectedHomePage || homepageFile);
+                res.send(injectedHtml || htmlFile);
                 return;
             }
             res.sendFile((0, path_1.join)(source, requestedFile), (err) => {
-                if (err) {
-                    (0, logger_js_1.error)('Unable to serve the requested file: ' + (0, path_1.join)(source, requestedFile));
+                if (!err) {
+                    return;
+                }
+                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);
                     res.status(404);
-                    res.send('Resource not found');
+                    notFoundPage
+                        ? res.sendFile(notFoundPage, (e) => {
+                            if (!e) {
+                                return;
+                            }
+                            (0, logger_js_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);
+                res.status(500);
+                res.send('Error fetching the resource');
             });
         }));
         const server = app.listen(httpPort).on('error', (err) => {