npm - @trpc/server - Versions diffs - 11.0.0-rc.637 → 11.0.0-rc.642 - Mend

@trpc/server 11.0.0-rc.637 → 11.0.0-rc.642

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

package/dist/unstable-core-do-not-import/rootConfig.d.ts CHANGED Viewed

@@ -69,7 +69,7 @@ export interface RootConfig<TTypes extends RootTypes> {
          * @default true
          */
         enabled?: boolean;
-    } & Pick<SSEStreamProducerOptions, 'ping' | 'emitAndEndImmediately' | 'maxDurationMs'>;
+    } & Pick<SSEStreamProducerOptions, 'ping' | 'emitAndEndImmediately' | 'maxDurationMs' | 'client'>;
     experimental?: {};
 }
 /**

package/dist/unstable-core-do-not-import/rootConfig.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rootConfig.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/rootConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,OAMmB,CAAC;AAElD;;;GAGG;AACH,MAAM,WAAW,UAAU,CAAC,MAAM,SAAS,SAAS;IAClD;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,WAAW,EAAE,uBAAuB,CAAC;IACrC;;;OAGG;IACH,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IAErE;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;OAGG;IACH,GAAG,CAAC,EAAE;QACJ;;;WAGG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,IAAI,CACN,wBAAwB,EACxB,MAAM,GAAG,uBAAuB,GAAG,eAAe,~~CACnD~~,CAAC;IACF,YAAY,CAAC,EAAE,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,SAAS,IAAI,SAAS,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG,eAAe,CAAC;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC,CAAC;AAEH,KAAK,SAAS,CAAC,UAAU,SAAS,OAAO,EAAE,KAAK,IAAI,UAAU,SAAS,IAAI,GACvE,OAAO,CAAC,KAAK,CAAC,GACd,KAAK,CAAC;AAEV;;;GAGG;AACH,MAAM,MAAM,qBAAqB,CAC/B,QAAQ,EACR,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IACvC,SAAS,CACX,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,KAAK,EACtC;IACE;;QAEI;IACJ,aAAa,EAAE,SAAS,CAAC;CAC1B,CACF,CAAC"}
1	+ {"version":3,"file":"rootConfig.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/rootConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,OAMmB,CAAC;AAElD;;;GAGG;AACH,MAAM,WAAW,UAAU,CAAC,MAAM,SAAS,SAAS;IAClD;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,WAAW,EAAE,uBAAuB,CAAC;IACrC;;;OAGG;IACH,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IAErE;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;OAGG;IACH,GAAG,CAAC,EAAE;QACJ;;;WAGG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,IAAI,CACN,wBAAwB,EACxB,MAAM,GAAG,uBAAuB,GAAG,eAAe,GAAG,QAAQ,CAC9D,CAAC;IACF,YAAY,CAAC,EAAE,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,SAAS,IAAI,SAAS,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG,eAAe,CAAC;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC,CAAC;AAEH,KAAK,SAAS,CAAC,UAAU,SAAS,OAAO,EAAE,KAAK,IAAI,UAAU,SAAS,IAAI,GACvE,OAAO,CAAC,KAAK,CAAC,GACd,KAAK,CAAC;AAEV;;;GAGG;AACH,MAAM,MAAM,qBAAqB,CAC/B,QAAQ,EACR,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IACvC,SAAS,CACX,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,KAAK,EACtC;IACE;;QAEI;IACJ,aAAa,EAAE,SAAS,CAAC;CAC1B,CACF,CAAC"}

package/dist/unstable-core-do-not-import/stream/jsonl.d.ts CHANGED Viewed

@@ -102,7 +102,7 @@ export declare function jsonlStreamConsumer<THead>(opts: {
      */
     abortController: AbortController;
 }): Promise<readonly [Awaited<THead>, {
-    readonly controllers: import("./utils/withRefCount").RefCountMap<ChunkIndex, ReadableStreamDefaultController<ChunkData | StreamInterruptedError>>;
+    readonly controllers: Map<ChunkIndex, ReadableStreamDefaultController<ChunkData | StreamInterruptedError>>;
 }]>;
 export {};
 //# sourceMappingURL=jsonl.d.ts.map

package/dist/unstable-core-do-not-import/stream/jsonl.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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~~IA4LA~~"}
1	+ {"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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"}

package/dist/unstable-core-do-not-import/stream/jsonl.js CHANGED Viewed

@@ -318,13 +318,27 @@ function createConsumerStream(from) {
         }));
     }
     let headDeferred = createDeferred.createDeferred();
-    const controllers = withRefCount.withRefCount(new Map(), ()=>{
-        opts.abortController?.abort();
-    });
+    /**
+   * This is needed as new values can come in before the controller has read the chunk
+   * Not pretty, could likely be refactored and omitted somehow
+   */ const chunkDeferred = new Map();
+    const controllers = new Map();
+    const maybeAbort = ()=>{
+        if (chunkDeferred.size === 0 && controllers.size === 0) {
+            // nothing is listening to the stream anymore
+            opts.abortController?.abort();
+        }
+    };
     function decodeChunkDefinition(value) {
         const [_path, type, chunkId] = value;
         const stream = createReadableStream.createReadableStream();
         controllers.set(chunkId, stream.controller);
+        // resolve chunk deferred if it exists
+        const deferred = chunkDeferred.get(chunkId);
+        if (deferred) {
+            deferred.resolve(stream.controller);
+            chunkDeferred.delete(chunkId);
+        }
         switch(type){
             case CHUNK_VALUE_TYPE_PROMISE:
                 {
@@ -354,58 +368,61 @@ function createConsumerStream(from) {
                             }
                         }).catch(reject).finally(()=>{
                             controllers.delete(chunkId);
+                            maybeAbort();
                         });
                     });
                 }
             case CHUNK_VALUE_TYPE_ASYNC_ITERABLE:
                 {
-                    return {
-                        [Symbol.asyncIterator]: ()=>{
-                            const reader = stream.readable.getReader();
-                            const iterator = {
-                                next: async ()=>{
-                                    const { done, value } = await reader.read();
-                                    if (value instanceof StreamInterruptedError) {
-                                        throw value;
-                                    }
-                                    if (done) {
-                                        controllers.delete(chunkId);
-                                        return {
-                                            done: true,
-                                            value: undefined
-                                        };
-                                    }
-                                    const [_chunkId, status, data] = value;
-                                    switch(status){
-                                        case ASYNC_ITERABLE_STATUS_VALUE:
-                                            return {
-                                                done: false,
-                                                value: decode(data)
-                                            };
-                                        case ASYNC_ITERABLE_STATUS_RETURN:
-                                            controllers.delete(chunkId);
-                                            return {
-                                                done: true,
-                                                value: decode(data)
-                                            };
-                                        case ASYNC_ITERABLE_STATUS_ERROR:
-                                            controllers.delete(chunkId);
-                                            throw opts.formatError?.({
-                                                error: data
-                                            }) ?? new AsyncError(data);
-                                    }
-                                },
-                                return: async ()=>{
+                    const reader = stream.readable.getReader();
+                    const iterator = {
+                        next: async ()=>{
+                            const { done, value } = await reader.read();
+                            if (value instanceof StreamInterruptedError) {
+                                throw value;
+                            }
+                            if (done) {
+                                controllers.delete(chunkId);
+                                maybeAbort();
+                                return {
+                                    done: true,
+                                    value: undefined
+                                };
+                            }
+                            const [_chunkId, status, data] = value;
+                            switch(status){
+                                case ASYNC_ITERABLE_STATUS_VALUE:
+                                    return {
+                                        done: false,
+                                        value: decode(data)
+                                    };
+                                case ASYNC_ITERABLE_STATUS_RETURN:
                                     controllers.delete(chunkId);
+                                    maybeAbort();
                                     return {
                                         done: true,
-                                        value: undefined
+                                        value: decode(data)
                                     };
-                                }
+                                case ASYNC_ITERABLE_STATUS_ERROR:
+                                    controllers.delete(chunkId);
+                                    maybeAbort();
+                                    throw opts.formatError?.({
+                                        error: data
+                                    }) ?? new AsyncError(data);
+                            }
+                        },
+                        return: async ()=>{
+                            controllers.delete(chunkId);
+                            maybeAbort();
+                            return {
+                                done: true,
+                                value: undefined
                             };
-                            return iterator;
                         }
                     };
+                    return {
+                        [Symbol.asyncIterator]: ()=>iterator
+                    };
                 }
         }
     }
@@ -440,18 +457,27 @@ function createConsumerStream(from) {
                 }
                 headDeferred.resolve(head);
                 headDeferred = null;
-                controllers.activate();
                 return;
             }
             const chunk = chunkOrHead;
             const [idx] = chunk;
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const controller = controllers.get(idx);
-            controller.enqueue(chunk);
+            let readController = controllers.get(idx);
+            if (!readController) {
+                let deferred = chunkDeferred.get(idx);
+                if (!deferred) {
+                    deferred = createDeferred.createDeferred();
+                    chunkDeferred.set(idx, deferred);
+                }
+                readController = await deferred.promise;
+            }
+            readController.enqueue(chunk);
         },
         close: closeOrAbort,
         abort: closeOrAbort
-    })).catch((error)=>{
+    }), {
+        signal: opts.abortController.signal
+    }).catch((error)=>{
         opts.onError?.({
             error
         });

package/dist/unstable-core-do-not-import/stream/jsonl.mjs CHANGED Viewed

@@ -316,13 +316,27 @@ function createConsumerStream(from) {
         }));
     }
     let headDeferred = createDeferred();
-    const controllers = withRefCount(new Map(), ()=>{
-        opts.abortController?.abort();
-    });
+    /**
+   * This is needed as new values can come in before the controller has read the chunk
+   * Not pretty, could likely be refactored and omitted somehow
+   */ const chunkDeferred = new Map();
+    const controllers = new Map();
+    const maybeAbort = ()=>{
+        if (chunkDeferred.size === 0 && controllers.size === 0) {
+            // nothing is listening to the stream anymore
+            opts.abortController?.abort();
+        }
+    };
     function decodeChunkDefinition(value) {
         const [_path, type, chunkId] = value;
         const stream = createReadableStream();
         controllers.set(chunkId, stream.controller);
+        // resolve chunk deferred if it exists
+        const deferred = chunkDeferred.get(chunkId);
+        if (deferred) {
+            deferred.resolve(stream.controller);
+            chunkDeferred.delete(chunkId);
+        }
         switch(type){
             case CHUNK_VALUE_TYPE_PROMISE:
                 {
@@ -352,58 +366,61 @@ function createConsumerStream(from) {
                             }
                         }).catch(reject).finally(()=>{
                             controllers.delete(chunkId);
+                            maybeAbort();
                         });
                     });
                 }
             case CHUNK_VALUE_TYPE_ASYNC_ITERABLE:
                 {
-                    return {
-                        [Symbol.asyncIterator]: ()=>{
-                            const reader = stream.readable.getReader();
-                            const iterator = {
-                                next: async ()=>{
-                                    const { done, value } = await reader.read();
-                                    if (value instanceof StreamInterruptedError) {
-                                        throw value;
-                                    }
-                                    if (done) {
-                                        controllers.delete(chunkId);
-                                        return {
-                                            done: true,
-                                            value: undefined
-                                        };
-                                    }
-                                    const [_chunkId, status, data] = value;
-                                    switch(status){
-                                        case ASYNC_ITERABLE_STATUS_VALUE:
-                                            return {
-                                                done: false,
-                                                value: decode(data)
-                                            };
-                                        case ASYNC_ITERABLE_STATUS_RETURN:
-                                            controllers.delete(chunkId);
-                                            return {
-                                                done: true,
-                                                value: decode(data)
-                                            };
-                                        case ASYNC_ITERABLE_STATUS_ERROR:
-                                            controllers.delete(chunkId);
-                                            throw opts.formatError?.({
-                                                error: data
-                                            }) ?? new AsyncError(data);
-                                    }
-                                },
-                                return: async ()=>{
+                    const reader = stream.readable.getReader();
+                    const iterator = {
+                        next: async ()=>{
+                            const { done, value } = await reader.read();
+                            if (value instanceof StreamInterruptedError) {
+                                throw value;
+                            }
+                            if (done) {
+                                controllers.delete(chunkId);
+                                maybeAbort();
+                                return {
+                                    done: true,
+                                    value: undefined
+                                };
+                            }
+                            const [_chunkId, status, data] = value;
+                            switch(status){
+                                case ASYNC_ITERABLE_STATUS_VALUE:
+                                    return {
+                                        done: false,
+                                        value: decode(data)
+                                    };
+                                case ASYNC_ITERABLE_STATUS_RETURN:
                                     controllers.delete(chunkId);
+                                    maybeAbort();
                                     return {
                                         done: true,
-                                        value: undefined
+                                        value: decode(data)
                                     };
-                                }
+                                case ASYNC_ITERABLE_STATUS_ERROR:
+                                    controllers.delete(chunkId);
+                                    maybeAbort();
+                                    throw opts.formatError?.({
+                                        error: data
+                                    }) ?? new AsyncError(data);
+                            }
+                        },
+                        return: async ()=>{
+                            controllers.delete(chunkId);
+                            maybeAbort();
+                            return {
+                                done: true,
+                                value: undefined
                             };
-                            return iterator;
                         }
                     };
+                    return {
+                        [Symbol.asyncIterator]: ()=>iterator
+                    };
                 }
         }
     }
@@ -438,18 +455,27 @@ function createConsumerStream(from) {
                 }
                 headDeferred.resolve(head);
                 headDeferred = null;
-                controllers.activate();
                 return;
             }
             const chunk = chunkOrHead;
             const [idx] = chunk;
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const controller = controllers.get(idx);
-            controller.enqueue(chunk);
+            let readController = controllers.get(idx);
+            if (!readController) {
+                let deferred = chunkDeferred.get(idx);
+                if (!deferred) {
+                    deferred = createDeferred();
+                    chunkDeferred.set(idx, deferred);
+                }
+                readController = await deferred.promise;
+            }
+            readController.enqueue(chunk);
         },
         close: closeOrAbort,
         abort: closeOrAbort
-    })).catch((error)=>{
+    }), {
+        signal: opts.abortController.signal
+    }).catch((error)=>{
         opts.onError?.({
             error
         });

package/dist/unstable-core-do-not-import/stream/sse.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ type Deserialize = (value: any) => any;
 /**
  * @internal
  */
-export interface PingOptions {
+export interface SSEPingOptions {
     /**
      * Enable ping comments sent from the server
      * @default false
@@ -18,15 +18,20 @@ export interface PingOptions {
      */
     intervalMs?: number;
 }
+export interface SSEClientOptions {
+    /**
+     * Timeout and reconnect after inactivity in milliseconds
+     * @default undefined
+     */
+    reconnectAfterInactivityMs?: number;
+}
 export interface SSEStreamProducerOptions<TValue = unknown> {
     serialize?: Serialize;
     data: AsyncIterable<TValue>;
-    abortCtrl: AbortController;
     maxDepth?: number;
-    ping?: PingOptions;
+    ping?: SSEPingOptions;
     /**
      * Maximum duration in milliseconds for the request before ending the stream
-     * Only useful for serverless runtimes
      * @default undefined
      */
     maxDurationMs?: number;
@@ -39,6 +44,11 @@ export interface SSEStreamProducerOptions<TValue = unknown> {
     formatError?: (opts: {
         error: unknown;
     }) => unknown;
+    /**
+     * Client-specific options - these will be sent to the client as part of the first message
+     * @default {}
+     */
+    client?: SSEClientOptions;
 }
 /**
  *
@@ -56,30 +66,28 @@ interface ConsumerStreamResultError<TConfig extends ConsumerConfig> extends Cons
     type: 'serialized-error';
     error: TConfig['error'];
 }
-interface ConsumerStreamResultOpened<TConfig extends ConsumerConfig> extends ConsumerStreamResultBase<TConfig> {
-    type: 'opened';
-}
 interface ConsumerStreamResultConnecting<TConfig extends ConsumerConfig> extends ConsumerStreamResultBase<TConfig> {
     type: 'connecting';
     event: EventSourceLike.EventOf<TConfig['EventSource']> | null;
 }
 interface ConsumerStreamResultTimeout<TConfig extends ConsumerConfig> extends ConsumerStreamResultBase<TConfig> {
     type: 'timeout';
+    ms: number;
 }
 interface ConsumerStreamResultPing<TConfig extends ConsumerConfig> extends ConsumerStreamResultBase<TConfig> {
     type: 'ping';
 }
-type ConsumerStreamResult<TConfig extends ConsumerConfig> = ConsumerStreamResultData<TConfig> | ConsumerStreamResultError<TConfig> | ConsumerStreamResultOpened<TConfig> | ConsumerStreamResultConnecting<TConfig> | ConsumerStreamResultTimeout<TConfig> | ConsumerStreamResultPing<TConfig>;
+interface ConsumerStreamResultConnected<TConfig extends ConsumerConfig> extends ConsumerStreamResultBase<TConfig> {
+    type: 'connected';
+    options: SSEClientOptions;
+}
+type ConsumerStreamResult<TConfig extends ConsumerConfig> = ConsumerStreamResultData<TConfig> | ConsumerStreamResultError<TConfig> | ConsumerStreamResultConnecting<TConfig> | ConsumerStreamResultTimeout<TConfig> | ConsumerStreamResultPing<TConfig> | ConsumerStreamResultConnected<TConfig>;
 export interface SSEStreamConsumerOptions<TConfig extends ConsumerConfig> {
     url: () => MaybePromise<string>;
     init: () => MaybePromise<EventSourceLike.InitDictOf<TConfig['EventSource']>> | undefined;
     signal: AbortSignal;
     deserialize?: Deserialize;
     EventSource: TConfig['EventSource'];
-    /**
-     * Reconnect after inactivity in milliseconds
-     */
-    reconnectAfterInactivityMs?: number;
 }
 interface ConsumerConfig {
     data: unknown;

package/dist/unstable-core-do-not-import/stream/sse.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAMpD,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,~~WAAW~~;~~IAC1B~~;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,GAAG,OAAO;IACxD,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;~~IAC5B~~,~~SAAS,EAAE,eAAe,CAAC;IAC3B,~~QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,~~WAAW~~,CAAC;~~IACnB;;;;OAIG~~;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC;~~CACrD~~;~~AAWD~~;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,GAAG,OAAO,EAChD,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC,~~0BA6GvC~~;AAED,UAAU,wBAAwB,CAAC,OAAO,SAAS,cAAc;IAC/D,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;CACnD;AAED,UAAU,wBAAwB,CAAC,OAAO,SAAS,cAAc,CAC/D,SAAQ,wBAAwB,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;CAC3C;AAED,UAAU,yBAAyB,CAAC,OAAO,SAAS,cAAc,CAChE,SAAQ,wBAAwB,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,kBAAkB,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACzB;AAED,UAAU,~~0BAA0B,CAAC,OAAO,SAAS,cAAc,CACjE,SAAQ,wBAAwB,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,UAAU,~~8BAA8B,CAAC,OAAO,SAAS,cAAc,CACrE,SAAQ,wBAAwB,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC;CAC/D;AACD,UAAU,2BAA2B,CAAC,OAAO,SAAS,cAAc,CAClE,SAAQ,wBAAwB,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,SAAS,CAAC;~~CACjB~~;~~AAED~~,UAAU,wBAAwB,CAAC,OAAO,SAAS,cAAc,CAC/D,SAAQ,wBAAwB,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,KAAK,oBAAoB,CAAC,OAAO,SAAS,cAAc,IACpD,wBAAwB,CAAC,OAAO,CAAC,GACjC,yBAAyB,CAAC,OAAO,CAAC,GAClC,~~0BAA0B~~,CAAC,OAAO,CAAC,~~GACnC~~,~~8BAA8B~~,CAAC,OAAO,CAAC,~~GACvC~~,~~2BAA2B~~,CAAC,OAAO,CAAC,~~GACpC~~,~~wBAAwB~~,CAAC,OAAO,CAAC,CAAC;~~AAEtC~~,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,cAAc;IACtE,GAAG,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MACF,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,GAChE,SAAS,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;~~IACpC;;OAEG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;~~CACrC;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,eAAe,CAAC,cAAc,CAAC;CAC7C;AA2BD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,cAAc,EAC9D,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,GACtC,aAAa,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,~~CA2J9C~~;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}
1	+ {"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"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"}

package/dist/unstable-core-do-not-import/stream/sse.js CHANGED Viewed

@@ -11,32 +11,36 @@ var withPing = require('./utils/withPing.js');
 const PING_EVENT = 'ping';
 const SERIALIZED_ERROR_EVENT = 'serialized-error';
+const CONNECTED_EVENT = 'connected';
 /**
  *
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */ function sseStreamProducer(opts) {
     const stream = createReadableStream.createReadableStream();
-    stream.controller.enqueue({
-        comment: 'connected'
-    });
     const { serialize = utils.identity } = opts;
     const ping = {
         enabled: opts.ping?.enabled ?? false,
         intervalMs: opts.ping?.intervalMs ?? 1000
     };
+    const client = opts.client ?? {};
+    stream.controller.enqueue({
+        event: CONNECTED_EVENT,
+        data: JSON.stringify(client)
+    });
+    if (ping.enabled && client.reconnectAfterInactivityMs && ping.intervalMs > client.reconnectAfterInactivityMs) {
+        throw new Error(`Ping interval must be less than client reconnect interval to prevent unnecessary reconnection - ping.intervalMs: ${ping.intervalMs} client.reconnectAfterInactivityMs: ${client.reconnectAfterInactivityMs}`);
+    }
     utils.run(async ()=>{
         let iterable = opts.data;
         if (opts.emitAndEndImmediately) {
             iterable = asyncIterable.takeWithGrace(iterable, {
                 count: 1,
-                gracePeriodMs: 1,
-                abortCtrl: opts.abortCtrl
+                gracePeriodMs: 1
             });
         }
         if (opts.maxDurationMs && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
             iterable = asyncIterable.withMaxDuration(iterable, {
-                maxDurationMs: opts.maxDurationMs,
-                abortCtrl: opts.abortCtrl
+                maxDurationMs: opts.maxDurationMs
             });
         }
         if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) {
@@ -139,6 +143,7 @@ async function withTimeout(opts) {
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */ function sseStreamConsumer(opts) {
     const { deserialize = (v)=>v } = opts;
+    let clientOptions = {};
     const signal = opts.signal;
     let _es = null;
     const createStream = ()=>new ReadableStream({
@@ -153,9 +158,13 @@ async function withTimeout(opts) {
                     eventSource: _es,
                     event: null
                 });
-                eventSource.addEventListener('open', ()=>{
+                eventSource.addEventListener(CONNECTED_EVENT, (_msg)=>{
+                    const msg = _msg;
+                    const options = JSON.parse(msg.data);
+                    clientOptions = options;
                     controller.enqueue({
-                        type: 'opened',
+                        type: 'connected',
+                        options,
                         eventSource
                     });
                 });
@@ -230,10 +239,11 @@ async function withTimeout(opts) {
             const iterator = {
                 async next () {
                     let promise = stream.reader.read();
-                    if (opts.reconnectAfterInactivityMs) {
+                    const timeoutMs = clientOptions.reconnectAfterInactivityMs;
+                    if (timeoutMs) {
                         promise = withTimeout({
                             promise,
-                            timeoutMs: opts.reconnectAfterInactivityMs,
+                            timeoutMs,
                             onTimeout: async ()=>{
                                 // Close and release old reader
                                 await stream.cancel();
@@ -242,6 +252,7 @@ async function withTimeout(opts) {
                                 return {
                                     value: {
                                         type: 'timeout',
+                                        ms: timeoutMs,
                                         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                                         eventSource: _es
                                     },

package/dist/unstable-core-do-not-import/stream/sse.mjs CHANGED Viewed

@@ -9,32 +9,36 @@ import { withPing, PING_SYM } from './utils/withPing.mjs';
 const PING_EVENT = 'ping';
 const SERIALIZED_ERROR_EVENT = 'serialized-error';
+const CONNECTED_EVENT = 'connected';
 /**
  *
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */ function sseStreamProducer(opts) {
     const stream = createReadableStream();
-    stream.controller.enqueue({
-        comment: 'connected'
-    });
     const { serialize = identity } = opts;
     const ping = {
         enabled: opts.ping?.enabled ?? false,
         intervalMs: opts.ping?.intervalMs ?? 1000
     };
+    const client = opts.client ?? {};
+    stream.controller.enqueue({
+        event: CONNECTED_EVENT,
+        data: JSON.stringify(client)
+    });
+    if (ping.enabled && client.reconnectAfterInactivityMs && ping.intervalMs > client.reconnectAfterInactivityMs) {
+        throw new Error(`Ping interval must be less than client reconnect interval to prevent unnecessary reconnection - ping.intervalMs: ${ping.intervalMs} client.reconnectAfterInactivityMs: ${client.reconnectAfterInactivityMs}`);
+    }
     run(async ()=>{
         let iterable = opts.data;
         if (opts.emitAndEndImmediately) {
             iterable = takeWithGrace(iterable, {
                 count: 1,
-                gracePeriodMs: 1,
-                abortCtrl: opts.abortCtrl
+                gracePeriodMs: 1
             });
         }
         if (opts.maxDurationMs && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
             iterable = withMaxDuration(iterable, {
-                maxDurationMs: opts.maxDurationMs,
-                abortCtrl: opts.abortCtrl
+                maxDurationMs: opts.maxDurationMs
             });
         }
         if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) {
@@ -137,6 +141,7 @@ async function withTimeout(opts) {
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */ function sseStreamConsumer(opts) {
     const { deserialize = (v)=>v } = opts;
+    let clientOptions = {};
     const signal = opts.signal;
     let _es = null;
     const createStream = ()=>new ReadableStream({
@@ -151,9 +156,13 @@ async function withTimeout(opts) {
                     eventSource: _es,
                     event: null
                 });
-                eventSource.addEventListener('open', ()=>{
+                eventSource.addEventListener(CONNECTED_EVENT, (_msg)=>{
+                    const msg = _msg;
+                    const options = JSON.parse(msg.data);
+                    clientOptions = options;
                     controller.enqueue({
-                        type: 'opened',
+                        type: 'connected',
+                        options,
                         eventSource
                     });
                 });
@@ -228,10 +237,11 @@ async function withTimeout(opts) {
             const iterator = {
                 async next () {
                     let promise = stream.reader.read();
-                    if (opts.reconnectAfterInactivityMs) {
+                    const timeoutMs = clientOptions.reconnectAfterInactivityMs;
+                    if (timeoutMs) {
                         promise = withTimeout({
                             promise,
-                            timeoutMs: opts.reconnectAfterInactivityMs,
+                            timeoutMs,
                             onTimeout: async ()=>{
                                 // Close and release old reader
                                 await stream.cancel();
@@ -240,6 +250,7 @@ async function withTimeout(opts) {
                                 return {
                                     value: {
                                         type: 'timeout',
+                                        ms: timeoutMs,
                                         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                                         eventSource: _es
                                     },