@libp2p/utils 7.4.1-a9bae64cb → 7.4.1-e724dd173

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.
@@ -58,6 +58,11 @@ export declare abstract class AbstractMessageStream<Timeline extends MessageStre
58
58
  get writeBufferLength(): number;
59
59
  onDrain(options?: AbortOptions): Promise<void>;
60
60
  [Symbol.asyncIterator](): AsyncGenerator<Uint8Array | Uint8ArrayList>;
61
+ /**
62
+ * Returns true if nothing is buffered and nothing more will arrive, because
63
+ * the remote writable end is closed or our readable end is closing or closed
64
+ */
65
+ private readableDone;
61
66
  isReadable(): boolean;
62
67
  send(data: Uint8Array | Uint8ArrayList): boolean;
63
68
  /**
@@ -77,8 +82,8 @@ export declare abstract class AbstractMessageStream<Timeline extends MessageStre
77
82
  addEventListener<K extends keyof MessageStreamEvents>(type: K, listener: EventHandler<MessageStreamEvents[K]> | null, options?: boolean | AddEventListenerOptions): void;
78
83
  addEventListener(type: string, listener: EventHandler<Event>, options?: boolean | AddEventListenerOptions): void;
79
84
  /**
80
- * Receive a reset message - close immediately for reading and writing (remote
81
- * error)
85
+ * Receive a reset message (remote error) - close immediately for writing,
86
+ * buffered data can still be read. Ignored once the stream has closed
82
87
  */
83
88
  onRemoteReset(): void;
84
89
  /**
@@ -97,8 +102,8 @@ export declare abstract class AbstractMessageStream<Timeline extends MessageStre
97
102
  onRemoteCloseRead(): void;
98
103
  protected processSendQueue(): boolean;
99
104
  /**
100
- * Emit 'end' if nothing is buffered and no more data will be delivered.
101
- * Emits at most once
105
+ * If nothing is buffered and no more data will be delivered, end any active
106
+ * async iterators and emit 'end'. 'end' is emitted at most once
102
107
  */
103
108
  protected maybeDispatchEnd(): void;
104
109
  protected dispatchReadBuffer(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-message-stream.d.ts","sourceRoot":"","sources":["../../src/abstract-message-stream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract-message-stream.d.ts","sourceRoot":"","sources":["../../src/abstract-message-stream.ts"],"names":[],"mappings":"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"}
@@ -27,6 +27,16 @@ export class AbstractMessageStream extends TypedEventEmitter {
27
27
  writeBuffer;
28
28
  sendingData;
29
29
  #readableEnded = false;
30
+ /**
31
+ * The error the stream was aborted or reset with, thrown by async iterators
32
+ * after they have yielded all received data
33
+ */
34
+ #closeError;
35
+ /**
36
+ * Ends active async iterators. Unlike 'end' these run each time the readable
37
+ * end is done, eg. again after data is pushed back following 'end'
38
+ */
39
+ #iteratorEnds = new Set();
30
40
  onDrainPromise;
31
41
  constructor(init) {
32
42
  super();
@@ -90,31 +100,44 @@ export class AbstractMessageStream extends TypedEventEmitter {
90
100
  return raceSignal(this.onDrainPromise.promise, options?.signal);
91
101
  }
92
102
  async *[Symbol.asyncIterator]() {
93
- if (this.readStatus !== 'readable' && this.readStatus !== 'paused') {
94
- return;
95
- }
96
103
  const output = pushable();
104
+ let error;
97
105
  const streamAsyncIterableOnMessageListener = (evt) => {
98
106
  output.push(evt.data);
99
107
  };
100
108
  this.addEventListener('message', streamAsyncIterableOnMessageListener);
101
- const streamAsyncIterableOnCloseListener = (evt) => {
102
- output.end(evt.error);
103
- };
104
- this.addEventListener('close', streamAsyncIterableOnCloseListener);
105
- const streamAsyncIterableOnRemoteCloseWriteListener = () => {
109
+ const streamAsyncIterableEnd = () => {
110
+ this.#iteratorEnds.delete(streamAsyncIterableEnd);
111
+ // data pushed back later must stay buffered for the next reader
112
+ this.removeEventListener('message', streamAsyncIterableOnMessageListener);
113
+ // ending the pushable with an error discards data not yet yielded, so
114
+ // throw the error after the output drains instead
115
+ error = this.#closeError;
106
116
  output.end();
107
117
  };
108
- this.addEventListener('remoteCloseWrite', streamAsyncIterableOnRemoteCloseWriteListener);
118
+ this.#iteratorEnds.add(streamAsyncIterableEnd);
119
+ // there may already be nothing left to read
120
+ if (this.readableDone()) {
121
+ streamAsyncIterableEnd();
122
+ }
109
123
  try {
110
124
  yield* output;
125
+ if (error != null) {
126
+ throw error;
127
+ }
111
128
  }
112
129
  finally {
113
130
  this.removeEventListener('message', streamAsyncIterableOnMessageListener);
114
- this.removeEventListener('close', streamAsyncIterableOnCloseListener);
115
- this.removeEventListener('remoteCloseWrite', streamAsyncIterableOnRemoteCloseWriteListener);
131
+ this.#iteratorEnds.delete(streamAsyncIterableEnd);
116
132
  }
117
133
  }
134
+ /**
135
+ * Returns true if nothing is buffered and nothing more will arrive, because
136
+ * the remote writable end is closed or our readable end is closing or closed
137
+ */
138
+ readableDone() {
139
+ return this.readBuffer.byteLength === 0 && (this.remoteWriteStatus === 'closed' || this.readStatus === 'closing' || this.readStatus === 'closed');
140
+ }
118
141
  isReadable() {
119
142
  return this.status === 'open';
120
143
  }
@@ -132,10 +155,19 @@ export class AbstractMessageStream extends TypedEventEmitter {
132
155
  */
133
156
  abort(err) {
134
157
  if (this.status === 'aborted' || this.status === 'reset' || this.status === 'closed') {
158
+ // a paused reader can still hold unread data after the stream closes,
159
+ // discard it so iterators waiting on it end
160
+ if (this.readBuffer.byteLength > 0) {
161
+ this.#closeError ??= err;
162
+ this.readBuffer.consume(this.readBuffer.byteLength);
163
+ this.readStatus = 'closed';
164
+ this.maybeDispatchEnd();
165
+ }
135
166
  return;
136
167
  }
137
168
  this.log.error('abort with error - %e', err);
138
169
  this.status = 'aborted';
170
+ this.#closeError = err;
139
171
  // throw away unread data
140
172
  if (this.readBuffer.byteLength > 0) {
141
173
  this.readBuffer.consume(this.readBuffer.byteLength);
@@ -249,11 +281,17 @@ export class AbstractMessageStream extends TypedEventEmitter {
249
281
  }
250
282
  }
251
283
  /**
252
- * Receive a reset message - close immediately for reading and writing (remote
253
- * error)
284
+ * Receive a reset message (remote error) - close immediately for writing,
285
+ * buffered data can still be read. Ignored once the stream has closed
254
286
  */
255
287
  onRemoteReset() {
288
+ // only emit one 'close' event and keep the first close error
289
+ if (this.status === 'aborted' || this.status === 'reset' || this.status === 'closed') {
290
+ return;
291
+ }
256
292
  this.log('remote reset');
293
+ const err = new StreamResetError();
294
+ this.#closeError = err;
257
295
  this.status = 'reset';
258
296
  this.writeStatus = 'closed';
259
297
  this.remoteWriteStatus = 'closed';
@@ -263,7 +301,7 @@ export class AbstractMessageStream extends TypedEventEmitter {
263
301
  this.readStatus = 'closed';
264
302
  this.maybeDispatchEnd();
265
303
  }
266
- this.dispatchEvent(new StreamResetEvent(new StreamResetError()));
304
+ this.dispatchEvent(new StreamResetEvent(err));
267
305
  }
268
306
  /**
269
307
  * The underlying resource or transport this stream uses has closed - it is
@@ -404,14 +442,15 @@ export class AbstractMessageStream extends TypedEventEmitter {
404
442
  }
405
443
  }
406
444
  /**
407
- * Emit 'end' if nothing is buffered and no more data will be delivered.
408
- * Emits at most once
445
+ * If nothing is buffered and no more data will be delivered, end any active
446
+ * async iterators and emit 'end'. 'end' is emitted at most once
409
447
  */
410
448
  maybeDispatchEnd() {
411
- if (this.#readableEnded || this.readBuffer.byteLength > 0) {
449
+ if (!this.readableDone()) {
412
450
  return;
413
451
  }
414
- if (this.remoteWriteStatus !== 'closed' && this.readStatus !== 'closed') {
452
+ this.#iteratorEnds.forEach(end => { end(); });
453
+ if (this.#readableEnded) {
415
454
  return;
416
455
  }
417
456
  this.#readableEnded = true;
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-message-stream.js","sourceRoot":"","sources":["../../src/abstract-message-stream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract-message-stream.js","sourceRoot":"","sources":["../../src/abstract-message-stream.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-stream.d.ts","sourceRoot":"","sources":["../../src/abstract-stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE7D,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IAEV;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,8BAAsB,cAAe,SAAQ,qBAAsB,YAAW,MAAM;IAC3E,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;gBAEV,IAAI,EAAE,kBAAkB;IAO/B,KAAK,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C7C,SAAS,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBvD;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/D;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CAC/D"}
1
+ {"version":3,"file":"abstract-stream.d.ts","sourceRoot":"","sources":["../../src/abstract-stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE7D,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IAEV;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,8BAAsB,cAAe,SAAQ,qBAAsB,YAAW,MAAM;IAC3E,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;gBAEV,IAAI,EAAE,kBAAkB;IAO/B,KAAK,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C7C,SAAS,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BvD;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/D;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CAC/D"}
@@ -52,9 +52,21 @@ export class AbstractStream extends AbstractMessageStream {
52
52
  this.readBuffer.consume(this.readBuffer.byteLength);
53
53
  }
54
54
  this.readStatus = 'closing';
55
- await this.sendCloseRead(options);
56
- this.readStatus = 'closed';
55
+ // no more data can be read, so end iterators and emit 'end' without waiting
56
+ // for the remote to be told
57
57
  this.maybeDispatchEnd();
58
+ try {
59
+ await this.sendCloseRead(options);
60
+ }
61
+ catch (err) {
62
+ this.log.error('failed to close readable end - %e', err);
63
+ throw err;
64
+ }
65
+ finally {
66
+ // unread data has been discarded so the readable end is closed even if
67
+ // the remote could not be told
68
+ this.readStatus = 'closed';
69
+ }
58
70
  this.log('closed readable end gracefully');
59
71
  }
60
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-stream.js","sourceRoot":"","sources":["../../src/abstract-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAgBpE,MAAM,OAAgB,cAAe,SAAQ,qBAAqB;IACzD,EAAE,CAAQ;IACV,QAAQ,CAAQ;IAEvB,YAAa,IAAwB;QACnC,KAAK,CAAC,IAAI,CAAC,CAAA;QAEX,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,KAAK,CAAE,OAAsB;QACjC,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpE,OAAM;QACR,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;QAE5B,wEAAwE;QACxE,gCAAgC;QAChC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,GAAG,CAAC,+FAA+F,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;YACtI,MAAM,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE;gBACzB,GAAG,OAAO;gBACV,eAAe,EAAE;oBACf,OAAO;iBACR;aACF,CAAC,CAAA;QACJ,CAAC;QAED,4EAA4E;QAC5E,4BAA4B;QAC5B,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,qGAAqG,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;YAC9J,MAAM,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE;gBAC1B,GAAG,OAAO;gBACV,eAAe,EAAE;oBACf,OAAO;iBACR;aACF,CAAC,CAAA;YACF,IAAI,CAAC,GAAG,CAAC,kFAAkF,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QAC7I,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QAElC,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAA;QAE3B,IAAI,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;QAE1C,IAAI,IAAI,CAAC,iBAAiB,KAAK,QAAQ,EAAE,CAAC;YACxC,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,OAAsB;QACrC,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAClE,OAAM;QACR,CAAC;QAED,6BAA6B;QAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QACrD,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAE3B,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAEjC,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAA;QAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAEvB,IAAI,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC5C,CAAC;CAaF"}
1
+ {"version":3,"file":"abstract-stream.js","sourceRoot":"","sources":["../../src/abstract-stream.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@libp2p/utils",
3
- "version": "7.4.1-a9bae64cb",
3
+ "version": "7.4.1-e724dd173",
4
4
  "description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem",
5
5
  "license": "Apache-2.0 OR MIT",
6
6
  "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/utils#readme",
@@ -47,8 +47,8 @@
47
47
  "dependencies": {
48
48
  "@chainsafe/is-ip": "^2.1.0",
49
49
  "@chainsafe/netmask": "^2.0.0",
50
- "@libp2p/interface": "3.3.0-a9bae64cb",
51
- "@libp2p/logger": "6.2.13-a9bae64cb",
50
+ "@libp2p/interface": "3.3.0-e724dd173",
51
+ "@libp2p/logger": "6.2.13-e724dd173",
52
52
  "@multiformats/multiaddr": "^13.0.3",
53
53
  "@multiformats/multiaddr-matcher": "^3.0.2",
54
54
  "@sindresorhus/fnv1a": "^3.1.0",
@@ -72,8 +72,8 @@
72
72
  "uint8arrays": "^6.1.1"
73
73
  },
74
74
  "devDependencies": {
75
- "@libp2p/crypto": "5.1.23-a9bae64cb",
76
- "@libp2p/peer-id": "6.0.15-a9bae64cb",
75
+ "@libp2p/crypto": "5.1.23-e724dd173",
76
+ "@libp2p/peer-id": "6.0.15-e724dd173",
77
77
  "@types/netmask": "^2.0.5",
78
78
  "aegir": "^48.1.1",
79
79
  "benchmark": "^2.1.4",
@@ -67,6 +67,18 @@ export abstract class AbstractMessageStream<Timeline extends MessageStreamTimeli
67
67
 
68
68
  #readableEnded = false
69
69
 
70
+ /**
71
+ * The error the stream was aborted or reset with, thrown by async iterators
72
+ * after they have yielded all received data
73
+ */
74
+ #closeError?: Error
75
+
76
+ /**
77
+ * Ends active async iterators. Unlike 'end' these run each time the readable
78
+ * end is done, eg. again after data is pushed back following 'end'
79
+ */
80
+ readonly #iteratorEnds = new Set<() => void>()
81
+
70
82
  private onDrainPromise?: PromiseWithResolvers<void>
71
83
 
72
84
  constructor (init: MessageStreamInit) {
@@ -145,36 +157,51 @@ export abstract class AbstractMessageStream<Timeline extends MessageStreamTimeli
145
157
  }
146
158
 
147
159
  async * [Symbol.asyncIterator] (): AsyncGenerator<Uint8Array | Uint8ArrayList> {
148
- if (this.readStatus !== 'readable' && this.readStatus !== 'paused') {
149
- return
150
- }
151
-
152
160
  const output = pushable<Uint8Array | Uint8ArrayList>()
161
+ let error: Error | undefined
153
162
 
154
163
  const streamAsyncIterableOnMessageListener = (evt: StreamMessageEvent): void => {
155
164
  output.push(evt.data)
156
165
  }
157
166
  this.addEventListener('message', streamAsyncIterableOnMessageListener)
158
167
 
159
- const streamAsyncIterableOnCloseListener = (evt: StreamCloseEvent): void => {
160
- output.end(evt.error)
161
- }
162
- this.addEventListener('close', streamAsyncIterableOnCloseListener)
168
+ const streamAsyncIterableEnd = (): void => {
169
+ this.#iteratorEnds.delete(streamAsyncIterableEnd)
170
+ // data pushed back later must stay buffered for the next reader
171
+ this.removeEventListener('message', streamAsyncIterableOnMessageListener)
163
172
 
164
- const streamAsyncIterableOnRemoteCloseWriteListener = (): void => {
173
+ // ending the pushable with an error discards data not yet yielded, so
174
+ // throw the error after the output drains instead
175
+ error = this.#closeError
165
176
  output.end()
166
177
  }
167
- this.addEventListener('remoteCloseWrite', streamAsyncIterableOnRemoteCloseWriteListener)
178
+ this.#iteratorEnds.add(streamAsyncIterableEnd)
179
+
180
+ // there may already be nothing left to read
181
+ if (this.readableDone()) {
182
+ streamAsyncIterableEnd()
183
+ }
168
184
 
169
185
  try {
170
186
  yield * output
187
+
188
+ if (error != null) {
189
+ throw error
190
+ }
171
191
  } finally {
172
192
  this.removeEventListener('message', streamAsyncIterableOnMessageListener)
173
- this.removeEventListener('close', streamAsyncIterableOnCloseListener)
174
- this.removeEventListener('remoteCloseWrite', streamAsyncIterableOnRemoteCloseWriteListener)
193
+ this.#iteratorEnds.delete(streamAsyncIterableEnd)
175
194
  }
176
195
  }
177
196
 
197
+ /**
198
+ * Returns true if nothing is buffered and nothing more will arrive, because
199
+ * the remote writable end is closed or our readable end is closing or closed
200
+ */
201
+ private readableDone (): boolean {
202
+ return this.readBuffer.byteLength === 0 && (this.remoteWriteStatus === 'closed' || this.readStatus === 'closing' || this.readStatus === 'closed')
203
+ }
204
+
178
205
  isReadable (): boolean {
179
206
  return this.status === 'open'
180
207
  }
@@ -196,12 +223,22 @@ export abstract class AbstractMessageStream<Timeline extends MessageStreamTimeli
196
223
  */
197
224
  abort (err: Error): void {
198
225
  if (this.status === 'aborted' || this.status === 'reset' || this.status === 'closed') {
226
+ // a paused reader can still hold unread data after the stream closes,
227
+ // discard it so iterators waiting on it end
228
+ if (this.readBuffer.byteLength > 0) {
229
+ this.#closeError ??= err
230
+ this.readBuffer.consume(this.readBuffer.byteLength)
231
+ this.readStatus = 'closed'
232
+ this.maybeDispatchEnd()
233
+ }
234
+
199
235
  return
200
236
  }
201
237
 
202
238
  this.log.error('abort with error - %e', err)
203
239
 
204
240
  this.status = 'aborted'
241
+ this.#closeError = err
205
242
 
206
243
  // throw away unread data
207
244
  if (this.readBuffer.byteLength > 0) {
@@ -346,12 +383,20 @@ export abstract class AbstractMessageStream<Timeline extends MessageStreamTimeli
346
383
  }
347
384
 
348
385
  /**
349
- * Receive a reset message - close immediately for reading and writing (remote
350
- * error)
386
+ * Receive a reset message (remote error) - close immediately for writing,
387
+ * buffered data can still be read. Ignored once the stream has closed
351
388
  */
352
389
  onRemoteReset (): void {
390
+ // only emit one 'close' event and keep the first close error
391
+ if (this.status === 'aborted' || this.status === 'reset' || this.status === 'closed') {
392
+ return
393
+ }
394
+
353
395
  this.log('remote reset')
354
396
 
397
+ const err = new StreamResetError()
398
+ this.#closeError = err
399
+
355
400
  this.status = 'reset'
356
401
  this.writeStatus = 'closed'
357
402
  this.remoteWriteStatus = 'closed'
@@ -363,7 +408,7 @@ export abstract class AbstractMessageStream<Timeline extends MessageStreamTimeli
363
408
  this.maybeDispatchEnd()
364
409
  }
365
410
 
366
- this.dispatchEvent(new StreamResetEvent(new StreamResetError()))
411
+ this.dispatchEvent(new StreamResetEvent(err))
367
412
  }
368
413
 
369
414
  /**
@@ -539,15 +584,17 @@ export abstract class AbstractMessageStream<Timeline extends MessageStreamTimeli
539
584
  }
540
585
 
541
586
  /**
542
- * Emit 'end' if nothing is buffered and no more data will be delivered.
543
- * Emits at most once
587
+ * If nothing is buffered and no more data will be delivered, end any active
588
+ * async iterators and emit 'end'. 'end' is emitted at most once
544
589
  */
545
590
  protected maybeDispatchEnd (): void {
546
- if (this.#readableEnded || this.readBuffer.byteLength > 0) {
591
+ if (!this.readableDone()) {
547
592
  return
548
593
  }
549
594
 
550
- if (this.remoteWriteStatus !== 'closed' && this.readStatus !== 'closed') {
595
+ this.#iteratorEnds.forEach(end => { end() })
596
+
597
+ if (this.#readableEnded) {
551
598
  return
552
599
  }
553
600
 
@@ -81,11 +81,21 @@ export abstract class AbstractStream extends AbstractMessageStream implements St
81
81
 
82
82
  this.readStatus = 'closing'
83
83
 
84
- await this.sendCloseRead(options)
85
-
86
- this.readStatus = 'closed'
84
+ // no more data can be read, so end iterators and emit 'end' without waiting
85
+ // for the remote to be told
87
86
  this.maybeDispatchEnd()
88
87
 
88
+ try {
89
+ await this.sendCloseRead(options)
90
+ } catch (err) {
91
+ this.log.error('failed to close readable end - %e', err)
92
+ throw err
93
+ } finally {
94
+ // unread data has been discarded so the readable end is closed even if
95
+ // the remote could not be told
96
+ this.readStatus = 'closed'
97
+ }
98
+
89
99
  this.log('closed readable end gracefully')
90
100
  }
91
101