Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

patched value handling order #724

Merged
merged 3 commits into from
Jul 11, 2023
Merged

patched value handling order #724

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e255c9
patched value handling order
RedMan13 Jul 11, 2023
41cb75c
fix eslint
RedMan13 Jul 11, 2023
b3c52e1
eslint is complaining here
RedMan13 Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions extensions/godslayerakp/http.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down