godslayerakp/http: patched value handling order (#724)

TurboWarp · Jul 11, 2023 · 61353ff · 61353ff
1 parent c0b8f2d
commit 61353ff
Showing 1 changed file with 22 additions and 22 deletions.
diff --git 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);
+            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 */