@cero-base/cero 1.2.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cero-base/cero",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "The ideal p2p API — everything is a handle, handles contain refs, refs contain rows.",
   "type": "module",
   "sideEffects": false,
@@ -86,7 +86,7 @@
     "test:bare": "npx bare test/bare-smoke.js"
   },
   "dependencies": {
-    "@cero-base/core": "^1.2.0",
+    "@cero-base/core": "^1.4.0",
     "b4a": "^1.8.1",
     "bare-abort-controller": "^1.1.2",
     "bare-crypto": "^1.15.3",

package/src/bluetooth.js

@@ -1,7 +1,7 @@
 import ReadyResource from 'ready-resource'
 import safetyCatch from 'safety-catch'
 
-import { BluetoothTransport } from '@cero-base/core/network/bluetooth'
+import { BLETransport } from '@cero-base/core/network/transports/ble'
 import { Pairing } from '@cero-base/core/pairing'
 import { Invite } from '@cero-base/core/invite'
 
@@ -48,6 +48,7 @@ export class Bluetooth extends ReadyResource {
     this._backend = backend || null
     this._autoStart = autoStart === true
     this._transport = null
+    this._name = null
     this._announces = new Set()
     /** @type {'unsupported'|'unauthorized'|'off'|'waiting'|'starting'|'on'} */
     this.state = 'off'
@@ -70,7 +71,7 @@ export class Bluetooth extends ReadyResource {
     const topic = Pairing.inviteTopic(invite)
     if (!topic) return () => {}
 
-    const transport = new BluetoothTransport({
+    const transport = new BLETransport({
       backend: this._backend,
       network: this._handle.network,
       uuid: topic,
@@ -114,12 +115,21 @@ export class Bluetooth extends ReadyResource {
    *
    * @returns {Promise<void>}
    */
-  async start() {
+  async start({ name } = {}) {
+    if (name !== undefined) this._name = name
     if (this.state === 'unsupported') return
-    if (this._transport) return
+    if (this._transport) {
+      // reuse one transport across toggles — recreating leaks iOS CoreBluetooth
+      // managers (can't destroy()) and their stale GATT service
+      this._transport.name = this._name || ''
+      this._transport.resume()
+      this.state = this._transport.state
+      this.emit('update')
+      return
+    }
     const handle = this._handle
 
-    this._transport = new BluetoothTransport({
+    this._transport = new BLETransport({
       backend: this._backend,
       network: handle.network,
       // channel isolation for free: same channel → same UUID, like the swarm.
@@ -127,7 +137,13 @@ export class Bluetooth extends ReadyResource {
       uuid: handle.network.channel
         ? Buffer.from(handle.network.channel)
         : handle.identity.publicKey,
-      nodeId: handle.identity.publicKey
+      nodeId: handle.identity.publicKey,
+      name: this._name || '',
+      // Android scans in a battery-saver mode by default — too slow for a mesh
+      scanOptions:
+        typeof Bare !== 'undefined' && Bare.platform === 'android'
+          ? { scanMode: this._backend.Central.SCAN_MODE_LOW_LATENCY }
+          : undefined
     })
     this._transport.on('update', () => {
       this.state = this._transport.state
@@ -156,17 +172,24 @@ export class Bluetooth extends ReadyResource {
       await t.close().catch(safetyCatch)
     }
     if (!this._transport) return
-    try {
-      await this._transport.close()
-    } catch (err) {
-      safetyCatch(err)
-    }
-    this._transport = null
+    // suspend, don't close: keep the transport (and its GATT service) so a later
+    // start() resumes the same instance instead of leaking a new one. suspend()
+    // is async (it says goodbye + drains before hanging up); await it.
+    await this._transport.suspend()
     this.state = 'off'
     this.emit('update')
   }
 
   async _close() {
-    await this.stop()
+    for (const t of [...this._announces]) {
+      this._announces.delete(t)
+      await t.close().catch(safetyCatch)
+    }
+    if (this._transport) {
+      await this._transport.close().catch(safetyCatch)
+      this._transport = null
+    }
+    this.state = 'off'
+    this.emit('update')
   }
 }

package/src/index.js

@@ -69,7 +69,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 | any} [bluetooth]               `true` enables nearby (Bluetooth) sync via `me.bluetooth`; pass a bare-bluetooth-shaped backend to inject one. Absent backend → `me.bluetooth.state === 'unsupported'`.
+ * @property {boolean | { autoStart?: boolean, backend?: any }} [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); absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
  */
 
 /**
@@ -177,9 +177,17 @@ export async function cero(dir, spec, opts = {}) {
     }
 
     if (opts.bluetooth) {
+      // `true` → defaults; `{ autoStart, backend }` → options. A bare backend
+      // object (pre-1.3 shape, has Central/Server) is still accepted.
+      const bt =
+        opts.bluetooth === true
+          ? {}
+          : opts.bluetooth.Central
+            ? { backend: opts.bluetooth }
+            : opts.bluetooth
       me.bluetooth = new Bluetooth(me, {
-        backend: opts.bluetooth === true ? null : opts.bluetooth,
-        autoStart: true
+        backend: bt.backend || null,
+        autoStart: bt.autoStart !== false
       })
       me.once('close', () => me.bluetooth.close().catch(safetyCatch))
       await me.bluetooth.ready()

package/types/bluetooth.d.ts

@@ -27,7 +27,8 @@ export class Bluetooth extends ReadyResource {
     _handle: any;
     _backend: any;
     _autoStart: boolean;
-    _transport: BluetoothTransport;
+    _transport: BLETransport;
+    _name: any;
     _announces: Set<any>;
     /** @type {'unsupported'|'unauthorized'|'off'|'waiting'|'starting'|'on'} */
     state: "unsupported" | "unauthorized" | "off" | "waiting" | "starting" | "on";
@@ -52,7 +53,7 @@ export class Bluetooth extends ReadyResource {
      *
      * @returns {Promise<void>}
      */
-    start(): Promise<void>;
+    start({ name }?: {}): Promise<void>;
     /**
      * Stop advertising/scanning and drop links. Idempotent. Sync stops; local
      * data and the rest of the network (DHT) are untouched.
@@ -62,4 +63,4 @@ export class Bluetooth extends ReadyResource {
     stop(): Promise<void>;
 }
 import ReadyResource from 'ready-resource';
-import { BluetoothTransport } from '@cero-base/core/network/bluetooth';
+import { BLETransport } from '@cero-base/core/network/transports/ble';

package/types/index.d.ts

@@ -19,7 +19,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 | any} [bluetooth]               `true` enables nearby (Bluetooth) sync via `me.bluetooth`; pass a bare-bluetooth-shaped backend to inject one. Absent backend → `me.bluetooth.state === 'unsupported'`.
+ * @property {boolean | { autoStart?: boolean, backend?: any }} [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); absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
  */
 /**
  * Open (or create) a cero handle at `dir`. Sets up storage, network and
@@ -133,9 +133,12 @@ export type CeroOpts = {
      */
     extensions?: boolean;
     /**
-     * `true` enables nearby (Bluetooth) sync via `me.bluetooth`; pass a bare-bluetooth-shaped backend to inject one. Absent backend → `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); absent backend on an unsupported host → `me.bluetooth.state === 'unsupported'`.
      */
-    bluetooth?: boolean | any;
+    bluetooth?: boolean | {
+        autoStart?: boolean;
+        backend?: any;
+    };
 };
 import { t } from './lib/spec.js';
 import { put } from './lib/operators.js';