@trpc/client 11.0.0-rc.474 → 11.0.0-rc.477

package/dist/bundle-analysis.json

@@ -1,20 +1,20 @@
 {
-  "bundleSize": 51847,
-  "bundleOrigSize": 69119,
-  "bundleReduction": 24.99,
+  "bundleSize": 52634,
+  "bundleOrigSize": 69964,
+  "bundleReduction": 24.77,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
-      "size": 13069,
-      "origSize": 14556,
+      "size": 13683,
+      "origSize": 15132,
       "renderedExports": [
         "createWSClient",
         "wsLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 25.21,
-      "reduction": 10.22
+      "percent": 26,
+      "reduction": 9.58
     },
     {
       "id": "/src/links/httpBatchStreamLink.ts",
@@ -25,7 +25,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.3,
+      "percent": 11.14,
       "reduction": 3.51
     },
     {
@@ -37,7 +37,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.53,
+      "percent": 10.37,
       "reduction": 18.48
     },
     {
@@ -61,7 +61,7 @@
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 8.61,
+      "percent": 8.48,
       "reduction": 32.82
     },
     {
@@ -76,7 +76,7 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 7.88,
+      "percent": 7.76,
       "reduction": 5.64
     },
     {
@@ -88,20 +88,20 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.57,
+      "percent": 7.46,
       "reduction": 4.69
     },
     {
       "id": "/src/links/httpSubscriptionLink.ts",
-      "size": 3632,
-      "origSize": 3952,
+      "size": 3805,
+      "origSize": 4221,
       "renderedExports": [
         "unstable_httpSubscriptionLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.01,
-      "reduction": 8.1
+      "percent": 7.23,
+      "reduction": 9.86
     },
     {
       "id": "/src/links/httpLink.ts",
@@ -112,7 +112,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.14,
+      "percent": 6.05,
       "reduction": 14.15
     },
     {
@@ -127,7 +127,7 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.17,
+      "percent": 4.11,
       "reduction": 47.6
     },
     {
@@ -147,7 +147,7 @@
         "/src/links/httpSubscriptionLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 3.74,
+      "percent": 3.69,
       "reduction": 45.43
     },
     {
@@ -164,7 +164,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.29,
+      "percent": 2.26,
       "reduction": 73.19
     },
     {
@@ -179,7 +179,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.33,
+      "percent": 1.31,
       "reduction": 32.75
     },
     {
@@ -191,7 +191,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.18,
+      "percent": 1.16,
       "reduction": 44.95
     },
     {
@@ -205,7 +205,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.09,
+      "percent": 1.07,
       "reduction": 66.75
     },
     {
@@ -220,7 +220,7 @@
         "/src/index.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.83,
+      "percent": 0.81,
       "reduction": 33.54
     },
     {
@@ -234,7 +234,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.64,
+      "percent": 0.63,
       "reduction": 15.17
     },
     {

package/dist/links/httpSubscriptionLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,0CAA0C,CAAC;AAMlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBxC,KAAK,2BAA2B,CAAC,KAAK,SAAS,cAAc,IAAI;IAC/D;;OAEG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;CACvD,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAC3B,8BAA8B,CAAC;AAEjC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EAEzC,IAAI,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAC/D,QAAQ,CAAC,WAAW,CAAC,CAgFvB"}
+{"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAMlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBxC,KAAK,2BAA2B,CAAC,KAAK,SAAS,cAAc,IAAI;IAC/D;;OAEG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;CACvD,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAC3B,8BAA8B,CAAC;AAEjC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EAEzC,IAAI,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAC/D,QAAQ,CAAC,WAAW,CAAC,CA2FvB"}

package/dist/links/httpSubscriptionLink.js

@@ -63,8 +63,12 @@ async function urlWithConnectionParams(opts) {
                         deserialize: transformer$1.output.deserialize
                     });
                     for await (const chunk of iterable){
-                        // if the `sse({})`-helper is used, we always have an `id` field
-                        const data = 'id' in chunk ? chunk : chunk.data;
+                        if (!chunk.ok) {
+                            continue;
+                        }
+                        const chunkData = chunk.data;
+                        // if the `tracked()`-helper is used, we always have an `id` field
+                        const data = 'id' in chunkData ? chunkData : chunkData.data;
                         observer.next({
                             result: {
                                 data

package/dist/links/httpSubscriptionLink.mjs

@@ -61,8 +61,12 @@ async function urlWithConnectionParams(opts) {
                         deserialize: transformer.output.deserialize
                     });
                     for await (const chunk of iterable){
-                        // if the `sse({})`-helper is used, we always have an `id` field
-                        const data = 'id' in chunk ? chunk : chunk.data;
+                        if (!chunk.ok) {
+                            continue;
+                        }
+                        const chunkData = chunk.data;
+                        // if the `tracked()`-helper is used, we always have an `id` field
+                        const data = 'id' in chunkData ? chunkData : chunkData.data;
                         observer.next({
                             result: {
                                 data

package/dist/links/wsLink.d.ts

@@ -45,7 +45,11 @@ export interface WebSocketClientOptions extends UrlOptionsWithConnectionParams {
 }
 export declare function createWSClient(opts: WebSocketClientOptions): {
     close: () => void;
-    request: (op: Operation, callbacks: WSCallbackObserver<AnyRouter, unknown>) => UnsubscribeFn;
+    request: (opts: {
+        op: Operation;
+        callbacks: WSCallbackObserver<AnyRouter, unknown>;
+        lastEventId: string | undefined;
+    }) => UnsubscribeFn;
     readonly connection: ({
         id: number;
     } & ({

package/dist/links/wsLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGvE,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAMhB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,QAAA,MAAM,kBAAkB,iBAAkB,MAAM,WACoB,CAAC;AAErE,MAAM,WAAW,sBAAuB,SAAQ,8BAA8B;IAC5E;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACzC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAOD,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBAuTpC,SAAS,wDAA0B,aAAa;;YAxQ/D,MAAM;;eAGC,MAAM;YACT,SAAS;;eAGN,QAAQ;YACX,SAAS;;eAGN,YAAY;aACd,SAAS;;IA2TlB;;OAEG;;EAGN;AACD,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AASlD;;GAEG;AACH,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAClC,QAAQ,CAAC,OAAO,CAAC,CA8CnB"}
+{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGvE,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAMhB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,QAAA,MAAM,kBAAkB,iBAAkB,MAAM,WACoB,CAAC;AAErE,MAAM,WAAW,sBAAuB,SAAQ,8BAA8B;IAC5E;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACzC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAOD,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;oBAsUlC;QACrB,EAAE,EAAE,SAAS,CAAC;QACd,SAAS,yCAAa;QACtB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC,KAAG,aAAa;;YAvRX,MAAM;;eAGC,MAAM;YACT,SAAS;;eAGN,QAAQ;YACX,SAAS;;eAGN,YAAY;aACd,SAAS;;IA8UlB;;OAEG;;EAGN;AACD,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AASlD;;GAEG;AACH,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAClC,QAAQ,CAAC,OAAO,CAAC,CA+CnB"}

package/dist/links/wsLink.js

@@ -99,7 +99,11 @@ function createWSClient(opts) {
         if (outgoing.some((r)=>r.id === req.op.id)) {
             return;
         }
-        request(req.op, req.callbacks);
+        request({
+            op: req.op,
+            callbacks: req.callbacks,
+            lastEventId: req.lastEventId
+        });
     }
     const startLazyDisconnectTimer = ()=>{
         if (!lazyOpts.enabled) {
@@ -189,6 +193,9 @@ function createWSClient(opts) {
                     req.connection = self;
                     oldConn && closeIfNoPending(oldConn);
                 }
+                if ('result' in data && data.result.type === 'data' && typeof data.result.id === 'string') {
+                    req.lastEventId = data.result.id;
+                }
                 if ('result' in data && data.result.type === 'stopped' && activeConnection === self) {
                     req.callbacks.complete();
                 }
@@ -241,21 +248,24 @@ function createWSClient(opts) {
         }).catch(onError);
         return self;
     }
-    function request(op, callbacks) {
+    function request(opts) {
+        const { op , callbacks , lastEventId  } = opts;
         const { type , input , path , id  } = op;
         const envelope = {
             id,
             method: type,
             params: {
                 input,
-                path
+                path,
+                lastEventId
             }
         };
         pendingRequests[id] = {
             connection: null,
             type,
             callbacks,
-            op
+            op,
+            lastEventId
         };
         // enqueue message
         outgoing.push(envelope);
@@ -318,35 +328,39 @@ class TRPCWebSocketClosedError extends Error {
                 const { type , path , id , context  } = op;
                 const input = transformer$1.input.serialize(op.input);
                 const unsub = client.request({
-                    type,
-                    path,
-                    input,
-                    id,
-                    context,
-                    signal: null
-                }, {
-                    error (err) {
-                        observer.error(err);
-                        unsub();
-                    },
-                    complete () {
-                        observer.complete();
+                    op: {
+                        type,
+                        path,
+                        input,
+                        id,
+                        context,
+                        signal: null
                     },
-                    next (message) {
-                        const transformed = unstableCoreDoNotImport.transformResult(message, transformer$1.output);
-                        if (!transformed.ok) {
-                            observer.error(TRPCClientError.TRPCClientError.from(transformed.error));
-                            return;
-                        }
-                        observer.next({
-                            result: transformed.result
-                        });
-                        if (op.type !== 'subscription') {
-                            // if it isn't a subscription we don't care about next response
+                    callbacks: {
+                        error (err) {
+                            observer.error(err);
                             unsub();
+                        },
+                        complete () {
                             observer.complete();
+                        },
+                        next (message) {
+                            const transformed = unstableCoreDoNotImport.transformResult(message, transformer$1.output);
+                            if (!transformed.ok) {
+                                observer.error(TRPCClientError.TRPCClientError.from(transformed.error));
+                                return;
+                            }
+                            observer.next({
+                                result: transformed.result
+                            });
+                            if (op.type !== 'subscription') {
+                                // if it isn't a subscription we don't care about next response
+                                unsub();
+                                observer.complete();
+                            }
                         }
-                    }
+                    },
+                    lastEventId: undefined
                 });
                 return ()=>{
                     unsub();

package/dist/links/wsLink.mjs

@@ -97,7 +97,11 @@ function createWSClient(opts) {
         if (outgoing.some((r)=>r.id === req.op.id)) {
             return;
         }
-        request(req.op, req.callbacks);
+        request({
+            op: req.op,
+            callbacks: req.callbacks,
+            lastEventId: req.lastEventId
+        });
     }
     const startLazyDisconnectTimer = ()=>{
         if (!lazyOpts.enabled) {
@@ -187,6 +191,9 @@ function createWSClient(opts) {
                     req.connection = self;
                     oldConn && closeIfNoPending(oldConn);
                 }
+                if ('result' in data && data.result.type === 'data' && typeof data.result.id === 'string') {
+                    req.lastEventId = data.result.id;
+                }
                 if ('result' in data && data.result.type === 'stopped' && activeConnection === self) {
                     req.callbacks.complete();
                 }
@@ -239,21 +246,24 @@ function createWSClient(opts) {
         }).catch(onError);
         return self;
     }
-    function request(op, callbacks) {
+    function request(opts) {
+        const { op , callbacks , lastEventId  } = opts;
         const { type , input , path , id  } = op;
         const envelope = {
             id,
             method: type,
             params: {
                 input,
-                path
+                path,
+                lastEventId
             }
         };
         pendingRequests[id] = {
             connection: null,
             type,
             callbacks,
-            op
+            op,
+            lastEventId
         };
         // enqueue message
         outgoing.push(envelope);
@@ -316,35 +326,39 @@ class TRPCWebSocketClosedError extends Error {
                 const { type , path , id , context  } = op;
                 const input = transformer.input.serialize(op.input);
                 const unsub = client.request({
-                    type,
-                    path,
-                    input,
-                    id,
-                    context,
-                    signal: null
-                }, {
-                    error (err) {
-                        observer.error(err);
-                        unsub();
-                    },
-                    complete () {
-                        observer.complete();
+                    op: {
+                        type,
+                        path,
+                        input,
+                        id,
+                        context,
+                        signal: null
                     },
-                    next (message) {
-                        const transformed = transformResult(message, transformer.output);
-                        if (!transformed.ok) {
-                            observer.error(TRPCClientError.from(transformed.error));
-                            return;
-                        }
-                        observer.next({
-                            result: transformed.result
-                        });
-                        if (op.type !== 'subscription') {
-                            // if it isn't a subscription we don't care about next response
+                    callbacks: {
+                        error (err) {
+                            observer.error(err);
                             unsub();
+                        },
+                        complete () {
                             observer.complete();
+                        },
+                        next (message) {
+                            const transformed = transformResult(message, transformer.output);
+                            if (!transformed.ok) {
+                                observer.error(TRPCClientError.from(transformed.error));
+                                return;
+                            }
+                            observer.next({
+                                result: transformed.result
+                            });
+                            if (op.type !== 'subscription') {
+                                // if it isn't a subscription we don't care about next response
+                                unsub();
+                                observer.complete();
+                            }
                         }
-                    }
+                    },
+                    lastEventId: undefined
                 });
                 return ()=>{
                     unsub();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.474+42b880437",
+  "version": "11.0.0-rc.477+a467f8314",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.474+42b880437"
+    "@trpc/server": "11.0.0-rc.477+a467f8314"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.474+42b880437",
+    "@trpc/server": "11.0.0-rc.477+a467f8314",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.57.0",
@@ -96,5 +96,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "42b880437961af45a4e59ff33267acbaedc46cec"
+  "gitHead": "a467f831416d19c0bf96139fd4ca576fcf80de2a"
 }

package/src/links/httpSubscriptionLink.ts

@@ -3,7 +3,6 @@ import type {
   AnyClientTypes,
   inferClientTypes,
   InferrableClientTypes,
-  SSEMessage,
 } from '@trpc/server/unstable-core-do-not-import';
 import {
   run,
@@ -96,14 +95,25 @@ export function unstable_httpSubscriptionLink<
           };
           // console.log('starting', new Date());
           eventSource.addEventListener('open', onStarted);
-          const iterable = sseStreamConsumer<Partial<SSEMessage>>({
+          const iterable = sseStreamConsumer<
+            Partial<{
+              id?: string;
+              data: unknown;
+            }>
+          >({
             from: eventSource,
             deserialize: transformer.output.deserialize,
           });
 
           for await (const chunk of iterable) {
-            // if the `sse({})`-helper is used, we always have an `id` field
-            const data = 'id' in chunk ? chunk : chunk.data;
+            if (!chunk.ok) {
+              // TODO: handle in https://github.com/trpc/trpc/issues/5871
+              continue;
+            }
+            const chunkData = chunk.data;
+
+            // if the `tracked()`-helper is used, we always have an `id` field
+            const data = 'id' in chunkData ? chunkData : chunkData.data;
             observer.next({
               result: {
                 data,

package/src/links/wsLink.ts

@@ -103,7 +103,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
    * pending outgoing requests that are awaiting callback
    */
   type TCallbacks = WSCallbackObserver<AnyRouter, unknown>;
-  type TRequest = {
+  type WsRequest = {
     /**
      * Reference to the WebSocket instance this request was made to
      */
@@ -111,8 +111,12 @@ export function createWSClient(opts: WebSocketClientOptions) {
     type: ProcedureType;
     callbacks: TCallbacks;
     op: Operation;
+    /**
+     * The last event id that the client has received
+     */
+    lastEventId: string | undefined;
   };
-  const pendingRequests: Record<number | string, TRequest> =
+  const pendingRequests: Record<number | string, WsRequest> =
     Object.create(null);
   let connectAttempt = 0;
   let connectTimer: ReturnType<typeof setTimeout> | undefined = undefined;
@@ -210,11 +214,15 @@ export function createWSClient(opts: WebSocketClientOptions) {
       conn.ws?.close();
     }
   }
-  function resumeSubscriptionOnReconnect(req: TRequest) {
+  function resumeSubscriptionOnReconnect(req: WsRequest) {
     if (outgoing.some((r) => r.id === req.op.id)) {
       return;
     }
-    request(req.op, req.callbacks);
+    request({
+      op: req.op,
+      callbacks: req.callbacks,
+      lastEventId: req.lastEventId,
+    });
   }
 
   const startLazyDisconnectTimer = () => {
@@ -323,6 +331,13 @@ export function createWSClient(opts: WebSocketClientOptions) {
           oldConn && closeIfNoPending(oldConn);
         }
 
+        if (
+          'result' in data &&
+          data.result.type === 'data' &&
+          typeof data.result.id === 'string'
+        ) {
+          req.lastEventId = data.result.id;
+        }
         if (
           'result' in data &&
           data.result.type === 'stopped' &&
@@ -388,7 +403,12 @@ export function createWSClient(opts: WebSocketClientOptions) {
     return self;
   }
 
-  function request(op: Operation, callbacks: TCallbacks): UnsubscribeFn {
+  function request(opts: {
+    op: Operation;
+    callbacks: TCallbacks;
+    lastEventId: string | undefined;
+  }): UnsubscribeFn {
+    const { op, callbacks, lastEventId } = opts;
     const { type, input, path, id } = op;
     const envelope: TRPCRequestMessage = {
       id,
@@ -396,13 +416,16 @@ export function createWSClient(opts: WebSocketClientOptions) {
       params: {
         input,
         path,
+        lastEventId,
       },
     };
+
     pendingRequests[id] = {
       connection: null,
       type,
       callbacks,
       op,
+      lastEventId,
     };
 
     // enqueue message
@@ -485,9 +508,9 @@ export function wsLink<TRouter extends AnyRouter>(
 
         const input = transformer.input.serialize(op.input);
 
-        const unsub = client.request(
-          { type, path, input, id, context, signal: null },
-          {
+        const unsub = client.request({
+          op: { type, path, input, id, context, signal: null },
+          callbacks: {
             error(err) {
               observer.error(err as TRPCClientError<any>);
               unsub();
@@ -514,7 +537,8 @@ export function wsLink<TRouter extends AnyRouter>(
               }
             },
           },
-        );
+          lastEventId: undefined,
+        });
         return () => {
           unsub();
         };