Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Node-Fetch

Browse source
This commit is contained in:
Scott Gould 2024-09-25 14:10:43 -04:00
parent 367b0b8fe6
commit 2b1644cc03
No known key found for this signature in database
4 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
package.json
View file

@ -20,11 +20,10 @@
"compression": "^1.7.4", "compression": "^1.7.4",
"eslint-plugin-html": "^8.1.1", "eslint-plugin-html": "^8.1.1",
"express": "^4.19.2", "express": "^4.19.2",
"gulp-sourcemaps": "^3.0.0",
"gulp-swc": "^2.2.0", "gulp-swc": "^2.2.0",
"node-fetch": "^3.3.2",
"rimraf": "^6.0.1", "rimraf": "^6.0.1",
"ts-to-jsdoc": "^2.2.0", "ts-to-jsdoc": "^2.2.0"
"gulp-sourcemaps":"^3.0.0"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.10.0", "@eslint/js": "^9.10.0",

2
src/index.ts
View file

@ -3,12 +3,12 @@
import compression from"compression"; import compression from"compression";
import express, { Request, Response }from"express"; import express, { Request, Response }from"express";
import fs from"node:fs/promises"; import fs from"node:fs/promises";
import fetch from"node-fetch";
import path from"node:path"; import path from"node:path";
import{ observe, uptime }from"./stats.js"; import{ observe, uptime }from"./stats.js";
import{ getApiUrls, inviteResponse }from"./utils.js"; import{ getApiUrls, inviteResponse }from"./utils.js";
import{ fileURLToPath }from"node:url"; import{ fileURLToPath }from"node:url";
import process from"node:process"; import process from"node:process";
const devmode = (process.env.NODE_ENV || "development") === "development"; const devmode = (process.env.NODE_ENV || "development") === "development";
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename); const __dirname = path.dirname(__filename);

3
src/stats.ts
View file

@ -1,6 +1,5 @@
import fs from"node:fs"; import fs from"node:fs";
import path from"node:path"; import path from"node:path";
import fetch from"node-fetch";
import{ getApiUrls }from"./utils.js"; import{ getApiUrls }from"./utils.js";
import{ fileURLToPath }from"node:url"; import{ fileURLToPath }from"node:url";
@ -251,4 +250,4 @@ function setStatus(instance: string | Instance, status: boolean): void{
calcStats(instance); calcStats(instance);
} }
} }
} }

33
src/utils.ts
View file

@ -1,23 +1,22 @@
import fetch from"node-fetch";
import{ Request, Response }from"express"; import{ Request, Response }from"express";
interface ApiUrls { interface ApiUrls {
api: string; api: string;
gateway: string; gateway: string;
cdn: string; cdn: string;
wellknown: string; wellknown: string;
} }
interface Invite { interface Invite {
guild: { guild: {
name: string; name: string;
description?: string; description?: string;
icon?: string; icon?: string;
id: string; id: string;
}; };
inviter?: { inviter?: {
username: string; username: string;
}; };
} }
export async function getApiUrls(url: string): Promise<ApiUrls | null>{ export async function getApiUrls(url: string): Promise<ApiUrls | null>{
@ -31,9 +30,7 @@ export async function getApiUrls(url: string): Promise<ApiUrls | null>{
const api = info.api; const api = info.api;
const apiUrl = new URL(api); const apiUrl = new URL(api);
const policies: any = await fetch( const policies: any = await fetch(
`${api}${ `${api}${apiUrl.pathname.includes("api") ? "" : "api"}/policies/instance/domains`
apiUrl.pathname.includes("api") ? "" : "api"
}/policies/instance/domains`
).then(res=>res.json()); ).then(res=>res.json());
return{ return{
api: policies.apiEndpoint, api: policies.apiEndpoint,
@ -111,4 +108,4 @@ export async function inviteResponse(
}; };
res.json(jsonResponse); res.json(jsonResponse);
} }
} }