huxy-node-server 1.0.4 → 1.0.6

package/example.js

@@ -14,11 +14,16 @@ const {app, config, httpServer} = await startServer({
   // ...
 }, (config, app, httpServer, logger) => {
   app.get('/config', (req, res) => {
-    logger.info('详细配置：', config);
+    logger.info(config, '详细配置：');
     res.status(200).json({ 
       result: config,
     });
   });
+  app.use('/', (req, res) => {
+    logger.info({url: req.url}, 'url');
+    // logger.info(req.headers, 'headers');
+    // logger.info(req.body, 'body');
+  });
 });
 
 // startStatic
@@ -26,6 +31,10 @@ const huxyServer = await startStatic({
   port: 9000,
   basepath: '/',
   buildPath: './build',
+  // ssl: {
+  //   key: '/path/to/name.key',
+  //   cert: '/path/to/name.pem',
+  // },
 }, (config, app) => {
   logger.info(config);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-node-server",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "一个精炼、高性能的 Express.js 服务器模板，为现代 Node.js 应用程序设计，提供灵活的功能和最佳实践。",
   "type": "module",
   "module": "./src/index.js",
@@ -40,7 +40,7 @@
     "express": "^5.2.1",
     "express-rate-limit": "^8.2.1",
     "helmet": "^8.1.0",
-    "pino": "^10.1.0",
+    "pino": "^10.2.0",
     "pino-http": "^11.0.0",
     "pino-pretty": "^13.1.3"
   },

package/src/index.js

@@ -1,28 +1,28 @@
-import y from 'express';
-import X from 'helmet';
-import Q from 'cors';
-import {rateLimit as J, ipKeyGenerator as Y} from 'express-rate-limit';
-import Z from 'compression';
-import q from 'pino-http';
+import P from 'express';
+import B from 'helmet';
+import X from 'cors';
+import {rateLimit as Q, ipKeyGenerator as J} from 'express-rate-limit';
+import Y from 'compression';
+import Z from 'pino-http';
 import {createServer as M} from 'node:http';
-import ee from 'node:https';
-import R from 'pino';
+import q from 'node:https';
+import b from 'pino';
 import j from 'node:os';
 import G from 'node:net';
 var c = (e = new Date()) => e.toLocaleString('zh-CN', {timeZone: 'Asia/Shanghai', hour12: !1}),
   w = e => Object.prototype.toString.call(e).slice(8, -1).toLowerCase(),
-  f = e => {
-    let r = e ? 'https' : 'http',
+  g = e => {
+    let o = e ? 'https' : 'http',
       t = j.networkInterfaces(),
-      o = [];
-    return (Object.keys(t).map(i => o.push(...t[i])), o.filter(i => i.family === 'IPv4').map(i => i.address));
+      r = [];
+    return (Object.keys(t).map(i => r.push(...t[i])), r.filter(i => i.family === 'IPv4').map(i => i.address));
   },
-  E = e => {
-    let r = e ?? process.argv.slice(2) ?? [],
+  y = e => {
+    let o = e ?? process.argv.slice(2) ?? [],
       t = {};
     return (
-      r.map(o => {
-        let [s, i] = o.split('=');
+      o.map(r => {
+        let [s, i] = r.split('=');
         t[s] = i;
       }),
       t
@@ -42,43 +42,42 @@ var c = (e = new Date()) => e.toLocaleString('zh-CN', {timeZone: 'Asia/Shanghai'
     JWT_SECRET: 'secret',
     AUTH_TOKEN: 'authToken',
   },
-  F = (e, r, t) => {
-    let [o, s] = e.split('.');
-    o && s ? (t[o] || (t[o] = {}), (t[o][s] = r)) : (t[o] = r);
+  F = (e, o, t) => {
+    let [r, s] = e.split('.');
+    r && s ? (t[r] || (t[r] = {}), (t[r][s] = o)) : (t[r] = o);
   },
-  W = e => (e ? (e.endsWith('/') ? e : `${e}/`) : '/'),
-  h = (e = {}, r = V) => {
+  v = (e = {}, o = V) => {
     let {env: t} = process;
-    Object.keys(r).map(s => {
+    Object.keys(o).map(s => {
       let i = t[s] ?? e[s];
-      i && F(r[s], i, e);
+      i && F(o[s], i, e);
     });
-    let o = {...e, ...E()};
-    return ((o.port = o.staticPort || o.port), (o.isDev = o.NODE_ENV === 'development'), (o.basepath = W(o.basepath)), (o.protocol = 'http'), o);
+    let r = {...e, ...y()};
+    return ((r.port = r.staticPort || r.port), (r.isDev = r.NODE_ENV === 'development'), (r.protocol = 'http'), r);
   },
-  g = (e, r = '127.0.0.1') =>
+  x = (e, o = '127.0.0.1') =>
     new Promise(t => {
-      let o = G.createServer();
-      (o.once('error', s => {
-        (o.close(), t((s.code === 'EADDRINUSE', !1)));
+      let r = G.createServer();
+      (r.once('error', s => {
+        (r.close(), t((s.code === 'EADDRINUSE', !1)));
       }),
-        o.once('listening', () => {
-          (o.close(), t(!0));
+        r.once('listening', () => {
+          (r.close(), t(!0));
         }),
-        o.listen(Number(e), r));
+        r.listen(Number(e), o));
     }),
-  b = (e, r = {}, t) => {
-    let o = s => {
+  A = (e, o = {}, t) => {
+    let r = s => {
       (t.warn(`\u6536\u5230 ${s} \u4FE1\u53F7, \u{1F6D1} \u6B63\u5728\u5173\u95ED\u670D\u52A1\u5668...`),
         e.close(async () => {
-          (t.info('\u{1F44B} \u670D\u52A1\u5668\u5DF2\u5173\u95ED'), await r.shutdown?.(), process.exit(0));
+          (t.info('\u{1F44B} \u670D\u52A1\u5668\u5DF2\u5173\u95ED'), await o.shutdown?.(), process.exit(0));
         }),
         setTimeout(() => {
           (t.error('\u274C \u5F3A\u5236\u5173\u95ED\u670D\u52A1\u5668'), process.exit(1));
         }, 5e3));
     };
-    (process.on('SIGTERM', () => o('SIGTERM')),
-      process.on('SIGINT', () => o('SIGINT')),
+    (process.on('SIGTERM', () => r('SIGTERM')),
+      process.on('SIGINT', () => r('SIGINT')),
       process.on('uncaughtException', s => {
         (t.fatal(s, `\u{1F4A5} \u672A\u6355\u83B7\u7684\u5F02\u5E38: ${s.message}`), process.exit(1));
       }),
@@ -86,33 +85,33 @@ var c = (e = new Date()) => e.toLocaleString('zh-CN', {timeZone: 'Asia/Shanghai'
         (t.fatal({reason: s, promise: i}, '\u26A0\uFE0F \u672A\u5904\u7406\u7684 Promise \u62D2\u7EDD'), process.exit(1));
       }));
   },
-  A = (e, {port: r, host: t = '0.0.0.0'} = {}) =>
-    new Promise((o, s) => {
-      let i = p => {
-          (a(), s(p));
+  $ = (e, {port: o, host: t = '0.0.0.0'} = {}) =>
+    new Promise((r, s) => {
+      let i = m => {
+          (a(), s(m));
         },
         n = () => {
-          (a(), o(e));
+          (a(), r(e));
         },
         a = () => {
           (e.off('error', i), e.off('listening', n));
         };
-      (e.once('error', i), e.once('listening', n), e.listen(r, t));
+      (e.once('error', i), e.once('listening', n), e.listen(o, t));
     }),
-  $ = (e, r = 56) => {
+  R = (e, o = 56) => {
     let t = e.length,
-      o = r - t,
-      s = ~~(o / 2);
-    return `${'-'.repeat(s)}${e}${'-'.repeat(o - s)}`;
+      r = o - t,
+      s = ~~(r / 2);
+    return `${'-'.repeat(s)}${e}${'-'.repeat(r - s)}`;
   };
 import 'dotenv';
-var K = {
+var W = {
     nodeEnv: process.env.NODE_ENV || 'development',
     isDev: process.env.NODE_ENV === 'development',
     port: parseInt(process.env.PORT || '3000', 10),
     host: process.env.HOST || '0.0.0.0',
     basepath: process.env.BASEPATH || '/',
-    apiPrefix: '/api',
+    apiPrefix: '/',
     cors: {origin: process.env.CORS_ORIGIN?.split(',') || '*', credentials: !0},
     rateLimit: {
       windowMs: parseInt(process.env.RATE_LIMIT_WINDOW_MS || '300000', 10),
@@ -125,137 +124,139 @@ var K = {
     },
     logLevel: process.env.LOG_LEVEL || 30,
   },
-  v = K;
-var u = (e, r) =>
-  R({
+  S = W;
+var f = (e, o) =>
+  b({
     name: e,
-    level: v.logLevel,
+    level: S.logLevel,
     formatters: {level: t => ({level: t})},
-    timestamp: R.stdTimeFunctions.isoTime,
+    timestamp: b.stdTimeFunctions.isoTime,
     base: null,
     transport: {target: 'pino-pretty', options: {colorize: !0, sync: !0, levelFirst: !0}, ignore: 'pid,hostname,level,time', translateTime: 'SYS:yyyy-mm-dd HH:MM:ss'},
-    ...r,
+    ...o,
   });
-var m = u('huxy');
-var O = u('error-handler'),
-  N = e => (r, t, o) => {
-    (O.error({message: 'Not Found', timestamp: c(), url: r.originalUrl, method: r.method, ip: r.ip, userAgent: r.get('User-Agent')}, '\u627E\u4E0D\u5230\u8DEF\u5F84'),
-      t.status(404).json({success: !1, status: 404, url: r.originalUrl, message: `\u8DEF\u7531 [${r.method} ${r.originalUrl}] \u4E0D\u5B58\u5728`, timestamp: c()}));
+var p = f('huxy');
+var O = f('error-handler'),
+  N = e => (o, t, r) => {
+    (O.error({message: 'Not Found', timestamp: c(), url: o.originalUrl, method: o.method, ip: o.ip, userAgent: o.get('User-Agent')}, '\u627E\u4E0D\u5230\u8DEF\u5F84'),
+      t.status(404).json({success: !1, status: 404, url: o.originalUrl, message: `\u8DEF\u7531 [${o.method} ${o.originalUrl}] \u4E0D\u5B58\u5728`, timestamp: c()}));
   },
-  _ = e => (r, t, o, s) => {
-    let i = r.status || 500,
-      n = r.message;
-    (O.error({message: n, timestamp: c(), stack: r.stack, url: t.originalUrl, method: t.method, ip: t.ip, userAgent: t.get('User-Agent')}, '\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF'),
-      o.status(i).json({success: !1, message: (e.isDev, n), stack: e.isDev ? r.stack : void 0, timestamp: c()}));
+  _ = e => (o, t, r, s) => {
+    let i = o.status || 500,
+      n = o.message;
+    (O.error({message: n, timestamp: c(), stack: o.stack, url: t.originalUrl, method: t.method, ip: t.ip, userAgent: t.get('User-Agent')}, '\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF'),
+      r.status(i).json({success: !1, message: (e.isDev, n), stack: e.isDev ? o.stack : void 0, timestamp: c()}));
   };
-import {Router as z} from 'express';
-var B = e => {
-    let r = z();
+import {Router as K} from 'express';
+var z = e => {
+    let o = K();
     return (
-      r.use('/health', (t, o) => {
-        o.status(200).json({status: 'OK', timestamp: c(), environment: e.nodeEnv, uptime: process.uptime(), memoryUsage: process.memoryUsage(), pid: process.pid});
+      o.use('/health', (t, r) => {
+        r.status(200).json({status: 'OK', timestamp: c(), environment: e.nodeEnv, uptime: process.uptime(), memoryUsage: process.memoryUsage(), pid: process.pid});
       }),
-      r.get('/', (t, o) => {
-        o.status(200).json({message: 'Node.js \u670D\u52A1\u5668\u8FD0\u884C\u4E2D', timestamp: c(), environment: e.nodeEnv});
+      o.get('/', (t, r) => {
+        r.status(200).json({message: 'Node.js \u670D\u52A1\u5668\u8FD0\u884C\u4E2D', timestamp: c(), environment: e.nodeEnv});
       }),
-      r
+      o
     );
   },
-  D = B;
-var te = (e, r = {}) => {
+  D = z;
+var ee = (e, o = {}) => {
     (e.disable('x-powered-by'),
-      e.set('trust proxy', 1),
-      e.use(q({logger: m, quietReqLogger: !0, autoLogging: !1, genReqId: !1})),
-      e.use(Z()),
-      e.use(X(r.helmet)),
-      e.use(Q(r.cors)),
-      e.use(r.apiPrefix, J({keyGenerator: t => Y(t.ip) || t.headers['x-huxy-auth'] || t.headers['x-api-key'] || t.headers.authorization, ...r.rateLimit})),
-      e.use(y.json({limit: '20mb'})),
-      e.use(y.urlencoded({extended: !0, limit: '20mb'})));
+      e.set('trust proxy', o.trustProxy ?? 1),
+      e.use(Z({logger: p, quietReqLogger: !0, autoLogging: !1, genReqId: !1})),
+      e.use(Y()),
+      e.use(B(o.helmet)),
+      e.use(X(o.cors)),
+      e.use(o.apiPrefix, Q({keyGenerator: t => J(t.ip) || t.headers['x-huxy-auth'] || t.headers['x-api-key'] || t.headers.authorization, ...o.rateLimit})),
+      e.use(P.json({limit: '20mb'})),
+      e.use(P.urlencoded({extended: !0, limit: '20mb'})));
   },
-  oe = (e, r = {}) => {
-    (e.use(D(r)), e.use(N(r)), e.use(_(r)));
+  te = (e, o = {}) => {
+    (e.use(D(o)), e.use(N(o)), e.use(_(o)));
   },
-  re = async (e, r) => {
-    let t = h(e),
-      {port: o, ssl: s} = t;
-    (await g(o, t.host)) || ((t.port = Number(o) + 1), m.warn(`\u7AEF\u53E3 ${o} \u5DF2\u88AB\u5360\u7528\uFF0C\u73B0\u5728\u4F7F\u7528\u7AEF\u53E3 ${t.port}`));
-    let n = y();
-    te(n, t);
+  oe = async (e, o) => {
+    let t = v(e),
+      {port: r, ssl: s} = t;
+    (await x(r, t.host)) || ((t.port = Number(r) + 1), p.warn(`\u7AEF\u53E3 ${r} \u5DF2\u88AB\u5360\u7528\uFF0C\u73B0\u5728\u4F7F\u7528\u7AEF\u53E3 ${t.port}`));
+    let n = P();
+    ee(n, t);
     let a;
     (s
       ? (w(s) === 'object' ||
-          (m.error({ssl: {key: '/path/to/name.key', cert: '/path/to/name.pem'}}, '\u26A0\uFE0F \u8BF7\u8BBE\u7F6E\u6709\u6548 SSL \u6216\u8BBE\u7F6E {ssl: false}'), process.exit(1)),
+          (p.error({ssl: {key: '/path/to/name.key', cert: '/path/to/name.pem'}}, '\u26A0\uFE0F \u8BF7\u8BBE\u7F6E\u6709\u6548 SSL \u6216\u8BBE\u7F6E {ssl: false}'), process.exit(1)),
         (t.protocol = 'https'),
-        (a = ee.createServer(s, n)),
+        (a = q.createServer(s, n)),
         M((d, l) => {
           (l.writeHead(301, {Location: `${t.protocol}://${d.headers.host}${d.url}`}), l.end());
         }).listen(80))
       : (a = M(n)),
-      b(a, t, m));
+      A(a, t, p));
     try {
-      await A(a, t);
-    } catch (p) {
-      (m.error({err: p}, '\u26A0\uFE0F \u670D\u52A1\u5668\u542F\u52A8\u5931\u8D25'), process.exit(1));
+      await $(a, t);
+    } catch (m) {
+      (p.error({err: m}, '\u26A0\uFE0F \u670D\u52A1\u5668\u542F\u52A8\u5931\u8D25'), process.exit(1));
     }
     try {
-      await r?.(t, n, a, m);
-    } catch (p) {
-      (m.error({err: p}, `\u274C \u56DE\u8C03\u51FD\u6570\u9519\u8BEF\uFF1A${p.message}`), process.exit(1));
+      await o?.(t, n, a, p);
+    } catch (m) {
+      (p.error({err: m}, `\u274C \u56DE\u8C03\u51FD\u6570\u9519\u8BEF\uFF1A${m.message}`), process.exit(1));
     }
-    return (oe(n, t), {app: n, httpServer: a, config: t, logger: m});
+    return (te(n, t), {app: n, httpServer: a, config: t, logger: p});
   },
-  H = re;
-var se = (e, r, t) =>
-    H({...v, ...e}, async (o, s, i, n) => {
-      let {port: a, host: p, nodeEnv: d, basepath: l, appName: S = 'HuxyServer', protocol: L} = o;
+  H = oe;
+var re = (e, o, t) =>
+    H({...S, ...e}, async (r, s, i, n) => {
+      let {port: a, host: m, nodeEnv: d, basepath: l, appName: u = 'HuxyServer', protocol: h} = r;
       if (!t) {
-        let U = f()
-          .filter(T => T !== p)
-          .map(T => `${L}://${T}:${a}${l}`);
-        (n.info($(S)),
-          n.info(`\u{1F680} \u670D\u52A1\u8FD0\u884C\u5728\u3010${d}\u3011\u73AF\u5883: ${L}://${p}:${a}${l}`),
+        let U = g()
+          .filter(E => E !== m)
+          .map(E => `${h}://${E}:${a}${l}`);
+        (n.info(R(u)),
+          n.info(`\u{1F680} \u670D\u52A1\u8FD0\u884C\u5728\u3010${d}\u3011\u73AF\u5883: ${h}://${m}:${a}${l}`),
           n.info(`-----------------[${c()}]------------------`),
           n.info({ips: U}, '\u672C\u5730\u5730\u5740\uFF1A'));
       }
-      await r?.(o, s, i, n);
+      await o?.(r, s, i, n);
     }),
-  x = se;
-import ce from 'express';
-import {fileURLToPath as ne} from 'node:url';
-import {dirname as ie, resolve as ae} from 'node:path';
-var I = (e = import.meta.url) => ie(ne(e)),
-  P = (...e) => ae(I(), ...e),
-  k = P;
-var pe = {port: 9e3, host: 'localhost', basepath: '/', buildPath: './build'},
-  me = (e, r) =>
-    x({...pe, ...e}, async (t, o, s, i) => {
-      await r?.(t, o, s, i);
+  T = re;
+import ae from 'express';
+import {fileURLToPath as se} from 'node:url';
+import {dirname as ne, resolve as ie} from 'node:path';
+var I = (e = import.meta.url) => ne(se(e)),
+  L = (...e) => ie(I(), ...e),
+  k = L;
+var ce = {port: 9e3, host: 'localhost', basepath: '/', buildPath: './build'},
+  me = e => (e ? (e.endsWith('/') ? e : `${e}/`) : '/'),
+  pe = (e, o) =>
+    T({...ce, ...e}, async (t, r, s, i) => {
+      await o?.(t, r, s, i);
       let {basepath: n, buildPath: a} = t;
       (n !== '/' &&
-        o.get('/', (d, l, S) => {
-          if (d.path === '/' || d.path === n.slice(0, -1)) return l.redirect(n);
-          S();
+        r.get('/', (l, u, h) => {
+          if (l.path === '/') return u.redirect(n);
+          h();
         }),
-        o.use(n, ce.static(a, {...t.staticCache})));
-      let p = new RegExp(`^${n.replace(/\//g, '\\/')}(.*)$`);
-      o.get(p, (d, l) => {
-        l.sendFile(k(a, 'index.html'));
+        r.use(n, ae.static(a, {...t.staticCache})));
+      let m = me(n),
+        d = new RegExp(`^${m.replace(/\//g, '\\/')}(.*)$`);
+      r.get(d, (l, u) => {
+        u.sendFile(k(a, 'index.html'));
       });
     }),
-  C = me;
-var ot = {startServer: x, startStatic: C, logger: m, createLogger: u, dateTime: c, localIPs: f, nodeArgs: E, getEnvConfig: h, checkPort: g, getDirName: I, resolvePath: P};
+  C = pe;
+var ot = {startServer: T, startStatic: C, logger: p, createLogger: f, dateTime: c, localIPs: g, nodeArgs: y, getEnvConfig: v, checkPort: x, getDirName: I, resolvePath: L};
 export {
-  g as checkPort,
-  u as createLogger,
+  x as checkPort,
+  f as createLogger,
   c as dateTime,
   ot as default,
   I as getDirName,
-  h as getEnvConfig,
-  f as localIPs,
-  m as logger,
-  E as nodeArgs,
-  P as resolvePath,
-  x as startServer,
+  v as getEnvConfig,
+  g as localIPs,
+  p as logger,
+  y as nodeArgs,
+  L as resolvePath,
+  T as startServer,
   C as startStatic,
 };