pzp
/
pzp-hub-client
mirror of https://codeberg.org/pzp/pzp-hub-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix conn key conversion to shse.pubkey

This commit is contained in:
Andre Staltz 2023-07-20 19:49:01 +03:00
parent fe72a1a86e
commit 62ad921abb
No known key found for this signature in database
GPG Key ID: 9EDE23EA7E8A4890
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ms-tunnel.js
View File

@ -33,7 +33,7 @@ const makeTunnelPlugin = (hubs, local) => (/** @type {any}} */ msConfig) => {
pull.drain(async ({ address, key, details }) => { pull.drain(async ({ address, key, details }) => {
if (!key) return if (!key) return
// TODO: once ssb-conn is replaced, we won't need this anymore: // TODO: once ssb-conn is replaced, we won't need this anymore:
const pubkey = bs58.encode(Buffer.from(key, 'base64')) const pubkey = key.slice(1, -8) // not base64, it's @BASE58.ed25519
if (hubs.has(pubkey)) return if (hubs.has(pubkey)) return
if (!details?.rpc) return if (!details?.rpc) return
if (address.startsWith('tunnel:')) return if (address.startsWith('tunnel:')) return
@ -61,7 +61,7 @@ const makeTunnelPlugin = (hubs, local) => (/** @type {any}} */ msConfig) => {
pull.drain(({ key }) => { pull.drain(({ key }) => {
if (!key) return if (!key) return
// TODO: once ssb-conn is replaced, we won't need this anymore: // TODO: once ssb-conn is replaced, we won't need this anymore:
const pubkey = bs58.encode(Buffer.from(key, 'base64')) const pubkey = key.slice(1, -8) // not base64, it's @BASE58.ed25519
if (!hubs.has(pubkey)) return if (!hubs.has(pubkey)) return
hubs.get(pubkey)?.close() hubs.get(pubkey)?.close()
hubs.delete(pubkey) hubs.delete(pubkey)
@ -95,6 +95,12 @@ const makeTunnelPlugin = (hubs, local) => (/** @type {any}} */ msConfig) => {
let hubRPC = hubs.get(hub)?.rpc let hubRPC = hubs.get(hub)?.rpc
// If no hub found, wait a second and try again
if (!hubRPC) {
await new Promise(resolve => setTimeout(resolve, 1000))
hubRPC = hubs.get(hub)?.rpc
}
// If no hub found, look up hub in connDB and connect to it // If no hub found, look up hub in connDB and connect to it
if (!hubRPC) { if (!hubRPC) {
for (const [msaddr] of local.conn.db().entries()) { for (const [msaddr] of local.conn.db().entries()) {