utils: fix pipeRequest

This commit is contained in:
undefined committed 2024-03-07 17:26:36 +08:00
1 parent c7f8d3c340
commit 1b8f209429
1 file changed
+4 -1
+4 -1
View File
@@ -325,7 +325,8 @@ export async function extractZip(zip: AdmZip, dest: string, overwrite = false, s
export async function pipeRequest(req: superagent.Request, w: fs.WriteStream, timeout?: number, name?: string) { export async function pipeRequest(req: superagent.Request, w: fs.WriteStream, timeout?: number, name?: string) {
try { try {
await req.buffer(false).timeout({ await new Promise((resolve, reject) => {
req.buffer(false).timeout({
response: Math.min(10000, timeout), response: Math.min(10000, timeout),
deadline: timeout, deadline: timeout,
}).parse((resp, cb) => { }).parse((resp, cb) => {
@@ -334,11 +335,13 @@ export async function pipeRequest(req: superagent.Request, w: fs.WriteStream, ti
resp.pipe(w); resp.pipe(w);
resp.on('end', () => { resp.on('end', () => {
cb(null, undefined); cb(null, undefined);
resolve(null);
}); });
resp.on('error', (err) => { resp.on('error', (err) => {
cb(err, undefined); cb(err, undefined);
}); });
} }
}).catch(reject);
}); });
} catch (e) { } catch (e) {
throw new Error(`Download${e.errno === 'ETIMEDOUT' ? 'Timedout' : 'Error'}(${name ? `${name}, ` : ''}${e.message})`); throw new Error(`Download${e.errno === 'ETIMEDOUT' ? 'Timedout' : 'Error'}(${name ? `${name}, ` : ''}${e.message})`);