huxy-server 1.0.5 → 1.0.7

package/package.json

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

package/src/index.js

@@ -1,20 +1,20 @@
 import {
-  startServer as W,
+  startServer as M,
   startStatic as L,
-  logger as q,
-  createLogger as ee,
-  dateTime as te,
-  localIPs as re,
-  nodeArgs as se,
-  getEnvConfig as oe,
-  checkPort as ae,
-  getDirName as ne,
-  resolvePath as ie,
+  logger as te,
+  createLogger as re,
+  dateTime as se,
+  localIPs as oe,
+  nodeArgs as ae,
+  getEnvConfig as ne,
+  checkPort as ie,
+  getDirName as pe,
+  resolvePath as ce,
 } from 'huxy-node-server';
-import {createProxyMiddleware as I} from 'http-proxy-middleware';
-import {dateTime as $} 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 f = (r, e = {secret, ...opt}) => T.verify(r, secret, opt);
+var m = (r, e = {secret, ...opt}) => T.verify(r, secret, opt);
 var x =
   (r = {}) =>
   (e, t, s) => {
@@ -25,7 +25,7 @@ var x =
     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'}));
     try {
-      let a = f(n, r);
+      let a = m(n, r);
       (e.log.info(a, '\u8BA4\u8BC1\u6210\u529F'), (e.user = a), s());
     } catch (a) {
       return a.name === 'TokenExpiredError'
@@ -37,56 +37,58 @@ var x =
             : (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'}));
     }
   };
-var v =
+var H =
     ({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 i = s.headers['x-huxy-auth'] || s.headers['x-api-key'];
+      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: c, expiresIn: l, algorithm: p, issuer: h} = t;
-      x({secret: c, expiresIn: l, algorithm: p, issuer: h})(s, o, n);
+      let {secret: u, expiresIn: c, algorithm: l, issuer: h} = t;
+      x({secret: u, expiresIn: c, algorithm: l, issuer: h})(s, o, n);
     },
-  y = v;
-var H = ['x-powered-by', 'server'],
+  y = H;
+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) => {
     let t = new Headers(r);
-    return (headersToRemove.forEach(s => t.delete(s)), t.set('Host', e), t.set('User-Agent', 'IHUXY-API/1.0'), t);
+    return (v.forEach(s => t.delete(s)), t.set('Host', e), t.set('User-Agent', 'IHUXY-API/1.0'), t);
   },
   g = r => {
     let e = new Headers(r);
     return (
-      H.forEach(t => e.delete(t)),
+      $.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 R = r => Object.prototype.toString.call(r).slice(8, -1).toLowerCase(),
-  E = r => (R(r) === 'object' ? [r] : Array.isArray(r) ? r : []),
-  A = (r, e) => E(r).map(t => ((t.prefix = `${e}${t.prefix ?? `/${t.name}`}`.replace('//', '/')), t)),
-  u = r => (Array.isArray(r) ? r : []).filter(Boolean),
-  P = (r, e) => ['/', '/health', e, ...u(r)].map(t => `${e}${t}`.replace('//', '/'));
-var S = ({target: r = 'http://localhost:11434', prefix: e = '/api', ...t} = {}, s = !1) => ({
+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),
+  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) => ({
     target: r,
-    pathRewrite: {[`^${e}`]: ''},
+    pathRewrite: e?.length > 1 ? {[`^${e}`]: ''} : void 0,
     changeOrigin: !0,
     selfHandleResponse: !1,
-    onProxyReq: (o, n, a) => {
-      !s && w(o.headers, r);
-    },
-    onProxyRes: (o, n, a) => {
-      !s && g(o.headers);
-    },
-    onError: (o, n, a) => {
-      (n.log.error({err: o}, '\u4EE3\u7406\u9519\u8BEF'), a.headersSent || a.status(502).json({error: '\u7F51\u5173\u9519\u8BEF'}));
+    on: {
+      proxyReq: (o, n, a) => (!s && w(o.headers, r), S(o, n, a)),
+      proxyRes: (o, n, a) => {
+        !s && g(o.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'}));
+      },
     },
     ...t,
   }),
-  k = (r, e) => {
-    let t = {status: 'OK', message: `API \u670D\u52A1\u5668\u8FD0\u884C\u4E2D \u{1F449} ${e}`, timestamp: $(), uptime: process.uptime(), memoryUsage: process.memoryUsage()};
+  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);
     }),
@@ -94,54 +96,53 @@ var S = ({target: r = 'http://localhost:11434', prefix: e = '/api', ...t} = {},
         o.status(200).json(t);
       }));
   },
-  C = (r, e = {}, t) => {
-    let {apiPrefix: s, proxys: o = [], whiteAuthKeys: n = [], whitePathList: a = [], preserve: i = !1} = e,
-      c = A(o, s);
-    if (!c.length) return;
-    (t.info(`\u{1F4DD} API \u63A5\u53E3\u5730\u5740: http://${e.host}:${e.port}${s}`), k(r, s));
-    let l = y({whiteAuthKeys: u(n), whitePathList: P(a, s), config: e});
-    c.map(({prefix: p, target: h}) => {
-      let j = S({prefix: p, target: h}, i);
-      (r.use(p, l, I(j)), t.info(`\u2705 \u4EE3\u7406\u4E2D ${p} \u{1F449} ${h}`));
+  W = (r, e = {}, t) => {
+    let {apiPrefix: s = '/', proxys: o = [], whiteAuthKeys: n = [], whitePathList: a = [], preserve: p = !1} = e,
+      i = A(o, 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}`));
     });
   },
-  d = C;
-var O = {
+  d = W;
+var B = {
     port: parseInt(process.env.PORT || '8080', 10),
     host: process.env.HOST || 'localhost',
-    apiPrefix: process.env.API_PREFIX || '/api',
+    apiPrefix: process.env.API_PREFIX || '/',
     authToken: !1,
     proxys: [],
     whitePathList: ['/health'],
     algorithm: 'HS256',
-    secret: process.env.JWT_SECRET || 'ah.yiru@gmail.com',
+    secret: process.env.JWT_SECRET || 'hy123',
     expiresIn: process.env.JWT_EXPIRES_IN || '30d',
     issuer: process.env.JWT_ISSUER || 'huxyApp',
   },
-  m = O;
-var M = (r, e) =>
-    W({...m, ...r}, async (t, s, o, n) => {
+  f = B;
+var U = (r, e) =>
+    M({...f, ...r}, async (t, s, o, n) => {
       (await e?.(t, s, o, n), d(s, t, n));
     }),
-  he = M,
-  le = (r, e) =>
-    L({...m, ...r}, async (t, s, o, n) => {
+  he = U,
+  de = (r, e) =>
+    L({...f, ...r}, async (t, s, o, n) => {
       (await e?.(t, s, o, n), d(s, t, n));
     });
 export {
   d as appProxy,
-  ae as checkPort,
-  ee as createLogger,
-  te as dateTime,
+  ie as checkPort,
+  re as createLogger,
+  se as dateTime,
   he as default,
-  ne as getDirName,
-  oe as getEnvConfig,
-  re as localIPs,
-  q as logger,
-  se as nodeArgs,
-  ie as resolvePath,
-  M as startApp,
-  W as startServer,
+  pe as getDirName,
+  ne as getEnvConfig,
+  oe as localIPs,
+  te as logger,
+  ae as nodeArgs,
+  ce as resolvePath,
+  U as startApp,
+  M as startServer,
   L as startStatic,
-  le as startStaticApp,
+  de as startStaticApp,
 };