@ikenxuan/amagi 4.4.7-pr103.ca19953 → 4.4.8

package/dist/default/cjs/index.cjs

@@ -4,17 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var axios = require('axios');
 var crypto = require('crypto');
+var express = require('express');
 var chalk = require('chalk');
 var log4js = require('log4js');
-var express = require('express');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
+var express__default = /*#__PURE__*/_interopDefault(express);
 var chalk__default = /*#__PURE__*/_interopDefault(chalk);
 var log4js__default = /*#__PURE__*/_interopDefault(log4js);
-var express__default = /*#__PURE__*/_interopDefault(express);
 
 // src/platform/bilibili/API.ts
 var BiLiBiLiAPI = class {
@@ -535,9 +535,8 @@ async function wbi_sign(BASEURL, cookie) {
   const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
   return query;
 }
-
-// src/platform/bilibili/routes.ts
-var registerBilibiliRoutes = (router, cookie) => {
+var registerBilibiliRoutes = (cookie) => {
+  const router = express__default.default.Router();
   router.get("/new_login_qrcode", async (req, res) => {
     const data2 = await BilibiliData({
       methodType: "\u7533\u8BF7\u4E8C\u7EF4\u7801"
@@ -1384,9 +1383,8 @@ async function GlobalGetData2(options) {
   }
   return ResponseData;
 }
-
-// src/platform/douyin/routes.ts
-var registerDouyinRoutes = (router, cookie) => {
+var registerDouyinRoutes = (cookie) => {
+  const router = express__default.default.Router();
   router.get("/fetch_one_work", async (req, res) => {
     const data2 = await DouyinData({
       methodType: "\u805A\u5408\u89E3\u6790",
@@ -1590,9 +1588,8 @@ async function GlobalGetData3(options) {
   }
   return ResponseData;
 }
-
-// src/platform/kuaishou/routes.ts
-var registerKuaishouRoutes = (router, cookie) => {
+var registerKuaishouRoutes = (cookie) => {
+  const router = express__default.default.Router();
   router.get("/fetch_one_work", async (req, res) => {
     const data2 = await KuaishouData({
       methodType: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E",
@@ -1739,17 +1736,21 @@ var CustomLogger = class {
   }
 };
 var logger = new CustomLogger("default");
-var logMiddleware = (req, res, next) => {
-  const startTime = Date.now();
-  const url = req.url;
-  const method = req.method;
-  const clientIP = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
-  res.on("finish", () => {
-    const responseTime = Date.now() - startTime;
-    const statusCode = res.statusCode;
-    logger.info(`[${method}] ${url} (Status: ${statusCode}, Time: ${responseTime}ms, Client: ${clientIP})`);
-  });
-  next();
+var logMiddleware = (pathsToLog) => {
+  return (req, res, next) => {
+    if (!pathsToLog || pathsToLog.some((path) => req.url.startsWith(path))) {
+      const startTime = Date.now();
+      const url = req.url;
+      const method = req.method;
+      const clientIP = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
+      res.on("finish", () => {
+        const responseTime = Date.now() - startTime;
+        const statusCode = res.statusCode;
+        logger.info(`[${method}] ${url} (Status: ${statusCode}, Time: ${responseTime}ms, Client: ${clientIP})`);
+      });
+    }
+    next();
+  };
 };
 var Networks = class {
   url;
@@ -1932,17 +1933,16 @@ var amagi = class {
    */
   startClient(port = 4567) {
     const app = express__default.default();
-    const router = express.Router();
     app.get("/", (_req, res) => {
       res.redirect(301, "https://amagi.apifox.cn");
     });
     app.get("/docs", (_req, res) => {
       res.redirect(301, "https://amagi.apifox.cn");
     });
-    app.use("/api/kuaishou", registerKuaishouRoutes(router, this.kuaishou));
-    app.use("/api/douyin", registerDouyinRoutes(router, this.douyin));
-    app.use("/api/bilibili", registerBilibiliRoutes(router, this.bilibili));
-    app.use(logMiddleware);
+    app.use(logMiddleware(["/api/douyin", "/api/bilibili", "/api/kuaishou"]));
+    app.use("/api/douyin", registerDouyinRoutes(this.douyin));
+    app.use("/api/bilibili", registerBilibiliRoutes(this.bilibili));
+    app.use("/api/kuaishou", registerKuaishouRoutes(this.kuaishou));
     app.listen(port, "::", () => {
       logger.mark(`Amagi server listening on ${logger.green(`http://localhost:${port}`)} ${logger.yellow("API docs: https://amagi.apifox.cn ")}`);
     });

package/dist/default/esm/index.mjs

@@ -1,8 +1,8 @@
 import axios, { AxiosError } from 'axios';
 import crypto from 'crypto';
+import express from 'express';
 import chalk from 'chalk';
 import log4js from 'log4js';
-import express, { Router } from 'express';
 
 // src/platform/bilibili/API.ts
 var BiLiBiLiAPI = class {
@@ -523,9 +523,8 @@ async function wbi_sign(BASEURL, cookie) {
   const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
   return query;
 }
-
-// src/platform/bilibili/routes.ts
-var registerBilibiliRoutes = (router, cookie) => {
+var registerBilibiliRoutes = (cookie) => {
+  const router = express.Router();
   router.get("/new_login_qrcode", async (req, res) => {
     const data2 = await BilibiliData({
       methodType: "\u7533\u8BF7\u4E8C\u7EF4\u7801"
@@ -1372,9 +1371,8 @@ async function GlobalGetData2(options) {
   }
   return ResponseData;
 }
-
-// src/platform/douyin/routes.ts
-var registerDouyinRoutes = (router, cookie) => {
+var registerDouyinRoutes = (cookie) => {
+  const router = express.Router();
   router.get("/fetch_one_work", async (req, res) => {
     const data2 = await DouyinData({
       methodType: "\u805A\u5408\u89E3\u6790",
@@ -1578,9 +1576,8 @@ async function GlobalGetData3(options) {
   }
   return ResponseData;
 }
-
-// src/platform/kuaishou/routes.ts
-var registerKuaishouRoutes = (router, cookie) => {
+var registerKuaishouRoutes = (cookie) => {
+  const router = express.Router();
   router.get("/fetch_one_work", async (req, res) => {
     const data2 = await KuaishouData({
       methodType: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E",
@@ -1727,17 +1724,21 @@ var CustomLogger = class {
   }
 };
 var logger = new CustomLogger("default");
-var logMiddleware = (req, res, next) => {
-  const startTime = Date.now();
-  const url = req.url;
-  const method = req.method;
-  const clientIP = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
-  res.on("finish", () => {
-    const responseTime = Date.now() - startTime;
-    const statusCode = res.statusCode;
-    logger.info(`[${method}] ${url} (Status: ${statusCode}, Time: ${responseTime}ms, Client: ${clientIP})`);
-  });
-  next();
+var logMiddleware = (pathsToLog) => {
+  return (req, res, next) => {
+    if (!pathsToLog || pathsToLog.some((path) => req.url.startsWith(path))) {
+      const startTime = Date.now();
+      const url = req.url;
+      const method = req.method;
+      const clientIP = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
+      res.on("finish", () => {
+        const responseTime = Date.now() - startTime;
+        const statusCode = res.statusCode;
+        logger.info(`[${method}] ${url} (Status: ${statusCode}, Time: ${responseTime}ms, Client: ${clientIP})`);
+      });
+    }
+    next();
+  };
 };
 var Networks = class {
   url;
@@ -1920,17 +1921,16 @@ var amagi = class {
    */
   startClient(port = 4567) {
     const app = express();
-    const router = Router();
     app.get("/", (_req, res) => {
       res.redirect(301, "https://amagi.apifox.cn");
     });
     app.get("/docs", (_req, res) => {
       res.redirect(301, "https://amagi.apifox.cn");
     });
-    app.use("/api/kuaishou", registerKuaishouRoutes(router, this.kuaishou));
-    app.use("/api/douyin", registerDouyinRoutes(router, this.douyin));
-    app.use("/api/bilibili", registerBilibiliRoutes(router, this.bilibili));
-    app.use(logMiddleware);
+    app.use(logMiddleware(["/api/douyin", "/api/bilibili", "/api/kuaishou"]));
+    app.use("/api/douyin", registerDouyinRoutes(this.douyin));
+    app.use("/api/bilibili", registerBilibiliRoutes(this.bilibili));
+    app.use("/api/kuaishou", registerKuaishouRoutes(this.kuaishou));
     app.listen(port, "::", () => {
       logger.mark(`Amagi server listening on ${logger.green(`http://localhost:${port}`)} ${logger.yellow("API docs: https://amagi.apifox.cn ")}`);
     });

package/dist/default/index.d.ts

@@ -13664,7 +13664,12 @@ declare class CustomLogger {
 }
 declare const logger: CustomLogger;
 
-declare const logMiddleware: RequestHandler;
+/**
+ * 创建一个日志中间件，用于记录特定请求的详细信息
+ * @param pathsToLog 指定需要记录日志的请求路径数组如果未提供，则记录所有请求的日志
+ * @returns
+ */
+declare const logMiddleware: (pathsToLog?: string[]) => RequestHandler;
 
 interface HeadersObject {
     [key: string]: string;
@@ -13769,10 +13774,9 @@ interface BilibiliRequest<T extends keyof BilibiliDataOptionsMap> extends Reques
 }
 /**
  * 注册B站相关的API接口路由
- * @param router - 路由实例
  * @param cookie - 有效的cookie
  */
-declare const registerBilibiliRoutes: (router: Router, cookie: string) => Router;
+declare const registerBilibiliRoutes: (cookie: string) => Router;
 
 declare function av2bv(aid: number): `BV1${string}`;
 declare function bv2av(bvid: string): number;
@@ -13816,10 +13820,9 @@ interface DouyinRequest<T extends keyof DouyinDataOptionsMap> extends Request {
 }
 /**
  * 注册抖音相关的API接口路由
- * @param router - 路由实例
  * @param cookie - 有效的cookie
  */
-declare const registerDouyinRoutes: (router: Router, cookie: string) => Router;
+declare const registerDouyinRoutes: (cookie: string) => Router;
 
 type KuaishouMethodOptionsWithoutMethodType = {
     [K in keyof KuaishouMethodOptionsMap]: OmitMethodType<KuaishouMethodOptionsMap[K]>;
@@ -13875,10 +13878,9 @@ interface KusiahouRequest<T extends keyof KuaishouDataOptionsMap> extends Reques
 }
 /**
  * 注册快手相关的API接口路由
- * @param router - 路由实例
  * @param cookie - 有效的cookie
  */
-declare const registerKuaishouRoutes: (router: Router, cookie: string) => Router;
+declare const registerKuaishouRoutes: (cookie: string) => Router;
 
 type ckParams = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "4.4.7-pr103.ca19953",
+  "version": "4.4.8",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "douyin",
@@ -62,6 +62,24 @@
     "log4js": "6.9.0",
     "pino-pretty": "^13.0.0"
   },
+  "devDependencies": {
+    "@eslint/js": "^9.17.0",
+    "@swc/core": "^1.10.12",
+    "@types/express": "^4.17.21",
+    "@types/lodash": "^4.17.13",
+    "@types/node": "^22.10.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
+    "eslint": "^9.17.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "globals": "^15.14.0",
+    "neostandard": "^0.12.0",
+    "sort-package-json": "^2.12.0",
+    "tsc-alias": "^1.8.10",
+    "tsup": "^8.3.6",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2"
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"