refactor: 移除 axios

SaltWood-Studio · Jan 12, 2025 · e6671b5 · e6671b5
1 parent 9b75ef8
commit e6671b5
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,6 @@
   "dependencies": {
     "@mongodb-js/zstd": "^2.0.0",
     "@tsconfig/node20": "^20.1.4",
-    "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/node": "^22.5.5",
     "acme-client": "^5.4.0",
@@ -24,7 +23,6 @@
     "crc-32": "^1.2.2",
     "cron": "^3.1.7",
     "dotenv": "^16.4.5",
-    "env-var": "^7.5.0",
     "express": "^4.21.2",
     "express-async-errors": "^3.1.1",
     "got": "^14.4.2",

diff --git a/src/Server.ts b/src/Server.ts
@@ -457,7 +457,7 @@ export class Server {
                     }
                     try {
                         const result = await fn(...data);
-                        // 如果不为 undefined
+                        // 如果为 undefined
                         if (result === undefined) {
                             callback([null, false]);
                             return;

diff --git a/src/certificate-manager/CloudFlare.ts b/src/certificate-manager/CloudFlare.ts
@@ -1,6 +1,5 @@
-import axios from 'axios';
-import * as crypto from 'crypto';
 import { DnsManager } from './DnsManager.js';
+import got from 'got';
 
 export class CloudFlare implements DnsManager {
     private apiToken: string; // Cloudflare API Token
@@ -20,21 +19,19 @@ export class CloudFlare implements DnsManager {
         console.log(`Cloudflare request: ${method} ${url}`);
 
         try {
-            const response = await axios({
-                method,
+            const response = await got(
                 url,
-                headers: {
-                    'Authorization': `Bearer ${this.apiToken}`,
-                    'Content-Type': 'application/json',
-                },
-                data,
-            });
+                {
+                    method,
+                    headers: {
+                        'Authorization': `Bearer ${this.apiToken}`,
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify(data)
+                }
+            ).json<{ error: string, result: string }>();
 
-            if (!response.data.success) {
-                throw new Error(response.data.errors.map((err: any) => err.message).join(', '));
-            }
-
-            return response.data.result;
+            return response.result;
         } catch (error: any) {
             throw new Error(`Cloudflare request failed: ${error.message}`);
         }

diff --git a/src/certificate-manager/DNSPod.ts b/src/certificate-manager/DNSPod.ts
@@ -1,6 +1,15 @@
-import axios from 'axios';
 import * as crypto from 'crypto';
 import { DnsManager } from './DnsManager.js';
+import got from 'got';
+
+interface ApiResponse {
+    Response: {
+        Error: {
+            Message: string;
+        };
+        RecordList: any[]
+    };
+}
 
 export class DNSPod implements DnsManager {
     private secretId: string;
@@ -30,17 +39,17 @@ export class DNSPod implements DnsManager {
         const signature = crypto.createHmac('sha1', this.secretKey).update(signStr).digest('base64');
 
         try {
-            const response = await axios.get('https://dnspod.tencentcloudapi.com/', {
-                params: {
+            const response = await got('https://dnspod.tencentcloudapi.com/', {
+                searchParams: {
                     ...params,
                     Signature: signature,
                 },
-            });
+            }).json<ApiResponse>();
 
-            if (response.data.Response && response.data.Response.Error) {
-                throw new Error(response.data.Response.Error.Message);
+            if (response.Response && response.Response.Error) {
+                throw new Error(response.Response.Error.Message);
             }
-            return response.data.Response;
+            return response.Response;
         } catch (error: any) {
             throw new Error(`DNSPod request failed: ${error}`);
         }