huxy-node-server 1.0.8 → 1.0.10

package/example.js

@@ -1,16 +1,15 @@
-import {startServer, startStatic, logger, createLogger, dateTime} from './src/index.js';
-
-logger.info(dateTime());
+import {startServer, startStatic, createLogger, dateTime} from './src/index.js';
 
 const testLogger = createLogger('test');
 
-testLogger.info({x: 123}, '测试');
-logger.error({status: 400}, 'HTTP请求错误');
+testLogger.info({x: 123}, dateTime());
+testLogger.error({status: 400}, '测试');
 
 // startServer
 const {app, config, httpServer} = await startServer({
   port: 8080,
   host: 'localhost',
+  appName: '测试Demo',
   // ...
 }, (config, app, httpServer, logger) => {
   app.get('/config', (req, res) => {
@@ -31,11 +30,12 @@ const huxyServer = await startStatic({
   port: 9000,
   basepath: '/',
   buildPath: './build',
+  httpLogger: console,
   // ssl: {
   //   key: '/path/to/name.key',
   //   cert: '/path/to/name.pem',
   // },
-}, (config, app) => {
+}, (config, app, httpServer, logger) => {
   logger.info(config);
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-node-server",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "一个精炼、高性能的 Express.js 服务器模板，为现代 Node.js 应用程序设计，提供灵活的功能和最佳实践。",
   "type": "module",
   "module": "./src/index.js",

package/src/index.js

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