@ikenxuan/amagi 5.0.2 → 5.0.3

package/dist/default/cjs/index.cjs

@@ -735,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, {

package/dist/default/esm/index.mjs

@@ -719,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, {

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;
@@ -16178,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;
 }>;
 

package/package.json

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