@trpc/client 10.0.0-alpha.42 → 10.0.0-alpha.43

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 (58) hide show
  1. package/dist/TRPCClientError.d.ts +1 -1
  2. package/dist/TRPCClientError.d.ts.map +1 -1
  3. package/dist/createTRPCClient.d.ts +1 -1
  4. package/dist/createTRPCClient.d.ts.map +1 -1
  5. package/dist/createTRPCClientProxy.d.ts +9 -3
  6. package/dist/createTRPCClientProxy.d.ts.map +1 -1
  7. package/dist/index.js +33 -97
  8. package/dist/index.mjs +30 -94
  9. package/dist/internals/TRPCClient.d.ts +19 -3
  10. package/dist/internals/TRPCClient.d.ts.map +1 -1
  11. package/dist/links/httpBatchLink.d.ts.map +1 -1
  12. package/dist/links/httpBatchLink.js +18 -1
  13. package/dist/links/httpBatchLink.mjs +18 -1
  14. package/dist/links/httpLink.d.ts.map +1 -1
  15. package/dist/links/httpLink.js +21 -2
  16. package/dist/links/httpLink.mjs +21 -2
  17. package/dist/links/internals/httpUtils.d.ts +4 -3
  18. package/dist/links/internals/httpUtils.d.ts.map +1 -1
  19. package/dist/links/internals/transformResult.d.ts +28 -0
  20. package/dist/links/internals/transformResult.d.ts.map +1 -0
  21. package/dist/links/loggerLink.d.ts +3 -3
  22. package/dist/links/loggerLink.d.ts.map +1 -1
  23. package/dist/links/loggerLink.js +1 -1
  24. package/dist/links/loggerLink.mjs +1 -1
  25. package/dist/links/types.d.ts +6 -8
  26. package/dist/links/types.d.ts.map +1 -1
  27. package/dist/links/wsLink.d.ts +9 -4
  28. package/dist/links/wsLink.d.ts.map +1 -1
  29. package/dist/links/wsLink.js +400 -12
  30. package/dist/links/wsLink.mjs +391 -10
  31. package/dist/transformResult-06bec648.mjs +108 -0
  32. package/dist/transformResult-3ccc74ea.js +122 -0
  33. package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.dev.js +4 -4
  34. package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.prod.js +4 -4
  35. package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.esm.js +1 -1
  36. package/links/httpLink/dist/trpc-client-links-httpLink.cjs.dev.js +4 -4
  37. package/links/httpLink/dist/trpc-client-links-httpLink.cjs.prod.js +4 -4
  38. package/links/httpLink/dist/trpc-client-links-httpLink.esm.js +1 -1
  39. package/package.json +4 -4
  40. package/src/TRPCClientError.ts +1 -1
  41. package/src/createTRPCClient.ts +1 -0
  42. package/src/createTRPCClientProxy.ts +17 -2
  43. package/src/internals/TRPCClient.ts +43 -35
  44. package/src/links/dedupeLink.test.ts +8 -14
  45. package/src/links/httpBatchLink.ts +17 -7
  46. package/src/links/httpLink.ts +14 -2
  47. package/src/links/internals/createChain.test.ts +18 -33
  48. package/src/links/internals/httpUtils.ts +6 -5
  49. package/src/links/internals/transformResult.ts +40 -0
  50. package/src/links/loggerLink.ts +5 -5
  51. package/src/links/retryLink.ts +1 -1
  52. package/src/links/types.ts +8 -10
  53. package/src/links/wsLink.ts +26 -7
  54. package/dist/links/internals/transformOperationResult.d.ts +0 -30
  55. package/dist/links/internals/transformOperationResult.d.ts.map +0 -1
  56. package/dist/wsLink-27b93bd0.mjs +0 -451
  57. package/dist/wsLink-44703a83.js +0 -467
  58. package/src/links/internals/transformOperationResult.ts +0 -53
@@ -1,7 +1,7 @@
1
1
  import { AnyRouter } from '@trpc/server';
2
2
  import { observable, tap } from '@trpc/server/observable';
3
3
  import { TRPCClientError } from '..';
4
- import { Operation, OperationResult, TRPCLink } from './types';
4
+ import { Operation, OperationResultEnvelope, TRPCLink } from './types';
5
5
 
6
6
  type ConsoleEsque = {
7
7
  log: (...args: any[]) => void;
@@ -14,7 +14,7 @@ type EnableFnOptions<TRouter extends AnyRouter> =
14
14
  })
15
15
  | {
16
16
  direction: 'down';
17
- result: OperationResult<TRouter, unknown> | TRPCClientError<TRouter>;
17
+ result: OperationResultEnvelope<unknown> | TRPCClientError<TRouter>;
18
18
  };
19
19
  type EnabledFn<TRouter extends AnyRouter> = (
20
20
  opts: EnableFnOptions<TRouter>,
@@ -33,7 +33,7 @@ type LogFnOptions<TRouter extends AnyRouter> = Operation &
33
33
  * Request result
34
34
  */
35
35
  direction: 'down';
36
- result: OperationResult<TRouter, unknown> | TRPCClientError<TRouter>;
36
+ result: OperationResultEnvelope<unknown> | TRPCClientError<TRouter>;
37
37
  elapsedMs: number;
38
38
  }
39
39
  );
@@ -92,7 +92,7 @@ const defaultLogger =
92
92
  const fn: 'error' | 'log' =
93
93
  props.direction === 'down' &&
94
94
  props.result &&
95
- (props.result instanceof Error || 'error' in props.result.data)
95
+ (props.result instanceof Error || 'error' in props.result.result)
96
96
  ? 'error'
97
97
  : 'log';
98
98
 
@@ -116,7 +116,7 @@ export function loggerLink<TRouter extends AnyRouter = AnyRouter>(
116
116
  });
117
117
  const requestStartTime = Date.now();
118
118
  function logResult(
119
- result: OperationResult<TRouter, unknown> | TRPCClientError<TRouter>,
119
+ result: OperationResultEnvelope<unknown> | TRPCClientError<TRouter>,
120
120
  ) {
121
121
  const elapsedMs = Date.now() - requestStartTime;
122
122
 
@@ -26,7 +26,7 @@ export function retryLink<TRouter extends AnyRouter = AnyRouter>(opts: {
26
26
  attempt();
27
27
  },
28
28
  next(result) {
29
- if ('result' in result.data) {
29
+ if ('result' in result.result) {
30
30
  isDone = true;
31
31
  observer.next(result);
32
32
  return;
@@ -1,6 +1,6 @@
1
- import { AnyRouter, DataTransformer, inferRouterError } from '@trpc/server';
1
+ import { AnyRouter, DataTransformer } from '@trpc/server';
2
2
  import { Observable, Observer } from '@trpc/server/observable';
3
- import { TRPCResponse, TRPCResponseMessage } from '@trpc/server/rpc';
3
+ import { TRPCResultMessage, TRPCSuccessResponse } from '@trpc/server/rpc';
4
4
  import { TRPCClientError } from '../TRPCClientError';
5
5
 
6
6
  export type CancelFn = () => void;
@@ -37,24 +37,22 @@ export interface TRPCClientRuntime {
37
37
  transformer: DataTransformer;
38
38
  }
39
39
 
40
- type OperationResultData<TRouter extends AnyRouter, TOutput> =
41
- | TRPCResponse<TOutput, inferRouterError<TRouter>>
42
- | TRPCResponseMessage<TOutput, inferRouterError<TRouter>>;
43
-
44
- export interface OperationResult<TRouter extends AnyRouter, TOutput> {
45
- data: OperationResultData<TRouter, TOutput>;
40
+ export interface OperationResultEnvelope<TOutput> {
41
+ result:
42
+ | TRPCSuccessResponse<TOutput>['result']
43
+ | TRPCResultMessage<TOutput>['result'];
46
44
  context?: OperationContext;
47
45
  }
48
46
 
49
47
  export type OperationResultObservable<
50
48
  TRouter extends AnyRouter,
51
49
  TOutput,
52
- > = Observable<OperationResult<TRouter, TOutput>, TRPCClientError<TRouter>>;
50
+ > = Observable<OperationResultEnvelope<TOutput>, TRPCClientError<TRouter>>;
53
51
 
54
52
  export type OperationResultObserver<
55
53
  TRouter extends AnyRouter,
56
54
  TOutput,
57
- > = Observer<OperationResult<TRouter, TOutput>, TRPCClientError<TRouter>>;
55
+ > = Observer<OperationResultEnvelope<TOutput>, TRPCClientError<TRouter>>;
58
56
 
59
57
  export type OperationLink<
60
58
  TRouter extends AnyRouter,
@@ -1,5 +1,5 @@
1
- import { AnyRouter, ProcedureType } from '@trpc/server';
2
- import { UnsubscribeFn, observable } from '@trpc/server/observable';
1
+ import { AnyRouter, ProcedureType, inferRouterError } from '@trpc/server';
2
+ import { Observer, UnsubscribeFn, observable } from '@trpc/server/observable';
3
3
  import {
4
4
  TRPCClientIncomingMessage,
5
5
  TRPCClientIncomingRequest,
@@ -9,7 +9,18 @@ import {
9
9
  } from '@trpc/server/rpc';
10
10
  import { TRPCClientError } from '../TRPCClientError';
11
11
  import { retryDelay } from '../internals/retryDelay';
12
- import { Operation, OperationResultObserver, TRPCLink } from './types';
12
+ import { transformResult } from './internals/transformResult';
13
+ import { Operation, TRPCLink } from './types';
14
+
15
+ type WSCallbackResult<TRouter extends AnyRouter, TOutput> = TRPCResponseMessage<
16
+ TOutput,
17
+ inferRouterError<TRouter>
18
+ >;
19
+
20
+ type WSCallbackObserver<TRouter extends AnyRouter, TOutput> = Observer<
21
+ WSCallbackResult<TRouter, TOutput>,
22
+ TRPCClientError<TRouter>
23
+ >;
13
24
 
14
25
  export interface WebSocketClientOptions {
15
26
  url: string;
@@ -40,7 +51,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
40
51
  /**
41
52
  * pending outgoing requests that are awaiting callback
42
53
  */
43
- type TCallbacks = OperationResultObserver<AnyRouter, unknown>;
54
+ type TCallbacks = WSCallbackObserver<AnyRouter, unknown>;
44
55
  type TRequest = {
45
56
  /**
46
57
  * Reference to the WebSocket instance this request was made to
@@ -157,7 +168,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
157
168
  return;
158
169
  }
159
170
 
160
- req.callbacks.next?.({ data });
171
+ req.callbacks.next?.(data);
161
172
  if (req.ws !== activeConnection && conn === activeConnection) {
162
173
  const oldWs = req.ws;
163
174
  // gracefully replace old connection with this
@@ -323,8 +334,16 @@ export function wsLink<TRouter extends AnyRouter>(
323
334
  observer.complete();
324
335
  }
325
336
  },
326
- next(result) {
327
- observer.next(result);
337
+ next(message) {
338
+ const transformed = transformResult(message, runtime);
339
+
340
+ if (!transformed.ok) {
341
+ observer.error(TRPCClientError.from(transformed.error));
342
+ return;
343
+ }
344
+ observer.next({
345
+ result: transformed.result,
346
+ });
328
347
 
329
348
  if (op.type !== 'subscription') {
330
349
  // if it isn't a subscription we don't care about next response
@@ -1,30 +0,0 @@
1
- import { AnyRouter } from '@trpc/server';
2
- import { TRPCResultMessage } from '@trpc/server/rpc';
3
- import { TRPCClientRuntime } from '..';
4
- import { TRPCClientError } from '../../TRPCClientError';
5
- import { OperationResult } from '../types';
6
- /** @internal */
7
- export declare function transformOperationResult<TRouter extends AnyRouter, TOutput>(result: OperationResult<TRouter, TOutput>, runtime: TRPCClientRuntime): {
8
- readonly ok: false;
9
- readonly error: TRPCClientError<TRouter>;
10
- readonly context: import("..").OperationContext | undefined;
11
- readonly data?: undefined;
12
- } | {
13
- readonly ok: true;
14
- readonly data: TOutput;
15
- readonly context: import("..").OperationContext | undefined;
16
- readonly error?: undefined;
17
- };
18
- /** @internal */
19
- export declare function transformSubscriptionOperationResult<TRouter extends AnyRouter, TOutput>(result: OperationResult<TRouter, TOutput>, runtime: TRPCClientRuntime): {
20
- readonly ok: false;
21
- readonly error: TRPCClientError<TRouter>;
22
- readonly context: import("..").OperationContext | undefined;
23
- readonly data?: undefined;
24
- } | {
25
- readonly ok: true;
26
- readonly data: TRPCResultMessage<TOutput>;
27
- readonly context: import("..").OperationContext | undefined;
28
- readonly error?: undefined;
29
- };
30
- //# sourceMappingURL=transformOperationResult.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"transformOperationResult.d.ts","sourceRoot":"","sources":["../../../src/links/internals/transformOperationResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,gBAAgB;AAChB,wBAAgB,wBAAwB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EACzE,MAAM,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,EACzC,OAAO,EAAE,iBAAiB;;;;;;;;;;EAgB3B;AAED,gBAAgB;AAChB,wBAAgB,oCAAoC,CAClD,OAAO,SAAS,SAAS,EACzB,OAAO,EACP,MAAM,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,iBAAiB;;;;;;;;;;EAqBtE"}
@@ -1,451 +0,0 @@
1
- import _createClass from '@babel/runtime/helpers/createClass';
2
- import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
3
- import _assertThisInitialized from '@babel/runtime/helpers/assertThisInitialized';
4
- import _inherits from '@babel/runtime/helpers/inherits';
5
- import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
6
- import _getPrototypeOf from '@babel/runtime/helpers/getPrototypeOf';
7
- import _wrapNativeSuper from '@babel/runtime/helpers/wrapNativeSuper';
8
- import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
9
- import { observable } from '@trpc/server/observable';
10
- import _defineProperty from '@babel/runtime/helpers/defineProperty';
11
-
12
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
13
-
14
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
15
-
16
- function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
17
-
18
- function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
19
-
20
- var TRPCClientError = /*#__PURE__*/function (_Error) {
21
- _inherits(TRPCClientError, _Error);
22
-
23
- var _super = /*#__PURE__*/_createSuper$1(TRPCClientError);
24
-
25
- function TRPCClientError(message, opts) {
26
- var _opts$result, _opts$result2;
27
-
28
- var _this;
29
-
30
- _classCallCheck(this, TRPCClientError);
31
-
32
- var cause = opts === null || opts === void 0 ? void 0 : opts.cause; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
33
- // @ts-ignore https://github.com/tc39/proposal-error-cause
34
-
35
- _this = _super.call(this, message, {
36
- cause: cause
37
- });
38
- _this.cause = void 0;
39
- _this.shape = void 0;
40
- _this.data = void 0;
41
- _this.meta = void 0;
42
- _this.meta = opts === null || opts === void 0 ? void 0 : opts.meta;
43
- _this.cause = cause;
44
- _this.shape = opts === null || opts === void 0 ? void 0 : (_opts$result = opts.result) === null || _opts$result === void 0 ? void 0 : _opts$result.error;
45
- _this.data = opts === null || opts === void 0 ? void 0 : (_opts$result2 = opts.result) === null || _opts$result2 === void 0 ? void 0 : _opts$result2.error.data;
46
- _this.name = 'TRPCClientError';
47
- Object.setPrototypeOf(_assertThisInitialized(_this), TRPCClientError.prototype);
48
- return _this;
49
- }
50
-
51
- _createClass(TRPCClientError, null, [{
52
- key: "from",
53
- value: function from(cause) {
54
- var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
55
-
56
- if (!(cause instanceof Error)) {
57
- var _message;
58
-
59
- return new TRPCClientError((_message = cause.error.message) !== null && _message !== void 0 ? _message : '', _objectSpread(_objectSpread({}, opts), {}, {
60
- cause: undefined,
61
- result: cause
62
- }));
63
- }
64
-
65
- if (cause.name === 'TRPCClientError') {
66
- return cause;
67
- }
68
-
69
- return new TRPCClientError(cause.message, _objectSpread(_objectSpread({}, opts), {}, {
70
- cause: cause,
71
- result: null
72
- }));
73
- }
74
- }]);
75
-
76
- return TRPCClientError;
77
- }( /*#__PURE__*/_wrapNativeSuper(Error));
78
-
79
- /* istanbul ignore next */
80
- var retryDelay = function retryDelay(attemptIndex) {
81
- return attemptIndex === 0 ? 0 : Math.min(1000 * Math.pow(2, attemptIndex), 30000);
82
- };
83
-
84
- function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
85
-
86
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
87
- function createWSClient(opts) {
88
- var url = opts.url,
89
- _opts$WebSocket = opts.WebSocket,
90
- WebSocketImpl = _opts$WebSocket === void 0 ? WebSocket : _opts$WebSocket,
91
- _opts$retryDelayMs = opts.retryDelayMs,
92
- retryDelayFn = _opts$retryDelayMs === void 0 ? retryDelay : _opts$retryDelayMs,
93
- onOpen = opts.onOpen,
94
- onClose = opts.onClose;
95
- /* istanbul ignore next */
96
-
97
- if (!WebSocketImpl) {
98
- throw new Error("No WebSocket implementation found - you probably don't want to use this on the server, but if you do you need to pass a `WebSocket`-ponyfill");
99
- }
100
- /**
101
- * outgoing messages buffer whilst not open
102
- */
103
-
104
-
105
- var outgoing = [];
106
- /**
107
- * pending outgoing requests that are awaiting callback
108
- */
109
-
110
- var pendingRequests = Object.create(null);
111
- var connectAttempt = 0;
112
- var dispatchTimer = null;
113
- var connectTimer = null;
114
- var activeConnection = createWS();
115
- var state = 'connecting';
116
- /**
117
- * tries to send the list of messages
118
- */
119
-
120
- function dispatch() {
121
- if (state !== 'open' || dispatchTimer) {
122
- return;
123
- }
124
-
125
- dispatchTimer = setTimeout(function () {
126
- dispatchTimer = null;
127
-
128
- if (outgoing.length === 1) {
129
- // single send
130
- activeConnection.send(JSON.stringify(outgoing.pop()));
131
- } else {
132
- // batch send
133
- activeConnection.send(JSON.stringify(outgoing));
134
- } // clear
135
-
136
-
137
- outgoing = [];
138
- });
139
- }
140
-
141
- function tryReconnect() {
142
- if (connectTimer || state === 'closed') {
143
- return;
144
- }
145
-
146
- var timeout = retryDelayFn(connectAttempt++);
147
- reconnectInMs(timeout);
148
- }
149
-
150
- function reconnect() {
151
- state = 'connecting';
152
- var oldConnection = activeConnection;
153
- activeConnection = createWS();
154
- closeIfNoPending(oldConnection);
155
- }
156
-
157
- function reconnectInMs(ms) {
158
- if (connectTimer) {
159
- return;
160
- }
161
-
162
- state = 'connecting';
163
- connectTimer = setTimeout(reconnect, ms);
164
- }
165
-
166
- function closeIfNoPending(conn) {
167
- // disconnect as soon as there are are no pending result
168
- var hasPendingRequests = Object.values(pendingRequests).some(function (p) {
169
- return p.ws === conn;
170
- });
171
-
172
- if (!hasPendingRequests) {
173
- conn.close();
174
- }
175
- }
176
-
177
- function resumeSubscriptionOnReconnect(req) {
178
- if (outgoing.some(function (r) {
179
- return r.id === req.op.id;
180
- })) {
181
- return;
182
- }
183
-
184
- request(req.op, req.callbacks);
185
- }
186
-
187
- function createWS() {
188
- var conn = new WebSocketImpl(url);
189
- clearTimeout(connectTimer);
190
- connectTimer = null;
191
- conn.addEventListener('open', function () {
192
- /* istanbul ignore next */
193
- if (conn !== activeConnection) {
194
- return;
195
- }
196
-
197
- connectAttempt = 0;
198
- state = 'open';
199
- onOpen === null || onOpen === void 0 ? void 0 : onOpen();
200
- dispatch();
201
- });
202
- conn.addEventListener('error', function () {
203
- if (conn === activeConnection) {
204
- tryReconnect();
205
- }
206
- });
207
-
208
- var handleIncomingRequest = function handleIncomingRequest(req) {
209
- if (req.method === 'reconnect' && conn === activeConnection) {
210
- if (state === 'open') {
211
- onClose === null || onClose === void 0 ? void 0 : onClose();
212
- }
213
-
214
- reconnect(); // notify subscribers
215
-
216
- for (var _i = 0, _Object$values = Object.values(pendingRequests); _i < _Object$values.length; _i++) {
217
- var pendingReq = _Object$values[_i];
218
-
219
- if (pendingReq.type === 'subscription') {
220
- resumeSubscriptionOnReconnect(pendingReq);
221
- }
222
- }
223
- }
224
- };
225
-
226
- var handleIncomingResponse = function handleIncomingResponse(data) {
227
- var _req$callbacks$next, _req$callbacks;
228
-
229
- var req = data.id !== null && pendingRequests[data.id];
230
-
231
- if (!req) {
232
- // do something?
233
- return;
234
- }
235
-
236
- (_req$callbacks$next = (_req$callbacks = req.callbacks).next) === null || _req$callbacks$next === void 0 ? void 0 : _req$callbacks$next.call(_req$callbacks, {
237
- data: data
238
- });
239
-
240
- if (req.ws !== activeConnection && conn === activeConnection) {
241
- var oldWs = req.ws; // gracefully replace old connection with this
242
-
243
- req.ws = activeConnection;
244
- closeIfNoPending(oldWs);
245
- }
246
-
247
- if ('result' in data && data.result.type === 'stopped' && conn === activeConnection) {
248
- req.callbacks.complete();
249
- }
250
- };
251
-
252
- conn.addEventListener('message', function (_ref) {
253
- var data = _ref.data;
254
- var msg = JSON.parse(data);
255
-
256
- if ('method' in msg) {
257
- handleIncomingRequest(msg);
258
- } else {
259
- handleIncomingResponse(msg);
260
- }
261
-
262
- if (conn !== activeConnection || state === 'closed') {
263
- // when receiving a message, we close old connection that has no pending requests
264
- closeIfNoPending(conn);
265
- }
266
- });
267
- conn.addEventListener('close', function () {
268
- if (state === 'open') {
269
- onClose === null || onClose === void 0 ? void 0 : onClose();
270
- }
271
-
272
- if (activeConnection === conn) {
273
- // connection might have been replaced already
274
- tryReconnect();
275
- }
276
-
277
- for (var _i2 = 0, _Object$entries = Object.entries(pendingRequests); _i2 < _Object$entries.length; _i2++) {
278
- var _req$callbacks$error, _req$callbacks2;
279
-
280
- var _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2),
281
- key = _Object$entries$_i[0],
282
- req = _Object$entries$_i[1];
283
-
284
- if (req.ws !== conn) {
285
- continue;
286
- }
287
-
288
- (_req$callbacks$error = (_req$callbacks2 = req.callbacks).error) === null || _req$callbacks$error === void 0 ? void 0 : _req$callbacks$error.call(_req$callbacks2, TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
289
-
290
- if (req.type !== 'subscription') {
291
- var _req$callbacks$comple, _req$callbacks3;
292
-
293
- delete pendingRequests[key];
294
- (_req$callbacks$comple = (_req$callbacks3 = req.callbacks).complete) === null || _req$callbacks$comple === void 0 ? void 0 : _req$callbacks$comple.call(_req$callbacks3);
295
- } else if (state !== 'closed') {
296
- // request restart of sub with next connection
297
- resumeSubscriptionOnReconnect(req);
298
- }
299
- }
300
- });
301
- return conn;
302
- }
303
-
304
- function request(op, callbacks) {
305
- var type = op.type,
306
- input = op.input,
307
- path = op.path,
308
- id = op.id;
309
- var envelope = {
310
- id: id,
311
- method: type,
312
- params: {
313
- input: input,
314
- path: path
315
- }
316
- };
317
- pendingRequests[id] = {
318
- ws: activeConnection,
319
- type: type,
320
- callbacks: callbacks,
321
- op: op
322
- }; // enqueue message
323
-
324
- outgoing.push(envelope);
325
- dispatch();
326
- return function () {
327
- var _pendingRequests$id, _callbacks$complete;
328
-
329
- var callbacks = (_pendingRequests$id = pendingRequests[id]) === null || _pendingRequests$id === void 0 ? void 0 : _pendingRequests$id.callbacks;
330
- delete pendingRequests[id];
331
- outgoing = outgoing.filter(function (msg) {
332
- return msg.id !== id;
333
- });
334
- callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$complete = callbacks.complete) === null || _callbacks$complete === void 0 ? void 0 : _callbacks$complete.call(callbacks);
335
-
336
- if (op.type === 'subscription') {
337
- outgoing.push({
338
- id: id,
339
- method: 'subscription.stop'
340
- });
341
- dispatch();
342
- }
343
- };
344
- }
345
-
346
- return {
347
- close: function close() {
348
- state = 'closed';
349
- onClose === null || onClose === void 0 ? void 0 : onClose();
350
- closeIfNoPending(activeConnection);
351
- clearTimeout(connectTimer);
352
- connectTimer = null;
353
- },
354
- request: request,
355
- getConnection: function getConnection() {
356
- return activeConnection;
357
- }
358
- };
359
- }
360
-
361
- var TRPCWebSocketClosedError = /*#__PURE__*/function (_Error) {
362
- _inherits(TRPCWebSocketClosedError, _Error);
363
-
364
- var _super = /*#__PURE__*/_createSuper(TRPCWebSocketClosedError);
365
-
366
- function TRPCWebSocketClosedError(message) {
367
- var _this;
368
-
369
- _classCallCheck(this, TRPCWebSocketClosedError);
370
-
371
- _this = _super.call(this, message);
372
- _this.name = 'TRPCWebSocketClosedError';
373
- Object.setPrototypeOf(_assertThisInitialized(_this), TRPCWebSocketClosedError.prototype);
374
- return _this;
375
- }
376
-
377
- return _createClass(TRPCWebSocketClosedError);
378
- }( /*#__PURE__*/_wrapNativeSuper(Error));
379
-
380
- var TRPCSubscriptionEndedError = /*#__PURE__*/function (_Error2) {
381
- _inherits(TRPCSubscriptionEndedError, _Error2);
382
-
383
- var _super2 = /*#__PURE__*/_createSuper(TRPCSubscriptionEndedError);
384
-
385
- function TRPCSubscriptionEndedError(message) {
386
- var _this2;
387
-
388
- _classCallCheck(this, TRPCSubscriptionEndedError);
389
-
390
- _this2 = _super2.call(this, message);
391
- _this2.name = 'TRPCSubscriptionEndedError';
392
- Object.setPrototypeOf(_assertThisInitialized(_this2), TRPCSubscriptionEndedError.prototype);
393
- return _this2;
394
- }
395
-
396
- return _createClass(TRPCSubscriptionEndedError);
397
- }( /*#__PURE__*/_wrapNativeSuper(Error));
398
-
399
- function wsLink(opts) {
400
- return function (runtime) {
401
- var client = opts.client;
402
- return function (_ref2) {
403
- var op = _ref2.op;
404
- return observable(function (observer) {
405
- var type = op.type,
406
- path = op.path,
407
- id = op.id,
408
- context = op.context;
409
- var input = runtime.transformer.serialize(op.input);
410
- var isDone = false;
411
- var unsub = client.request({
412
- type: type,
413
- path: path,
414
- input: input,
415
- id: id,
416
- context: context
417
- }, {
418
- error: function error(err) {
419
- isDone = true;
420
- observer.error(err);
421
- unsub();
422
- },
423
- complete: function complete() {
424
- if (!isDone) {
425
- isDone = true;
426
- observer.error(TRPCClientError.from(new TRPCSubscriptionEndedError('Operation ended prematurely')));
427
- } else {
428
- observer.complete();
429
- }
430
- },
431
- next: function next(result) {
432
- observer.next(result);
433
-
434
- if (op.type !== 'subscription') {
435
- // if it isn't a subscription we don't care about next response
436
- isDone = true;
437
- unsub();
438
- observer.complete();
439
- }
440
- }
441
- });
442
- return function () {
443
- isDone = true;
444
- unsub();
445
- };
446
- });
447
- };
448
- };
449
- }
450
-
451
- export { TRPCClientError as T, createWSClient as c, wsLink as w };