@outfoxx/sunday 2.0.0-beta.18 → 2.0.0-beta.19

package/build/event-parser.js

@@ -11,141 +11,113 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+/** Incremental UTF-8 SSE parser. Create one instance per connection; incomplete events end with it. */
 export class EventParser {
-    decoder = new TextDecoder('utf-8');
-    unprocessedBuffer;
-    process(buffer, dispatcher) {
-        const availableBuffer = this.buildAvailableBuffer(buffer);
-        if (!availableBuffer) {
-            return;
-        }
-        const eventStrings = this.extractEventStringsFromBuffer(availableBuffer);
-        if (!eventStrings.length) {
-            return;
-        }
-        EventParser.parseAndDispatchEvents(eventStrings, dispatcher);
+    control;
+    // Node can strip two consecutive BOMs when the first spans chunks; remove exactly one here.
+    decoder = new TextDecoder('utf-8', { ignoreBOM: true });
+    atStart = true;
+    lineParts = [];
+    event = {};
+    data = [];
+    skipLF = false;
+    /** Receives each completed control line, even when EOF discards the unfinished message. */
+    constructor(control = () => { }) {
+        this.control = control;
     }
-    buildAvailableBuffer(buffer) {
-        const unprocessedBuffer = this.unprocessedBuffer;
-        this.unprocessedBuffer = undefined;
-        if (!buffer.byteLength) {
-            return unprocessedBuffer;
-        }
-        else if (!unprocessedBuffer?.byteLength) {
-            return buffer;
+    /** Parses complete lines and events, discarding the rest of a chunk when the signal aborts. */
+    process(buffer, dispatcher, signal) {
+        if (signal?.aborted) {
+            this.discard();
+            return;
         }
-        const newBuffer = new Uint8Array(unprocessedBuffer.byteLength + buffer.byteLength);
-        newBuffer.set(new Uint8Array(unprocessedBuffer), 0);
-        newBuffer.set(new Uint8Array(buffer), unprocessedBuffer.byteLength);
-        return newBuffer.buffer;
-    }
-    extractEventStringsFromBuffer(buffer) {
-        const eventStrings = [];
-        while (buffer.byteLength) {
-            // Find end of next event separator in buffer, exiting if none found.
-            const eventSeparator = EventParser.findEventSeparator(buffer);
-            if (!eventSeparator) {
-                // Save unprocessed data
-                this.unprocessedBuffer = buffer;
-                break;
-            }
-            const [endOfCurrentEventIdx, startOfNextEventIdx] = eventSeparator;
-            const eventBuffer = buffer.slice(0, endOfCurrentEventIdx);
-            buffer = buffer.slice(startOfNextEventIdx);
-            const eventString = this.decoder.decode(eventBuffer, {
-                stream: true,
-            });
-            eventStrings.push(eventString);
+        let text = this.decoder.decode(buffer, { stream: true });
+        if (this.atStart && text.length) {
+            this.atStart = false;
+            if (text[0] === '\ufeff')
+                text = text.slice(1);
         }
-        return eventStrings;
-    }
-    static findEventSeparator(buffer) {
-        const bytes = new Uint8Array(buffer);
-        for (let idx = 0; idx < bytes.length; ++idx) {
-            const byte = bytes[idx];
-            switch (byte) {
-                // line-feed
-                case 0xa: {
-                    // if the next byte is the
-                    // same, we found a separator
-                    if (bytes[idx + 1] == 0xa) {
-                        return [idx, idx + 2];
-                    }
-                    break;
-                }
-                // carriage-return
-                case 0xd: {
-                    // if the next byte is the
-                    // same, we found a separator
-                    if (bytes[idx + 1] == 0xd) {
-                        return [idx, idx + 2];
-                    }
-                    // if next is line-feed, and pattern
-                    // repeats, we found a separator.
-                    if (bytes[idx + 1] == 0xa &&
-                        bytes[idx + 2] == 0xd &&
-                        bytes[idx + 3] == 0xa) {
-                        return [idx, idx + 4];
-                    }
-                    break;
+        let start = 0;
+        for (let index = 0; index < text.length; index++) {
+            const character = text[index];
+            // A CR completes its line immediately; only its optional following LF is skipped.
+            if (this.skipLF) {
+                this.skipLF = false;
+                if (character === '\n') {
+                    start = index + 1;
+                    continue;
                 }
-                default:
             }
-        }
-        return undefined;
-    }
-    static parseAndDispatchEvents(eventStrings, dispatcher) {
-        for (const eventString of eventStrings) {
-            if (!eventString.length) {
+            if (character !== '\r' && character !== '\n')
                 continue;
-            }
-            const parsedEvent = EventParser.parseEvent(eventString);
-            dispatcher(parsedEvent);
-        }
-    }
-    static parseEvent(eventString) {
-        const event = {};
-        for (const line of eventString.split(lineSeparatorsRegEx)) {
-            const keyValueSeparatorIdx = line.indexOf(':');
-            let key;
-            let value;
-            if (keyValueSeparatorIdx != -1) {
-                key = line.slice(0, keyValueSeparatorIdx);
-                value = line.slice(keyValueSeparatorIdx + 1);
+            this.lineParts.push(text.slice(start, index));
+            const line = this.lineParts.join('');
+            this.lineParts.length = 0;
+            this.skipLF = character === '\r';
+            start = index + 1;
+            if (line) {
+                this.processLine(line);
             }
             else {
-                key = line;
-                value = '';
+                const event = this.event;
+                if (this.data.length)
+                    event.data = this.data.join('\n');
+                this.event = {};
+                this.data.length = 0;
+                if (event.data !== undefined || event.id !== undefined)
+                    dispatcher(event);
             }
-            switch (key) {
-                case 'retry':
-                    event.retry = EventParser.trimFieldValue(value);
-                    break;
-                case 'data': {
-                    const data = event.data ?? '';
-                    event.data = `${data}${EventParser.trimFieldValue(value)}\n`;
-                    break;
-                }
-                case '':
-                    // comment do nothing
-                    break;
-                default: {
-                    event[key] =
-                        EventParser.trimFieldValue(value);
-                }
+            if (signal?.aborted) {
+                this.discard();
+                return;
             }
         }
-        if (event.data?.[event.data?.length - 1] == '\n') {
-            event.data = event.data.slice(0, -1);
-        }
-        return event;
+        if (start < text.length)
+            this.lineParts.push(text.slice(start));
+    }
+    discard() {
+        // decode() without stream resets UTF-8/BOM state, including a partial character in the
+        // discarded tail. It must not contaminate a later call after cancellation.
+        this.decoder.decode();
+        this.atStart = true;
+        this.lineParts.length = 0;
+        this.event = {};
+        this.data.length = 0;
+        this.skipLF = false;
     }
-    static trimFieldValue(value) {
-        if (value[0] !== ' ') {
-            return value;
+    processLine(line) {
+        const colon = line.indexOf(':');
+        const key = colon < 0 ? line : line.slice(0, colon);
+        let value = colon < 0 ? '' : line.slice(colon + 1);
+        if (value.startsWith(' '))
+            value = value.slice(1);
+        switch (key) {
+            case 'data':
+                this.data.push(value);
+                break;
+            case 'id':
+                if (!value.includes('\0'))
+                    this.event.id = value;
+                break;
+            case 'retry':
+                if (parseEventMilliseconds(value) !== undefined)
+                    this.control({ retry: value });
+                break;
+            case 'event':
+                this.event.event = value;
+                break;
+            case 'keepalive':
+            case 'retry-max':
+                this.control({ [key]: value });
+                break;
         }
-        return value.slice(1);
     }
 }
-const lineSeparatorsRegEx = /\r\n|\r|\n/;
+/** @internal Parses bounded SSE millisecond values without accepting partial numbers. */
+export function parseEventMilliseconds(value) {
+    if (!/^\d+$/.test(value))
+        return undefined;
+    const milliseconds = Number(value);
+    return Number.isSafeInteger(milliseconds) ? milliseconds : undefined;
+}
 //# sourceMappingURL=event-parser.js.map

package/build/event-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-parser.js","sourceRoot":"","sources":["../src/event-parser.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAWjC,MAAM,OAAO,WAAW;IACL,OAAO,GAAgB,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IACzD,iBAAiB,CAAe;IAExC,OAAO,CACL,MAAmB,EACnB,UAA0C;QAE1C,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC;QAEzE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,WAAW,CAAC,sBAAsB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC/D,CAAC;IAEO,oBAAoB,CAAC,MAAmB;QAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO,iBAAiB,CAAC;QAC3B,CAAC;aAAM,IAAI,CAAC,iBAAiB,EAAE,UAAU,EAAE,CAAC;YAC1C,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,UAAU,CAC9B,iBAAiB,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CACjD,CAAC;QACF,SAAS,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;QACpD,SAAS,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEpE,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAEO,6BAA6B,CAAC,MAAmB;QACvD,MAAM,YAAY,GAAa,EAAE,CAAC;QAElC,OAAO,MAAM,CAAC,UAAU,EAAE,CAAC;YACzB,qEAAqE;YACrE,MAAM,cAAc,GAAG,WAAW,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC9D,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,wBAAwB;gBACxB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;gBAChC,MAAM;YACR,CAAC;YAED,MAAM,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,GAAG,cAAc,CAAC;YAEnE,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAC1D,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAE3C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE;gBACnD,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;YAEH,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAC/B,MAAmB;QAEnB,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QAErC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YAExB,QAAQ,IAAI,EAAE,CAAC;gBACb,YAAY;gBACZ,KAAK,GAAG,CAAC,CAAC,CAAC;oBACT,0BAA0B;oBAC1B,6BAA6B;oBAC7B,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;wBAC1B,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;oBACxB,CAAC;oBACD,MAAM;gBACR,CAAC;gBAED,kBAAkB;gBAClB,KAAK,GAAG,CAAC,CAAC,CAAC;oBACT,0BAA0B;oBAC1B,6BAA6B;oBAC7B,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;wBAC1B,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;oBACxB,CAAC;oBAED,oCAAoC;oBACpC,iCAAiC;oBACjC,IACE,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,GAAG;wBACrB,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,GAAG;wBACrB,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,GAAG,EACrB,CAAC;wBACD,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;oBACxB,CAAC;oBAED,MAAM;gBACR,CAAC;gBAED,QAAQ;YACV,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,MAAM,CAAC,sBAAsB,CACnC,YAAsB,EACtB,UAA0C;QAE1C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;gBACxB,SAAS;YACX,CAAC;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAExD,UAAU,CAAC,WAAW,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,WAAmB;QAC3C,MAAM,KAAK,GAAc,EAAE,CAAC;QAE5B,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC1D,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAE/C,IAAI,GAAW,CAAC;YAChB,IAAI,KAAa,CAAC;YAClB,IAAI,oBAAoB,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC/B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;gBAC1C,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,IAAI,CAAC;gBACX,KAAK,GAAG,EAAE,CAAC;YACb,CAAC;YAED,QAAQ,GAAG,EAAE,CAAC;gBACZ,KAAK,OAAO;oBACV,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;oBAChD,MAAM;gBAER,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC9B,KAAK,CAAC,IAAI,GAAG,GAAG,IAAI,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC7D,MAAM;gBACR,CAAC;gBAED,KAAK,EAAE;oBACL,qBAAqB;oBACrB,MAAM;gBAER,OAAO,CAAC,CAAC,CAAC;oBACP,KAAgC,CAAC,GAAG,CAAC;wBACpC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACjD,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,KAAa;QACzC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;CACF;AAED,MAAM,mBAAmB,GAAG,YAAY,CAAC"}
+{"version":3,"file":"event-parser.js","sourceRoot":"","sources":["../src/event-parser.ts"],"names":[],"mappings":"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"}

package/build/fetch-copy.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Copies native Fetch request settings and transfers responsibility for its body. The old request
+ * must not subsequently consume the body. Supply a replacement after consuming a body.
+ */
+export declare function copyRequest(request: Request, changes?: RequestInit & {
+    url?: string | URL;
+    duplex?: 'half';
+}): Request;
+/**
+ * Copies an inspectable response without teeing its body, retaining Fetch metadata.
+ * Opaque/error responses cannot be reconstructed with the platform Response constructor.
+ */
+export declare function copyResponse(response: Response, changes?: ResponseInit & {
+    body?: BodyInit | null;
+}): Response;

package/build/fetch-copy.js

@@ -0,0 +1,70 @@
+// Copyright 2020 Outfox, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { inheritBody } from './util/owned-body.js';
+/**
+ * Copies native Fetch request settings and transfers responsibility for its body. The old request
+ * must not subsequently consume the body. Supply a replacement after consuming a body.
+ */
+export function copyRequest(request, changes = {}) {
+    const { url = request.url, ...init } = changes;
+    const sameURL = String(url) === request.url;
+    // Native Request copies inherit the input body for null as well as undefined. Bun may
+    // instead return a bodyless request; inheritBody only records a transfer when a body exists.
+    const originalBody = request.body;
+    const body = init.body === undefined || (sameURL && init.body === null)
+        ? originalBody
+        : init.body;
+    const result = sameURL
+        ? new Request(request, init)
+        : new Request(url, {
+            method: request.method,
+            headers: request.headers,
+            signal: request.signal,
+            cache: request.cache,
+            credentials: request.credentials,
+            integrity: request.integrity,
+            keepalive: request.keepalive,
+            mode: request.mode,
+            redirect: request.redirect,
+            referrer: request.referrer,
+            referrerPolicy: request.referrerPolicy,
+            ...(request.body ? { duplex: 'half' } : {}),
+            ...init,
+            body,
+        });
+    inheritBody(body instanceof ReadableStream ? body : undefined, result, body === originalBody ? request.body : undefined);
+    return result;
+}
+/**
+ * Copies an inspectable response without teeing its body, retaining Fetch metadata.
+ * Opaque/error responses cannot be reconstructed with the platform Response constructor.
+ */
+export function copyResponse(response, changes = {}) {
+    const { body = response.body, ...init } = changes;
+    const result = new Response(body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers,
+        ...init,
+    });
+    for (const name of ['url', 'redirected', 'type']) {
+        Object.defineProperty(result, name, {
+            value: response[name],
+            configurable: true,
+        });
+    }
+    inheritBody(body instanceof ReadableStream ? body : undefined, result);
+    return result;
+}
+//# sourceMappingURL=fetch-copy.js.map

package/build/fetch-copy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-copy.js","sourceRoot":"","sources":["../src/fetch-copy.ts"],"names":[],"mappings":"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"}

package/build/fetch-event-source.d.ts

@@ -7,6 +7,7 @@ export interface FetchEventSource {
 export declare class FetchEventSource extends EventTarget implements ExtEventSource {
     private static readonly LAST_EVENT_ID_HEADER;
     private static readonly RETRY_TIME_DEFAULT;
+    private static readonly MAX_TIMER_DELAY;
     private static readonly RETRY_MAX_MULTIPLIER_DEFAULT;
     private static readonly KEEPALIVE_TIMEOUT_MULTIPLIER;
     private static readonly KEEPALIVE_TIMEOUT_MINIMUM;
@@ -40,11 +41,10 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
     private readonly eventTimeoutCheckInterval;
     private eventTimeoutCheckHandle?;
     private lastEventReceivedTime;
-    private readonly eventParser;
     constructor(url: string, eventSourceInit?: EventSourceInit & {
         adapter?: (url: string, requestInit: RequestInit) => Promise<Request>;
         /** Executes one connection using a subscription-owned authentication recovery budget. */
-        fetch?: (request: Request, signal: AbortSignal) => Promise<Response>;
+        fetch?: (request: Request, signal: AbortSignal, observeSignal: (signal: AbortSignal) => void) => Promise<Response>;
         signal?: AbortSignal;
         eventTimeout?: number;
         eventTimeoutCheckInterval?: number;
@@ -52,23 +52,24 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
     });
     connect(): void;
     private internalConnect;
-    close(): void;
+    /** Stops the subscription, forwarding an optional failure to the request and body producer. */
+    close(reason?: unknown): void;
     private internalClose;
     private updateLastEventReceived;
     private startEventTimeoutCheck;
     private stopEventTimeoutCheck;
     private checkEventTimeout;
     private receivedHeaders;
-    private receivedData;
     private receivedError;
     private receivedFatalError;
     private receivedComplete;
     private scheduleReconnect;
     private static calculateRetryTime;
     private clearReconnect;
+    private readonly receiveControls;
     private readonly dispatchParsedEvent;
-    private static parseMilliseconds;
     fireErrorEvent(error: unknown): void;
+    private notify;
     private abortConnection;
     private startExternalAbortListener;
     private stopExternalAbortListener;