noxt-server 0.1.14 → 0.1.16

package/units.txt

@@ -1,6 +1,4 @@
-------
-fetch.js
------
+=== ./fetch.js ===
 export const info = {
   version: '1.0.0',
   description: 'Preload props from urls',
@@ -27,10 +25,7 @@ export default mlm => ({
       }
     }
   },
-})
-------
-config.js
------
+})=== ./config.js ===
 export const info = {
   name: 'config',
   version: '1.0.0',
@@ -38,6 +33,7 @@ export const info = {
   requires: ['utils','services'],
 }
 
+const config = {};
 const config_is = {};
 const config_defaults = {};
 const config_defs = {}
@@ -87,8 +83,12 @@ function isPlainObject(value) {
 }
 
 export default mlm => ({
-  '$global.config': () => ({}),
-  '$define.config': (defs, unit) => {
+  'define.config': {
+    get: () => config,
+    enumerable: true,
+    configurable: false
+  },
+  'register.config': (defs, unit) => {
     for (const key in defs) {
       const def = defs[key];
       mlm.assert.not(key in config_defs, 'Duplicate config key ' + key);
@@ -111,8 +111,8 @@ export default mlm => ({
   },
   'utils.merge_deep': merge_deep,
   'services.config': () => new class ConfigService {
-    process(config) {
-      const merged = merge_deep({}, config_defaults, config);
+    process(userConfig) {
+      const merged = merge_deep({}, config_defaults, userConfig);
       const ret = {};
       for (const key in config_defs) {
         const { is: type, normalize } = config_defs[key];
@@ -127,10 +127,10 @@ export default mlm => ({
       }
       return ret;
     }
-    merge(config) {
-      mlm.log('config', config,mlm.config);
-      Object.assign(mlm.config, this.process(config));
-      
+    merge(userConfig) {
+      console.log('initial',config_defaults,userConfig)
+      Object.assign(config, this.process(userConfig));
+      console.log(userConfig,'final',config)
     }
     get_defs() {
       return {
@@ -140,10 +140,7 @@ export default mlm => ({
       };
     }
   },
-})
-------
-fetch-cache.js
------
+})=== ./fetch-cache.js ===
 export const info = {
   name: 'fetch-cache',
   version: '1.0.0',
@@ -191,10 +188,7 @@ async function globalFetch(ctx, url, options = {}) {
   const res = await fetchCache(url, options);
   if (!res.ok) throw new Error(res.statusText);
   return res;
-}
-------
-services.js
------
+}=== ./services.js ===
 export const info = {
   name: 'services',
   version: '1.0.0',
@@ -205,8 +199,8 @@ export const info = {
 const services = {}
 
 export default mlm => ({
-  '$global.services': () => mlm.utils.readOnly(services, 'services'),
-  '$define.services': mlm.utils.collector(services, {
+  'define.services': () => mlm.utils.readOnly(services, 'services'),
+  'register.services': mlm.utils.collector(services, {
     is: 'function',
     mode: 'object',
     map: (fn, key) => {
@@ -215,10 +209,7 @@ export default mlm => ({
       return service
     }
   }),
-})
-------
-noxt.js
------
+})=== ./noxt.js ===
 export const info = {
   name: 'noxt',
   version: '1.0.0',
@@ -231,10 +222,7 @@ export const info = {
     'fetch-cache-fs', 
     'fetch',
   ],
-}
-------
-utils.js
------
+}=== ./utils.js ===
 export const info = {
   name: 'utils',
   version: '1.0.0',
@@ -244,16 +232,16 @@ export const info = {
 export default mlm => {
 
   const utils = {};
-  utils.eval = (fn,...args) => typeof fn === 'function' ? fn(...args) : fn;
+  utils.eval = (fn, ...args) => typeof fn === 'function' ? fn(...args) : fn;
   utils.readOnly = (obj, { label = 'object' } = {}) => new Proxy(obj, {
     get: (t, k) => t[k],
     set: (t, k, v) => { mlm.throw(label + ' is read-only'); }
   });
-  utils.collector = (target, { 
-    map, is, filter, 
-    label = 'object', 
-    mode = 'object', 
-    override = false 
+  utils.collector = (target, {
+    map, is, filter,
+    label = 'object',
+    mode = 'object',
+    override = false
   } = {}) => {
     const modes = {
       array: () => source => {
@@ -271,7 +259,7 @@ export default mlm => {
           }
           let value = source[key];
           if (filter && !filter(value, key)) continue;
-          if (is) mlm.assert.is( is,value, label + '.' + key);
+          if (is) mlm.assert.is(is, value, label + '.' + key);
           if (map) value = map(value, key);
           target[key] = value;
         }
@@ -309,13 +297,10 @@ export default mlm => {
     return modes[mode]();
   }
   return ({
-    '$global.utils': () => utils.readOnly(utils, 'utils'),
-    '$define.utils': utils.collector(utils, { is: 'function', mode: 'object' }),
+    'define.utils': () => utils.readOnly(utils, 'utils'),
+    'register.utils': utils.collector(utils, { is: 'function', mode: 'object', map: (fn, key) => { mlm.log('utils', key); return fn; } }),
   })
-}
-------
-fetch-node.js
------
+}=== ./fetch-node.js ===
 export const info = {
   name: 'fetch-node',
   version: '1.0.0',
@@ -336,19 +321,13 @@ async function fetchOrThrow(ctx, url, options = {}) {
   const res = await fetch(url, options);
   if (!res.ok) throw new Error(res.statusText);
   return res;
-}
-------
-plugin.js
------
+}=== ./plugin.js ===
 export const info = {
   name: 'plugin',
   version: '1.0.0',
   description: 'Base',
-  requires: ['utils','services','hooks','config']
-}
-------
-reload.js
------
+  requires: ['env','utils','services','hooks','config']
+}=== ./reload.js ===
 export const info = {
   name: 'reload',
   description: 'Hot reload middleware',
@@ -424,28 +403,31 @@ eventSource.addEventListener('reload', () => {
 window.addEventListener('beforeunload', () => {
   eventSource.close();
 });
-`
-------
-logger.js
------
+`=== ./logger.js ===
 export const info = {
   name: 'logger',
-  version: '1.0.0',
-  description: 'Minimal logger',
+  version: '1.0.1',
+  description: 'Noxt logger',
   requires: ['express'],
 }
 
 export default mlm => ({
-  'middleware.logger': async (app) => {
-     return (req, res, next) => {
-        mlm.log(req.method, req.url);
-        next();
-     }
+  'middleware.logger': async () => (req, res, next) => {
+    const start = process.hrtime.bigint();
+    const ip = req.headers['x-forwarded-for']?.split(',')[0] || req.socket.remoteAddress;
+    const ua = req.headers['user-agent'] || '-';
+    res.on('finish', () => {
+      const dur = Number(process.hrtime.bigint() - start) / 1e6; // ms
+      const date = new Date().toISOString();
+      mlm.log(
+        `[${date}] ${ip} ${req.method} ${req.originalUrl || req.url} ` +
+        `| HTTP/${req.httpVersion} | ${res.statusCode} | ${ua} | ${dur.toFixed(2)}ms `
+      );
+    });
+    next();
   },
-})
-------
-express.js
------
+});
+=== ./express.js ===
 export const info = {
   name: 'express',
   description: 'Sets up an Express server',
@@ -460,8 +442,8 @@ let app;
 const middlewareNames = new Set();
 const middlewares = [];
 export default mlm => ({
-  '$global.express': { get: () => app },
-  '$define.middleware': (conf, unit) => {
+  '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);
@@ -504,14 +486,20 @@ export default mlm => ({
         app.use(mw);
       }
     }
-    app.listen(mlm.config.port, mlm.config.host, () => {
+    app.listen(mlm.config.port, mlm.config.host, (error) => {
+      if (error) {
+        mlm.throw(error);
+      }
       mlm.log(`Listening on ${mlm.config.host}:${mlm.config.port}`);
     });
+    app.on('close', () => {
+      mlm.log('Server closed');
+    });
+    app.on('error', (error) => {
+      mlm.throw(error);
+    });
   },
-})
-------
-noxt-dev.js
------
+})=== ./noxt-dev.js ===
 export const info = {
   name: 'noxt-dev',
   description: 'Noxt Dev server',
@@ -524,10 +512,7 @@ export const info = {
     'fetch-cache-fs',
     'fetch',
   ],
-}
-------
-fetch-cache-fs.js
------
+}=== ./fetch-cache-fs.js ===
 export const info = {
   name: 'fetch-cache-fs',
   version: '1.0.0',
@@ -581,10 +566,7 @@ async function globalFetch(ctx, url, options = {}) {
   }
   if (!res.ok) throw new Error(res.statusText);
   return res;
-}
-------
-noxt-plugin.js
------
+}=== ./noxt-plugin.js ===
 export const info = {
   name: 'noxt-plugin',
   description: 'Noxt Plugin',
@@ -638,12 +620,12 @@ export default mlm => {
   }
   const globalServerContext = {};
   return ({
-    '$define.pageContext': arrayCollector(pageContextHooks, 'page context handler'),
-    '$define.serverContext': arrayCollector(serverContextHooks, 'server context handler'),
-    '$define.componentExports': arrayCollector(componentExportsHooks, 'page export handler'),
-    '$define.registerPage': collector(registerPageHooks, 'register page handler'),
-    '$define.registerComponent': collector(registerComponentHooks, 'register component handler'),
-    '$global.noxt_context': {
+    'register.pageContext': arrayCollector(pageContextHooks, 'page context handler'),
+    'register.serverContext': arrayCollector(serverContextHooks, 'server context handler'),
+    'register.componentExports': arrayCollector(componentExportsHooks, 'page export handler'),
+    'register.registerPage': collector(registerPageHooks, 'register page handler'),
+    'register.registerComponent': collector(registerComponentHooks, 'register component handler'),
+    'define.noxt_context': {
       get: () => globalServerContext,
       enumerable: true
     },
@@ -709,10 +691,7 @@ export default mlm => {
       }
     }
   })
-}
-------
-noxt-router-dev.js
------
+}=== ./noxt-router-dev.js ===
 export const info = {
   name: 'noxt-router-dev',
   description: 'Sets up a Noxt Router',
@@ -745,10 +724,7 @@ export default mlm => ({
     noxtRouter.use('/dev', devRouter)
     return noxtRouter
   }
-})
-------
-hooks.js
------
+})=== ./hooks.js ===
 export const info = {
   name: 'hooks',
   version: '1.0.0',
@@ -760,8 +736,8 @@ const hook_handlers = {}
 
 export default mlm => {
   return ({
-    '$global.hooks': () => mlm.utils.readOnly(hooks, 'hooks'),
-    '$define.hooks': mlm.utils.collector(hooks, {
+    'define.hooks': () => mlm.utils.readOnly(hooks, 'hooks'),
+    'register.hooks': mlm.utils.collector(hooks, {
       is: 'function',
       mode: 'object',
       map: (fn, key) => (...args) => {
@@ -770,15 +746,12 @@ export default mlm => {
         }
       }
     }),
-    '$define.on': mlm.utils.collector(hook_handlers, {
+    'register.on': mlm.utils.collector(hook_handlers, {
       is: 'function',
       mode: 'array'
     })
   })
-}
-------
-static.js
------
+}=== ./static.js ===
 export const info = {
   name: 'static',
   description: 'Static middleware',
@@ -799,27 +772,21 @@ export default mlm => ({
      const dir = mlm.config.static;
      return serve_static(resolve(dir));
   },
-})
-------
-env.js
------
+})=== ./env.js ===
 export const info = {
   name: 'env',
   version: '1.0.0',
   description: 'Environment',
 }
-/*
+
 export default mlm => ({
-  '$global.DEV': () => process.env.NODE_ENV !== 'production',
-  '$global.PROD': () => process.env.NODE_ENV === 'production',
+  'define.DEV': () => process.env.NODE_ENV !== 'production',
+  'define.PROD': () => process.env.NODE_ENV === 'production',
   'onBeforeLoad': () => {
-    //process.env.NODE_ENV ||= 'development'
+    process.env.NODE_ENV ||= 'development'
   }
 })
-  */
-------
-noxt-router.js
------
+  === ./noxt-router.js ===
 export const info = {
   name: 'noxt-router',
   description: 'Sets up a Noxt Router',
@@ -845,4 +812,4 @@ export default mlm => ({
     })
     return noxtRouter
   },
-})
+})

package/units/noxt-router-dev.js

@@ -1,33 +0,0 @@
-export const info = {
-  name: 'noxt-router-dev',
-  description: 'Sets up a Noxt Router',
-  requires: ['plugin'],
-  provides: ['#noxt-router'],
-  npm: {
-    'noxt-js-middleware': '^1.0.4'
-  },
-}
-
-export default mlm => ({
-  'config.views': {
-    normalize: p => [p].flat(),
-    is: ['string'],
-    default: ['views']
-  },
-  'middleware.noxt': async () => {
-    const { default: noxt } = await mlm.import('noxt-js-middleware');
-    const noxtRouter = await noxt({
-      context: mlm.noxt_context,
-      views: mlm.config.views,
-      hooks: mlm.services.noxt.noxt_hooks
-    })
-    const devRouter = await noxt({
-      context: mlm.noxt_context,
-      views: mlm.config.views,
-      hooks: mlm.services.noxt.noxt_hooks,
-      noxt: noxtRouter
-    })
-    noxtRouter.use('/dev', devRouter)
-    return noxtRouter
-  }
-})