Skip to content

Commit b015853

Browse files
committed
Use native fetch and AbortController
1 parent 0373e15 commit b015853

File tree

3 files changed

+3
-69
lines changed

3 files changed

+3
-69
lines changed

package-lock.json

Lines changed: 0 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
"author": "Thomas Weber",
1010
"license": "MIT",
1111
"dependencies": {
12-
"abort-controller": "^3.0.0",
1312
"better-sqlite3": "^11.8.0",
1413
"express": "^4.21.2",
15-
"node-fetch": "^2.7.0",
1614
"scratch-translate-extension-languages": "1.0.7",
1715
"sharp": "^0.33.5",
1816
"winston": "^3.17.0",

src/lib/RequestQueue.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
const https = require('https');
2-
const fetch = require('node-fetch').default;
3-
const AbortController = require('abort-controller').AbortController;
41
const logger = require('../logger');
52
const APIError = require('./APIError');
63

@@ -85,8 +82,8 @@ class RequestQueue {
8582
case 200:
8683
// uploads.scratch.mit.edu is returning status 688 for users with the default avatar; just treat as success
8784
case 688: {
88-
const body = await res.buffer();
89-
callback(null, body);
85+
const arrayBuffer = await res.arrayBuffer();
86+
callback(null, Buffer.from(arrayBuffer));
9087
break;
9188
}
9289
case 404: callback(new APIError.NotFound('Resource does not exist'), null); break;
@@ -106,10 +103,10 @@ class RequestQueue {
106103

107104
getRequestOptions() {
108105
return {
106+
keepalive: true,
109107
headers: {
110108
'User-Agent': 'https://github.com/TurboWarp/trampoline'
111109
},
112-
agent: RequestQueue.requestAgent,
113110
};
114111
}
115112

@@ -166,6 +163,4 @@ class RequestQueue {
166163
}
167164
}
168165

169-
RequestQueue.requestAgent = new https.Agent({ keepAlive: true });
170-
171166
module.exports = RequestQueue;

0 commit comments

Comments
 (0)