@ikenxuan/amagi 4.3.3 → 4.4.0

package/dist/cjs/index.cjs

@@ -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;

package/dist/esm/index.mjs

@@ -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;

package/dist/index.d.ts

@@ -13360,6 +13360,10 @@ type OmitMethodType<T> = Omit<T, 'methodType'>;
 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;
 /**
  * 类型精度控制参数
  */
@@ -13396,56 +13400,63 @@ type TypeControl = {
  * @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, R extends TypeControl["typeMode"]>(type: T, cookie?: string, options?: DouyinDataOptions<T> & {
+declare function getDouyinData<T extends keyof DouyinDataOptionsMap, R extends 'strict' | 'loose'>(type: T, cookie: string, options?: DouyinDataOptions<T> & {
     typeMode?: R;
-}) => Promise<R extends "strict" ? DouyinDataOptionsMap[T]["data"] : any>;
+}): 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, R extends TypeControl['typeMode']>(methodType: T, cookie?: string, options?: BilibiliDataOptions<T> & {
+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;
-}): Promise<R extends 'strict' ? BilibiliDataOptionsMap[T]["data"] : any>;
+}, 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, R extends TypeControl["typeMode"]>(methodType: T, cookie?: string, options?: KuaishouDataOptions<T> & {
+declare function getKuaishouData<T extends keyof KuaishouDataOptionsMap, R extends 'strict' | 'loose'>(methodType: T, cookie?: string, options?: KuaishouDataOptions<T> & {
     typeMode?: R;
-}) => Promise<R extends "strict" ? KuaishouDataOptionsMap[T]["data"] : any>;
-declare const fetchDouyinData: <T extends keyof DouyinDataOptionsMap, R extends TypeControl["typeMode"]>(type: T, cookie?: string, options?: DouyinDataOptions<T> & {
+}): 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;
-}) => Promise<R extends "strict" ? DouyinDataOptionsMap[T]["data"] : any>;
+}, cookie?: string): Promise<Fnc<KuaishouDataOptionsMap[T], R>>;
+declare const fetchDouyinData: typeof getDouyinData;
 declare const fetchBilibiliData: typeof getBilibiliData;
-declare const fetchKuaishouData: <T extends keyof KuaishouDataOptionsMap, R extends TypeControl["typeMode"]>(methodType: T, cookie?: string, options?: KuaishouDataOptions<T> & {
-    typeMode?: R;
-}) => Promise<R extends "strict" ? KuaishouDataOptionsMap[T]["data"] : any>;
+declare const fetchKuaishouData: typeof getKuaishouData;
 
 declare class CustomLogger {
     private logger;
@@ -13704,9 +13715,9 @@ declare class amagi {
      * })
      * ```
      */
-    getDouyinData: <T extends keyof DouyinDataOptionsMap, R extends TypeControl["typeMode"]>(methodType: T, options?: DouyinDataOptions<T> & {
+    getDouyinData: <T extends keyof DouyinDataOptionsMap, R extends "strict" | "loose">(methodType: T, options?: DouyinDataOptions<T> & {
         typeMode?: R;
-    }) => Promise<R extends "strict" ? DouyinDataOptionsMap[T]["data"] : any>;
+    }) => Promise<Fnc<DouyinDataOptionsMap[T], R>>;
     /**
      * 获取B站数据
      * @param type - 请求数据类型
@@ -13724,9 +13735,9 @@ declare class amagi {
      * })
      * ```
      */
-    getBilibiliData: <T extends keyof BilibiliDataOptionsMap, R extends TypeControl["typeMode"]>(methodType: T, options?: BilibiliDataOptions<T> & {
+    getBilibiliData: <T extends keyof BilibiliDataOptionsMap, R extends "strict" | "loose">(methodType: T, options?: BilibiliDataOptions<T> & {
         typeMode?: R;
-    }) => Promise<R extends "strict" ? BilibiliDataOptionsMap[T]["data"] : any>;
+    }) => Promise<Fnc<BilibiliDataOptionsMap[T], R>>;
     /**
      * 获取快手数据
      * @param type - 请求数据类型
@@ -13744,9 +13755,9 @@ declare class amagi {
      * })
      * ```
      */
-    getKuaishouData: <T extends keyof KuaishouDataOptionsMap, R extends TypeControl["typeMode"]>(methodType: T, options?: KuaishouDataOptions<T> & {
+    getKuaishouData: <T extends keyof KuaishouDataOptionsMap, R extends "strict" | "loose">(methodType: T, options?: KuaishouDataOptions<T> & {
         typeMode?: R;
-    }) => Promise<R extends "strict" ? KuaishouDataOptionsMap[T]["data"] : any>;
+    }) => Promise<Fnc<KuaishouDataOptionsMap[T], R>>;
 }
 
 /**
@@ -13759,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, 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 };
+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.3",
+  "version": "4.4.0",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "douyin",