@lesomnus/grpc-dgram 0.0.1 → 0.1.0

package/dist/{wire-BR8KiyRg.mjs → wire-DqHx0oUs.mjs}

@@ -11,6 +11,8 @@ function resolveRxConfig(c = {}) {
 		policy: c.policy ?? 0
 	};
 }
+const DEFAULT_MAX_PEER_WINDOW = 1024;
+const MAX_PEER_WINDOW = 4294967295;
 function resolveLimits(l = {}) {
 	const pos = (v, d) => v !== void 0 && v > 0 ? v : d;
 	return {
@@ -19,7 +21,8 @@ function resolveLimits(l = {}) {
 		maxDeadPeers: pos(l.maxDeadPeers, 4),
 		maxPendingResets: pos(l.maxPendingResets, 1024),
 		maxLiveCalls: pos(l.maxLiveCalls, 4096),
-		maxRepliesPerRTI: pos(l.maxRepliesPerRTI, 64)
+		maxRepliesPerRTI: pos(l.maxRepliesPerRTI, 64),
+		maxPeerWindow: Math.min(Math.max(Math.floor(pos(l.maxPeerWindow, DEFAULT_MAX_PEER_WINDOW)), DEFAULT_MAX_PEER_WINDOW), MAX_PEER_WINDOW)
 	};
 }
 //#endregion
@@ -94,7 +97,7 @@ function decodeBase64(s) {
 	return out;
 }
 const textEncoder$1 = new TextEncoder();
-const textDecoder$1 = new TextDecoder();
+const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
 function encodeMetadataValue(key, value) {
 	if (!isBinaryKey(key)) return textEncoder$1.encode(value);
 	try {
@@ -104,7 +107,7 @@ function encodeMetadataValue(key, value) {
 	}
 }
 function decodeMetadataValue(key, bytes) {
-	return isBinaryKey(key) ? encodeBase64(bytes) : textDecoder$1.decode(bytes);
+	return isBinaryKey(key) ? encodeBase64(bytes) : textDecoder.decode(bytes);
 }
 function validateMetadata(md) {
 	if (md === void 0) return;
@@ -209,12 +212,13 @@ var FrameQueue = class {
 		return true;
 	}
 	putDrop(f, policy) {
-		if (this.tryPut(f)) return;
+		if (this.tryPut(f)) return 0;
 		if (policy === 1) {
 			if (this.buf.shift() !== void 0) this.dropped++;
-			if (this.tryPut(f)) return;
+			if (this.tryPut(f)) return 1;
 		}
 		this.dropped++;
+		return 1;
 	}
 	async putBlocking(f, done, signal) {
 		const prev = this.putTail;
@@ -280,6 +284,7 @@ var Sweeper = class {
 	}
 };
 const W_INIT = 32;
+const W_CONN = 1024;
 const DEFAULT_STALL_MS = 3e4;
 function reliableRxSize(size, reliable) {
 	return reliable && size < 32 ? 32 : size;
@@ -305,14 +310,31 @@ var FlowSender = class {
 		}
 		wake(this.waiters);
 	}
+	reassume(window) {
+		this.on = window > 0;
+		this.observed = false;
+		this.granted = Math.max(window, 0);
+		this.sent = 0;
+		wake(this.waiters);
+	}
 	grant(n) {
 		if (n <= 0 || !this.on) return;
 		this.granted = Math.min(this.granted + n, Number.MAX_SAFE_INTEGER);
 		wake(this.waiters);
 	}
 	undo() {
-		if (this.sent > 0) this.sent--;
+		return this.refund(1) === 1;
+	}
+	refund(n) {
+		const r = Math.min(n, this.sent);
+		this.sent -= r;
 		wake(this.waiters);
+		return r;
+	}
+	drain() {
+		const n = this.sent;
+		this.sent = 0;
+		return n;
 	}
 	release() {
 		this.on = false;
@@ -323,32 +345,45 @@ var FlowSender = class {
 		this.sent++;
 		return true;
 	}
+	empty() {
+		return this.on && this.sent >= this.granted;
+	}
+	state() {
+		return {
+			on: this.on,
+			observed: this.observed,
+			granted: this.granted,
+			sent: this.sent
+		};
+	}
+	restore(st) {
+		this.on = st.on;
+		this.observed = st.observed;
+		this.granted = st.granted;
+		this.sent = st.sent;
+	}
 	async acquire(done, stallMs, signal) {
 		let timer;
 		let dispose = noop;
-		let expired = false;
 		let bounds;
 		try {
 			for (;;) {
-				if (this.tryAcquire()) return "ok";
 				if (done.tripped) return "ended";
 				if (signal?.aborted) return "aborted";
-				if (expired) return "stalled";
+				if (this.tryAcquire()) return "ok";
 				if (bounds === void 0) {
-					bounds = [done.wait()];
+					bounds = [done.wait().then(() => "ended")];
 					if (stallMs > 0) bounds.push(new Promise((res) => {
-						const t = setTimeout(() => {
-							expired = true;
-							res();
-						}, stallMs);
+						const t = setTimeout(() => res("stalled"), stallMs);
 						unrefTimer(t);
 						timer = t;
 					}));
 					if (signal !== void 0) bounds.push(new Promise((res) => {
-						dispose = abortListener(signal, res);
+						dispose = abortListener(signal, () => res("aborted"));
 					}));
 				}
-				await Promise.race([this.parked(), ...bounds]);
+				const why = await Promise.race([this.parked().then(() => "grant"), ...bounds]);
+				if (why !== "grant") return why;
 			}
 		} finally {
 			if (timer !== void 0) clearTimeout(timer);
@@ -359,6 +394,51 @@ var FlowSender = class {
 		return new Promise((res) => this.waiters.push(res));
 	}
 };
+function takeBoth(stream, peer) {
+	if (!stream.tryAcquire()) return "stream";
+	if (peer !== void 0 && !peer.tryAcquire()) {
+		stream.undo();
+		return "peer";
+	}
+	return "ok";
+}
+function tryAcquireBoth(stream, peer) {
+	return takeBoth(stream, peer) === "ok";
+}
+async function acquireBoth(stream, peer, done, stallMs, signal, onStall) {
+	let timer;
+	let dispose = noop;
+	let bounds;
+	try {
+		for (;;) {
+			if (done.tripped) return "ended";
+			if (signal?.aborted) return "aborted";
+			const short = takeBoth(stream, peer);
+			if (short === "ok") return "ok";
+			const onPeer = short === "peer" || peer !== void 0 && peer.empty();
+			if (bounds === void 0) {
+				bounds = [done.wait().then(() => "ended")];
+				if (stallMs > 0) bounds.push(new Promise((res) => {
+					const t = setTimeout(() => res("stalled"), stallMs);
+					unrefTimer(t);
+					timer = t;
+				}));
+				if (signal !== void 0) bounds.push(new Promise((res) => {
+					dispose = abortListener(signal, () => res("aborted"));
+				}));
+				onStall?.(onPeer);
+			}
+			const wait = short === "peer" ? peer.parked() : stream.parked();
+			const why = await Promise.race([wait.then(() => "grant"), ...bounds]);
+			if (why === "grant") continue;
+			if (why === "stalled") return onPeer ? "peer-stalled" : "stalled";
+			return why;
+		}
+	} finally {
+		if (timer !== void 0) clearTimeout(timer);
+		dispose();
+	}
+}
 var FlowReceiver = class {
 	on = false;
 	window = 0;
@@ -379,6 +459,81 @@ var FlowReceiver = class {
 		return grant;
 	}
 };
+const U32_MAX = 4294967295;
+var PeerFlowRx = class {
+	window = 0;
+	outstanding = 0;
+	pending = /* @__PURE__ */ new Map();
+	evicted = /* @__PURE__ */ new Map();
+	evictCap = 0;
+	enable(window, evictCap) {
+		this.window = Math.min(window, U32_MAX);
+		this.evictCap = evictCap;
+	}
+	get active() {
+		return this.window > 0;
+	}
+	admit() {
+		if (this.window <= 0) return true;
+		if (this.outstanding >= this.window) return false;
+		this.outstanding++;
+		return true;
+	}
+	retire(epoch, n, credit) {
+		if (this.window <= 0) return 0;
+		this.outstanding -= Math.min(n, this.outstanding);
+		if (!credit) return 0;
+		this.hold(epoch, n);
+		return this.due(epoch);
+	}
+	unadmitted(epoch, n) {
+		if (this.window <= 0) return 0;
+		this.hold(epoch, n);
+		return this.due(epoch);
+	}
+	unadmittedEvicted(epoch, n) {
+		if (this.window <= 0 || !this.evicted.has(epoch)) return 0;
+		this.hold(epoch, n);
+		return this.due(epoch);
+	}
+	hold(epoch, n) {
+		this.pending.set(epoch, Math.min((this.pending.get(epoch) ?? 0) + n, U32_MAX));
+	}
+	due(epoch) {
+		const pending = this.pending.get(epoch) ?? 0;
+		if (pending === 0) return 0;
+		if (pending * 2 < this.window && this.outstanding + pending < this.window) return 0;
+		this.pending.delete(epoch);
+		return pending;
+	}
+	renew() {
+		this.pending.clear();
+	}
+	stash(epoch, state) {
+		if (this.evictCap <= 0) {
+			this.pending.delete(epoch);
+			return;
+		}
+		this.evicted.set(epoch, { ...state });
+		while (this.evicted.size > this.evictCap) {
+			const oldest = this.evicted.keys().next().value;
+			this.evicted.delete(oldest);
+			this.pending.delete(oldest);
+		}
+	}
+	unstash(epoch) {
+		const e = this.evicted.get(epoch);
+		if (e === void 0) return void 0;
+		this.evicted.delete(epoch);
+		return e;
+	}
+	creditEvicted(epoch, n) {
+		if (n <= 0) return;
+		const e = this.evicted.get(epoch);
+		if (e === void 0 || !e.on) return;
+		e.granted = Math.min(e.granted + n, Number.MAX_SAFE_INTEGER);
+	}
+};
 const DEFAULT_MAX_RECV_MSG_SIZE = 4 * 1024 * 1024;
 const DEFAULT_MAX_SEND_MSG_SIZE = 2147483647;
 function sizeOr(v, def) {
@@ -515,6 +670,7 @@ function frame(init) {
 		peerEpoch: 0,
 		window: 0,
 		compressor: "",
+		connWindow: 0,
 		...init
 	};
 }
@@ -559,7 +715,10 @@ function resetFor(f) {
 	});
 }
 const textEncoder = new TextEncoder();
-const textDecoder = new TextDecoder();
+const strictTextDecoder = new TextDecoder("utf-8", {
+	fatal: true,
+	ignoreBOM: true
+});
 var Writer = class {
 	buf = [];
 	byte(b) {
@@ -641,7 +800,12 @@ var Reader = class {
 		return out;
 	}
 	string() {
-		return textDecoder.decode(this.bytes());
+		const b = this.bytes();
+		try {
+			return strictTextDecoder.decode(b);
+		} catch {
+			throw new Error("drpc: malformed frame: string field is not valid UTF-8");
+		}
 	}
 	skip(wire) {
 		switch (wire) {
@@ -717,11 +881,9 @@ function encodeMetadata(md) {
 	const w = new Writer();
 	for (const key of Object.keys(md).sort()) {
 		const entry = new Writer();
-		for (const v of md[key]) entry.bytes(1, encodeMetadataValue(key, v));
-		const kv = new Writer();
-		kv.string(1, key);
-		kv.bytes(2, entry.finish());
-		w.bytes(1, kv.finish());
+		entry.string(1, key);
+		for (const v of md[key]) entry.bytes(2, encodeMetadataValue(key, v));
+		w.bytes(1, entry.finish());
 	}
 	return w.finish();
 }
@@ -731,22 +893,24 @@ function decodeMetadata(data) {
 	while (!r.eof) {
 		const tag = r.varint32();
 		if (tag >>> 3 === 1 && (tag & 7) === 2) {
-			const kv = new Reader(r.bytes());
+			const entry = new Reader(r.bytes());
 			let key = "";
 			const raw = [];
-			while (!kv.eof) {
-				const t = kv.varint32();
-				if (t >>> 3 === 1 && (t & 7) === 2) key = kv.string();
-				else if (t >>> 3 === 2 && (t & 7) === 2) {
-					const entry = new Reader(kv.bytes());
-					while (!entry.eof) {
-						const et = entry.varint32();
-						if (et >>> 3 === 1 && (et & 7) === 2) raw.push(entry.bytes());
-						else entry.skip(et & 7);
-					}
-				} else kv.skip(t & 7);
+			while (!entry.eof) {
+				const t = entry.varint32();
+				if (t >>> 3 === 1 && (t & 7) === 2) key = entry.string();
+				else if (t >>> 3 === 2 && (t & 7) === 2) raw.push(entry.bytes());
+				else entry.skip(t & 7);
 			}
-			md[key] = raw.map((b) => decodeMetadataValue(key, b));
+			const vals = raw.map((b) => decodeMetadataValue(key, b));
+			const prev = Object.prototype.hasOwnProperty.call(md, key) ? md[key] : void 0;
+			if (prev === void 0) Object.defineProperty(md, key, {
+				value: vals,
+				enumerable: true,
+				writable: true,
+				configurable: true
+			});
+			else for (const v of vals) prev.push(v);
 		} else r.skip(tag & 7);
 	}
 	return md;
@@ -778,6 +942,10 @@ function encodeFrame(f) {
 	}
 	if (f.compressor) w.string(16, f.compressor);
 	if (f.details !== void 0) for (const d of f.details) w.bytes(17, encodeAny(d));
+	if (f.connWindow) {
+		w.tag(18, 0);
+		w.varint(f.connWindow);
+	}
 	return w.finish();
 }
 function decodeFrame(data) {
@@ -852,17 +1020,21 @@ function decodeFrame(data) {
 				if (wire !== 2) r.skip(wire);
 				else (f.details ??= []).push(decodeAny(r.bytes()));
 				break;
+			case 18:
+				if (wire !== 0) r.skip(wire);
+				else f.connWindow = r.varint32();
+				break;
 			default: r.skip(wire);
 		}
 	}
 	return f;
 }
-function encodeEnvelop(frames) {
+function encodeEnvelope(frames) {
 	const w = new Writer();
 	for (const f of frames) w.bytes(1, encodeFrame(f));
 	return w.finish();
 }
-function decodeEnvelop(data) {
+function decodeEnvelope(data) {
 	const frames = [];
 	const r = new Reader(data);
 	while (!r.eof) {
@@ -873,4 +1045,4 @@ function decodeEnvelop(data) {
 	return frames;
 }
 //#endregion
-export { unpack as $, DEFAULT_MAX_SEND_MSG_SIZE as A, checkSendSize as B, isTerminal as C, setFrameError as D, resetFor as E, Latch as F, noop as G, decompressPayload as H, Sweeper as I, reliableRxSize as J, nowMs as K, W_INIT as L, FlowReceiver as M, FlowSender as N, shapeOf as O, FrameQueue as P, hasTransportInfo as Q, abortListener as R, isReset as S, legalShape as T, getCompressor as U, compressPayload as V, nonzeroEpoch as W, unrefTimer as X, sizeOr as Y, hasConnAttacher as Z, isData as _, FlagReset as a, validateMetadata as at, isOpen as b, decodeEnvelop as c, resolveLimits as ct, encodeFrame as d, cloneMetadata as et, frame as f, isCompressed as g, isClose as h, FlagPing as i, metadataJoin as it, DEFAULT_STALL_MS as j, DEFAULT_MAX_RECV_MSG_SIZE as k, decodeFrame as l, resolveRxConfig as lt, hasUnknownFlags as m, FlagCompressed as n, encodeBase64 as nt, FlagWindow as o, validateMetadataPair as ot, frameStatus as p, rawPayload as q, FlagOpen as r, isBinaryKey as rt, SHAPE_MASK as s, DropPolicy as st, FlagClose as t, decodeBase64 as tt, encodeEnvelop as u, isHalfClose as v, isWindow as w, isPing as x, isHeaderFrame as y, checkRecvSize as z };
+export { sizeOr as $, DEFAULT_MAX_SEND_MSG_SIZE as A, W_INIT as B, isTerminal as C, setFrameError as D, resetFor as E, Latch as F, compressPayload as G, acquireBoth as H, PeerFlowRx as I, nonzeroEpoch as J, decompressPayload as K, Sweeper as L, FlowReceiver as M, FlowSender as N, shapeOf as O, FrameQueue as P, reliableRxSize as Q, U32_MAX as R, isReset as S, legalShape as T, checkRecvSize as U, abortListener as V, checkSendSize as W, nowMs as X, noop as Y, rawPayload as Z, isData as _, FlagReset as a, cloneMetadata as at, isOpen as b, decodeEnvelope as c, isBinaryKey as ct, encodeFrame as d, validateMetadataPair as dt, tryAcquireBoth as et, frame as f, DropPolicy as ft, isCompressed as g, isClose as h, FlagPing as i, unpack as it, DEFAULT_STALL_MS as j, DEFAULT_MAX_RECV_MSG_SIZE as k, decodeFrame as l, metadataJoin as lt, hasUnknownFlags as m, resolveRxConfig as mt, FlagCompressed as n, hasConnAttacher as nt, FlagWindow as o, decodeBase64 as ot, frameStatus as p, resolveLimits as pt, getCompressor as q, FlagOpen as r, hasTransportInfo as rt, SHAPE_MASK as s, encodeBase64 as st, FlagClose as t, unrefTimer as tt, encodeEnvelope as u, validateMetadata as ut, isHalfClose as v, isWindow as w, isPing as x, isHeaderFrame as y, W_CONN as z };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@lesomnus/grpc-dgram",
   "type": "module",
-  "version": "0.0.1",
-  "description": "gRPC over unreliable datagram channels \u2014 TypeScript port of gRPC-dgram (dRPC wire protocol v1.1)",
+  "version": "0.1.0",
+  "description": "gRPC over unreliable datagram channels \u2014 TypeScript port of gRPC-dgram (the dRPC wire protocol, docs/PROTOCOL.md)",
   "license": "Apache-2.0",
   "author": "lesomnus",
   "homepage": "https://github.com/lesomnus/grpc-dgram/tree/main/ts",
@@ -20,6 +20,7 @@
     "datagram",
     "webrtc",
     "websocket",
+    "webtransport",
     "wasm",
     "connect"
   ],
@@ -37,10 +38,12 @@
     "./transport/node-udp": "./dist/transport/node-udp.mjs",
     "./transport/protobuf-es": "./dist/transport/protobuf-es.mjs",
     "./transport/connect": "./dist/transport/connect.mjs",
+    "./transport/webtransport": "./dist/transport/webtransport.mjs",
     "./package.json": "./package.json"
   },
   "files": [
-    "dist"
+    "dist",
+    "CHANGELOG.md"
   ],
   "scripts": {
     "build": "tsdown",