@peerbit/stream 4.4.0-780f7ce → 4.4.0-9b0640c

package/src/index.ts

@@ -60,7 +60,6 @@ import type {
 } from "@peerbit/stream-interface";
 import { AbortError, TimeoutError, delay } from "@peerbit/time";
 import { abortableSource } from "abortable-iterator";
-import { anySignal } from "any-signal";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
 import { type Pushable, pushable } from "it-pushable";
@@ -131,8 +130,6 @@ const DEFAULT_PRUNED_CONNNECTIONS_TIMEOUT = 30 * 1000;
 
 const ROUTE_UPDATE_DELAY_FACTOR = 3e4;
 
-const DEFAULT_CREATE_OUTBOUND_STREAM_TIMEOUT = 30_000;
-
 const getLaneFromPriority = (priority: number) => {
 	if (priority > 0) {
 		return 0;
@@ -265,31 +262,14 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 			raw,
 		).catch((e: any) => {
 			candidate.aborted = true;
-			try {
-				pushableInst.end(e);
-			} catch {}
 			logError(e as { message: string } as any);
 		});
 		this.outboundStreams.push(candidate);
 		const origAbort = raw.abort?.bind(raw);
 		raw.abort = (err?: any) => {
 			candidate.aborted = true;
-			try {
-				pushableInst.end(err);
-			} catch {}
 			return origAbort?.(err);
 		};
-
-		const origClose = raw.close?.bind(raw);
-		if (origClose) {
-			raw.close = (...args: any[]) => {
-				candidate.aborted = true;
-				try {
-					pushableInst.end();
-				} catch {}
-				return origClose(...args);
-			};
-		}
 		return candidate;
 	}
 
@@ -330,7 +310,7 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 	 * Do we have a connection to write on?
 	 */
 	get isWritable() {
-		return this.outboundStreams.some((c) => !c.aborted);
+		return this.outboundStreams.length > 0;
 	}
 
 	get usedBandwidth() {
@@ -362,12 +342,6 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 		let failures: any[] = [];
 		const failed: OutboundCandidate[] = [];
 		for (const c of this.outboundStreams) {
-			if (c.aborted) {
-				failures.push(new Error("aborted"));
-				failed.push(c);
-				continue;
-			}
-
 			try {
 				c.pushable.push(
 					payload,
@@ -399,9 +373,6 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 					(c) => !failed.includes(c),
 				);
 				for (const f of failed) {
-					try {
-						f.pushable.end(new AbortError("Failed write" as any));
-					} catch {}
 					try {
 						f.raw.abort?.(new AbortError("Failed write" as any));
 					} catch {}
@@ -841,7 +812,7 @@ export abstract class DirectStream<
 	private routeMaxRetentionPeriod: number;
 
 	// for sequential creation of outbound streams
-	public outboundInflightQueue: Pushable<{
+	private outboundInflightQueue: Pushable<{
 		connection: Connection;
 		peerId: PeerId;
 	}>;
@@ -850,7 +821,6 @@ export abstract class DirectStream<
 	seekTimeout: number;
 	closeController: AbortController;
 	session: number;
-	_outboundPump: ReturnType<typeof pipe> | undefined;
 
 	private _ackCallbacks: Map<
 		string,
@@ -967,76 +937,16 @@ export abstract class DirectStream<
 		this.closeController = new AbortController();
 
 		this.outboundInflightQueue = pushable({ objectMode: true });
-
-		const drainOutbound = async (
-			source: AsyncIterable<{ peerId: PeerId; connection: Connection }>,
-		) => {
+		pipe(this.outboundInflightQueue, async (source) => {
 			for await (const { peerId, connection } of source) {
-				if (this.stopping || !this.started) break; // do not 'return' – finish loop cleanly
-
-				// Skip closed/closing connections
-				if (connection?.timeline?.close != null) {
-					logger.debug(
-						"skip outbound stream on closed connection %s",
-						connection.remoteAddr?.toString(),
-					);
-					continue;
-				}
-
-				try {
-					// Pass an abort + timeout into your stream open so it cannot hang forever
-					const attemptSignal = anySignal([
-						this.closeController.signal,
-						AbortSignal.timeout(DEFAULT_CREATE_OUTBOUND_STREAM_TIMEOUT), // pick a sensible per-attempt cap
-					]);
-					try {
-						await this.createOutboundStream(peerId, connection, {
-							signal: attemptSignal,
-						});
-					} finally {
-						attemptSignal.clear?.();
-					}
-				} catch (e: any) {
-					// Treat common shutdowny errors as transient – do NOT crash the pump
-					const msg = String(e?.message ?? e);
-					if (
-						e?.code === "ERR_STREAM_RESET" ||
-						/unexpected end of input|ECONNRESET|EPIPE|Muxer closed|Premature close/i.test(
-							msg,
-						)
-					) {
-						logger.debug(
-							"createOutboundStream transient failure (%s): %s",
-							connection?.remoteAddr,
-							msg,
-						);
-					} else {
-						logger.warn(
-							"createOutboundStream failed (%s): %o",
-							connection?.remoteAddr,
-							e,
-						);
-					}
-					// continue to next item
+				if (this.stopping || this.started === false) {
+					return;
 				}
+				await this.createOutboundStream(peerId, connection);
 			}
-		};
-
-		this._outboundPump = pipe(this.outboundInflightQueue, drainOutbound).catch(
-			(e) => {
-				// Only log if we didn't intentionally abort
-				if (!this.closeController.signal.aborted) {
-					logger.error("outbound inflight pipeline crashed: %o", e);
-					// Optional: restart the pump to self-heal
-					this._outboundPump = pipe(
-						this.outboundInflightQueue,
-						drainOutbound,
-					).catch((err) =>
-						logger.error("outbound pump crashed again: %o", err),
-					);
-				}
-			},
-		);
+		}).catch((e) => {
+			logger.error("outbound inflight queue error: " + e?.toString());
+		});
 
 		this.closeController.signal.addEventListener("abort", () => {
 			this.outboundInflightQueue.return();
@@ -1213,11 +1123,7 @@ export abstract class DirectStream<
 		await this.outboundInflightQueue.push({ peerId, connection });
 	}
 
-	protected async createOutboundStream(
-		peerId: PeerId,
-		connection: Connection,
-		opts?: { signal?: AbortSignal },
-	) {
+	protected async createOutboundStream(peerId: PeerId, connection: Connection) {
 		for (const existingStreams of connection.streams) {
 			if (
 				existingStreams.protocol &&
@@ -1244,10 +1150,7 @@ export abstract class DirectStream<
 					// research whether we can do without this so we can push data without beeing able to send
 					// more info here https://github.com/libp2p/js-libp2p/issues/2321
 					negotiateFully: true,
-					signal: anySignal([
-						this.closeController.signal,
-						...(opts?.signal ? [opts.signal] : []),
-					]),
+					signal: this.closeController.signal,
 				});
 
 				if (stream.protocol == null) {