@cero-base/cero 1.13.0 → 1.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cero-base/cero",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "The ideal p2p API — everything is a handle, handles contain refs, refs contain rows.",
   "type": "module",
   "sideEffects": false,
@@ -95,13 +95,13 @@
     "test:node": "ls test/*.test.js | xargs -P1 -n1 brittle-node"
   },
   "dependencies": {
-    "@cero-base/core": "^1.13.0",
+    "@cero-base/core": "^1.14.0",
     "b4a": "^1.8.1",
     "bare-abort-controller": "^1.1.2",
     "bare-crypto": "^1.15.3",
     "bare-fs": "^4.8.0",
     "bare-path": "^3.1.1",
-    "ble-swarm": "github:holepunchto/ble-swarm#63566f02d4b3a1f3849b9fb009e18666411592a5",
+    "ble-swarm": "^2.2.0",
     "compact-encoding": "^3.3.2",
     "corestore": "^7.12.0",
     "hrpc": "^4.3.1",
@@ -114,6 +114,7 @@
     "ready-resource": "^1.2.0",
     "safety-catch": "^1.0.3",
     "streamx": "^2.28.0",
+    "suspendify": "^1.7.2",
     "z32": "^1.1.0"
   },
   "devDependencies": {

package/src/bluetooth.js

@@ -107,8 +107,9 @@ export class Bluetooth extends ReadyResource {
   async stop() {
     this._clearAnnounce()
     await this.swarm.stop()
-    // while stopped setTopic just sticks — the next start() is back on the mesh
-    await this.swarm.setTopic(this._topic)
+    // while stopped setTopic just sticks — the next start() is back on the
+    // mesh. A start() + announce() that landed during the await wins.
+    if (!this._announce) await this.swarm.setTopic(this._topic)
   }
 
   /**

package/src/handle/index.js

@@ -5,6 +5,7 @@ import Hypercore from 'hypercore'
 import { discoveryKey } from 'hypercore-crypto'
 import ReadyResource from 'ready-resource'
 import safetyCatch from 'safety-catch'
+import Suspendify from 'suspendify'
 import z32 from 'z32'
 
 import { Identity } from '@cero-base/core/identity'
@@ -127,6 +128,10 @@ export class Handle extends ReadyResource {
     this._fileServer = null
     this._blobs = null
     this._epochBlobs = null
+    // root only — serializes suspend/resume, converges rapid bounces
+    this._sus = parent
+      ? null
+      : new Suspendify({ suspend: () => this._suspend(), resume: () => this._resume() })
     this._owned = new Set()
 
     this.store = new Database({
@@ -348,7 +353,10 @@ export class Handle extends ReadyResource {
     blobs
       .ready()
       .then(() => {
-        if (blobs.key) this.root._coreKeys.set(b4a.toString(blobs.key, 'hex'), encryptionKey)
+        // close prunes _coreKeys first — a ready() resolving after that must
+        // not re-insert the entry (it would outlive the handle on the root)
+        if (this.closing || this.closed || !blobs.key) return
+        this.root._coreKeys.set(b4a.toString(blobs.key, 'hex'), encryptionKey)
       })
       .catch(this._onerror)
     return blobs
@@ -374,7 +382,9 @@ export class Handle extends ReadyResource {
         if (stamp === undefined) {
           this.store
             .get('files', id)
-            .then(({ data }) => data && this._registerBlobCore(id, data.stamp || 0))
+            .then(({ data }) => {
+              if (data && !this.closing && !this.closed) this._registerBlobCore(id, data.stamp || 0)
+            })
             .catch(safetyCatch)
           return
         }
@@ -412,7 +422,7 @@ export class Handle extends ReadyResource {
   }
 
   get suspended() {
-    return this._suspended === true
+    return this._sus?.suspended === true
   }
 
   /**
@@ -571,14 +581,14 @@ export class Handle extends ReadyResource {
     const sig = this.identity.sign(
       addWriterPayload(this.store.key, writerKey, this.store.writerKey)
     )
-    await this.store.tx(async () => {
-      await this.store.call('add-writer', {
+    await this.store.tx(async (tx) => {
+      await tx.call('add-writer', {
         sig,
         master: this.identity.publicKey,
         writer: writerKey,
         ts: member.updatedAt || Date.now()
       })
-      await this.store.call('add-member', member)
+      await tx.call('add-member', member)
     })
   }
 
@@ -619,11 +629,25 @@ export class Handle extends ReadyResource {
     )
     // a failure after the child opens must close it — else it leaks its Database,
     // swarm session and attached bee, never reaped by the parent (not yet a child)
+    let publish = null
+    let abort = null
+    let inflightId = null
     try {
       await child.ready()
       child.name = name
 
       const id = toId(child.store.key)
+      // Close the create/open race: the `add-handle` write below makes the row
+      // visible before this create finishes, so a concurrent _load for the id
+      // must share this child — a duplicate Handle over the same core
+      // deadlocks in ready().
+      const inflight = new Promise((resolve, reject) => {
+        publish = resolve
+        abort = reject
+      })
+      inflight.catch(safetyCatch)
+      inflightId = id
+      this._loading?.set(id, inflight)
       await this._saveKeyPair(id, writer)
 
       const ts = Date.now()
@@ -658,8 +682,12 @@ export class Handle extends ReadyResource {
       bind(child, type)
       this.children.add(child)
       this.emit('handle', child, { name, role })
+      publish(child)
+      this._loading?.delete(id)
       return child
     } catch (err) {
+      if (abort) abort(err)
+      if (inflightId) this._loading?.delete(inflightId)
       await child.close().catch(safetyCatch)
       throw err
     }
@@ -738,11 +766,23 @@ export class Handle extends ReadyResource {
     )
     // whenWritable timing out (host offline) is a normal failure — close the
     // fully-opened child rather than leak its Database/pairing/swarm session
+    let publish = null
+    let abort = null
+    let inflightId = null
     try {
       await child.ready()
       if (!child.store.writable) await child.store.whenWritable({ timeout: deadline })
 
       const id = toId(child.store.key)
+      // same create/open race as _create: the add-handle row is visible before
+      // this join finishes — a concurrent _load must share this child
+      const inflight = new Promise((resolve, reject) => {
+        publish = resolve
+        abort = reject
+      })
+      inflight.catch(safetyCatch)
+      inflightId = id
+      this._loading?.set(id, inflight)
       await this._saveKeyPair(id, child.store.keyPair)
 
       const ts = Date.now()
@@ -759,8 +799,12 @@ export class Handle extends ReadyResource {
       bind(child, type)
       this.children.add(child)
       this.emit('handle', child, {})
+      publish(child)
+      this._loading?.delete(id)
       return child
     } catch (err) {
+      if (abort) abort(err)
+      if (inflightId) this._loading?.delete(inflightId)
       await child.close().catch(safetyCatch)
       throw err
     }
@@ -834,8 +878,11 @@ export class Handle extends ReadyResource {
    * @returns {Promise<void>}
    */
   async suspend() {
-    if (this.parent || this.closing || this.closed || this._suspended) return
-    this._suspended = true
+    if (this._sus) await this._sus.suspend()
+  }
+
+  async _suspend() {
+    if (this.closing || this.closed) return
     await Promise.all([...this.children].map((c) => c.pair?.suspend()))
     await this.bluetooth?.suspend()
     await this.network.suspend()
@@ -852,8 +899,11 @@ export class Handle extends ReadyResource {
    * @returns {Promise<void>}
    */
   async resume() {
-    if (this.parent || this.closing || this.closed || !this._suspended) return
-    this._suspended = false
+    if (this._sus) await this._sus.resume()
+  }
+
+  async _resume() {
+    if (this.closing || this.closed) return
     try {
       await this.store.store.resume()
     } catch (err) {

package/src/index.js

@@ -74,7 +74,7 @@ export { t, schema } from './lib/spec.js'
  * @property {number} [recoveryTimeout]                Max wait for peer data + writer capability during recovery.
  * @property {Uint8Array} [storageKey]                 32-byte key encrypting local key material (master seed, device keypairs) at rest. Source it from the OS keychain — cero never stores it.
  * @property {boolean} [extensions]                    `false` disables the bundled extensions (profileSync, handleSync) for this instance. Build with `{ extensions: false }` too so the spec matches.
- * @property {boolean | { autoStart?: boolean, backend?: any, maxOutbound?: number, maxInbound?: number }} [bluetooth]  `true` enables nearby (Bluetooth) sync via `me.bluetooth` (auto-started). `{ autoStart: false }` creates the facade without starting the radio — the app calls `me.bluetooth.start()`/`stop()` (user toggle). `backend` injects a bare-bluetooth-shaped backend (tests). `maxOutbound`/`maxInbound` cap concurrent outbound links and inbound sessions. Absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
+ * @property {boolean | { autoStart?: boolean, backend?: any, maxOutbound?: number, maxInbound?: number, pipe?: 'l2cap' | 'gatt' }} [bluetooth]  `true` enables nearby (Bluetooth) sync via `me.bluetooth` (auto-started). `{ autoStart: false }` creates the facade without starting the radio — the app calls `me.bluetooth.start()`/`stop()` (user toggle). `backend` injects a bare-bluetooth-shaped backend (tests). `maxOutbound`/`maxInbound` cap concurrent outbound links and inbound sessions. `pipe` picks the data pipe — `'l2cap'` (default, faster) or `'gatt'`; both peers must match. Absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
  */
 
 /**

package/types/handle/index.d.ts

@@ -96,6 +96,7 @@ export class Handle extends ReadyResource {
     _fileServer: FileServer;
     _blobs: Blobs;
     _epochBlobs: any;
+    _sus: any;
     _owned: Set<any>;
     store: Database;
     pair: Pairing;
@@ -314,13 +315,14 @@ export class Handle extends ReadyResource {
      * @returns {Promise<void>}
      */
     suspend(): Promise<void>;
-    _suspended: boolean;
+    _suspend(): Promise<void>;
     /**
      * Resume a suspended root handle. Idempotent; no-op on child handles.
      *
      * @returns {Promise<void>}
      */
     resume(): Promise<void>;
+    _resume(): Promise<void>;
     /**
      * @param {Handle} child
      * @param {{ role?: string }} [opts]

package/types/index.d.ts

@@ -20,7 +20,7 @@
  * @property {number} [recoveryTimeout]                Max wait for peer data + writer capability during recovery.
  * @property {Uint8Array} [storageKey]                 32-byte key encrypting local key material (master seed, device keypairs) at rest. Source it from the OS keychain — cero never stores it.
  * @property {boolean} [extensions]                    `false` disables the bundled extensions (profileSync, handleSync) for this instance. Build with `{ extensions: false }` too so the spec matches.
- * @property {boolean | { autoStart?: boolean, backend?: any, maxOutbound?: number, maxInbound?: number }} [bluetooth]  `true` enables nearby (Bluetooth) sync via `me.bluetooth` (auto-started). `{ autoStart: false }` creates the facade without starting the radio — the app calls `me.bluetooth.start()`/`stop()` (user toggle). `backend` injects a bare-bluetooth-shaped backend (tests). `maxOutbound`/`maxInbound` cap concurrent outbound links and inbound sessions. Absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
+ * @property {boolean | { autoStart?: boolean, backend?: any, maxOutbound?: number, maxInbound?: number, pipe?: 'l2cap' | 'gatt' }} [bluetooth]  `true` enables nearby (Bluetooth) sync via `me.bluetooth` (auto-started). `{ autoStart: false }` creates the facade without starting the radio — the app calls `me.bluetooth.start()`/`stop()` (user toggle). `backend` injects a bare-bluetooth-shaped backend (tests). `maxOutbound`/`maxInbound` cap concurrent outbound links and inbound sessions. `pipe` picks the data pipe — `'l2cap'` (default, faster) or `'gatt'`; both peers must match. Absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
  */
 /**
  * Open (or create) a cero handle at `dir`. Sets up storage, network and
@@ -140,13 +140,14 @@ export type CeroOpts = {
      */
     extensions?: boolean;
     /**
-     * `true` enables nearby (Bluetooth) sync via `me.bluetooth` (auto-started). `{ autoStart: false }` creates the facade without starting the radio — the app calls `me.bluetooth.start()`/`stop()` (user toggle). `backend` injects a bare-bluetooth-shaped backend (tests). `maxOutbound`/`maxInbound` cap concurrent outbound links and inbound sessions. Absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
+     * `true` enables nearby (Bluetooth) sync via `me.bluetooth` (auto-started). `{ autoStart: false }` creates the facade without starting the radio — the app calls `me.bluetooth.start()`/`stop()` (user toggle). `backend` injects a bare-bluetooth-shaped backend (tests). `maxOutbound`/`maxInbound` cap concurrent outbound links and inbound sessions. `pipe` picks the data pipe — `'l2cap'` (default, faster) or `'gatt'`; both peers must match. Absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
      */
     bluetooth?: boolean | {
         autoStart?: boolean;
         backend?: any;
         maxOutbound?: number;
         maxInbound?: number;
+        pipe?: "l2cap" | "gatt";
     };
 };
 import { t } from './lib/spec.js';