huxy-server 1.0.11 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-server",
-  "version": "1.0.11",
+  "version": "1.1.1",
   "description": "一个精炼、高性能的 Express.js 服务器模板，为现代 Node.js 应用程序设计，提供灵活的功能和最佳实践。",
   "type": "module",
   "module": "./src/index.js",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "http-proxy-middleware": "^3.0.5",
-    "huxy-node-server": "^1.0.7",
+    "huxy-node-server": "^1.1.1",
     "jsonwebtoken": "^9.0.3"
   },
   "engines": {

package/src/index.js

@@ -1,117 +1,111 @@
 import {
   startServer as U,
   startStatic as X,
-  logger as se,
-  createLogger as oe,
-  dateTime as ae,
-  localIPs as ne,
-  nodeArgs as ie,
-  getEnvConfig as pe,
-  checkPort as ce,
-  getDirName as ue,
-  resolvePath as le,
+  createLogger as se,
+  dateTime as oe,
+  localIPs as ae,
+  nodeArgs as ne,
+  getEnvConfig as ie,
+  checkPort as pe,
+  getDirName as ce,
+  resolvePath as ue,
 } from 'huxy-node-server';
-import {createProxyMiddleware as k, fixRequestBody as O} from 'http-proxy-middleware';
-import {dateTime as W} from 'huxy-node-server';
-import $ from 'jsonwebtoken';
-var d = (r, {secret: e = '', ...t} = {}) => $.verify(r, e, t);
-var m =
-  (r = {}) =>
-  (e, t, o) => {
+import {createProxyMiddleware as S, fixRequestBody as k} from 'http-proxy-middleware';
+import {dateTime as C} from 'huxy-node-server';
+import j from 'jsonwebtoken';
+var h = (t, {secret: e = '', ...r} = {}) => j.verify(t, e, r);
+var d =
+  (t = {}) =>
+  (e, r, s) => {
     let i = e.headers.authorization;
-    if (!i) return (e.log.warn('\u8BA4\u8BC1\u5931\u8D25: \u7F3A\u5C11\u8BA4\u8BC1\u4FE1\u606F'), t.status(401).json({message: '\u7F3A\u5C11\u8BA4\u8BC1\u4FE1\u606F'}));
+    if (!i) return (e.log.warn('\u8BA4\u8BC1\u5931\u8D25: \u7F3A\u5C11\u8BA4\u8BC1\u4FE1\u606F'), r.status(401).json({message: '\u7F3A\u5C11\u8BA4\u8BC1\u4FE1\u606F'}));
     if (!i.startsWith('Bearer '))
-      return (e.log.warn('\u8BA4\u8BC1\u5931\u8D25: \u672A\u63D0\u4F9B\u6709\u6548\u8BA4\u8BC1\u4FE1\u606F'), t.status(401).json({message: '\u672A\u63D0\u4F9B\u6709\u6548\u8BA4\u8BC1\u4FE1\u606F'}));
+      return (e.log.warn('\u8BA4\u8BC1\u5931\u8D25: \u672A\u63D0\u4F9B\u6709\u6548\u8BA4\u8BC1\u4FE1\u606F'), r.status(401).json({message: '\u672A\u63D0\u4F9B\u6709\u6548\u8BA4\u8BC1\u4FE1\u606F'}));
     let a = i.split(' ')[1];
-    if (!a) return (e.log.warn('\u8BA4\u8BC1\u5931\u8D25: \u8BBF\u95EE\u4EE4\u724C\u7F3A\u5931'), t.status(401).json({message: '\u8BBF\u95EE\u4EE4\u724C\u7F3A\u5931'}));
+    if (!a) return (e.log.warn('\u8BA4\u8BC1\u5931\u8D25: \u8BBF\u95EE\u4EE4\u724C\u7F3A\u5931'), r.status(401).json({message: '\u8BBF\u95EE\u4EE4\u724C\u7F3A\u5931'}));
     try {
-      let s = d(a, r);
-      (e.log.info(s, '\u8BA4\u8BC1\u6210\u529F'), (e.user = s), o());
-    } catch (s) {
-      let n = s.type || s.name;
+      let o = h(a, t);
+      (e.log.info(o, '\u8BA4\u8BC1\u6210\u529F'), (e.user = o), s());
+    } catch (o) {
+      let n = o.type || o.name;
       return n === 'TokenExpiredError'
-        ? (e.log.warn({ip: e.ip}, '\u8BA4\u8BC1\u5931\u8D25: \u4EE4\u724C\u5DF2\u8FC7\u671F'), t.status(401).json({message: '\u4EE4\u724C\u5DF2\u8FC7\u671F'}))
+        ? (e.log.warn({ip: e.ip}, '\u8BA4\u8BC1\u5931\u8D25: \u4EE4\u724C\u5DF2\u8FC7\u671F'), r.status(401).json({message: '\u4EE4\u724C\u5DF2\u8FC7\u671F'}))
         : n === 'JsonWebTokenError'
-          ? (e.log.warn({ip: e.ip}, '\u8BA4\u8BC1\u5931\u8D25: \u65E0\u6548\u7684\u4EE4\u724C'), t.status(403).json({message: '\u65E0\u6548\u7684\u4EE4\u724C'}))
+          ? (e.log.warn({ip: e.ip}, '\u8BA4\u8BC1\u5931\u8D25: \u65E0\u6548\u7684\u4EE4\u724C'), r.status(403).json({message: '\u65E0\u6548\u7684\u4EE4\u724C'}))
           : n === 'AuthorizationError'
-            ? (e.log.warn({ip: e.ip}, `\u8BA4\u8BC1\u5931\u8D25: ${s.message}`), t.status(s.status).json({message: s.message}))
-            : (e.log.warn({err: s, ip: e.ip}, '\u8BA4\u8BC1\u5931\u8D25: \u5185\u90E8\u670D\u52A1\u5668\u9519\u8BEF'), t.status(500).json({message: '\u5185\u90E8\u670D\u52A1\u5668\u9519\u8BEF'}));
+            ? (e.log.warn({ip: e.ip}, `\u8BA4\u8BC1\u5931\u8D25: ${o.message}`), r.status(o.status).json({message: o.message}))
+            : (e.log.warn({err: o, ip: e.ip}, '\u8BA4\u8BC1\u5931\u8D25: \u5185\u90E8\u670D\u52A1\u5668\u9519\u8BEF'), r.status(500).json({message: '\u5185\u90E8\u670D\u52A1\u5668\u9519\u8BEF'}));
     }
   };
-var v = r => Object.prototype.toString.call(r).slice(8, -1).toLowerCase(),
-  I = r => (v(r) === 'object' ? [r] : Array.isArray(r) ? r : []),
-  f = (r, e) => I(r).map(t => ((t.prefix = `${e}${t.prefix ?? (t.name ? `/${t.name}` : '')}`.replace('//', '/')), t)),
-  x = r => (Array.isArray(r) ? r : []).filter(Boolean),
-  y = (r, e) => [...new Set(['/', '/health', e, ...(Array.isArray(r) ? r : [])])].filter(Boolean).map(t => `${e}${t}`.replace('//', '/'));
-var R =
-    (r = {}) =>
-    (e, t, o) => {
-      if (e.method === 'OPTIONS') return o();
-      let i = x(r.whiteAuthKeys);
-      if (y(r.whitePathList, r.apiPrefix).includes(e.path)) return o();
-      let {authToken: s} = r;
-      if (s === !1 || s === 'false') return o();
+var $ = t => Object.prototype.toString.call(t).slice(8, -1).toLowerCase(),
+  v = t => ($(t) === 'object' ? [t] : Array.isArray(t) ? t : []),
+  m = (t, e) => v(t).map(r => ((r.prefix = `${e}${r.prefix ?? (r.name ? `/${r.name}` : '')}`.replace('//', '/')), r)),
+  f = t => (Array.isArray(t) ? t : []).filter(Boolean),
+  x = (t, e) => [...new Set(['/', '/health', e, ...(Array.isArray(t) ? t : [])])].filter(Boolean).map(r => `${e}${r}`.replace('//', '/'));
+var I =
+    (t = {}) =>
+    (e, r, s) => {
+      if (e.method === 'OPTIONS') return s();
+      let i = f(t.whiteAuthKeys);
+      if (x(t.whitePathList, t.apiPrefix).includes(e.path)) return s();
+      let {authToken: o} = t;
+      if (o === !1 || o === 'false') return s();
       let n = e.headers,
         p = n['x-huxy-auth'] || n['x-api-key'] || n.authorization?.split('Bearer ')[1];
-      if ((p && p === s) || i.includes(p)) return o();
-      let {secret: u, expiresIn: T, algorithm: j, issuer: H} = r;
-      m({secret: u, expiresIn: T, algorithm: j, issuer: H})(e, t, o);
+      if ((p && p === o) || i.includes(p)) return s();
+      let {secret: c, expiresIn: g, algorithm: T, issuer: H} = t;
+      d({secret: c, expiresIn: g, algorithm: T, issuer: H})(e, r, s);
     },
-  w = R;
+  y = I;
 var E = ['origin', 'referer', 'x-forwarded-for', 'x-real-ip', 'cf-connecting-ip', 'cf-ipcountry', 'cf-ray', 'x-huxy-auth'],
-  S = ['x-powered-by', 'server'],
-  A = (r, e) => {
-    let t = new Headers(r);
-    return (E.forEach(o => t.delete(o)), t.set('Host', e), t.set('User-Agent', 'IHUXY-API/1.0'), t);
+  R = ['x-powered-by', 'server'],
+  w = (t, e) => {
+    let r = new Headers(t);
+    return (E.forEach(s => r.delete(s)), r.set('Host', e), r.set('User-Agent', 'IHUXY-API/1.0'), r);
   },
-  P = r => {
-    let e = new Headers(r);
+  A = t => {
+    let e = new Headers(t);
     return (
-      S.forEach(t => e.delete(t)),
+      R.forEach(r => e.delete(r)),
       e.set('Access-Control-Allow-Origin', '*'),
       e.set('X-Content-Type-Options', 'nosniff'),
       e.get('content-type')?.includes('text/event-stream') && ((e['Cache-Control'] = 'no-cache, no-transform'), (e.Connection = 'keep-alive'), (e['X-Accel-Buffering'] = 'no')),
       e
     );
   };
-var c = (r, e = '/') => {
-    let t = {status: 'OK', message: `API \u670D\u52A1\u5668\u8FD0\u884C\u4E2D \u{1F449} ${e}`, timestamp: W(), uptime: process.uptime(), memoryUsage: process.memoryUsage()};
-    (r.get(e, (o, i) => {
-      i.status(200).json(t);
-    }),
-      r.get(`${e}/health`.replace('//', '/'), (o, i) => {
-        i.status(200).json(t);
-      }));
+var O = (t, e = '/') => {
+    let r = {status: 'OK', message: `API \u670D\u52A1\u5668\u8FD0\u884C\u4E2D \u{1F449} ${e}`, timestamp: C(), uptime: process.uptime(), memoryUsage: process.memoryUsage()};
+    t.get(`${e}/health`.replace('//', '/'), (s, i) => {
+      i.status(200).json(r);
+    });
   },
-  g = 0,
-  B = ({target: r = 'http://', prefix: e, withPrefix: t, preserve: o = !0, ...i} = {}) => ({
-    target: r,
+  P = 0,
+  W = ({target: t = 'http://', prefix: e, withPrefix: r, preserve: s = !0, ...i} = {}) => ({
+    target: t,
     changeOrigin: !0,
     selfHandleResponse: !1,
     on: {
-      proxyReq: (a, s, n) => (!o && A(a.headers, r), O(a, s, n)),
-      proxyRes: (a, s, n) => {
-        !o && P(a.headers);
+      proxyReq: (a, o, n) => (!s && w(a.headers, t), k(a, o, n)),
+      proxyRes: (a, o, n) => {
+        !s && A(a.headers);
       },
-      error: (a, s, n) => {
-        (g || ((g = 1), s.log.error({err: a}, '\u4EE3\u7406\u9519\u8BEF')), n.headersSent || n.status(502).json({error: '\u7F51\u5173\u9519\u8BEF'}));
+      error: (a, o, n) => {
+        (P || ((P = 1), o.log.error({err: a}, '\u4EE3\u7406\u9519\u8BEF')), n.headersSent || n.status(502).json({error: '\u7F51\u5173\u9519\u8BEF'}));
       },
     },
     ...i,
   }),
-  C = (r, e = {}, t) => {
-    let {apiPrefix: o = '/', proxys: i = []} = e,
-      a = f(i, o);
-    if (a.length)
-      return (
-        t.info(`\u{1F4DD} API \u63A5\u53E3\u5730\u5740: ${e.protocol}://${e.host}:${e.port}${o}`),
-        a.map(({prefix: s, target: n, withPrefix: p = !0, ...u}) => {
-          ((n = p ? `${n}${s}` : n), r.use(s, w(e), k(B({prefix: s, target: n, withPrefix: p, ...u}))), t.info(`\u2705 \u4EE3\u7406\u4E2D ${s} \u{1F449} ${n}`));
-        }),
-        !0
-      );
+  B = (t, e = {}, r) => {
+    let {apiPrefix: s = '/', proxys: i = []} = e,
+      a = m(i, s);
+    if (!a.length) return !1;
+    (r.info(`\u{1F4DD} API \u63A5\u53E3\u5730\u5740: ${e.protocol}://${e.host}:${e.port}${s}`),
+      a.map(({prefix: o, target: n, withPrefix: p = !0, ...c}) => {
+        ((n = p ? `${n}${o}` : n), t.use(o, y(e), S(W({prefix: o, target: n, withPrefix: p, ...c}))), r.info(`\u2705 \u4EE3\u7406\u4E2D ${o} \u{1F449} ${n}`));
+      }),
+      O(t, s));
   },
-  l = C;
+  u = B;
 var M = {
     port: parseInt(process.env.PORT || '8080', 10),
     host: process.env.HOST || 'localhost',
@@ -124,32 +118,29 @@ var M = {
     expiresIn: process.env.JWT_EXPIRES_IN || '30d',
     issuer: process.env.JWT_ISSUER || 'huxyApp',
   },
-  h = M;
-var _ = (r, e) =>
-    U({...h, ...r}, async (t, o, i, a) => {
-      let s = l(o, t, a);
-      (await e?.(t, o, i, a), s && c(o, t.apiPrefix));
+  l = M;
+var _ = (t, e) =>
+    U({...l, ...t}, async (r, s, i, a) => {
+      (u(s, r, a), await e?.(r, s, i, a));
     }),
-  me = _,
-  fe = (r, e) =>
-    X({...h, ...r}, async (t, o, i, a) => {
-      let s = l(o, t, a);
-      (await e?.(t, o, i, a), c(o, t.apiPrefix), s && c(o, t.apiPrefix));
+  de = _,
+  me = (t, e) =>
+    X({...l, ...t}, async (r, s, i, a) => {
+      (u(s, r, a), await e?.(r, s, i, a));
     });
 export {
-  l as appProxy,
-  ce as checkPort,
-  oe as createLogger,
-  ae as dateTime,
-  me as default,
-  ue as getDirName,
-  pe as getEnvConfig,
-  ne as localIPs,
-  se as logger,
-  ie as nodeArgs,
-  le as resolvePath,
+  u as appProxy,
+  pe as checkPort,
+  se as createLogger,
+  oe as dateTime,
+  de as default,
+  ce as getDirName,
+  ie as getEnvConfig,
+  ae as localIPs,
+  ne as nodeArgs,
+  ue as resolvePath,
   _ as startApp,
   U as startServer,
   X as startStatic,
-  fe as startStaticApp,
+  me as startStaticApp,
 };