blind-peer 2.9.3 → 2.9.5

package/bare-bin.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env bare
+
+require('./bin')

package/bin.js

@@ -10,6 +10,7 @@ const byteSize = require('tiny-byte-size')
 const pino = require('pino')
 const b4a = require('b4a')
 const hypCrypto = require('hypercore-crypto')
+const { version: ownVersion } = require('./package.json')
 
 const BlindPeer = require('.')
 
@@ -131,6 +132,9 @@ const cmd = command(
     blindPeer.on('announce-core', (core) => {
       logger.info(`Started announcing core ${coreToInfo(core, true)}`)
     })
+    blindPeer.on('announced-initial-cores', () => {
+      logger.info(`Announced all initial cores`)
+    })
     blindPeer.on('core-downloaded', (core) => {
       logger.info(`Announced core fully downloaded: ${coreToInfo(core, true)}`)
     })
@@ -284,7 +288,8 @@ const cmd = command(
         scraperPublicKey,
         prometheusAlias,
         scraperSecret,
-        prometheusServiceName: SERVICE_NAME
+        prometheusServiceName: SERVICE_NAME,
+        version: ownVersion
       })
 
       blindPeer.registerMetrics(instrumentation.promClient)

package/index.js

@@ -187,7 +187,17 @@ class WakeupHandler {
 class BlindPeer extends ReadyResource {
   constructor(
     rocks,
-    { swarm, store, wakeup, maxBytes = 100_000_000_000, enableGc = true, trustedPubKeys, port } = {}
+    {
+      swarm,
+      store,
+      wakeup,
+      maxBytes = 100_000_000_000,
+      enableGc = true,
+      trustedPubKeys,
+      port,
+      announcingInterval = 100,
+      wakeupGcTickTime = null
+    } = {}
   ) {
     super()
 
@@ -195,10 +205,11 @@ class BlindPeer extends ReadyResource {
     this.store = store || new Corestore(this.rocks, { active: false })
     this.swarm = swarm || null
     this._port = port || 0
+    this.announcingInterval = announcingInterval
     this.trustedPubKeys = new Set()
     for (const k of trustedPubKeys || []) this.addTrustedPubKey(k)
 
-    this.wakeup = wakeup || new Wakeup(this._onwakeup.bind(this))
+    this.wakeup = wakeup || new Wakeup(this._onwakeup.bind(this), { gcTickTime: wakeupGcTickTime })
     this.ownsWakeup = !wakeup
     this.ownsSwarm = !swarm
     this.ownsStore = !store
@@ -266,12 +277,7 @@ class BlindPeer extends ReadyResource {
     }
     this.swarm.on('connection', this._onconnection.bind(this))
 
-    const announceProms = []
-    for await (const record of this.db.createAnnouncingCoresStream()) {
-      announceProms.push(this._announceCore(record.key))
-    }
-    await Promise.all(announceProms)
-
+    this._announceCores().catch(safetyCatch) // announcing cores asynchronously
     this.flushInterval = setInterval(this.flush.bind(this), 10_000)
   }
 
@@ -442,6 +448,18 @@ class BlindPeer extends ReadyResource {
     stream.on('close', () => core.close().catch(safetyCatch))
   }
 
+  async _announceCores() {
+    for await (const record of this.db.createAnnouncingCoresStream()) {
+      if (this.closing) return
+      await this._announceCore(record.key)
+      if (this.closing) return
+      await new Promise((resolve) => setTimeout(resolve, this.announcingInterval))
+      if (this.closing) return
+    }
+
+    this.emit('announced-initial-cores')
+  }
+
   async _announceCore(key) {
     const coreId = IdEnc.normalize(key)
     if (this.announcedCores.has(coreId)) return

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "blind-peer",
-  "version": "2.9.3",
+  "version": "2.9.5",
   "description": "Blind peers help keep hypercores available",
   "main": "index.js",
   "bin": {
-    "blind-peer": "bin.js"
+    "blind-peer": "bin.js",
+    "blind-peer-bare": "bare-bin.js"
   },
   "dependencies": {
     "autobase": "^7.0.18",
@@ -14,7 +15,7 @@
     "compact-encoding": "^2.16.0",
     "corestore": "^7.4.4",
     "graceful-goodbye": "^1.3.3",
-    "hyper-instrument": "^2.0.0",
+    "hyper-instrument": "^3.0.0",
     "hypercore": "^11.0.12",
     "hypercore-crypto": "^3.5.0",
     "hypercore-id-encoding": "^1.3.0",
@@ -23,8 +24,9 @@
     "hyperswarm": "^4.13.1",
     "paparam": "^1.8.0",
     "pino": "^9.6.0",
+    "pino-bare": "^0.0.1",
     "protomux-rpc": "^1.7.1",
-    "protomux-wakeup": "^2.7.0",
+    "protomux-wakeup": "^2.9.0",
     "ready-resource": "^1.1.2",
     "repl-swarm": "^2.3.0",
     "rocksdb-native": "^3.1.6",
@@ -33,6 +35,8 @@
     "tiny-byte-size": "^1.1.0"
   },
   "devDependencies": {
+    "bare-events": "^2.8.2",
+    "bare-process": "^4.2.2",
     "blind-peering": "^1.13.0",
     "brittle": "^3.7.0",
     "debounceify": "^1.1.0",
@@ -40,7 +44,8 @@
     "prettier": "^3.6.2",
     "prettier-config-holepunch": "^2.0.0",
     "prom-client": "^15.1.3",
-    "test-tmp": "^1.3.0"
+    "test-tmp": "^1.3.0",
+    "which-runtime": "^1.3.2"
   },
   "files": [
     "bin.js",
@@ -49,8 +54,9 @@
   ],
   "scripts": {
     "format": "prettier --write .",
-    "test": "prettier --check . && brittle test/*.js",
-    "test:bare": "bare test/basic.js"
+    "format:check": "prettier --check .",
+    "test": "npm run format:check && brittle test/*.js",
+    "test:bare": "bare test/test.js"
   },
   "repository": {
     "type": "git",
@@ -61,5 +67,15 @@
   "bugs": {
     "url": "https://github.com/holepunchto/blind-peer/issues"
   },
-  "homepage": "https://github.com/holepunchto/blind-peer"
+  "homepage": "https://github.com/holepunchto/blind-peer",
+  "imports": {
+    "pino": {
+      "bare": "pino-bare",
+      "default": "pino"
+    },
+    "events": {
+      "bare": "bare-events",
+      "default": "events"
+    }
+  }
 }