huxy-server 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-server",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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.5",
+    "huxy-node-server": "^1.0.6",
     "jsonwebtoken": "^9.0.3"
   },
   "engines": {

package/src/index.js

@@ -1,5 +1,5 @@
 import {
-  startServer as M,
+  startServer as C,
   startStatic as L,
   logger as te,
   createLogger as re,
@@ -11,103 +11,106 @@ import {
   getDirName as pe,
   resolvePath as ce,
 } from 'huxy-node-server';
-import {createProxyMiddleware as E, fixRequestBody as S} from 'http-proxy-middleware';
-import {dateTime as C} from 'huxy-node-server';
-import T from 'jsonwebtoken';
-var m = (r, e = {secret, ...opt}) => T.verify(r, secret, opt);
-var x =
+import {createProxyMiddleware as S, fixRequestBody as k} from 'http-proxy-middleware';
+import {dateTime as O} from 'huxy-node-server';
+import H from 'jsonwebtoken';
+var x = (r, {secret: e = '', ...t} = {}) => H.verify(r, e, t);
+var y =
   (r = {}) =>
   (e, t, s) => {
-    let o = e.headers.authorization;
-    if (!o) 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 (!o.startsWith('Bearer '))
+    let n = e.headers.authorization;
+    if (!n) 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 (!n.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'}));
-    let n = o.split(' ')[1];
-    if (!n) 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'}));
+    let a = n.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'}));
     try {
-      let a = m(n, r);
-      (e.log.info(a, '\u8BA4\u8BC1\u6210\u529F'), (e.user = a), s());
-    } catch (a) {
-      return a.name === 'TokenExpiredError'
+      let o = x(a, r);
+      (e.log.info(o, '\u8BA4\u8BC1\u6210\u529F'), (e.user = o), s());
+    } catch (o) {
+      let i = o.type || o.name;
+      return i === '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'}))
-        : a.name === 'JsonWebTokenError'
+        : i === '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'}))
-          : a instanceof AuthorizationError
-            ? (e.log.warn({ip: e.ip}, `\u8BA4\u8BC1\u5931\u8D25: ${a.message}`), t.status(a.status).json({message: a.message}))
-            : (e.log.warn({err: a, 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'}));
+          : i === 'AuthorizationError'
+            ? (e.log.warn({ip: e.ip}, `\u8BA4\u8BC1\u5931\u8D25: ${o.message}`), t.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'), t.status(500).json({message: '\u5185\u90E8\u670D\u52A1\u5668\u9519\u8BEF'}));
     }
   };
-var H =
+var $ =
     ({whiteAuthKeys: r = [], whiteAuthPaths: e = [], config: t = {}}) =>
-    (s, o, n) => {
-      if (s.method === 'OPTIONS' || e.includes(s.path)) return n();
-      let {authToken: a} = t;
-      if (a === !1 || a === 'false') return n();
-      let p = s.headers,
-        i = p['x-huxy-auth'] || p['x-api-key'] || p.authorization?.split('Bearer ')[1];
-      if ((i && i === a) || r.includes(i)) return n();
-      let {secret: u, expiresIn: c, algorithm: l, issuer: h} = t;
-      x({secret: u, expiresIn: c, algorithm: l, issuer: h})(s, o, n);
+    (s, n, a) => {
+      if (s.method === 'OPTIONS' || e.includes(s.path)) return a();
+      let {authToken: o} = t;
+      if (o === !1 || o === 'false') return a();
+      let i = s.headers,
+        u = i['x-huxy-auth'] || i['x-api-key'] || i.authorization?.split('Bearer ')[1];
+      if ((u && u === o) || r.includes(u)) return a();
+      let {secret: c, expiresIn: p, algorithm: l, issuer: h} = t;
+      y({secret: c, expiresIn: p, algorithm: l, issuer: h})(s, n, a);
     },
-  y = H;
+  w = $;
 var v = ['origin', 'referer', 'x-forwarded-for', 'x-real-ip', 'cf-connecting-ip', 'cf-ipcountry', 'cf-ray', 'x-huxy-auth'],
-  $ = ['x-powered-by', 'server'],
-  w = (r, e) => {
+  I = ['x-powered-by', 'server'],
+  A = (r, e) => {
     let t = new Headers(r);
     return (v.forEach(s => t.delete(s)), t.set('Host', e), t.set('User-Agent', 'IHUXY-API/1.0'), t);
   },
-  g = r => {
+  P = r => {
     let e = new Headers(r);
     return (
-      $.forEach(t => e.delete(t)),
+      I.forEach(t => e.delete(t)),
       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 I = r => Object.prototype.toString.call(r).slice(8, -1).toLowerCase(),
-  R = r => (I(r) === 'object' ? [r] : Array.isArray(r) ? r : []),
-  A = (r, e) => R(r).map(t => ((t.prefix = `${e}${(t.prefix ?? t.name) ? `/${t.name}` : ''}`.replace('//', '/')), t)),
-  P = r => (Array.isArray(r) ? r : []).filter(Boolean),
+var R = r => Object.prototype.toString.call(r).slice(8, -1).toLowerCase(),
+  E = r => (R(r) === 'object' ? [r] : Array.isArray(r) ? r : []),
+  g = (r, e) => E(r).map(t => ((t.prefix = `${e}${t.prefix ?? (t.name ? `/${t.name}` : '')}`.replace('//', '/')), t)),
+  T = r => (Array.isArray(r) ? r : []).filter(Boolean),
   j = (r, e) => [...new Set(['/', '/health', e, ...(Array.isArray(r) ? r : [])])].filter(Boolean).map(t => `${e}${t}`.replace('//', '/'));
-var k = ({target: r = 'http://', prefix: e, ...t} = {}, s = !1) => ({
+var d = (r, e = '/') => {
+    let t = {status: 'OK', message: `API \u670D\u52A1\u5668\u8FD0\u884C\u4E2D \u{1F449} ${e}`, timestamp: O(), uptime: process.uptime(), memoryUsage: process.memoryUsage()};
+    (r.get(e, (s, n) => {
+      n.status(200).json(t);
+    }),
+      r.get(`${e}/health`.replace('//', '/'), (s, n) => {
+        n.status(200).json(t);
+      }));
+  },
+  W = ({target: r = 'http://', prefix: e, withPrefix: t, preserve: s = !0, ...n} = {}) => ({
     target: r,
-    pathRewrite: e?.length > 1 ? {[`^${e}`]: ''} : void 0,
     changeOrigin: !0,
     selfHandleResponse: !1,
     on: {
-      proxyReq: (o, n, a) => (!s && w(o.headers, r), S(o, n, a)),
-      proxyRes: (o, n, a) => {
-        !s && g(o.headers);
+      proxyReq: (a, o, i) => (!s && A(a.headers, r), k(a, o, i)),
+      proxyRes: (a, o, i) => {
+        !s && P(a.headers);
       },
-      error: (o, n, a) => {
-        (n.log.error({err: o}, '\u4EE3\u7406\u9519\u8BEF'), a.headersSent || a.status(502).json({error: '\u7F51\u5173\u9519\u8BEF'}));
+      error: (a, o, i) => {
+        (o.log.error({err: a}, '\u4EE3\u7406\u9519\u8BEF'), i.headersSent || i.status(502).json({error: '\u7F51\u5173\u9519\u8BEF'}));
       },
     },
-    ...t,
+    ...n,
   }),
-  O = (r, e) => {
-    let t = {status: 'OK', message: `API \u670D\u52A1\u5668\u8FD0\u884C\u4E2D \u{1F449} ${e}`, timestamp: C(), uptime: process.uptime(), memoryUsage: process.memoryUsage()};
-    (r.get(e, (s, o) => {
-      o.status(200).json(t);
-    }),
-      r.get(`${e}/health`.replace('//', '/'), (s, o) => {
-        o.status(200).json(t);
-      }));
-  },
-  W = (r, e = {}, t) => {
-    let {apiPrefix: s = '/', proxys: o = [], whiteAuthKeys: n = [], whitePathList: a = [], preserve: p = !1} = e,
-      i = A(o, s);
+  B = (r, e = {}, t) => {
+    let {apiPrefix: s = '/', proxys: n = [], whiteAuthKeys: a = [], whitePathList: o = []} = e,
+      i = g(n, s);
     if (!i.length) return;
-    (t.info(`\u{1F4DD} API \u63A5\u53E3\u5730\u5740: ${e.protocol}://${e.host}:${e.port}${s}`), O(r, s));
-    let u = y({whiteAuthKeys: P(n), whitePathList: j(a, s), config: e});
-    i.map(({prefix: c, target: l, ...h}) => {
-      (r.use(c, u, E(k({prefix: c, target: l, ...h}, p))), t.info(`\u2705 \u4EE3\u7406\u4E2D ${c} \u{1F449} ${l}`));
-    });
+    t.info(`\u{1F4DD} API \u63A5\u53E3\u5730\u5740: ${e.protocol}://${e.host}:${e.port}${s}`);
+    let u = w({whiteAuthKeys: T(a), whitePathList: j(o, s), config: e});
+    return (
+      i.map(({prefix: c, target: p, withPrefix: l = !0, ...h}) => {
+        ((p = l ? `${p}${c}` : p), r.use(c, u, S(W({prefix: c, target: p, withPrefix: l, ...h}))), t.info(`\u2705 \u4EE3\u7406\u4E2D ${c} \u{1F449} ${p}`));
+      }),
+      !0
+    );
   },
-  d = W;
-var B = {
+  m = B;
+var M = {
     port: parseInt(process.env.PORT || '8080', 10),
     host: process.env.HOST || 'localhost',
     apiPrefix: process.env.API_PREFIX || '/',
@@ -119,22 +122,24 @@ var B = {
     expiresIn: process.env.JWT_EXPIRES_IN || '30d',
     issuer: process.env.JWT_ISSUER || 'huxyApp',
   },
-  f = B;
+  f = M;
 var U = (r, e) =>
-    M({...f, ...r}, async (t, s, o, n) => {
-      (await e?.(t, s, o, n), d(s, t, n));
+    C({...f, ...r}, async (t, s, n, a) => {
+      let o = m(s, t, a);
+      (await e?.(t, s, n, a), o && d(s, t.apiPrefix));
     }),
-  he = U,
-  de = (r, e) =>
-    L({...f, ...r}, async (t, s, o, n) => {
-      (await e?.(t, s, o, n), d(s, t, n));
+  de = U,
+  he = (r, e) =>
+    L({...f, ...r}, async (t, s, n, a) => {
+      let o = m(s, t, a);
+      (await e?.(t, s, n, a), d(s, t.apiPrefix), o && d(s, t.apiPrefix));
     });
 export {
-  d as appProxy,
+  m as appProxy,
   ie as checkPort,
   re as createLogger,
   se as dateTime,
-  he as default,
+  de as default,
   pe as getDirName,
   ne as getEnvConfig,
   oe as localIPs,
@@ -142,7 +147,7 @@ export {
   ae as nodeArgs,
   ce as resolvePath,
   U as startApp,
-  M as startServer,
+  C as startServer,
   L as startStatic,
-  de as startStaticApp,
+  he as startStaticApp,
 };