fix uncaught error for blank controller, improve logging coloring, ve…

…rsion bump
realtux · Jan 1, 2025 · a77a104 · a77a104
1 parent 9b889bb
commit a77a104
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 17 deletions.
diff --git a/lib/core/logger.js b/lib/core/logger.js
@@ -0,0 +1,17 @@
+import chalk from 'chalk';
+
+export default new class {
+
+    error(...msg) {
+        console.log(`${chalk.red('!')}`, ...msg);
+    }
+
+    warning(...msg) {
+        console.log(`${chalk.yellow('*')}`, ...msg);
+    }
+
+    info(...msg) {
+        console.log(`${chalk.cyan('*')}`, ...msg);
+    }
+
+}
diff --git a/lib/http/express.js b/lib/http/express.js
@@ -1,4 +1,5 @@
 import config from '#exa/core/config.js';
+import logger from '#exa/core/logger.js';
 import chalk from 'chalk';
 import cors from 'cors';
 import Express from 'express';
@@ -35,9 +36,18 @@ export const init = async () => {
     // mounted http controller routes
     let files = await glob(`${config.paths.root}${config.paths.http}/**/*.js`);
 
+    let route_count = 0;
+
     for (const file of files) {
+        let controller_path = file.replace(config.paths.root + '/', '');
+
         let { default: controller } = await import(file);
 
+        if (!controller?.routes) {
+            logger.error(`routes object missing from controller (${controller_path}), skipping`);
+            continue;
+        }
+
         for (const [route, handler] of Object.entries(controller.routes)) {
             let [method, path] = route.split(' ');
 
@@ -50,19 +60,21 @@ export const init = async () => {
             }
 
             if (!controller[handler]) {
-                console.log(`${chalk.red('*')} cannot bind to ${file}::${handler}, skipping`);
+                logger.error(`cannot bind to ${file}::${handler}, skipping`);
                 continue;
             }
 
             app[method](path, ...middleware.concat(controller[handler].bind(controller)));
+
+            ++route_count;
         }
     }
 
-    // console.log(`mounted ${chalk.green(controllers.length)} routes`);
+    logger.info(`mounted ${chalk.green(route_count)} routes`);
 
     // start server
     const server = app.listen(config.http.port, () => {
-        console.log(`server running on ${config.http.host}:${config.http.port}`);
+        logger.info(`server running on ${config.http.host}:${config.http.port}`);
     });
 
     if (config.http.websocket) {
@@ -91,7 +103,7 @@ export const init = async () => {
                         path_mapper['/'].connection(socket, req);
                     }
                 } catch {
-                    console.log('no matching websocket path or fallback file');
+                    logger.error('no matching websocket path or fallback file');
                     socket.close();
                 }
             });

diff --git a/lib/index.js b/lib/index.js
@@ -12,17 +12,19 @@ import { fileURLToPath } from 'node:url';
 import { DateTime } from 'luxon';
 import { dirname } from 'node:path';
 import fs from 'node:fs/promises';
+import logger from '#exa/core/logger.js';
 
 process.on('uncaughtException', err => {
-    console.log(chalk.red('uncaught last resort'), chalk.yellow(DateTime.now().toISO()));
+    logger.error(`exa uncaught last resort:`);
+    logger.error(chalk.red('time'), DateTime.now().toISO())
 
     if (err instanceof Error) {
-        console.error(chalk.cyan('error:'), err.message);
-        console.error(chalk.cyan('stack:'), err.stack.toString());
+        logger.error(chalk.red('error:'), err.message);
+        logger.error(chalk.red('stack:'), err.stack.toString());
     } else if (typeof err === 'string') {
-        console.error(err);
+        logger.error(err);
     } else if (typeof err === 'object') {
-        console.error(err.toString());
+        logger.error(err.toString());
     }
 });
 
@@ -62,9 +64,9 @@ export default new class {
 
             if (!quiet) {
                 console.log();
-                console.log(`${chalk.yellow('exa.js')} by tux - v${version}`);
+                console.log(`${chalk.green('exa.js')} by tux - v${version}`);
                 console.log('-----------------------------');
-                console.log(`${chalk.green(DateTime.now().toISO())}`);
+                console.log(`${chalk.gray(DateTime.now().toISO())}`);
                 console.log('-----------------------------');
                 console.log(`mode: ${config.environment.development ? 'development' : 'production'}`);
             }
@@ -75,7 +77,7 @@ export default new class {
              */
             if (config.database.use) {
                 if (!quiet) {
-                    console.log('initializing database...');
+                    logger.info('initializing database...');
                 }
 
                 await init_db();
@@ -100,7 +102,7 @@ export default new class {
                 if (scripts[command]) {
                     await scripts[command].run(...process.argv.slice(4))
                 } else {
-                    console.log(`${chalk.red('*')} no script called ${command} found`);
+                    logger.error(`no script called ${command} found`);
                 }
             } else {
                 /**
@@ -111,9 +113,9 @@ export default new class {
                 await init_express();
             }
         } catch (e) {
-            console.log('exa uncaught:');
-            console.log(e.message);
-            console.log(e.stack);
+            logger.error('exa uncaught:');
+            logger.error(e.message);
+            logger.error(e.stack);
         }
     }
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "@exajs/core",
     "type": "module",
     "author": "Brian Seymour <@realtux>",
-    "version": "0.0.18",
+    "version": "0.0.19",
     "description": "modern opinionated node.js framework",
     "license": "MIT",
     "homepage": "https://github.com/realtux/exa",