don't retry on EINTR, fix peer url format

hackbg · Nov 28, 2024 · 6efb688 · 6efb688
1 parent 66cb16e
commit 6efb688
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/peers.js b/peers.js
@@ -22,7 +22,7 @@ function build (color) {
   } else {
     peers = Object.entries(peerMap).map(([port, peer])=>{
       peer = new URL(peer)
-      return `tcp://${peer.username}:${color}-sync-proxy:${port}`
+      return `tcp://${peer.username}@${color}-sync-proxy:${port}`
     }).join(',')
   }
   console.log(peers)

diff --git a/sync_proxy.js b/sync_proxy.js
@@ -96,20 +96,11 @@ async function run (localHost, controlPort, proxyConfig) {
             console.log(`🟢 ${localPort}->${remoteHost}:${remotePort}: connected`)
             // Collect connection to close it on pause
             connections.add(connection)
-            // Proxy client to server and back, retrying on EINTR
-            while (true) {
-              try {
-                await Promise.all([
-                  connection.readable.pipeTo(remote.writable),
-                  remote.readable.pipeTo(connection.writable),
-                ])
-                break
-              } catch (e) {
-                if (e.code !== 'EINTR') {
-                  throw e
-                }
-              }
-            }
+            // Proxy client to server and back
+            await Promise.all([
+              connection.readable.pipeTo(remote.writable),
+              remote.readable.pipeTo(connection.writable),
+            ])
           } catch (e) {
             if (e.code) {
               console.error(`🔴 ${localPort}->${remoteHost}:${remotePort}: ${e.code}`)