@net-mesh/browser 0.39.0 → 0.41.0

package/dist/store/join.d.ts

@@ -57,7 +57,12 @@ export declare const MAX_OUTSTANDING = 64;
 export interface JoinStoreOptions<S extends object, A extends ActionSpec, I extends InputSpec> {
     readonly definition: StoreDefinition<S, A, I>;
     readonly transport: StoreTransport;
-    /** The node hosting the store. */
+    /**
+     * The node hosting the store: 16 hex digits, as `nodeIdHex()` and a
+     * descriptor's `peerIdHex` print it. The decimal `peerNode` of an
+     * event is accepted too, unless it is exactly sixteen digits long —
+     * that is the hex spelling, and it is read as hex.
+     */
     readonly host: string;
     /** The audience this caller wants. */
     readonly audience: readonly string[];

package/dist/store/join.js

@@ -23,7 +23,7 @@
  */
 import { StoreCore } from './core.js';
 import { isStaleStream, StoreError } from './errors.js';
-import { peerHexOf, samePeer } from './host.js';
+import { nodeHexOf, peerHexOf } from './host.js';
 import { StoreReplica } from './replica.js';
 import { decodeMessage, encodeMessage, utf8Length } from './wire.js';
 /** How often a live handle renews its lease (§1.6). */
@@ -83,7 +83,10 @@ export function joinStore(options) {
     // had already accepted the subscription. Refused here instead,
     // where the caller can read what it did wrong.
     const selfId = options.transport.nodeIdHex();
-    if (selfId !== null && samePeer(selfId, options.host)) {
+    // Read ONCE, as an id the caller holds: hex when it is the sixteen
+    // digits `nodeIdHex()` prints, even when none of them is a letter.
+    const hostHex = nodeHexOf(options.host);
+    if (selfId !== null && hostHex !== null && nodeHexOf(selfId) === hostHex) {
         throw new StoreError('invalid-data', 'a replica cannot join the node it runs on: hold the hostStore handle instead');
     }
     const streamId = options.streamId ?? `store/${options.definition.id}`;
@@ -124,8 +127,7 @@ export function joinStore(options) {
             return upstream;
         if (opening !== null)
             return opening;
-        const addressable = peerHexOf(options.host);
-        if (addressable === null) {
+        if (hostHex === null) {
             return Promise.reject(new StoreError('invalid-data', `the host id is not a node id: ${options.host}`));
         }
         // `label`, never `streamId`: see {@link StoreTransport.openStream}.
@@ -139,11 +141,11 @@ export function joinStore(options) {
         // the relay is installed before the direct half is even tried, so
         // the open below is the thing that decides, and its refusal is
         // typed.
-        opening = Promise.resolve(options.transport.connectPeer?.(addressable))
+        opening = Promise.resolve(options.transport.connectPeer?.(hostHex))
             .catch(() => undefined)
             .then(() => options.transport.openStream({
             reliability: 'reliable',
-            peer: addressable,
+            peer: hostHex,
             label: streamId,
         }))
             .then(open => {
@@ -350,8 +352,12 @@ export function joinStore(options) {
         // is what identifies this store's traffic.
         // The host's identity, compared as a NUMBER: the event carries an
         // exact decimal and `options.host` is hex, so `!==` on the strings
-        // rejected every frame the host ever sent.
-        if (typeof event.peerNode !== 'string' || !samePeer(event.peerNode, options.host))
+        // rejected every frame the host ever sent. Each side is read in
+        // its OWN spelling: one reader for both took an all-digit hex host
+        // for a decimal, and then no frame of that host's ever matched.
+        if (typeof event.peerNode !== 'string' || hostHex === null)
+            return;
+        if (peerHexOf(event.peerNode) !== hostHex)
             return;
         const payload = event.payload;
         if (payload === undefined)

package/dist/world/link.js

@@ -14,7 +14,7 @@
  * handoffs.handoff('ship-7', 'r:4:8');         // when the ship crosses the border
  * ```
  */
-import { peerHexOf } from '../store/host.js';
+import { nodeHexOf, peerHexOf } from '../store/host.js';
 import { ghostTargets, onForwardedAction, pruneActs, } from './border.js';
 import { beginHandoff, locate, onHandoffOffer, onHandoffReply, pruneHandled, reofferHandoff, retryHandoffs, } from './handoff.js';
 const encoder = new TextEncoder();
@@ -140,7 +140,7 @@ export function handoffLink(options) {
         // handoff on another region's behalf.
         const sender = typeof event.peerNode === 'string' ? peerHexOf(event.peerNode) : null;
         const expected = options.peerOf(body.from);
-        if (sender === null || expected === null || peerHexOf(expected) !== sender) {
+        if (sender === null || expected === null || nodeHexOf(expected) !== sender) {
             drop('unauthenticated');
             refresh(body.from);
             return;
@@ -153,7 +153,7 @@ export function handoffLink(options) {
             if (closed)
                 return;
             const peer = options.peerOf(message.to);
-            const hex = peer === null ? null : peerHexOf(peer);
+            const hex = peer === null ? null : nodeHexOf(peer);
             if (hex === null) {
                 drop('unknown-region');
                 refresh(message.to);

package/dist/world/regions.js

@@ -27,7 +27,7 @@
  * directory (`handoffLink({ peerOf: directory.peerOf })`) needs the list:
  * otherwise a node that announces a region could also send offers as it.
  */
-import { peerHexOf } from '../store/host.js';
+import { nodeHexOf } from '../store/host.js';
 import { joinStore } from '../store/join.js';
 /** Region `r:<rx>:<rz>` for a position, with regions `size` units square. */
 export function regionOf(x, z, size) {
@@ -77,7 +77,7 @@ export function announceRegions(node, world, regions, options = {}) {
 export function regionDirectory(options) {
     const trusted = options.trustedHosts === undefined
         ? null
-        : new Set(options.trustedHosts.map(id => peerHexOf(id)).filter((id) => id !== null));
+        : new Set(options.trustedHosts.map(id => nodeHexOf(id)).filter((id) => id !== null));
     const cache = new Map();
     return {
         async lookup(region) {
@@ -90,7 +90,7 @@ export function regionDirectory(options) {
             }
             const hosts = [
                 ...new Set(found
-                    .map(descriptor => peerHexOf(descriptor.peerIdHex))
+                    .map(descriptor => nodeHexOf(descriptor.peerIdHex))
                     .filter((id) => id !== null && (trusted === null || trusted.has(id)))),
             ].sort();
             const answer = hosts.length === 0

package/package.json

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