huxy-node-server 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-node-server",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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.2.0",
+    "pino": "^10.2.1",
     "pino-http": "^11.0.0",
     "pino-pretty": "^13.1.3"
   },

package/src/index.js

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