@trpc/client 10.28.2 → 10.29.1
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.
- package/dist/httpBatchLink-38dcf5f2.js +243 -0
- package/dist/httpBatchLink-e66c0674.mjs +240 -0
- package/dist/httpBatchLink-f35df745.js +239 -0
- package/dist/{httpUtils-00c8b54e.js → httpUtils-145e783b.js} +27 -23
- package/dist/{httpUtils-90a6bccb.js → httpUtils-21cbb35d.js} +27 -20
- package/dist/{httpUtils-8a5c637a.mjs → httpUtils-b2fcc20c.mjs} +26 -21
- package/dist/index.js +162 -2
- package/dist/index.mjs +164 -4
- package/dist/internals/dataLoader.d.ts +1 -1
- package/dist/internals/dataLoader.d.ts.map +1 -1
- package/dist/internals/types.d.ts +2 -0
- package/dist/internals/types.d.ts.map +1 -1
- package/dist/links/HTTPBatchLinkOptions.d.ts +20 -0
- package/dist/links/HTTPBatchLinkOptions.d.ts.map +1 -0
- package/dist/links/HTTPBatchStreamLinkOptions.d.ts +11 -0
- package/dist/links/HTTPBatchStreamLinkOptions.d.ts.map +1 -0
- package/dist/links/httpBatchLink.d.ts +2 -15
- package/dist/links/httpBatchLink.d.ts.map +1 -1
- package/dist/links/httpBatchLink.js +5 -217
- package/dist/links/httpBatchLink.mjs +4 -220
- package/dist/links/httpBatchStreamLink.d.ts +3 -0
- package/dist/links/httpBatchStreamLink.d.ts.map +1 -0
- package/dist/links/httpLink.js +1 -1
- package/dist/links/httpLink.mjs +1 -1
- package/dist/links/index.d.ts +3 -0
- package/dist/links/index.d.ts.map +1 -1
- package/dist/links/internals/createHTTPBatchLink.d.ts +20 -0
- package/dist/links/internals/createHTTPBatchLink.d.ts.map +1 -0
- package/dist/links/internals/getTextDecoder.d.ts +3 -0
- package/dist/links/internals/getTextDecoder.d.ts.map +1 -0
- package/dist/links/internals/httpUtils.d.ts +5 -1
- package/dist/links/internals/httpUtils.d.ts.map +1 -1
- package/dist/links/internals/parseJSONStream.d.ts +39 -0
- package/dist/links/internals/parseJSONStream.d.ts.map +1 -0
- package/dist/links/internals/streamingUtils.d.ts +7 -0
- package/dist/links/internals/streamingUtils.d.ts.map +1 -0
- package/package.json +4 -4
- package/src/internals/dataLoader.ts +21 -7
- package/src/internals/types.ts +1 -0
- package/src/links/HTTPBatchLinkOptions.ts +21 -0
- package/src/links/HTTPBatchStreamLinkOptions.ts +11 -0
- package/src/links/httpBatchLink.ts +45 -133
- package/src/links/httpBatchStreamLink.ts +53 -0
- package/src/links/index.ts +3 -0
- package/src/links/internals/createHTTPBatchLink.ts +115 -0
- package/src/links/internals/getTextDecoder.ts +19 -0
- package/src/links/internals/httpUtils.ts +35 -24
- package/src/links/internals/parseJSONStream.ts +168 -0
- package/src/links/internals/streamingUtils.ts +6 -0
package/dist/index.mjs
CHANGED
|
@@ -4,9 +4,10 @@ export { s as splitLink } from './splitLink-4c75f7be.mjs';
|
|
|
4
4
|
import { T as TRPCClientError } from './transformResult-9a244fe7.mjs';
|
|
5
5
|
export { T as TRPCClientError } from './transformResult-9a244fe7.mjs';
|
|
6
6
|
import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
|
|
7
|
-
import { h as httpRequest } from './httpUtils-
|
|
8
|
-
export {
|
|
9
|
-
|
|
7
|
+
import { f as fetchHTTPResponse, g as getUrl, a as getBody$1, h as httpRequest } from './httpUtils-b2fcc20c.mjs';
|
|
8
|
+
export { b as getFetch } from './httpUtils-b2fcc20c.mjs';
|
|
9
|
+
import { c as createHTTPBatchLink } from './httpBatchLink-e66c0674.mjs';
|
|
10
|
+
export { h as httpBatchLink } from './httpBatchLink-e66c0674.mjs';
|
|
10
11
|
import { httpLinkFactory } from './links/httpLink.mjs';
|
|
11
12
|
export { httpLink, httpLinkFactory } from './links/httpLink.mjs';
|
|
12
13
|
export { loggerLink } from './links/loggerLink.mjs';
|
|
@@ -163,6 +164,165 @@ function createTRPCProxyClient(opts) {
|
|
|
163
164
|
return proxy;
|
|
164
165
|
}
|
|
165
166
|
|
|
167
|
+
function getTextDecoder(customTextDecoder) {
|
|
168
|
+
if (customTextDecoder) {
|
|
169
|
+
return customTextDecoder;
|
|
170
|
+
}
|
|
171
|
+
if (typeof window !== 'undefined' && window.TextDecoder) {
|
|
172
|
+
return new window.TextDecoder();
|
|
173
|
+
}
|
|
174
|
+
if (typeof globalThis !== 'undefined' && globalThis.TextDecoder) {
|
|
175
|
+
return new globalThis.TextDecoder();
|
|
176
|
+
}
|
|
177
|
+
throw new Error('No TextDecoder implementation found');
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
// Stream parsing adapted from https://www.loginradius.com/blog/engineering/guest-post/http-streaming-with-nodejs-and-fetch-api/
|
|
181
|
+
/**
|
|
182
|
+
* @internal
|
|
183
|
+
* @description Take a stream of bytes and call `onLine` with
|
|
184
|
+
* a JSON object for each line in the stream. Expected stream
|
|
185
|
+
* format is:
|
|
186
|
+
* ```json
|
|
187
|
+
* {"1": {...}
|
|
188
|
+
* ,"0": {...}
|
|
189
|
+
* }
|
|
190
|
+
* ```
|
|
191
|
+
*/ async function parseJSONStream(opts) {
|
|
192
|
+
const parse = opts.parse ?? JSON.parse;
|
|
193
|
+
const onLine = (line)=>{
|
|
194
|
+
if (opts.signal?.aborted) return;
|
|
195
|
+
if (!line || line === '}') {
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
/**
|
|
199
|
+
* At this point, `line` can be one of two things:
|
|
200
|
+
* - The first line of the stream `{"2":{...}`
|
|
201
|
+
* - A line in the middle of the stream `,"2":{...}`
|
|
202
|
+
*/ const indexOfColon = line.indexOf(':');
|
|
203
|
+
const indexAsStr = line.substring(2, indexOfColon - 1);
|
|
204
|
+
const text = line.substring(indexOfColon + 1);
|
|
205
|
+
opts.onSingle(Number(indexAsStr), parse(text));
|
|
206
|
+
};
|
|
207
|
+
await readLines(opts.readableStream, onLine, opts.textDecoder);
|
|
208
|
+
}
|
|
209
|
+
/**
|
|
210
|
+
* Handle transforming a stream of bytes into lines of text.
|
|
211
|
+
* To avoid using AsyncIterators / AsyncGenerators,
|
|
212
|
+
* we use a callback for each line.
|
|
213
|
+
*
|
|
214
|
+
* @param readableStream can be a NodeJS stream or a WebAPI stream
|
|
215
|
+
* @param onLine will be called for every line ('\n' delimited) in the stream
|
|
216
|
+
*/ async function readLines(readableStream, onLine, textDecoder) {
|
|
217
|
+
let partOfLine = '';
|
|
218
|
+
const onChunk = (chunk)=>{
|
|
219
|
+
const chunkText = textDecoder.decode(chunk);
|
|
220
|
+
const chunkLines = chunkText.split('\n');
|
|
221
|
+
if (chunkLines.length === 1) {
|
|
222
|
+
partOfLine += chunkLines[0];
|
|
223
|
+
} else if (chunkLines.length > 1) {
|
|
224
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- length checked on line above
|
|
225
|
+
onLine(partOfLine + chunkLines[0]);
|
|
226
|
+
for(let i = 1; i < chunkLines.length - 1; i++){
|
|
227
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- length checked on line above
|
|
228
|
+
onLine(chunkLines[i]);
|
|
229
|
+
}
|
|
230
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- length doesn't change, so is necessarily > 1
|
|
231
|
+
partOfLine = chunkLines[chunkLines.length - 1];
|
|
232
|
+
}
|
|
233
|
+
};
|
|
234
|
+
// we handle 2 different types of streams, this if where we figure out which one we have
|
|
235
|
+
if ('getReader' in readableStream) {
|
|
236
|
+
await readStandardChunks(readableStream, onChunk);
|
|
237
|
+
} else {
|
|
238
|
+
await readNodeChunks(readableStream, onChunk);
|
|
239
|
+
}
|
|
240
|
+
onLine(partOfLine);
|
|
241
|
+
}
|
|
242
|
+
/**
|
|
243
|
+
* Handle NodeJS stream
|
|
244
|
+
*/ function readNodeChunks(stream, onChunk) {
|
|
245
|
+
return new Promise((resolve)=>{
|
|
246
|
+
stream.on('data', onChunk);
|
|
247
|
+
stream.on('end', resolve);
|
|
248
|
+
});
|
|
249
|
+
}
|
|
250
|
+
/**
|
|
251
|
+
* Handle WebAPI stream
|
|
252
|
+
*/ async function readStandardChunks(stream, onChunk) {
|
|
253
|
+
const reader = stream.getReader();
|
|
254
|
+
let readResult = await reader.read();
|
|
255
|
+
while(!readResult.done){
|
|
256
|
+
onChunk(readResult.value);
|
|
257
|
+
readResult = await reader.read();
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
const streamingJsonHttpRequester = (opts, onSingle)=>{
|
|
261
|
+
const ac = opts.AbortController ? new opts.AbortController() : null;
|
|
262
|
+
const responsePromise = fetchHTTPResponse({
|
|
263
|
+
...opts,
|
|
264
|
+
contentTypeHeader: 'application/json',
|
|
265
|
+
batchModeHeader: 'stream',
|
|
266
|
+
getUrl,
|
|
267
|
+
getBody: getBody$1
|
|
268
|
+
}, ac);
|
|
269
|
+
const cancel = ()=>ac?.abort();
|
|
270
|
+
const promise = responsePromise.then(async (res)=>{
|
|
271
|
+
if (!res.body) throw new Error('Received response without body');
|
|
272
|
+
const meta = {
|
|
273
|
+
response: res
|
|
274
|
+
};
|
|
275
|
+
return parseJSONStream({
|
|
276
|
+
readableStream: res.body,
|
|
277
|
+
onSingle,
|
|
278
|
+
parse: (string)=>({
|
|
279
|
+
json: JSON.parse(string),
|
|
280
|
+
meta
|
|
281
|
+
}),
|
|
282
|
+
signal: ac?.signal,
|
|
283
|
+
textDecoder: opts.textDecoder
|
|
284
|
+
});
|
|
285
|
+
});
|
|
286
|
+
return {
|
|
287
|
+
cancel,
|
|
288
|
+
promise
|
|
289
|
+
};
|
|
290
|
+
};
|
|
291
|
+
|
|
292
|
+
const streamRequester = (requesterOpts)=>{
|
|
293
|
+
const textDecoder = getTextDecoder(requesterOpts.opts.textDecoder);
|
|
294
|
+
return (batchOps, unitResolver)=>{
|
|
295
|
+
const path = batchOps.map((op)=>op.path).join(',');
|
|
296
|
+
const inputs = batchOps.map((op)=>op.input);
|
|
297
|
+
const { cancel , promise } = streamingJsonHttpRequester({
|
|
298
|
+
...requesterOpts,
|
|
299
|
+
textDecoder,
|
|
300
|
+
path,
|
|
301
|
+
inputs,
|
|
302
|
+
headers () {
|
|
303
|
+
if (!requesterOpts.opts.headers) {
|
|
304
|
+
return {};
|
|
305
|
+
}
|
|
306
|
+
if (typeof requesterOpts.opts.headers === 'function') {
|
|
307
|
+
return requesterOpts.opts.headers({
|
|
308
|
+
opList: batchOps
|
|
309
|
+
});
|
|
310
|
+
}
|
|
311
|
+
return requesterOpts.opts.headers;
|
|
312
|
+
}
|
|
313
|
+
}, (index, res)=>unitResolver(index, res));
|
|
314
|
+
return {
|
|
315
|
+
/**
|
|
316
|
+
* return an empty array because the batchLoader expects an array of results
|
|
317
|
+
* but we've already called the `unitResolver` for each of them, there's
|
|
318
|
+
* nothing left to do here.
|
|
319
|
+
*/ promise: promise.then(()=>[]),
|
|
320
|
+
cancel
|
|
321
|
+
};
|
|
322
|
+
};
|
|
323
|
+
};
|
|
324
|
+
const unstable_httpBatchStreamLink = createHTTPBatchLink(streamRequester);
|
|
325
|
+
|
|
166
326
|
const getBody = (opts)=>{
|
|
167
327
|
if (!('input' in opts)) {
|
|
168
328
|
return undefined;
|
|
@@ -189,4 +349,4 @@ const experimental_formDataLink = httpLinkFactory({
|
|
|
189
349
|
requester: formDataRequester
|
|
190
350
|
});
|
|
191
351
|
|
|
192
|
-
export { clientCallTypeToProcedureType, createTRPCClient, createTRPCClientProxy, createTRPCProxyClient, createTRPCUntypedClient, experimental_formDataLink };
|
|
352
|
+
export { clientCallTypeToProcedureType, createTRPCClient, createTRPCClientProxy, createTRPCProxyClient, createTRPCUntypedClient, experimental_formDataLink, unstable_httpBatchStreamLink };
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { CancelFn, PromiseAndCancel } from '../links/types';
|
|
2
2
|
type BatchLoader<TKey, TValue> = {
|
|
3
3
|
validate: (keys: TKey[]) => boolean;
|
|
4
|
-
fetch: (keys: TKey[]) => {
|
|
4
|
+
fetch: (keys: TKey[], unitResolver: (index: number, value: NonNullable<TValue>) => void) => {
|
|
5
5
|
promise: Promise<TValue[]>;
|
|
6
6
|
cancel: CancelFn;
|
|
7
7
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAa5D,KAAK,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAa5D,KAAK,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,CACL,IAAI,EAAE,IAAI,EAAE,EACZ,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,KAC9D;QACH,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3B,MAAM,EAAE,QAAQ,CAAC;KAClB,CAAC;CACH,CAAC;AAWF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;gBAsGnB,IAAI,KAAG,iBAAiB,MAAM,CAAC;EAsCnD"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
export interface AbortControllerEsque {
|
|
2
3
|
new (): AbortControllerInstanceEsque;
|
|
3
4
|
}
|
|
@@ -61,6 +62,7 @@ export interface RequestInitEsque {
|
|
|
61
62
|
* @see Response from lib.dom.d.ts
|
|
62
63
|
*/
|
|
63
64
|
export interface ResponseEsque {
|
|
65
|
+
readonly body?: ReadableStream<Uint8Array> | NodeJS.ReadableStream | null;
|
|
64
66
|
/**
|
|
65
67
|
* @remarks
|
|
66
68
|
* The built-in Response::json() method returns Promise<any>, but
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,4BAA4B,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,MAAM,EACjC,IAAI,CAAC,EAAE,WAAW,GAAG,gBAAgB,KAClC,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,IAAI,CAAC,EAAE,yBAAyB,KAC7B,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAEjD;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":";AAAA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,4BAA4B,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,MAAM,EACjC,IAAI,CAAC,EAAE,WAAW,GAAG,gBAAgB,KAClC,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,IAAI,CAAC,EAAE,yBAAyB,KAC7B,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAEjD;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAC1E;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { NonEmptyArray } from '../internals/types';
|
|
2
|
+
import { HTTPLinkBaseOptions } from './internals/httpUtils';
|
|
3
|
+
import { HTTPHeaders, Operation } from './types';
|
|
4
|
+
export interface HTTPBatchLinkOptions extends HTTPLinkBaseOptions {
|
|
5
|
+
maxURLLength?: number;
|
|
6
|
+
/**
|
|
7
|
+
* Headers to be set on outgoing requests or a callback that of said headers
|
|
8
|
+
* @link http://trpc.io/docs/client/headers
|
|
9
|
+
*/
|
|
10
|
+
headers?: HTTPHeaders | ((opts: {
|
|
11
|
+
opList: NonEmptyArray<Operation>;
|
|
12
|
+
}) => HTTPHeaders | Promise<HTTPHeaders>);
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* @alias HttpBatchLinkOptions
|
|
16
|
+
* @deprecated use `HTTPBatchLinkOptions` instead
|
|
17
|
+
*/
|
|
18
|
+
export interface HttpBatchLinkOptions extends HTTPBatchLinkOptions {
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=HTTPBatchLinkOptions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HTTPBatchLinkOptions.d.ts","sourceRoot":"","sources":["../../src/links/HTTPBatchLinkOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEjD,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,OAAO,CAAC,EACJ,WAAW,GACX,CAAC,CAAC,IAAI,EAAE;QACN,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;KAClC,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CAC/C;AACD;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;CAAG"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { HTTPBatchLinkOptions } from './HTTPBatchLinkOptions';
|
|
2
|
+
import { TextDecoderEsque } from './internals/streamingUtils';
|
|
3
|
+
export interface HTTPBatchStreamLinkOptions extends HTTPBatchLinkOptions {
|
|
4
|
+
/**
|
|
5
|
+
* Will default to the webAPI `TextDecoder`,
|
|
6
|
+
* but you can use this option if your client
|
|
7
|
+
* runtime doesn't provide it.
|
|
8
|
+
*/
|
|
9
|
+
textDecoder?: TextDecoderEsque;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=HTTPBatchStreamLinkOptions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HTTPBatchStreamLinkOptions.d.ts","sourceRoot":"","sources":["../../src/links/HTTPBatchStreamLinkOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE;;;;OAIG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC"}
|
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
import { HTTPLinkBaseOptions } from './internals/httpUtils';
|
|
4
|
-
import { HTTPHeaders, Operation, TRPCLink } from './types';
|
|
5
|
-
export interface HttpBatchLinkOptions extends HTTPLinkBaseOptions {
|
|
6
|
-
maxURLLength?: number;
|
|
7
|
-
/**
|
|
8
|
-
* Headers to be set on outgoing requests or a callback that of said headers
|
|
9
|
-
* @link http://trpc.io/docs/client/headers
|
|
10
|
-
*/
|
|
11
|
-
headers?: HTTPHeaders | ((opts: {
|
|
12
|
-
opList: NonEmptyArray<Operation>;
|
|
13
|
-
}) => HTTPHeaders | Promise<HTTPHeaders>);
|
|
14
|
-
}
|
|
15
|
-
export declare function httpBatchLink<TRouter extends AnyRouter>(opts: HttpBatchLinkOptions): TRPCLink<TRouter>;
|
|
1
|
+
import { HTTPBatchLinkOptions } from './HTTPBatchLinkOptions';
|
|
2
|
+
export declare const httpBatchLink: <TRouter extends import("@trpc/server").AnyRouter>(opts: HTTPBatchLinkOptions) => import("./types").TRPCLink<TRouter>;
|
|
16
3
|
//# sourceMappingURL=httpBatchLink.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAgD9D,eAAO,MAAM,aAAa,uHAAsC,CAAC"}
|
|
@@ -2,223 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
var links_httpBatchLink = require('../httpBatchLink-38dcf5f2.js');
|
|
6
|
+
require('../httpUtils-21cbb35d.js');
|
|
7
|
+
require('@trpc/server/observable');
|
|
8
|
+
require('../transformResult-70f95ffb.js');
|
|
8
9
|
|
|
9
|
-
/* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
|
|
10
|
-
* A function that should never be called unless we messed something up.
|
|
11
|
-
*/ const throwFatalError = ()=>{
|
|
12
|
-
throw new Error('Something went wrong. Please submit an issue at https://github.com/trpc/trpc/issues/new');
|
|
13
|
-
};
|
|
14
|
-
/**
|
|
15
|
-
* Dataloader that's very inspired by https://github.com/graphql/dataloader
|
|
16
|
-
* Less configuration, no caching, and allows you to cancel requests
|
|
17
|
-
* When cancelling a single fetch the whole batch will be cancelled only when _all_ items are cancelled
|
|
18
|
-
*/ function dataLoader(batchLoader) {
|
|
19
|
-
let pendingItems = null;
|
|
20
|
-
let dispatchTimer = null;
|
|
21
|
-
const destroyTimerAndPendingItems = ()=>{
|
|
22
|
-
clearTimeout(dispatchTimer);
|
|
23
|
-
dispatchTimer = null;
|
|
24
|
-
pendingItems = null;
|
|
25
|
-
};
|
|
26
|
-
/**
|
|
27
|
-
* Iterate through the items and split them into groups based on the `batchLoader`'s validate function
|
|
28
|
-
*/ function groupItems(items) {
|
|
29
|
-
const groupedItems = [
|
|
30
|
-
[]
|
|
31
|
-
];
|
|
32
|
-
let index = 0;
|
|
33
|
-
while(true){
|
|
34
|
-
const item = items[index];
|
|
35
|
-
if (!item) {
|
|
36
|
-
break;
|
|
37
|
-
}
|
|
38
|
-
const lastGroup = groupedItems[groupedItems.length - 1];
|
|
39
|
-
if (item.aborted) {
|
|
40
|
-
// Item was aborted before it was dispatched
|
|
41
|
-
item.reject(new Error('Aborted'));
|
|
42
|
-
index++;
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
const isValid = batchLoader.validate(lastGroup.concat(item).map((it)=>it.key));
|
|
46
|
-
if (isValid) {
|
|
47
|
-
lastGroup.push(item);
|
|
48
|
-
index++;
|
|
49
|
-
continue;
|
|
50
|
-
}
|
|
51
|
-
if (lastGroup.length === 0) {
|
|
52
|
-
item.reject(new Error('Input is too big for a single dispatch'));
|
|
53
|
-
index++;
|
|
54
|
-
continue;
|
|
55
|
-
}
|
|
56
|
-
// Create new group, next iteration will try to add the item to that
|
|
57
|
-
groupedItems.push([]);
|
|
58
|
-
}
|
|
59
|
-
return groupedItems;
|
|
60
|
-
}
|
|
61
|
-
function dispatch() {
|
|
62
|
-
const groupedItems = groupItems(pendingItems);
|
|
63
|
-
destroyTimerAndPendingItems();
|
|
64
|
-
// Create batches for each group of items
|
|
65
|
-
for (const items of groupedItems){
|
|
66
|
-
if (!items.length) {
|
|
67
|
-
continue;
|
|
68
|
-
}
|
|
69
|
-
const batch = {
|
|
70
|
-
items,
|
|
71
|
-
cancel: throwFatalError
|
|
72
|
-
};
|
|
73
|
-
for (const item of items){
|
|
74
|
-
item.batch = batch;
|
|
75
|
-
}
|
|
76
|
-
const { promise , cancel } = batchLoader.fetch(batch.items.map((_item)=>_item.key));
|
|
77
|
-
batch.cancel = cancel;
|
|
78
|
-
promise.then((result)=>{
|
|
79
|
-
for(let i = 0; i < result.length; i++){
|
|
80
|
-
const value = result[i];
|
|
81
|
-
const item = batch.items[i];
|
|
82
|
-
item.resolve(value);
|
|
83
|
-
item.batch = null;
|
|
84
|
-
}
|
|
85
|
-
}).catch((cause)=>{
|
|
86
|
-
for (const item of batch.items){
|
|
87
|
-
item.reject(cause);
|
|
88
|
-
item.batch = null;
|
|
89
|
-
}
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
function load(key) {
|
|
94
|
-
const item = {
|
|
95
|
-
aborted: false,
|
|
96
|
-
key,
|
|
97
|
-
batch: null,
|
|
98
|
-
resolve: throwFatalError,
|
|
99
|
-
reject: throwFatalError
|
|
100
|
-
};
|
|
101
|
-
const promise = new Promise((resolve, reject)=>{
|
|
102
|
-
item.reject = reject;
|
|
103
|
-
item.resolve = resolve;
|
|
104
|
-
if (!pendingItems) {
|
|
105
|
-
pendingItems = [];
|
|
106
|
-
}
|
|
107
|
-
pendingItems.push(item);
|
|
108
|
-
});
|
|
109
|
-
if (!dispatchTimer) {
|
|
110
|
-
dispatchTimer = setTimeout(dispatch);
|
|
111
|
-
}
|
|
112
|
-
const cancel = ()=>{
|
|
113
|
-
item.aborted = true;
|
|
114
|
-
if (item.batch?.items.every((item)=>item.aborted)) {
|
|
115
|
-
// All items in the batch have been cancelled
|
|
116
|
-
item.batch.cancel();
|
|
117
|
-
item.batch = null;
|
|
118
|
-
}
|
|
119
|
-
};
|
|
120
|
-
return {
|
|
121
|
-
promise,
|
|
122
|
-
cancel
|
|
123
|
-
};
|
|
124
|
-
}
|
|
125
|
-
return {
|
|
126
|
-
load
|
|
127
|
-
};
|
|
128
|
-
}
|
|
129
10
|
|
|
130
|
-
function httpBatchLink(opts) {
|
|
131
|
-
const resolvedOpts = httpUtils.resolveHTTPLinkOptions(opts);
|
|
132
|
-
// initialized config
|
|
133
|
-
return (runtime)=>{
|
|
134
|
-
const maxURLLength = opts.maxURLLength || Infinity;
|
|
135
|
-
const batchLoader = (type)=>{
|
|
136
|
-
const validate = (batchOps)=>{
|
|
137
|
-
if (maxURLLength === Infinity) {
|
|
138
|
-
// escape hatch for quick calcs
|
|
139
|
-
return true;
|
|
140
|
-
}
|
|
141
|
-
const path = batchOps.map((op)=>op.path).join(',');
|
|
142
|
-
const inputs = batchOps.map((op)=>op.input);
|
|
143
|
-
const url = httpUtils.getUrl({
|
|
144
|
-
...resolvedOpts,
|
|
145
|
-
runtime,
|
|
146
|
-
type,
|
|
147
|
-
path,
|
|
148
|
-
inputs
|
|
149
|
-
});
|
|
150
|
-
return url.length <= maxURLLength;
|
|
151
|
-
};
|
|
152
|
-
const fetch = (batchOps)=>{
|
|
153
|
-
const path = batchOps.map((op)=>op.path).join(',');
|
|
154
|
-
const inputs = batchOps.map((op)=>op.input);
|
|
155
|
-
const { promise , cancel } = httpUtils.jsonHttpRequester({
|
|
156
|
-
...resolvedOpts,
|
|
157
|
-
runtime,
|
|
158
|
-
type,
|
|
159
|
-
path,
|
|
160
|
-
inputs,
|
|
161
|
-
headers () {
|
|
162
|
-
if (!opts.headers) {
|
|
163
|
-
return {};
|
|
164
|
-
}
|
|
165
|
-
if (typeof opts.headers === 'function') {
|
|
166
|
-
return opts.headers({
|
|
167
|
-
opList: batchOps
|
|
168
|
-
});
|
|
169
|
-
}
|
|
170
|
-
return opts.headers;
|
|
171
|
-
}
|
|
172
|
-
});
|
|
173
|
-
return {
|
|
174
|
-
promise: promise.then((res)=>{
|
|
175
|
-
const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
|
|
176
|
-
const result = resJSON.map((item)=>({
|
|
177
|
-
meta: res.meta,
|
|
178
|
-
json: item
|
|
179
|
-
}));
|
|
180
|
-
return result;
|
|
181
|
-
}),
|
|
182
|
-
cancel
|
|
183
|
-
};
|
|
184
|
-
};
|
|
185
|
-
return {
|
|
186
|
-
validate,
|
|
187
|
-
fetch
|
|
188
|
-
};
|
|
189
|
-
};
|
|
190
|
-
const query = dataLoader(batchLoader('query'));
|
|
191
|
-
const mutation = dataLoader(batchLoader('mutation'));
|
|
192
|
-
const subscription = dataLoader(batchLoader('subscription'));
|
|
193
|
-
const loaders = {
|
|
194
|
-
query,
|
|
195
|
-
subscription,
|
|
196
|
-
mutation
|
|
197
|
-
};
|
|
198
|
-
return ({ op })=>{
|
|
199
|
-
return observable.observable((observer)=>{
|
|
200
|
-
const loader = loaders[op.type];
|
|
201
|
-
const { promise , cancel } = loader.load(op);
|
|
202
|
-
promise.then((res)=>{
|
|
203
|
-
const transformed = transformResult.transformResult(res.json, runtime);
|
|
204
|
-
if (!transformed.ok) {
|
|
205
|
-
observer.error(transformResult.TRPCClientError.from(transformed.error, {
|
|
206
|
-
meta: res.meta
|
|
207
|
-
}));
|
|
208
|
-
return;
|
|
209
|
-
}
|
|
210
|
-
observer.next({
|
|
211
|
-
context: res.meta,
|
|
212
|
-
result: transformed.result
|
|
213
|
-
});
|
|
214
|
-
observer.complete();
|
|
215
|
-
}).catch((err)=>observer.error(transformResult.TRPCClientError.from(err)));
|
|
216
|
-
return ()=>{
|
|
217
|
-
cancel();
|
|
218
|
-
};
|
|
219
|
-
});
|
|
220
|
-
};
|
|
221
|
-
};
|
|
222
|
-
}
|
|
223
11
|
|
|
224
|
-
exports.httpBatchLink = httpBatchLink;
|
|
12
|
+
exports.httpBatchLink = links_httpBatchLink.httpBatchLink;
|