@trpc/client 11.0.0-rc.592 → 11.0.0-rc.599

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 (49) hide show
  1. package/dist/TRPCClientError.d.ts +1 -1
  2. package/dist/TRPCClientError.d.ts.map +1 -1
  3. package/dist/bundle-analysis.json +61 -49
  4. package/dist/index.js +2 -0
  5. package/dist/index.mjs +1 -0
  6. package/dist/internals/TRPCUntypedClient.d.ts +3 -3
  7. package/dist/internals/TRPCUntypedClient.d.ts.map +1 -1
  8. package/dist/internals/TRPCUntypedClient.js +24 -8
  9. package/dist/internals/TRPCUntypedClient.mjs +24 -8
  10. package/dist/links/httpSubscriptionLink.d.ts +10 -9
  11. package/dist/links/httpSubscriptionLink.d.ts.map +1 -1
  12. package/dist/links/httpSubscriptionLink.js +64 -2
  13. package/dist/links/httpSubscriptionLink.mjs +65 -3
  14. package/dist/links/internals/retryLink.d.ts +26 -6
  15. package/dist/links/internals/retryLink.d.ts.map +1 -1
  16. package/dist/links/internals/retryLink.js +43 -0
  17. package/dist/links/internals/retryLink.mjs +41 -0
  18. package/dist/links/internals/subscriptions.d.ts +20 -0
  19. package/dist/links/internals/subscriptions.d.ts.map +1 -0
  20. package/dist/links/internals/urlWithConnectionParams.d.ts +2 -1
  21. package/dist/links/internals/urlWithConnectionParams.d.ts.map +1 -1
  22. package/dist/links/internals/urlWithConnectionParams.js +3 -2
  23. package/dist/links/internals/urlWithConnectionParams.mjs +3 -2
  24. package/dist/links/loggerLink.d.ts +4 -4
  25. package/dist/links/loggerLink.d.ts.map +1 -1
  26. package/dist/links/loggerLink.js +1 -1
  27. package/dist/links/loggerLink.mjs +1 -1
  28. package/dist/links/types.d.ts +5 -4
  29. package/dist/links/types.d.ts.map +1 -1
  30. package/dist/links/wsLink.d.ts +24 -1
  31. package/dist/links/wsLink.d.ts.map +1 -1
  32. package/dist/links/wsLink.js +125 -54
  33. package/dist/links/wsLink.mjs +126 -55
  34. package/dist/links.d.ts +1 -0
  35. package/dist/links.d.ts.map +1 -1
  36. package/dist/unstable-internals.d.ts +1 -0
  37. package/dist/unstable-internals.d.ts.map +1 -1
  38. package/package.json +4 -4
  39. package/src/TRPCClientError.ts +1 -1
  40. package/src/internals/TRPCUntypedClient.ts +23 -10
  41. package/src/links/httpSubscriptionLink.ts +94 -20
  42. package/src/links/internals/retryLink.ts +42 -24
  43. package/src/links/internals/subscriptions.ts +26 -0
  44. package/src/links/internals/urlWithConnectionParams.ts +8 -2
  45. package/src/links/loggerLink.ts +16 -6
  46. package/src/links/types.ts +12 -4
  47. package/src/links/wsLink.ts +163 -56
  48. package/src/links.ts +1 -1
  49. package/src/unstable-internals.ts +1 -0
@@ -21,7 +21,7 @@ export declare class TRPCClientError<TRouterOrProcedure extends InferrableClient
21
21
  cause?: Error;
22
22
  meta?: Record<string, unknown>;
23
23
  });
24
- static from<TRouterOrProcedure extends InferrableClientTypes>(_cause: Error | TRPCErrorResponse<any>, opts?: {
24
+ static from<TRouterOrProcedure extends InferrableClientTypes>(_cause: Error | TRPCErrorResponse<any> | object, opts?: {
25
25
  meta?: Record<string, unknown>;
26
26
  }): TRPCClientError<TRouterOrProcedure>;
27
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,KAAK,eAAe,CAAC,WAAW,SAAS,qBAAqB,IAC5D,gBAAgB,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;AAC9C,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,qBAAqB,IACvE,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAgCpD,qBAAa,eAAe,CAAC,kBAAkB,SAAS,qBAAqB,CAC3E,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAInE,SAAyB,KAAK,oBAAC;IAC/B,SAAgB,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,SAAgB,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,kBAAkB,SAAS,qBAAqB,EACjE,MAAM,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACtC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CA2BvC"}
1
+ {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,KAAK,eAAe,CAAC,WAAW,SAAS,qBAAqB,IAC5D,gBAAgB,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;AAC9C,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,qBAAqB,IACvE,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAgCpD,qBAAa,eAAe,CAAC,kBAAkB,SAAS,qBAAqB,CAC3E,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAInE,SAAyB,KAAK,oBAAC;IAC/B,SAAgB,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,SAAgB,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,kBAAkB,SAAS,qBAAqB,EACjE,MAAM,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,MAAM,EAC/C,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CA2BvC"}
@@ -1,20 +1,32 @@
1
1
  {
2
- "bundleSize": 54780,
3
- "bundleOrigSize": 72948,
4
- "bundleReduction": 24.91,
2
+ "bundleSize": 62359,
3
+ "bundleOrigSize": 80871,
4
+ "bundleReduction": 22.89,
5
5
  "modules": [
6
6
  {
7
7
  "id": "/src/links/wsLink.ts",
8
- "size": 15278,
9
- "origSize": 17001,
8
+ "size": 17975,
9
+ "origSize": 20048,
10
10
  "renderedExports": [
11
11
  "createWSClient",
12
12
  "wsLink"
13
13
  ],
14
14
  "removedExports": [],
15
15
  "dependents": [],
16
- "percent": 27.89,
17
- "reduction": 10.13
16
+ "percent": 28.83,
17
+ "reduction": 10.34
18
+ },
19
+ {
20
+ "id": "/src/links/httpSubscriptionLink.ts",
21
+ "size": 6723,
22
+ "origSize": 6686,
23
+ "renderedExports": [
24
+ "unstable_httpSubscriptionLink"
25
+ ],
26
+ "removedExports": [],
27
+ "dependents": [],
28
+ "percent": 10.78,
29
+ "reduction": 0
18
30
  },
19
31
  {
20
32
  "id": "/src/links/httpBatchStreamLink.ts",
@@ -25,20 +37,20 @@
25
37
  ],
26
38
  "removedExports": [],
27
39
  "dependents": [],
28
- "percent": 10.97,
40
+ "percent": 9.63,
29
41
  "reduction": 4.41
30
42
  },
31
43
  {
32
44
  "id": "/src/links/loggerLink.ts",
33
- "size": 5456,
34
- "origSize": 6693,
45
+ "size": 5485,
46
+ "origSize": 6916,
35
47
  "renderedExports": [
36
48
  "loggerLink"
37
49
  ],
38
50
  "removedExports": [],
39
51
  "dependents": [],
40
- "percent": 9.96,
41
- "reduction": 18.48
52
+ "percent": 8.8,
53
+ "reduction": 20.69
42
54
  },
43
55
  {
44
56
  "id": "/src/internals/dataLoader.ts",
@@ -52,7 +64,7 @@
52
64
  "/src/links/httpBatchLink.ts",
53
65
  "/src/links/httpBatchStreamLink.ts"
54
66
  ],
55
- "percent": 7.46,
67
+ "percent": 6.55,
56
68
  "reduction": 5.64
57
69
  },
58
70
  {
@@ -64,21 +76,9 @@
64
76
  ],
65
77
  "removedExports": [],
66
78
  "dependents": [],
67
- "percent": 7.19,
79
+ "percent": 6.32,
68
80
  "reduction": 5.56
69
81
  },
70
- {
71
- "id": "/src/links/httpSubscriptionLink.ts",
72
- "size": 3776,
73
- "origSize": 4507,
74
- "renderedExports": [
75
- "unstable_httpSubscriptionLink"
76
- ],
77
- "removedExports": [],
78
- "dependents": [],
79
- "percent": 6.89,
80
- "reduction": 16.22
81
- },
82
82
  {
83
83
  "id": "/src/links/internals/httpUtils.ts",
84
84
  "size": 3693,
@@ -99,7 +99,7 @@
99
99
  "/src/links/httpBatchStreamLink.ts",
100
100
  "/src/links/httpSubscriptionLink.ts"
101
101
  ],
102
- "percent": 6.74,
102
+ "percent": 5.92,
103
103
  "reduction": 37.12
104
104
  },
105
105
  {
@@ -111,13 +111,13 @@
111
111
  ],
112
112
  "removedExports": [],
113
113
  "dependents": [],
114
- "percent": 5.81,
114
+ "percent": 5.1,
115
115
  "reduction": 14.14
116
116
  },
117
117
  {
118
118
  "id": "/src/internals/TRPCUntypedClient.ts",
119
- "size": 2169,
120
- "origSize": 4235,
119
+ "size": 2707,
120
+ "origSize": 4579,
121
121
  "renderedExports": [
122
122
  "TRPCUntypedClient"
123
123
  ],
@@ -126,13 +126,13 @@
126
126
  "/src/createTRPCUntypedClient.ts",
127
127
  "/src/createTRPCClient.ts"
128
128
  ],
129
- "percent": 3.96,
130
- "reduction": 48.78
129
+ "percent": 4.34,
130
+ "reduction": 40.88
131
131
  },
132
132
  {
133
133
  "id": "/src/TRPCClientError.ts",
134
134
  "size": 1940,
135
- "origSize": 3555,
135
+ "origSize": 3564,
136
136
  "renderedExports": [
137
137
  "TRPCClientError"
138
138
  ],
@@ -146,8 +146,20 @@
146
146
  "/src/links/httpSubscriptionLink.ts",
147
147
  "/src/internals/TRPCUntypedClient.ts"
148
148
  ],
149
- "percent": 3.54,
150
- "reduction": 45.43
149
+ "percent": 3.11,
150
+ "reduction": 45.57
151
+ },
152
+ {
153
+ "id": "/src/links/internals/retryLink.ts",
154
+ "size": 1286,
155
+ "origSize": 1920,
156
+ "renderedExports": [
157
+ "retryLink"
158
+ ],
159
+ "removedExports": [],
160
+ "dependents": [],
161
+ "percent": 2.06,
162
+ "reduction": 33.02
151
163
  },
152
164
  {
153
165
  "id": "/src/internals/signals.ts",
@@ -163,7 +175,7 @@
163
175
  "/src/links/httpBatchStreamLink.ts",
164
176
  "/src/links/httpSubscriptionLink.ts"
165
177
  ],
166
- "percent": 2.17,
178
+ "percent": 1.91,
167
179
  "reduction": 3.88
168
180
  },
169
181
  {
@@ -180,7 +192,7 @@
180
192
  "dependents": [
181
193
  "/src/index.ts"
182
194
  ],
183
- "percent": 2.17,
195
+ "percent": 1.9,
184
196
  "reduction": 73.19
185
197
  },
186
198
  {
@@ -195,7 +207,7 @@
195
207
  "/src/links/splitLink.ts",
196
208
  "/src/internals/TRPCUntypedClient.ts"
197
209
  ],
198
- "percent": 1.26,
210
+ "percent": 1.11,
199
211
  "reduction": 32.75
200
212
  },
201
213
  {
@@ -207,7 +219,7 @@
207
219
  ],
208
220
  "removedExports": [],
209
221
  "dependents": [],
210
- "percent": 1.11,
222
+ "percent": 0.98,
211
223
  "reduction": 44.95
212
224
  },
213
225
  {
@@ -221,7 +233,7 @@
221
233
  "dependents": [
222
234
  "/src/unstable-internals.ts"
223
235
  ],
224
- "percent": 1.03,
236
+ "percent": 0.91,
225
237
  "reduction": 66.71
226
238
  },
227
239
  {
@@ -236,7 +248,7 @@
236
248
  "/src/index.ts",
237
249
  "/src/links/internals/httpUtils.ts"
238
250
  ],
239
- "percent": 0.78,
251
+ "percent": 0.69,
240
252
  "reduction": 33.54
241
253
  },
242
254
  {
@@ -250,13 +262,13 @@
250
262
  ],
251
263
  "removedExports": [],
252
264
  "dependents": [],
253
- "percent": 0.6,
265
+ "percent": 0.53,
254
266
  "reduction": 15.17
255
267
  },
256
268
  {
257
269
  "id": "/src/links/internals/urlWithConnectionParams.ts",
258
- "size": 158,
259
- "origSize": 864,
270
+ "size": 240,
271
+ "origSize": 1016,
260
272
  "renderedExports": [
261
273
  "resultOf"
262
274
  ],
@@ -265,8 +277,8 @@
265
277
  "/src/links/wsLink.ts",
266
278
  "/src/links/httpSubscriptionLink.ts"
267
279
  ],
268
- "percent": 0.29,
269
- "reduction": 81.71
280
+ "percent": 0.38,
281
+ "reduction": 76.38
270
282
  },
271
283
  {
272
284
  "id": "/src/createTRPCUntypedClient.ts",
@@ -279,7 +291,7 @@
279
291
  "dependents": [
280
292
  "/src/index.ts"
281
293
  ],
282
- "percent": 0.18,
294
+ "percent": 0.16,
283
295
  "reduction": 82.58
284
296
  },
285
297
  {
@@ -295,7 +307,7 @@
295
307
  {
296
308
  "id": "/src/unstable-internals.ts",
297
309
  "size": 0,
298
- "origSize": 41,
310
+ "origSize": 90,
299
311
  "renderedExports": [],
300
312
  "removedExports": [],
301
313
  "dependents": [
@@ -307,5 +319,5 @@
307
319
  "reduction": 100
308
320
  }
309
321
  ],
310
- "moduleCount": 21
322
+ "moduleCount": 22
311
323
  }
package/dist/index.js CHANGED
@@ -12,6 +12,7 @@ var loggerLink = require('./links/loggerLink.js');
12
12
  var splitLink = require('./links/splitLink.js');
13
13
  var wsLink = require('./links/wsLink.js');
14
14
  var httpSubscriptionLink = require('./links/httpSubscriptionLink.js');
15
+ var retryLink = require('./links/internals/retryLink.js');
15
16
  var TRPCUntypedClient = require('./internals/TRPCUntypedClient.js');
16
17
 
17
18
 
@@ -35,4 +36,5 @@ exports.splitLink = splitLink.splitLink;
35
36
  exports.createWSClient = wsLink.createWSClient;
36
37
  exports.wsLink = wsLink.wsLink;
37
38
  exports.unstable_httpSubscriptionLink = httpSubscriptionLink.unstable_httpSubscriptionLink;
39
+ exports.retryLink = retryLink.retryLink;
38
40
  exports.TRPCUntypedClient = TRPCUntypedClient.TRPCUntypedClient;
package/dist/index.mjs CHANGED
@@ -10,4 +10,5 @@ export { loggerLink } from './links/loggerLink.mjs';
10
10
  export { splitLink } from './links/splitLink.mjs';
11
11
  export { createWSClient, wsLink } from './links/wsLink.mjs';
12
12
  export { unstable_httpSubscriptionLink } from './links/httpSubscriptionLink.mjs';
13
+ export { retryLink } from './links/internals/retryLink.mjs';
13
14
  export { TRPCUntypedClient } from './internals/TRPCUntypedClient.mjs';
@@ -1,5 +1,6 @@
1
1
  import type { Unsubscribable } from '@trpc/server/observable';
2
- import type { AnyRouter, InferrableClientTypes, TypeError } from '@trpc/server/unstable-core-do-not-import';
2
+ import type { AnyRouter, inferAsyncIterableYield, InferrableClientTypes, TypeError } from '@trpc/server/unstable-core-do-not-import';
3
+ import type { TRPCConnectionState } from '../links/internals/subscriptions';
3
4
  import type { OperationContext, TRPCClientRuntime, TRPCLink } from '../links/types';
4
5
  import { TRPCClientError } from '../TRPCClientError';
5
6
  export interface TRPCRequestOptions {
@@ -9,7 +10,6 @@ export interface TRPCRequestOptions {
9
10
  context?: OperationContext;
10
11
  signal?: AbortSignal;
11
12
  }
12
- type inferAsyncIterableYield<T> = T extends AsyncIterable<infer U> ? U : T;
13
13
  export interface TRPCSubscriptionObserver<TValue, TError> {
14
14
  onStarted: (opts: {
15
15
  context: OperationContext | undefined;
@@ -18,6 +18,7 @@ export interface TRPCSubscriptionObserver<TValue, TError> {
18
18
  onError: (err: TError) => void;
19
19
  onStopped: () => void;
20
20
  onComplete: () => void;
21
+ onConnectionStateChange: (state: TRPCConnectionState<TError>) => void;
21
22
  }
22
23
  /** @internal */
23
24
  export type CreateTRPCClientOptions<TRouter extends InferrableClientTypes> = {
@@ -37,5 +38,4 @@ export declare class TRPCUntypedClient<TRouter extends AnyRouter> {
37
38
  mutation(path: string, input?: unknown, opts?: TRPCRequestOptions): Promise<unknown>;
38
39
  subscription(path: string, input: unknown, opts: Partial<TRPCSubscriptionObserver<unknown, TRPCClientError<AnyRouter>>> & TRPCRequestOptions): Unsubscribable;
39
40
  }
40
- export {};
41
41
  //# sourceMappingURL=TRPCUntypedClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EAErB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,KAAK,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE3E,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,uBAAuB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACzD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;YAkBF,gBAAgB;IAkBvB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CA4BlB"}
1
+ {"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,uBAAuB,EACvB,qBAAqB,EAErB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,uBAAuB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACzD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,uBAAuB,EAAE,CAAC,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;CACvE;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;YAkBF,gBAAgB;IAkBvB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CAwClB"}
@@ -54,14 +54,30 @@ class TRPCUntypedClient {
54
54
  });
55
55
  return observable$.subscribe({
56
56
  next (envelope) {
57
- if (envelope.result.type === 'started') {
58
- opts.onStarted?.({
59
- context: envelope.context
60
- });
61
- } else if (envelope.result.type === 'stopped') {
62
- opts.onStopped?.();
63
- } else {
64
- opts.onData?.(envelope.result.data);
57
+ switch(envelope.result.type){
58
+ case 'state':
59
+ {
60
+ opts.onConnectionStateChange?.(envelope.result);
61
+ break;
62
+ }
63
+ case 'started':
64
+ {
65
+ opts.onStarted?.({
66
+ context: envelope.context
67
+ });
68
+ break;
69
+ }
70
+ case 'stopped':
71
+ {
72
+ opts.onStopped?.();
73
+ break;
74
+ }
75
+ case 'data':
76
+ case undefined:
77
+ {
78
+ opts.onData?.(envelope.result.data);
79
+ break;
80
+ }
65
81
  }
66
82
  },
67
83
  error (err) {
@@ -52,14 +52,30 @@ class TRPCUntypedClient {
52
52
  });
53
53
  return observable$.subscribe({
54
54
  next (envelope) {
55
- if (envelope.result.type === 'started') {
56
- opts.onStarted?.({
57
- context: envelope.context
58
- });
59
- } else if (envelope.result.type === 'stopped') {
60
- opts.onStopped?.();
61
- } else {
62
- opts.onData?.(envelope.result.data);
55
+ switch(envelope.result.type){
56
+ case 'state':
57
+ {
58
+ opts.onConnectionStateChange?.(envelope.result);
59
+ break;
60
+ }
61
+ case 'started':
62
+ {
63
+ opts.onStarted?.({
64
+ context: envelope.context
65
+ });
66
+ break;
67
+ }
68
+ case 'stopped':
69
+ {
70
+ opts.onStopped?.();
71
+ break;
72
+ }
73
+ case 'data':
74
+ case undefined:
75
+ {
76
+ opts.onData?.(envelope.result.data);
77
+ break;
78
+ }
63
79
  }
64
80
  },
65
81
  error (err) {
@@ -1,21 +1,22 @@
1
- import type { AnyClientTypes, inferClientTypes, InferrableClientTypes, SSEStreamConsumerOptions } from '@trpc/server/unstable-core-do-not-import';
1
+ import type { AnyClientTypes, EventSourceLike, inferClientTypes, InferrableClientTypes } from '@trpc/server/unstable-core-do-not-import';
2
2
  import { type TransformerOptions } from '../unstable-internals';
3
- import type { CallbackOrValue } from './internals/urlWithConnectionParams';
4
3
  import { type UrlOptionsWithConnectionParams } from './internals/urlWithConnectionParams';
5
- import type { TRPCLink } from './types';
6
- type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes> = {
4
+ import type { Operation, TRPCLink } from './types';
5
+ type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes, TEventSource extends EventSourceLike.AnyConstructor = typeof EventSource> = {
7
6
  /**
8
- * EventSource options or a callback that returns them
7
+ * EventSource ponyfill
9
8
  */
10
- eventSourceOptions?: CallbackOrValue<EventSourceInit>;
9
+ EventSource?: TEventSource;
11
10
  /**
12
- * @see https://trpc.io/docs/client/links/httpSubscriptionLink#updatingConfig
11
+ * EventSource options or a callback that returns them
13
12
  */
14
- experimental_shouldRecreateOnError?: SSEStreamConsumerOptions['shouldRecreateOnError'];
13
+ eventSourceOptions?: EventSourceLike.InitDictOf<TEventSource> | ((opts: {
14
+ op: Operation;
15
+ }) => EventSourceLike.InitDictOf<TEventSource> | Promise<EventSourceLike.InitDictOf<TEventSource>>);
15
16
  } & TransformerOptions<TRoot> & UrlOptionsWithConnectionParams;
16
17
  /**
17
18
  * @see https://trpc.io/docs/client/links/httpSubscriptionLink
18
19
  */
19
- export declare function unstable_httpSubscriptionLink<TInferrable extends InferrableClientTypes>(opts: HTTPSubscriptionLinkOptions<inferClientTypes<TInferrable>>): TRPCLink<TInferrable>;
20
+ export declare function unstable_httpSubscriptionLink<TInferrable extends InferrableClientTypes, TEventSource extends EventSourceLike.AnyConstructor>(opts: HTTPSubscriptionLinkOptions<inferClientTypes<TInferrable>, TEventSource>): TRPCLink<TInferrable>;
20
21
  export {};
21
22
  //# sourceMappingURL=httpSubscriptionLink.d.ts.map
@@ -1 +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,EACrB,wBAAwB,EACzB,MAAM,0CAA0C,CAAC;AAOlD,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;IACtD;;OAEG;IACH,kCAAkC,CAAC,EAAE,wBAAwB,CAAC,uBAAuB,CAAC,CAAC;CACxF,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,CA6FvB"}
1
+ {"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAQlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBnD,KAAK,2BAA2B,CAC9B,KAAK,SAAS,cAAc,EAC5B,YAAY,SAAS,eAAe,CAAC,cAAc,GAAG,OAAO,WAAW,IACtE;IACF;;OAEG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B;;OAEG;IACH,kBAAkB,CAAC,EACf,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,GACxC,CAAC,CAAC,IAAI,EAAE;QACN,EAAE,EAAE,SAAS,CAAC;KACf,KACG,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,GACxC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAC5D,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAC3B,8BAA8B,CAAC;AAajC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EACzC,YAAY,SAAS,eAAe,CAAC,cAAc,EAEnD,IAAI,EAAE,2BAA2B,CAC/B,gBAAgB,CAAC,WAAW,CAAC,EAC7B,YAAY,CACb,GACA,QAAQ,CAAC,WAAW,CAAC,CA6IvB"}
@@ -1,6 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var observable = require('@trpc/server/observable');
4
+ var rpc = require('@trpc/server/rpc');
4
5
  var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
5
6
  var signals = require('../internals/signals.js');
6
7
  var TRPCClientError = require('../TRPCClientError.js');
@@ -17,6 +18,15 @@ async function urlWithConnectionParams(opts) {
17
18
  }
18
19
  return url;
19
20
  }
21
+ /**
22
+ * tRPC error codes that are considered retryable
23
+ * With out of the box SSE, the client will reconnect when these errors are encountered
24
+ */ const codes5xx = [
25
+ rpc.TRPC_ERROR_CODES_BY_KEY.BAD_GATEWAY,
26
+ rpc.TRPC_ERROR_CODES_BY_KEY.SERVICE_UNAVAILABLE,
27
+ rpc.TRPC_ERROR_CODES_BY_KEY.GATEWAY_TIMEOUT,
28
+ rpc.TRPC_ERROR_CODES_BY_KEY.INTERNAL_SERVER_ERROR
29
+ ];
20
30
  /**
21
31
  * @see https://trpc.io/docs/client/links/httpSubscriptionLink
22
32
  */ function unstable_httpSubscriptionLink(opts) {
@@ -39,10 +49,24 @@ async function urlWithConnectionParams(opts) {
39
49
  type,
40
50
  signal: null
41
51
  }),
42
- init: ()=>urlWithConnectionParams$1.resultOf(opts.eventSourceOptions),
52
+ init: ()=>urlWithConnectionParams$1.resultOf(opts.eventSourceOptions, {
53
+ op
54
+ }),
43
55
  signal,
44
56
  deserialize: transformer$1.output.deserialize,
45
- shouldRecreateOnError: opts.experimental_shouldRecreateOnError
57
+ EventSource: opts.EventSource ?? globalThis.EventSource
58
+ });
59
+ const connectionState = observable.behaviorSubject({
60
+ type: 'state',
61
+ state: 'connecting',
62
+ error: null
63
+ });
64
+ const connectionSub = connectionState.subscribe({
65
+ next (state) {
66
+ observer.next({
67
+ result: state
68
+ });
69
+ }
46
70
  });
47
71
  unstableCoreDoNotImport.run(async ()=>{
48
72
  for await (const chunk of eventSourceStream){
@@ -70,6 +94,43 @@ async function urlWithConnectionParams(opts) {
70
94
  eventSource: chunk.eventSource
71
95
  }
72
96
  });
97
+ connectionState.next({
98
+ type: 'state',
99
+ state: 'pending',
100
+ error: null
101
+ });
102
+ break;
103
+ }
104
+ case 'serialized-error':
105
+ {
106
+ const error = TRPCClientError.TRPCClientError.from({
107
+ error: chunk.error
108
+ });
109
+ if (codes5xx.includes(chunk.error.code)) {
110
+ //
111
+ connectionState.next({
112
+ type: 'state',
113
+ state: 'connecting',
114
+ error
115
+ });
116
+ break;
117
+ }
118
+ //
119
+ // non-retryable error, cancel the subscription
120
+ throw error;
121
+ }
122
+ case 'connecting':
123
+ {
124
+ const lastState = connectionState.get();
125
+ const error1 = chunk.event && TRPCClientError.TRPCClientError.from(chunk.event);
126
+ if (!error1 && lastState.state === 'connecting') {
127
+ break;
128
+ }
129
+ connectionState.next({
130
+ type: 'state',
131
+ state: 'connecting',
132
+ error: error1
133
+ });
73
134
  break;
74
135
  }
75
136
  }
@@ -86,6 +147,7 @@ async function urlWithConnectionParams(opts) {
86
147
  return ()=>{
87
148
  observer.complete();
88
149
  ac.abort();
150
+ connectionSub.unsubscribe();
89
151
  };
90
152
  });
91
153
  };