godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #98431 from lodicolo/4.3-stable_GH_76825

Browse Source 
Fix GodotFetch glue code for null response bodies
This commit is contained in:
Thaddeus Crews
2024-10-24 13:23:07 -05:00
parent db60dcc4fb c7f421ef5f
commit 1015a481ff
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/web/js/libs/library_godot_fetch.js
View File

@@ -59,7 +59,12 @@ const GodotFetch = {
}); });
obj.status = response.status; obj.status = response.status;
obj.response = response; obj.response = response;
obj.reader = response.body.getReader(); // `body` can be null per spec (for example, in cases where the request method is HEAD).
// As of the time of writing, Chromium (127.0.6533.72) does not follow the spec but Firefox (131.0.3) does.
// See godotengine/godot#76825 for more information.
// See Chromium revert (of the change to follow the spec):
// https://chromium.googlesource.com/chromium/src/+/135354b7bdb554cd03c913af7c90aceead03c4d4
obj.reader = response.body?.getReader();
obj.chunked = chunked; obj.chunked = chunked;
}, },
@@ -121,6 +126,10 @@ const GodotFetch = {
} }
obj.reading = true; obj.reading = true;
obj.reader.read().then(GodotFetch.onread.bind(null, id)).catch(GodotFetch.onerror.bind(null, id)); obj.reader.read().then(GodotFetch.onread.bind(null, id)).catch(GodotFetch.onerror.bind(null, id));
} else if (obj.reader == null && obj.response.body == null) {
// Emulate a stream closure to maintain the request lifecycle.
obj.reading = true;
GodotFetch.onread(id, { value: undefined, done: true });
} }
}, },
}, },
@@ -159,7 +168,10 @@ const GodotFetch = {
if (!obj.response) { if (!obj.response) {
return 0; return 0;
} }
if (obj.reader) { // If the reader is nullish, but there is no body, and the request is not marked as done,
// the same status should be returned as though the request is currently being read
// so that the proper lifecycle closure can be handled in `read()`.
if (obj.reader || (obj.response.body == null && !obj.done)) {
return 1; return 1;
} }
if (obj.done) { if (obj.done) {