diff options
Diffstat (limited to 'packages/meshbay-hub/tests')
5 files changed, 48 insertions, 42 deletions
diff --git a/packages/meshbay-hub/tests/harness/local_network_harness.mjs b/packages/meshbay-hub/tests/harness/local_network_harness.mjs index 3c86cf77..9afdf59e 100644 --- a/packages/meshbay-hub/tests/harness/local_network_harness.mjs +++ b/packages/meshbay-hub/tests/harness/local_network_harness.mjs @@ -151,13 +151,6 @@ if (cfg.classify) { undefined, undefined, '', 'pk') .then(() => { outcome = 'connected'; }, (err) => { outcome = err.message; reason = err.reason || null; main.close(); }); - // What a caller that stops waiting early reads (connection-pool.js): at - // `probeAt` ms, while ICE is still checking, or after it connected. - let early = null; - if (cfg.probeAt) { - await run(cfg.probeAt); - early = await main.localNetworkRefused(); - } await run(60000); - process.stdout.write(JSON.stringify({ outcome, reason, statsCalls, early })); + process.stdout.write(JSON.stringify({ outcome, reason, statsCalls })); } diff --git a/packages/meshbay-hub/tests/harness/search_connect_harness.mjs b/packages/meshbay-hub/tests/harness/search_connect_harness.mjs index 71c7e8c4..0c10a39d 100644 --- a/packages/meshbay-hub/tests/harness/search_connect_harness.mjs +++ b/packages/meshbay-hub/tests/harness/search_connect_harness.mjs @@ -28,9 +28,11 @@ const { nodes = 1, // Which of them answer (resolveAt applies to these). null: all. answering = null, - // Which of them this device refuses to reach on the local network: what the - // transport reads from its connection when search gives up on it. + // Which of them this device refuses to reach on the local network. As + // measured on a Pixel: no progress, and connect() names the refusal only + // when ICE gives up, `refusedAt` ms in. lanRefused = [], + refusedAt = 30000, // How far to run the clock before giving up on the harness itself. runUntil = 300000, } = cfg; @@ -70,6 +72,8 @@ async function run(until) { // ── The environment ────────────────────────────────────────────────────────── let closed = 0; +const closedAt = []; +const lateRefusals = []; let made = 0; class FakeTransport { @@ -79,8 +83,6 @@ class FakeTransport { this.index = made++; } - async localNetworkRefused() { return lanRefused.includes(this.index); } - connect() { const started = now; for (const at of progressAt) { @@ -92,14 +94,25 @@ class FakeTransport { } }, at); } - return new Promise((resolve) => { + return new Promise((resolve, reject) => { + if (lanRefused.includes(this.index)) { + setTimeout(() => { + const err = new Error('This device refused to reach the local network'); + err.reason = 'local_network_blocked'; + reject(err); + }, refusedAt); + return; + } if (resolveAt !== null && (answering === null || answering.includes(this.index))) { setTimeout(() => resolve({ ok: true, at: now - started }), resolveAt); + } else { + // The transport's own deadline for the channel: every connect() ends. + setTimeout(() => reject(new Error('DataChannel open timeout')), 30000); } }); } - close() { closed += 1; } + close() { closed += 1; closedAt.push(now); } } globalThis.window = { MeshBayTransport: FakeTransport }; @@ -134,7 +147,8 @@ const connectToGroup = make(hubFetch, ensureFreshToken, globalThis.window); // ── The scenario ───────────────────────────────────────────────────────────── let outcome = null; -connectToGroup('https://hub.example', 'g1', 'tok', null, 'alice', 'u1') +connectToGroup('https://hub.example', 'g1', 'tok', null, 'alice', 'u1', + (groupId) => { lateRefusals.push({ groupId, at: now }); }) .then(() => { outcome = { result: 'connected', at: now }; }) .catch((e) => { outcome = { result: 'failed', at: now, error: String(e.message), reason: e.reason || null }; @@ -145,4 +159,6 @@ await run(runUntil); console.log(JSON.stringify({ ...(outcome || { result: 'still-waiting', at: now }), closed, + closedAt, + lateRefusals, })); diff --git a/packages/meshbay-hub/tests/test_local_network_refused.py b/packages/meshbay-hub/tests/test_local_network_refused.py index 4f556474..3d0f3041 100644 --- a/packages/meshbay-hub/tests/test_local_network_refused.py +++ b/packages/meshbay-hub/tests/test_local_network_refused.py @@ -104,17 +104,3 @@ def test_stats_that_cannot_be_read_leave_the_old_error(): out = _run({"offer": PHONE_WIFI, "answer": NODE, "remote": KEPT_WHEN_REFUSED, "statsThrow": True}) assert out["reason"] is None and out["outcome"] == "DataChannel closed", out - - -def test_the_refusal_is_read_before_ice_gives_up(): - """Search stops waiting after ten seconds without progress, and ICE gives up - later: the signature is in the pairs as soon as checks begin.""" - refused = _run({"offer": PHONE_WIFI, "answer": NODE, "remote": KEPT_WHEN_REFUSED, - "probeAt": 5000}) - assert refused["early"] is True, refused - paired = _run({"offer": PHONE_WIFI, "answer": NODE, "remote": EVERY_NODE_ADDRESS, - "probeAt": 5000}) - assert paired["early"] is False, paired - reached = _run({"offer": PHONE_WIFI, "answer": NODE, "remote": KEPT_WHEN_REFUSED, - "iceConnects": True, "probeAt": 5000}) - assert reached["early"] is False, reached diff --git a/packages/meshbay-hub/tests/test_search_connect_deadline.py b/packages/meshbay-hub/tests/test_search_connect_deadline.py index 0dfee4e0..50b52369 100644 --- a/packages/meshbay-hub/tests/test_search_connect_deadline.py +++ b/packages/meshbay-hub/tests/test_search_connect_deadline.py @@ -125,19 +125,25 @@ def test_a_fast_connection_is_unaffected(): assert out["at"] == 3000 -def test_a_node_refused_the_local_network_is_named_when_search_gives_up(): - """Android 17 and Chrome 155 refuse the node's address on the phone's Wi-Fi - without the permission, and connect() names it only when ICE gives up, - long after search has: the refusal is read from the connection then.""" +def test_a_node_refused_the_local_network_is_named_when_its_connection_says_so(): + """Measured on a Pixel: when search gives up, ten seconds in, Chrome still + lists the refused address and counts its checks as sent, so nothing tells it + from a node that does not answer. The connection is left to reach its own + verdict, thirty seconds in, and the refusal is heard then.""" out = _attempt(lanRefused=[0]) - assert out["result"] == "failed" and out["reason"] == "local_network_blocked", out - assert out["at"] == STALL_MS, out + assert out["result"] == "failed" and out["at"] == STALL_MS, out + assert out["lateRefusals"] == [{"groupId": "g1", "at": 30000}], out + # Closed once its verdict is in, not when search moved on. + assert out["closedAt"] == [30000], out -def test_a_refused_node_does_not_stop_the_walk(): - """Refused here is one node: another of the group may be elsewhere.""" - out = _attempt(nodes=2, lanRefused=[0], answering=[1], progressAt=[], resolveAt=500) - assert out["result"] == "connected", out - # And when no node answers, the refusal is what is said, not a timeout. - out = _attempt(nodes=2, lanRefused=[0]) - assert out["reason"] == "local_network_blocked", out +def test_a_refused_node_does_not_hold_up_the_walk(): + """Refused here is one node: another of the group may be elsewhere, and is + tried as soon as search gives up on the first.""" + out = _attempt(nodes=2, lanRefused=[0], answering=[1], resolveAt=500) + assert out["result"] == "connected" and out["at"] == STALL_MS + 500, out + + +def test_a_node_that_does_not_answer_is_closed_without_a_word(): + out = _attempt(resolveAt=None) + assert out["lateRefusals"] == [], out diff --git a/packages/meshbay-hub/tests/test_search_fanout.py b/packages/meshbay-hub/tests/test_search_fanout.py index 73ba4ac0..303045cd 100644 --- a/packages/meshbay-hub/tests/test_search_fanout.py +++ b/packages/meshbay-hub/tests/test_search_fanout.py @@ -189,3 +189,8 @@ def test_the_search_page_shows_the_refused_groups_with_a_way_in(): start = source.index("lanBlocked.length > 0") hint = source[start:start + 400] assert "t('search.lan_blocked'" in hint and "groupLinkRoute(g)" in hint + # The refusals heard after the pass, from the pool, join the same list. + pool = source[source.index("new ConnectionPool(HUB,"):] + pool = pool[:pool.index("return () =>")] + assert "addLanBlocked([g])" in pool + assert "addLanBlocked(refused)" in source and "setLanBlocked(refused)" not in source |