noxt-server 0.1.14 → 0.1.16

package/README.md

@@ -1,118 +1,5 @@
-# noxt-js
+# noxt-server
 
-A zero-config JSX web server powered by [Express](https://expressjs.com/) and [noxt-js-middleware](https://npmjs.com/package/noxt-js-middleware).  
-Run it with `npx noxt-js` and drop `.jsx` files into your `views/` folder — routes are created automatically.  
+Server stack for [noxt-js-middleware](https://npmjs.com/package/noxt-js-middleware)
 
-No React required. No heavy framework. Just JSX + Express.  
-
----
-
-## Installation
-
-```sh
-npm install noxt-js
-```
-
-or run it directly without installing:
-
-```sh
-npx noxt-js
-```
-
----
-
-## Quick Start
-
-```sh
-npx noxt-js
-```
-
-By default, this will:
-
-- Serve pages from `./views/`
-- Start an HTTP server on port `3000`
-- Look for configuration in `noxt.config.yaml` (optional)
-
----
-
-## Configuration
-
-`noxt-js` reads options from `noxt.config.yaml` in your project root, or from CLI flags.  
-CLI flags override config file values.
-
-Example `noxt.config.yaml`:
-
-```yaml
-port: 4000
-host: localhost
-views: views
-logLevel: info
-ssl: false
-```
-
-Run with CLI overrides:
-
-```sh
-npx noxt-js --port 8080 --views src/pages
-```
-
-### Available options
-
-- **`port`**: HTTP port number (default: `3000`)  
-- **`host`**: Hostname or IP (default: `0.0.0.0`)  
-- **`views`**: Directory containing `.jsx` files (default: `views`)  
-- **`logLevel`**: One of `error`, `warn`, `info`, `debug`  
-- **`ssl`**:  
-  - `false` (disable SSL)  
-  - or object with `cert` and `key` paths for HTTPS  
-
----
-
-## Context
-
-You can provide shared helpers/utilities to all components via a `context.js` file (or any path you specify in config). For example:
-
-```js
-// context.js
-export async function fetchUser(id) {
-  return db.users.findById(id);
-}
-```
-
-Then in a page:
-
-```jsx
-export const route = '/user/:id';
-
-export default async function UserPage({ id }, { fetchUser }) {
-  const user = await fetchUser(id);
-  return <h1>{user.name}</h1>;
-}
-```
-
----
-
-## Pages & Routing
-
-- Any `.jsx` file in `views/` is loaded as a component.  
-- If it exports `route`, it becomes a page at that route.  
-- Props come from route params, query string, and optional `params` export.  
-
-Example:
-
-```jsx
-export const route = '/hello/:name';
-
-export default function HelloPage({ name }) {
-  return <h1>Hello, {name}!</h1>;
-}
-```
-
----
-
-
----
-
-## License
-
-LGPL-3.0-or-later
+Run with [noxt-cli](https://npmjs.com/package/noxt-cli)

package/noxt-server.js

@@ -5,32 +5,56 @@ import MLM from 'mlm-core';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-export async function startServer({ config, recipe }) {
+function resolveModule(name) {
+  if (!name.includes('/')) {
+    return `${__dirname}/units/${name}.js`;
+  }
+  if (name.startsWith('app/')) {
+    return `${process.cwd()}/units/${name.slice(4)}.js`;
+  }
+  if (name.startsWith('contrib/')) {
+    const m = name.match(/^contrib\/([^/]+)(?:\/(.*))?$/);
+    if (!m) throw new Error(`Invalid contrib module name: ${name}`);
+    if (!m[2]) return `noxt-contrib-${m[1]}`;
+    return `noxt-contrib-${m[1]}/${m[2]}`;
+  }
+  throw new Error(`Invalid module name: ${name}`);
+}
+
+export async function startServer({ config, recipe, import: _import}) {
  
-  const mlmInstance = MLM({
-    import:
-      p => import(p),
-    resolveModule:
-      name => name.startsWith('app/')
-        ? `${process.cwd()}/units/${name.slice(4)}.js`
-        : `${__dirname}/units/${name}.js`
+  const beforeBoot = process.hrtime.bigint();
+  const mlmInstance = await MLM({
+    import: _import ?? (p => import(p)),
+    resolveModule
   });
   try {
-
+    const afterBoot = process.hrtime.bigint();
     const report = await mlmInstance.analyze(recipe ?? 'noxt-dev');
     if (!report.success) {
       console.log('Bad recipe: ' + recipe + '\n' + report.order.join(', '));
       console.log(report.errors.join('\n'));
       process.exit(1);
     }
-    
+    const afterAnalyze = process.hrtime.bigint();
     await mlmInstance.install(recipe ?? 'noxt-dev');
+    const afterInstall = process.hrtime.bigint();
     const mlm = mlmInstance.context;
     await mlm.services.config.merge(config);
-    console.log(mlm.config);
-    mlmInstance.start();
+    const afterConfig = process.hrtime.bigint();
+    await mlmInstance.start();
+    const afterStart = process.hrtime.bigint();
+
+    console.log(
+      '[noxt-server] Total time', Number((afterStart - beforeBoot) / 1_000_000n), 'ms',
+      '| Boot', Number((afterBoot - beforeBoot) / 1_000_000n), 'ms',
+      '| Load', Number((afterAnalyze - afterBoot) / 1_000_000n), 'ms',
+      '| Install', Number((afterInstall - afterAnalyze) / 1_000_000n), 'ms',
+      '| Config', Number((afterConfig - afterInstall) / 1_000_000n), 'ms',
+      '| Start', Number((afterStart - afterConfig) / 1_000_000n), 'ms',
+    );
 
-    mlmInstance.repl();
+  mlm.DEV && mlmInstance.repl();
   } catch (e) {
     console.log(await mlmInstance.analyze(recipe ?? 'noxt-dev'));
     console.error(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noxt-server",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Server for noxt-js-middleware with CLI and config support",
   "type": "module",
   "main": "noxt-server.js",
@@ -23,17 +23,15 @@
   "author": "Zoran Obradović [https://github.com/zocky]",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "noxt-js-middleware": "^1.0.6",
-    "mlm-core": "^1.0.6",
-    "express": "^5.0.0",
+    "noxt-js-middleware": "^1.0.9",
+    "mlm-core": "^1.0.8",
+    "express": "^5.1.0",
     "cookie-parser": "^1.4.6",
-    "js-yaml": "^4.1.0",
-    "minimist": "^1.2.8",
-    "node-fetch-cache": "^5.0.2"
+    "js-yaml": "^4.1.0"
   },
-  "devDependencies": {
-    "noxt-js-middleware": "../noxt-js-middleware",
-    "mlm-core": "../mlm-core"
+  "peerDependencies": {
+    "compression": "^1.8.1",
+    "sharp": "^0.34.5"
   },
   "engines": {
     "node": ">=18"

package/units/bundler.js

@@ -0,0 +1,56 @@
+export const info = {
+  name: 'bundler',
+  version: '1.0.0',
+  description: 'Bundle js and css from component exports',
+  requires: ['noxt-plugin'],
+}
+
+export default mlm => {
+  const styles = {};
+  const scripts = {};
+  return {
+    'config.bundler': {
+      is: {
+        style: 'string|false',
+        script: 'string|false',
+      },
+      default: {
+        style: '_style',
+        script: '_script',
+      },
+    },
+    'services.bundler': () => ({ styles, scripts }),
+    'registerComponent.bundler': async ({ name, component, module }) => {
+      styles[component.name] = module.style ? `/* ${name} */ \n ${module.style}\n` : '';
+
+      if (!module.script) return;
+
+      if (typeof module.script == 'string') {
+        scripts[component.name] = `/* ${name} */ \n (()=>{\n${module.script}\n})();\n\n`;
+        return
+      }
+      if (typeof module.script == 'function') {
+        scripts[component.name] = `/* ${name} */ \n (${module.script.toString()})(window);\n\n`;
+        return
+      }
+    },
+    'middleware.bundler': () => {
+      const router = mlm.services.express.Router();
+      if (mlm.config.bundler.style) {
+        router.get(`/${mlm.config.bundler.style}`, (req, res) => {
+          res.logGroup = 'bundler';
+          res.set('Content-Type', 'text/css');
+          res.send( Object.values(styles).join('') );
+        });
+      }
+      if (mlm.config.bundler.script) {
+        router.get(`/${mlm.config.bundler.script}`, (req, res) => {
+          res.logGroup = 'bundler';
+          res.set('Content-Type', 'text/javascript');
+          res.send( Object.values(scripts).join('') );
+        });
+      }
+      return router
+    }
+  }
+}

package/units/bust-cache.js

@@ -0,0 +1,30 @@
+export const info = {
+  name: 'bust-cache',
+  version: '1.0.0',
+  description: 'Bust cache on GET requests',
+  requires: ['express'],
+}
+
+export default mlm => ({
+  'hook.bustCache': async (fn, req) => {
+    req.bustCache ||= fn(req);
+  },
+  'prod.middleware.bustCache': async () => {
+    return (req, res, next) => {
+      if (req.method === 'GET') {
+        mlm.hook.bustCache(req);
+      }
+      next();
+    };
+  },
+  'dev.middleware.bustCache': () => {
+    return (req, res, next) => {
+      if (req.method === 'GET') {
+        if (req.headers['cache-control']?.includes('no-cache')) {
+          req.bustCache = true;
+        }
+      }
+      next();
+    };
+  },
+});

package/units/compression.js

@@ -0,0 +1,30 @@
+// units/compression.js
+export const info = {
+  name: 'compression',
+  version: '1.0.0',
+  description: 'Response compression',
+  requires: ['express'],
+  packages: ['compression'],
+}
+
+export default mlm => ({
+  'config.compression': {
+    is: {
+      enabled: 'boolean',
+      level: 'number',  // 0-9, default 6
+      threshold: 'number',  // bytes, default 1024
+    },
+    default: {
+      enabled: true,
+      level: 6,
+      threshold: 1024,  // only compress responses > 1kb
+    },
+  },
+  
+  'middleware.compression': async () => {
+    const { enabled, level, threshold } = mlm.config.compression;
+    if (!enabled) return null;
+    const compression = mlm.packages.compression.default;
+    return compression({ level, threshold });
+  },
+});

package/units/config.js

@@ -100,9 +100,9 @@ export default mlm => ({
       return ret;
     }
     merge(userConfig) {
-      console.log('initial',config_defaults)
+//      console.log('initial',config_defaults,userConfig)
       Object.assign(config, this.process(userConfig));
-      console.log(userConfig,'final',config)
+//      console.log(userConfig,'final',config)
     }
     get_defs() {
       return {

package/units/env.js

@@ -9,6 +9,7 @@ export default mlm => ({
   'define.PROD': () => process.env.NODE_ENV === 'production',
   'onBeforeLoad': () => {
     process.env.NODE_ENV ||= 'development'
-  }
+  },
+  'inject.dev': (confs, unit) => mlm.DEV ? confs : null,
+  'inject.prod': (confs, unit) => !mlm.DEV ? confs : null,
 })
-  

package/units/express.js

@@ -2,62 +2,95 @@ export const info = {
   name: 'express',
   description: 'Sets up an Express server',
   requires: ['plugin'],
-  npm: {
-    'express': '^5.0.0',
-    'cookie-parser': '^1.4.6'
-  },
+  packages: ['express'],
 }
 
-let app;
-const middlewareNames = new Set();
-const middlewares = [];
-export default mlm => ({
-  'define.express': { get: () => app },
-  'register.middleware': (conf, unit) => {
-    for (const key in conf) {
-      mlm.assert.not(key in middlewareNames, 'Duplicate middleware ' + key);
-      middlewareNames.add(key);
-      let c = conf[key];
-      if (mlm.is.function(c)) {
-        c = { create: c };
+export default async mlm => {
+  let app;
+  const middlewareNames = new Set();
+  const middlewares = [];
+  const { default: express } = mlm.packages.express;
+  return {
+    'services.express': () => new class {
+      get app () {
+        return app;
       }
-      mlm.assert.is({
-        path: 'string|none',
-        create: 'function'
-      }, c, 'middleware');
-      mlm.assert.is.function(c.create, 'middleware');
-      middlewares.push({ ...c, unit: unit.name });
-    }
-  },
-  'config.port': {
-    is: v => Number.isInteger(v) && v > 0 && v < 65536,
-    default: 3000
-  },
-  'config.host': {
-    is: 'string',
-    default: 'localhost'
-  },
-  'middleware.json': async (app) => {
-    const { default: express } = await mlm.import('express');
-    return express.json();
-  },
-  'middleware.urlencoded': async (app) => {
-    const { default: express } = await mlm.import('express');
-    return express.urlencoded({ extended: true });
-  },
-  async onStart() {
-    const { default: express } = await mlm.import('express');
-    app = express();
-    for (const middleware of middlewares) {
-      const mw = await middleware.create(app);
-      if (middleware.path) {
-        app.use(middleware.path, mw);
-      } else {
-        app.use(mw);
+      get Router() {
+        return express.Router;
+      }
+      get express () {
+        return express;
+      }
+    },
+    'register.middleware': (conf, unit) => {
+      for (const key in conf) {
+        mlm.assert.not(key in middlewareNames, 'Duplicate middleware ' + key);
+        middlewareNames.add(key);
+        let c = conf[key];
+        if (mlm.is.function(c)) {
+          c = { create: c };
+        }
+        mlm.assert.is({
+          path: 'string|none',
+          create: 'function'
+        }, c, 'middleware');
+        mlm.assert.is.function(c.create, 'middleware');
+        middlewares.push({ ...c, unit: unit.name });
       }
+    },
+    'config.port': {
+      is: v => Number.isInteger(v) && v > 0 && v < 65536,
+      default: 3000
+    },
+    'config.host': {
+      is: 'string',
+      default: 'localhost'
+    },
+    'middleware.json': async (app) => {
+      return express.json();
+    },
+    'middleware.urlencoded': async (app) => {
+      return express.urlencoded({ extended: true });
+    },
+    async onStart() {
+      app = express();
+      for (const middleware of middlewares) {
+        const mw = await middleware.create(app);
+        if (!mw) {
+          continue;
+        }
+        if (middleware.path) {
+          app.use(middleware.path, mw);
+        } else {
+          app.use(mw);
+        }
+      }
+      app.use('/.well-known', (req, res, next) => {
+        res.logGroup = 'well-known';
+        res.status(404).send('Not found');
+        res.end();
+      });
+      app.use((req, res, next) => {
+        res.logGroup = '404';
+        res.status(404).send('Not found');
+      })
+      app.use((error, req, res, next,) => {
+        mlm.log('error', error);
+        res.status(500).send(error.stack);
+      })
+      const server = app.listen(mlm.config.port, mlm.config.host, (error) => {
+        if (error) {
+          mlm.throw(error);
+        }
+        mlm.log(`Listening on ${mlm.config.host}:${mlm.config.port}`);
+      });
+      server.on('close', () => {
+        mlm.log('Server closed');
+      });
+      app.on('error', (error) => {
+        mlm.error(error);
+        app.throw(error);
+      });
     }
-    app.listen(mlm.config.port, mlm.config.host, () => {
-      mlm.log(`Listening on ${mlm.config.host}:${mlm.config.port}`);
-    });
-  },
-})
+  }
+}