@peerbit/stream 3.0.10 → 3.1.0

package/lib/esm/pushable-lanes.js

@@ -0,0 +1,262 @@
+import defer from "p-defer";
+import GenericFIFO from "fast-fifo";
+export class AbortError extends Error {
+    type;
+    code;
+    constructor(message, code) {
+        super(message ?? "The operation was aborted");
+        this.type = "aborted";
+        this.code = code ?? "ABORT_ERR";
+    }
+}
+/**
+ * Fifo but with total readableLength counter
+ */
+class Uint8ArrayFifo extends GenericFIFO {
+    size = 0;
+    push(val) {
+        if (val.value) {
+            this.size += val.value.byteLength;
+        }
+        return super.push(val);
+    }
+    shift() {
+        const shifted = super.shift();
+        if (shifted?.value) {
+            this.size -= shifted.value.byteLength;
+        }
+        return shifted;
+    }
+}
+/**
+ * A queue consisting of multiple 'lanes' with different priority to be emptied.
+ * The lane with index 0 will empty before lane with index 1 etc..
+ * TODO add an additional proprty to control whether we  we pick objects from slower lanes
+ * so no lane get really "stuck"
+ */
+class Uint8arrayPriorityQueue {
+    lanes;
+    constructor(options = { lanes: 1 }) {
+        this.lanes = new Array(options.lanes);
+        for (let i = 0; i < this.lanes.length; i++) {
+            this.lanes[i] = new Uint8ArrayFifo();
+        }
+    }
+    get size() {
+        let sum = 0;
+        for (const lane of this.lanes) {
+            sum += lane.size;
+        }
+        return sum;
+    }
+    push(val, lane) {
+        return this.lanes[lane].push(val);
+    }
+    shift() {
+        // fetch the first non undefined item.
+        // by iterating from index 0 up we define that lanes with lower index have higher prioirity
+        for (const lane of this.lanes) {
+            const element = lane.shift();
+            if (element) {
+                return element;
+            }
+        }
+        return undefined;
+    }
+    isEmpty() {
+        for (const lane of this.lanes) {
+            if (!lane.isEmpty()) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+export function pushableLanes(options = {}) {
+    return _pushable(options);
+}
+// Modified from https://github.com/alanshaw/it-pushable
+function _pushable(options) {
+    options = options ?? {};
+    let onEnd = options.onEnd;
+    let buffer = new Uint8arrayPriorityQueue(options.lanes ? { lanes: options.lanes } : undefined);
+    let pushable;
+    let onNext;
+    let ended;
+    let drain = defer();
+    const getNext = () => {
+        const next = buffer.shift();
+        if (next == null) {
+            return { done: true };
+        }
+        if (next.error != null) {
+            throw next.error;
+        }
+        return {
+            done: next.done === true,
+            // @ts-expect-error if done is false, value will be present
+            value: next.value
+        };
+    };
+    const waitNext = async () => {
+        try {
+            if (!buffer.isEmpty()) {
+                return getNext();
+            }
+            if (ended) {
+                return { done: true };
+            }
+            return await new Promise((resolve, reject) => {
+                onNext = (next, lane) => {
+                    onNext = null;
+                    buffer.push(next, lane);
+                    try {
+                        resolve(getNext());
+                    }
+                    catch (err) {
+                        reject(err);
+                    }
+                    return pushable;
+                };
+            });
+        }
+        finally {
+            if (buffer.isEmpty()) {
+                // settle promise in the microtask queue to give consumers a chance to
+                // await after calling .push
+                queueMicrotask(() => {
+                    drain.resolve();
+                    drain = defer();
+                });
+            }
+        }
+    };
+    const bufferNext = (next, lane) => {
+        if (onNext != null) {
+            return onNext(next, lane);
+        }
+        buffer.push(next, lane);
+        return pushable;
+    };
+    const bufferError = (err) => {
+        buffer = new Uint8ArrayFifo();
+        if (onNext != null) {
+            return onNext({ error: err }, 0);
+        }
+        buffer.push({ error: err });
+        return pushable;
+    };
+    const push = (value, lane = 0) => {
+        if (ended) {
+            return pushable;
+        }
+        return bufferNext({ done: false, value }, lane);
+    };
+    const end = (err) => {
+        if (ended)
+            return pushable;
+        ended = true;
+        return err != null ? bufferError(err) : bufferNext({ done: true }, 0);
+    };
+    const _return = () => {
+        buffer = new Uint8ArrayFifo();
+        end();
+        return { done: true };
+    };
+    const _throw = (err) => {
+        end(err);
+        return { done: true };
+    };
+    pushable = {
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+        next: waitNext,
+        return: _return,
+        throw: _throw,
+        push,
+        end,
+        get readableLength() {
+            return buffer.size;
+        },
+        getReadableLength(lane) {
+            if (lane == null) {
+                return buffer.size;
+            }
+            if (buffer instanceof Uint8arrayPriorityQueue) {
+                return buffer.lanes[lane].size;
+            }
+            throw new Error("Missing lane info");
+        },
+        onEmpty: async (options) => {
+            const signal = options?.signal;
+            signal?.throwIfAborted();
+            if (buffer.isEmpty()) {
+                return;
+            }
+            let cancel;
+            let listener;
+            if (signal != null) {
+                cancel = new Promise((resolve, reject) => {
+                    listener = () => {
+                        reject(new AbortError());
+                    };
+                    signal.addEventListener("abort", listener);
+                });
+            }
+            try {
+                await Promise.race([drain.promise, cancel]);
+            }
+            finally {
+                if (listener != null && signal != null) {
+                    signal?.removeEventListener("abort", listener);
+                }
+            }
+        }
+    };
+    if (onEnd == null) {
+        return pushable;
+    }
+    const _pushable = pushable;
+    pushable = {
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+        next() {
+            return _pushable.next();
+        },
+        throw(err) {
+            _pushable.throw(err);
+            if (onEnd != null) {
+                onEnd(err);
+                onEnd = undefined;
+            }
+            return { done: true };
+        },
+        return() {
+            _pushable.return();
+            if (onEnd != null) {
+                onEnd();
+                onEnd = undefined;
+            }
+            return { done: true };
+        },
+        push,
+        end(err) {
+            _pushable.end(err);
+            if (onEnd != null) {
+                onEnd(err);
+                onEnd = undefined;
+            }
+            return pushable;
+        },
+        get readableLength() {
+            return _pushable.readableLength;
+        },
+        onEmpty: (opts) => {
+            return _pushable.onEmpty(opts);
+        }
+    };
+    return pushable;
+}
+//# sourceMappingURL=pushable-lanes.js.map

package/lib/esm/pushable-lanes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pushable-lanes.js","sourceRoot":"","sources":["../../src/pushable-lanes.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@peerbit/stream",
-	"version": "3.0.10",
+	"version": "3.1.0",
 	"description": "A building block for direct streaming protocols",
 	"type": "module",
 	"sideEffects": false,
@@ -50,18 +50,20 @@
 		"dao.xyz"
 	],
 	"devDependencies": {
-		"@peerbit/libp2p-test-utils": "2.1.1",
+		"@peerbit/libp2p-test-utils": "2.1.2",
+		"@types/fast-fifo": "^1.0.2",
 		"@types/yallist": "^4.0.1"
 	},
 	"dependencies": {
 		"@dao-xyz/borsh": "^5.2.1",
 		"@peerbit/cache": "2.0.6",
 		"@peerbit/crypto": "2.1.7",
-		"@peerbit/stream-interface": "^3.0.8",
+		"@peerbit/stream-interface": "^3.0.9",
 		"abortable-iterator": "^5.0.1",
+		"fast-fifo": "^1.3.2",
 		"libp2p": "^1.2.1",
 		"p-queue": "^8.0.1",
 		"yallist": "^4.0.0"
 	},
-	"gitHead": "82d6f528faf0a4e060e400314bc01bc7260c41a5"
+	"gitHead": "0953a22f7a7ad21e89d0d4ee0673b0569da27f87"
 }

package/src/index.ts

@@ -3,8 +3,7 @@ import { pipe } from "it-pipe";
 import Queue from "p-queue";
 import type { PeerId } from "@libp2p/interface";
 import type { Connection } from "@libp2p/interface";
-import type { Pushable } from "it-pushable";
-import { pushable } from "it-pushable";
+import { PushableLanes, pushableLanes } from "./pushable-lanes.js";
 import type { Stream } from "@libp2p/interface";
 import { Uint8ArrayList } from "uint8arraylist";
 import { abortableSource } from "abortable-iterator";
@@ -13,7 +12,6 @@ import { MAX_ROUTE_DISTANCE, Routes } from "./routes.js";
 import type { IncomingStreamData, Registrar } from "@libp2p/interface-internal";
 import type { AddressManager } from "@libp2p/interface-internal";
 import type { ConnectionManager } from "@libp2p/interface-internal";
-
 import { PeerStore } from "@libp2p/interface";
 import pDefer from "p-defer";
 
@@ -53,7 +51,8 @@ import {
 	TracedDelivery,
 	AnyWhere,
 	NotStartedError,
-	deliveryModeHasReceiver
+	deliveryModeHasReceiver,
+	DeliveryError
 } from "@peerbit/stream-interface";
 
 import { MultiAddrinfo } from "@peerbit/stream-interface";
@@ -63,6 +62,7 @@ export { BandwidthTracker }; // might be useful for others
 const logError = (e?: { message: string }) => {
 	return logger.error(e?.message);
 };
+
 export interface PeerStreamsInit {
 	peerId: PeerId;
 	publicKey: PublicSignKey;
@@ -114,7 +114,8 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 	/**
 	 * Write stream - it's preferable to use the write method
 	 */
-	public outboundStream?: Pushable<Uint8Array>;
+	public outboundStream?: PushableLanes<Uint8Array>;
+
 	/**
 	 * Read stream
 	 */
@@ -122,11 +123,11 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 	/**
 	 * The raw outbound stream, as retrieved from conn.newStream
 	 */
-	public _rawOutboundStream?: Stream;
+	public rawOutboundStream?: Stream;
 	/**
 	 * The raw inbound stream, as retrieved from the callback from libp2p.handle
 	 */
-	public _rawInboundStream?: Stream;
+	public rawInboundStream?: Stream;
 	/**
 	 * An AbortController for controlled shutdown of the  treams
 	 */
@@ -174,7 +175,7 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 	 * Send a message to this peer.
 	 * Throws if there is no `stream` to write to available.
 	 */
-	write(data: Uint8Array | Uint8ArrayList) {
+	write(data: Uint8Array | Uint8ArrayList, priority = false) {
 		if (data.length > MAX_DATA_LENGTH_OUT) {
 			throw new Error(
 				`Message too large (${data.length * 1e-6}) mb). Needs to be less than ${
@@ -188,13 +189,13 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 		}
 
 		this.usedBandWidthTracker.add(data.byteLength);
-
 		this.outboundStream.push(
-			data instanceof Uint8Array ? data : data.subarray()
+			data instanceof Uint8Array ? data : data.subarray(),
+			priority || this.outboundStream.getReadableLength(0) === 0 ? 0 : 1
 		);
 	}
 
-	async waitForWrite(bytes: Uint8Array | Uint8ArrayList) {
+	async waitForWrite(bytes: Uint8Array | Uint8ArrayList, priority = false) {
 		if (this.closed) {
 			logger.error("Failed to send to stream: " + this.peerId + ". Closed");
 			return;
@@ -233,13 +234,13 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 
 			await outboundPromise
 				.then(() => {
-					this.write(bytes);
+					this.write(bytes, priority);
 				})
 				.catch((error) => {
 					throw error;
 				});
 		} else {
-			this.write(bytes);
+			this.write(bytes, priority);
 		}
 	}
 
@@ -251,9 +252,9 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 		// The inbound stream is:
 		// - abortable, set to only return on abort, rather than throw
 		// - transformed with length-prefix transform
-		this._rawInboundStream = stream;
+		this.rawInboundStream = stream;
 		this.inboundStream = abortableSource(
-			pipe(this._rawInboundStream, (source) =>
+			pipe(this.rawInboundStream, (source) =>
 				lp.decode(source, { maxDataLength: MAX_DATA_LENGTH_IN })
 			),
 			this.inboundAbortController.signal,
@@ -276,35 +277,23 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 	async attachOutboundStream(stream: Stream) {
 		// If an outbound stream already exists, gently close it
 		const _prevStream = this.outboundStream;
-
-		this._rawOutboundStream = stream;
-		this.outboundStream = pushable<Uint8Array>({
-			objectMode: false,
-			onEnd: () => {
-				return stream.close().then(() => {
-					if (this._rawOutboundStream === stream) {
-						this.dispatchEvent(new CustomEvent("close"));
-						this._rawOutboundStream = undefined;
-						this.outboundStream = undefined;
-					}
-				});
-			}
-		});
+		if (_prevStream) {
+			logger.info(
+				`Stream already exist. This can be due to that you are opening two or more connections to ${this.peerId.toString()}. A stream will only be created for the first succesfully created connection`
+			);
+			return;
+		}
+		this.rawOutboundStream = stream;
+		this.outboundStream = pushableLanes({ lanes: 2 });
 
 		pipe(
 			this.outboundStream,
 			(source) => lp.encode(source),
-			this._rawOutboundStream
+			this.rawOutboundStream
 		).catch(logError);
 
 		// Emit if the connection is new
 		this.dispatchEvent(new CustomEvent("stream:outbound"));
-
-		if (_prevStream != null) {
-			// End the stream without emitting a close event
-			await _prevStream.end();
-		}
-		return this.outboundStream;
 	}
 
 	/**
@@ -320,21 +309,23 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 		// End the outbound stream
 		if (this.outboundStream != null) {
 			await this.outboundStream.return();
-			await this._rawOutboundStream?.close();
+			await this.rawOutboundStream?.abort(new AbortError("Closed"));
 		}
+
 		// End the inbound stream
 		if (this.inboundStream != null) {
 			this.inboundAbortController.abort();
-			await this._rawInboundStream?.close();
+			await this.rawInboundStream?.close();
 		}
 
 		this.usedBandWidthTracker.stop();
 
 		this.dispatchEvent(new CustomEvent("close"));
 
-		this._rawOutboundStream = undefined;
+		this.rawOutboundStream = undefined;
 		this.outboundStream = undefined;
-		this._rawInboundStream = undefined;
+
+		this.rawInboundStream = undefined;
 		this.inboundStream = undefined;
 	}
 }
@@ -815,7 +806,7 @@ export abstract class DirectStream<
 			const dependent = this.routes.getDependent(peerKeyHash);
 
 			// make neighbour unreachables
-			this.removePeerFromRoutes(peerKeyHash);
+			this.removePeerFromRoutes(peerKeyHash, true);
 
 			if (dependent.length > 0) {
 				await this.publishMessage(
@@ -836,7 +827,11 @@ export abstract class DirectStream<
 		logger.debug("connection ended:" + peerKey.toString());
 	}
 
-	public removePeerFromRoutes(hash: string) {
+	public removePeerFromRoutes(hash: string, deleteIfNeighbour = false) {
+		if (this.peers.has(hash) && !deleteIfNeighbour) {
+			return;
+		}
+
 		const unreachable = this.routes.remove(hash);
 		for (const node of unreachable) {
 			this.onPeerUnreachable(node); // TODO types
@@ -1375,9 +1370,13 @@ export abstract class DirectStream<
 			})
 				.then(() => true)
 				.catch((e) => {
-					if (e instanceof TimeoutError) {
+					if (e instanceof DeliveryError) {
+						return false;
+					} else if (e instanceof NotStartedError) {
 						return false;
-					} else if (e instanceof AbortError || e instanceof NotStartedError) {
+					} else if (e instanceof TimeoutError) {
+						return false;
+					} else if (e instanceof AbortError) {
 						return false;
 					} else {
 						throw e;
@@ -1557,8 +1556,16 @@ export abstract class DirectStream<
 		const onUnreachable =
 			!relayed &&
 			((ev) => {
-				messageToSet.delete(ev.detail.hashcode());
-				checkDone();
+				const deletedReceiver = messageToSet.delete(ev.detail.hashcode());
+				if (deletedReceiver) {
+					// Only reject if we are the sender
+					clear();
+					deliveryDeferredPromise.reject(
+						new DeliveryError(
+							`At least one recipent became unreachable while delivering messsage of type$ ${message.constructor.name}} to ${ev.detail.hashcode()}`
+						)
+					);
+				}
 			});
 
 		onUnreachable && this.addEventListener("peer:unreachable", onUnreachable);
@@ -1591,10 +1598,8 @@ export abstract class DirectStream<
 
 			if (!hasAll && willGetAllAcknowledgements) {
 				deliveryDeferredPromise.reject(
-					new TimeoutError(
-						`${
-							this.publicKeyHash
-						} Failed to get message ${idString} ${filterMessageForSeenCounter} ${[
+					new DeliveryError(
+						`Failed to get message ${idString} ${filterMessageForSeenCounter} ${[
 							...messageToSet
 						]} delivery acknowledges from all nodes (${
 							fastestNodesReached.size
@@ -1688,6 +1693,11 @@ export abstract class DirectStream<
 		if (this.stopping || !this.started) {
 			throw new NotStartedError();
 		}
+		const isPriorityMessage =
+			message.header.mode instanceof SilentDelivery ||
+			message.header.mode instanceof AnyWhere
+				? false
+				: true;
 
 		let delivereyPromise: Promise<void> | undefined = undefined as any;
 
@@ -1755,7 +1765,8 @@ export abstract class DirectStream<
 						const promises: Promise<any>[] = [];
 						for (const [neighbour, _distantPeers] of fanout) {
 							const stream = this.peers.get(neighbour);
-							stream && promises.push(stream.waitForWrite(bytes));
+							stream &&
+								promises.push(stream.waitForWrite(bytes, isPriorityMessage));
 						}
 						await Promise.all(promises);
 						return delivereyPromise; // we are done sending the message in all direction with updates 'to' lists
@@ -1801,7 +1812,7 @@ export abstract class DirectStream<
 
 			sentOnce = true;
 
-			promises.push(id.waitForWrite(bytes));
+			promises.push(id.waitForWrite(bytes, isPriorityMessage));
 		}
 		await Promise.all(promises);
 
@@ -1948,7 +1959,8 @@ export abstract class DirectStream<
 	getQueuedBytes(): number {
 		let sum = 0;
 		for (const peer of this.peers) {
-			sum += peer[1].outboundStream?.readableLength || 0;
+			const out = peer[1].outboundStream;
+			sum += out ? out.readableLength : 0;
 		}
 		return sum;
 	}