lightcordwarez
/
BetterDiscordApp-rauenzi
mirror of https://github.com/rauenzi/BetterDiscordApp.git
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Fix fetch (#1671) 

* Fix fetch

Fix timeout in fetch.
Fix errors when response answer has a status code that don't have a body.
Fix FetchOptions missing timeout property.

* Fix fetch

Fix FetchOptions missing timeout property
This commit is contained in:
bottomtext228 2023-11-03 23:06:52 +03:00 committed by GitHub
parent 799b61f6a7
commit 52975fbe1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
preload/src/api/fetch.js
View File

@ -12,6 +12,7 @@ const redirectCodes = new Set([301, 302, 307, 308]);
* @property {number} [maxRedirects] - Maximum amount of redirects to be followed.
* @property {AbortSignal} [signal] - Signal to abruptly cancel the request
* @property {Uint8Array | string} [body] - Defines a request body. Data must be serializable.
* @property {number} [timeout] - Request timeout time.
*/
/**

6
renderer/src/modules/api/fetch.js
View File

@ -1,10 +1,11 @@
import Remote from "../../polyfill/remote";
const methods = new Set(["GET", "PUT", "POST", "DELETE"]);
const bodylessStatusCodes = new Set([101, 204, 205, 304]);
class FetchResponse extends Response {
constructor(options) {
super(options.content, {
super(bodylessStatusCodes.has(options.status) ? null : options.content, {
headers: new Headers(options.headers),
method: options.method ?? "GET",
body: options.content,
@ -40,6 +41,7 @@ const convertSignal = signal => {
* @property {number} [maxRedirects] - Maximum amount of redirects to be followed.
* @property {AbortSignal} [signal] - Signal to abruptly cancel the request
* @property {Uint8Array | string} [body] - Defines a request body. Data must be serializable.
* @property {number} [timeout] - Request timeout time.
*/
/**
@ -58,7 +60,7 @@ export default function fetch(url, options = {}) {
if (typeof options.body === "string" || options.body instanceof Uint8Array) data.body = options.body;
if (typeof options.method === "string" && methods.has(options.method)) data.method = options.method;
if (options.signal instanceof AbortSignal) data.signal = convertSignal(options.signal);
if (typeof options.timeout === 'number') data.timeout = options.timeout;
let ctx;
try {
ctx = Remote.nativeFetch(url, data);