@trpc/server 11.0.0-rc.474 → 11.0.0-rc.475

package/dist/unstable-core-do-not-import/rpc/parseTRPCMessage.mjs

@@ -40,8 +40,11 @@ import { isObject } from '../utils.mjs';
     }
     assertIsProcedureType(method);
     assertIsObject(params);
-    const { input: rawInput , path  } = params;
+    const { input: rawInput , path , lastEventId  } = params;
     assertIsString(path);
+    if (lastEventId !== undefined) {
+        assertIsString(lastEventId);
+    }
     const input = transformer.input.deserialize(rawInput);
     return {
         id,
@@ -49,7 +52,8 @@ import { isObject } from '../utils.mjs';
         method,
         params: {
             input,
-            path
+            path,
+            lastEventId
         }
     };
 }

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

@@ -1,34 +1,7 @@
-import type { ValidateShape } from '../types';
 import type { ConsumerOnError } from './jsonl';
+import type { inferTrackedOutput } from './tracked';
 type Serialize = (value: any) => any;
 type Deserialize = (value: any) => any;
-/**
- * Server-sent Event Message
- * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
- * @public
- */
-export interface SSEMessage {
-    /**
-     * The data field of the message - this can be anything
-     */
-    data: unknown;
-    /**
-     * The id for this message
-     * Passing this id will allow the client to resume the connection from this point if the connection is lost
-     * @see https://html.spec.whatwg.org/multipage/server-sent-events.html#the-last-event-id-header
-     */
-    id: string;
-}
-declare const sseSymbol: unique symbol;
-export type SSEMessageEnvelope<TData> = [typeof sseSymbol, TData];
-/**
- * Produce a typed server-sent event message
- */
-export declare function sse<TData extends SSEMessage>(event: ValidateShape<TData, SSEMessage>): SSEMessageEnvelope<TData>;
-export declare function isSSEMessageEnvelope<TData extends SSEMessage>(value: unknown): value is SSEMessageEnvelope<TData>;
-export type SerializedSSEvent = Omit<SSEMessage, 'data'> & {
-    data?: string;
-};
 /**
  * @internal
  */
@@ -67,7 +40,6 @@ export interface SSEStreamProducerOptions {
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
 export declare function sseStreamProducer(opts: SSEStreamProducerOptions): ReadableStream<string>;
-export type inferSSEOutput<TData> = TData extends SSEMessageEnvelope<infer $Data> ? $Data : TData;
 /**
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
@@ -75,7 +47,7 @@ export declare function sseStreamConsumer<TData>(opts: {
     from: EventSource;
     onError?: ConsumerOnError;
     deserialize?: Deserialize;
-}): AsyncIterable<inferSSEOutput<TData>>;
+}): AsyncIterable<inferTrackedOutput<TData>>;
 export declare const sseHeaders: {
     readonly 'Content-Type': "text/event-stream";
     readonly 'Cache-Control': "no-cache, no-transform";

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

@@ -1 +1 @@
-{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,QAAA,MAAM,SAAS,eAA+B,CAAC;AAC/C,MAAM,MAAM,kBAAkB,CAAC,KAAK,IAAI,CAAC,OAAO,SAAS,EAAE,KAAK,CAAC,CAAC;AAElE;;GAEG;AACH,wBAAgB,GAAG,CAAC,KAAK,SAAS,UAAU,EAC1C,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,GACtC,kBAAkB,CAAC,KAAK,CAAC,CAQ3B;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,UAAU,EAC3D,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAEpC;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;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;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7B,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;CACjC;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,0BA2G/D;AACD,MAAM,MAAM,cAAc,CAAC,KAAK,IAAI,KAAK,SAAS,kBAAkB,CAClE,MAAM,KAAK,CACZ,GACG,KAAK,GACL,KAAK,CAAC;AACV;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;IAC7C,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CA0DvC;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}
+{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAKpD,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;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7B,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;CACjC;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,0BA8G/D;AACD;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;IAC7C,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CA6D3C;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}

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

@@ -2,25 +2,10 @@
 
 var TRPCError = require('../error/TRPCError.js');
 var utils = require('../utils.js');
+var tracked = require('./tracked.js');
 var createDeferred = require('./utils/createDeferred.js');
 var createReadableStream = require('./utils/createReadableStream.js');
 
-const sseSymbol = Symbol('SSEMessageEnvelope');
-/**
- * Produce a typed server-sent event message
- */ function sse(event) {
-    if (event.id === '') {
-        // This could be removed by using different event names for `yield sse(x)`-emitted events and `yield y`-emitted events
-        throw new Error('`id` must not be an empty string as empty string is the same as not setting the id at all');
-    }
-    return [
-        sseSymbol,
-        event
-    ];
-}
-function isSSEMessageEnvelope(value) {
-    return Array.isArray(value) && value[0] === sseSymbol;
-}
 /**
  *
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
@@ -68,8 +53,9 @@ function isSSEMessageEnvelope(value) {
                 break;
             }
             const value = next.value;
-            const chunk = isSSEMessageEnvelope(value) ? {
-                ...value[1]
+            const chunk = tracked.isTrackedEnvelope(value) ? {
+                id: value[0],
+                data: value[1]
             } : {
                 data: value
             };
@@ -171,8 +157,6 @@ const sseHeaders = {
     Connection: 'keep-alive'
 };
 
-exports.isSSEMessageEnvelope = isSSEMessageEnvelope;
-exports.sse = sse;
 exports.sseHeaders = sseHeaders;
 exports.sseStreamConsumer = sseStreamConsumer;
 exports.sseStreamProducer = sseStreamProducer;

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

@@ -1,24 +1,9 @@
 import { getTRPCErrorFromUnknown } from '../error/TRPCError.mjs';
 import { run } from '../utils.mjs';
+import { isTrackedEnvelope } from './tracked.mjs';
 import { createTimeoutPromise } from './utils/createDeferred.mjs';
 import { createReadableStream } from './utils/createReadableStream.mjs';
 
-const sseSymbol = Symbol('SSEMessageEnvelope');
-/**
- * Produce a typed server-sent event message
- */ function sse(event) {
-    if (event.id === '') {
-        // This could be removed by using different event names for `yield sse(x)`-emitted events and `yield y`-emitted events
-        throw new Error('`id` must not be an empty string as empty string is the same as not setting the id at all');
-    }
-    return [
-        sseSymbol,
-        event
-    ];
-}
-function isSSEMessageEnvelope(value) {
-    return Array.isArray(value) && value[0] === sseSymbol;
-}
 /**
  *
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
@@ -66,8 +51,9 @@ function isSSEMessageEnvelope(value) {
                 break;
             }
             const value = next.value;
-            const chunk = isSSEMessageEnvelope(value) ? {
-                ...value[1]
+            const chunk = isTrackedEnvelope(value) ? {
+                id: value[0],
+                data: value[1]
             } : {
                 data: value
             };
@@ -169,4 +155,4 @@ const sseHeaders = {
     Connection: 'keep-alive'
 };
 
-export { isSSEMessageEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer };
+export { sseHeaders, sseStreamConsumer, sseStreamProducer };

package/dist/unstable-core-do-not-import/stream/tracked.d.ts

@@ -0,0 +1,31 @@
+declare const trackedSymbol: unique symbol;
+type TrackedId = string & {
+    __brand: 'TrackedId';
+};
+export type TrackedEnvelope<TData> = [TrackedId, TData, typeof trackedSymbol];
+type Tracked<TData> = {
+    /**
+     * The id of the message to keep track of in case the connection gets lost
+     */
+    id: string;
+    /**
+     * The data field of the message - this can be anything
+     */
+    data: TData;
+};
+/**
+ * Produce a typed server-sent event message
+ * @deprecated use `tracked(id, data)` instead
+ */
+export declare function sse<TData>(event: {
+    id: string;
+    data: TData;
+}): TrackedEnvelope<TData>;
+export declare function isTrackedEnvelope<TData>(value: unknown): value is TrackedEnvelope<TData>;
+/**
+ * Automatically track an event so that it can be resumed from a given id if the connection is lost
+ */
+export declare function tracked<TData>(id: string, data: TData): TrackedEnvelope<TData>;
+export type inferTrackedOutput<TData> = TData extends TrackedEnvelope<infer $Data> ? Tracked<$Data> : TData;
+export {};
+//# sourceMappingURL=tracked.d.ts.map

package/dist/unstable-core-do-not-import/stream/tracked.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracked.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/tracked.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,aAAa,eAA4B,CAAC;AAEhD,KAAK,SAAS,GAAG,MAAM,GAAG;IACxB,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AACF,MAAM,MAAM,eAAe,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,aAAa,CAAC,CAAC;AAE9E,KAAK,OAAO,CAAC,KAAK,IAAI;IACpB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;CACb,CAAC;AACF;;;GAGG;AACH,wBAAgB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,KAAK,CAAC;CACb,GAAG,eAAe,CAAC,KAAK,CAAC,CAEzB;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EACrC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,eAAe,CAAC,KAAK,CAAC,CAEjC;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAC3B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,KAAK,GACV,eAAe,CAAC,KAAK,CAAC,CAQxB;AAED,MAAM,MAAM,kBAAkB,CAAC,KAAK,IAAI,KAAK,SAAS,eAAe,CACnE,MAAM,KAAK,CACZ,GACG,OAAO,CAAC,KAAK,CAAC,GACd,KAAK,CAAC"}

package/dist/unstable-core-do-not-import/stream/tracked.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const trackedSymbol = Symbol('TrackedEnvelope');
+/**
+ * Produce a typed server-sent event message
+ * @deprecated use `tracked(id, data)` instead
+ */ function sse(event) {
+    return tracked(event.id, event.data);
+}
+function isTrackedEnvelope(value) {
+    return Array.isArray(value) && value[2] === trackedSymbol;
+}
+/**
+ * Automatically track an event so that it can be resumed from a given id if the connection is lost
+ */ function tracked(id, data) {
+    if (id === '') {
+        // This limitation could be removed by using different SSE event names / channels for tracked event and non-tracked event
+        throw new Error('`id` must not be an empty string as empty string is the same as not setting the id at all');
+    }
+    return [
+        id,
+        data,
+        trackedSymbol
+    ];
+}
+
+exports.isTrackedEnvelope = isTrackedEnvelope;
+exports.sse = sse;
+exports.tracked = tracked;

package/dist/unstable-core-do-not-import/stream/tracked.mjs

@@ -0,0 +1,25 @@
+const trackedSymbol = Symbol('TrackedEnvelope');
+/**
+ * Produce a typed server-sent event message
+ * @deprecated use `tracked(id, data)` instead
+ */ function sse(event) {
+    return tracked(event.id, event.data);
+}
+function isTrackedEnvelope(value) {
+    return Array.isArray(value) && value[2] === trackedSymbol;
+}
+/**
+ * Automatically track an event so that it can be resumed from a given id if the connection is lost
+ */ function tracked(id, data) {
+    if (id === '') {
+        // This limitation could be removed by using different SSE event names / channels for tracked event and non-tracked event
+        throw new Error('`id` must not be an empty string as empty string is the same as not setting the id at all');
+    }
+    return [
+        id,
+        data,
+        trackedSymbol
+    ];
+}
+
+export { isTrackedEnvelope, sse, tracked };

package/dist/unstable-core-do-not-import/transformer.d.ts

@@ -89,6 +89,7 @@ declare function transformResultInner<TRouter extends AnyRouter, TOutput>(respon
         data?: never;
     } | (import("./rpc").TRPCResult<TOutput> & {
         type: "data";
+        id?: string;
     });
     readonly error?: undefined;
 };

package/dist/unstable-core-do-not-import/transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,OAAO,CAAC;AAGf;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,oBAAqB,SAAQ,eAAe;IACpD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,qBAAsB,SAAQ,eAAe;IACrD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,KAAK,EAAE,oBAAoB,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG;IAC1C,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3D,MAAM,EAAE,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC;CAChE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,uBAAuB,GAAG,eAAe,CAAC;AAE/E;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,sBAAsB,GAClC,uBAAuB,CAKzB;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,uBAGhC,CAAC;AAyBF;;IAEI;AACJ,wBAAgB,qBAAqB,CACnC,SAAS,SACL,YAAY,GACZ,YAAY,EAAE,GACd,mBAAmB,GACnB,mBAAmB,EAAE,EACzB,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS;;yEAIzD;AAKD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;EAuB7B;AAQD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe,GAC3B,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}
+{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,OAAO,CAAC;AAGf;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,oBAAqB,SAAQ,eAAe;IACpD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED,UAAU,qBAAsB,SAAQ,eAAe;IACrD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,KAAK,EAAE,oBAAoB,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG;IAC1C,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3D,MAAM,EAAE,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC;CAChE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,uBAAuB,GAAG,eAAe,CAAC;AAE/E;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,sBAAsB,GAClC,uBAAuB,CAKzB;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,uBAGhC,CAAC;AAyBF;;IAEI;AACJ,wBAAgB,qBAAqB,CACnC,SAAS,SACL,YAAY,GACZ,YAAY,EAAE,GACd,mBAAmB,GACnB,mBAAmB,EAAE,EACzB,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS;;yEAIzD;AAKD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;EAuB7B;AAQD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,WAAW,EAAE,eAAe,GAC3B,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}

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

@@ -34,6 +34,7 @@ export * from './unstable-core-do-not-import/router';
 export * from './unstable-core-do-not-import/rpc';
 export * from './unstable-core-do-not-import/stream/jsonl';
 export * from './unstable-core-do-not-import/stream/sse';
+export * from './unstable-core-do-not-import/stream/tracked';
 export * from './unstable-core-do-not-import/stream/utils/createDeferred';
 export * from './unstable-core-do-not-import/transformer';
 export * from './unstable-core-do-not-import/types';

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

@@ -1 +1 @@
-{"version":3,"file":"unstable-core-do-not-import.d.ts","sourceRoot":"","sources":["../src/unstable-core-do-not-import.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,cAAc,mDAAmD,CAAC;AAClE,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,yDAAyD,CAAC;AACxE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uDAAuD,CAAC;AACtE,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,0DAA0D,CAAC;AACzE,cAAc,oDAAoD,CAAC;AACnE,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,0CAA0C,CAAC;AACzD,cAAc,2DAA2D,CAAC;AAC1E,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC"}
+{"version":3,"file":"unstable-core-do-not-import.d.ts","sourceRoot":"","sources":["../src/unstable-core-do-not-import.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,cAAc,mDAAmD,CAAC;AAClE,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,yDAAyD,CAAC;AACxE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uDAAuD,CAAC;AACtE,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,0DAA0D,CAAC;AACzE,cAAc,oDAAoD,CAAC;AACnE,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,0CAA0C,CAAC;AACzD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2DAA2D,CAAC;AAC1E,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC"}

package/dist/unstable-core-do-not-import.js

@@ -23,6 +23,7 @@ var codes = require('./unstable-core-do-not-import/rpc/codes.js');
 var parseTRPCMessage = require('./unstable-core-do-not-import/rpc/parseTRPCMessage.js');
 var jsonl = require('./unstable-core-do-not-import/stream/jsonl.js');
 var sse = require('./unstable-core-do-not-import/stream/sse.js');
+var tracked = require('./unstable-core-do-not-import/stream/tracked.js');
 var createDeferred = require('./unstable-core-do-not-import/stream/utils/createDeferred.js');
 var transformer = require('./unstable-core-do-not-import/transformer.js');
 var types = require('./unstable-core-do-not-import/types.js');
@@ -67,11 +68,12 @@ exports.parseTRPCMessage = parseTRPCMessage.parseTRPCMessage;
 exports.isPromise = jsonl.isPromise;
 exports.jsonlStreamConsumer = jsonl.jsonlStreamConsumer;
 exports.jsonlStreamProducer = jsonl.jsonlStreamProducer;
-exports.isSSEMessageEnvelope = sse.isSSEMessageEnvelope;
-exports.sse = sse.sse;
 exports.sseHeaders = sse.sseHeaders;
 exports.sseStreamConsumer = sse.sseStreamConsumer;
 exports.sseStreamProducer = sse.sseStreamProducer;
+exports.isTrackedEnvelope = tracked.isTrackedEnvelope;
+exports.sse = tracked.sse;
+exports.tracked = tracked.tracked;
 exports.createDeferred = createDeferred.createDeferred;
 exports.createTimeoutPromise = createDeferred.createTimeoutPromise;
 exports.defaultTransformer = transformer.defaultTransformer;

package/dist/unstable-core-do-not-import.mjs

@@ -20,7 +20,8 @@ export { callProcedure, createCallerFactory, createRouterFactory, mergeRouters }
 export { TRPC_ERROR_CODES_BY_KEY, TRPC_ERROR_CODES_BY_NUMBER } from './unstable-core-do-not-import/rpc/codes.mjs';
 export { parseTRPCMessage } from './unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
 export { isPromise, jsonlStreamConsumer, jsonlStreamProducer } from './unstable-core-do-not-import/stream/jsonl.mjs';
-export { isSSEMessageEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer } from './unstable-core-do-not-import/stream/sse.mjs';
+export { sseHeaders, sseStreamConsumer, sseStreamProducer } from './unstable-core-do-not-import/stream/sse.mjs';
+export { isTrackedEnvelope, sse, tracked } from './unstable-core-do-not-import/stream/tracked.mjs';
 export { createDeferred, createTimeoutPromise } from './unstable-core-do-not-import/stream/utils/createDeferred.mjs';
 export { defaultTransformer, getDataTransformer, transformResult, transformTRPCResponse } from './unstable-core-do-not-import/transformer.mjs';
 export { ERROR_SYMBOL } from './unstable-core-do-not-import/types.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.474+42b880437",
+  "version": "11.0.0-rc.475+10b4bde0c",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "42b880437961af45a4e59ff33267acbaedc46cec"
+  "gitHead": "10b4bde0cb497c29d00f3c78c09fe8b64391f93c"
 }

package/src/@trpc/server/index.ts

@@ -37,7 +37,11 @@ export {
   type QueryProcedure as TRPCQueryProcedure,
   type SubscriptionProcedure as TRPCSubscriptionProcedure,
   type TRPCBuilder,
+  /**
+   * @deprecated use `tracked(id, data)` instead
+   */
   sse,
+  tracked,
 } from '../../unstable-core-do-not-import';
 
 export type {

package/src/adapters/ws.ts

@@ -21,6 +21,7 @@ import type {
   TRPCConnectionParamsMessage,
   TRPCReconnectNotification,
   TRPCResponseMessage,
+  TRPCResultMessage,
 } from '../@trpc/server/rpc';
 import { parseConnectionParamsFromUnknown } from '../http';
 import { isObservable } from '../observable';
@@ -29,6 +30,7 @@ import { observableToAsyncIterable } from '../observable/observable';
 import {
   isAsyncIterable,
   isObject,
+  isTrackedEnvelope,
   run,
   type MaybePromise,
 } from '../unstable-core-do-not-import';
@@ -171,6 +173,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
 
     async function handleRequest(msg: TRPCClientOutgoingMessage) {
       const { id, jsonrpc } = msg;
+
       /* istanbul ignore next -- @preserve */
       if (id === null) {
         throw new TRPCError({
@@ -182,9 +185,22 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         clientSubscriptions.get(id)?.abort();
         return;
       }
-      const { path, input } = msg.params;
+      const { path, lastEventId } = msg.params;
+      let { input } = msg.params;
       const type = msg.method;
       try {
+        if (lastEventId !== undefined) {
+          if (isObject(input)) {
+            input = {
+              ...input,
+              lastEventId: lastEventId,
+            };
+          } else {
+            input ??= {
+              lastEventId: lastEventId,
+            };
+          }
+        }
         await ctxPromise; // asserts context has been set
 
         const result = await callProcedure({
@@ -195,7 +211,16 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
           type,
         });
 
+        const isIterableResult =
+          isAsyncIterable(result) || isObservable(result);
+
         if (type !== 'subscription') {
+          if (isIterableResult) {
+            throw new TRPCError({
+              code: 'UNSUPPORTED_MEDIA_TYPE',
+              message: `Cannot return an async iterable or observable from a ${type} procedure with WebSockets`,
+            });
+          }
           // send the value as data if the method is not a subscription
           respond({
             id,
@@ -208,7 +233,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
           return;
         }
 
-        if (!isObservable(result) && !isAsyncIterable(result)) {
+        if (!isIterableResult) {
           throw new TRPCError({
             message: `Subscription ${path} did not return an observable or a AsyncGenerator`,
             code: 'INTERNAL_SERVER_ERROR',
@@ -277,13 +302,24 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
               break;
             }
 
+            const result: TRPCResultMessage<unknown>['result'] = {
+              type: 'data',
+              data: next.value,
+            };
+
+            if (isTrackedEnvelope(next.value)) {
+              const [id, data] = next.value;
+              result.id = id;
+              result.data = {
+                id,
+                data,
+              };
+            }
+
             respond({
               id,
               jsonrpc,
-              result: {
-                type: 'data',
-                data: next.value,
-              },
+              result,
             });
           }
 

package/src/unstable-core-do-not-import/procedureBuilder.ts

@@ -23,7 +23,7 @@ import type {
   QueryProcedure,
   SubscriptionProcedure,
 } from './procedure';
-import type { inferSSEOutput } from './stream/sse';
+import type { inferTrackedOutput } from './stream/tracked';
 import type {
   GetRawInputFn,
   MaybePromise,
@@ -47,7 +47,7 @@ type DefaultValue<TValue, TFallback> = TValue extends UnsetMarker
 type inferSubscriptionOutput<TOutput> = TOutput extends AsyncIterable<
   infer $Output
 >
-  ? inferSSEOutput<$Output>
+  ? inferTrackedOutput<$Output>
   : inferObservableValue<TOutput>;
 
 export type CallerOverride<TContext> = (opts: {

package/src/unstable-core-do-not-import/rpc/envelopes.ts

@@ -49,7 +49,17 @@ export namespace JSONRPC2 {
 /////////////////////////// HTTP envelopes ///////////////////////
 
 export interface TRPCRequest
-  extends JSONRPC2.Request<ProcedureType, { path: string; input: unknown }> {}
+  extends JSONRPC2.Request<
+    ProcedureType,
+    {
+      path: string;
+      input: unknown;
+      /**
+       * The last event id that the client received
+       */
+      lastEventId?: string;
+    }
+  > {}
 
 export interface TRPCResult<TData = unknown> {
   data: TData;
@@ -101,7 +111,13 @@ export interface TRPCResultMessage<TData>
   extends JSONRPC2.ResultResponse<
     | { type: 'started'; data?: never }
     | { type: 'stopped'; data?: never }
-    | (TRPCResult<TData> & { type: 'data' })
+    | (TRPCResult<TData> & {
+        type: 'data';
+        /**
+         * The id of the message to keep track of in case of a reconnect
+         */
+        id?: string;
+      })
   > {}
 
 export type TRPCResponseMessage<

package/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts

@@ -67,9 +67,12 @@ export function parseTRPCMessage(
   }
   assertIsProcedureType(method);
   assertIsObject(params);
-  const { input: rawInput, path } = params;
+  const { input: rawInput, path, lastEventId } = params;
 
   assertIsString(path);
+  if (lastEventId !== undefined) {
+    assertIsString(lastEventId);
+  }
 
   const input = transformer.input.deserialize(rawInput);
 
@@ -80,6 +83,7 @@ export function parseTRPCMessage(
     params: {
       input,
       path,
+      lastEventId,
     },
   };
 }