@cero-base/core 1.2.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cero-base/core",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "cero p2p primitives — identity, storage, network, database, blobs, rpc, pairing.",
   "type": "module",
   "sideEffects": false,
@@ -41,9 +41,13 @@
       "types": "./types/network/index.d.ts",
       "default": "./src/network/index.js"
     },
-    "./network/bluetooth": {
-      "types": "./types/network/bluetooth.d.ts",
-      "default": "./src/network/bluetooth.js"
+    "./network/transports/ble": {
+      "types": "./types/network/transports/ble.d.ts",
+      "default": "./src/network/transports/ble.js"
+    },
+    "./network/transports/dht": {
+      "types": "./types/network/transports/dht.d.ts",
+      "default": "./src/network/transports/dht.js"
     },
     "./database": {
       "types": "./types/database/index.d.ts",

package/src/network/index.js

@@ -1,15 +1,16 @@
-import Hyperswarm from 'hyperswarm'
 import NoiseSecretStream from '@hyperswarm/secret-stream'
 import BlindPairing from 'blind-pairing'
 import ProtomuxWakeup from 'protomux-wakeup'
 import ReadyResource from 'ready-resource'
 import safetyCatch from 'safety-catch'
 import b4a from 'b4a'
-import { hash } from 'hypercore-crypto'
 
 import { ACTIVE, PASSIVE } from '../lib/constants.js'
 import { CeroError } from '../lib/errors.js'
 import { Discovery } from './discovery.js'
+import { DHTTransport, channelTopic } from './transports/dht.js'
+
+export { channelTopic }
 
 /**
  * @typedef {object} NetworkOpts
@@ -36,7 +37,7 @@ export class Network extends ReadyResource {
     this.relayThrough = relayThrough || null
     this.channel = channel || null
 
-    this.swarm = null
+    this._dht = null
     this.wakeup = new ProtomuxWakeup()
 
     this._replicateables = new Set()
@@ -45,6 +46,11 @@ export class Network extends ReadyResource {
     this._blind = null
   }
 
+  /** @returns {any} The underlying hyperswarm, or null before ready / after close. */
+  get swarm() {
+    return this._dht ? this._dht.swarm : null
+  }
+
   /**
    * Feed an externally-established connection — a Bluetooth L2CAP channel, a
    * serial link, an in-process pair, any duplex — into the network. A raw
@@ -60,8 +66,16 @@ export class Network extends ReadyResource {
   inject(stream, { isInitiator } = {}) {
     if (this.closing || this.closed) throw CeroError.CLOSED('Network')
     if (!stream) throw CeroError.REQUIRED('stream')
+    // Injected links authenticate with the same long-lived identity as the
+    // swarm — an ephemeral key per link would defeat duplicate-peer detection
+    // (two radios between one pair would look like two different peers).
+    const keyPair = this.identity
+      ? { publicKey: this.identity.publicKey, secretKey: this.identity.secretKey }
+      : (this.swarm?.keyPair ?? undefined)
     const conn =
-      stream.noiseStream === stream ? stream : new NoiseSecretStream(isInitiator === true, stream)
+      stream.noiseStream === stream
+        ? stream
+        : new NoiseSecretStream(isInitiator === true, stream, keyPair ? { keyPair } : undefined)
 
     // blind-pairing picks the lowest-`rtt` unvisited channel to send on; that
     // field only exists on real udx sockets. A raw injected duplex has none,
@@ -135,24 +149,18 @@ export class Network extends ReadyResource {
   }
 
   async _open() {
-    const opts = {}
-    if (this.identity)
-      opts.keyPair = { publicKey: this.identity.publicKey, secretKey: this.identity.secretKey }
-    if (this.bootstrap) opts.bootstrap = this.bootstrap
-    if (this.firewall) opts.firewall = this.firewall
-    if (this.relayThrough) opts.relayThrough = this.relayThrough
-
-    this.swarm = new Hyperswarm(opts)
-
-    if (this.channel) {
-      const channel = this.channel
-      const join = this.swarm.join.bind(this.swarm)
-      const leave = this.swarm.leave.bind(this.swarm)
-      this.swarm.join = (topic, opts) => join(channelTopic(topic, channel), opts)
-      this.swarm.leave = (topic) => leave(channelTopic(topic, channel))
-    }
+    this._dht = new DHTTransport({
+      identity: this.identity,
+      bootstrap: this.bootstrap,
+      firewall: this.firewall,
+      relayThrough: this.relayThrough,
+      channel: this.channel
+    })
 
-    this.swarm.on('connection', (stream, info) => {
+    // DHTTransport owns the swarm's lifecycle; Network subscribes to its events
+    // because the handlers touch Network state (wakeup, replicateables, emit).
+    const swarm = this._dht.swarm
+    swarm.on('connection', (stream, info) => {
       if (this.closing || this.closed) {
         stream.destroy()
         return
@@ -161,8 +169,8 @@ export class Network extends ReadyResource {
       for (const r of this._replicateables) replicateInto(r, stream)
       this.emit('connection', stream, info)
     })
-    this.swarm.on('peer-add', (peer) => this.emit('peer-add', peer))
-    this.swarm.on('peer-remove', (peer) => this.emit('peer-remove', peer))
+    swarm.on('peer-add', (peer) => this.emit('peer-add', peer))
+    swarm.on('peer-remove', (peer) => this.emit('peer-remove', peer))
   }
 
   /**
@@ -171,9 +179,8 @@ export class Network extends ReadyResource {
    * @param {{ timeout?: number }} [opts]
    * @returns {Promise<void>}
    */
-  async flush({ timeout = 500 } = {}) {
-    if (!this.swarm) return
-    await Promise.race([this.swarm.flush(), new Promise((r) => setTimeout(r, timeout))])
+  async flush(opts) {
+    await this._dht?.flush(opts)
   }
 
   /**
@@ -182,13 +189,8 @@ export class Network extends ReadyResource {
    * @returns {Promise<void>}
    */
   async suspend() {
-    if (!this.swarm || this.closing || this.closed) return
-    if (this.swarm.suspended) return
-    try {
-      await this.swarm.suspend()
-    } catch (err) {
-      safetyCatch(err)
-    }
+    if (this.closing || this.closed) return
+    await this._dht?.suspend()
   }
 
   /**
@@ -197,13 +199,8 @@ export class Network extends ReadyResource {
    * @returns {Promise<void>}
    */
   async resume() {
-    if (!this.swarm || this.closing || this.closed) return
-    if (!this.swarm.suspended) return
-    try {
-      await this.swarm.resume()
-    } catch (err) {
-      safetyCatch(err)
-    }
+    if (this.closing || this.closed) return
+    await this._dht?.resume()
   }
 
   async _close() {
@@ -233,18 +230,13 @@ export class Network extends ReadyResource {
       this._blind = null
     }
 
-    if (this.swarm) {
+    if (this._dht) {
       try {
-        await this.flush()
+        await this._dht.destroy()
       } catch (err) {
         safetyCatch(err)
       }
-      try {
-        await this.swarm.destroy()
-      } catch (err) {
-        safetyCatch(err)
-      }
-      this.swarm = null
+      this._dht = null
     }
 
     if (this.wakeup) {
@@ -342,12 +334,6 @@ function replicateInto(core, stream) {
   }
 }
 
-// A channel re-namespaces every swarm topic so only same-channel peers meet.
-// No channel → identity (unchanged, back-compat).
-export function channelTopic(topic, channel) {
-  return channel ? hash([topic, b4a.from(channel)]) : topic
-}
-
 function isTopic(x) {
   return b4a.isBuffer(x) && x.length === 32
 }