From 8e255c98286c5540678c7272ff9a02ea138655ed Mon Sep 17 00:00:00 2001 From: godslayerakp <74981904+RedMan13@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:52:01 -0700 Subject: [PATCH] patched value handling order --- extensions/godslayerakp/http.js | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/extensions/godslayerakp/http.js b/extensions/godslayerakp/http.js index 6d7e6c5b58..4a0f572d12 100644 --- a/extensions/godslayerakp/http.js +++ b/extensions/godslayerakp/http.js @@ -590,34 +590,34 @@ // eslint-disable-next-line require-await async sendRequest(args) { const url = Cast.toString(args.url); - - this.clearAll(); + const options = this.request.options + + this.clearAll() this.response.url = url; - Scratch.fetch(url, this.request.options) - .then(res => { - // @ts-ignore - this.response.status = res.status; - this.response.headers = res.headers; - this.response.statusText = res.statusText; - if (res.ok) { - this.request.success = true; - this.request.events.activate('reqSuccess'); - } else { - this.request.fail = true; - this.request.events.activate('reqFail'); - } - this.request.end = true; - return res.text(); - }) - .then(body => this.response.text = body) - .catch(err => { - this.response.error = String(err); - console.warn('request failed with error', err); + try { + const res = await Scratch.fetch(url, options) + // @ts-ignore + this.response.status = res.status; + this.response.headers = res.headers; + this.response.statusText = res.statusText; + if (res.ok) { + this.request.success = true; + this.request.events.activate('reqSuccess'); + } else { this.request.fail = true; - this.request.end = true; this.request.events.activate('reqFail'); - }); + } + this.request.end = true; + const body = await res.text() + this.response.text = body + } catch (err) { + this.response.error = String(err); + console.warn('request failed with error', err); + this.request.fail = true; + this.request.end = true; + this.request.events.activate('reqFail'); + } } /* extra stuff for when its missing something */