From 681d36d443fcd5a7a9827042a9fb81ea490fbe08 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Wed, 29 Mar 2023 11:13:15 -0500
Subject: [PATCH] Fall back to normal relay connections if multiplexer fails to
 connect

---
 package-lock.json | Bin 603917 -> 603917 bytes
 package.json      |   2 +-
 src/agent/pool.ts |  21 ++++++++++++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6b504cb94cfc290d7f78791db3000ca0aa4b63e6..195b630813d814840aa7cec55818f4d23a5c1be3 100644
GIT binary patch
delta 279
zcmeBur_%dQWy4=4M#JWROzr=e7=f5+`#&aTyH(SlPGmEhp0}1+eDdM*%Ao<yd7cLP
z=4I|_Mecc#xqc=tj#1erNnU|DX<3dH&Z!0-e!(f)q51AE+WLi_WjPs19%d2w-Wl#j
z<z5yQ7H+;Nex7cY=DxmWW{HLRK9OOiUinee3;CGTr(Y1^=$h;xz}voi9WxNK05K~N
cvu)qKj@>YoF77a#z@gj@bjS7!BAm8L0HcUw$N&HU

delta 279
zcmeBur_%dQWy4=4MuX;mOzr=e7=f5+`#&aTyH(S-Sa29m&tJ<dHht3-CgqSo1M{?`
zFoXQasxocE;u5E@Y*Y8*;Oqd;@TjU1OCvLj3bT?5Pxs<N<E+Z`^5SBDqpCCmKSvh}
z!_XX)0Haj1fbx{EOp}1@G&ldyQh)Q*OzptQA0#xUUl8Hwn(QFJ+rE1pGZ3=?F)I+W
hZQs3)-7po+8KJarhTrsu@~q13K!<F<Ai`;@1OOFsWmW(H

diff --git a/package.json b/package.json
index 7c4c0f38..b8cd7198 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "lru-cache": "^7.18.3",
     "nostr-tools": "^1.7.4",
     "npm-run-all": "^4.1.5",
-    "paravel": "^0.1.10",
+    "paravel": "^0.1.11",
     "qr-scanner": "^1.4.2",
     "qrcode": "^1.5.1",
     "ramda": "^0.28.0",
diff --git a/src/agent/pool.ts b/src/agent/pool.ts
index ac578b9d..e505250a 100644
--- a/src/agent/pool.ts
+++ b/src/agent/pool.ts
@@ -159,11 +159,22 @@ function getExecutor(urls) {
     urls = forceUrls
   }
 
-  const executor = new Executor(
-    Config.multiplextrUrl
-      ? new Plex(urls, pool.get(Config.multiplextrUrl))
-      : new Relays(urls.map(url => pool.get(url)))
-  )
+  let target
+
+  // Try to use our multiplexer, but if it fails to connect fall back to relays
+  if (Config.multiplextrUrl) {
+    const socket = pool.get(Config.multiplextrUrl)
+
+    if (!socket.error) {
+      target = new Plex(urls, pool.get(Config.multiplextrUrl))
+    }
+  }
+
+  if (!target) {
+    target = new Relays(urls.map(url => pool.get(url)))
+  }
+
+  const executor = new Executor(target)
 
   executor.handleAuth({
     onAuth(url, challenge) {