fix: renegotiate webRTC when remote client disconnects

Co-authored-by: Alex Stelea <alex.s@rdx.works>

.env.localhost

@@ -0,0 +1,4 @@
+VITE_APP_SIGNALING_SERVER_BASE_URL=ws://localhost:4000
+VITE_APP_LOG_LEVEL=0
+VITE_APP_IS_INITIATOR=true
+VITE_APP_USE_TARGET_CLIENT_ID=true

package.json

@@ -13,6 +13,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "start": "DEV_TOOLS=true vite",
+    "start:local": "DEV_TOOLS=true vite --mode localhost",
     "start:beta": "DEV_TOOLS=true vite --mode beta",
     "build:dev": "tsc && vite build --mode development",
     "build:beta": "tsc && vite build --mode beta",

src/connector/secrets-client.ts

@@ -1,5 +1,5 @@
 import { Logger } from 'tslog'
-import { ReplaySubject, share, tap } from 'rxjs'
+import { ReplaySubject } from 'rxjs'
 import { deriveSecretsFromPassword } from './helpers/derive-secrets-from-connection-password'
 import { generateConnectionPassword } from './helpers/generate-connection-password'
 import { Secrets } from './_types'
@@ -23,11 +23,6 @@ export const SecretsClient = (input: { logger?: Logger<unknown> }) => {
       deriveSecretsFromPassword(password).map((secrets) => {
         secretsSubject.next(secrets)
       }),
-    secrets$: secretsSubject.pipe(
-      tap(() => {
-        logger?.debug(`🔐💾 connection password set`)
-      }),
-      share()
-    ),
+    secrets$: secretsSubject,
   }
 }

src/connector/signaling/signaling-client.ts

@@ -121,6 +121,10 @@ export const SignalingClient = (input: {
         method,
         source,
       }))
+      .mapErr((err) => {
+        logger?.error(`prepareMessage`, err)
+        return err
+      })
 
   const sendMessage = (
     message: Pick<DataTypes, 'payload' | 'method' | 'source' | 'targetClientId'>

src/connector/webrtc/webrtc-client.ts

@@ -10,6 +10,7 @@ import {
   filter,
   first,
   merge,
+  mergeMap,
   Subject,
   Subscription,
   switchMap,
@@ -79,6 +80,17 @@ export const WebRtcClient = (
 
   const subscriptions = new Subscription()
 
+  subscriptions.add(
+    signalingClient.remoteClientConnected$
+      .pipe(
+        first(),
+        mergeMap(() =>
+          signalingClient.remoteClientDisconnected$.pipe(tap(() => restart()))
+        )
+      )
+      .subscribe()
+  )
+
   subscriptions.add(
     merge(onLocalOffer$, onLocalAnswer$, onLocalIceCandidate$)
       .pipe(concatMap(input.signalingClient.sendMessage))

src/pairing/pairing.tsx

@@ -43,7 +43,9 @@ export const Paring = () => {
         .getItem('connectionPassword')
         .andThen(({ connectionPassword }) => {
           if (connectionPassword) {
-            connectorClient.setConnectionPassword(connectionPassword)
+            connectorClient.setConnectionPassword(
+              Buffer.from(connectionPassword, 'hex')
+            )
             return ok(null)
           } else {
             connectorClient.connect()