Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0826108
chore(quest): claim quest/m1/stream-credit/release-on-leave.md
kixelated Nov 5, 2026
83cb9d7
docs(quest): record lite-07 three-slot setup blocker
kixelated Nov 5, 2026
f7fdfdd
chore(quest): claim quest/m1/stream-credit/release-on-leave.md
kixelated Nov 5, 2026
f178bc6
Merge claim and settled four-stream plan
kixelated Nov 5, 2026
ad77cfe
fix(net): release abandoned subscription setup streams
kixelated Nov 5, 2026
56e407c
Merge remote-tracking branch 'origin/main' into quest/m1/stream-credi…
kixelated Nov 5, 2026
c102d0d
fix(net): preserve pre-TRACK subscription bootstrap
kixelated Nov 5, 2026
a4881cb
fix(net): preserve linger and drive fetches during setup
kixelated Nov 5, 2026
623b9f8
fix(net): apply fill demand changes after setup completes
kixelated Nov 5, 2026
188fc53
fix(net): keep legacy feed fills parked until establishment
kixelated Nov 5, 2026
142ea21
fix(net): reconcile abandoned setup cleanup with main
kixelated Nov 6, 2026
359f9be
fix(net): finish setup state and quest merge cleanup
kixelated Nov 6, 2026
28fd7fa
test(net): adapt stream credit coverage to broadcast handles
kixelated Nov 6, 2026
3e0085a
test(net): use hidden origin route for credit coverage
kixelated Nov 6, 2026
48e0952
style(net): format migrated credit test
kixelated Nov 6, 2026
3869692
fix(net): keep a fresh setup until its demand arrives
pullfrog[bot] Nov 6, 2026
14cd5eb
Merge origin/main into subscriber setup fix
kixelated Nov 6, 2026
477a18f
fix(net): reset canceled setup demand and idle linger
kixelated Nov 6, 2026
eb09770
Merge remote-tracking branch 'origin/quest/m1/stream-credit/release-o…
kixelated Nov 6, 2026
5089575
docs(quest): record explicit requester ownership decision
kixelated Nov 6, 2026
aca6db8
docs(quest): link the resumed setup ownership work
kixelated Nov 6, 2026
0a079f9
fix(net): use requester ownership during subscription setup
kixelated Nov 6, 2026
3296c40
test(net): poll the retained requester handle directly
kixelated Nov 6, 2026
d6acf79
docs(quest): finish requester ownership cleanup
kixelated Nov 6, 2026
dec1cc2
fix(net): use requester ownership while waiting for authorization
kixelated Nov 6, 2026
17baaea
quest land: merge tested base
Nov 6, 2026
be53da8
Merge branch 'base' into pr-7980
Nov 6, 2026
4025c4a
test(net): follow base origin hop constructor type
Nov 6, 2026
c69f45a
quest land: merge tested base
Nov 7, 2026
7c238f3
quest land: merge tested base
Nov 7, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions js/net/src/lite/subscriber.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,38 @@ test("a lite SUBSCRIBE open given up leaves its stream to the next open", async
}
});

// Leaving during SUBSCRIBE setup releases its TRACK bridge while the broadcast stays live.
test.each(["credit", "answer"] as const)("abandoning SUBSCRIBE during %s releases TRACK", async (stage) => {
const { quic, streams, opened } = fakeSession(stage === "credit" ? [1] : []);
const subscriber = new Subscriber(quic, Version.DRAFT_07, HopSchema.parse(1n));
const warn = spyOn(console, "warn").mockImplementation(() => {});
const room = subscriber.consume(Path.from("room"));
try {
const video = room.track("video").subscribe();
await opened(0);
await streams[0].reading;
await answerTrackInfo(streams[0], Version.DRAFT_07);
await opened(1);
if (stage === "answer") await streams[1].reading;
video.close();
await drainReactions();
if (stage === "credit") await streams[0].aborted;
else await streams[0].finished;
if (stage === "credit") {
streams[1].release();
await drainReactions();
expect(streams[1].written).toEqual([]);
}
const audio = room.track("audio").subscribe();
await (await opened(stage === "credit" ? 1 : 2)).writing;
audio.close();
} finally {
room.close();
subscriber.close();
warn.mockRestore();
}
});

// The last reader leaving gives the setup up while its TRACK stream still waits for a slot, so
// the stream admitted for it goes unused to the next open.
test("a lite subscribe whose readers leave while it waits for a stream gives up the wait", async () => {
Expand Down
17 changes: 8 additions & 9 deletions js/net/src/lite/subscriber.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import type * as track from "../track.ts";
import { untilAborted } from "../util/abort.ts";
import { closeUnwanted } from "../util/announce.ts";
import { Deadline } from "../util/deadline.ts";
import { abandoned, isAbandoned, unwanted } from "../util/demand.ts";
import { isUnrequested, unrequested, unwanted } from "../util/demand.ts";
import { LIMITS, type Limits, SlotMap, Slots } from "../util/limits.ts";
import { min, UNBOUNDED } from "../util/sequence.ts";
import { Budget } from "../util/yield.ts";
Expand Down Expand Up @@ -1154,11 +1154,11 @@ export class Subscriber {
for (;;) {
const ready = await this.#auth?.ready(broadcast, "subscribe", {
signal: consumed.valid,
until: () => abandoned(request.demand()),
until: () => unrequested(request),
});
if (ready !== false) break;
// Demand returning before we commit is not abandonment, matching the serving loop.
if (!isAbandoned(request.demand())) continue;
if (!isUnrequested(request)) continue;
request.reject(new Error("subscribe abandoned before it was authorized"));
return;
}
Expand Down Expand Up @@ -1215,21 +1215,20 @@ export class Subscriber {
const deadline = new Deadline();
const setup = this.#openSubscribe(state, msg, ranges, request, id, deadline);

// The readers leaving gives the setup up, even while its streams wait for credit. An
// info-only lookup attaches no reader, so only demand that arrived and left counts.
// Subscribers and info lookups explicitly own setup, including the handoff from
// metadata acceptance to reader attachment. Release it when the last owner leaves.
const left = new AbortController();
const demand = request.demand();
let arrived = false;
const wanted = hooks.requestWanted(request);
let unwatch: Dispose | undefined;
const watch = () => {
if (demand.wanted.peek() !== undefined) arrived = true;
if (hooks.demandReleased(demand).peek() !== undefined || (arrived && demand.wanted.peek() === undefined)) {
if (isUnrequested(request)) {
left.abort(
new StreamError(StreamCode.Cancel, { message: "subscribe abandoned before it was accepted" }),
);
state.cancel.abort(left.signal.reason);
} else {
unwatch = Signal.race(demand.wanted, hooks.demandReleased(demand)).changed(watch);
unwatch = Signal.race(wanted, hooks.demandReleased(demand)).changed(watch);
}
};
watch();
Expand Down
1 change: 0 additions & 1 deletion quest/m1/stream-credit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,5 @@ receiving every group, and nothing hanging.

## Required

- [An abandoned subscription setup releases its streams](/quest/m1/stream-credit/release-on-leave.md) - release TRACK and pending SUBSCRIBE when demand leaves during setup
- [Reset fallback](/quest/m1/stream-credit/reset-fallback.md) - a waiting higher-priority open resets the lowest-priority stream, one reset in flight per waiting open
- [Takeover](/quest/m1/stream-credit/takeover.md) - on lite-07 a higher-priority group takes over an acknowledged stream, and a group that lost its stream resumes
28 changes: 0 additions & 28 deletions quest/m1/stream-credit/release-on-leave.md

This file was deleted.

1 change: 0 additions & 1 deletion quest/m2/recut-held.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,5 @@ padding probes already moved to m3 on 2026-11-06.

## Required

- [Release on leave](/quest/m1/stream-credit/release-on-leave.md) - claim held stream-credit
- [Browser send estimate](/quest/m2/probe/browser-send-estimate.md) - claim held probe
- [One page-wide getStats sampling ticker](/quest/m2/probe/stats-ticker.md) - claim held probe
Loading
Loading