net-mesh-cli 0.41.0__tar.gz → 0.41.1__tar.gz

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/Cargo.lock

@@ -3119,7 +3119,7 @@ dependencies = [
 
 [[package]]
 name = "net-aggregator-daemon"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "assert_cmd",
  "blake3",
@@ -3141,7 +3141,7 @@ dependencies = [
 
 [[package]]
 name = "net-cli"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "assert_cmd",
  "async-trait",
@@ -3177,7 +3177,7 @@ dependencies = [
 
 [[package]]
 name = "net-compute-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "bytes",
  "dashmap",
@@ -3192,7 +3192,7 @@ dependencies = [
 
 [[package]]
 name = "net-deck"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "bytes",
  "chrono",
@@ -3212,7 +3212,7 @@ dependencies = [
 
 [[package]]
 name = "net-deck-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "futures",
  "net-mesh",
@@ -3224,7 +3224,7 @@ dependencies = [
 
 [[package]]
 name = "net-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "net-compute-ffi",
  "net-deck-ffi",
@@ -3239,7 +3239,7 @@ dependencies = [
 
 [[package]]
 name = "net-mcp-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "net-mesh-mcp",
  "net-mesh-sdk",
@@ -3252,7 +3252,7 @@ dependencies = [
 
 [[package]]
 name = "net-mesh"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "arc-swap",
  "async-nats",
@@ -3308,7 +3308,7 @@ dependencies = [
 
 [[package]]
 name = "net-mesh-mcp"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "apple-native-keyring-store",
  "async-trait",
@@ -3334,7 +3334,7 @@ dependencies = [
 
 [[package]]
 name = "net-mesh-sdk"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3383,7 +3383,7 @@ dependencies = [
 
 [[package]]
 name = "net-mesh-sdk-macros"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3392,7 +3392,7 @@ dependencies = [
 
 [[package]]
 name = "net-mesh-wire"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "blake2 0.11.0",
  "bytes",
@@ -3417,7 +3417,7 @@ dependencies = [
 
 [[package]]
 name = "net-meshdb-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "futures",
  "net-mesh",
@@ -3429,7 +3429,7 @@ dependencies = [
 
 [[package]]
 name = "net-meshos-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "bytes",
  "net-mesh",
@@ -3440,7 +3440,7 @@ dependencies = [
 
 [[package]]
 name = "net-node"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -3466,7 +3466,7 @@ dependencies = [
 
 [[package]]
 name = "net-org-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "bytes",
  "libc",
@@ -3480,7 +3480,7 @@ dependencies = [
 
 [[package]]
 name = "net-payments"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "async-trait",
  "base64 0.23.1",
@@ -3515,7 +3515,7 @@ dependencies = [
 
 [[package]]
 name = "net-python"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -3541,7 +3541,7 @@ dependencies = [
 
 [[package]]
 name = "net-rpc-ffi"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "async-trait",
  "bytes",

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/Cargo.toml

@@ -6,7 +6,7 @@ members = [".", "wire", "sdk", "cli", "adapters/mcp", "aggregator-daemon"]
 # `version.workspace = true`). Bump it here; the version-consistency check
 # (.github/scripts/check-versions.py) fails CI on any published manifest,
 # internal dependency or package file that disagrees.
-version = "0.41.0"
+version = "0.41.1"
 
 [package]
 name = "net-mesh"
@@ -238,7 +238,7 @@ cli = ["dataforts", "redex-disk", "dep:clap"]
 # handshake, packet AEAD, reliability, sessions, the routing envelope.
 # tokio-free and wasm32-clean; the core re-exports every module of it
 # under its previous path.
-net-mesh-wire = { version = "0.41.0", path = "wire", features = ["json"] }
+net-mesh-wire = { version = "0.41.1", path = "wire", features = ["json"] }
 
 # Async runtime
 tokio = { version = "1", features = ["rt-multi-thread", "sync", "time", "macros", "net", "io-util"] }
@@ -408,7 +408,7 @@ clap = { version = "4", features = ["derive", "env"], optional = true }
 # The wire crate's own surface, for `tests/cross_lang_wire.rs`: the
 # AEAD golden vector is asserted against the seam directly, so the
 # fixture pins the backend rather than only the packet path above it.
-net-mesh-wire = { version = "0.41.0", path = "wire", features = ["json", "test-vectors"] }
+net-mesh-wire = { version = "0.41.1", path = "wire", features = ["json", "test-vectors"] }
 tokio = { version = "1", features = ["full", "test-util"] }
 # `heartbeat_api_drift_check`'s workspace-layout classifier is
 # witnessed over synthetic trees (a packaged crate, the same tree

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: net-mesh-cli
-Version: 0.41.0
+Version: 0.41.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/adapters/mcp/Cargo.toml

@@ -48,7 +48,7 @@ keychain = [
 # `serve_tool` / `call_tool` provider+caller verbs the announce/invoke
 # slices need; it pulls `net` (the SDK tool module is written against the
 # mesh-RPC surface) and `cortex`.
-net-mesh-sdk = { version = "0.41.0", path = "../../sdk", default-features = false, features = [
+net-mesh-sdk = { version = "0.41.1", path = "../../sdk", default-features = false, features = [
     "net",
     "tool",
 ] }

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/aggregator-daemon/Cargo.toml

@@ -18,14 +18,14 @@ path = "src/main.rs"
 [dependencies]
 # Substrate primitives — aggregator + lifecycle + registry +
 # RPC service all live behind the SDK's `net` feature surface.
-net-sdk = { package = "net-mesh-sdk", version = "0.41.0", path = "../sdk", default-features = false, features = [
+net-sdk = { package = "net-mesh-sdk", version = "0.41.1", path = "../sdk", default-features = false, features = [
     "net",
     "nat-traversal",
 ] }
 # Direct dep on the underlying crate so the binary can reach
 # the typed surfaces the SDK doesn't re-export (AggregatorConfig,
 # LifecycleGroup, etc).
-net = { package = "net-mesh", version = "0.41.0", path = ".." }
+net = { package = "net-mesh", version = "0.41.1", path = ".." }
 
 # Argv parsing.
 clap = { version = "4", features = ["derive", "env"] }

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/browser-ts/CHANGELOG.md

@@ -14,6 +14,36 @@ missing method at the call site rather than at install time. Unlike
 `@net-mesh/sdk`, this package never depends on `@net-mesh/core` — see
 the README on why it is a sibling package rather than a sub-path.
 
+## 0.41.1 — two pages can connect to each other at once
+
+- **`connectPeer` from both sides no longer cancels both attempts.** When
+  two pages called `connectPeer` on each other at the same moment, each
+  answer retired the answerer's own offer, both ran out their ICE
+  deadline, and the pair stayed relayed. Every game had to hand-code a
+  tie-break. The SDK now does it, on `BrowserNode` and `MeshSession`
+  alike:
+  - the page with the **lower** node id offers;
+  - the higher one answers an offer from that peer that arrived within
+    the offerer's ICE deadline instead of offering back, and answers one
+    that crosses its own offer while that is under way. Once an answer
+    has started, its outcome is the call's;
+  - `acceptPeer` while this surface's own `connectPeer` for the peer is
+    in flight takes that call's outcome.
+
+  Offers are learned from the surface's verified signal events. With
+  none, or with the peer's node id unknown, `connectPeer` behaves as
+  before. One offerer per pair is an attempt at a direct link, not a
+  guarantee of one: read `peerAttempt()`.
+- **`joinLobby`'s `close()` resolves only once its withdrawal has
+  settled.** An announcement replaces a node's whole tag set, so a
+  withdrawal still in flight when the page went on to `createLobby`
+  could land after the new listing and erase it. The withdrawal also
+  waits for any seeking announcement still in flight.
+- **`counters()` reports each drop reason.** The leaf's nested `drops`
+  object came back as the string `"[object Object]"`; nested groups now
+  flatten to dotted keys (`drops.<reason>`), each still an exact decimal
+  string.
+
 ## 0.41.0 — the whole module surface is exported
 
 - **Every module-level export is reachable from an entry point.** Code

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/browser-ts/README.md

@@ -576,9 +576,11 @@ For views the rules can't express, write the projection yourself:
 audience })` (one per player). The declared rules still apply after it, so your
 code can hide more but never reveal a declared secret.
 
-**One tab per player.** All tabs of the same site in one browser profile share a
-single identity, so two tabs are the *same* player — and a player can't join
-itself. To test with two players on one machine, use two browser profiles, or
+**One tab per player.** With `rememberedIdentity()`, all tabs of the same site in
+one browser profile share a single identity once it is stored (two tabs that
+call it for the very first time at once can each create their own), so two tabs
+are the *same* player — and a player can't join itself. (Without it, every tab's `connect()` is a new
+player.) To test with two players on one machine, use two browser profiles, or
 two different browsers.
 
 **Announcements expire.** A host that announces once disappears from searches

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/browser-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@net-mesh/browser",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Browser-native Net mesh leaf \u2014 idiomatic TypeScript over the net-mesh-leaf wasm node",
   "type": "module",
   "main": "dist/index.js",

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/browser-ts/src/leader/session.ts

@@ -68,7 +68,9 @@ import {
 } from '../node.js';
 import {
   acceptPeer as driveAccept,
+  answerWaitingOffer,
   connectPeer as driveConnect,
+  noteOffer,
   PeerAttempts,
   type PeerPrimitives,
 } from '../peer-driver.js';
@@ -144,8 +146,8 @@ export class MeshSession {
    * iteration a page is already written to handle.
    */
   private readonly streams = new Set<LeafStream>();
-  /** One attempt per peer at a time: see {@link PeerAttempts}. */
-  private readonly attempts = new PeerAttempts();
+  /** One attempt per peer at a time, and one offerer per pair: see {@link PeerAttempts}. */
+  private readonly attempts = new PeerAttempts(() => this.inner.node_id_hex() ?? null);
   /**
    * The generation the streams in that set were opened under.
    *
@@ -173,6 +175,7 @@ export class MeshSession {
   constructor(private readonly inner: LeafWasmSession) {
     this.streamGeneration = inner.generation();
     inner.on_event((json) => this.hub.deliver(json, parseSessionEvent));
+    this.hub.onAny((event) => noteOffer(this.attempts, event));
     this.hub.onAny((event) => {
       // `leader_lost` is this tab losing the leader it was talking
       // to; `not_leader` is this tab discovering it *was* the leader
@@ -365,6 +368,13 @@ export class MeshSession {
    * offer: it is a proxy round trip here, and read ahead of the gate it
    * could be stale by the time the offer went out. See
    * {@link PeerAttempts}.
+   *
+   * **And between two nodes, the lower id offers.** When this node's id
+   * is the higher of the pair, an offer the peer sent in the last
+   * `PEER_OFFER_FRESH_MS` (10 s) — or one that crosses this call's own —
+   * is answered instead of offered over, so two pages reaching each
+   * other at once (glare) converge rather than cancel. See
+   * {@link PeerAttempts}.
    */
   async connectPeer(nodeIdHex: string): Promise<PeerConnectOutcome> {
     return this.attempts.connect(
@@ -379,6 +389,7 @@ export class MeshSession {
         }
       },
       () => driveConnect(nodeIdHex, this.peerPrimitives(), parseAttemptStatus),
+      () => answerWaitingOffer(nodeIdHex, this.peerPrimitives(), parseAttemptStatus),
     );
   }
 

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/browser-ts/src/lobby.ts

@@ -579,17 +579,30 @@ export async function joinLobby<S extends object, A extends ActionSpec, I extend
   const node = options.node;
   const keep = [...(options.tags ?? [])];
   const seeking = [...keep, seekTag(options.game, host)];
-  let stopped = false;
+  let stopped: Promise<void> | null = null;
+  // The seeking announcements not yet settled: the withdrawal waits for
+  // them, or one landing after it would put the seek tag back — over a
+  // lobby this node created meanwhile.
+  const seekingInFlight = new Set<Promise<void>>();
   const announce = () => {
-    if (!stopped) node.announce(seeking).catch(() => {});
+    if (stopped !== null) return;
+    const sent = node.announce(seeking).catch(() => {});
+    seekingInFlight.add(sent);
+    void sent.finally(() => seekingInFlight.delete(sent));
   };
   announce();
   const timer = setInterval(announce, LOBBY_ANNOUNCE_MS);
-  const stop = () => {
-    if (stopped) return;
-    stopped = true;
+  // Withdraws the seek tag, after any seeking announcement still in
+  // flight. Settles once the withdrawal has been attempted (a failure is
+  // swallowed, as every announcement here is), so a `close()` that awaits
+  // it is an ordering barrier: an announcement replaces the node's whole
+  // tag set, and one still in flight when the page goes on to
+  // `createLobby` would land after the new listing and erase it.
+  const stop = (): Promise<void> => {
+    if (stopped !== null) return stopped;
     clearInterval(timer);
-    node.announce(keep).catch(() => {});
+    stopped = Promise.all(seekingInFlight).then(() => node.announce(keep)).catch(() => {});
+    return stopped;
   };
 
   // Reach the host before joining. Until this player's announcement has
@@ -604,7 +617,7 @@ export async function joinLobby<S extends object, A extends ActionSpec, I extend
         break;
       } catch (error) {
         if (Date.now() >= deadline) {
-          stop();
+          void stop();
           throw new LobbyError('not-found', `could not reach the lobby's host ${host}: ${String((error as Error)?.message ?? error)}`);
         }
         await new Promise(resolve => setTimeout(resolve, 500));
@@ -624,13 +637,14 @@ export async function joinLobby<S extends object, A extends ActionSpec, I extend
       ...(options.interest === undefined ? {} : { interest: options.interest }),
     });
   } catch (error) {
-    stop();
+    void stop();
     throw error;
   }
   const close = joined.close.bind(joined);
   (joined as { close: () => Promise<void> }).close = async () => {
-    stop();
+    const withdrawn = stop();
     await close();
+    await withdrawn;
   };
   return joined;
 }

{net_mesh_cli-0.41.0 → net_mesh_cli-0.41.1}/browser-ts/src/node.ts

@@ -45,8 +45,10 @@ import {
 import { LeafStream, type OpenStreamOptions } from './stream.js';
 import {
   acceptPeer as driveAccept,
+  answerWaitingOffer,
   connectPeer as driveConnect,
   handshakePeer as driveHandshake,
+  noteOffer,
   PeerAttempts,
   type PeerPrimitives,
 } from './peer-driver.js';
@@ -343,8 +345,8 @@ export class BrowserNode {
    * handle.
    */
   private readonly streams = new Set<LeafStream>();
-  /** One attempt per peer at a time: see {@link PeerAttempts}. */
-  private readonly attempts = new PeerAttempts();
+  /** One attempt per peer at a time, and one offerer per pair: see {@link PeerAttempts}. */
+  private readonly attempts = new PeerAttempts(() => this.nodeId);
   /**
    * The live org handles (plan §4.5), so {@link BrowserNode.close}
    * can retire ownership: pending calls fail typed and each dropped
@@ -860,6 +862,13 @@ export class BrowserNode {
    * attempt), offering only after an inconclusive one. See
    * {@link PeerAttempts}.
    *
+   * **And between two nodes, the lower id offers.** When this node's id
+   * is the higher of the pair, an offer the peer sent in the last
+   * `PEER_OFFER_FRESH_MS` (10 s) — or one that crosses this call's own —
+   * is answered instead of offered over, so two pages reaching each
+   * other at once (glare) converge rather than cancel. See
+   * {@link PeerAttempts}.
+   *
    * Returns a {@link PeerConnectOutcome}. It **rejects** only for
    * something that is not a disposition of the attempt — a closed
    * node, a peer that answered `Reject`, a malformed peer id.
@@ -883,6 +892,7 @@ export class BrowserNode {
         }
       },
       () => driveConnect(nodeIdHex, this.peerPrimitives(), parseAttemptStatus),
+      () => answerWaitingOffer(nodeIdHex, this.peerPrimitives(), parseAttemptStatus),
     );
   }
 
@@ -1186,6 +1196,7 @@ export class BrowserNode {
       if (event.rtcAddr !== null) this.anchorRtcAddr = event.rtcAddr;
       if (event.rtcAddrs.length > 0) this.anchorRtcAddrs = event.rtcAddrs;
     }
+    noteOffer(this.attempts, event);
     this.hub.dispatch(event);
   }
 }
@@ -1241,14 +1252,26 @@ export function buildConnectRequest(options: ConnectOptions): LeafWasmConnectOpt
  * are `u64` on the Rust side and a JS number would round the large
  * ones. Exported for the session surface, whose `counters_json` is a
  * promise but whose payload is identical.
+ *
+ * A nested group is flattened into dotted keys: the leaf's per-reason
+ * `drops` object becomes `drops.<reason>`, one counter each. Stringified
+ * whole, it read `"[object Object]"` — every drop reason lost behind
+ * the doc comment's promise of "each drop reason".
  */
 export function parseCounters(json: string): Record<string, string> {
   const parsed: unknown = JSON.parse(json);
   if (parsed === null || typeof parsed !== 'object') return {};
   const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(parsed)) {
-    out[key] = typeof value === 'string' ? value : String(value);
-  }
+  const flatten = (group: object, prefix: string): void => {
+    for (const [key, value] of Object.entries(group)) {
+      if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+        flatten(value, `${prefix}${key}.`);
+      } else {
+        out[`${prefix}${key}`] = typeof value === 'string' ? value : String(value);
+      }
+    }
+  };
+  flatten(parsed, '');
   return out;
 }