goscript 0.2.2 → 0.2.3

package/dist/gs/net/http/index.js

@@ -324,7 +324,10 @@ function parseRequestURL(rawURL) {
         }
         const parsed = new URL(rawURL, 'http://goscript.invalid');
         const hasHost = /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(rawURL);
-        return [new RequestURL(parsed.pathname, parsed.search.startsWith('?') ? parsed.search.slice(1) : parsed.search, hasHost ? parsed.protocol.replace(/:$/, '') : '', hasHost ? parsed.host : ''), null];
+        return [
+            new RequestURL(parsed.pathname, parsed.search.startsWith('?') ? parsed.search.slice(1) : parsed.search, hasHost ? parsed.protocol.replace(/:$/, '') : '', hasHost ? parsed.host : ''),
+            null,
+        ];
     }
     catch {
         return [null, errors.New(`parse "${rawURL}": invalid URL`)];
@@ -342,6 +345,46 @@ class responseBody {
         return null;
     }
 }
+class fetchResponseBody {
+    fetched;
+    requestContext;
+    abortFetch;
+    stopContextWatch;
+    reader = null;
+    closed = false;
+    constructor(fetched, requestContext, abortFetch, stopContextWatch) {
+        this.fetched = fetched;
+        this.requestContext = requestContext;
+        this.abortFetch = abortFetch;
+        this.stopContextWatch = stopContextWatch;
+    }
+    async Read(p) {
+        if (this.closed) {
+            return [0, ErrBodyReadAfterClose];
+        }
+        if (this.reader == null) {
+            const [data, err] = await readFetchBody(this.fetched, this.requestContext, this.abortFetch);
+            if (err != null) {
+                this.stopContextWatch();
+                return [0, err];
+            }
+            this.stopContextWatch();
+            this.reader = bytes.NewReader(data);
+        }
+        return this.reader.Read(p);
+    }
+    Close() {
+        if (this.closed) {
+            return null;
+        }
+        this.closed = true;
+        this.stopContextWatch();
+        if (this.reader == null) {
+            this.abortFetch();
+        }
+        return null;
+    }
+}
 class noBody {
     Read(_p) {
         return [0, io.EOF];
@@ -386,7 +429,9 @@ export class Cookie {
         this.Unparsed = init?.Unparsed ?? null;
     }
     String() {
-        const parts = [`${this.Name}=${this.Quoted ? quoteCookieValue(this.Value) : this.Value}`];
+        const parts = [
+            `${this.Name}=${this.Quoted ? quoteCookieValue(this.Value) : this.Value}`,
+        ];
         if (this.Path !== '') {
             parts.push(`Path=${this.Path}`);
         }
@@ -429,12 +474,19 @@ function isToken(value) {
     return /^[!#$%&'*+\-.^_`{}|~0-9A-Za-z]+$/.test(value);
 }
 function validCookieValueByte(code) {
-    return code >= 0x20 && code < 0x7f && code !== 0x22 && code !== 0x3b && code !== 0x5c;
+    return (code >= 0x20 &&
+        code < 0x7f &&
+        code !== 0x22 &&
+        code !== 0x3b &&
+        code !== 0x5c);
 }
 function parseCookieValue(raw, allowDoubleQuote) {
     let value = raw;
     let quoted = false;
-    if (allowDoubleQuote && value.length > 1 && value[0] === '"' && value[value.length - 1] === '"') {
+    if (allowDoubleQuote &&
+        value.length > 1 &&
+        value[0] === '"' &&
+        value[value.length - 1] === '"') {
         value = value.slice(1, -1);
         quoted = true;
     }
@@ -507,7 +559,7 @@ function inProcessServerRequest(request) {
     const rawQuery = request.URL?.RawQuery ?? '';
     const query = rawQuery === '' ? '' : `?${rawQuery}`;
     req.RequestURI = `${request.URL?.Path ?? '/'}${query}`;
-    req.Host = request.Host === '' ? request.URL?.Host ?? '' : request.Host;
+    req.Host = request.Host === '' ? (request.URL?.Host ?? '') : request.Host;
     if (req.URL?.clone != null) {
         req.URL = req.URL.clone();
         req.URL.Scheme = '';
@@ -560,7 +612,9 @@ export class Request {
         this.Cancel = init?.Cancel ?? null;
         this.Response = init?.Response ?? null;
         this.Pattern = init?.Pattern ?? '';
-        this.ctx = init?.ctx ?? context.Background();
+        this.ctx =
+            init?.ctx ??
+                context.Background();
     }
     Context() {
         return this.ctx;
@@ -571,7 +625,9 @@ export class Request {
     Clone(ctx) {
         return new Request({
             Method: this.Method,
-            URL: this.URL?.clone != null ? this.URL.clone() : this.URL == null ? null : { ...this.URL },
+            URL: this.URL?.clone != null ? this.URL.clone()
+                : this.URL == null ? null
+                    : { ...this.URL },
             Proto: this.Proto,
             ProtoMajor: this.ProtoMajor,
             ProtoMinor: this.ProtoMinor,
@@ -601,7 +657,8 @@ export class Request {
         return Header_Get(this.Header, 'Referer');
     }
     ProtoAtLeast(major, minor) {
-        return this.ProtoMajor > major || (this.ProtoMajor === major && this.ProtoMinor >= minor);
+        return (this.ProtoMajor > major ||
+            (this.ProtoMajor === major && this.ProtoMinor >= minor));
     }
     Cookie(name) {
         for (const cookie of Array.from(this.Cookies() ?? [])) {
@@ -678,7 +735,8 @@ export class Response {
         this.TLS = init?.TLS ?? null;
         if (this.Status === '' && this.StatusCode !== 0) {
             const text = StatusText(this.StatusCode);
-            this.Status = text === '' ? String(this.StatusCode) : `${this.StatusCode} ${text}`;
+            this.Status =
+                text === '' ? String(this.StatusCode) : `${this.StatusCode} ${text}`;
         }
     }
     clone() {
@@ -726,7 +784,8 @@ export class Response {
         }
     }
     ProtoAtLeast(major, minor) {
-        return this.ProtoMajor > major || (this.ProtoMajor === major && this.ProtoMinor >= minor);
+        return (this.ProtoMajor > major ||
+            (this.ProtoMajor === major && this.ProtoMinor >= minor));
     }
     Write(w) {
         const write = (data) => {
@@ -820,10 +879,8 @@ function encodeFormData(data) {
     if (data instanceof URLSearchParams) {
         return data.toString();
     }
-    const entries = data instanceof Map ?
-        Array.from(data.entries())
-        : typeof data === 'object' ?
-            Object.entries(data)
+    const entries = data instanceof Map ? Array.from(data.entries())
+        : typeof data === 'object' ? Object.entries(data)
             : [];
     entries.sort(([a], [b]) => String(a).localeCompare(String(b)));
     const params = new URLSearchParams();
@@ -1015,7 +1072,10 @@ async function fetchRoundTrip(request) {
     };
     if (typeof globalThis.fetch !== 'function') {
         closeRequestBody();
-        return [null, errors.New('net/http: Client.Do is not implemented in GoScript')];
+        return [
+            null,
+            errors.New('net/http: Client.Do is not implemented in GoScript'),
+        ];
     }
     const ctxErr = request.Context()?.Err?.();
     if (ctxErr != null) {
@@ -1029,7 +1089,9 @@ async function fetchRoundTrip(request) {
         }
     }
     let body;
-    if (requestBody != null && request.Method !== MethodGet && request.Method !== MethodHead) {
+    if (requestBody != null &&
+        request.Method !== MethodGet &&
+        request.Method !== MethodHead) {
         const [data, err] = await io.ReadAll(requestBody);
         const closeErr = closeRequestBody();
         if (err != null) {
@@ -1046,21 +1108,32 @@ async function fetchRoundTrip(request) {
             return [null, closeErr];
         }
     }
+    const fetchContext = newFetchContext(request.Context());
     try {
         const bodyInit = body == null ? undefined : Uint8Array.from(body).buffer;
-        const fetched = await globalThis.fetch(request.URL?.String?.() ?? '', {
+        const [fetched, fetchErr] = await fetchContext.wait(globalThis.fetch(request.URL?.String?.() ?? '', {
             method: request.Method || MethodGet,
             headers,
             body: bodyInit,
-        });
-        const data = new Uint8Array(await fetched.arrayBuffer());
+            signal: fetchContext.signal,
+        }));
+        if (fetchErr != null || fetched == null) {
+            fetchContext.stop();
+            return [null, fetchErr];
+        }
         const respHeader = new Header();
         fetched.headers.forEach((value, key) => Header_Add(respHeader, key, value));
+        const responseBody = request.Method === MethodHead ?
+            NoBody
+            : new fetchResponseBody(fetched, request.Context(), fetchContext.abort, fetchContext.stop);
+        if (request.Method === MethodHead) {
+            fetchContext.stop();
+        }
         return [
             new Response({
                 Status: `${fetched.status} ${fetched.statusText}`,
                 StatusCode: fetched.status,
-                Body: new responseBody(data),
+                Body: responseBody,
                 Header: respHeader,
                 ContentLength: Number(fetched.headers.get('content-length') ?? -1),
                 Request: request,
@@ -1069,12 +1142,79 @@ async function fetchRoundTrip(request) {
         ];
     }
     catch (err) {
-        const message = typeof err === 'object' && err != null && 'message' in err
-            ? String(err.message)
-            : String(err);
-        return [null, errors.New(message)];
+        fetchContext.stop();
+        return [null, errorFromUnknown(err)];
     }
 }
+function newFetchContext(requestContext) {
+    let stopped = false;
+    const watchController = typeof AbortController === 'undefined' ? null : new AbortController();
+    const controller = typeof AbortController === 'undefined' ? null : new AbortController();
+    const abort = () => {
+        if (controller != null && !controller.signal.aborted) {
+            controller.abort(requestContext?.Err?.() ?? context.Canceled);
+        }
+    };
+    const donePromise = requestContext == null ? null : ((async () => {
+        try {
+            await requestContext.Done().selectReceive(0, watchController?.signal);
+        }
+        catch {
+            // Closed channels and receive wakeups both mean the context is done.
+        }
+        const err = requestContext.Err() ?? context.Canceled;
+        if (!stopped) {
+            abort();
+        }
+        return err;
+    })());
+    return {
+        signal: controller?.signal,
+        abort,
+        stop: () => {
+            stopped = true;
+            watchController?.abort();
+        },
+        wait: async (promise) => {
+            const settle = promise.then((value) => ({ value }), (thrown) => ({ thrown }));
+            if (donePromise == null) {
+                const result = await settle;
+                if ('thrown' in result) {
+                    return [null, errorFromUnknown(result.thrown)];
+                }
+                return [result.value, null];
+            }
+            const result = await Promise.race([settle, donePromise.then((err) => ({ err }))]);
+            if ('err' in result) {
+                abort();
+                return [null, result.err];
+            }
+            if ('thrown' in result) {
+                return [
+                    null,
+                    requestContext?.Err?.() ?? errorFromUnknown(result.thrown),
+                ];
+            }
+            return [result.value, null];
+        },
+    };
+}
+function errorFromUnknown(err) {
+    const message = typeof err === 'object' && err != null && 'message' in err ?
+        String(err.message)
+        : String(err);
+    return errors.New(message);
+}
+async function readFetchBody(fetched, requestContext, abortFetch) {
+    const fetchContext = newFetchContext(requestContext);
+    const [buffer, err] = await fetchContext.wait(fetched.arrayBuffer());
+    fetchContext.stop();
+    if (err != null) {
+        abortFetch();
+        return [new Uint8Array(), err];
+    }
+    return [new Uint8Array(buffer ?? new ArrayBuffer(0)), null];
+}
 export function FS(fsys) {
     return {
         Open(name) {
@@ -1094,7 +1234,9 @@ function httpFileFromFSFile(file) {
         Read: (p) => file.Read(p instanceof Uint8Array ? p : Uint8Array.from(p ?? [])),
         Close: () => file.Close(),
         Stat: () => file.Stat(),
-        Seek: seek == null ? () => [0, errors.New('net/http: file does not support seek')] : seek.bind(file),
+        Seek: seek == null ?
+            () => [0, errors.New('net/http: file does not support seek')]
+            : seek.bind(file),
         Readdir: readdir == null ? () => [null, io.EOF] : readdir.bind(file),
     };
 }
@@ -1109,13 +1251,13 @@ export function FileServer(root) {
                 Error(w, 'method not allowed', StatusMethodNotAllowed);
                 return;
             }
-            const [file, err] = root?.Open(cleanFileServerPath(req.URL?.Path ?? '')) ?? [null, fs.ErrInvalid];
+            const [file, err] = (await root?.Open(cleanFileServerPath(req.URL?.Path ?? ''))) ?? [null, fs.ErrInvalid];
             if (err != null || file == null) {
                 NotFound(w, req);
                 return;
             }
             try {
-                const [info, statErr] = file.Stat();
+                const [info, statErr] = await file.Stat();
                 if (statErr != null) {
                     Error(w, statErr.Error(), StatusInternalServerError);
                     return;
@@ -1138,7 +1280,7 @@ export function FileServer(root) {
                 }
             }
             finally {
-                file.Close();
+                await file.Close();
             }
         },
     };
@@ -1174,7 +1316,23 @@ function cleanFileServerPath(name) {
     }
     return parts.length === 0 ? '.' : parts.join('/');
 }
+$.registerInterfaceType('http.Handler', null, [
+    {
+        name: 'ServeHTTP',
+        args: [
+            { name: 'w', type: 'http.ResponseWriter' },
+            {
+                name: 'r',
+                type: { kind: $.TypeKind.Pointer, elemType: 'http.Request' },
+            },
+        ],
+        returns: [],
+    },
+]);
 export function HandlerFunc_ServeHTTP(h, w, r) {
+    if (!h) {
+        throw new globalThis.Error('http: nil HandlerFunc');
+    }
     return h(w, r);
 }
 export class CrossOriginProtection {
@@ -1334,7 +1492,8 @@ export class Server {
         this.BaseContext = init?.BaseContext ?? null;
         this.ConnContext = init?.ConnContext ?? null;
         this.Handler = init?.Handler ?? null;
-        this.DisableGeneralOptionsHandler = init?.DisableGeneralOptionsHandler ?? false;
+        this.DisableGeneralOptionsHandler =
+            init?.DisableGeneralOptionsHandler ?? false;
         this.TLSConfig = init?.TLSConfig ?? null;
         this.ReadTimeout = init?.ReadTimeout ?? 0;
         this.ReadTimeoutHandler = init?.ReadTimeoutHandler ?? null;
@@ -1492,7 +1651,9 @@ export function StripPrefix(prefix, handler) {
     return {
         ServeHTTP(w, r) {
             const req = $.pointerValue(r);
-            if (req?.URL != null && typeof req.URL.Path === 'string' && req.URL.Path.startsWith(prefix)) {
+            if (req?.URL != null &&
+                typeof req.URL.Path === 'string' &&
+                req.URL.Path.startsWith(prefix)) {
                 req.URL = { ...req.URL, Path: req.URL.Path.slice(prefix.length) || '/' };
             }
             return handler?.ServeHTTP(w, req);
@@ -1554,7 +1715,10 @@ export function Redirect(w, _r, url, code) {
 export function ParseTime(text) {
     const date = new globalThis.Date(text);
     if (isNaN(date.getTime())) {
-        return [new time.Time(), $.newError(`parsing time "${text}" as HTTP-date: cannot parse`)];
+        return [
+            new time.Time(),
+            $.newError(`parsing time "${text}" as HTTP-date: cannot parse`),
+        ];
     }
     return [time.UnixMilli(date.getTime()), null];
 }
@@ -1599,7 +1763,8 @@ export function DetectContentType(data) {
     if (startsWithBytes(bytes, new Uint8Array([0xef, 0xbb, 0xbf]))) {
         return 'text/plain; charset=utf-8';
     }
-    if (startsWithBytes(bytes, new Uint8Array([0x00, 0x00, 0x01, 0x00])) || startsWithBytes(bytes, new Uint8Array([0x00, 0x00, 0x02, 0x00]))) {
+    if (startsWithBytes(bytes, new Uint8Array([0x00, 0x00, 0x01, 0x00])) ||
+        startsWithBytes(bytes, new Uint8Array([0x00, 0x00, 0x02, 0x00]))) {
         return 'image/x-icon';
     }
     if (startsWithASCII(bytes, 'BM')) {
@@ -1675,7 +1840,10 @@ export function DetectContentType(data) {
         return 'application/wasm';
     }
     for (const byte of afterWS) {
-        if (byte <= 0x08 || byte === 0x0b || (byte >= 0x0e && byte <= 0x1a) || (byte >= 0x1c && byte <= 0x1f)) {
+        if (byte <= 0x08 ||
+            byte === 0x0b ||
+            (byte >= 0x0e && byte <= 0x1a) ||
+            (byte >= 0x1c && byte <= 0x1f)) {
             return 'application/octet-stream';
         }
     }
@@ -1684,7 +1852,11 @@ export function DetectContentType(data) {
 function firstNonWhitespace(data) {
     for (let i = 0; i < data.length; i++) {
         const byte = data[i];
-        if (byte !== 0x09 && byte !== 0x0a && byte !== 0x0c && byte !== 0x0d && byte !== 0x20) {
+        if (byte !== 0x09 &&
+            byte !== 0x0a &&
+            byte !== 0x0c &&
+            byte !== 0x0d &&
+            byte !== 0x20) {
             return i;
         }
     }
@@ -1807,7 +1979,12 @@ export function ParseSetCookie(line) {
     if (!ok) {
         return [null, errInvalidCookieValue];
     }
-    const cookie = new Cookie({ Name: name, Value: value, Quoted: quoted, Raw: line });
+    const cookie = new Cookie({
+        Name: name,
+        Value: value,
+        Quoted: quoted,
+        Raw: line,
+    });
     const unparsed = [];
     for (const raw of parts.slice(1)) {
         const part = raw.trim();
@@ -1863,7 +2040,8 @@ export function ParseSetCookie(line) {
                     break;
                 }
                 let secs = Number.parseInt(attrValue, 10);
-                if ((secs !== 0 && attrValue[0] === '0') || !Number.isSafeInteger(secs)) {
+                if ((secs !== 0 && attrValue[0] === '0') ||
+                    !Number.isSafeInteger(secs)) {
                     break;
                 }
                 if (secs <= 0) {
@@ -1901,7 +2079,10 @@ export function NewRequestWithContext(ctx, method, url, body) {
         method = MethodGet;
     }
     if (!isToken(method)) {
-        return [null, errors.New(`net/http: invalid method ${JSON.stringify(method)}`)];
+        return [
+            null,
+            errors.New(`net/http: invalid method ${JSON.stringify(method)}`),
+        ];
     }
     if (ctx == null) {
         return [null, errors.New('net/http: nil Context')];
@@ -1911,7 +2092,17 @@ export function NewRequestWithContext(ctx, method, url, body) {
         return [null, err];
     }
     const bodyInfo = requestBodyInfo(body, 0);
-    return [new Request({ Method: method, URL: parsedURL, Body: bodyInfo.Body, ContentLength: bodyInfo.ContentLength, Host: parsedURL.Host, ctx }), null];
+    return [
+        new Request({
+            Method: method,
+            URL: parsedURL,
+            Body: bodyInfo.Body,
+            ContentLength: bodyInfo.ContentLength,
+            Host: parsedURL.Host,
+            ctx,
+        }),
+        null,
+    ];
 }
 export async function Get(_url) {
     const [req, err] = NewRequest(MethodGet, _url, null);
@@ -1984,9 +2175,14 @@ function requestBodyInfo(body, unknownLength) {
     if (value === NoBody) {
         return { Body: NoBody, ContentLength: 0 };
     }
-    if (value instanceof bytes.Buffer || value instanceof bytes.Reader || value instanceof strings.Reader) {
+    if (value instanceof bytes.Buffer ||
+        value instanceof bytes.Reader ||
+        value instanceof strings.Reader) {
         const length = value.Len();
-        return { Body: length === 0 ? NoBody : readCloserForBody(body), ContentLength: length };
+        return {
+            Body: length === 0 ? NoBody : readCloserForBody(body),
+            ContentLength: length,
+        };
     }
     return { Body: readCloserForBody(body), ContentLength: unknownLength };
 }