@ikenxuan/amagi 3.1.2 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/README.md +45 -34
  2. package/lib/business/bilibili/getdata.js +51 -26
  3. package/lib/business/bilibili/index.d.ts +1 -0
  4. package/lib/business/bilibili/index.js +2 -1
  5. package/lib/business/bilibili/result.js +14 -3
  6. package/lib/business/bilibili/sign/bv2av.d.ts +2 -0
  7. package/lib/business/bilibili/sign/bv2av.js +27 -0
  8. package/lib/business/douyin/getdata.js +12 -8
  9. package/lib/business/douyin/result.js +12 -3
  10. package/lib/business/index.d.ts +0 -1
  11. package/lib/business/index.js +1 -2
  12. package/lib/model/DataFetchers.d.ts +1 -14
  13. package/lib/model/DataFetchers.js +2 -18
  14. package/lib/model/logger.d.ts +14 -0
  15. package/lib/model/logger.js +13 -2
  16. package/lib/model/networks.js +3 -2
  17. package/lib/server/client.d.ts +12 -21
  18. package/lib/server/client.js +63 -39
  19. package/lib/test.js +7 -5
  20. package/lib/types/DataType.d.ts +3 -7
  21. package/lib/types/DouyinAPIParams.d.ts +4 -2
  22. package/lib/types/OptionsType.d.ts +0 -14
  23. package/lib/types/index.d.ts +3 -4
  24. package/lib/types/index.js +1 -1
  25. package/package.json +7 -6
  26. package/lib/business/xiaohongshu/AIP.d.ts +0 -14
  27. package/lib/business/xiaohongshu/AIP.js +0 -17
  28. package/lib/business/xiaohongshu/getdata.d.ts +0 -13
  29. package/lib/business/xiaohongshu/getdata.js +0 -58
  30. package/lib/business/xiaohongshu/index.d.ts +0 -5
  31. package/lib/business/xiaohongshu/index.js +0 -6
  32. package/lib/business/xiaohongshu/result.d.ts +0 -9
  33. package/lib/business/xiaohongshu/result.js +0 -19
  34. package/lib/business/xiaohongshu/sign/generateX_S.d.ts +0 -2
  35. package/lib/business/xiaohongshu/sign/generateX_S.js +0 -207
  36. package/lib/business/xiaohongshu/sign/generateX_S_Common.d.ts +0 -6
  37. package/lib/business/xiaohongshu/sign/generateX_S_Common.js +0 -141
  38. package/lib/business/xiaohongshu/sign/index.d.ts +0 -16
  39. package/lib/business/xiaohongshu/sign/index.js +0 -29
  40. package/lib/types/XiaohongshuAPIParams.d.ts +0 -13
  41. package/lib/types/XiaohongshuAPIParams.js +0 -2
@@ -1,4 +1,4 @@
1
- import { DouyinResult, BilibiliResult, XiaohongshuResult } from '../business/index.js'
1
+ import { DouyinResult, BilibiliResult } from '../business/index.js'
2
2
  /**
3
3
  * 获取抖音数据
4
4
  * @param type 请求数据类型
@@ -21,17 +21,6 @@ export const getBilibiliData = async (type, cookie, options) => {
21
21
  const data = await BilibiliResult({ type, cookie }, options)
22
22
  return data.data
23
23
  }
24
- /**
25
- * 获取小红书数据
26
- * @param type 请求数据类型
27
- * @param cookie 小红书用户 ck
28
- * @param options 请求参数,是一个对象
29
- * @returns 返回接口的原始数据
30
- */
31
- export const getXiaohongshuData = async (type, cookie = '', options) => {
32
- const data = await XiaohongshuResult({ type, cookie }, options)
33
- return data.data
34
- }
35
24
  /**
36
25
  * 已废弃,请直接使用 getDouyinData 方法
37
26
  * @deprecated
@@ -42,9 +31,4 @@ export const GetDouyinData = getDouyinData
42
31
  * @deprecated
43
32
  */
44
33
  export const GetBilibiliData = getBilibiliData
45
- /**
46
- * 已废弃,请直接使用 getXiaohongshuData 方法
47
- * @deprecated
48
- */
49
- export const GetXiaohongshuData = getXiaohongshuData
50
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YUZldGNoZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZGVsL0RhdGFGZXRjaGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBR2hGOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQ2hDLElBQU8sRUFDUCxNQUFlLEVBQ2YsT0FBaUMsRUFDbkIsRUFBRTtJQUNoQixNQUFNLElBQUksR0FBRyxNQUFNLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUMxRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUE7QUFDbEIsQ0FBQyxDQUFBO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFDbEMsSUFBTyxFQUNQLE1BQWUsRUFDZixPQUFtQyxFQUNyQixFQUFFO0lBQ2hCLE1BQU0sSUFBSSxHQUFHLE1BQU0sY0FBYyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQTtBQUNsQixDQUFDLENBQUE7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxLQUFLLEVBQ3JDLElBQU8sRUFDUCxTQUFTLEVBQVksRUFDckIsT0FBcUMsRUFDdkIsRUFBRTtJQUNoQixNQUFNLElBQUksR0FBRyxNQUFNLGlCQUFpQixDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQy9ELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQTtBQUNsQixDQUFDLENBQUE7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsYUFBYSxDQUFBO0FBQzFDOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxlQUFlLENBQUE7QUFDOUM7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsa0JBQWtCLENBQUEifQ==
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YUZldGNoZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZGVsL0RhdGFGZXRjaGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRzdEOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQ2hDLElBQU8sRUFDUCxNQUFlLEVBQ2YsT0FBaUMsRUFDbkIsRUFBRTtJQUNoQixNQUFNLElBQUksR0FBRyxNQUFNLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUMxRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUE7QUFDbEIsQ0FBQyxDQUFBO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFDbEMsSUFBTyxFQUNQLE1BQWUsRUFDZixPQUFtQyxFQUNyQixFQUFFO0lBQ2hCLE1BQU0sSUFBSSxHQUFHLE1BQU0sY0FBYyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQTtBQUNsQixDQUFDLENBQUE7QUFHRDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsYUFBYSxDQUFBO0FBQzFDOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxlQUFlLENBQUEifQ==
@@ -1,3 +1,17 @@
1
1
  import log4js from 'log4js'
2
+ declare const chalk: import("chalk").ChalkInstance
3
+ declare module 'log4js' {
4
+ interface Logger {
5
+ chalk?: typeof chalk;
6
+ red: typeof chalk.red;
7
+ green: typeof chalk.green;
8
+ yellow: typeof chalk.yellow;
9
+ blue: typeof chalk.blue;
10
+ magenta: typeof chalk.magenta;
11
+ cyan: typeof chalk.cyan;
12
+ white: typeof chalk.white;
13
+ gray: typeof chalk.gray;
14
+ }
15
+ }
2
16
  declare const logger: log4js.Logger
3
17
  export { logger }
@@ -1,4 +1,5 @@
1
1
  import log4js from 'log4js'
2
+ import { Chalk } from 'chalk'
2
3
  log4js.configure({
3
4
  appenders: {
4
5
  console: {
@@ -40,6 +41,16 @@ log4js.configure({
40
41
  },
41
42
  pm2: true
42
43
  })
43
- const logger = log4js.getLogger()
44
+ const chalk = new Chalk({ level: 3 })
45
+ const logger = log4js.getLogger('default')
46
+ logger.chalk = chalk
47
+ logger.red = chalk.red
48
+ logger.green = chalk.green
49
+ logger.yellow = chalk.yellow
50
+ logger.blue = chalk.blue
51
+ logger.magenta = chalk.magenta
52
+ logger.cyan = chalk.cyan
53
+ logger.white = chalk.white
54
+ logger.gray = chalk.gray
44
55
  export { logger }
45
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZGVsL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUE7QUFFM0IsTUFBTSxDQUFDLFNBQVMsQ0FBQztJQUNmLFNBQVMsRUFBRTtRQUNULE9BQU8sRUFBRTtZQUNQLElBQUksRUFBRSxRQUFRO1lBQ2QsTUFBTSxFQUFFO2dCQUNOLElBQUksRUFBRSxTQUFTO2dCQUNmLE9BQU8sRUFBRSx5Q0FBeUM7YUFDbkQ7U0FDRjtRQUNELE9BQU8sRUFBRTtZQUNQLElBQUksRUFBRSxVQUFVO1lBQ2hCLFFBQVEsRUFBRSxjQUFjO1lBQ3hCLE9BQU8sRUFBRSxnQkFBZ0I7WUFDekIsVUFBVSxFQUFFLEVBQUU7WUFDZCxvQkFBb0IsRUFBRSxJQUFJO1lBQzFCLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsU0FBUztnQkFDZixPQUFPLEVBQUUsOEJBQThCO2FBQ3hDO1NBQ0Y7UUFDRCxhQUFhLEVBQUU7WUFDYixJQUFJLEVBQUUsUUFBUTtZQUNkLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsU0FBUztnQkFDZixPQUFPLEVBQUUsMENBQTBDO2FBQ3BEO1NBQ0Y7UUFDRCxhQUFhLEVBQUU7WUFDYixJQUFJLEVBQUUsVUFBVTtZQUNoQixRQUFRLEVBQUUsb0JBQW9CO1lBQzlCLE9BQU8sRUFBRSxnQkFBZ0I7WUFDekIsVUFBVSxFQUFFLEVBQUU7WUFDZCxvQkFBb0IsRUFBRSxJQUFJO1lBQzFCLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLDhCQUE4QixFQUFFO1NBQ3JFO0tBQ0Y7SUFDRCxVQUFVLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFLGNBQWM7S0FDOUU7SUFDRCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUMsQ0FBQTtBQUVGLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQTtBQUNqQyxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUEifQ==
56
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZGVsL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUE7QUFDM0IsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLE9BQU8sQ0FBQTtBQUU3QixNQUFNLENBQUMsU0FBUyxDQUFDO0lBQ2YsU0FBUyxFQUFFO1FBQ1QsT0FBTyxFQUFFO1lBQ1AsSUFBSSxFQUFFLFFBQVE7WUFDZCxNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLFNBQVM7Z0JBQ2YsT0FBTyxFQUFFLHlDQUF5QzthQUNuRDtTQUNGO1FBQ0QsT0FBTyxFQUFFO1lBQ1AsSUFBSSxFQUFFLFVBQVU7WUFDaEIsUUFBUSxFQUFFLGNBQWM7WUFDeEIsT0FBTyxFQUFFLGdCQUFnQjtZQUN6QixVQUFVLEVBQUUsRUFBRTtZQUNkLG9CQUFvQixFQUFFLElBQUk7WUFDMUIsTUFBTSxFQUFFO2dCQUNOLElBQUksRUFBRSxTQUFTO2dCQUNmLE9BQU8sRUFBRSw4QkFBOEI7YUFDeEM7U0FDRjtRQUNELGFBQWEsRUFBRTtZQUNiLElBQUksRUFBRSxRQUFRO1lBQ2QsTUFBTSxFQUFFO2dCQUNOLElBQUksRUFBRSxTQUFTO2dCQUNmLE9BQU8sRUFBRSwwQ0FBMEM7YUFDcEQ7U0FDRjtRQUNELGFBQWEsRUFBRTtZQUNiLElBQUksRUFBRSxVQUFVO1lBQ2hCLFFBQVEsRUFBRSxvQkFBb0I7WUFDOUIsT0FBTyxFQUFFLGdCQUFnQjtZQUN6QixVQUFVLEVBQUUsRUFBRTtZQUNkLG9CQUFvQixFQUFFLElBQUk7WUFDMUIsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsOEJBQThCLEVBQUU7U0FDckU7S0FDRjtJQUNELFVBQVUsRUFBRTtRQUNWLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUUsY0FBYztLQUM5RTtJQUNELEdBQUcsRUFBRSxJQUFJO0NBQ1YsQ0FBQyxDQUFBO0FBRUYsTUFBTSxLQUFLLEdBQUcsSUFBSSxLQUFLLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQWdCckMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUUxQyxNQUFNLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtBQUNwQixNQUFNLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUE7QUFDdEIsTUFBTSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFBO0FBQzFCLE1BQU0sQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQTtBQUM1QixNQUFNLENBQUMsSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUE7QUFDeEIsTUFBTSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFBO0FBQzlCLE1BQU0sQ0FBQyxJQUFJLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQTtBQUN4QixNQUFNLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUE7QUFDMUIsTUFBTSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFBO0FBR3hCLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQSJ9
@@ -27,7 +27,8 @@ export class Networks {
27
27
  headers: this.headers,
28
28
  maxRedirects: 5,
29
29
  validateStatus: (status) => {
30
- return (status >= 200 && status < 300) || status === 406 || (status >= 500)
30
+ // 接受200-299,400-499,以及500及以上的状态码
31
+ return (status >= 200 && status < 600)
31
32
  }
32
33
  })
33
34
  }
@@ -138,4 +139,4 @@ export class Networks {
138
139
  }
139
140
  }
140
141
  }
141
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kZWwvbmV0d29ya3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxVQUFVLEVBQXFDLE1BQU0sT0FBTyxDQUFBO0FBRTVFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFNakMsTUFBTSxPQUFPLFFBQVE7SUFDbkIsR0FBRyxDQUFRO0lBQ1gsTUFBTSxDQUFRO0lBQ2QsT0FBTyxDQUFlO0lBQ3RCLElBQUksQ0FBUTtJQUNaLElBQUksQ0FBTTtJQUNWLGFBQWEsQ0FBSztJQUNsQixXQUFXLENBQVM7SUFDcEIsT0FBTyxDQUFRO0lBQ2YsS0FBSyxDQUE0QjtJQUNqQyxJQUFJLENBQUk7SUFFUixZQUFhLElBQXdCO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDakMsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQTtRQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLElBQUksTUFBTSxDQUFBO1FBQy9CLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUE7UUFDbEMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQTtRQUM3QixJQUFJLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQTtRQUNkLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxLQUFLLENBQUE7UUFDcEMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUE7UUFDeEIsSUFBSSxDQUFDLEtBQUssR0FBRyxTQUFTLENBQUE7UUFFdEIsWUFBWTtRQUNaLElBQUksQ0FBQyxhQUFhLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztZ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
142
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kZWwvbmV0d29ya3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxVQUFVLEVBQXFDLE1BQU0sT0FBTyxDQUFBO0FBRTVFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFNakMsTUFBTSxPQUFPLFFBQVE7SUFDbkIsR0FBRyxDQUFRO0lBQ1gsTUFBTSxDQUFRO0lBQ2QsT0FBTyxDQUFlO0lBQ3RCLElBQUksQ0FBUTtJQUNaLElBQUksQ0FBTTtJQUNWLGFBQWEsQ0FBSztJQUNsQixXQUFXLENBQVM7SUFDcEIsT0FBTyxDQUFRO0lBQ2YsS0FBSyxDQUE0QjtJQUNqQyxJQUFJLENBQUk7SUFFUixZQUFhLElBQXdCO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDakMsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQTtRQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLElBQUksTUFBTSxDQUFBO1FBQy9CLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUE7UUFDbEMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQTtRQUM3QixJQUFJLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQTtRQUNkLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxLQUFLLENBQUE7UUFDcEMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUE7UUFDeEIsSUFBSSxDQUFDLEtBQUssR0FBRyxTQUFTLENBQUE7UUFFdEIsWUFBWTtRQUNaLElBQUksQ0FBQyxhQUFhLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztZ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
@@ -1,10 +1,10 @@
1
- import { DouyinDataOptionsMap, BilibiliDataOptionsMap, XiaohongshuDataOptionsMap } from '../types/index.js'
1
+ import { DouyinDataOptionsMap, BilibiliDataOptionsMap } from '../types/index.js'
2
2
  import { FastifyInstance } from 'fastify'
3
3
  interface initClientParams {
4
4
  /** 抖音ck */
5
- douyin: string;
5
+ douyin?: string;
6
6
  /** B站ck */
7
- bilibili: string;
7
+ bilibili?: string;
8
8
  }
9
9
  interface AmagiInstance {
10
10
  /** Fastify 实例 */
@@ -13,24 +13,12 @@ interface AmagiInstance {
13
13
  * amagi.getDouyinData 可能在未来版本废弃,建议直接导入 getDouyinData 方法使用
14
14
  * @deprecated
15
15
  */
16
- getDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, cookie?: string, options?: DouyinDataOptionsMap[T]) => Promise<any>;
16
+ getDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, options?: DouyinDataOptionsMap[T]) => Promise<any>;
17
17
  /**
18
18
  * amagi.getBilibiliData 可能在未来版本废弃,建议直接导入 getBilibiliData 方法使用
19
19
  * @deprecated
20
20
  */
21
- getBilibiliData: <T extends keyof BilibiliDataOptionsMap>(type: T, cookie?: string, options?: BilibiliDataOptionsMap[T]) => Promise<any>;
22
- /**
23
- * amagi.getXiaohongshuiData 可能在未来版本废弃,建议直接导入 getXiaohongshuiData 方法使用
24
- * @deprecated
25
- */
26
- getXiaohongshuData: <T extends keyof XiaohongshuDataOptionsMap>(type: T, cookie: string, options: XiaohongshuDataOptionsMap[T]) => Promise<any>;
27
- /**
28
- *
29
- * @param client Fastify 实例
30
- * @param port 监听端口
31
- * @returns
32
- */
33
- startClient: (client: FastifyInstance, port: 4567) => Promise<void>;
21
+ getBilibiliData: <T extends keyof BilibiliDataOptionsMap>(type: T, options?: BilibiliDataOptionsMap[T]) => Promise<any>;
34
22
  }
35
23
  export declare class amagi {
36
24
  private douyin
@@ -41,10 +29,13 @@ export declare class amagi {
41
29
  */
42
30
  constructor(data: initClientParams);
43
31
  /**
44
- * 初始化 fastify 实例
45
- * @param log log 是否启用日志,默认为 false
46
- * @returns amagi 实例
32
+ *
33
+ * @param port 监听端口
34
+ * @default port 4567
35
+ * @returns
47
36
  */
48
- initServer(log?: boolean): AmagiInstance;
37
+ startClient(port?: number): AmagiInstance;
38
+ getDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, options?: DouyinDataOptionsMap[T]) => Promise<any>
39
+ getBilibiliData: <T extends keyof BilibiliDataOptionsMap>(type: T, options?: BilibiliDataOptionsMap[T]) => Promise<any>
49
40
  }
50
41
  export {}
@@ -1,8 +1,8 @@
1
1
  import { BilibiliResult } from '../business/bilibili/index.js'
2
2
  import { DouyinResult } from '../business/douyin/index.js'
3
- import { getDouyinData, getBilibiliData, getXiaohongshuData } from '../model/DataFetchers.js'
3
+ import { getDouyinData, getBilibiliData } from '../model/DataFetchers.js'
4
4
  import Fastify from 'fastify'
5
- import { startClient } from '../server/listen.js'
5
+ import { logger } from '../model/index.js'
6
6
  export class amagi {
7
7
  douyin
8
8
  bilibili
@@ -12,18 +12,20 @@ export class amagi {
12
12
  */
13
13
  constructor (data) {
14
14
  /** 抖音ck */
15
- this.douyin = data.douyin
15
+ this.douyin = data.douyin || ''
16
16
  /** B站ck */
17
- this.bilibili = data.bilibili
17
+ this.bilibili = data.bilibili || ''
18
+ /** 小红书ck */
18
19
  }
19
20
  /**
20
- * 初始化 fastify 实例
21
- * @param log log 是否启用日志,默认为 false
22
- * @returns amagi 实例
21
+ *
22
+ * @param port 监听端口
23
+ * @default port 4567
24
+ * @returns
23
25
  */
24
- initServer (log = false) {
26
+ startClient (port = 4567) {
25
27
  const Client = Fastify({
26
- logger: log && {
28
+ logger: {
27
29
  transport: {
28
30
  target: 'pino-pretty',
29
31
  options: {
@@ -41,73 +43,73 @@ export class amagi {
41
43
  Client.get('/docs', async (_request, reply) => {
42
44
  reply.redirect('https://amagi.apifox.cn', 301)
43
45
  })
44
- Client.get('/api/douyin/aweme', async (request, reply) => {
46
+ Client.get('/api/douyin/fetch_one_work', async (request, reply) => {
45
47
  reply.type('application/json').send(await DouyinResult({
46
48
  type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.单个视频作品数据 */,
47
49
  cookie: this.douyin
48
50
  }, { url: request.query.url }))
49
51
  })
50
- Client.get('/api/douyin/comments', async (request, reply) => {
52
+ Client.get('/api/douyin/fetch_work_comments', async (request, reply) => {
51
53
  reply.type('application/json').send(await DouyinResult({
52
54
  type: "\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.评论数据 */,
53
55
  cookie: this.douyin
54
56
  }, { url: request.query.url }))
55
57
  })
56
- Client.get('/api/douyin/comments/reply', async (request, reply) => {
58
+ Client.get('/api/douyin/fetch_video_comment_replies', async (request, reply) => {
57
59
  reply.type('application/json').send(await DouyinResult({
58
60
  type: "\u4E8C\u7EA7\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.二级评论数据 */,
59
61
  cookie: this.douyin
60
62
  }, { aweme_id: request.query.aweme_id, comment_id: request.query.comment_id }))
61
63
  })
62
- Client.get('/api/douyin/userinfo', async (request, reply) => {
64
+ Client.get('/api/douyin/fetch_user_info', async (request, reply) => {
63
65
  reply.type('application/json').send(await DouyinResult({
64
66
  type: "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* DouyinDataType.用户主页数据 */,
65
67
  cookie: this.douyin
66
68
  }, { sec_uid: request.query.sec_uid }))
67
69
  })
68
- Client.get('/api/douyin/uservideoslist', async (request, reply) => {
70
+ Client.get('/api/douyin/fetch_user_post_videos', async (request, reply) => {
69
71
  reply.type('application/json').send(await DouyinResult({
70
72
  type: "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType.用户主页视频列表数据 */,
71
73
  cookie: this.douyin
72
74
  }, { sec_uid: request.query.sec_uid }))
73
75
  })
74
- Client.get('/api/douyin/suggestwords', async (request, reply) => {
76
+ Client.get('/api/douyin/fetch_suggest_words', async (request, reply) => {
75
77
  reply.type('application/json').send(await DouyinResult({
76
78
  type: "\u70ED\u70B9\u8BCD\u6570\u636E" /* DouyinDataType.热点词数据 */,
77
79
  cookie: this.douyin
78
80
  }, { query: request.query.query }))
79
81
  })
80
- Client.get('/api/douyin/search', async (request, reply) => {
82
+ Client.get('/api/douyin/fetch_search_info', async (request, reply) => {
81
83
  reply.type('application/json').send(await DouyinResult({
82
84
  type: "\u641C\u7D22\u6570\u636E" /* DouyinDataType.搜索数据 */,
83
85
  cookie: this.douyin
84
86
  }, { query: request.query.query }))
85
87
  })
86
- Client.get('/api/douyin/emoji', async (_request, reply) => {
88
+ Client.get('/api/douyin/fetch_emoji_list', async (_request, reply) => {
87
89
  reply.type('application/json').send(await DouyinResult({
88
90
  type: "\u5B98\u65B9emoji\u6570\u636E" /* DouyinDataType.官方emoji数据 */,
89
91
  cookie: this.douyin
90
92
  }))
91
93
  })
92
- Client.get('/api/douyin/expressionplus', async (_request, reply) => {
94
+ Client.get('/api/douyin/fetch_emoji_pro_list', async (_request, reply) => {
93
95
  reply.type('application/json').send(await DouyinResult({
94
96
  type: "\u52A8\u6001\u8868\u60C5\u6570\u636E" /* DouyinDataType.动态表情数据 */,
95
97
  cookie: this.douyin
96
98
  }))
97
99
  })
98
- Client.get('/api/douyin/music', async (request, reply) => {
100
+ Client.get('/api/douyin/fetch_music_work', async (request, reply) => {
99
101
  reply.type('application/json').send(await DouyinResult({
100
102
  type: "\u97F3\u4E50\u6570\u636E" /* DouyinDataType.音乐数据 */,
101
103
  cookie: this.douyin
102
104
  }, { music_id: request.query.music_id }))
103
105
  })
104
- Client.get('/api/douyin/liveimages', async (request, reply) => {
106
+ Client.get('/api/douyin/fetch_user_mix_videos', async (request, reply) => {
105
107
  reply.type('application/json').send(await DouyinResult({
106
108
  type: "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E" /* DouyinDataType.实况图片图集数据 */,
107
109
  cookie: this.douyin
108
110
  }, { url: request.query.url }))
109
111
  })
110
- Client.get('/api/douyin/livedata', async (request, reply) => {
112
+ Client.get('/api/douyin/fetch_user_live_videos', async (request, reply) => {
111
113
  reply.type('application/json').send(await DouyinResult({
112
114
  type: "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E" /* DouyinDataType.直播间信息数据 */,
113
115
  cookie: this.douyin
@@ -131,85 +133,107 @@ export class amagi {
131
133
  cookie: request.headers.cookie
132
134
  }, {}))
133
135
  })
134
- Client.get('/api/bilibili/work', async (request, reply) => {
136
+ Client.get('/api/bilibili/fetch_one_video', async (request, reply) => {
135
137
  reply.type('application/json').send(await BilibiliResult({
136
138
  type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType.单个视频作品数据 */,
137
139
  cookie: this.bilibili
138
140
  }, { url: request.query.url }))
139
141
  })
140
- Client.get('/api/bilibili/downloadwork', async (request, reply) => {
142
+ Client.get('/api/bilibili/fetch_video_playurl', async (request, reply) => {
141
143
  reply.type('application/json').send(await BilibiliResult({
142
144
  type: "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.单个视频下载信息数据 */,
143
145
  cookie: this.bilibili
144
146
  }, { avid: request.query.avid, cid: request.query.cid }))
145
147
  })
146
- Client.get('/api/bilibili/comment', async (request, reply) => {
148
+ Client.get('/api/bilibili/fetch_work_comments', async (request, reply) => {
147
149
  reply.type('application/json').send(await BilibiliResult({
148
150
  type: "\u8BC4\u8BBA\u6570\u636E" /* BilibiliDataType.评论数据 */,
149
151
  cookie: this.bilibili
150
- }, { bvid: request.query.bvid }))
152
+ }, { oid: Number(request.query.oid), number: Number(request.query.number), type: Number(request.query.type || 1) }))
151
153
  })
152
- Client.get('/api/bilibili/emoji', async (_request, reply) => {
154
+ Client.get('/api/bilibili/fetch_emoji_list', async (_request, reply) => {
153
155
  reply.type('application/json').send(await BilibiliResult({
154
156
  type: "emoji\u6570\u636E" /* BilibiliDataType.emoji数据 */,
155
157
  cookie: this.bilibili
156
158
  }, {}))
157
159
  })
158
- Client.get('/api/bilibili/bangumivideoinfo', async (request, reply) => {
160
+ Client.get('/api/bilibili/fetch_bangumi_video_info', async (request, reply) => {
159
161
  reply.type('application/json').send(await BilibiliResult({
160
162
  type: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧基本信息数据 */,
161
163
  cookie: this.bilibili
162
164
  }, { url: request.query.url }))
163
165
  })
164
- Client.get('/api/bilibili/bangumivideodownloadlink', async (request, reply) => {
166
+ Client.get('/api/bilibili/fetch_bangumi_video_playurl', async (request, reply) => {
165
167
  reply.type('application/json').send(await BilibiliResult({
166
168
  type: "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧下载信息数据 */,
167
169
  cookie: this.bilibili
168
170
  }, { cid: request.query.cid, ep_id: request.query.ep_id }))
169
171
  })
170
- Client.get('/api/bilibili/dynamiclist', async (request, reply) => {
172
+ Client.get('/api/bilibili/fetch_user_dynamic', async (request, reply) => {
171
173
  reply.type('application/json').send(await BilibiliResult({
172
174
  type: "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" /* BilibiliDataType.用户主页动态列表数据 */,
173
175
  cookie: this.bilibili
174
176
  }, { host_mid: request.query.host_mid }))
175
177
  })
176
- Client.get('/api/bilibili/dynamicinfo', async (request, reply) => {
178
+ Client.get('/api/bilibili/fetch_dynamic_info', async (request, reply) => {
177
179
  reply.type('application/json').send(await BilibiliResult({
178
180
  type: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */,
179
181
  cookie: this.bilibili
180
182
  }, { dynamic_id: request.query.dynamic_id }))
181
183
  })
182
- Client.get('/api/bilibili/dynamicdard', async (request, reply) => {
184
+ Client.get('/api/bilibili/fetch_dynamic_card', async (request, reply) => {
183
185
  reply.type('application/json').send(await BilibiliResult({
184
186
  type: "\u52A8\u6001\u5361\u7247\u6570\u636E" /* BilibiliDataType.动态卡片数据 */,
185
187
  cookie: this.bilibili
186
188
  }, { dynamic_id: request.query.dynamic_id }))
187
189
  })
188
- Client.get('/api/bilibili/userinfo', async (request, reply) => {
190
+ Client.get('/api/bilibili/fetch_user_profile', async (request, reply) => {
189
191
  reply.type('application/json').send(await BilibiliResult({
190
192
  type: "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* BilibiliDataType.用户主页数据 */,
191
193
  cookie: this.bilibili
192
194
  }, { host_mid: request.query.host_mid }))
193
195
  })
194
- Client.get('/api/bilibili/liveroominfo', async (request, reply) => {
196
+ Client.get('/api/bilibili/fetch_live_room_detail', async (request, reply) => {
195
197
  reply.type('application/json').send(await BilibiliResult({
196
198
  type: "\u76F4\u64AD\u95F4\u4FE1\u606F" /* BilibiliDataType.直播间信息 */,
197
199
  cookie: this.bilibili
198
200
  }, { room_id: request.query.room_id }))
199
201
  })
200
- Client.get('/api/bilibili/liveroominit', async (request, reply) => {
202
+ Client.get('/api/bilibili/fetch_liveroom_def', async (request, reply) => {
201
203
  reply.type('application/json').send(await BilibiliResult({
202
204
  type: "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F" /* BilibiliDataType.直播间初始化信息 */,
203
205
  cookie: this.bilibili
204
206
  }, { room_id: request.query.room_id }))
205
207
  })
208
+ Client.get('/api/bilibili/bv_to_av', async (request, reply) => {
209
+ reply.type('application/json').send(await BilibiliResult({
210
+ type: "BV\u8F6CAV" /* BilibiliDataType.BV转AV */,
211
+ cookie: this.bilibili
212
+ }, { bvid: request.query.bvid }))
213
+ })
214
+ Client.get('/api/bilibili/av_to_bv', async (request, reply) => {
215
+ reply.type('application/json').send(await BilibiliResult({
216
+ type: "AV\u8F6CBV" /* BilibiliDataType.AV转BV */,
217
+ cookie: this.bilibili
218
+ }, { avid: request.query.avid }))
219
+ })
220
+ Client.listen({ port: port, host: '::' }, (_err, _address) => {
221
+ if (_err)
222
+ Client.log.error(_err)
223
+ logger.mark(`amagi server ${logger.green(`listening on ${port}`)} port. ${logger.yellow('API docs: https://amagi.apifox.cn')}`)
224
+ })
206
225
  return {
207
- startClient,
226
+ /** Fastify 实例 */
208
227
  Instance: Client,
209
- getDouyinData,
210
- getBilibiliData,
211
- getXiaohongshuData
228
+ getDouyinData: this.getDouyinData,
229
+ getBilibiliData: this.getBilibiliData
212
230
  }
213
231
  }
232
+ getDouyinData = async (type, options) => {
233
+ return await getDouyinData(type, this.douyin, options)
234
+ }
235
+ getBilibiliData = async (type, options) => {
236
+ return await getBilibiliData(type, this.bilibili, options)
237
+ }
214
238
  }
215
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
239
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
package/lib/test.js CHANGED
@@ -2,16 +2,18 @@ import { Amagi, getBilibiliData } from './index.js';
2
2
  const client = new Amagi({
3
3
  douyin: '',
4
4
  bilibili: ''
5
- }).initServer(true);
6
- await client.startClient(client.Instance, 4567);
5
+ });
6
+ const h = client.startClient();
7
+ await h.getDouyinData('官方emoji数据');
8
+ const b = await h.getBilibiliData('单个视频作品数据', { id_type: 'bvid', id: 'BV1WvpTekEPQ' });
7
9
  const douyinData = await client.getDouyinData('官方emoji数据');
8
10
  const bilibiliData = await getBilibiliData('emoji数据');
9
- console.log({ douyinData, bilibiliData });
11
+ console.log({ douyinData, bilibiliData, b });
10
12
  if (douyinData && bilibiliData) {
11
- client.Instance.close();
13
+ h.Instance.close();
12
14
  process.exit(0);
13
15
  }
14
16
  else {
15
17
  process.exit(1);
16
18
  }
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxDQUFBO0FBRTFDLE1BQU0sTUFBTSxHQUFHLElBQUksS0FBSyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxFQUFFO0lBQ1YsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFBO0FBQ25CLE1BQU0sTUFBTSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFBO0FBRS9DLE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMxRCxNQUFNLFlBQVksR0FBRyxNQUFNLGVBQWUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUVyRCxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUE7QUFFekMsSUFBSSxVQUFVLElBQUksWUFBWSxFQUFFLENBQUM7SUFDL0IsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUN2QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2pCLENBQUM7S0FBTSxDQUFDO0lBQ04sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqQixDQUFDIn0=
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxDQUFBO0FBRTFDLE1BQU0sTUFBTSxHQUFHLElBQUksS0FBSyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxFQUFFO0lBQ1YsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLENBQUE7QUFDRixNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUE7QUFFOUIsTUFBTSxDQUFDLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQ2xDLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDLGVBQWUsQ0FBQyxVQUFVLEVBQUUsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFBO0FBRXRGLE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMxRCxNQUFNLFlBQVksR0FBRyxNQUFNLGVBQWUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUVyRCxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0FBRTVDLElBQUksVUFBVSxJQUFJLFlBQVksRUFBRSxDQUFDO0lBQy9CLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqQixDQUFDO0tBQU0sQ0FBQztJQUNOLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDakIsQ0FBQyJ9
@@ -35,11 +35,7 @@ export declare const enum BilibiliDataType {
35
35
  直播间初始化信息 = "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F",
36
36
  登录基本信息 = "\u767B\u5F55\u57FA\u672C\u4FE1\u606F",
37
37
  申请二维码 = "\u7533\u8BF7\u4E8C\u7EF4\u7801",
38
- 二维码状态 = "\u4E8C\u7EF4\u7801\u72B6\u6001"
39
- }
40
- /**
41
- * 小红书接口类型
42
- */
43
- export declare const enum XiaohongshuDataType {
44
- 单个笔记 = "\u5355\u4E2A\u7B14\u8BB0"
38
+ 二维码状态 = "\u4E8C\u7EF4\u7801\u72B6\u6001",
39
+ BV转AV = "BV\u8F6CAV",
40
+ AV转BV = "AV\u8F6CBV"
45
41
  }
@@ -13,13 +13,15 @@ type LiveWorkParams = {
13
13
  aweme_id?: string;
14
14
  };
15
15
  type CommentParams = {
16
+ /** 视频分享URL,和aweme_id二选一 */
17
+ url?: string;
16
18
  /** 视频ID,数据获取更准确,和url二选一 */
17
- aweme_id: string;
19
+ aweme_id?: string;
18
20
  /**
19
21
  * 获取的评论数量
20
22
  * @default 50
21
23
  */
22
- number: number;
24
+ number?: number;
23
25
  /** 游标 */
24
26
  cursor?: number;
25
27
  };
@@ -115,17 +115,3 @@ export type BilibiliOptionsType = {
115
115
  */
116
116
  pn?: number;
117
117
  };
118
- export type XiaohongshuOptionsType = {
119
- /**
120
- * 笔记ID
121
- */
122
- source_note_id?: string;
123
- /**
124
- * web端的路径参数xsec_token
125
- */
126
- xsec_token?: string;
127
- /**
128
- * 笔记分享URL
129
- */
130
- url?: string;
131
- };
@@ -1,10 +1,9 @@
1
1
  import type { BilibiliDataOptionsMapKeys, BilibiliDataOptionsMap } from './BilibiliAPIParams.js'
2
2
  import type { ConfigType } from './ConfigType.js'
3
- import { BilibiliDataType, DouyinDataType, XiaohongshuDataType } from './DataType.js'
3
+ import { BilibiliDataType, DouyinDataType } from './DataType.js'
4
4
  import type { DouyinDataOptionsMap, DouyinDataOptionsMapKeys } from './DouyinAPIParams.js'
5
5
  import type { GetDataResponseType } from './GetDataResponseType.js'
6
6
  import type { NetworksConfigType } from './NetworksConfigType.js'
7
- import type { BilibiliOptionsType, DouyinOptionsType, XiaohongshuOptionsType } from './OptionsType.js'
8
- import type { XiaohongshuDataOptionsMap, XiaohongshuDataOptionsMapKeys } from './XiaohongshuAPIParams.js'
7
+ import type { BilibiliOptionsType, DouyinOptionsType } from './OptionsType.js'
9
8
  export * from './Request.js'
10
- export { BilibiliDataOptionsMapKeys, BilibiliDataType, BilibiliOptionsType, ConfigType, DouyinDataType, DouyinOptionsType, GetDataResponseType, NetworksConfigType, DouyinDataOptionsMapKeys, DouyinDataOptionsMap, BilibiliDataOptionsMap, XiaohongshuDataOptionsMap, XiaohongshuDataType, XiaohongshuDataOptionsMapKeys, XiaohongshuOptionsType }
9
+ export { BilibiliDataOptionsMapKeys, BilibiliDataType, BilibiliOptionsType, ConfigType, DouyinDataType, DouyinOptionsType, GetDataResponseType, NetworksConfigType, DouyinDataOptionsMapKeys, DouyinDataOptionsMap, BilibiliDataOptionsMap }
@@ -1,2 +1,2 @@
1
1
  export * from './Request.js'
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsY0FBYyxXQUFXLENBQUEifQ==
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsY0FBYyxXQUFXLENBQUEifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ikenxuan/amagi",
3
- "version": "3.1.2",
3
+ "version": "3.2.0",
4
4
  "homepage": "https://github.com/ikenxuan/amagi",
5
5
  "bugs": {
6
6
  "url": "https://github.com/ikenxuan/amagi/issues"
@@ -23,23 +23,24 @@
23
23
  "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix",
24
24
  "dev": "tsx watch src/dev.ts",
25
25
  "dev:js": "node src/dev.js",
26
- "fix": "eslint lib/**/*.js --fix && eslint lib/**/*.d.ts --fix",
26
+ "fix": "npx eslint lib/**/*.js --fix && npx eslint lib/**/*.d.ts --fix",
27
27
  "sort": "npx sort-package-json",
28
28
  "test": "node lib/test.js"
29
29
  },
30
30
  "dependencies": {
31
31
  "axios": "^1.7.7",
32
- "fastify": "^5.0.0",
32
+ "chalk": "^5.3.0",
33
+ "fastify": "^4.28.1",
33
34
  "lodash": "^4.17.21",
34
35
  "log4js": "6.9.0",
35
36
  "pino-pretty": "^11.2.2"
36
37
  },
37
38
  "devDependencies": {
38
39
  "@types/lodash": "^4.17.9",
39
- "@types/node": "^22.7.3",
40
- "@typescript-eslint/parser": "^8.7.0",
40
+ "@types/node": "^22.7.4",
41
+ "@typescript-eslint/parser": "^8.8.0",
41
42
  "eslint": "^9.11.1",
42
- "globals": "^15.9.0",
43
+ "globals": "^15.10.0",
43
44
  "neostandard": "^0.11.6",
44
45
  "sort-package-json": "^2.10.1",
45
46
  "tsc-alias": "^1.8.10",