@trpc/server 11.0.0-alpha-tmp-issues-5851-take-two.454 → 11.0.0-alpha-tmp-issues-5851-take-two.458

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.
@@ -1,12 +1,12 @@
1
1
  {
2
- "bundleSize": 131681,
3
- "bundleOrigSize": 181073,
4
- "bundleReduction": 27.28,
2
+ "bundleSize": 131586,
3
+ "bundleOrigSize": 180977,
4
+ "bundleReduction": 27.29,
5
5
  "modules": [
6
6
  {
7
7
  "id": "/src/unstable-core-do-not-import/stream/jsonl.ts",
8
- "size": 17569,
9
- "origSize": 18310,
8
+ "size": 17474,
9
+ "origSize": 18214,
10
10
  "renderedExports": [
11
11
  "isPromise",
12
12
  "jsonlStreamProducer",
@@ -17,8 +17,8 @@
17
17
  "/src/unstable-core-do-not-import.ts",
18
18
  "/src/unstable-core-do-not-import/http/resolveResponse.ts"
19
19
  ],
20
- "percent": 13.34,
21
- "reduction": 4.05
20
+ "percent": 13.28,
21
+ "reduction": 4.06
22
22
  },
23
23
  {
24
24
  "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -31,7 +31,7 @@
31
31
  "dependents": [
32
32
  "/src/unstable-core-do-not-import.ts"
33
33
  ],
34
- "percent": 12.97,
34
+ "percent": 12.98,
35
35
  "reduction": 0
36
36
  },
37
37
  {
@@ -46,7 +46,7 @@
46
46
  "dependents": [
47
47
  "/src/adapters/fastify/fastifyTRPCPlugin.ts"
48
48
  ],
49
- "percent": 10.84,
49
+ "percent": 10.85,
50
50
  "reduction": 0
51
51
  },
52
52
  {
@@ -94,7 +94,7 @@
94
94
  "/src/unstable-core-do-not-import.ts",
95
95
  "/src/unstable-core-do-not-import/initTRPC.ts"
96
96
  ],
97
- "percent": 4.8,
97
+ "percent": 4.81,
98
98
  "reduction": 60.06
99
99
  },
100
100
  {
@@ -127,7 +127,7 @@
127
127
  "dependents": [
128
128
  "/src/adapters/aws-lambda/index.ts"
129
129
  ],
130
- "percent": 4.11,
130
+ "percent": 4.12,
131
131
  "reduction": 11.38
132
132
  },
133
133
  {
@@ -147,7 +147,7 @@
147
147
  "/src/unstable-core-do-not-import/http/resolveResponse.ts",
148
148
  "/src/observable/operators.ts"
149
149
  ],
150
- "percent": 3.4,
150
+ "percent": 3.41,
151
151
  "reduction": 0
152
152
  },
153
153
  {
@@ -193,11 +193,11 @@
193
193
  "removedExports": [],
194
194
  "dependents": [
195
195
  "/src/unstable-core-do-not-import.ts",
196
+ "/src/unstable-core-do-not-import/http/resolveResponse.ts",
196
197
  "/src/unstable-core-do-not-import/initTRPC.ts",
197
- "/src/unstable-core-do-not-import/router.ts",
198
- "/src/unstable-core-do-not-import/http/resolveResponse.ts"
198
+ "/src/unstable-core-do-not-import/router.ts"
199
199
  ],
200
- "percent": 2.08,
200
+ "percent": 2.09,
201
201
  "reduction": 45.94
202
202
  },
203
203
  {
@@ -245,7 +245,7 @@
245
245
  "/src/unstable-core-do-not-import/initTRPC.ts",
246
246
  "/src/unstable-core-do-not-import/procedureBuilder.ts"
247
247
  ],
248
- "percent": 1.99,
248
+ "percent": 2,
249
249
  "reduction": 55.5
250
250
  },
251
251
  {
@@ -319,11 +319,11 @@
319
319
  "removedExports": [],
320
320
  "dependents": [
321
321
  "/src/unstable-core-do-not-import.ts",
322
+ "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
323
+ "/src/unstable-core-do-not-import/http/resolveResponse.ts",
322
324
  "/src/unstable-core-do-not-import/stream/sse.ts",
323
325
  "/src/unstable-core-do-not-import/middleware.ts",
324
326
  "/src/unstable-core-do-not-import/router.ts",
325
- "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
326
- "/src/unstable-core-do-not-import/http/resolveResponse.ts",
327
327
  "/src/unstable-core-do-not-import/http/contentType.ts",
328
328
  "/src/unstable-core-do-not-import/procedureBuilder.ts",
329
329
  "/src/unstable-core-do-not-import/stream/jsonl.ts"
@@ -393,8 +393,8 @@
393
393
  "removedExports": [],
394
394
  "dependents": [
395
395
  "/src/unstable-core-do-not-import.ts",
396
- "/src/unstable-core-do-not-import/error/getErrorShape.ts",
397
- "/src/unstable-core-do-not-import/http/resolveResponse.ts"
396
+ "/src/unstable-core-do-not-import/http/resolveResponse.ts",
397
+ "/src/unstable-core-do-not-import/error/getErrorShape.ts"
398
398
  ],
399
399
  "percent": 0.98,
400
400
  "reduction": 18.7
@@ -415,15 +415,15 @@
415
415
  "removedExports": [],
416
416
  "dependents": [
417
417
  "/src/unstable-core-do-not-import.ts",
418
+ "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
419
+ "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
420
+ "/src/unstable-core-do-not-import/http/resolveResponse.ts",
421
+ "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
418
422
  "/src/unstable-core-do-not-import/error/TRPCError.ts",
419
423
  "/src/unstable-core-do-not-import/stream/sse.ts",
420
424
  "/src/unstable-core-do-not-import/transformer.ts",
421
425
  "/src/unstable-core-do-not-import/middleware.ts",
422
426
  "/src/unstable-core-do-not-import/router.ts",
423
- "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
424
- "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
425
- "/src/unstable-core-do-not-import/http/resolveResponse.ts",
426
- "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
427
427
  "/src/unstable-core-do-not-import/http/contentType.ts",
428
428
  "/src/unstable-core-do-not-import/procedureBuilder.ts",
429
429
  "/src/unstable-core-do-not-import/stream/jsonl.ts"
@@ -473,7 +473,7 @@
473
473
  "dependents": [
474
474
  "/src/unstable-core-do-not-import.ts"
475
475
  ],
476
- "percent": 0.8,
476
+ "percent": 0.81,
477
477
  "reduction": 0
478
478
  },
479
479
  {
@@ -592,7 +592,7 @@
592
592
  ],
593
593
  "removedExports": [],
594
594
  "dependents": [],
595
- "percent": 0.39,
595
+ "percent": 0.4,
596
596
  "reduction": 67.09
597
597
  },
598
598
  {
@@ -709,16 +709,6 @@
709
709
  "percent": 0.05,
710
710
  "reduction": 93.8
711
711
  },
712
- {
713
- "id": "/src/index.ts",
714
- "size": 0,
715
- "origSize": 32,
716
- "renderedExports": [],
717
- "removedExports": [],
718
- "dependents": [],
719
- "percent": 0,
720
- "reduction": 100
721
- },
722
712
  {
723
713
  "id": "/src/http.ts",
724
714
  "size": 0,
@@ -741,6 +731,16 @@
741
731
  "percent": 0,
742
732
  "reduction": 100
743
733
  },
734
+ {
735
+ "id": "/src/index.ts",
736
+ "size": 0,
737
+ "origSize": 32,
738
+ "renderedExports": [],
739
+ "removedExports": [],
740
+ "dependents": [],
741
+ "percent": 0,
742
+ "reduction": 100
743
+ },
744
744
  {
745
745
  "id": "/src/shared.ts",
746
746
  "size": 0,
@@ -93,6 +93,7 @@ export declare function jsonlStreamConsumer<THead>(opts: {
93
93
  formatError?: (opts: {
94
94
  error: unknown;
95
95
  }) => Error;
96
+ abortController: AbortController | null;
96
97
  }): Promise<readonly [Awaited<THead>, {
97
98
  readonly controllers: Map<ChunkIndex, {
98
99
  controller: ReadableStreamDefaultController<ChunkData | StreamInterruptedError>;
@@ -1 +1 @@
1
- {"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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"}
@@ -321,7 +321,6 @@ function createConsumerStream(from) {
321
321
  * @see https://jsonlines.org/
322
322
  */ async function jsonlStreamConsumer(opts) {
323
323
  const { deserialize =(v)=>v } = opts;
324
- const streamAbortController = new AbortController();
325
324
  let source = createConsumerStream(opts.from);
326
325
  if (deserialize) {
327
326
  source = source.pipeThrough(new TransformStream({
@@ -333,6 +332,12 @@ function createConsumerStream(from) {
333
332
  let headDeferred = createDeferred.createDeferred();
334
333
  const chunkDeferred = new Map();
335
334
  const controllers = new Map();
335
+ const maybeAbortStream = ()=>{
336
+ if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
337
+ // nothing is listening to the stream anymore
338
+ opts.abortController?.abort();
339
+ }
340
+ };
336
341
  function hydrateChunkDefinition(value, path) {
337
342
  const [_path, type, chunkId] = value;
338
343
  const { readable , controller } = createReadableStream.createReadableStream();
@@ -377,6 +382,7 @@ function createConsumerStream(from) {
377
382
  }).catch(reject).finally(()=>{
378
383
  // reader.releaseLock();
379
384
  controllers.delete(chunkId);
385
+ maybeAbortStream();
380
386
  });
381
387
  });
382
388
  }
@@ -407,12 +413,14 @@ function createConsumerStream(from) {
407
413
  };
408
414
  case ASYNC_ITERABLE_STATUS_DONE:
409
415
  controllers.delete(chunkId);
416
+ maybeAbortStream();
410
417
  return {
411
418
  done: true,
412
419
  value: undefined
413
420
  };
414
421
  case ASYNC_ITERABLE_STATUS_ERROR:
415
422
  controllers.delete(chunkId);
423
+ maybeAbortStream();
416
424
  throw opts.formatError?.({
417
425
  error: data
418
426
  }) ?? new AsyncError(data);
@@ -420,10 +428,7 @@ function createConsumerStream(from) {
420
428
  },
421
429
  return: async ()=>{
422
430
  wrapper.returned = true;
423
- if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
424
- // nothing is listening to the stream anymore
425
- streamAbortController.abort();
426
- }
431
+ maybeAbortStream();
427
432
  return {
428
433
  done: true,
429
434
  value: undefined
@@ -465,11 +470,6 @@ function createConsumerStream(from) {
465
470
  controllers.clear();
466
471
  };
467
472
  source.pipeTo(new WritableStream({
468
- start (controller) {
469
- streamAbortController.signal.addEventListener('abort', ()=>{
470
- controller.error(streamAbortController.signal.reason);
471
- });
472
- },
473
473
  async write (chunkOrHead) {
474
474
  if (headDeferred) {
475
475
  const head = chunkOrHead;
@@ -319,7 +319,6 @@ function createConsumerStream(from) {
319
319
  * @see https://jsonlines.org/
320
320
  */ async function jsonlStreamConsumer(opts) {
321
321
  const { deserialize =(v)=>v } = opts;
322
- const streamAbortController = new AbortController();
323
322
  let source = createConsumerStream(opts.from);
324
323
  if (deserialize) {
325
324
  source = source.pipeThrough(new TransformStream({
@@ -331,6 +330,12 @@ function createConsumerStream(from) {
331
330
  let headDeferred = createDeferred();
332
331
  const chunkDeferred = new Map();
333
332
  const controllers = new Map();
333
+ const maybeAbortStream = ()=>{
334
+ if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
335
+ // nothing is listening to the stream anymore
336
+ opts.abortController?.abort();
337
+ }
338
+ };
334
339
  function hydrateChunkDefinition(value, path) {
335
340
  const [_path, type, chunkId] = value;
336
341
  const { readable , controller } = createReadableStream();
@@ -375,6 +380,7 @@ function createConsumerStream(from) {
375
380
  }).catch(reject).finally(()=>{
376
381
  // reader.releaseLock();
377
382
  controllers.delete(chunkId);
383
+ maybeAbortStream();
378
384
  });
379
385
  });
380
386
  }
@@ -405,12 +411,14 @@ function createConsumerStream(from) {
405
411
  };
406
412
  case ASYNC_ITERABLE_STATUS_DONE:
407
413
  controllers.delete(chunkId);
414
+ maybeAbortStream();
408
415
  return {
409
416
  done: true,
410
417
  value: undefined
411
418
  };
412
419
  case ASYNC_ITERABLE_STATUS_ERROR:
413
420
  controllers.delete(chunkId);
421
+ maybeAbortStream();
414
422
  throw opts.formatError?.({
415
423
  error: data
416
424
  }) ?? new AsyncError(data);
@@ -418,10 +426,7 @@ function createConsumerStream(from) {
418
426
  },
419
427
  return: async ()=>{
420
428
  wrapper.returned = true;
421
- if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
422
- // nothing is listening to the stream anymore
423
- streamAbortController.abort();
424
- }
429
+ maybeAbortStream();
425
430
  return {
426
431
  done: true,
427
432
  value: undefined
@@ -463,11 +468,6 @@ function createConsumerStream(from) {
463
468
  controllers.clear();
464
469
  };
465
470
  source.pipeTo(new WritableStream({
466
- start (controller) {
467
- streamAbortController.signal.addEventListener('abort', ()=>{
468
- controller.error(streamAbortController.signal.reason);
469
- });
470
- },
471
471
  async write (chunkOrHead) {
472
472
  if (headDeferred) {
473
473
  const head = chunkOrHead;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "11.0.0-alpha-tmp-issues-5851-take-two.454+1fa4b0c5f",
3
+ "version": "11.0.0-alpha-tmp-issues-5851-take-two.458+a4c9a078a",
4
4
  "description": "The tRPC server library",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -149,5 +149,5 @@
149
149
  "funding": [
150
150
  "https://trpc.io/sponsor"
151
151
  ],
152
- "gitHead": "1fa4b0c5ff4a47b02497c580f464d5aa01356c8d"
152
+ "gitHead": "a4c9a078a9c1ef9bfe1f6c9d94bbe28b61fc9a54"
153
153
  }
@@ -422,9 +422,9 @@ export async function jsonlStreamConsumer<THead>(opts: {
422
422
  deserialize?: Deserialize;
423
423
  onError?: ConsumerOnError;
424
424
  formatError?: (opts: { error: unknown }) => Error;
425
+ abortController: AbortController | null;
425
426
  }) {
426
427
  const { deserialize = (v) => v } = opts;
427
- const streamAbortController = new AbortController();
428
428
 
429
429
  let source = createConsumerStream<Head>(opts.from);
430
430
  if (deserialize) {
@@ -447,6 +447,16 @@ export async function jsonlStreamConsumer<THead>(opts: {
447
447
  const chunkDeferred = new Map<ChunkIndex, Deferred<ControllerWrapper>>();
448
448
  const controllers = new Map<ChunkIndex, ControllerWrapper>();
449
449
 
450
+ const maybeAbortStream = () => {
451
+ if (
452
+ chunkDeferred.size === 0 &&
453
+ Array.from(controllers.values()).every((it) => it.returned)
454
+ ) {
455
+ // nothing is listening to the stream anymore
456
+ opts.abortController?.abort();
457
+ }
458
+ };
459
+
450
460
  function hydrateChunkDefinition(value: ChunkDefinition, path: PathArray) {
451
461
  const [_path, type, chunkId] = value;
452
462
 
@@ -486,6 +496,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
486
496
  switch (status) {
487
497
  case PROMISE_STATUS_FULFILLED:
488
498
  resolve(hydrate(data, path));
499
+
489
500
  break;
490
501
  case PROMISE_STATUS_REJECTED:
491
502
  reject(
@@ -498,6 +509,8 @@ export async function jsonlStreamConsumer<THead>(opts: {
498
509
  .finally(() => {
499
510
  // reader.releaseLock();
500
511
  controllers.delete(chunkId);
512
+
513
+ maybeAbortStream();
501
514
  });
502
515
  });
503
516
  }
@@ -529,12 +542,14 @@ export async function jsonlStreamConsumer<THead>(opts: {
529
542
  };
530
543
  case ASYNC_ITERABLE_STATUS_DONE:
531
544
  controllers.delete(chunkId);
545
+ maybeAbortStream();
532
546
  return {
533
547
  done: true,
534
548
  value: undefined,
535
549
  };
536
550
  case ASYNC_ITERABLE_STATUS_ERROR:
537
551
  controllers.delete(chunkId);
552
+ maybeAbortStream();
538
553
  throw (
539
554
  opts.formatError?.({ error: data }) ??
540
555
  new AsyncError(data)
@@ -543,13 +558,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
543
558
  },
544
559
  return: async () => {
545
560
  wrapper.returned = true;
546
- if (
547
- chunkDeferred.size === 0 &&
548
- Array.from(controllers.values()).every((it) => it.returned)
549
- ) {
550
- // nothing is listening to the stream anymore
551
- streamAbortController.abort();
552
- }
561
+ maybeAbortStream();
553
562
  return {
554
563
  done: true,
555
564
  value: undefined,
@@ -599,11 +608,6 @@ export async function jsonlStreamConsumer<THead>(opts: {
599
608
  source
600
609
  .pipeTo(
601
610
  new WritableStream({
602
- start(controller) {
603
- streamAbortController.signal.addEventListener('abort', () => {
604
- controller.error(streamAbortController.signal.reason);
605
- });
606
- },
607
611
  async write(chunkOrHead) {
608
612
  if (headDeferred) {
609
613
  const head = chunkOrHead as Record<number | string, unknown>;