remove hanging if no connection

relay.js

@@ -11,25 +11,28 @@ export function normalizeRelayURL(url) {
 export function relayConnect(url, onEvent, onNotice) {
   url = normalizeRelayURL(url)
 
-  const ws = new WebSocket(
+  let ws, resolveOpen, untilOpen, rejectOpen
-    url + (url.indexOf('?') !== -1 ? '&' : '?') + `session=${Math.random()}`,
-    {
-      pingTimeout: 180 * 1000
-    }
-  )
 
-  var isOpen
+  function connect() {
-  let untilOpen = new Promise(resolve => {
+
-    isOpen = resolve
+    untilOpen = new Promise((resolve, reject) => {
+      resolveOpen = resolve
+      rejectOpen = reject
     })
   
+    ws = new WebSocket(
+      url + (url.indexOf('?') !== -1 ? '&' : '?') + `session=${Math.random()}`
+    )
+
     ws.onopen = () => {
       console.log('connected to', url)
-    isOpen()
+      resolveOpen()
+    }
+    ws.onerror = err =>  {
+      console.log('error connecting to relay', url, err)
+      rejectOpen()
     }
-  ws.onerror = err => console.log('error connecting to relay', url, err)
     ws.onclose = () => console.log('relay connection closed', url)
-
     ws.onmessage = async e => {
       var data
       try {
@@ -67,32 +70,47 @@ export function relayConnect(url, onEvent, onNotice) {
         }
       }
     }
+  }
+
+  setInterval(() => {
+    if (!ws || ws.readyState !== WebSocket.OPEN)
+      connect()
+  }, 180 * 1000)
+
+  connect()
+
+  async function trySend(msg) {
+    if (ws && ws.readyState === WebSocket.OPEN) {
+      ws.send(msg)
+    } else {
+      try {
+        await untilOpen
+        ws.send(msg)
+      } catch(e) {
+        console.log(`waiting to connect to ${url}`)
+      }
+    }
+  }
 
   return {
     url,
     async subKey(key) {
-      await untilOpen
+      trySend('sub-key:' + key)
-      ws.send('sub-key:' + key)
     },
     async unsubKey(key) {
-      await untilOpen
+      trySend('unsub-key:' + key)
-      ws.send('unsub-key:' + key)
     },
     async reqFeed(params = {}) {
-      await untilOpen
+      trySend('req-feed:' + JSON.stringify(params))
-      ws.send('req-feed:' + JSON.stringify(params))
     },
     async reqEvent(params) {
-      await untilOpen
+      trySend('req-event:' + JSON.stringify(params))
-      ws.send('req-event:' + JSON.stringify(params))
     },
     async reqKey(params) {
-      await untilOpen
+      trySend('req-key:' + JSON.stringify(params))
-      ws.send('req-key:' + JSON.stringify(params))
     },
     async publish(event) {
-      await untilOpen
+      trySend(JSON.stringify(event))
-      ws.send(JSON.stringify(event))
     },
     close() {
       ws.close()