From c62e7fc3bf524b545e8ec3efd886087c20325754 Mon Sep 17 00:00:00 2001
From: Andre Staltz <andre@staltz.com>
Date: Fri, 12 Jan 2024 17:10:04 +0200
Subject: [PATCH] no event.parsedAddress

---
 lib/ms-tunnel.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/ms-tunnel.js b/lib/ms-tunnel.js
index 3558940..e13c302 100644
--- a/lib/ms-tunnel.js
+++ b/lib/ms-tunnel.js
@@ -10,13 +10,16 @@ const { muxrpcMissing } = require('./utils')
  */
 
 /**
- * @param {Array<[any, any]>} parsedAddress
+ * @param {string} addresses
  * @returns {string | undefined}
  */
-function extractSHSEPubkey(parsedAddress) {
-  for (const [transport, transform] of parsedAddress) {
-    if (transform.name === 'shse') {
-      return bs58.encode(transform.pubkey)
+function extractSHSEPubkey(addresses) {
+  for (const address of addresses.split(';')) {
+    for (const [transport, transform] of address.split('~')) {
+      const [name, pubkey, extra] = transform.split(':')
+      if (name === 'shse') {
+        return pubkey
+      }
     }
   }
 }
@@ -42,8 +45,8 @@ const makeTunnelPlugin = (hubs, peer) => (/** @type {any}} */ msConfig) => {
       pull(
         peer.net.listen(),
         pull.filter(({ type }) => type === 'connected'),
-        pull.drain(async ({ address, parsedAddress, details }) => {
-          const pubkey = extractSHSEPubkey(parsedAddress)
+        pull.drain(async ({ address, details }) => {
+          const pubkey = extractSHSEPubkey(address)
           if (!pubkey) return
           if (hubs.has(pubkey)) return
           if (!details?.rpc) return
@@ -69,8 +72,8 @@ const makeTunnelPlugin = (hubs, peer) => (/** @type {any}} */ msConfig) => {
       pull(
         peer.net.listen(),
         pull.filter(({ type }) => type === 'disconnected'),
-        pull.drain(({ parsedAddress }) => {
-          const pubkey = extractSHSEPubkey(parsedAddress)
+        pull.drain(({ address }) => {
+          const pubkey = extractSHSEPubkey(address)
           if (!pubkey) return
           if (!hubs.has(pubkey)) return
           hubs.get(pubkey)?.close()
@@ -107,7 +110,7 @@ const makeTunnelPlugin = (hubs, peer) => (/** @type {any}} */ msConfig) => {
 
       // If no hub found, wait a second and try again
       if (!hubRPC) {
-        await new Promise(resolve => setTimeout(resolve, 1000))
+        await new Promise((resolve) => setTimeout(resolve, 1000))
         hubRPC = hubs.get(hub)?.rpc
       }