@ikenxuan/amagi 5.0.1 → 5.0.3

package/dist/default/cjs/index.cjs

@@ -27,7 +27,7 @@ var express__default = /*#__PURE__*/_interopDefault(express);
  * GPL-3.0 Licensed
  */
 
-// node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.3_tsx@4.20.3_typescript@5.8.3/node_modules/tsup/assets/cjs_shims.js
+// node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.3_tsx@4.20.3_typescript@5.9.2/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 var getPackageLogsPath = () => {
@@ -167,9 +167,16 @@ var logMiddleware = (pathsToLog) => {
     next();
   };
 };
+var cleanUserAgent = (userAgent) => {
+  return userAgent.replace(/\s+Edg\/[\d\.]+/g, "");
+};
 var fetchData = async (config) => {
   try {
-    const response = await axios__default.default(config);
+    const cleanedConfig = { ...config };
+    if (cleanedConfig.headers && cleanedConfig.headers["User-Agent"]) {
+      cleanedConfig.headers["User-Agent"] = cleanUserAgent(cleanedConfig.headers["User-Agent"]);
+    }
+    const response = await axios__default.default(cleanedConfig);
     if (response.status === 429) {
       logger.error("HTTP \u54CD\u5E94\u72B6\u6001\u7801: 429");
       throw new Error("ratelimit triggered, \u89E6\u53D1\u901F\u7387\u9650\u5236\uFF01");
@@ -185,7 +192,11 @@ var fetchData = async (config) => {
 };
 var fetchResponse = async (config) => {
   try {
-    return await axios__default.default(config);
+    const cleanedConfig = { ...config };
+    if (cleanedConfig.headers && cleanedConfig.headers["User-Agent"]) {
+      cleanedConfig.headers["User-Agent"] = cleanUserAgent(cleanedConfig.headers["User-Agent"]);
+    }
+    return await axios__default.default(cleanedConfig);
   } catch (error) {
     if (error instanceof axios.AxiosError) {
       throw error;
@@ -444,7 +455,8 @@ var generateSecChUa = (userAgent) => {
 };
 var getDouyinDefaultConfig = (cookie, requestConfig) => {
   var _a;
-  const finalUserAgent = ((_a = void 0 ) == null ? void 0 : _a["User-Agent"]) || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36";
+  let finalUserAgent = ((_a = void 0 ) == null ? void 0 : _a["User-Agent"]) || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36";
+  finalUserAgent = finalUserAgent.replace(/\s+Edg\/[\d\.]+/g, "");
   const defHeaders = {
     Accept: "application/json, text/plain, */*",
     "Accept-Encoding": "gzip, deflate, br, zstd",
@@ -723,11 +735,46 @@ var fetchBilibili = async (data2, cookie, requestConfig) => {
       return result;
     }
     case "\u4E8C\u7EF4\u7801\u72B6\u6001": {
-      const result = await getHeadersAndData({
-        ...baseRequestConfig,
-        url: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
-      });
-      return result;
+      try {
+        const result = await getHeadersAndData({
+          ...baseRequestConfig,
+          url: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
+        });
+        if (result.data.code !== 0) {
+          const errorMessage = bilibiliErrorCodeMap[String(result.data.code)] || result.data.message || "\u672A\u77E5\u9519\u8BEF";
+          const Err = {
+            errorDescription: `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u539F\u56E0\uFF1A${errorMessage}\uFF01`,
+            requestType: data2.methodType,
+            requestUrl: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
+          };
+          return {
+            code: result.data.code,
+            data: result.data,
+            amagiError: Err
+          };
+        }
+        return {
+          code: 0,
+          data: {
+            data: result.data.data,
+            headers: result.headers
+          },
+          message: "0"
+        };
+      } catch (error) {
+        if (error && typeof error === "object") {
+          return error;
+        }
+        return {
+          code: "UNKNOWN_ERROR" /* UNKNOWN */,
+          data: error.data,
+          amagiError: {
+            errorDescription: "\u672A\u77E5\u9519\u8BEF",
+            requestType: data2.methodType,
+            requestUrl: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
+          }
+        };
+      }
     }
     case "\u767B\u5F55\u57FA\u672C\u4FE1\u606F": {
       const result = await GlobalGetData(data2.methodType, {
@@ -1229,8 +1276,12 @@ function generate_random_str() {
   random_str_list = random_str_list.concat(gener_random(Math.random() * 1e4, [1, 5]));
   return String.fromCharCode.apply(null, random_str_list);
 }
+var cleanUserAgentForSigning = (userAgent) => {
+  return userAgent.replace(/\s+Edg\/[\d\.]+/g, "");
+};
 var a_bogus_default = (url, user_agent) => {
-  let result_str = generate_random_str() + generate_rc4_bb_str(new URLSearchParams(new URL(url).search).toString(), user_agent, "1536|747|1536|834|0|30|0|0|1536|834|1536|864|1525|747|24|24|Win32");
+  const cleanedUserAgent = cleanUserAgentForSigning(user_agent);
+  let result_str = generate_random_str() + generate_rc4_bb_str(new URLSearchParams(new URL(url).search).toString(), cleanedUserAgent, "1536|747|1536|834|0|30|0|0|1536|834|1536|864|1525|747|24|24|Win32");
   return result_encrypt(result_str, "s4") + "=";
 };
 
@@ -3345,9 +3396,6 @@ var createAmagiClient = (options) => {
     });
     return app;
   };
-  const startClient = (port = 4567) => {
-    return startServer(port);
-  };
   const getDouyinDataWithCookie = async (methodType, options2) => {
     return await getDouyinData(methodType, options2, douyinCookie, requestConfig);
   };
@@ -3360,8 +3408,6 @@ var createAmagiClient = (options) => {
   return {
     /** 启动本地HTTP服务 */
     startServer,
-    /** @deprecated 此方法已废弃，请使用 startServer 方法代替 */
-    startClient,
     getDouyinData: getDouyinDataWithCookie,
     getBilibiliData: getBilibiliDataWithCookie,
     getKuaishouData: getKuaishouDataWithCookie,

package/dist/default/esm/index.mjs

@@ -151,9 +151,16 @@ var logMiddleware = (pathsToLog) => {
     next();
   };
 };
+var cleanUserAgent = (userAgent) => {
+  return userAgent.replace(/\s+Edg\/[\d\.]+/g, "");
+};
 var fetchData = async (config) => {
   try {
-    const response = await axios(config);
+    const cleanedConfig = { ...config };
+    if (cleanedConfig.headers && cleanedConfig.headers["User-Agent"]) {
+      cleanedConfig.headers["User-Agent"] = cleanUserAgent(cleanedConfig.headers["User-Agent"]);
+    }
+    const response = await axios(cleanedConfig);
     if (response.status === 429) {
       logger.error("HTTP \u54CD\u5E94\u72B6\u6001\u7801: 429");
       throw new Error("ratelimit triggered, \u89E6\u53D1\u901F\u7387\u9650\u5236\uFF01");
@@ -169,7 +176,11 @@ var fetchData = async (config) => {
 };
 var fetchResponse = async (config) => {
   try {
-    return await axios(config);
+    const cleanedConfig = { ...config };
+    if (cleanedConfig.headers && cleanedConfig.headers["User-Agent"]) {
+      cleanedConfig.headers["User-Agent"] = cleanUserAgent(cleanedConfig.headers["User-Agent"]);
+    }
+    return await axios(cleanedConfig);
   } catch (error) {
     if (error instanceof AxiosError) {
       throw error;
@@ -428,7 +439,8 @@ var generateSecChUa = (userAgent) => {
 };
 var getDouyinDefaultConfig = (cookie, requestConfig) => {
   var _a;
-  const finalUserAgent = ((_a = void 0 ) == null ? void 0 : _a["User-Agent"]) || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36";
+  let finalUserAgent = ((_a = void 0 ) == null ? void 0 : _a["User-Agent"]) || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36";
+  finalUserAgent = finalUserAgent.replace(/\s+Edg\/[\d\.]+/g, "");
   const defHeaders = {
     Accept: "application/json, text/plain, */*",
     "Accept-Encoding": "gzip, deflate, br, zstd",
@@ -707,11 +719,46 @@ var fetchBilibili = async (data2, cookie, requestConfig) => {
       return result;
     }
     case "\u4E8C\u7EF4\u7801\u72B6\u6001": {
-      const result = await getHeadersAndData({
-        ...baseRequestConfig,
-        url: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
-      });
-      return result;
+      try {
+        const result = await getHeadersAndData({
+          ...baseRequestConfig,
+          url: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
+        });
+        if (result.data.code !== 0) {
+          const errorMessage = bilibiliErrorCodeMap[String(result.data.code)] || result.data.message || "\u672A\u77E5\u9519\u8BEF";
+          const Err = {
+            errorDescription: `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u539F\u56E0\uFF1A${errorMessage}\uFF01`,
+            requestType: data2.methodType,
+            requestUrl: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
+          };
+          return {
+            code: result.data.code,
+            data: result.data,
+            amagiError: Err
+          };
+        }
+        return {
+          code: 0,
+          data: {
+            data: result.data.data,
+            headers: result.headers
+          },
+          message: "0"
+        };
+      } catch (error) {
+        if (error && typeof error === "object") {
+          return error;
+        }
+        return {
+          code: "UNKNOWN_ERROR" /* UNKNOWN */,
+          data: error.data,
+          amagiError: {
+            errorDescription: "\u672A\u77E5\u9519\u8BEF",
+            requestType: data2.methodType,
+            requestUrl: bilibiliApiUrls.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key })
+          }
+        };
+      }
     }
     case "\u767B\u5F55\u57FA\u672C\u4FE1\u606F": {
       const result = await GlobalGetData(data2.methodType, {
@@ -1213,8 +1260,12 @@ function generate_random_str() {
   random_str_list = random_str_list.concat(gener_random(Math.random() * 1e4, [1, 5]));
   return String.fromCharCode.apply(null, random_str_list);
 }
+var cleanUserAgentForSigning = (userAgent) => {
+  return userAgent.replace(/\s+Edg\/[\d\.]+/g, "");
+};
 var a_bogus_default = (url, user_agent) => {
-  let result_str = generate_random_str() + generate_rc4_bb_str(new URLSearchParams(new URL(url).search).toString(), user_agent, "1536|747|1536|834|0|30|0|0|1536|834|1536|864|1525|747|24|24|Win32");
+  const cleanedUserAgent = cleanUserAgentForSigning(user_agent);
+  let result_str = generate_random_str() + generate_rc4_bb_str(new URLSearchParams(new URL(url).search).toString(), cleanedUserAgent, "1536|747|1536|834|0|30|0|0|1536|834|1536|864|1525|747|24|24|Win32");
   return result_encrypt(result_str, "s4") + "=";
 };
 
@@ -3329,9 +3380,6 @@ var createAmagiClient = (options) => {
     });
     return app;
   };
-  const startClient = (port = 4567) => {
-    return startServer(port);
-  };
   const getDouyinDataWithCookie = async (methodType, options2) => {
     return await getDouyinData(methodType, options2, douyinCookie, requestConfig);
   };
@@ -3344,8 +3392,6 @@ var createAmagiClient = (options) => {
   return {
     /** 启动本地HTTP服务 */
     startServer,
-    /** @deprecated 此方法已废弃，请使用 startServer 方法代替 */
-    startClient,
     getDouyinData: getDouyinDataWithCookie,
     getBilibiliData: getBilibiliDataWithCookie,
     getKuaishouData: getKuaishouDataWithCookie,

package/dist/default/index.d.ts

@@ -1,7 +1,7 @@
+import { AxiosResponse, AxiosRequestConfig } from 'axios';
 import { z } from 'zod';
 import * as express from 'express';
 import express__default, { Router, RequestHandler } from 'express';
-import { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { ChalkInstance } from 'chalk';
 
 /**
@@ -9709,18 +9709,17 @@ type StudioInfo = {
 };
 
 type BiliCheckQrcode = {
-    data: CheckQrcodeData;
-    headers: Headers;
-    [property: string]: any;
-};
-type CheckQrcodeData = {
     code: number;
-    data: DataData$1;
+    data: PurpleData;
     message: string;
-    ttl: number;
     [property: string]: any;
 };
-type DataData$1 = {
+type PurpleData = {
+    data: FluffyData;
+    headers: AxiosResponse['headers'];
+    [property: string]: any;
+};
+type FluffyData = {
     code: number;
     message: string;
     refresh_token: string;
@@ -9728,21 +9727,6 @@ type DataData$1 = {
     url: string;
     [property: string]: any;
 };
-type Headers = {
-    'bili-status-code': string;
-    'bili-trace-id': string;
-    'cache-control': string;
-    connection: string;
-    'content-type': string;
-    cpu_usage: string;
-    date: string;
-    expires: string;
-    'transfer-encoding': string;
-    'x-bili-trace-id': string;
-    'x-cache-webcdn': string;
-    'x-ticket-status': string;
-    [property: string]: any;
-};
 
 type BiliNewLoginQrcode = {
     code: number;
@@ -14291,8 +14275,6 @@ type Options = {
 declare const createAmagiClient: (options?: Options) => {
     /** 启动本地HTTP服务 */
     startServer: (port?: number) => express__default.Application;
-    /** @deprecated 此方法已废弃，请使用 startServer 方法代替 */
-    startClient: (port?: number) => express__default.Application;
     getDouyinData: <T extends DouyinMethodType, M extends TypeMode>(methodType: T, options?: ExtendedDouyinOptions<T> & {
         typeMode?: M;
     }) => Promise<ApiResponse<ConditionalReturnType<DouyinDataOptionsMap[T]["data"], M>>>;
@@ -16180,7 +16162,7 @@ declare const fetchResponse: <T = unknown>(config: AxiosRequestConfig) => Promis
  * @returns 包含headers和data的对象
  */
 declare const getHeadersAndData: <T = any>(config: AxiosRequestConfig) => Promise<{
-    headers: Record<string, string>;
+    headers: AxiosResponse<T>["headers"];
     data: T;
 }>;
 
@@ -16248,7 +16230,6 @@ declare const handleError: (error: unknown, requestPath?: string) => {
  */
 declare const amagiClient: (options?: Options) => {
     startServer: (port?: number) => express.Application;
-    startClient: (port?: number) => express.Application;
     getDouyinData: <T extends DouyinMethodType, M extends TypeMode>(methodType: T, options?: ExtendedDouyinOptions<T> & {
         typeMode?: M;
     }) => Promise<ApiResponse<ConditionalReturnType<DouyinDataOptionsMap[T]["data"], M>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "douyin",