@ikenxuan/amagi 4.3.2 → 4.4.0

package/dist/cjs/index.cjs

@@ -1283,7 +1283,7 @@ var DouyinData = async (data2, cookie) => {
         const url = douyinAPI.\u641C\u7D22({
           query: data2.query,
           number: requestCount,
-          search_id: search_id === "" ? undefined : search_id
+          search_id: search_id === "" ? void 0 : search_id
         });
         const response = await GlobalGetData2({
           url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1656,18 +1656,45 @@ var registerKuaishouRoutes = (fastify, cookie) => {
 };
 
 // src/model/DataFetchers.ts
-var getDouyinData = async (type, cookie, options) => {
+async function getDouyinData(type, arg2, arg3) {
+  let cookie;
+  let options;
+  if (typeof arg2 === "string") {
+    cookie = arg2;
+    options = arg3;
+  } else {
+    options = arg2;
+    cookie = arg3;
+  }
   const data2 = await DouyinData({ ...options, methodType: type }, cookie);
   return data2;
-};
-async function getBilibiliData(methodType, cookie, options) {
+}
+async function getBilibiliData(methodType, arg2, arg3) {
+  let cookie;
+  let options;
+  if (typeof arg2 === "string") {
+    cookie = arg2;
+    options = arg3;
+  } else {
+    options = arg2;
+    cookie = arg3;
+  }
   const data2 = await BilibiliData({ ...options, methodType }, cookie);
   return data2;
 }
-var getKuaishouData = async (methodType, cookie, options) => {
+async function getKuaishouData(methodType, arg2, arg3) {
+  let cookie;
+  let options;
+  if (typeof arg2 === "string") {
+    cookie = arg2;
+    options = arg3;
+  } else {
+    options = arg2;
+    cookie = arg3;
+  }
   const data2 = await KuaishouData({ ...options, methodType }, cookie);
   return data2;
-};
+}
 var fetchDouyinData = getDouyinData;
 var fetchBilibiliData = getBilibiliData;
 var fetchKuaishouData = getKuaishouData;
@@ -1771,7 +1798,7 @@ var Networks = class {
     this.data = {};
     this.timeout = data2.timeout ?? 15e3;
     this.isGetResult = false;
-    this.timer = undefined;
+    this.timer = void 0;
     this.axiosInstance = axios__default.default.create({
       timeout: this.timeout,
       headers: this.headers,
@@ -1902,9 +1929,9 @@ var amagi = class {
    * @param cookie - 包含抖音ck、B站ck、快手ck的对象
    */
   constructor(data2) {
-    this.douyin = (data2 == null ? undefined : data2.douyin) ?? "";
-    this.bilibili = (data2 == null ? undefined : data2.bilibili) ?? "";
-    this.kuaishou = (data2 == null ? undefined : data2.kuaishou) ?? "";
+    this.douyin = (data2 == null ? void 0 : data2.douyin) ?? "";
+    this.bilibili = (data2 == null ? void 0 : data2.bilibili) ?? "";
+    this.kuaishou = (data2 == null ? void 0 : data2.kuaishou) ?? "";
   }
   /**
    * 启动本地http服务

package/dist/esm/index.mjs

@@ -1271,7 +1271,7 @@ var DouyinData = async (data2, cookie) => {
         const url = douyinAPI.\u641C\u7D22({
           query: data2.query,
           number: requestCount,
-          search_id: search_id === "" ? undefined : search_id
+          search_id: search_id === "" ? void 0 : search_id
         });
         const response = await GlobalGetData2({
           url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1644,18 +1644,45 @@ var registerKuaishouRoutes = (fastify, cookie) => {
 };
 
 // src/model/DataFetchers.ts
-var getDouyinData = async (type, cookie, options) => {
+async function getDouyinData(type, arg2, arg3) {
+  let cookie;
+  let options;
+  if (typeof arg2 === "string") {
+    cookie = arg2;
+    options = arg3;
+  } else {
+    options = arg2;
+    cookie = arg3;
+  }
   const data2 = await DouyinData({ ...options, methodType: type }, cookie);
   return data2;
-};
-async function getBilibiliData(methodType, cookie, options) {
+}
+async function getBilibiliData(methodType, arg2, arg3) {
+  let cookie;
+  let options;
+  if (typeof arg2 === "string") {
+    cookie = arg2;
+    options = arg3;
+  } else {
+    options = arg2;
+    cookie = arg3;
+  }
   const data2 = await BilibiliData({ ...options, methodType }, cookie);
   return data2;
 }
-var getKuaishouData = async (methodType, cookie, options) => {
+async function getKuaishouData(methodType, arg2, arg3) {
+  let cookie;
+  let options;
+  if (typeof arg2 === "string") {
+    cookie = arg2;
+    options = arg3;
+  } else {
+    options = arg2;
+    cookie = arg3;
+  }
   const data2 = await KuaishouData({ ...options, methodType }, cookie);
   return data2;
-};
+}
 var fetchDouyinData = getDouyinData;
 var fetchBilibiliData = getBilibiliData;
 var fetchKuaishouData = getKuaishouData;
@@ -1759,7 +1786,7 @@ var Networks = class {
     this.data = {};
     this.timeout = data2.timeout ?? 15e3;
     this.isGetResult = false;
-    this.timer = undefined;
+    this.timer = void 0;
     this.axiosInstance = axios.create({
       timeout: this.timeout,
       headers: this.headers,
@@ -1890,9 +1917,9 @@ var amagi = class {
    * @param cookie - 包含抖音ck、B站ck、快手ck的对象
    */
   constructor(data2) {
-    this.douyin = (data2 == null ? undefined : data2.douyin) ?? "";
-    this.bilibili = (data2 == null ? undefined : data2.bilibili) ?? "";
-    this.kuaishou = (data2 == null ? undefined : data2.kuaishou) ?? "";
+    this.douyin = (data2 == null ? void 0 : data2.douyin) ?? "";
+    this.bilibili = (data2 == null ? void 0 : data2.bilibili) ?? "";
+    this.kuaishou = (data2 == null ? void 0 : data2.kuaishou) ?? "";
   }
   /**
    * 启动本地http服务

package/dist/index.d.ts

@@ -13357,9 +13357,42 @@ type NetworksConfigType = {
 
 /** 定义一个泛型类型 OmitMethodType<T>，从类型 T 中排除 'methodType' 属性 */
 type OmitMethodType<T> = Omit<T, 'methodType'>;
-type DouyinDataOptions<T extends keyof DouyinDataOptionsMap> = OmitMethodType<DouyinDataOptionsMap[T]['opt']>;
-type BilibiliDataOptions<T extends keyof BilibiliDataOptionsMap> = OmitMethodType<BilibiliDataOptionsMap[T]['opt']>;
-type KuaishouDataOptions<T extends keyof KuaishouDataOptionsMap> = OmitMethodType<KuaishouDataOptionsMap[T]['opt']>;
+type DouyinDataOptions<T extends keyof DouyinDataOptionsMap> = OmitMethodType<DouyinDataOptionsMap[T]['opt']> & TypeControl;
+type BilibiliDataOptions<T extends keyof BilibiliDataOptionsMap> = OmitMethodType<BilibiliDataOptionsMap[T]['opt']> & TypeControl;
+type KuaishouDataOptions<T extends keyof KuaishouDataOptionsMap> = OmitMethodType<KuaishouDataOptionsMap[T]['opt']> & TypeControl;
+/** 根据 `typeMode` 定义返回类型 */
+type Fnc<T extends {
+    data: any;
+}, R extends TypeControl['typeMode']> = R extends 'strict' ? T['data'] : any;
+/**
+ * 类型精度控制参数
+ */
+type TypeControl = {
+    /**
+     * 获取返回类型
+     * 类型定义时间：2025-02-02
+     *
+     * 类型解析模式：
+     * - `strict`: 返回严格类型（基于接口响应定义，随时间推移可能缺少未声明的字段）
+     * - `loose` 或 `未指定`: 返回宽松的 any 类型（默认）
+     *
+     * @default 'loose'
+     * @example
+     * ```ts
+     * // 严格模式
+     * const data = await amagi.getDouyinData('视频作品数据', {
+     *   aweme_id: '123',
+     *   typeMode: 'strict' // 返回精确的 VideoWork 类型
+     * });
+     *
+     * // 宽松模式
+     * const data = await amagi.getDouyinData('视频作品数据', {
+     *   aweme_id: '123' // 返回 any 类型
+     * });
+     * ```
+     */
+    typeMode?: 'strict' | 'loose';
+};
 
 /**
  * 获取抖音数据
@@ -13367,46 +13400,63 @@ type KuaishouDataOptions<T extends keyof KuaishouDataOptionsMap> = OmitMethodTyp
  * @param cookie - 有效的用户Cookie
  * @param options - 请求参数，是一个对象
  * @returns 返回接口的原始数据
- * @example
- * ```ts
- * const data = await getDouyinData('搜索数据', 'User Cookies', {
- *   query: '114514',
- *   number: 10
- * })
- * ```
  */
-declare const getDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, cookie?: string, options?: DouyinDataOptions<T>) => Promise<DouyinDataOptionsMap[T]["data"]>;
+declare function getDouyinData<T extends keyof DouyinDataOptionsMap, R extends 'strict' | 'loose'>(type: T, cookie: string, options?: DouyinDataOptions<T> & {
+    typeMode?: R;
+}): Promise<Fnc<DouyinDataOptionsMap[T], R>>;
+/**
+ * 获取抖音数据
+ * @param type - 请求数据类型
+ * @param options - 请求参数，是一个对象
+ * @param cookie - 有效的用户Cookie
+ * @returns 返回接口的原始数据
+ */
+declare function getDouyinData<T extends keyof DouyinDataOptionsMap, R extends 'strict' | 'loose'>(type: T, options?: DouyinDataOptions<T> & {
+    typeMode?: R;
+}, cookie?: string): Promise<Fnc<DouyinDataOptionsMap[T], R>>;
 /**
  * 获取B站数据
  * @param type - 请求数据类型
  * @param cookie - 有效的用户Cookie
  * @param options - 请求参数，是一个对象
  * @returns 返回接口的原始数据
- * @example
- * ```ts
- * const data = await getBilibiliData('单个视频作品数据', 'User Cookies', {
- *   bvid: 'BV1fK4y1q79u'
- * })
- * ```
  */
-declare function getBilibiliData<T extends keyof BilibiliDataOptionsMap>(methodType: T, cookie?: string, options?: BilibiliDataOptions<T>): Promise<BilibiliDataOptionsMap[T]['data']>;
+declare function getBilibiliData<T extends keyof BilibiliDataOptionsMap, R extends 'strict' | 'loose'>(methodType: T, cookie?: string, options?: BilibiliDataOptions<T> & {
+    typeMode?: R;
+}): Promise<Fnc<BilibiliDataOptionsMap[T], R>>;
+/**
+ * 获取B站数据
+ * @param type - 请求数据类型
+ * @param options - 请求参数，是一个对象
+ * @param cookie - 有效的用户Cookie
+ * @returns 返回接口的原始数据
+ */
+declare function getBilibiliData<T extends keyof BilibiliDataOptionsMap, R extends 'strict' | 'loose'>(methodType: T, options?: BilibiliDataOptions<T> & {
+    typeMode?: R;
+}, cookie?: string): Promise<Fnc<BilibiliDataOptionsMap[T], R>>;
 /**
  * 获取快手数据
  * @param type - 请求数据类型
  * @param cookie - 有效的用户Cookie
  * @param options - 请求参数，是一个对象
  * @returns 返回接口的原始数据
- * @example
- * ```ts
- * const data = await getKuaishouData('单个视频作品数据', 'User Cookies', {
- *   photoId: '3xdpv6sfi8yjsqy'
- * })
- * ```
  */
-declare const getKuaishouData: <T extends keyof KuaishouDataOptionsMap>(methodType: T, cookie?: string, options?: KuaishouDataOptions<T>) => Promise<KuaishouDataOptionsMap[T]["data"]>;
-declare const fetchDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, cookie?: string, options?: DouyinDataOptions<T>) => Promise<DouyinDataOptionsMap[T]["data"]>;
+declare function getKuaishouData<T extends keyof KuaishouDataOptionsMap, R extends 'strict' | 'loose'>(methodType: T, cookie?: string, options?: KuaishouDataOptions<T> & {
+    typeMode?: R;
+}): Promise<Fnc<KuaishouDataOptionsMap[T], R>>;
+/**
+ * 获取快手数据
+ * @param type - 请求数据类型
+ * @param options - 请求参数，是一个对象
+ * @param cookie - 有效的用户Cookie
+ * @returns 返回接口的原始数据
+ */
+declare function getKuaishouData<T extends keyof KuaishouDataOptionsMap, R extends 'strict' | 'loose'>(methodType: T, options?: KuaishouDataOptions<T> & {
+    typeMode?: R;
+}, cookie?: string): Promise<Fnc<KuaishouDataOptionsMap[T], R>>;
+declare const fetchDouyinData: typeof getDouyinData;
 declare const fetchBilibiliData: typeof getBilibiliData;
-declare const fetchKuaishouData: <T extends keyof KuaishouDataOptionsMap>(methodType: T, cookie?: string, options?: KuaishouDataOptions<T>) => Promise<KuaishouDataOptionsMap[T]["data"]>;
+declare const fetchKuaishouData: typeof getKuaishouData;
 
 declare class CustomLogger {
     private logger;
@@ -13665,7 +13715,9 @@ declare class amagi {
      * })
      * ```
      */
-    getDouyinData: <T extends keyof DouyinDataOptionsMap = keyof DouyinDataOptionsMap>(methodType: T, options?: DouyinDataOptions<T>) => Promise<DouyinDataOptionsMap[T]["data"]>;
+    getDouyinData: <T extends keyof DouyinDataOptionsMap, R extends "strict" | "loose">(methodType: T, options?: DouyinDataOptions<T> & {
+        typeMode?: R;
+    }) => Promise<Fnc<DouyinDataOptionsMap[T], R>>;
     /**
      * 获取B站数据
      * @param type - 请求数据类型
@@ -13683,7 +13735,9 @@ declare class amagi {
      * })
      * ```
      */
-    getBilibiliData: <T extends keyof BilibiliDataOptionsMap = keyof BilibiliDataOptionsMap>(methodType: T, options?: BilibiliDataOptions<T>) => Promise<BilibiliDataOptionsMap[T]["data"]>;
+    getBilibiliData: <T extends keyof BilibiliDataOptionsMap, R extends "strict" | "loose">(methodType: T, options?: BilibiliDataOptions<T> & {
+        typeMode?: R;
+    }) => Promise<Fnc<BilibiliDataOptionsMap[T], R>>;
     /**
      * 获取快手数据
      * @param type - 请求数据类型
@@ -13701,7 +13755,9 @@ declare class amagi {
      * })
      * ```
      */
-    getKuaishouData: <T extends keyof KuaishouDataOptionsMap = keyof KuaishouDataOptionsMap>(methodType: T, options?: KuaishouDataOptions<T>) => Promise<KuaishouDataOptionsMap[T]["data"]>;
+    getKuaishouData: <T extends keyof KuaishouDataOptionsMap, R extends "strict" | "loose">(methodType: T, options?: KuaishouDataOptions<T> & {
+        typeMode?: R;
+    }) => Promise<Fnc<KuaishouDataOptionsMap[T], R>>;
 }
 
 /**
@@ -13714,4 +13770,4 @@ declare const startClient: (client: FastifyInstance, port: 4567) => void;
 
 declare function Amagi(options: ckParams): amagi;
 
-export { Amagi, BilibiliData, type BilibiliDataOptions, type BilibiliDataOptionsMap, type BilibiliMethodOptionsMap, DouyinData, type DouyinDataOptions, type DouyinDataOptionsMap, type DouyinMethodOptionsMap, KuaishouAPI, KuaishouData, type KuaishouDataOptions, type KuaishouDataOptionsMap, Networks, type NetworksConfigType, type OmitMethodType, amagi, av2bv, bilibiliAPI, bv2av, type ckParams, amagi as default, douyinAPI, douyinSign, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, startClient, validateData, wbi_sign };
+export { Amagi, BilibiliData, type BilibiliDataOptions, type BilibiliDataOptionsMap, type BilibiliMethodOptionsMap, DouyinData, type DouyinDataOptions, type DouyinDataOptionsMap, type DouyinMethodOptionsMap, type Fnc, KuaishouAPI, KuaishouData, type KuaishouDataOptions, type KuaishouDataOptionsMap, Networks, type NetworksConfigType, type OmitMethodType, type TypeControl, amagi, av2bv, bilibiliAPI, bv2av, type ckParams, amagi as default, douyinAPI, douyinSign, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, startClient, validateData, wbi_sign };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "4.3.2",
+  "version": "4.4.0",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "douyin",
@@ -31,7 +31,7 @@
   },
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
-  "types": "dist/esm/index.d.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/*",
     "LICENSE",