From 7f8744725c226d7cbe0ed362a964ea4e3c81eaee Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 6 Jan 2026 15:30:54 -0800
Subject: [PATCH] Improve signer status

---
 src/app/components/SignerStatus.svelte | 33 +++++++++++----------
 src/routes/+layout.svelte              | 41 ++++++++++++--------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/app/components/SignerStatus.svelte b/src/app/components/SignerStatus.svelte
index 391b2bb6..f391d5e1 100644
--- a/src/app/components/SignerStatus.svelte
+++ b/src/app/components/SignerStatus.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import {spec, prop, avg} from "@welshman/lib"
-  import {session, SessionMethod, signerLog, SignerLogEntryStatus} from "@welshman/app"
+  import {spec, avg} from "@welshman/lib"
+  import {session, SessionMethod, signerLog} from "@welshman/app"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import Danger from "@assets/icons/danger-triangle.svg?dataurl"
   import ClockCircle from "@assets/icons/clock-circle.svg?dataurl"
@@ -10,17 +10,18 @@
   import LogOut from "@app/components/LogOut.svelte"
   import {pushModal} from "@app/util/modal"
 
-  const {Pending, Success, Failure} = SignerLogEntryStatus
-  const pending = $derived($signerLog.filter(spec({status: Pending})).length)
-  const success = $derived($signerLog.filter(spec({status: Success})).length)
-  const failure = $derived($signerLog.filter(spec({status: Failure})).length)
+  const finished = $derived($signerLog.filter(x => x.finished_at))
+  const pending = $derived($signerLog.filter(x => !x.finished_at))
+  const failure = $derived(finished.filter(spec({ok: false})))
+  const success = $derived(finished.filter(spec({ok: true})))
   const recent = $derived($signerLog.slice(-10))
-  const recentAvg = $derived(avg(recent.map(prop("duration"))))
-  const recentPending = $derived(recent.filter(spec({status: Pending})).length)
-  const recentSuccess = $derived(recent.filter(spec({status: Success})).length)
-  const recentFailure = $derived(recent.filter(spec({status: Failure})).length)
+  const recentFinished = $derived(recent.filter(x => x.finished_at))
+  const recentPending = $derived(recent.filter(x => !x.finished_at))
+  const recentAvg = $derived(avg(recentFinished.map(x => x.finished_at! - x.started_at)))
+  const recentFailure = $derived(recentFinished.filter(x => !x.ok))
+  const recentSuccess = $derived(recentFinished.filter(x => x.ok))
   const isDisconnected = $derived(
-    recent.length > 0 && recentFailure + recentPending === recent.length,
+    recent.length > 0 && recentFailure.length + recentPending.length === recent.length,
   )
 
   const logout = () => pushModal(LogOut)
@@ -34,11 +35,13 @@
         <span class="flex items-center gap-2">
           {#if isDisconnected}
             <Icon icon={CloseCircle} class="text-error" size={4} /> Disconnected
-          {:else if recentFailure > 3}
+          {:else if recentFailure.length > 3}
             <Icon icon={Danger} class="text-warning" size={4} /> Partial Failure
-          {:else if recentAvg > 1000 || recentPending > 3}
+          {:else if recentAvg > 1000 || recentPending.length > 3}
             <Icon icon={ClockCircle} class="text-warning" size={4} /> Slow connection
-          {:else if recentSuccess === 0 && recentFailure > 0}{:else}
+          {:else if recentSuccess.length === 0 && recentFailure.length > 0}
+            <Icon icon={Danger} class="text-warning" size={4} /> Partial Failure
+          {:else}
             <Icon icon={CheckCircle} class="text-success" size={4} /> Ok
           {/if}
         </span>
@@ -59,7 +62,7 @@
           {/if}
         </p>
         <p>
-          {success} requests succeeded, {failure} failed, {pending} pending
+          {success.length} requests succeeded, {failure.length} failed, {pending.length} pending
         </p>
       </div>
     </div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index f354e6b3..18c988e2 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,17 +1,16 @@
 <script lang="ts">
   import "@src/app.css"
   import "@capacitor-community/safe-area"
-  import {throttle} from "throttle-debounce"
   import * as nip19 from "nostr-tools/nip19"
   import type {Unsubscriber} from "svelte/store"
   import {get} from "svelte/store"
   import {App, type URLOpenListenerEvent} from "@capacitor/app"
   import {dev} from "$app/environment"
   import {goto} from "$app/navigation"
-  import {sync} from "@welshman/store"
-  import {call, spec} from "@welshman/lib"
+  import {sync, throttled} from "@welshman/store"
+  import {call} from "@welshman/lib"
   import {defaultSocketPolicies} from "@welshman/net"
-  import {pubkey, sessions, signerLog, shouldUnwrap, SignerLogEntryStatus} from "@welshman/app"
+  import {pubkey, sessions, signerLog, shouldUnwrap} from "@welshman/app"
   import * as lib from "@welshman/lib"
   import * as util from "@welshman/util"
   import * as feeds from "@welshman/feeds"
@@ -141,25 +140,23 @@
 
     // Listen for signer errors, report to user via toast
     unsubscribers.push(
-      signerLog.subscribe(
-        throttle(10_000, $log => {
-          const recent = $log.slice(-10)
-          const success = recent.filter(spec({status: SignerLogEntryStatus.Success}))
-          const failure = recent.filter(spec({status: SignerLogEntryStatus.Failure}))
+      throttled(10_000, signerLog).subscribe($log => {
+        const cutoff = Date.now() - 3_000
+        const recent = $log.filter(x => x.started_at < cutoff).slice(-10)
+        const ok = recent.filter(x => x.ok)
 
-          if (!$toast && failure.length > 5 && success.length === 0) {
-            pushToast({
-              theme: "error",
-              timeout: 60_000,
-              message: "Your signer appears to be unresponsive.",
-              action: {
-                message: "Details",
-                onclick: () => goto("/settings/profile"),
-              },
-            })
-          }
-        }),
-      ),
+        if (!$toast && recent.length > 5 && ok.length === 0) {
+          pushToast({
+            theme: "error",
+            timeout: 60_000,
+            message: "Your signer appears to be unresponsive.",
+            action: {
+              message: "Details",
+              onclick: () => goto("/settings/profile"),
+            },
+          })
+        }
+      }),
     )
 
     // Sync theme and font size