fix: deleted rooms persisting in navigation

package.json

@@ -22,7 +22,6 @@
     "@sveltejs/vite-plugin-svelte": "^5.1.1",
     "@tailwindcss/postcss": "^4.2.2",
     "@types/eslint": "^9.6.1",
-    "@types/node": "^25.9.1",
     "autoprefixer": "^10.4.23",
     "classnames": "^2.5.1",
     "eslint": "^9.39.2",
@@ -69,16 +68,16 @@
     "@types/throttle-debounce": "^5.0.2",
     "@vite-pwa/assets-generator": "^1.0.2",
     "@vite-pwa/sveltekit": "^1.1.0",
-    "@welshman/app": "^0.8.16",
-    "@welshman/content": "^0.8.16",
-    "@welshman/editor": "^0.8.16",
-    "@welshman/feeds": "^0.8.16",
-    "@welshman/lib": "^0.8.16",
-    "@welshman/net": "^0.8.16",
-    "@welshman/router": "^0.8.16",
-    "@welshman/signer": "^0.8.16",
-    "@welshman/store": "^0.8.16",
-    "@welshman/util": "^0.8.16",
+    "@welshman/app": "^0.8.15",
+    "@welshman/content": "^0.8.15",
+    "@welshman/editor": "^0.8.15",
+    "@welshman/feeds": "^0.8.15",
+    "@welshman/lib": "^0.8.15",
+    "@welshman/net": "^0.8.15",
+    "@welshman/router": "^0.8.15",
+    "@welshman/signer": "^0.8.15",
+    "@welshman/store": "^0.8.15",
+    "@welshman/util": "^0.8.15",
     "cheerio": "^1.2.0",
     "compressorjs-next": "^1.1.2",
     "daisyui": "^5.5.19",
@@ -99,5 +98,17 @@
     "throttle-debounce": "^5.0.2",
     "tippy.js": "^6.3.7"
   },
-  "packageManager": "pnpm@11.4.0"
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "esbuild"
+    ],
+    "onlyBuiltDependencies": [
+      "sharp",
+      "nostr-signer-capacitor-plugin"
+    ],
+    "overrides": {
+      "sharp": "0.35.0-rc.0"
+    }
+  },
+  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
 }

pnpm-workspace.yaml

@@ -1,18 +0,0 @@
-allowBuilds:
-  nostr-signer-capacitor-plugin: true
-  cbor-extract: false
-  esbuild: false
-  sharp: true
-minimumReleaseAgeExclude:
-  - '@welshman/app@0.8.16'
-  - '@welshman/content@0.8.16'
-  - '@welshman/editor@0.8.16'
-  - '@welshman/feeds@0.8.16'
-  - '@welshman/lib@0.8.16'
-  - '@welshman/net@0.8.16'
-  - '@welshman/router@0.8.16'
-  - '@welshman/signer@0.8.16'
-  - '@welshman/store@0.8.16'
-  - '@welshman/util@0.8.16'
-overrides:
-  sharp: 0.35.0-rc.0

src/app/call/voice.ts

@@ -20,7 +20,7 @@ import type {TrustedEvent} from "@welshman/util"
 import {makeHttpAuth, makeHttpAuthHeader, getTags} from "@welshman/util"
 import {signer} from "@welshman/app"
 import {getLivekitEndpoint} from "$lib/livekit"
-import {AbortError, TimeoutError, whenAborted, whenTimeout} from "$lib/util"
+import {AbortError, whenAborted, whenTimeout} from "$lib/util"
 import {
   currentVoiceRoom,
   currentVoiceSession,
@@ -157,8 +157,6 @@ const setUpMicrophone = async (
   startMuted: boolean,
   preferredMicId: string | undefined,
   participant: LocalParticipant,
-  signal?: AbortSignal,
-  settleSignal?: AbortSignal,
 ): Promise<boolean> => {
   if (startMuted) {
     return true
@@ -170,34 +168,15 @@ const setUpMicrophone = async (
     capture = {deviceId: preferredMicId}
   }
   try {
-    await Promise.race([
-      participant.setMicrophoneEnabled(true, capture),
-      whenTimeout(15_000, {message: "Microphone access timed out.", signal: settleSignal}),
-      whenAborted(signal),
-    ])
+    await participant.setMicrophoneEnabled(true, capture)
     muted = false
   } catch (e) {
-    // Timeout or microphone rejection: join muted, the call is still usable. A
-    // genuine abort is surfaced to the caller so it can tear down the room.
-    if (e instanceof AbortError) throw e
-    if (!(e instanceof TimeoutError)) {
-      pushToast({theme: "error", message: "Could not access microphone"})
-    }
+    pushToast({theme: "error", message: "Could not access microphone"})
   }
   return muted
 }
 
-// The room whose events are allowed to mutate shared state. Abandoned rooms
-// (after switching calls or an engine reconnect give-up) must not clobber it.
-let activeRoom: LiveKitRoom | undefined
-
-const makeOnRoomDisconnected = (room: LiveKitRoom) => (reason?: DisconnectReason) => {
-  // Ignore disconnects from rooms that are no longer the active session.
-  if (room !== activeRoom) return
-
-  activeRoom = undefined
-  room.removeAllListeners()
-
+const onRoomDisconnected = (reason?: DisconnectReason) => {
   videoPrimaryTileKey.set(undefined)
   voiceMicMuted.set(true)
   currentVoiceSession.set(undefined)
@@ -275,6 +254,9 @@ export const joinVoiceRoom = async (
 ): Promise<void> => {
   cancelJoinVoiceRoom()
 
+  const session = get(currentVoiceSession)
+  if (session) await leaveVoiceRoom()
+
   currentVoiceRoom.set(get(deriveRoom(url, h)))
   voiceState.set(VoiceState.Joining)
 
@@ -283,43 +265,14 @@ export const joinVoiceRoom = async (
   const signal = controller.signal
   const isActive = () => joinAbortController === controller
 
-  // Self-cleaning controller: aborted in finally so whenTimeout/whenAborted
-  // helpers clear their timers/listeners once the races below have settled.
-  const settle = new AbortController()
-
   try {
-    // Tear down any existing session before joining. Bound it so a slow leave
-    // (camera/screenshare renegotiation can take ~15s) cannot block this join.
-    if (get(currentVoiceSession)) {
-      await Promise.race([
-        leaveVoiceRoom(),
-        whenTimeout(15_000, {message: "Leaving previous call timed out.", signal: settle.signal}),
-        whenAborted(signal),
-      ]).catch(e => {
-        if (e instanceof AbortError) throw e
-      })
-
-      // leaveVoiceRoom flips voiceState to Disconnected; re-assert Joining.
-      voiceState.set(VoiceState.Joining)
-    }
-
-    if (signal.aborted) throw new AbortError()
-
-    const {server_url, participant_token} = await Promise.race([
-      fetchLivekitToken(url, h, signal),
-      whenTimeout(15_000, {
-        message: "Connection timed out. Please check your network and try again.",
-        signal: settle.signal,
-      }),
-      whenAborted(signal),
-    ])
+    const {server_url, participant_token} = await fetchLivekitToken(url, h, signal)
 
     if (signal.aborted) throw new AbortError()
 
     const liveKitRoom = new LiveKitRoom({adaptiveStream: true, dynacast: true})
-    activeRoom = liveKitRoom
 
-    liveKitRoom.on(RoomEvent.Disconnected, makeOnRoomDisconnected(liveKitRoom))
+    liveKitRoom.on(RoomEvent.Disconnected, onRoomDisconnected)
     liveKitRoom.on(RoomEvent.ParticipantConnected, onParticipantConnected)
     liveKitRoom.on(RoomEvent.ParticipantDisconnected, onParticipantDisconnected)
     liveKitRoom.on(RoomEvent.TrackSubscribed, onTrackSubscribed)
@@ -337,13 +290,10 @@ export const joinVoiceRoom = async (
         liveKitRoom.connect(server_url, participant_token, {maxRetries: 0}),
         whenTimeout(15_000, {
           message: "Connection timed out. Please check your network and try again.",
-          signal: settle.signal,
         }),
         whenAborted(signal),
       ])
     } catch (e) {
-      if (activeRoom === liveKitRoom) activeRoom = undefined
-      liveKitRoom.removeAllListeners()
       liveKitRoom.disconnect()
       throw e
     }
@@ -354,24 +304,7 @@ export const joinVoiceRoom = async (
       syncParticipantMedia(p)
     }
 
-    // Bounded against timeout/abort inside setUpMicrophone: a stuck permission
-    // prompt resolves to muted rather than hanging the join forever.
-    const muted = await setUpMicrophone(
-      startMuted,
-      preferredMicId,
-      liveKitRoom.localParticipant,
-      signal,
-      settle.signal,
-    )
-
-    // A cancel during the mic step must tear down the connected room rather
-    // than leaking it.
-    if (signal.aborted) {
-      if (activeRoom === liveKitRoom) activeRoom = undefined
-      liveKitRoom.removeAllListeners()
-      liveKitRoom.disconnect()
-      throw new AbortError()
-    }
+    const muted = await setUpMicrophone(startMuted, preferredMicId, liveKitRoom.localParticipant)
 
     voiceMicMuted.set(muted)
     currentVoiceSession.set({
@@ -388,7 +321,6 @@ export const joinVoiceRoom = async (
     if (e instanceof AbortError) return
     throw e
   } finally {
-    settle.abort()
     if (isActive()) joinAbortController = undefined
   }
 }
@@ -416,23 +348,14 @@ export const leaveVoiceRoom = async () => {
     }
   }
 
-  // Always tear down this room's connection and listeners.
-  if (activeRoom === session.room) activeRoom = undefined
-  session.room.removeAllListeners()
+  voiceState.set(VoiceState.Disconnected)
+  videoPrimaryTileKey.set(undefined)
+  voiceMicMuted.set(true)
+  currentVoiceSession.set(undefined)
+  resetVideoCallLayout()
   session.room.disconnect()
-
-  // Only reset shared UI state if this session is still current. A slow leave
-  // that was superseded by a new join (bounded by a timeout in joinVoiceRoom)
-  // must not clobber the freshly-joined session when it finally completes.
-  if (get(currentVoiceSession) === session) {
-    voiceState.set(VoiceState.Disconnected)
-    videoPrimaryTileKey.set(undefined)
-    voiceMicMuted.set(true)
-    currentVoiceSession.set(undefined)
-    resetVideoCallLayout()
-    speakingParticipants.set([])
-    participantMediaState.set(new Map())
-  }
+  speakingParticipants.set([])
+  participantMediaState.set(new Map())
 }
 
 export const rejoinVoiceRoom = async (): Promise<void> => {

src/app/components/SpaceInviteAccept.svelte

@@ -23,8 +23,8 @@
   import SpaceJoinSettings from "@app/components/SpaceJoinSettings.svelte"
   import {pushToast} from "@app/util/toast"
   import {makeSpacePath} from "@app/util/routes"
+  import {Push} from "@app/util/notifications"
   import {relaysMostlyRestricted, notificationSettings, parseInviteLink} from "@app/core/state"
-  import {Push} from "@app/util/push"
   import {
     attemptRelayAccess,
     addSpaceMembership,

src/app/components/SpaceJoin.svelte

@@ -24,7 +24,7 @@
   import {pushModal} from "@app/util/modal"
   import {pushToast} from "@app/util/toast"
   import {makeSpacePath} from "@app/util/routes"
-  import {Push} from "@app/util/push"
+  import {Push} from "@app/util/notifications"
 
   type Props = {
     url: string

src/app/core/state.ts

@@ -418,7 +418,7 @@ export const device = withGetter(writable(randomId()))
 export const notificationSettings = withGetter(
   writable({
     push: false,
-    sound: true,
+    sound: false,
     badge: false,
     spaces: true,
     mentions: true,

src/app/util/logout.ts

@@ -1,6 +1,6 @@
 import {db, kv, ss} from "@app/core/storage"
+import {Push} from "@app/util/notifications"
 import {deactivateCurrentPomadeSession} from "@app/util/pomade"
-import {Push} from "@app/util/push"
 
 export const logout = async () => {
   await deactivateCurrentPomadeSession()

src/app/util/notifications.ts

@@ -18,6 +18,7 @@ import {
 } from "@app/core/state"
 import {kv} from "@app/core/storage"
 import {page} from "$app/stores"
+export {Push} from "@app/util/push"
 
 // Checked state
 

src/lib/html.ts

@@ -44,10 +44,7 @@ export const createScroller = ({
     : element.closest(".scroll-container")
 
   const check = async () => {
-    const isHidden = (el: Element) =>
-      (el as HTMLElement).offsetParent === null || el.clientHeight === 0
-
-    if (container && !isHidden(container)) {
+    if (container) {
       // While we have empty space, fill it
       const {scrollY, innerHeight} = window
       const {scrollHeight, scrollTop, clientHeight} = container

src/lib/util.ts

@@ -44,15 +44,11 @@ export const whenAborted = (signal?: AbortSignal) => {
   })
 }
 
-/**
- * Returns a promise that rejects with TimeoutError after ms. Use with Promise.race.
- * Pass an optional signal to clear the timer when that signal aborts (self-cleaning).
- */
-export const whenTimeout = (ms: number, opts: {message?: string; signal?: AbortSignal} = {}) => {
-  return new Promise<never>((_, reject) => {
-    const timeout = setTimeout(() => reject(new TimeoutError(opts.message)), ms)
-    opts.signal?.addEventListener("abort", () => clearTimeout(timeout), {once: true})
-  })
+/** Returns a promise that rejects with TimeoutError after ms. Use with Promise.race. */
+export const whenTimeout = (ms: number, opts: {message?: string} = {}) => {
+  return new Promise<never>((_, reject) =>
+    setTimeout(() => reject(new TimeoutError(opts.message)), ms),
+  )
 }
 
 export const buildUrl = (base: string | URL, ...pathname: string[]) => {

src/routes/+layout.svelte

@@ -37,7 +37,6 @@
   import {theme} from "@app/util/theme"
   import {toast, pushToast} from "@app/util/toast"
   import * as notifications from "@app/util/notifications"
-  import {Push} from "@app/util/push"
   import {onPushNotificationAction} from "@app/util/push/adapters/common"
   import * as storage from "@app/util/storage"
   import {syncKeyboard} from "@app/util/keyboard"
@@ -176,7 +175,7 @@
     unsubscribers.push(notifications.syncChecked())
 
     // Initialize background notifications
-    unsubscribers.push(Push.sync())
+    unsubscribers.push(notifications.Push.sync())
 
     // Listen for signer errors, report to user via toast
     unsubscribers.push(

src/routes/chat/[chat]/+page.svelte

@@ -1,51 +1,13 @@
-<script context="module" lang="ts">
-  import {synced} from "@welshman/store"
-  import {kv} from "@app/core/storage"
-
-  const dmNotificationsPrompted = synced({
-    key: "dmNotificationsPrompted",
-    defaultValue: false,
-    storage: kv,
-  })
-</script>
-
 <script lang="ts">
-  import {onMount} from "svelte"
   import {page} from "$app/stores"
   import type {MakeNonOptional} from "@welshman/lib"
   import {append, uniq} from "@welshman/lib"
   import {pubkey} from "@welshman/app"
   import Chat from "@app/components/Chat.svelte"
   import {splitChatId} from "@app/core/state"
-  import {notificationSettings} from "@app/core/state"
-  import {pushToast} from "@app/util/toast"
-  import {Push} from "@app/util/push"
 
   const {chat} = $page.params as MakeNonOptional<typeof $page.params>
   const pubkeys = uniq(append($pubkey!, splitChatId(chat)))
-
-  onMount(async () => {
-    if (!$dmNotificationsPrompted) {
-      dmNotificationsPrompted.set(true)
-
-      const permission = await Push.request()
-
-      if (!permission.startsWith("granted")) {
-        return pushToast({
-          theme: "error",
-          message: `Failed to request notification permissions (${permission}).`,
-        })
-      }
-
-      notificationSettings.update(current => ({
-        ...current,
-        push: true,
-        messages: true,
-      }))
-
-      pushToast({message: "Notifications enabled!"})
-    }
-  })
 </script>
 
 <Chat {pubkeys} />

src/routes/settings/alerts/+page.svelte

@@ -10,8 +10,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import {pushToast} from "@app/util/toast"
-  import {clearBadges} from "@app/util/notifications"
-  import {Push} from "@app/util/push"
+  import {Push, clearBadges} from "@app/util/notifications"
   import {notificationSettings} from "@app/core/state"
 
   const reset = () => {