Merge pull request #13 from erictik:queue

remove axios & use fetch

package.json

@@ -23,6 +23,9 @@
     "midjourney-api",
     "midjourney"
   ],
+  "engines": {
+    "node": ">=18"
+  },
   "author": "Eric Yang <yanghao@10d.xin>",
   "license": "ISC",
   "bugs": {
@@ -33,11 +36,11 @@
     "@types/node": "^18.16.0",
     "dotenv": "^16.0.3",
     "prettier": "^2.8.8",
+    "ts-node": "^10.9.1",
     "tsx": "^3.12.6",
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "axios": "^1.3.6",
     "p-queue": "^6.6.2",
     "throat": "^6.0.2",
     "tslib": "^2.5.0"

src/midjourney.message.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { MJMessage } from "./interfaces";
 import { CreateQueue } from "./queue";
 import { sleep } from "./utls";
@@ -90,10 +89,13 @@ export class MidjourneyMessage {
   }
   async RetrieveMessages(limit = 50) {
     const headers = { authorization: this.SalaiToken };
-    const response = await axios.get(
+    const response = await fetch(
       `https://discord.com/api/v10/channels/${this.ChannelId}/messages?limit=${limit}`,
-      { headers: headers }
+      {
+        headers: headers,
+      }
     );
-    return response.data;
+    const data = await response.json();
+    return data;
   }
 }

src/midjourney.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { MidjourneyMessage } from "./midjourney.message";
 import { CreateQueue } from "./queue";
 import { random, sleep } from "./utls";
@@ -44,15 +43,16 @@ export class Midjourney extends MidjourneyMessage {
     payload: any,
     callback?: (result: number) => void
   ) {
-    const headers = { authorization: this.SalaiToken };
     try {
-      const response = await axios.post(
-        "https://discord.com/api/v9/interactions",
-        payload,
-        {
-          headers,
-        }
-      );
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: this.SalaiToken,
+      };
+      const response = await fetch("https://discord.com/api/v9/interactions", {
+        method: "POST",
+        body: JSON.stringify(payload),
+        headers: headers,
+      });
       callback && callback(response.status);
       //discord api rate limit
       await sleep(950);

tsconfig.json

@@ -12,6 +12,7 @@
     "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     "lib": [
       "es2021",
+      "DOM",
       "esnext.asynciterable"
     ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */