moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent double callback

This commit is contained in:
Bryan Ashby 2023-02-24 21:43:58 -07:00
parent 60e8b787d9
commit 5b08d21966
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
art/themes/luciano_blocktronics/activitypub_actor_search_main.ans
View File

Binary file not shown.

18
core/http_util.js
View File

@ -70,6 +70,14 @@ function _makeRequest(url, options, cb) {
} }
} }
let cbCalled = false;
const cbWrapper = (e, b, r) => {
if (!cbCalled) {
cbCalled = true;
return cb(e, b, r);
}
};
const req = https.request(url, options, res => { const req = https.request(url, options, res => {
let body = []; let body = [];
res.on('data', d => { res.on('data', d => {
@ -80,7 +88,7 @@ function _makeRequest(url, options, cb) {
body = Buffer.concat(body).toString(); body = Buffer.concat(body).toString();
if (res.statusCode < 200 || res.statusCode > 299) { if (res.statusCode < 200 || res.statusCode > 299) {
return cb( return cbWrapper(
Errors.HttpError( Errors.HttpError(
`URL ${url} HTTP error ${res.statusCode}: ${truncate(body, { `URL ${url} HTTP error ${res.statusCode}: ${truncate(body, {
length: 128, length: 128,
@ -89,7 +97,7 @@ function _makeRequest(url, options, cb) {
); );
} }
return cb(null, body, res); return cbWrapper(null, body, res);
}); });
}); });
@ -98,17 +106,17 @@ function _makeRequest(url, options, cb) {
httpSignature.sign(req, options.sign); httpSignature.sign(req, options.sign);
} catch (e) { } catch (e) {
req.destroy(); req.destroy();
return cb(Errors.Invalid(`Invalid signing material: ${e}`)); return cbWrapper(Errors.Invalid(`Invalid signing material: ${e}`));
} }
} }
req.on('error', err => { req.on('error', err => {
return cb(err); return cbWrapper(err);
}); });
req.on('timeout', () => { req.on('timeout', () => {
req.destroy(); req.destroy();
return cb(Errors.Timeout('Timeout making HTTP request')); return cbWrapper(Errors.Timeout('Timeout making HTTP request'));
}); });
if (options.body) { if (options.body) {