@ikenxuan/amagi 1.5.6 → 1.5.8

package/lib/business/bilibili/API.js

@@ -10,7 +10,7 @@ class BiLiBiLiAPI {
     }
     /** type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
     评论区明细(data) {
-        return `https://api.bilibili.com/x/v2/reply?sort=1&ps=20&type=${data.type}&oid=${data.oid}`;
+        return `https://api.bilibili.com/x/v2/reply?sort=1&ps=${data.number || 20}&type=${data.type}&oid=${data.oid}`;
     }
     表情列表() {
         return 'https://api.bilibili.com/x/emote/user/panel/web?business=reply&web_location=0.0';

package/lib/business/bilibili/getdata.js

@@ -8,7 +8,7 @@ export default class BilibiliData {
         this.type = type;
         this.headers = {};
         this.headers.Referer = 'https://api.bilibili.com/';
-        this.headers.Cookie = cookie;
+        this.headers.Cookie = cookie.replace(/\s+/g, '');
         this.headers['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0';
     }
     async GetData(data = {}) {

package/lib/business/bilibili/index.d.ts

@@ -1,7 +1,7 @@
 import BiLiBiLiAPI from './API.js';
 import BilibiliData from './getdata.js';
 import GetBilibiliID from './getid.js';
-import wbi_sign from './sign/wbi.js';
 import qtparam from './qtparam.js';
 import BilibiliResult from './result.js';
-export { BiLiBiLiAPI, BilibiliData, GetBilibiliID, wbi_sign, qtparam, BilibiliResult };
+import wbi_sign from './sign/wbi.js';
+export { BiLiBiLiAPI, BilibiliData, BilibiliResult, GetBilibiliID, qtparam, wbi_sign };

package/lib/business/bilibili/index.js

@@ -1,7 +1,7 @@
 import BiLiBiLiAPI from './API.js';
 import BilibiliData from './getdata.js';
 import GetBilibiliID from './getid.js';
-import wbi_sign from './sign/wbi.js';
 import qtparam from './qtparam.js';
 import BilibiliResult from './result.js';
-export { BiLiBiLiAPI, BilibiliData, GetBilibiliID, wbi_sign, qtparam, BilibiliResult };
+import wbi_sign from './sign/wbi.js';
+export { BiLiBiLiAPI, BilibiliData, BilibiliResult, GetBilibiliID, qtparam, wbi_sign };

package/lib/business/bilibili/qtparam.js

@@ -1,5 +1,5 @@
-import { Networks } from '../../model/index.js';
 import { BiLiBiLiAPI, wbi_sign } from '../../business/bilibili/index.js';
+import { Networks } from '../../model/index.js';
 export default async function qtparam(BASEURL, cookie) {
     if (cookie == '')
         return { QUERY: '&platform=html5', STATUS: '!isLogin' };

package/lib/business/bilibili/result.d.ts

@@ -1,4 +1,4 @@
-import { BilibiliDataType, GetDataResponseType, BilibiliOptionsType } from '../../types/index.js';
+import { BilibiliDataType, BilibiliOptionsType, GetDataResponseType } from '../../types/index.js';
 export default class BilibiliResult {
     type: BilibiliDataType;
     cookie: string;

package/lib/business/bilibili/sign/wbi.js

@@ -1,5 +1,5 @@
 import md5 from 'md5';
-import fetch from 'node-fetch';
+import axios from 'axios';
 const mixinKeyEncTab = [
     46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49, 33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40, 61, 26,
     17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11, 36, 20, 34, 44, 52
@@ -29,12 +29,12 @@ function encWbi(params, img_key, sub_key) {
 }
 // 获取最新的 img_key 和 sub_key
 async function getWbiKeys(cookie) {
-    const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
+    const res = await axios('https://api.bilibili.com/x/web-interface/nav', {
         headers: {
             Cookie: cookie
         }
     });
-    const responseJson = await res.json();
+    const responseJson = res.data;
     const response = responseJson; // 类型断言
     // 确保response是ResponseData类型后再解构
     const { data: { wbi_img: { img_url, sub_url } } } = response;

package/lib/business/douyin/API.js

@@ -23,7 +23,7 @@ class DouyinAPI {
         return `https://www.douyin.com/aweme/v1/web/user/profile/other/?device_platform=webapp&aid=6383&channel=channel_pc_web&publish_video_strategy_type=2&source=channel_pc_web&sec_user_id=${data.sec_uid}&personal_center_strategy=1&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=0&webid=7327957959955580467&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
     }
     热点词(data) {
-        return `https://www.douyin.com/aweme/v1/web/api/suggest_words/?device_platform=webapp&aid=6383&channel=channel_pc_web&query=${encodeURIComponent(data.query)}&business_id=30088&from_group_id=7129543174929812767&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh - CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7327957959955580467&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
+        return `https://www.douyin.com/aweme/v1/web/api/suggest_words/?device_platform=webapp&aid=6383&channel=channel_pc_web&query=${data.query}&business_id=30088&from_group_id=7129543174929812767&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh - CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7327957959955580467&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
     }
     搜索(data) {
         return `https://www.douyin.com/aweme/v1/web/general/search/single/?device_platform=webapp&aid=6383&channel=channel_pc_web&search_channel=aweme_general&sort_type=0&publish_time=0&keyword=${data.query}&search_source=normal_search&query_correct_type=1&is_filter_search=0&from_group_id=&offset=0&count=15&pc_client_type=1&version_code=190600&version_name=19.6.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7338423850134226495&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;

package/lib/business/douyin/getdata.js

@@ -1,4 +1,4 @@
-import { Sign, DouyinAPI } from '../../business/douyin/index.js';
+import { DouyinAPI, Sign } from '../../business/douyin/index.js';
 import { Networks } from '../../model/index.js';
 export default class DouyinData {
     type;
@@ -8,7 +8,7 @@ export default class DouyinData {
         this.type = type;
         this.headers = {
             Referer: 'https://www.douyin.com/',
-            Cookie: cookie,
+            Cookie: cookie.replace(/\s+/g, ''),
             Accept: '*/*',
             'Content-Type': 'application/json',
             'Accpet-Language': 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',

package/lib/business/douyin/index.d.ts

@@ -1,6 +1,6 @@
-import DouyinData from './getdata.js';
 import DouyinAPI from './API.js';
+import DouyinData from './getdata.js';
 import GetDouyinID from './getid.js';
 import DouyinResult from './result.js';
 import Sign from './sign/index.js';
-export { DouyinAPI, DouyinData, GetDouyinID, DouyinResult, Sign };
+export { DouyinAPI, DouyinData, DouyinResult, GetDouyinID, Sign };

package/lib/business/douyin/index.js

@@ -1,6 +1,6 @@
-import DouyinData from './getdata.js';
 import DouyinAPI from './API.js';
+import DouyinData from './getdata.js';
 import GetDouyinID from './getid.js';
 import DouyinResult from './result.js';
 import Sign from './sign/index.js';
-export { DouyinAPI, DouyinData, GetDouyinID, DouyinResult, Sign };
+export { DouyinAPI, DouyinData, DouyinResult, GetDouyinID, Sign };

package/lib/business/douyin/result.d.ts

@@ -1,4 +1,4 @@
-import { DouyinDataType, GetDataResponseType, DouyinOptionsType } from '../../types/index.js';
+import { DouyinDataType, DouyinOptionsType, GetDataResponseType } from '../../types/index.js';
 export default class DouyinResult {
     type: DouyinDataType;
     cookie: string;

package/lib/business/douyin/sign/index.js

@@ -1,5 +1,5 @@
-import a_bogus from './a_bogus.js';
 import crypto from 'crypto';
+import a_bogus from './a_bogus.js';
 const headers = {
     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36'
 };

package/lib/business/index.d.ts

@@ -1,2 +1,2 @@
-export * from '../business/douyin/index.js';
 export * from '../business/bilibili/index.js';
+export * from '../business/douyin/index.js';

package/lib/business/index.js

@@ -1,2 +1,2 @@
-export * from '../business/douyin/index.js';
 export * from '../business/bilibili/index.js';
+export * from '../business/douyin/index.js';

package/lib/index.d.ts

@@ -1,8 +1,7 @@
-export * from "./model/index.js";
 export * from "./business/index.js";
-export * from "./types/index.js";
+export * from "./model/index.js";
 export * from "./server/index.js";
+export * from "./types/index.js";
+export { amagi as Amagi, amagi as default };
 import { client } from "./server/index.js";
 declare const amagi: typeof client;
-export { amagi as default };
-export { amagi as Amagi };

package/lib/index.js

@@ -1,8 +1,7 @@
-export * from "./model/index.js";
 export * from "./business/index.js";
-export * from "./types/index.js";
+export * from "./model/index.js";
 export * from "./server/index.js";
+export * from "./types/index.js";
+export { amagi as Amagi, amagi as default };
 import { client } from "./server/index.js";
 const amagi = client;
-export { amagi as default };
-export { amagi as Amagi };

package/lib/model/dir.d.ts

@@ -2,4 +2,4 @@
 declare const dirPath: string;
 /** 插件包的名称 */
 declare const basename: string;
-export { dirPath, basename };
+export { basename, dirPath };

package/lib/model/dir.js

@@ -6,4 +6,4 @@ const filePath = fileURLToPath(import.meta.url).replace(/\\/g, '/');
 const dirPath = path.resolve(filePath, '../../../');
 /** 插件包的名称 */
 const basename = path.basename(dirPath);
-export { dirPath, basename };
+export { basename, dirPath };

package/lib/model/index.d.ts

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

package/lib/model/index.js

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

package/lib/model/logger.js

@@ -1,6 +1,6 @@
+import chalk from 'chalk';
 import log from 'loglevel';
 import prefix from 'loglevel-plugin-prefix';
-import chalk from 'chalk';
 const colors = {
   TRACE: chalk.magenta,
   DEBUG: chalk.cyan,
@@ -11,7 +11,7 @@ const colors = {
 prefix.reg(log);
 log.enableAll();
 prefix.apply(log, {
-  format(level, name, timestamp) {
+  format (level, name, timestamp) {
     const levelKey = level.toUpperCase();
     if (!(levelKey in colors)) {
       throw new Error(`Invalid log level: ${levelKey}`);
@@ -20,7 +20,7 @@ prefix.apply(log, {
   }
 });
 prefix.apply(log.getLogger('critical'), {
-  format(level, name, timestamp) {
+  format (level, name, timestamp) {
     return chalk.red.bold(`[${timestamp}] ${level} ${name}:`);
   }
 });

package/lib/model/networks.d.ts

@@ -1,24 +1,23 @@
-import { Response } from 'node-fetch';
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { NetworksConfigType } from '../types/index.js';
 interface HeadersObject {
     [key: string]: string;
 }
 export default class Networks {
-  url: string | URL;
+  url: string;
   method: string;
-  Headers: any;
+  headers: HeadersObject;
   type: string;
-  body?: string;
-  fetch: any;
+  body?: any;
+  axiosInstance: any;
   isGetResult: boolean;
   timeout: number;
   timer: NodeJS.Timeout | undefined;
   data: {};
-  redirect: string;
   constructor(data: NetworksConfigType);
-  get config(): NetworksConfigType;
-  getfetch(): Promise<Response | boolean>;
-  returnResult(): Promise<Response>;
+  get config(): AxiosRequestConfig;
+  getfetch(): Promise<AxiosResponse | boolean>;
+  returnResult(): Promise<AxiosResponse>;
   /** 最终地址（跟随重定向） */
   getLongLink(): Promise<string>;
   /** 获取首个302 */
@@ -33,6 +32,5 @@ export default class Networks {
   ToText(): Promise<void>;
   ToArrayBuffer(): Promise<void>;
   ToBlob(): Promise<void>;
-  timeoutPromise(timeout: number): Promise<Response>;
 }
 export {};

package/lib/model/networks.js

@@ -1,48 +1,44 @@
-import fetch, { Response } from 'node-fetch';
 import { logger } from '../model/index.js';
-const controller = new AbortController();
+import axios from 'axios';
 export default class Networks {
   url;
   method;
-  Headers;
+  headers;
   type;
   body;
-  fetch;
+  axiosInstance;
   isGetResult;
   timeout;
   timer;
   data;
-  redirect;
-  constructor(data) {
-    this.Headers = new Headers();
-    if (data.headers && Object.keys(data.headers).length > 0) {
-      for (const [key, value] of Object.entries(data.headers)) {
-        this.Headers.append(key, value);
-      }
-    }
-    else
-      this.Headers = {};
+  constructor (data) {
+    this.headers = data.headers || {};
     this.url = data.url || '';
     this.type = data.type || 'json';
     this.method = data.method || 'GET';
-    this.body = data.body || ''; // 用于POST请求
+    this.body = data.body || null;
     this.data = {};
-    this.timeout = data.timeout || 15000;
+    this.timeout = data.timeout || 5000;
     this.isGetResult = false;
     this.timer = undefined;
-    this.redirect = 'follow'; // 默认跟随重定向
+    // 创建axios实例
+    this.axiosInstance = axios.create({
+      timeout: this.timeout,
+      headers: this.headers
+    });
   }
-  get config() {
-    let data = {
-      headers: this.Headers,
-      method: this.method
+  get config () {
+    let config = {
+      url: this.url,
+      method: this.method,
+      headers: this.headers
     };
-    if (this.method === 'POST') {
-      data = { ...data, body: JSON.stringify(this.body) || '' };
+    if (this.method === 'POST' && this.body) {
+      config.data = this.body;
     }
-    return data;
+    return config;
   }
-  async getfetch() {
+  async getfetch () {
     try {
       const result = await this.returnResult();
       if (result.status === 504) {
@@ -56,14 +52,14 @@ export default class Networks {
       return false;
     }
   }
-  async returnResult() {
-    return await fetch(this.url, this.config);
+  async returnResult () {
+    return await this.axiosInstance(this.config);
   }
   /** 最终地址（跟随重定向） */
-  async getLongLink() {
+  async getLongLink () {
     try {
       const result = await this.returnResult();
-      return result.url;
+      return result.request.res.responseUrl; // axios中获取最终的请求URL
     }
     catch (error) {
       logger.error(error);
@@ -71,14 +67,15 @@ export default class Networks {
     }
   }
   /** 获取首个302 */
-  async getLocation() {
+  async getLocation () {
     try {
-      const response = await fetch(this.url, {
+      const response = await this.axiosInstance({
         method: 'GET',
-        redirect: 'manual' // 不跟随重定向
+        url: this.url,
+        maxRedirects: 0, // 禁止跟随重定向
+        validateStatus: (status) => status >= 300 && status < 400 // 仅处理3xx响应
       });
-      // 取location返回
-      return response.headers.get('location');
+      return response.headers['location'];
     }
     catch (error) {
       logger.error(error);
@@ -86,7 +83,7 @@ export default class Networks {
     }
   }
   /** 获取数据并处理数据的格式化，默认json */
-  async getData(new_fetch = '') {
+  async getData (new_fetch = '') {
     try {
       if (!new_fetch) {
         const result = await this.returnResult();
@@ -97,11 +94,11 @@ export default class Networks {
           logger.warn('HTTP 响应状态码: 429');
           throw new Error('ratelimit triggered, 触发 https://www.douyin.com/ 的速率限制！！！');
         }
-        this.fetch = result;
+        this.axiosInstance = result;
         this.isGetResult = true;
       }
       else {
-        this.fetch = new_fetch;
+        this.axiosInstance = new_fetch;
       }
       switch (this.type) {
       case 'json':
@@ -118,7 +115,7 @@ export default class Networks {
         break;
       default:
       }
-      return this.fetch;
+      return this.axiosInstance;
     }
     catch (error) {
       logger.error(error);
@@ -126,17 +123,12 @@ export default class Networks {
     }
   }
   /** 获取响应头 */
-  async getHeaders() {
+  async getHeaders () {
     try {
-      this.fetch = await this.returnResult();
-      if (this.fetch) {
-        if (this.fetch.headers) {
-          const headers = this.fetch.headers;
-          const headersObject = {};
-          for (const [key, value] of headers.entries()) {
-            headersObject[key] = value;
-          }
-          return headersObject;
+      this.axiosInstance = await this.returnResult();
+      if (this.axiosInstance) {
+        if (this.axiosInstance.headers) {
+          return this.axiosInstance.headers;
         }
         else {
           logger.error('未获取到响应头');
@@ -154,32 +146,19 @@ export default class Networks {
     }
   }
   /** 一次性获取响应头和响应体 */
-  async getHeadersAndData() {
+  async getHeadersAndData () {
     try {
-      // 发起网络请求获取响应对象
-      this.fetch = await this.returnResult();
-      // 初始化响应头和响应数据
+      this.axiosInstance = await this.returnResult();
       let headers = null;
       let data = null;
-      if (this.fetch) {
-        // 获取响应头
-        if (this.fetch.headers) {
-          headers = {};
-          const fetchHeaders = this.fetch.headers;
-          for (const [key, value] of fetchHeaders.entries()) {
-            headers[key] = value;
-          }
-        }
-        else {
-          logger.error('未获取到响应头');
-        }
-        // 获取响应数据
+      if (this.axiosInstance) {
+        headers = this.axiosInstance.headers;
         switch (this.type) {
         case 'json':
-          data = await this.fetch.json();
+          data = this.axiosInstance.data;
           break;
         case 'text':
-          data = await this.fetch.text();
+          data = this.axiosInstance.data;
           break;
         case 'arrayBuffer':
           data = await this.ToArrayBuffer();
@@ -200,31 +179,23 @@ export default class Networks {
       return { headers: null, data: null };
     }
   }
-  async Tojson() {
-    if (this.fetch.headers.get('content-type').includes('json')) {
-      this.fetch = await this.fetch.json();
+  async Tojson () {
+    if (this.axiosInstance.headers['content-type'].includes('json')) {
+      this.axiosInstance = this.axiosInstance.data;
     }
     else {
-      this.fetch = await this.fetch.text();
+      this.axiosInstance = this.axiosInstance.data;
       this.type = 'text';
     }
   }
-  async ToText() {
-    this.fetch = await this.fetch.text();
+  async ToText () {
+    this.axiosInstance = this.axiosInstance.data;
   }
-  async ToArrayBuffer() {
-    this.fetch = await this.fetch.arrayBuffer();
+  async ToArrayBuffer () {
+    this.axiosInstance = this.axiosInstance.data;
   }
-  async ToBlob() {
-    this.fetch = await this.fetch.blob();
-  }
-  timeoutPromise(timeout) {
-    return new Promise((resolve, reject) => {
-      this.timer = setTimeout(() => {
-        logger.info('执行力');
-        controller.abort();
-        resolve(new Response('timeout', { status: 504, statusText: 'timeout' }));
-      }, timeout);
-    });
+  async ToBlob () {
+    // axios 没有直接支持blob, 需要使用arraybuffer然后转换
+    this.axiosInstance = new Blob([new Uint8Array(this.axiosInstance.data)]);
   }
 }

package/lib/server/client.js

@@ -8,7 +8,7 @@ export class client {
      *
      * @param cookies 包含抖音和B站cookie的参数对象
      */
-  constructor(cookies) {
+  constructor (cookies) {
     /** 抖音ck */
     this.douyin = cookies.douyin;
     /** B站ck */
@@ -19,7 +19,7 @@ export class client {
      * @param log 是否启用日志
      * @returns fastify 实例
      */
-  async initServer(log = false) {
+  async initServer (log = false) {
     const client = fastify({ logger: log });
     client.get('/api/douyin/aweme', async (request, reply) => {
       const url = request.query.url;

package/lib/types/BilibiliAPIParams.d.ts

@@ -12,9 +12,11 @@ type VideoStreamParams = {
 };
 type CommentParams = {
     /** 评论区类型，type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
-    type: number | string;
+    type?: number | string;
     /** 稿件ID，也就是AVID */
-    oid: number | string;
+    oid?: number | string;
+    /** 获取的评论数量，默认最高20 */
+    number?: number;
 };
 type BangumiInfoParams = {
     /** 稿件ID是否为epid */

package/lib/types/DouyinAPIParams.d.ts

@@ -1,6 +1,7 @@
 type WorkParams = {
     /** 视频ID */
     aweme_id: string;
+    /** 获取的评论数量 */
     number?: number | string;
 };
 type CommentParams = {

package/lib/types/NetworksConfigType.d.ts

@@ -2,7 +2,7 @@ export type NetworksConfigType = {
     /**
      * 请求地址
      */
-    url?: string | URL;
+    url?: string;
     /**
      * 请求方法
      */

package/lib/types/Request.d.ts

@@ -1,5 +1,5 @@
 import { FastifyRequest } from 'fastify';
-import { DouyinOptionsType, BilibiliOptionsType } from './OptionsType.js';
+import { BilibiliOptionsType, DouyinOptionsType } from './OptionsType.js';
 export interface DouyinRequest extends FastifyRequest {
     Querystring: DouyinOptionsType;
 }

package/lib/types/index.d.ts

@@ -1,9 +1,9 @@
-import { DouyinDataType, BilibiliDataType } from './DataType.js';
-import { type DouyinOptionsType, type BilibiliOptionsType } from './OptionsType.js';
-import { type GetDataResponseType } from './GetDataResponseType.js';
+import { type BilibiliAPIParams } from './BilibiliAPIParams.js';
 import { type ConfigType } from './ConfigType.js';
-import { type NetworksConfigType } from './NetworksConfigType.js';
-import { DouyinRequest, BilibiliRequest } from './Request.js';
+import { BilibiliDataType, DouyinDataType } from './DataType.js';
 import { type DouyinAPIParams } from './DouyinAPIParams.js';
-import { type BilibiliAPIParams } from './BilibiliAPIParams.js';
-export { DouyinDataType, BilibiliDataType, DouyinOptionsType, BilibiliOptionsType, GetDataResponseType, ConfigType, NetworksConfigType, DouyinRequest, BilibiliRequest, DouyinAPIParams, BilibiliAPIParams };
+import { type GetDataResponseType } from './GetDataResponseType.js';
+import { type NetworksConfigType } from './NetworksConfigType.js';
+import { type BilibiliOptionsType, type DouyinOptionsType } from './OptionsType.js';
+export * from './Request.js';
+export { BilibiliAPIParams, BilibiliDataType, BilibiliOptionsType, ConfigType, DouyinAPIParams, DouyinDataType, DouyinOptionsType, GetDataResponseType, NetworksConfigType };

package/lib/types/index.js

@@ -1 +1 @@
-export {};
+export * from './Request.js';

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "homepage": "https://github.com/ikenxuan/amagi",
   "scripts": {
-    "dev": "tsx lib/dev.js",
+    "dev": "tsx watch src/dev.ts",
     "fix": "eslint lib/**/*.js --fix && eslint lib/**/*.d.ts --fix",
     "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix"
   },
@@ -29,14 +29,14 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
+    "axios": "^1.7.3",
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
     "fastify": "^4.28.1",
     "lodash": "4.17.21",
     "loglevel": "^1.9.1",
     "loglevel-plugin-prefix": "^0.8.4",
-    "md5": "^2.3.0",
-    "node-fetch": "^3.3.2"
+    "md5": "^2.3.0"
   },
   "devDependencies": {
     "@types/lodash": "latest",