unb-api 1.5.1 → 2.0.0

package/README.md

@@ -10,6 +10,8 @@
 
 `npm install unb-api`
 
+Requires Node.js 18 or newer (uses the built-in `fetch`). For older Node.js versions, use `unb-api@1`.
+
 ## Documentation
 
 Full API documentation is located at [https://unbelievaboat.com/api/docs](https://unbelievaboat.com/api/docs)

package/eslintrc.js

@@ -1,5 +1,12 @@
 module.exports = {
     'extends': 'eslint:recommended',
+    'env': {
+        'node': true,
+        'es2020': true
+    },
+    'globals': {
+        'fetch': 'readonly'
+    },
     'rules': {
         'indent': ['error', 4],
         'linebreak-style': ['error', 'unix'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unb-api",
-  "version": "1.5.1",
+  "version": "2.0.0",
   "description": "API wrapper for UnbelievaBoat Discord Bot API",
   "main": "src/index.js",
   "types": "index.d.ts",
@@ -16,12 +16,12 @@
   ],
   "author": "unbelievable",
   "license": "MIT",
+  "engines": {
+    "node": ">=18"
+  },
   "devDependencies": {
     "@types/node": "^10.0.7",
     "eslint": "^6.7.2",
     "typescript": "^2.6.2"
-  },
-  "dependencies": {
-    "axios": "^1.20.0"
   }
 }

package/src/lib/RequestHandler.js

@@ -1,4 +1,3 @@
-const axios = require('axios');
 const Bucket = require('./util/Bucket');
 const { APIError, HTTPError } = require('./errors');
 const MajorParams = ['guilds'];
@@ -7,13 +6,6 @@ class RequestHandler {
     constructor(client) {
         this._client = client;
         this.ratelimits = {};
-        this.axiosInstance = axios.create({
-            baseURL: this._client.baseURL,
-            headers: {
-                'Authorization': this._client.token,
-                'Content-Type': 'application/json'
-            }
-        });
     }
 
     async request(method, endpoint, data = {}, params = {}, _attempts = 0) {
@@ -32,7 +24,7 @@ class RequestHandler {
                 };
 
                 try {
-                    const { data: responseData, status, headers } = await this.axiosInstance(options);
+                    const { data: responseData, status, statusText, headers } = await this.fetch(options);
 
                     // Increase the number of attempts
                     ++_attempts;
@@ -44,21 +36,17 @@ class RequestHandler {
                         resolve(responseData);
                     } else if (status === 429) {
                         if (_attempts >= this._client.maxRetries) {
-                            this.rejectWithError(options, responseData, status, reject);
+                            this.rejectWithError(options, responseData, status, statusText, reject);
                         } else {
                             this.retryRequest(method, endpoint, data, params, _attempts, headers, resolve, reject);
                         }
                     } else {
-                        this.rejectWithError(options, responseData, status, reject);
+                        this.rejectWithError(options, responseData, status, statusText, reject);
                     }
 
                     callback();
                 } catch (error) {
-                    if (axios.isAxiosError(error)) {
-                        this.rejectWithError(options, error.response.data, error.response.status, reject);
-                    } else {
-                        reject(error);
-                    }
+                    reject(error);
                     callback();
                 }
             };
@@ -67,11 +55,49 @@ class RequestHandler {
         });
     }
 
-    rejectWithError(options, data, status, reject) {
+    async fetch(options) {
+        const url = new URL(`${this._client.baseURL.replace(/\/+$/, '')}${options.url}`);
+        for (const [key, value] of Object.entries(options.params || {})) {
+            if (value === undefined || value === null) continue;
+            if (Array.isArray(value)) {
+                for (const v of value) url.searchParams.append(`${key}[]`, v);
+            } else {
+                url.searchParams.append(key, value);
+            }
+        }
+
+        const response = await fetch(url, {
+            method: options.method,
+            headers: {
+                'Authorization': this._client.token,
+                'Content-Type': 'application/json'
+            },
+            body: ['GET', 'HEAD'].includes(options.method) ? undefined : JSON.stringify(options.data)
+        });
+
+        const text = await response.text();
+        let data = text;
+        if (text) {
+            try {
+                data = JSON.parse(text);
+            } catch (e) {
+                // Not JSON (e.g. an HTML error page from a proxy), keep the raw text
+            }
+        }
+
+        return {
+            data,
+            status: response.status,
+            statusText: response.statusText,
+            headers: Object.fromEntries(response.headers)
+        };
+    }
+
+    rejectWithError(options, data, status, statusText, reject) {
         if (data && data.message) {
-            reject(new APIError(options, { data, status }));
+            reject(new APIError(options, { data, status, statusText }));
         } else {
-            reject(new HTTPError(options, { data, status }));
+            reject(new HTTPError(options, { data, status, statusText }));
         }
     }