Make simpleReq typesafe
This commit is contained in:
parent
e63cff7a52
commit
bd4cfe4e7a
1 changed files with 18 additions and 11 deletions
|
@ -20,26 +20,33 @@ export async function downloadFile(url: string, file: string, options: RequestOp
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function simpleReq(url: string, options: RequestOptions = {}) {
|
export function simpleReq(url: string, options: RequestOptions = {}): Promise<IncomingMessage> {
|
||||||
return new Promise<IncomingMessage>((resolve, reject) => {
|
return new Promise<IncomingMessage>((resolve, reject) => {
|
||||||
get(url, options, res => {
|
get(url, options, res => {
|
||||||
const { statusCode, statusMessage, headers } = res;
|
const { statusCode, statusMessage, headers } = res;
|
||||||
if (statusCode! >= 400) return void reject(`${statusCode}: ${statusMessage} - ${url}`);
|
if (statusCode && statusCode >= 400) return reject(new Error(`${statusCode}: ${statusMessage} - ${url}`));
|
||||||
if (statusCode! >= 300) return simpleReq(headers.location!, options).then(resolve).catch(reject);
|
if (statusCode && statusCode >= 300 && headers.location) {
|
||||||
|
return simpleReq(headers.location, options).then(resolve).catch(reject);
|
||||||
|
}
|
||||||
resolve(res);
|
resolve(res);
|
||||||
|
}).on("error", err => {
|
||||||
|
reject(new Error(`Network error: ${err.message}`));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function simpleGet(url: string, options: RequestOptions = {}) {
|
export async function simpleGet(url: string, options: RequestOptions = {}) {
|
||||||
const res = await simpleReq(url, options);
|
try {
|
||||||
|
const res = await simpleReq(url, options);
|
||||||
|
|
||||||
return new Promise<Buffer>((resolve, reject) => {
|
return new Promise<Buffer>((resolve, reject) => {
|
||||||
const chunks = [] as Buffer[];
|
const chunks = [] as Buffer[];
|
||||||
|
|
||||||
res.once("error", reject);
|
res.once("error", reject);
|
||||||
res.on("data", chunk => chunks.push(chunk));
|
res.on("data", chunk => chunks.push(chunk));
|
||||||
res.once("end", () => resolve(Buffer.concat(chunks)));
|
res.once("end", () => resolve(Buffer.concat(chunks)));
|
||||||
});
|
});
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue