@ikenxuan/amagi 2.3.0 → 3.0.0

package/lib/model/DataFetchers.js

@@ -0,0 +1,50 @@
+import { DouyinResult, BilibiliResult, XiaohongshuResult } from '../business/index.js'
+/**
+ * 获取抖音数据
+ * @param type 请求数据类型
+ * @param cookie 抖音用户 ck
+ * @param options 请求参数，是一个对象
+ * @returns 返回接口的原始数据
+ */
+export const getDouyinData = async (type, cookie, options) => {
+  const data = await DouyinResult({ type, cookie }, options)
+  return data.data
+}
+/**
+ * 获取B站数据
+ * @param type 请求数据类型
+ * @param cookie bilibili 用户 ck
+ * @param options 请求参数，是一个对象
+ * @returns 返回接口的原始数据
+ */
+export const getBilibiliData = async (type, cookie, options) => {
+  const data = await BilibiliResult({ type, cookie }, options)
+  return data.data
+}
+/**
+ * 获取小红书数据
+ * @param type 请求数据类型
+ * @param cookie 小红书用户 ck
+ * @param options 请求参数，是一个对象
+ * @returns 返回接口的原始数据
+ */
+export const getXiaohongshuData = async (type, cookie = '', options) => {
+  const data = await XiaohongshuResult({ type, cookie }, options)
+  return data.data
+}
+/**
+ * 已废弃，请直接使用 getDouyinData 方法
+ * @deprecated
+ */
+export const GetDouyinData = getDouyinData
+/**
+ * 已废弃，请直接使用 getBilibiliData 方法
+ * @deprecated
+ */
+export const GetBilibiliData = getBilibiliData
+/**
+ * 已废弃，请直接使用 getXiaohongshuData 方法
+ * @deprecated
+ */
+export const GetXiaohongshuData = getXiaohongshuData
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YUZldGNoZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZGVsL0RhdGFGZXRjaGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBR2hGOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQ2hDLElBQU8sRUFDUCxNQUFlLEVBQ2YsT0FBaUMsRUFDbkIsRUFBRTtJQUNoQixNQUFNLElBQUksR0FBRyxNQUFNLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUMxRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUE7QUFDbEIsQ0FBQyxDQUFBO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFDbEMsSUFBTyxFQUNQLE1BQWUsRUFDZixPQUFtQyxFQUNyQixFQUFFO0lBQ2hCLE1BQU0sSUFBSSxHQUFHLE1BQU0sY0FBYyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQTtBQUNsQixDQUFDLENBQUE7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxLQUFLLEVBQ3JDLElBQU8sRUFDUCxTQUFTLEVBQVksRUFDckIsT0FBcUMsRUFDdkIsRUFBRTtJQUNoQixNQUFNLElBQUksR0FBRyxNQUFNLGlCQUFpQixDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQy9ELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQTtBQUNsQixDQUFDLENBQUE7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsYUFBYSxDQUFBO0FBQzFDOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxlQUFlLENBQUE7QUFDOUM7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsa0JBQWtCLENBQUEifQ==

package/lib/model/index.d.ts

@@ -1,4 +1,4 @@
-import Networks from './networks.js'
+export * from './networks.js'
 export * from './dir.js'
-import logger from './logger.js'
-export { Networks, logger }
+export * from './logger.js'
+export * from './DataFetchers.js'

package/lib/model/index.js

@@ -1,5 +1,5 @@
-import Networks from './networks.js'
+export * from './networks.js'
 export * from './dir.js'
-import logger from './logger.js'
-export { Networks, logger }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kZWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxRQUFRLE1BQU0sWUFBWSxDQUFBO0FBQ2pDLGNBQWMsT0FBTyxDQUFBO0FBQ3JCLE9BQU8sTUFBTSxNQUFNLFVBQVUsQ0FBQTtBQUU3QixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFBIn0=
+export * from './logger.js'
+export * from './DataFetchers.js'
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kZWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxZQUFZLENBQUE7QUFDMUIsY0FBYyxPQUFPLENBQUE7QUFDckIsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxnQkFBZ0IsQ0FBQSJ9

package/lib/model/logger.d.ts

@@ -1,3 +1,3 @@
 import log4js from 'log4js'
 declare const logger: log4js.Logger
-export default logger
+export { logger }

package/lib/model/logger.js

@@ -41,5 +41,5 @@ log4js.configure({
   pm2: true
 })
 const logger = log4js.getLogger()
-export default logger
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZGVsL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUE7QUFFM0IsTUFBTSxDQUFDLFNBQVMsQ0FBQztJQUNmLFNBQVMsRUFBRTtRQUNULE9BQU8sRUFBRTtZQUNQLElBQUksRUFBRSxRQUFRO1lBQ2QsTUFBTSxFQUFFO2dCQUNOLElBQUksRUFBRSxTQUFTO2dCQUNmLE9BQU8sRUFBRSx5Q0FBeUM7YUFDbkQ7U0FDRjtRQUNELE9BQU8sRUFBRTtZQUNQLElBQUksRUFBRSxVQUFVO1lBQ2hCLFFBQVEsRUFBRSxjQUFjO1lBQ3hCLE9BQU8sRUFBRSxnQkFBZ0I7WUFDekIsVUFBVSxFQUFFLEVBQUU7WUFDZCxvQkFBb0IsRUFBRSxJQUFJO1lBQzFCLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsU0FBUztnQkFDZixPQUFPLEVBQUUsOEJBQThCO2FBQ3hDO1NBQ0Y7UUFDRCxhQUFhLEVBQUU7WUFDYixJQUFJLEVBQUUsUUFBUTtZQUNkLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsU0FBUztnQkFDZixPQUFPLEVBQUUsMENBQTBDO2FBQ3BEO1NBQ0Y7UUFDRCxhQUFhLEVBQUU7WUFDYixJQUFJLEVBQUUsVUFBVTtZQUNoQixRQUFRLEVBQUUsb0JBQW9CO1lBQzlCLE9BQU8sRUFBRSxnQkFBZ0I7WUFDekIsVUFBVSxFQUFFLEVBQUU7WUFDZCxvQkFBb0IsRUFBRSxJQUFJO1lBQzFCLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLDhCQUE4QixFQUFFO1NBQ3JFO0tBQ0Y7SUFDRCxVQUFVLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFLGNBQWM7S0FDOUU7SUFDRCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUMsQ0FBQTtBQUVGLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQTtBQUNqQyxlQUFlLE1BQU0sQ0FBQSJ9
+export { logger }
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZGVsL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUE7QUFFM0IsTUFBTSxDQUFDLFNBQVMsQ0FBQztJQUNmLFNBQVMsRUFBRTtRQUNULE9BQU8sRUFBRTtZQUNQLElBQUksRUFBRSxRQUFRO1lBQ2QsTUFBTSxFQUFFO2dCQUNOLElBQUksRUFBRSxTQUFTO2dCQUNmLE9BQU8sRUFBRSx5Q0FBeUM7YUFDbkQ7U0FDRjtRQUNELE9BQU8sRUFBRTtZQUNQLElBQUksRUFBRSxVQUFVO1lBQ2hCLFFBQVEsRUFBRSxjQUFjO1lBQ3hCLE9BQU8sRUFBRSxnQkFBZ0I7WUFDekIsVUFBVSxFQUFFLEVBQUU7WUFDZCxvQkFBb0IsRUFBRSxJQUFJO1lBQzFCLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsU0FBUztnQkFDZixPQUFPLEVBQUUsOEJBQThCO2FBQ3hDO1NBQ0Y7UUFDRCxhQUFhLEVBQUU7WUFDYixJQUFJLEVBQUUsUUFBUTtZQUNkLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsU0FBUztnQkFDZixPQUFPLEVBQUUsMENBQTBDO2FBQ3BEO1NBQ0Y7UUFDRCxhQUFhLEVBQUU7WUFDYixJQUFJLEVBQUUsVUFBVTtZQUNoQixRQUFRLEVBQUUsb0JBQW9CO1lBQzlCLE9BQU8sRUFBRSxnQkFBZ0I7WUFDekIsVUFBVSxFQUFFLEVBQUU7WUFDZCxvQkFBb0IsRUFBRSxJQUFJO1lBQzFCLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLDhCQUE4QixFQUFFO1NBQ3JFO0tBQ0Y7SUFDRCxVQUFVLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFLGNBQWM7S0FDOUU7SUFDRCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUMsQ0FBQTtBQUVGLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQTtBQUNqQyxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUEifQ==

package/lib/model/networks.d.ts

@@ -3,7 +3,7 @@ import { NetworksConfigType } from '../types/index.js'
 interface HeadersObject {
     [key: string]: string;
 }
-export default class Networks {
+export declare class Networks {
   url: string
   method: string
   headers: HeadersObject

package/lib/model/networks.js

@@ -1,6 +1,6 @@
 import axios, { AxiosError } from 'axios'
-import logger from './logger.js'
-export default class Networks {
+import { logger } from './logger.js'
+export class Networks {
   url
   method
   headers
@@ -25,7 +25,10 @@ export default class Networks {
     this.axiosInstance = axios.create({
       timeout: this.timeout,
       headers: this.headers,
-      maxRedirects: 5
+      maxRedirects: 5,
+      validateStatus: (status) => {
+        return (status >= 200 && status < 300) || status === 406 || (status >= 500)
+      }
     })
   }
   get config () {
@@ -135,4 +138,4 @@ export default class Networks {
     }
   }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kZWwvbmV0d29ya3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxVQUFVLEVBQXFDLE1BQU0sT0FBTyxDQUFBO0FBRTVFLE9BQU8sTUFBTSxNQUFNLFVBQVUsQ0FBQTtBQU03QixNQUFNLENBQUMsT0FBTyxPQUFPLFFBQVE7SUFDM0IsR0FBRyxDQUFRO0lBQ1gsTUFBTSxDQUFRO0lBQ2QsT0FBTyxDQUFlO0lBQ3RCLElBQUksQ0FBUTtJQUNaLElBQUksQ0FBTTtJQUNWLGFBQWEsQ0FBSztJQUNsQixXQUFXLENBQVM7SUFDcEIsT0FBTyxDQUFRO0lBQ2YsS0FBSyxDQUE0QjtJQUNqQyxJQUFJLENBQUk7SUFFUixZQUFhLElBQXdCO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDakMsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQTtRQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLElBQUksTUFBTSxDQUFBO1FBQy9CLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUE7UUFDbEMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQTtRQUM3QixJQUFJLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQTtRQUNkLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUE7UUFDbkMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUE7UUFDeEIsSUFBSSxDQUFDLEtBQUssR0FBRyxTQUFTLENBQUE7UUFFdEIsWUFBWTtRQUNaLElBQUksQ0FBQyxhQUFhLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztZ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kZWwvbmV0d29ya3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxVQUFVLEVBQXFDLE1BQU0sT0FBTyxDQUFBO0FBRTVFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFNakMsTUFBTSxPQUFPLFFBQVE7SUFDbkIsR0FBRyxDQUFRO0lBQ1gsTUFBTSxDQUFRO0lBQ2QsT0FBTyxDQUFlO0lBQ3RCLElBQUksQ0FBUTtJQUNaLElBQUksQ0FBTTtJQUNWLGFBQWEsQ0FBSztJQUNsQixXQUFXLENBQVM7SUFDcEIsT0FBTyxDQUFRO0lBQ2YsS0FBSyxDQUE0QjtJQUNqQyxJQUFJLENBQUk7SUFFUixZQUFhLElBQXdCO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDakMsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQTtRQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLElBQUksTUFBTSxDQUFBO1FBQy9CLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUE7UUFDbEMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQTtRQUM3QixJQUFJLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQTtRQUNkLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUE7UUFDbkMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUE7UUFDeEIsSUFBSSxDQUFDLEtBQUssR0FBRyxTQUFTLENBQUE7UUFFdEIsWUFBWTtRQUNaLElBQUksQ0FBQyxhQUFhLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNoQyxPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDckIsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ3JCLFlBQVksRUFBRSxDQUFDO1lBQ2YsY0FBYyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUU7Z0JBQ3pCLE9BQU8sQ0FBQyxNQUFNLElBQUksR0FBRyxJQUFJLE1BQU0sR0FBRyxHQUFHLENBQUMsSUFBSSxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxDQUFBO1lBQzdFLENBQUM7U0FDRixDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsSUFBSSxNQUFNO1FBQ1IsSUFBSSxNQUFNLEdBQXVCO1lBQy9CLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87U0FDdEIsQ0FBQTtRQUVELElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxNQUFNLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQTtRQUN6QixDQUFDO1FBRUQsT0FBTyxNQUFNLENBQUE7SUFDZixDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVE7UUFDWixJQUFJLENBQUM7WUFDSCxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQTtZQUN4QyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQzFCLE9BQU8sTUFBTSxDQUFBO1lBQ2YsQ0FBQztZQUNELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFBO1lBQ3ZCLE9BQU8sTUFBTSxDQUFBO1FBQ2YsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ2xCLE9BQU8sS0FBSyxDQUFBO1FBQ2QsQ0FBQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWTtRQUNoQixPQUFPLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDOUMsQ0FBQztJQUVELGtCQUFrQjtJQUNsQixLQUFLLENBQUMsV0FBVztRQUNmLElBQUksQ0FBQztZQUNILE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQztnQkFDeEMsTUFBTSxFQUFFLEtBQUs7Z0JBQ2IsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO2FBQ2QsQ0FBQyxDQUFBO1lBQ0YsT0FBTyxRQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUEsQ0FBQyxtQkFBbUI7UUFDN0QsQ0FBQztRQUFDLE9BQU8sS0FBYyxFQUFFLENBQUM7WUFDeEIsSUFBSSxLQUFLLFlBQVksVUFBVSxFQUFFLENBQUM7Z0JBQ2hDLE1BQU0sSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQzlCLENBQUM7WUFDRCxPQUFPLEVBQUUsQ0FBQTtRQUNYLENBQUM7SUFDSCxDQUFDO0lBRUQsY0FBYztJQUNkLEtBQUssQ0FBQyxXQUFXO1FBQ2YsSUFBSSxDQUFDO1lBQ0gsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDO2dCQUN4QyxNQUFNLEVBQUUsS0FBSztnQkFDYixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0JBQ2IsWUFBWSxFQUFFLENBQUMsRUFBRSxVQUFVO2dCQUMzQixjQUFjLEVBQUUsQ0FBQyxNQUFjLEVBQUUsRUFBRSxDQUFDLE1BQU0sSUFBSSxHQUFHLElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQyxXQUFXO2FBQzlFLENBQUMsQ0FBQTtZQUNGLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQVcsQ0FBQTtRQUMvQyxDQUFDO1FBQUMsT0FBTyxLQUFjLEVBQUUsQ0FBQztZQUN4QixJQUFJLEtBQUssWUFBWSxVQUFVLEVBQUUsQ0FBQztnQkFDaEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7WUFDOUIsQ0FBQztZQUNELE9BQU8sRUFBRSxDQUFBO1FBQ1gsQ0FBQztJQUNILENBQUM7SUFFRCwyQkFBMkI7SUFDM0IsS0FBSyxDQUFDLE9BQU8sQ0FBRSxTQUFTLEdBQUcsRUFBRTtRQUMzQixJQUFJLENBQUM7WUFDSCxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7Z0JBQ2YsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUE7Z0JBQ3hDLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQztvQkFDMUIsT0FBTyxNQUFNLENBQUE7Z0JBQ2YsQ0FBQztnQkFDRCxJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7b0JBQzFCLE1BQU0sQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtvQkFDL0IsTUFBTSxJQUFJLEtBQUssQ0FBQywwREFBMEQsQ0FBQyxDQUFBO2dCQUM3RSxDQUFDO2dCQUVELElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFBO2dCQUMzQixJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQTtZQUN6QixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sSUFBSSxDQUFDLGFBQWEsR0FBRyxTQUFTLENBQUE7WUFDaEMsQ0FBQztZQUNELE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUE7UUFDaEMsQ0FBQztRQUFDLE9BQU8sS0FBYyxFQUFFLENBQUM7WUFDeEIsSUFBSSxLQUFLLFlBQVksVUFBVSxFQUFFLENBQUM7Z0JBQ2hDLE1BQU0sSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQzlCLENBQUM7WUFDRCxPQUFPLEtBQUssQ0FBQTtRQUNkLENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGlCQUFpQjtRQUNyQixJQUFJLENBQUM7WUFDSCxlQUFlO1lBQ2YsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTtZQUVwRCxjQUFjO1lBQ2QsSUFBSSxPQUFPLEdBQXdCLEVBQUUsQ0FBQTtZQUNyQyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFBO1lBQ25DLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7Z0JBQ3hELE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUE7WUFDdEIsQ0FBQztZQUNELE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUN2QyxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLE9BQU8sQ0FBQyxLQUFLLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxDQUFBO1lBQ25DLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQTtRQUN0QyxDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=

package/lib/server/client.d.ts

@@ -1,4 +1,4 @@
-import { BilibiliDataType, DouyinDataType } from '../types/index.js'
+import { DouyinDataOptionsMap, BilibiliDataOptionsMap, XiaohongshuDataOptionsMap } from '../types/index.js'
 import { FastifyInstance } from 'fastify'
 interface initClientParams {
     /** 抖音ck */
@@ -6,50 +6,45 @@ interface initClientParams {
     /** B站ck */
     bilibili: string;
 }
-interface amagiInstance {
+interface AmagiInstance {
     /** Fastify 实例 */
     Instance: FastifyInstance;
     /**
-     * amagi.GetDouyinData 已废弃，请直接导入 GetDouyinData 方法使用
+     * amagi.getDouyinData 可能在未来版本废弃，建议直接导入 getDouyinData 方法使用
      * @deprecated
      */
-    GetDouyinData: (data: {
-        type: keyof typeof DouyinDataType;
-    }) => Error | any;
+    getDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, cookie?: string, options?: DouyinDataOptionsMap[T]) => Promise<any>;
     /**
-     * amagi.GetBilibiliData 已废弃！请直接导入 GetBilibiliData 方法使用
+     * amagi.getBilibiliData 可能在未来版本废弃，建议直接导入 getBilibiliData 方法使用
      * @deprecated
      */
-    GetBilibiliData: (data: {
-        type: keyof typeof BilibiliDataType;
-    }) => Error | any;
+    getBilibiliData: <T extends keyof BilibiliDataOptionsMap>(type: T, cookie?: string, options?: BilibiliDataOptionsMap[T]) => Promise<any>;
+    /**
+     * amagi.getXiaohongshuiData 可能在未来版本废弃，建议直接导入 getXiaohongshuiData 方法使用
+     * @deprecated
+     */
+    getXiaohongshuData: <T extends keyof XiaohongshuDataOptionsMap>(type: T, cookie: string, options: XiaohongshuDataOptionsMap[T]) => Promise<any>;
+    /**
+     *
+     * @param client Fastify 实例
+     * @param port 监听端口
+     * @returns
+     */
+    startClient: (client: FastifyInstance, port: 4567) => Promise<void>;
 }
-export declare class client {
-  /** douyin cookies */
-  douyin: string
-  /** bilibili cookes */
-  bilibili: string
+export declare class amagi {
+  private douyin
+  private bilibili
   /**
      *
-     * @param cookies 包含抖音和B站cookie的参数对象
+     * @param data 一个对象，里面包含 douyin 和 bilibili 两个字段，分别对应抖音和B站cookie
      */
-  constructor(cookies: initClientParams);
+  constructor(data: initClientParams);
   /**
      * 初始化 fastify 实例
-     * @param log 是否启用日志
-     * @returns fastify 实例
+     * @param log log 是否启用日志，默认为 false
+     * @returns amagi 实例
      */
-  initServer(log?: boolean): Promise<amagiInstance>;
-  GetDouyinData: (data: {
-        type: keyof typeof DouyinDataType;
-    }) => Error | any
-  GetBilibiliData: (data: {
-        type: keyof typeof BilibiliDataType;
-    }) => {
-        /**
-         * @deprecated
-         */
-        result: () => Promise<never>;
-    }
+  initServer(log?: boolean): AmagiInstance;
 }
 export {}

package/lib/server/client.js

@@ -1,27 +1,27 @@
 import { BilibiliResult } from '../business/bilibili/index.js'
 import { DouyinResult } from '../business/douyin/index.js'
+import { getDouyinData, getBilibiliData, getXiaohongshuData } from '../model/DataFetchers.js'
 import Fastify from 'fastify'
-export class client {
-  /** douyin cookies */
+import { startClient } from '../server/listen.js'
+export class amagi {
   douyin
-  /** bilibili cookes */
   bilibili
   /**
      *
-     * @param cookies 包含抖音和B站cookie的参数对象
+     * @param data 一个对象，里面包含 douyin 和 bilibili 两个字段，分别对应抖音和B站cookie
      */
-  constructor (cookies) {
+  constructor (data) {
     /** 抖音ck */
-    this.douyin = cookies.douyin
+    this.douyin = data.douyin
     /** B站ck */
-    this.bilibili = cookies.bilibili
+    this.bilibili = data.bilibili
   }
   /**
      * 初始化 fastify 实例
-     * @param log 是否启用日志
-     * @returns fastify 实例
+     * @param log log 是否启用日志，默认为 false
+     * @returns amagi 实例
      */
-  async initServer (log = false) {
+  initServer (log = false) {
     const Client = Fastify({
       logger: log && {
         transport: {
@@ -204,27 +204,12 @@ export class client {
       }, { room_id: request.query.room_id }))
     })
     return {
+      startClient,
       Instance: Client,
-      GetDouyinData: this.GetDouyinData,
-      GetBilibiliData: this.GetBilibiliData
-    }
-  }
-  GetDouyinData = (data) => {
-    return {
-      result: () => {
-        throw new Error('该方法已废弃！请直接导入 GetBilibiliData 方法使用')
-      }
-    }
-  }
-  GetBilibiliData = (data) => {
-    return {
-      /**
-             * @deprecated
-             */
-      result: async () => {
-        throw new Error('该方法已废弃！请直接导入 GetBilibiliData 方法使用')
-      }
+      getDouyinData,
+      getBilibiliData,
+      getXiaohongshuData
     }
   }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}

package/lib/server/listen.d.ts

@@ -5,4 +5,9 @@ import { FastifyInstance } from 'fastify'
  * @param port 监听端口
  * @returns
  */
+export declare const startClient: (client: FastifyInstance, port: 4567) => Promise<void>
+/**
+ * 已废弃，请使用 startClient 方法
+ * @deprecated
+ */
 export declare const StartClient: (client: FastifyInstance, port: 4567) => Promise<void>

package/lib/server/listen.js

@@ -5,11 +5,16 @@ import { logger } from '../model/index.js'
  * @param port 监听端口
  * @returns
  */
-export const StartClient = async (client, port) => {
+export const startClient = async (client, port) => {
   return client.listen({ port: port, host: '::' }, (_err, _address) => {
     if (_err)
       client.log.error(_err)
     logger.mark(`amagi server listening on ${port} port. API docs: https://amagi.apifox.cn`)
   })
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdGVuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZlci9saXN0ZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUdwQzs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxLQUFLLEVBQUUsTUFBdUIsRUFBRSxJQUFVLEVBQWlCLEVBQUU7SUFDdEYsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLEVBQUU7UUFDbEUsSUFBSSxJQUFJO1lBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDaEMsTUFBTSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsSUFBSSwwQ0FBMEMsQ0FBQyxDQUFBO0lBQzFGLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBIn0=
+/**
+ * 已废弃，请使用 startClient 方法
+ * @deprecated
+ */
+export const StartClient = startClient
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdGVuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZlci9saXN0ZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUdwQzs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxLQUFLLEVBQUUsTUFBdUIsRUFBRSxJQUFVLEVBQWlCLEVBQUU7SUFDdEYsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLEVBQUU7UUFDbEUsSUFBSSxJQUFJO1lBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDaEMsTUFBTSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsSUFBSSwwQ0FBMEMsQ0FBQyxDQUFBO0lBQzFGLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQSJ9

package/lib/test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test.js

@@ -0,0 +1,17 @@
+import { Amagi, getBilibiliData } from './index.js';
+const client = new Amagi({
+    douyin: '',
+    bilibili: ''
+}).initServer(true);
+await client.startClient(client.Instance, 4567);
+const douyinData = await client.getDouyinData('官方emoji数据');
+const bilibiliData = await getBilibiliData('emoji数据');
+console.log({ douyinData, bilibiliData });
+if (douyinData && bilibiliData) {
+    client.Instance.close();
+    process.exit(0);
+}
+else {
+    process.exit(1);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxDQUFBO0FBRTFDLE1BQU0sTUFBTSxHQUFHLElBQUksS0FBSyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxFQUFFO0lBQ1YsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFBO0FBQ25CLE1BQU0sTUFBTSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFBO0FBRS9DLE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMxRCxNQUFNLFlBQVksR0FBRyxNQUFNLGVBQWUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUVyRCxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUE7QUFFekMsSUFBSSxVQUFVLElBQUksWUFBWSxFQUFFLENBQUM7SUFDL0IsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUN2QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2pCLENBQUM7S0FBTSxDQUFDO0lBQ04sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqQixDQUFDIn0=

package/lib/types/BilibiliAPIParams.d.ts

@@ -1,14 +1,21 @@
 type VideoInfoParams = {
-    /** ID类型 */
-    id_type: 'bvid' | 'aid';
+    /**
+     * 视频分享URL。建议使用 id_type 和 id 字段作为参数，url参数可能不稳定
+     * @deprecated
+     */
+    url?: string;
+    /** 稿件 ID 类型，一般为 bvid */
+    id_type?: 'bvid' | 'aid';
     /** 稿件ID */
-    id: string;
+    id?: string;
 };
 type VideoStreamParams = {
+    /** 视频分享URL。建议使用 id_type 和 id 字段作为参数，url参数可能不稳定 */
+    url?: string;
     /** 稿件AVID */
-    avid: string;
+    avid?: string;
     /** 稿件cid */
-    cid: string;
+    cid?: string;
 };
 type CommentParams = {
     /** 评论区类型，type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
@@ -18,7 +25,7 @@ type CommentParams = {
     /** 稿件ID，也就是AVID */
     oid?: number | string;
     /** 获取的评论数量，默认最高20 */
-    number?: number;
+    number?: number | string;
 };
 type BangumiInfoParams = {
     /** 稿件ID是否为epid */
@@ -34,7 +41,7 @@ type BangumiStreamParams = {
 };
 type UserParams = {
     /** UP主UID */
-    host_mid: string;
+    host_mid: string | number;
 };
 type DynamicParams = {
     /** 动态ID */
@@ -48,16 +55,33 @@ type QrcodeParams = {
     /** 扫码登录秘钥 */
     qrcode_key: string;
 };
-/** B站API接口参数类型 */
-export type BilibiliAPIParams = {
+export interface BilibiliDataOptionsMapKeys {
     VideoInfoParams: VideoInfoParams;
     VideoStreamParams: VideoStreamParams;
     CommentParams: CommentParams;
-    BangumiInfoParams: BangumiInfoParams;
-    BangumiStreamParams: BangumiStreamParams;
     UserParams: UserParams;
     DynamicParams: DynamicParams;
+    BangumiInfoParams: BangumiInfoParams;
+    BangumiStreamParams: BangumiStreamParams;
     LiveRoomParams: LiveRoomParams;
     QrcodeParams: QrcodeParams;
+}
+/** B站API接口参数类型 */
+export type BilibiliDataOptionsMap = {
+    '单个视频作品数据': VideoInfoParams;
+    '单个视频下载信息数据': VideoStreamParams;
+    '评论数据': CommentParams;
+    '用户主页数据': UserParams;
+    '用户主页动态列表数据': UserParams;
+    'emoji数据': {};
+    '番剧基本信息数据': BangumiInfoParams;
+    '番剧下载信息数据': BangumiStreamParams;
+    '动态详情数据': DynamicParams;
+    '动态卡片数据': DynamicParams;
+    '直播间信息': LiveRoomParams;
+    '直播间初始化信息': LiveRoomParams;
+    '登录基本信息': {};
+    '申请二维码': {};
+    '二维码状态': QrcodeParams;
 };
 export {}

package/lib/types/DataType.d.ts

@@ -14,7 +14,8 @@ export declare const enum DouyinDataType {
     音乐数据 = "\u97F3\u4E50\u6570\u636E",
     图集作品数据 = "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E",
     实况图片图集数据 = "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E",
-    直播间信息数据 = "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E"
+    直播间信息数据 = "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E",
+    申请二维码数据 = "\u7533\u8BF7\u4E8C\u7EF4\u7801\u6570\u636E"
 }
 /**
  * B站接口类型
@@ -36,3 +37,9 @@ export declare const enum BilibiliDataType {
     申请二维码 = "\u7533\u8BF7\u4E8C\u7EF4\u7801",
     二维码状态 = "\u4E8C\u7EF4\u7801\u72B6\u6001"
 }
+/**
+ * 小红书接口类型
+ */
+export declare const enum XiaohongshuDataType {
+    单个笔记 = "\u5355\u4E2A\u7B14\u8BB0"
+}

package/lib/types/DouyinAPIParams.d.ts

@@ -1,10 +1,27 @@
 type WorkParams = {
+    /**
+     * 视频分享URL。建议使用 aweme_id 参数，url参数可能不稳定
+     * @deprecated
+     */
+    url?: string;
     /** 视频ID */
-    aweme_id: string;
+    aweme_id?: string;
     /** 获取的评论数量 */
     number?: number | string;
 };
+type LiveWorkParams = {
+    /** 视频分享URL，和aweme_id二选一 */
+    url?: string;
+    /** 视频ID，和url二选一 */
+    aweme_id?: string;
+};
 type CommentParams = {
+    /** 视频ID */
+    aweme_id: string;
+    /** 获取的评论数量 */
+    number: number | string;
+};
+type CommentReplyParams = {
     /** 视频ID */
     aweme_id: string;
     /** 评论ID */
@@ -32,14 +49,31 @@ type QrcodeParams = {
     /** fp指纹 */
     verify_fp: string;
 };
-/** 抖音API接口参数类型 */
-export type DouyinAPIParams = {
+export interface DouyinDataOptionsMapKeys {
+    CommentReplyParams: CommentReplyParams;
+    UserParams: UserParams;
     WorkParams: WorkParams;
     CommentParams: CommentParams;
-    UserParams: UserParams;
-    SearchParams: SearchParams;
     MusicParams: MusicParams;
+    LiveWorkParams: LiveWorkParams;
     LiveRoomParams: LiveRoomParams;
     QrcodeParams: QrcodeParams;
+    SearchParams: SearchParams;
+}
+export type DouyinDataOptionsMap = {
+    '二级评论数据': CommentReplyParams;
+    '用户主页数据': UserParams;
+    '单个视频作品数据': WorkParams;
+    '评论数据': CommentParams;
+    '用户主页视频列表数据': UserParams;
+    '热点词数据': SearchParams;
+    '搜索数据': SearchParams;
+    '官方emoji数据': {};
+    '动态表情数据': {};
+    '音乐数据': MusicParams;
+    '图集作品数据': WorkParams;
+    '实况图片图集数据': LiveWorkParams;
+    '直播间信息数据': LiveRoomParams;
+    '申请二维码数据': QrcodeParams;
 };
 export {}

package/lib/types/OptionsType.d.ts

@@ -29,7 +29,7 @@ export type DouyinOptionsType = {
     /**
      * 评论数量，单位条
      */
-    number?: number;
+    number?: number | string;
     /**
      * 直播间ID（虚拟的）
      */
@@ -86,7 +86,7 @@ export type BilibiliOptionsType = {
     /**
      * 评论数量，单位条
      */
-    number?: number;
+    number?: number | string;
     /**
      * 用户 Cookie
      */
@@ -98,9 +98,23 @@ export type BilibiliOptionsType = {
     /**
      * 评论区类型代码
      */
-    commentstype?: number;
+    commentstype?: number | string;
     /**
      * 评论区查询专属参数
      */
-    oid?: number;
+    oid?: number | string;
+};
+export type XiaohongshuOptionsType = {
+    /**
+     * 笔记ID
+     */
+    source_note_id?: string;
+    /**
+     * web端的路径参数xsec_token
+     */
+    xsec_token?: string;
+    /**
+     * 笔记分享URL
+     */
+    url?: string;
 };

package/lib/types/XiaohongshuAPIParams.d.ts

@@ -0,0 +1,13 @@
+type NoteInfoParams = {
+    /** 笔记ID */
+    source_note_id: string;
+    /** web端的路径参数xsec_token */
+    xsec_token?: string;
+};
+export interface XiaohongshuDataOptionsMapKeys {
+    NoteInfoParams: NoteInfoParams;
+}
+export type XiaohongshuDataOptionsMap = {
+    单个笔记: NoteInfoParams;
+};
+export {}

package/lib/types/XiaohongshuAPIParams.js

@@ -0,0 +1,2 @@
+export {}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiWGlhb2hvbmdzaHVBUElQYXJhbXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMvWGlhb2hvbmdzaHVBUElQYXJhbXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9