From c80abe6dba4c06a9d0f1c564cfa37a64a1329683 Mon Sep 17 00:00:00 2001 From: Leref <12578483+Leref@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:24:20 -0500 Subject: [PATCH] now using undici --- package-lock.json | 62 +++++++++++++---------------------------------- package.json | 2 +- src/api/index.js | 2 +- src/utilFuncs.js | 18 +++++++++----- 4 files changed, 31 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebe3546..929b053 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "body-parser": "^1.20.2", "express": "^4.18.2", "express-session": "^1.17.3", - "node-fetch": "^2.6.1" + "undici": "^6.4.0" }, "devDependencies": { "aoi.js": "^6.7.1" @@ -170,7 +170,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==", - "dev": true, "engines": { "node": ">=14" } @@ -279,6 +278,18 @@ "node": ">=20.x" } }, + "node_modules/aoi.js/node_modules/undici": { + "version": "5.28.2", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz", + "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==", + "dev": true, + "dependencies": { + "@fastify/busboy": "^2.0.0" + }, + "engines": { + "node": ">=14.0" + } + }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -960,25 +971,6 @@ "node": ">= 0.6" } }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/object-inspect": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", @@ -1219,11 +1211,6 @@ "node": ">=0.6" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "node_modules/ts-mixer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz", @@ -1260,15 +1247,14 @@ } }, "node_modules/undici": { - "version": "5.28.2", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz", - "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==", - "dev": true, + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.4.0.tgz", + "integrity": "sha512-wYaKgftNqf6Je7JQ51YzkEkEevzOgM7at5JytKO7BjaURQpERW8edQSMrr2xb+Yv4U8Yg47J24+lc9+NbeXMFA==", "dependencies": { "@fastify/busboy": "^2.0.0" }, "engines": { - "node": ">=14.0" + "node": ">=18.0" } }, "node_modules/undici-types": { @@ -1301,20 +1287,6 @@ "node": ">= 0.8" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/ws": { "version": "8.16.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", diff --git a/package.json b/package.json index e33d2dc..41fcec5 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "body-parser": "^1.20.2", "express": "^4.18.2", "express-session": "^1.17.3", - "node-fetch": "^2.6.1" + "undici": "^6.4.0" }, "devDependencies": { "aoi.js": "^6.7.1" diff --git a/src/api/index.js b/src/api/index.js index 5078806..3c304a5 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -5,7 +5,7 @@ function loadAPIRoutes(data){ let app = data.app; let auth=data.auth; function checkAuth(req, res, next) { - + if(!req.params.auth){ return res.status(401).json({"error":"No auth was provided."}) } diff --git a/src/utilFuncs.js b/src/utilFuncs.js index 3bd7d06..8e26059 100644 --- a/src/utilFuncs.js +++ b/src/utilFuncs.js @@ -1,10 +1,16 @@ -const fetch = require("node-fetch"); -const {AoiError} = require("aoi.js"); +const { Agent, fetch } = require("undici"); +const { AoiError } = require("aoi.js"); const json = require("../package.json"); + async function checkVersion() { try { - const res = await fetch("https://registry.npmjs.com/@akarui/aoi.panel"); - const data = await res.json(); + const agent = new Agent(); + const response = await fetch("https://registry.npmjs.com/@akarui/aoi.panel", { + method: "GET", + agent, + }); + + const data = await response.json(); const c_version = json.version; if (c_version.includes("dev")) { @@ -63,10 +69,10 @@ function checkPackage() { "red", { text: "@akarui/aoi.panel", textColor: "cyan" } ); - } + } } module.exports = { checkVersion, checkPackage -}; \ No newline at end of file +};