@ikenxuan/amagi 2.0.0 → 2.0.1

package/README.md

@@ -35,9 +35,15 @@ const Client = await new amagi({
   bilibili: 'B站ck'
 }).initServer()
 
-const Data = await (Client.GetBilibiliData({ type: '单个视频作品数据' }))
+const Douyin = await Client.GetDouyinData({ type: '热点词数据' })
+  .result({ query: '珠江新城CBD' })
+
+const Bilibili = await Client.GetBilibiliData({ type: '单个视频作品数据' })
   .result({ url: 'https://b23.tv/9JvEHhJ' })
 ```
+type 参数详见 [**API数据类型枚举**](./src/types/DataType.ts)
+
+result 方法传递对象的参数详见 [**抖音接口请求参数类型**](./src/types/DouyinAPIParams.ts)、[**B站接口请求参数类型**](./src/types/BilibiliAPIParams.ts) 
 
 ## 开发构建
 > **开发环境下，支持最低node版本为 v18**

package/lib/model/networks.d.ts

@@ -24,10 +24,6 @@ export default class Networks {
   getLocation(): Promise<string>;
   /** 获取数据并处理数据的格式化，默认json */
   getData(new_fetch?: string): Promise<any | boolean>;
-  /** 获取响应头 */
-  getHeaders(): Promise<HeadersObject | null>;
-  /** 一次性获取响应头和响应体 */
-  getHeadersAndData(): Promise<object>;
   Tojson(): Promise<any>;
   ToText(): Promise<void>;
   ToArrayBuffer(): Promise<void>;

package/lib/model/networks.js

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios, { AxiosError } from 'axios';
 export default class Networks {
   url;
   method;
@@ -61,7 +61,9 @@ export default class Networks {
       return result.request.res.responseUrl; // axios中获取最终的请求URL
     }
     catch (error) {
-      console.error(error);
+      if (error instanceof AxiosError) {
+        throw new Error(error.stack);
+      }
       return '';
     }
   }
@@ -77,7 +79,9 @@ export default class Networks {
       return response.headers['location'];
     }
     catch (error) {
-      console.error(error);
+      if (error instanceof AxiosError) {
+        throw new Error(error.stack);
+      }
       return '';
     }
   }
@@ -117,65 +121,10 @@ export default class Networks {
       return this.axiosInstance;
     }
     catch (error) {
-      console.error(error);
-      return false;
-    }
-  }
-  /** 获取响应头 */
-  async getHeaders () {
-    try {
-      this.axiosInstance = await this.returnResult();
-      if (this.axiosInstance) {
-        if (this.axiosInstance.headers) {
-          return this.axiosInstance.headers;
-        }
-        else {
-          console.error('未获取到响应头');
-          return null;
-        }
-      }
-      else {
-        console.error('未获取到响应对象');
-        return null;
-      }
-    }
-    catch (error) {
-      console.error('获取响应头失败:', error);
-      return null;
-    }
-  }
-  /** 一次性获取响应头和响应体 */
-  async getHeadersAndData () {
-    try {
-      this.axiosInstance = await this.returnResult();
-      let headers = null;
-      let data = null;
-      if (this.axiosInstance) {
-        headers = this.axiosInstance.headers;
-        switch (this.type) {
-        case 'json':
-          data = this.axiosInstance.data;
-          break;
-        case 'text':
-          data = this.axiosInstance.data;
-          break;
-        case 'arrayBuffer':
-          data = await this.ToArrayBuffer();
-          break;
-        case 'blob':
-          data = await this.ToBlob();
-          break;
-        default:
-        }
+      if (error instanceof AxiosError) {
+        throw new Error(error.stack);
       }
-      else {
-        console.error('未获取到响应对象');
-      }
-      return { headers, data };
-    }
-    catch (error) {
-      console.error('获取响应头和数据失败:', error);
-      return { headers: null, data: null };
+      return false;
     }
   }
   async Tojson () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",