fix: websocket reconnection every 2 min

src/connector/connector-client.ts

@@ -23,7 +23,7 @@ import { errAsync, ResultAsync } from 'neverthrow'
 import { errorIdentity } from 'utils/error-identity'
 import { sendMessageOverDataChannelAndWaitForConfirmation } from './webrtc/helpers/send-message-over-data-channel-and-wait-for-confirmation'
 import { ConnectorClientSubjects } from './subjects'
-import { MessageErrorReasons } from './_types'
+import { MessageErrorReasons, Secrets } from './_types'
 
 export type ConnectorClient = ReturnType<typeof ConnectorClient>
 
@@ -72,6 +72,7 @@ export const ConnectorClient = (input: {
   const subscriptions = new Subscription()
 
   const connection$ = secretsClient.secrets$.pipe(
+    filter((secrets): secrets is Secrets => !!secrets),
     switchMap((secrets) => {
       const signalingClient = SignalingClient({
         baseUrl: input.signalingServerBaseUrl,
@@ -131,7 +132,7 @@ export const ConnectorClient = (input: {
     setConnectionPassword: (password: Buffer) =>
       secretsClient.deriveSecretsFromPassword(password),
     connectionPassword$: secretsClient.secrets$.pipe(
-      map((secrets) => secrets.encryptionKey)
+      map((secrets) => secrets?.encryptionKey)
     ),
     generateConnectionPassword: () => secretsClient.generateConnectionSecrets(),
     connect: () => shouldConnectSubject.next(true),

src/connector/secrets-client.ts

@@ -1,28 +1,31 @@
 import { Logger } from 'tslog'
-import { ReplaySubject } from 'rxjs'
-import { deriveSecretsFromPassword } from './helpers/derive-secrets-from-connection-password'
+import { BehaviorSubject } from 'rxjs'
+import { deriveSecretsFromPassword as deriveSecretsFromPasswordFn } from './helpers/derive-secrets-from-connection-password'
 import { generateConnectionPassword } from './helpers/generate-connection-password'
 import { Secrets } from './_types'
 
 export const SecretsClient = (input: { logger?: Logger<unknown> }) => {
   const logger = input.logger
-  const secretsSubject = new ReplaySubject<Secrets>(1)
+  const secretsSubject = new BehaviorSubject<Secrets | undefined>(undefined)
 
   const generateConnectionSecrets = () =>
     generateConnectionPassword().asyncAndThen((password) =>
-      deriveSecretsFromPassword(password).map((secrets) => {
+      deriveSecretsFromPasswordFn(password).map((secrets) => {
         logger?.debug(`🔐🔄 connection password generated`)
         secretsSubject.next(secrets)
         return password
       })
     )
 
+  const deriveSecretsFromPassword = (password: Buffer) =>
+    deriveSecretsFromPasswordFn(password).map((secrets) => {
+      if (!secretsSubject.value?.encryptionKey.equals(secrets.encryptionKey))
+        secretsSubject.next(secrets)
+    })
+
   return {
     generateConnectionSecrets,
-    deriveSecretsFromPassword: (password: Buffer) =>
-      deriveSecretsFromPassword(password).map((secrets) => {
-        secretsSubject.next(secrets)
-      }),
+    deriveSecretsFromPassword,
     secrets$: secretsSubject,
   }
 }

src/pairing/pairing.tsx

@@ -34,7 +34,7 @@ export const Paring = () => {
 
     const subscription = connectorClient.connectionPassword$.subscribe(
       (password) => {
-        setConnectionPassword(password.toString('hex'))
+        setConnectionPassword(password?.toString('hex'))
       }
     )