Skip to content

Commit 198bb01

Browse files
yossydevyossydev
committed
feat(ext/fetch): Response
1 parent a4f5ac2 commit 198bb01

File tree

3 files changed

+211
-63
lines changed

3 files changed

+211
-63
lines changed

‎examples/response.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const url = "https://example.com";
2+
const response1 = new Response(`${url}`, {});
3+
4+
console.log("body", response1.body);
5+
console.log("status", response1.status);
6+
console.log("url", response1.url);
7+
console.log("ok", response1.ok);
8+
console.log("redirected", response1.redirected);
9+
console.log("type", response1.type);
10+
console.log("statusText", response1.statusText);

‎runtime/src/ext/fetch/response/mod.ts‎

Lines changed: 199 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ interface ResponseInit {
66

77
class Response {
88
#response;
9-
#headers;
9+
#headers: any;
1010
/**
1111
* The new Response(body, init) constructor steps are:
1212
* @see https://fetch.spec.whatwg.org/#dom-response
1313
*/
14-
constructor(body, init: ResponseInit) {
14+
constructor(body: any, init: ResponseInit) {
1515
// 1. Set this’s response to a new response.
1616
this.#response = makeResponse(init);
1717

@@ -22,13 +22,65 @@ class Response {
2222
let bodyWithType = null;
2323

2424
// 4. If body is non-null, then set bodyWithType to the result of extracting body.
25-
if (body != null){
26-
bodyWithType =
25+
if (body != null) {
26+
const [extractedBody, type] = extractBody(body);
27+
bodyWithType = { body: extractedBody, type };
2728
}
2829
// 5. Perform initialize a response given this, init, and bodyWithType.
30+
initializeAResponse(this, init, bodyWithType);
31+
}
32+
33+
static getResponse(response: Response) {
34+
return response.#response;
35+
}
36+
37+
/** The type getter steps are to return this’s response’s type. */
38+
get type() {
39+
return this.#response.type;
40+
}
41+
42+
/**
43+
* The url getter steps are to return the empty string if this’s response’s URL is null;
44+
* otherwise this’s response’s URL, serialized with exclude fragment set to true.
45+
*/
46+
get url() {
47+
return this.#response.url;
48+
}
49+
50+
/** The redirected getter steps are to return true if this’s response’s URL list’s size is greater than 1; otherwise false. */
51+
get redirected() {
52+
return this.#response.url.length > 1;
53+
}
54+
55+
/** The status getter steps are to return this’s response’s status. */
56+
get status() {
57+
return this.#response.status;
58+
}
59+
60+
/** The ok getter steps are to return true if this’s response’s status is an ok status; otherwise false. */
61+
get ok() {
62+
const status = this.#response.status;
63+
return status >= 200 && status <= 299;
64+
}
65+
66+
/** The statusText getter steps are to return this’s response’s status message. */
67+
get statusText() {
68+
return this.#response.statusText;
69+
}
70+
71+
/** The headers getter steps are to return this’s headers. */
72+
get headers() {
73+
return this.#headers;
74+
}
75+
76+
// TODO
77+
get body() {
78+
return this.#response.body;
2979
}
3080
}
3181

82+
const { getResponse } = Response;
83+
3284
// TODO: headers
3385
function makeResponse(init: ResponseInit) {
3486
return {
@@ -42,92 +94,176 @@ function makeResponse(init: ResponseInit) {
4294
cacheState: "",
4395
statusText: "",
4496
url: "",
97+
body: null,
4598
...init,
4699
};
47100
}
48101

49-
/**
50-
* To extract a body with type from a byte sequence or BodyInit object object, with an optional boolean keepalive (default false)
51-
* @see https://fetch.spec.whatwg.org/#concept-bodyinit-extract
52-
*/
53-
function extractBody (object, keepalive = false) {
54-
// 1. Let stream be null.
55-
let stream = null;
56-
// 2. If object is a ReadableStream object, then set stream to object.
57-
// TODO: implement ReadableStream
58-
// 3. Otherwise, if object is a Blob object, set stream to the result of running object’s get stream.
59-
// 4. Otherwise, set stream to a new ReadableStream object, and set up stream with byte reading support.
60-
// 5. Assert: stream is a ReadableStream object.
61-
62-
// 6, Let action be null.
63-
let action = null;
102+
function initializeAResponse(
103+
response: Response,
104+
init: ResponseInit,
105+
body: {
106+
body: any;
107+
type: any;
108+
} | null,
109+
) {
110+
// 1. If init["status"] is not in the range 200 to 599, inclusive, then throw a RangeError.
111+
if (
112+
init.status != null && (init.status < 200 || init.status > 599)
113+
) {
114+
throw new RangeError(
115+
`The status provided (${init.status}) is not equal to 101 and outside the range [200, 599]`,
116+
);
117+
}
64118

65-
// 7. Let source be null.
66-
let source = null;
119+
// 2. If init["statusText"] is not the empty string and does not match the reason-phrase token production, then throw a TypeError.
120+
// TODO: implement RegExp.
121+
if (
122+
init.statusText && isValidReasonPhrase(init.statusText)
123+
) {
124+
throw new TypeError(
125+
`Invalid status text: "${init.statusText}"`,
126+
);
127+
}
67128

68-
// 8. Let length be null.
69-
let length = null;
129+
// 3. Set response’s response’s status to init["status"].
130+
if (init.status != null) {
131+
getResponse(response).status = init.status;
132+
}
70133

71-
// Let type be null.
72-
let type = null
134+
// 4. Set response’s response’s status message to init["statusText"].
135+
if (init.statusText != null) {
136+
getResponse(response).statusText = init.statusText;
137+
}
73138

74-
// Switch on object:
75-
if (Blob.prototype.isPrototypeOf(object)){
76-
// Blob:
77-
// 1. Set source to object.
78-
// 2. Set length to object’s size.
79-
// 3. If object’s type attribute is not the empty byte sequence, set type to its value.
80-
stream = object.stream();
81-
stream = object
82-
length = object.size
83-
} else if (object ==="string"){
84-
// byte sequence:
85-
// 1. Set source to object.
86-
source = object
87-
}
139+
// 5. If init["headers"] exists, then fill response’s headers with init["headers"].
140+
if (init.headers != null) {
141+
// TODO: get headerlist
142+
getResponse(response).headers = init.headers;
143+
}
88144

145+
// 6. If body is non-null, then:
146+
if (body != null) {
147+
// 1. If response’s status is a null body status, then throw a TypeError.
148+
// NOTE: 101 and 103 are included in null body status due to their use elsewhere. They do not affect this step.
149+
if (nullBodyStatus(response.status)) {
150+
throw new TypeError(
151+
"Response with null body status cannot have body",
152+
);
153+
}
154+
// 2. Set response’s body to body’s body.
155+
getResponse(response).body = body.body;
156+
// 3. If body’s type is non-null and response’s header list does not contain `Content-Type`, then append (`Content-Type`, body’s type) to response’s header list.
157+
}
158+
}
89159

160+
/**
161+
* TODO: when implemented module, move to ext/fetch/body
162+
* To extract a body with type from a byte sequence or BodyInit object object,
163+
* with an optional boolean keepalive (default false)
164+
* @see https://fetch.spec.whatwg.org/#concept-bodyinit-extract
165+
*/
166+
function extractBody(object: any, _keepalive = false) {
167+
// 1. Let stream be null.
168+
let stream = null;
169+
// 2. If object is a ReadableStream object, then set stream to object.
170+
// TODO: implement ReadableStream
171+
// 3. Otherwise, if object is a Blob object, set stream to the result of running object’s get stream.
172+
// 4. Otherwise, set stream to a new ReadableStream object, and set up stream with byte reading support.
173+
// 5. Assert: stream is a ReadableStream object.
90174

175+
// 6, Let action be null.
176+
let _action = null;
91177

178+
// 7. Let source be null.
179+
let source = null;
92180

93-
// BufferSource
94-
// Set source to a copy of the bytes held by object.
181+
// 8. Let length be null.
182+
let length = null;
95183

96-
// FormData
97-
// Set action to this step: run the multipart/form-data encoding algorithm, with object’s entry list and UTF-8.
184+
// Let type be null.
185+
let type = null;
98186

99-
// Set source to object.
187+
// Switch on object:
188+
if (typeof object == "string") {
189+
// scalar value string:
190+
// Set source to the UTF-8 encoding of object.
191+
// Set type to `text/plain;charset=UTF-8`.
192+
source = object;
193+
type = "text/plain;charset=UTF-8";
194+
} else {
195+
console.error("TODO: these doesn't yet supported");
196+
// Blob
197+
// Set source to object.
198+
// Set length to object’s size.
199+
// If object’s type attribute is not the empty byte sequence, set type to its value.
100200

101-
// Set length to unclear, see html/6424 for improving this.
201+
// byte sequence:
202+
// Set source to object.
102203

103-
// Set type to `multipart/form-data; boundary=`, followed by the multipart/form-data boundary string generated by the multipart/form-data encoding algorithm.
204+
// BufferSource:
205+
// Set source to a copy of the bytes held by object.
104206

105-
// URLSearchParams
106-
// Set source to the result of running the application/x-www-form-urlencoded serializer with object’s list.
207+
// FormData:
208+
// Set action to this step: run the multipart/form-data encoding algorithm, with object’s entry list and UTF-8.
107209

108-
// Set type to `application/x-www-form-urlencoded;charset=UTF-8`.
210+
// Set source to object.
109211

110-
// scalar value string
111-
// Set source to the UTF-8 encoding of object.
212+
// Set length to unclear, see html/6424 for improving this.
112213

113-
// Set type to `text/plain;charset=UTF-8`.
214+
// Set type to `multipart/form-data; boundary=`, followed by the multipart/form-data boundary string generated by the multipart/form-data encoding algorithm.
114215

115-
// ReadableStream
116-
// If keepalive is true, then throw a TypeError.
216+
// URLSearchParams:
217+
// Set source to the result of running the application/x-www-form-urlencoded serializer with object’s list.
117218

118-
// If object is disturbed or locked, then throw a TypeError.
219+
// Set type to `application/x-www-form-urlencoded;charset=UTF-8`.
119220

120-
// If source is a byte sequence, then set action to a step that returns source and length to source’s length.
221+
// ReadableStream:
222+
// If keepalive is true, then throw a TypeError.
223+
// If object is disturbed or locked, then throw a TypeError.
224+
}
121225

122-
// If action is non-null, then run these steps in parallel:
226+
// 11. If source is a byte sequence, then set action to a step that returns source and length to source’s length.
123227

124-
// Run action.
228+
// 12. If action is non-null, then run these steps in parallel:
229+
// 1. Run action.
230+
// Whenever one or more bytes are available and stream is not errored, enqueue the result of creating a Uint8Array from the available bytes into stream.
231+
// When running action is done, close stream.
125232

126-
// Whenever one or more bytes are available and stream is not errored, enqueue the result of creating a Uint8Array from the available bytes into stream.
233+
// 13. Let body be a body whose stream is stream, source is source, and length is length.
234+
const body = { stream, source, length };
127235

128-
// When running action is done, close stream.
236+
// 14. Return (body, type).
237+
return [body, type];
238+
}
129239

130-
// Let body be a body whose stream is stream, source is source, and length is length.
240+
// Check whether |statusText| is a ByteString and
241+
// matches the Reason-Phrase token production.
242+
// RFC 2616: https://tools.ietf.org/html/rfc2616
243+
// RFC 7230: https://tools.ietf.org/html/rfc7230
244+
// "reason-phrase = *( HTAB / SP / VCHAR / obs-text )"
245+
// https://github.com/chromium/chromium/blob/94.0.4604.1/third_party/blink/renderer/core/fetch/response.cc#L116
246+
function isValidReasonPhrase(statusText: string) {
247+
for (let i = 0; i < statusText.length; ++i) {
248+
const c = statusText.charCodeAt(i);
249+
if (
250+
!(
251+
c === 0x09 || // HTAB
252+
(c >= 0x20 && c <= 0x7e) || // SP / VCHAR
253+
(c >= 0x80 && c <= 0xff) // obs-text
254+
)
255+
) {
256+
return false;
257+
}
258+
}
259+
return true;
260+
}
131261

132-
// Return (body, type).
133-
}
262+
/**
263+
* A null body status is a status that is 101, 103, 204, 205, or 304.
264+
* @see https://fetch.spec.whatwg.org/#null-body-status
265+
*/
266+
function nullBodyStatus(status: number): boolean {
267+
return status === 101 || status === 103 || status === 204 || status === 205 ||
268+
status === 304;
269+
}

‎runtime/src/recommended.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use crate::{
1212
HeadersExt,
1313
ProcessExt,
1414
RequestExt,
15+
ResponseExt,
1516
RuntimeMacroTask,
1617
TimeExt,
1718
URLExt,
@@ -29,6 +30,7 @@ pub fn recommended_extensions() -> Vec<Extension> {
2930
HeadersExt::new_extension(),
3031
// BroadcastChannelExt::new_extension(),
3132
RequestExt::new_extension(),
33+
ResponseExt::new_extension(),
3234
#[cfg(feature = "canvas")]
3335
crate::CanvasExt::new_extension(),
3436
#[cfg(feature = "crypto")]

0 commit comments

Comments
 (0)