blind-peer 3.9.0 → 3.10.0

package/index.js

@@ -24,6 +24,8 @@ const {
   RouterResolvePeersRequest,
   RouterResolvePeersResponse
 } = require('blind-peer-encodings')
+const blindPush = require('blind-push')
+const { ForwardPushRequest } = require('blind-push/encodings')
 
 const BlindPeerDB = require('./lib/db.js')
 const TopKWindow = require('./lib/top-k.js')
@@ -218,6 +220,8 @@ class BlindPeer extends ReadyResource {
       routerPoolOpts,
       ipBanListKeys = [],
       banTimeout = 16_000,
+      pushGatewayKeys,
+      pushGatewayPoolOpts,
       port,
       bootstrap = null,
       announcingInterval = 100,
@@ -257,10 +261,13 @@ class BlindPeer extends ReadyResource {
     this.announcedCores = new Map()
     this.replicationLagThreshold = replicationLagThreshold
 
+    this.rpcClient = null
     this.routerKey = routerKey || null
     this.routerPoolOpts = routerPoolOpts || {}
     this.routerPool = null
     this.adminRouter = adminRouter
+    this.pushGatewayKeys = pushGatewayKeys || []
+    this.pushGatewayPoolOpts = pushGatewayPoolOpts || {}
 
     this.stats = {
       bytesGcd: 0,
@@ -268,6 +275,9 @@ class BlindPeer extends ReadyResource {
       activations: 0,
       wakeups: 0,
       addCoresRx: 0,
+      notificationsRx: 0,
+      notificationsSent: 0,
+      notificationErrors: 0,
       muxerPaired: 0,
       muxerErrors: 0
     }
@@ -365,9 +375,20 @@ class BlindPeer extends ReadyResource {
       })
     )
 
+    this.rpcClient = new ProtomuxRpcClient(this.swarm.dht)
     if (this.routerKey) {
-      const rpcClient = new ProtomuxRpcClient(this.swarm.dht)
-      this.routerPool = new ProtomuxRpcClientPool([this.routerKey], rpcClient, this.routerPoolOpts)
+      this.routerPool = new ProtomuxRpcClientPool(
+        [this.routerKey],
+        this.rpcClient,
+        this.routerPoolOpts
+      )
+    }
+    if (this.pushGatewayKeys.length) {
+      this.gatewayPool = new ProtomuxRpcClientPool(
+        this.pushGatewayKeys,
+        this.rpcClient,
+        this.pushGatewayPoolOpts
+      )
     }
 
     await this.topKByPeer.ready()
@@ -537,6 +558,15 @@ class BlindPeer extends ReadyResource {
             self.emit('muxer-error', e, conn)
             throw e
           }
+        },
+        async onnotification(request) {
+          try {
+            await self._onnotification(conn, request)
+          } catch (e) {
+            self.stats.notificationErrors++
+            self.emit('notification-error', e, conn)
+            throw e
+          }
         }
       })
     })
@@ -878,11 +908,46 @@ class BlindPeer extends ReadyResource {
     return true
   }
 
+  async _onnotification(stream, request) {
+    this.stats.notificationsRx++
+
+    if (!this.gatewayPool) {
+      return null
+    }
+
+    const core = this.store.get({ key: request.block.key })
+
+    await core.ready()
+
+    const payload = await blindPush.createNotification(core, {
+      roomKey: request.destination.key,
+      roomDiscoveryKey: request.destination.discoveryKey,
+      index: request.block.index,
+      version: request.version,
+      extra: request.extra
+    })
+
+    await this.gatewayPool.makeRequest(
+      'forward-push',
+      { payload, appId: request.appId },
+      {
+        requestEncoding: ForwardPushRequest,
+        responseEncoding: c.none
+      }
+    )
+
+    this.stats.notificationsSent++
+    this.emit('notification-sent', request, payload, stream)
+  }
+
   async _close() {
     if (this.routerPool) {
       await this.routerPool.destroy()
-      await this.routerPool.statelessRpc.close()
     }
+    if (this.gatewayPool) {
+      await this.gatewayPool.destroy()
+    }
+    await this.rpcClient.close()
     if (this.adminRouter) await this.adminRouter.close()
     clearInterval(this.flushInterval)
     await this.topKByPeer.close()
@@ -1074,6 +1139,14 @@ class BlindPeer extends ReadyResource {
           this.set(self.store.active ? 1 : 0)
         }
       })
+
+      new promClient.Gauge({
+        name: 'blind_peer_push_notifications_active',
+        help: 'Whether push notifications can be forwarded (1) or not (0)',
+        collect() {
+          this.set(self.gatewayPool ? 1 : 0)
+        }
+      })
     }
   }
 }

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "blind-peer",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "Blind peers help keep hypercores available",
   "main": "index.js",
   "dependencies": {
     "autobase": "^7.0.18",
     "b4a": "^1.6.7",
     "blind-peer-encodings": "^3.3.0",
-    "blind-peer-muxer": "^1.0.0",
+    "blind-peer-muxer": "^1.3.0",
+    "blind-push": "^0.2.5",
     "compact-encoding": "^3.0.0",
     "corestore": "^7.4.4",
     "hypercore": "^11.26.0",
@@ -19,8 +20,8 @@
     "hyperswarm": "^4.13.1",
     "ip-ban-list": "^0.3.0",
     "protomux-rpc": "^1.7.1",
-    "protomux-rpc-client": "^2.1.0",
-    "protomux-rpc-client-pool": "^2.1.0",
+    "protomux-rpc-client": "^2.3.0",
+    "protomux-rpc-client-pool": "^2.2.0",
     "protomux-wakeup": "^2.9.0",
     "ready-resource": "^1.1.2",
     "repl-swarm": "^2.3.0",
@@ -34,7 +35,8 @@
     "bare-process": "^4.2.2",
     "bare-prom-client": "^15.1.3",
     "blind-peer-router": "^0.2.2",
-    "blind-peering": "^2.1.2",
+    "blind-peering": "^2.2.1",
+    "blind-push-gateway": "^0.1.1",
     "brittle": "^3.7.0",
     "debounceify": "^1.1.0",
     "graceful-goodbye": "^1.3.3",