fullstacked 0.11.3-1148 → 0.11.3-1150

package/lib/fetch/index.ts

@@ -1,318 +1,318 @@
-import { toByteArray } from "../base64";
-import { bridge } from "../bridge";
-import {
-    deserializeArgs,
-    getLowestKeyIdAvailable,
-    serializeArgs
-} from "../bridge/serialization";
-import core_message from "../core_message";
-
-const te = new TextEncoder();
-
-type ResponseSimplified = {
-    statusCode: number;
-    statusMessage: string;
-    headers: Record<string, string>;
-    body: string | Uint8Array | AsyncIterableIterator<string | Uint8Array>;
-};
-
-const activeFetchRequests = new Map<
-    number,
-    {
-        resolve: (response: ResponseSimplified) => void;
-        reject: (error: string) => void;
-    }
->();
-
-let addedListener = false;
-function receivedResponse(base64Data: string) {
-    const data = toByteArray(base64Data);
-    const args = deserializeArgs(data);
-
-    const id = args.at(0);
-    const fetchRequest = activeFetchRequests.get(id);
-
-    const [statusCode, statusMessage, headersStr, body] = args.slice(1);
-
-    const response: ResponseSimplified = {
-        statusCode,
-        statusMessage,
-        headers: headersStr ? JSON.parse(headersStr) : {},
-        body
-    };
-
-    if (statusCode >= 400) {
-        fetchRequest.reject(JSON.stringify(response));
-    } else {
-        fetchRequest.resolve(response);
-    }
-
-    activeFetchRequests.delete(id);
-}
-
-// 15
-export default function core_fetch(
-    url: string,
-    options?: Partial<FetchOptions>
-): Promise<FetchResponse & { body: Uint8Array }>;
-export default function core_fetch(
-    url: string,
-    options?: Partial<FetchOptions> & { encoding: "utf8" }
-): Promise<FetchResponse & { body: string }>;
-export default function core_fetch(
-    url: string,
-    options?: Partial<FetchOptions> & { stream?: boolean; encoding?: "utf8" }
-) {
-    const method = options?.method || "GET";
-
-    const headers = options?.headers ? JSON.stringify(options.headers) : "";
-
-    const body = options?.body
-        ? typeof options.body === "string"
-            ? te.encode(options.body)
-            : options.body
-        : new Uint8Array();
-
-    const timeout = options?.timeout || 10;
-
-    const requestId = getLowestKeyIdAvailable(activeFetchRequests);
-
-    const payload = new Uint8Array([
-        15,
-
-        ...serializeArgs([
-            requestId,
-            method,
-            url,
-            headers,
-            body,
-            timeout,
-            options?.encoding === "utf8"
-        ])
-    ]);
-
-    if (!addedListener) {
-        core_message.addListener("fetch-response", receivedResponse);
-        addedListener = true;
-    }
-
-    return new Promise<ResponseSimplified>((resolve, reject) => {
-        activeFetchRequests.set(requestId, {
-            resolve,
-            reject
-        });
-        bridge(payload);
-    });
-}
-
-const activeFetch2Requests = new Map<
-    number,
-    {
-        url: string;
-        resolveResponse(response: Response): void;
-        resolveStream?(param: { done: boolean; chunk: Uint8Array }): void;
-    }
->();
-
-let addedListener2 = false;
-function receivedResponse2(base64Data: string) {
-    const data = toByteArray(base64Data);
-    const args = deserializeArgs(data);
-
-    const id = args.at(0);
-    const request = activeFetch2Requests.get(id);
-
-    if (request.resolveStream) {
-        const [done, chunk] = args.slice(1);
-        request.resolveStream({ done, chunk });
-        if (done) {
-            activeFetch2Requests.delete(id);
-        }
-        return;
-    }
-
-    const [status, statusText, headersStr] = args.slice(1);
-
-    const ok = status <= 299;
-
-    let finished = false;
-    const read = async () => {
-        if (finished) {
-            return { done: true };
-        }
-
-        const { done, chunk } = await new Promise<{
-            done: boolean;
-            chunk: Uint8Array;
-        }>((resolve) => {
-            request.resolveStream = resolve;
-        });
-        finished = done;
-
-        return { done: false, value: chunk };
-    };
-
-    const it = {
-        next: read
-    } as AsyncIterator<Uint8Array>;
-
-    const responseIterator = {
-        [Symbol.asyncIterator]() {
-            return it;
-        }
-    };
-
-    const readBody = async () => {
-        if (!ok) {
-            return te.encode(statusText);
-        }
-        let body = new Uint8Array();
-        for await (const chunk of responseIterator) {
-            const buffer = new Uint8Array(body.byteLength + chunk.byteLength);
-            buffer.set(body, 0);
-            buffer.set(chunk, body.length);
-            body = buffer;
-        }
-        return body;
-    };
-
-    const response: Response = {
-        url: request.url,
-        redirected: false,
-        type: "default",
-        bodyUsed: false,
-        ok,
-        status,
-        statusText,
-        headers: objectToHeaders(JSON.parse(headersStr || "{}")),
-
-        body: iteratorToStream(it),
-
-        bytes: readBody,
-        arrayBuffer: async () => {
-            const data = await readBody();
-            return data.buffer;
-        },
-        blob: async () => {
-            const body = await readBody();
-            return new Blob([body]);
-        },
-        text: async () => {
-            const body = await readBody();
-            return new TextDecoder().decode(body);
-        },
-        json: async () => {
-            const body = await readBody();
-            return JSON.parse(new TextDecoder().decode(body));
-        },
-
-        // not implemented
-        clone: () => null,
-        formData: async () => null
-    };
-
-    request.resolveResponse(response);
-}
-
-export function core_fetch2(request: Request): Promise<Response>;
-export function core_fetch2(
-    url: string | URL,
-    options?: RequestInit
-): Promise<Response>;
-export async function core_fetch2(
-    urlOrRequest: string | URL | Request,
-    options?: RequestInit
-): Promise<Response> {
-    if (!addedListener2) {
-        core_message.addListener("fetch2-response", receivedResponse2);
-        addedListener2 = true;
-    }
-
-    if (urlOrRequest instanceof Request) {
-        const bodyReader = urlOrRequest.body?.getReader();
-        const body = bodyReader ? (await bodyReader.read()).value : "";
-
-        options = {
-            method: urlOrRequest.method,
-            headers: urlOrRequest.headers,
-            signal: urlOrRequest.signal,
-            body
-        };
-
-        return fetch2(urlOrRequest.url, options);
-    }
-
-    const url =
-        urlOrRequest instanceof URL ? urlOrRequest.toString() : urlOrRequest;
-
-    return fetch2(url, options);
-}
-
-// 16
-function fetch2(url: string, options?: RequestInit): Promise<Response> {
-    const id = getLowestKeyIdAvailable(activeFetch2Requests);
-
-    const headers = options?.headers
-        ? options.headers instanceof Headers
-            ? JSON.stringify(headersToObject(options.headers))
-            : JSON.stringify(options.headers)
-        : "";
-    const body = options?.body
-        ? typeof options.body === "string"
-            ? te.encode(options.body)
-            : options.body
-        : new Uint8Array();
-
-    if (options?.signal) {
-        options.signal.onabort = () => {
-            console.log("ABORT REQUEST");
-            // cancel
-        };
-    }
-
-    const payload = new Uint8Array([
-        16,
-
-        ...serializeArgs([id, options?.method || "GET", url, headers, body])
-    ]);
-
-    return new Promise<Response>((resolve) => {
-        activeFetch2Requests.set(id, {
-            url,
-            resolveResponse: resolve
-        });
-        bridge(payload);
-    });
-}
-
-function objectToHeaders(o: Record<string, string>) {
-    const headers = new Headers();
-    Object.entries(o).forEach(([n, v]) => {
-        headers.set(n, v);
-    });
-    return headers;
-}
-
-const headersToObject = (h: Headers) => {
-    const obj = {};
-    for (const [n, v] of h.entries()) {
-        obj[n] = v;
-    }
-    return obj;
-};
-
-// https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream#convert_an_iterator_or_async_iterator_to_a_stream
-function iteratorToStream(iterator: AsyncIterator<Uint8Array>) {
-    return new ReadableStream({
-        async pull(controller) {
-            const { value, done } = await iterator.next();
-
-            if (value) {
-                controller.enqueue(value);
-            }
-            if (done) {
-                controller.close();
-            }
-        }
-    });
-}
+import { toByteArray } from "../base64";
+import { bridge } from "../bridge";
+import {
+    deserializeArgs,
+    getLowestKeyIdAvailable,
+    serializeArgs
+} from "../bridge/serialization";
+import core_message from "../core_message";
+
+const te = new TextEncoder();
+
+type ResponseSimplified = {
+    statusCode: number;
+    statusMessage: string;
+    headers: Record<string, string>;
+    body: string | Uint8Array | AsyncIterableIterator<string | Uint8Array>;
+};
+
+const activeFetchRequests = new Map<
+    number,
+    {
+        resolve: (response: ResponseSimplified) => void;
+        reject: (error: string) => void;
+    }
+>();
+
+let addedListener = false;
+function receivedResponse(base64Data: string) {
+    const data = toByteArray(base64Data);
+    const args = deserializeArgs(data);
+
+    const id = args.at(0);
+    const fetchRequest = activeFetchRequests.get(id);
+
+    const [statusCode, statusMessage, headersStr, body] = args.slice(1);
+
+    const response: ResponseSimplified = {
+        statusCode,
+        statusMessage,
+        headers: headersStr ? JSON.parse(headersStr) : {},
+        body
+    };
+
+    if (statusCode >= 400) {
+        fetchRequest.reject(JSON.stringify(response));
+    } else {
+        fetchRequest.resolve(response);
+    }
+
+    activeFetchRequests.delete(id);
+}
+
+// 15
+export default function core_fetch(
+    url: string,
+    options?: Partial<FetchOptions>
+): Promise<FetchResponse & { body: Uint8Array }>;
+export default function core_fetch(
+    url: string,
+    options?: Partial<FetchOptions> & { encoding: "utf8" }
+): Promise<FetchResponse & { body: string }>;
+export default function core_fetch(
+    url: string,
+    options?: Partial<FetchOptions> & { stream?: boolean; encoding?: "utf8" }
+) {
+    const method = options?.method || "GET";
+
+    const headers = options?.headers ? JSON.stringify(options.headers) : "";
+
+    const body = options?.body
+        ? typeof options.body === "string"
+            ? te.encode(options.body)
+            : options.body
+        : new Uint8Array();
+
+    const timeout = options?.timeout || 10;
+
+    const requestId = getLowestKeyIdAvailable(activeFetchRequests);
+
+    const payload = new Uint8Array([
+        15,
+
+        ...serializeArgs([
+            requestId,
+            method,
+            url,
+            headers,
+            body,
+            timeout,
+            options?.encoding === "utf8"
+        ])
+    ]);
+
+    if (!addedListener) {
+        core_message.addListener("fetch-response", receivedResponse);
+        addedListener = true;
+    }
+
+    return new Promise<ResponseSimplified>((resolve, reject) => {
+        activeFetchRequests.set(requestId, {
+            resolve,
+            reject
+        });
+        bridge(payload);
+    });
+}
+
+const activeFetch2Requests = new Map<
+    number,
+    {
+        url: string;
+        resolveResponse(response: Response): void;
+        resolveStream?(param: { done: boolean; chunk: Uint8Array }): void;
+    }
+>();
+
+let addedListener2 = false;
+function receivedResponse2(base64Data: string) {
+    const data = toByteArray(base64Data);
+    const args = deserializeArgs(data);
+
+    const id = args.at(0);
+    const request = activeFetch2Requests.get(id);
+
+    if (request.resolveStream) {
+        const [done, chunk] = args.slice(1);
+        request.resolveStream({ done, chunk });
+        if (done) {
+            activeFetch2Requests.delete(id);
+        }
+        return;
+    }
+
+    const [status, statusText, headersStr] = args.slice(1);
+
+    const ok = status <= 299;
+
+    let finished = false;
+    const read = async () => {
+        if (finished) {
+            return { done: true };
+        }
+
+        const { done, chunk } = await new Promise<{
+            done: boolean;
+            chunk: Uint8Array;
+        }>((resolve) => {
+            request.resolveStream = resolve;
+        });
+        finished = done;
+
+        return { done: false, value: chunk };
+    };
+
+    const it = {
+        next: read
+    } as AsyncIterator<Uint8Array>;
+
+    const responseIterator = {
+        [Symbol.asyncIterator]() {
+            return it;
+        }
+    };
+
+    const readBody = async () => {
+        if (!ok) {
+            return te.encode(statusText);
+        }
+        let body = new Uint8Array();
+        for await (const chunk of responseIterator) {
+            const buffer = new Uint8Array(body.byteLength + chunk.byteLength);
+            buffer.set(body, 0);
+            buffer.set(chunk, body.length);
+            body = buffer;
+        }
+        return body;
+    };
+
+    const response: Response = {
+        url: request.url,
+        redirected: false,
+        type: "default",
+        bodyUsed: false,
+        ok,
+        status,
+        statusText,
+        headers: objectToHeaders(JSON.parse(headersStr || "{}")),
+
+        body: iteratorToStream(it),
+
+        bytes: readBody,
+        arrayBuffer: async () => {
+            const data = await readBody();
+            return data.buffer;
+        },
+        blob: async () => {
+            const body = await readBody();
+            return new Blob([body]);
+        },
+        text: async () => {
+            const body = await readBody();
+            return new TextDecoder().decode(body);
+        },
+        json: async () => {
+            const body = await readBody();
+            return JSON.parse(new TextDecoder().decode(body));
+        },
+
+        // not implemented
+        clone: () => null,
+        formData: async () => null
+    };
+
+    request.resolveResponse(response);
+}
+
+export function core_fetch2(request: Request): Promise<Response>;
+export function core_fetch2(
+    url: string | URL,
+    options?: RequestInit
+): Promise<Response>;
+export async function core_fetch2(
+    urlOrRequest: string | URL | Request,
+    options?: RequestInit
+): Promise<Response> {
+    if (!addedListener2) {
+        core_message.addListener("fetch2-response", receivedResponse2);
+        addedListener2 = true;
+    }
+
+    if (urlOrRequest instanceof Request) {
+        const bodyReader = urlOrRequest.body?.getReader();
+        const body = bodyReader ? (await bodyReader.read()).value : "";
+
+        options = {
+            method: urlOrRequest.method,
+            headers: urlOrRequest.headers,
+            signal: urlOrRequest.signal,
+            body
+        };
+
+        return fetch2(urlOrRequest.url, options);
+    }
+
+    const url =
+        urlOrRequest instanceof URL ? urlOrRequest.toString() : urlOrRequest;
+
+    return fetch2(url, options);
+}
+
+// 16
+function fetch2(url: string, options?: RequestInit): Promise<Response> {
+    const id = getLowestKeyIdAvailable(activeFetch2Requests);
+
+    const headers = options?.headers
+        ? options.headers instanceof Headers
+            ? JSON.stringify(headersToObject(options.headers))
+            : JSON.stringify(options.headers)
+        : "";
+    const body = options?.body
+        ? typeof options.body === "string"
+            ? te.encode(options.body)
+            : options.body
+        : new Uint8Array();
+
+    if (options?.signal) {
+        options.signal.onabort = () => {
+            console.log("ABORT REQUEST");
+            // cancel
+        };
+    }
+
+    const payload = new Uint8Array([
+        16,
+
+        ...serializeArgs([id, options?.method || "GET", url, headers, body])
+    ]);
+
+    return new Promise<Response>((resolve) => {
+        activeFetch2Requests.set(id, {
+            url,
+            resolveResponse: resolve
+        });
+        bridge(payload);
+    });
+}
+
+function objectToHeaders(o: Record<string, string>) {
+    const headers = new Headers();
+    Object.entries(o).forEach(([n, v]) => {
+        headers.set(n, v);
+    });
+    return headers;
+}
+
+const headersToObject = (h: Headers) => {
+    const obj = {};
+    for (const [n, v] of h.entries()) {
+        obj[n] = v;
+    }
+    return obj;
+};
+
+// https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream#convert_an_iterator_or_async_iterator_to_a_stream
+function iteratorToStream(iterator: AsyncIterator<Uint8Array>) {
+    return new ReadableStream({
+        async pull(controller) {
+            const { value, done } = await iterator.next();
+
+            if (value) {
+                controller.enqueue(value);
+            }
+            if (done) {
+                controller.close();
+            }
+        }
+    });
+}