From 2dceafea6b253a1450388c1e16202a381a18794c Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Wed, 15 Jan 2025 14:32:31 +0700
Subject: [PATCH] cleanup

---
 .../lib/components/lists/table/Filters.svelte |  11 +-
 .../components/partials/MonitorActions.svelte |   2 -
 apps/gui/src/lib/stores/app.ts                |   7 +-
 apps/gui/src/lib/utils/lifecycle.ts           |  14 +-
 apps/gui/src/routes/+layout.svelte            | 142 ++++++++++--------
 package.json                                  |   3 +-
 pnpm-lock.yaml                                |   3 +
 7 files changed, 93 insertions(+), 89 deletions(-)

diff --git a/apps/gui/src/lib/components/lists/table/Filters.svelte b/apps/gui/src/lib/components/lists/table/Filters.svelte
index f5bd909a..b90f509f 100644
--- a/apps/gui/src/lib/components/lists/table/Filters.svelte
+++ b/apps/gui/src/lib/components/lists/table/Filters.svelte
@@ -122,8 +122,6 @@
 
     // **Build Inverted Index**
     function buildInvertedIndex(data: RecordData[], filtersInclude: string[]) {
-        // const begin = new Date().getTime();
-        // //console.log('begin buildInvertedIndex');
         filtersInclude.forEach(filterKey => {
             _invertedIndex[filterKey] = {};
             data.forEach(record => {
@@ -140,7 +138,6 @@
                 }
             });
         });
-        // //console.log('end buildInvertedIndex', new Date().getTime() - begin);
     }
 
     // **Compute Active Record IDs Based on Active Filters**
@@ -318,8 +315,6 @@
 
     // **Apply a Filter Value Based on Its Type and Mode**
     function applyFilter(filterKey: string, value: any) {
-        // const begin = new Date().getTime();
-        // //console.log('begin applyFilter', filterKey, value);
         const filter = $relayFilters.find(f => f.key === filterKey);
         if (!filter) return;
 
@@ -338,10 +333,9 @@
                 }
             } else if (filter.type === 'string' || filter.type === 'array') {
                 if (mode === 'OR') {
-                    // OR mode allows multiple selections (union)
+                    // union
                     if (Array.isArray(existingFilter)) {
                         if (existingFilter.includes(value)) {
-                            // Deselect the value
                             const newValues = existingFilter.filter(v => v !== value);
                             if (newValues.length === 0) {
                                 const { [filterKey]: _, ...rest } = currentFilters;
@@ -349,7 +343,6 @@
                             }
                             return { ...currentFilters, [filterKey]: newValues };
                         } else {
-                            // Select the value
                             return { ...currentFilters, [filterKey]: [...existingFilter, value] };
                         }
                     } else {
@@ -357,7 +350,7 @@
                         return { ...currentFilters, [filterKey]: [value] };
                     }
                 } else if (mode === 'AND') {
-                    // AND mode requires all selected values to be present (intersection)
+                    // intersection
                     if (Array.isArray(existingFilter)) {
                         if (existingFilter.includes(value)) {
                             // Deselect the value
diff --git a/apps/gui/src/lib/components/partials/MonitorActions.svelte b/apps/gui/src/lib/components/partials/MonitorActions.svelte
index fddc4e70..875bb23d 100644
--- a/apps/gui/src/lib/components/partials/MonitorActions.svelte
+++ b/apps/gui/src/lib/components/partials/MonitorActions.svelte
@@ -46,8 +46,6 @@
             } 
             else {
                 monitor.enable()
-                // const lastSync = monitor.getLastSyncSince(30166)
-
                 const options = {
                     filters: [ monitor.checkFilter ],
                     options: {
diff --git a/apps/gui/src/lib/stores/app.ts b/apps/gui/src/lib/stores/app.ts
index 583f2abb..378b0ca7 100644
--- a/apps/gui/src/lib/stores/app.ts
+++ b/apps/gui/src/lib/stores/app.ts
@@ -5,7 +5,11 @@ import { formatSeconds, timeAgo } from "../utils/time";
 import { nip66 } from "./nip66";
 import { delay } from "@nostrwatch/utils";
 
+export type AppStateType = 'booting' | 'running' | 'sleeping' | 'shutdown'
+export const appState: Writable<AppStateType> = writable()
 
+export type TabStateType = 'idle' | 'leader' | 'follower' | 'unsupported';
+export const tabState: Writable<TabStateType> = writable('follower');
 export const nip66Initialized: Readable<boolean> = derived( nip66, ($nip66) => $nip66?.initialized? true: false )
 export const unsupported: Writable<boolean> = writable(false)
 export const isLivesyncing: Writable<boolean> = writable(false)
@@ -32,7 +36,7 @@ export const shouldSync = () => {
     const threshold = 15*1
     const timestamp = get(lastCompleteSync)
     const now = Math.round(Date.now()/1000)
-    console.log('should snyc?', threshold<(now-timestamp), formatSeconds(threshold), timeAgo(now*1000), timeAgo(timestamp*1000))
+    console.log('should sync?', threshold<(now-timestamp), formatSeconds(threshold), timeAgo(now*1000), timeAgo(timestamp*1000))
     if(threshold<(now-timestamp))
         return true;
     return false; 
@@ -53,3 +57,4 @@ export const doAggregateCache: Writable<boolean> = writable(false)
 export const shouldAggregate = (): boolean => {
     return !get(doAggregateCache)
 }
+
diff --git a/apps/gui/src/lib/utils/lifecycle.ts b/apps/gui/src/lib/utils/lifecycle.ts
index b7d9408e..e5119f6e 100644
--- a/apps/gui/src/lib/utils/lifecycle.ts
+++ b/apps/gui/src/lib/utils/lifecycle.ts
@@ -136,7 +136,7 @@ export const bootstrapMonitorData = async () => {
     if(!$nip66){
         $nip66 = await instance();
     }
-    bindBootstrapEmitters($nip66);
+    bindBootstrapEmitters();
     await $nip66?.services?.monitors?.bootstrapMonitors();
 }
 
@@ -148,7 +148,6 @@ export const bootstrapMonitorChecks = async () => {
     await $nip66?.services?.monitors?.syncMonitorsChecks();
 }
 
-
 export const bootstrap = async () => {
     console.log('bootstrap')
     if(!$nip66){
@@ -163,7 +162,6 @@ export const bootstrap = async () => {
             liveSyncBatcher.add(event); 
         }
     }
-    
     if( shouldSync() ){
         if( get(isBootstrapping) ) return;
         isBootstrapping.set(true)
@@ -175,11 +173,7 @@ export const bootstrap = async () => {
         })
     }
     else {
-        //console.log('skipping full sync')
-        //TODO: Send ready event from Cache Adapter Worker wait on Adapter ready.
-        // await $nip66?.adapters?.cache.ready();
-        await new Promise( (resolve) => setTimeout(resolve, 1000) ) 
-        //
+        await new Promise( (resolve) => setTimeout(resolve, 1000) )         
         seedFromCache().then( () => {
             if(get(isLivesyncing)) return;
             beginLiveSync({ onevents })
@@ -187,6 +181,8 @@ export const bootstrap = async () => {
     }
 }
 
+type LiveSyncResumer = () => Promise<void>
+
 export const beginLiveSync = async (callbacks?: SubscribeHandlers): Promise<void> => {
     isLivesyncing.set(true)
     if(!$nip66){
@@ -203,8 +199,6 @@ export const stopLiveSync = async (): Promise<void> => {
     $nip66?.services?.monitors?.stopLiveSync()
 }
 
-type LiveSyncResumer = () => Promise<void>
-
 export const pauseLiveSync = async (): Promise<LiveSyncResumer> => {
     console.log('Lifecycle:pauseLiveSync')
     let wasLiveSyncing = get(isLivesyncing) 
diff --git a/apps/gui/src/routes/+layout.svelte b/apps/gui/src/routes/+layout.svelte
index bc2cbf59..7e4cecab 100755
--- a/apps/gui/src/routes/+layout.svelte
+++ b/apps/gui/src/routes/+layout.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
   import '../app.css';
+  import process from 'process/browser';
+
   import { page } from '$app/stores';
   import { goto } from '$app/navigation';
   import { onMount, onDestroy } from 'svelte';
@@ -15,18 +17,14 @@
   import { delay } from '@nostrwatch/utils';
   import { getBrowserInfo } from '$lib/utils/compat.js';
   import { StateManager } from '@nostrwatch/nip66';
-  import { unsupported } from '$lib/stores/app';
+  import { unsupported, appState, tabState, type TabStateType } from '$lib/stores/app';
   import { IdleDetector } from '$lib/utils/idle.js';
-  
+
+  window.process = process;
+
   const IDLE_TIMEOUT_MS = 60 * 1000;
   
-  const isLeader: Writable<boolean> = writable(false);
-  const isIdle: Writable<boolean> = writable(false);
-  
-  let isLeaderValue = false;
-  let isIdleValue = false;
   let isReady = false;
-  
   let busy = false;
   
   const lifecycle = createTabLifecycle();
@@ -34,105 +32,97 @@
   let idleDetector: IdleDetector | null = null;
   let nip66: Nip66;
 
-  import process from 'process/browser';
-  window.process = process;
-
-  
   function handleIdle() {
-    //console.log('User is idle. Performing idle actions...');
-    isIdle.set(true);
+    console.log('User is idle. Performing idle actions...');
+    setTabState('idle');
     lifecycle.releaseLeadership();
   }
   
-  function handleActive() {
-    //console.log('User is active again.');
-    isIdle.set(false);
-    lifecycle.acquireLeadership();
-    idleDetector?.reset?.();
+  async function handleActive() {
+    try {
+      console.log('User is active again.');
+      setTabState('follower');
+      await lifecycle.acquireLeadership();
+      if (get(unsupported)) return;
+      setTabState('leader');
+      await boot();
+      idleDetector?.reset?.();
+    } catch (error) {
+      console.error('Error in handleActive:', error);
+      setTabState('follower');
+    }
   }
   
   lifecycle.onStartLeader(async () => {
-    //console.log('[Lifecycle] onStartLeader triggered');
-    isLeader.set(true);
+    console.log('[Lifecycle] onStartLeader triggered');
     if (get(unsupported)) return;
-    
+    setTabState('leader');
     try {
       await boot(); 
-      //console.log('Leader tab: DB initialized.');
+      console.log('Leader tab: DB initialized.');
     } catch (error) {
       console.error('[Lifecycle] Error in onStartLeader:', error);
     }
   });
   
   lifecycle.onLeaderAcquired(async () => {
-    //console.log('Non-leader tab: Just became leader, initializing DB.');
-    isLeader.set(true);
+    console.log('Non-leader tab: Just became leader, initializing DB.');
     if (get(unsupported)) return;
-    
+    setTabState('leader');
     try {
       await boot(); 
-      //console.log('Leader tab: DB initialized.');
+      console.log('Leader tab: DB initialized.');
     } catch (error) {
       console.error('[Lifecycle] Error in onLeaderAcquired:', error);
     }
   });
   
   lifecycle.onReleaseLeader(async () => {
-    //console.log('[Lifecycle] onReleaseLeader triggered'); 
+    console.log('[Lifecycle] onReleaseLeader triggered'); 
     try {
-      //console.log("Leader tab: Releasing...");
       nip66 = await instance();
-      //console.log("Leader tab: awaiting ready...");
       await nip66.ready();
-      //console.log("Leader tab: ready, awaiting shutdown...");
       await nip66.shutdown();
-      //console.log("Leader tab: shutdown...");
       await delay(1000);
       destroy();
-      //console.log("Leader tab: Released.");
-      isLeader.set(false);
+      console.log("Leader tab: Released.");
+      setTabState('follower');
     } catch (error) {
       console.error('[Lifecycle] Error in onReleaseLeader:', error);
+      setTabState('follower'); 
     }
   });
   
   lifecycle.onWaitForLeaderRelease(() => {
-    //console.log('Non-leader tab: Waiting for DB to be released by leader...');
+    console.log('Non-leader tab: Waiting for DB to be released by leader...');
   });
   
   let unsubs: (() => any)[] = [];
   
-  const isLeaderUnsub = isLeader.subscribe(value => {
-    isLeaderValue = value;
-    if (isReady === false) {
-      isReady = true;
-    }
-  });
-  const isIdleUnsub = isIdle.subscribe(value => {
-    isIdleValue = value;
-    if (isReady === false) {
-      isReady = true;
+  const appStateUnsub = tabState.subscribe(value => {
+    if (value !== undefined) {
+      if (!isReady) isReady = true;
     }
   });
-
-  unsubs.push(isLeaderUnsub, isIdleUnsub);
+  
+  unsubs.push(appStateUnsub);
   
   const unsubscribe = () => {
     unsubs.forEach(unsub => unsub());
-    isLeaderUnsub();
-    isIdleUnsub();
     if (idleDetector) {
       idleDetector.destroy();
       idleDetector = null;
-      //console.log('IdleDetector destroyed on component cleanup.');
+      console.log('IdleDetector destroyed on component cleanup.');
     }
   };
   
   async function boot() {
+    appState.set('booting');
     if (!get(doBootstrap)) {
       try {
         await seedFromCache();
-        //console.log('Data seeded from cache.');
+        appState.set('running');
+        console.log('Data seeded from cache.');
       } catch (error) {
         console.error('Error seeding from cache:', error);
       }
@@ -140,7 +130,8 @@
       busy = true;
       try {
         await bootstrap();
-        //console.log('Bootstrap completed.');
+        appState.set('running');
+        console.log('Bootstrap completed.');
       } catch (error) {
         console.error('Error during bootstrap:', error);
       } finally {
@@ -155,19 +146,24 @@
     const browserInfo = getBrowserInfo();
     const isSafari = browserInfo?.name.toLowerCase().includes('safari');
   
-    unsupported.set(isSafari || isMobile);
+    if (isSafari || isMobile) {
+      unsupported.set(true);
   
-    if (isMobile && page.url.pathname !== '/mobile') {
-      goto('/mobile'); 
-    }
+      if (isMobile && page.url.pathname !== '/mobile') {
+        goto('/mobile'); 
+      }
   
-    if (isSafari && page.url.pathname !== '/unsupported') {
-      goto('/unsupported');
+      if (isSafari && page.url.pathname !== '/unsupported') {
+        goto('/unsupported');
+      }
+    } else {
+      unsupported.set(false);
     }
   }
   
   onDestroy(() => {
     unsubscribe();
+    console.log('Component destroyed. Cleaned up subscriptions and resources.');
   });
   
   onMount(async () => {
@@ -194,34 +190,48 @@
         onIdle: handleIdle,
         onActive: handleActive,
       });
-      //console.log('IdleDetector initialized on component mount.');
+      console.log('IdleDetector initialized on component mount.');
     }
   
     lifecycle.acquireLeadership();
   });
   
   $: if (navigating) {
-    //console.log('Navigation detected. Rechecking support and loading data.');
+    console.log('Navigation detected. Rechecking support and loading data.');
     checkSupport();
     boot();
   };
+
+  // Helper function to set app state with logging
+  function setTabState(newState: TabStateType) {
+    tabState.update(current => {
+      console.log(`TabState changing from ${current} to ${newState}`);
+      return newState;
+    });
+  }
 </script>
 
+
 {#if isReady}
-  {#if isLeaderValue}
+  {#if $tabState === 'idle'}
+    <!-- Idle State -->
+    <div class="flex flex-col items-center justify-center h-screen px-4">
+      <div class="text-2xl">Zzz</div>
+    </div>
+  {:else if $tabState === 'leader'}
+    <!-- Leader State -->
     <Header />
     <div id="content-wrapper" class="mt-16 block">
       <slot />
     </div>
-  {:else if !isIdleValue}
+  {:else if $tabState === 'follower'}
+    <!-- Follower State -->
     <div class="flex flex-col items-center justify-center h-screen px-4">
       <div class="text-2xl">Another Session Detected</div>
       <div class="text-lg text-center">Please wait while the existing session is terminated.</div>
     </div>
-  {:else if isIdleValue}
-    <div class="flex flex-col items-center justify-center h-screen px-4">
-      <div class="text-2xl">Zzz</div>
-    </div>
+  {:else if $tabState === 'unsupported'}
+    <!-- Unsupported State handled by navigation -->
   {/if}
 {/if}
 
diff --git a/package.json b/package.json
index cbc2d9ca..1a03d21c 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
   "author": "dskvr <dskvr@users.noreply.github.com>",
   "license": "MIT",
   "dependencies": {
-    "glob": "^11.0.0"
+    "glob": "^11.0.0",
+    "nostr-tools": "^2.10.4"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 66b03d0f..38bb34ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       glob:
         specifier: ^11.0.0
         version: 11.0.0
+      nostr-tools:
+        specifier: ^2.10.4
+        version: 2.10.4(typescript@5.7.2)
     devDependencies:
       '@changesets/cli':
         specifier: 2.27.8