row bg + few small improvements

sandwichfarm · Dec 21, 2024 · 092390d · 092390d
1 parent 1f8781a
commit 092390d
Show file tree

Hide file tree

Showing 14 changed files with 376 additions and 44 deletions.
diff --git a/apps/gui/package.json b/apps/gui/package.json
@@ -69,6 +69,7 @@
 		"prettier-plugin-svelte": "^3.1.2",
 		"prettier-plugin-tailwindcss": "^0.6.4",
 		"publint": "^0.2.0",
+		"rollup-plugin-polyfill-node": "^0.13.0",
 		"sass-embedded": "^1.82.0",
 		"serve": "^14.2.4",
 		"svelte": "^5.2.7",
@@ -101,6 +102,7 @@
 		"@nostrwatch/nocap": "workspace:^",
 		"@nostrwatch/nocap-websocket-adapter-default": "workspace:^",
 		"@nostrwatch/utils": "workspace:^",
+		"@nostrwatch/worker-relay": "^1.3.0",
 		"@unovis/svelte": "^1.4.5",
 		"@unovis/ts": "^1.4.5",
 		"brotli": "^1.3.3",

diff --git a/apps/gui/src/lib/components/lists/table/DataTable.svelte b/apps/gui/src/lib/components/lists/table/DataTable.svelte
@@ -292,7 +292,14 @@
                     </Table.Header>
                     <Table.Body>
                         {#each tableInstance?.rows as row (row.id)}
-                            <Table.Row class="{$rowStyles.get(row.pubkey)}" style="{row.banner? `background-image: ${row.banner}; background-repeat: no-repeat; background-size: cover; background-blend-mode: lighten;`: ''}">
+                            <Table.Row 
+                                class="{$rowStyles.get(row.pubkey)}" 
+                                style="{row.banner? 
+                                    `background: linear-gradient(rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.8)),  url('${row.banner}'); 
+                                     background-repeat: no-repeat; 
+                                     background-size: cover; `
+                                     : ''}"
+                                >
                                 {#if actionsComponent}
                                     <svelte:component this={actionsComponent} data={row} />
                                 {/if}

diff --git a/apps/gui/src/lib/components/partials/relay-single/RelayAudits.svelte b/apps/gui/src/lib/components/partials/relay-single/RelayAudits.svelte
@@ -11,6 +11,9 @@
 	import Badge from "../../ui/badge/badge.svelte";
 	import type { Nip11 } from "@nostrwatch/nip66/models";
 
+    import * as Alert from "$lib/components/ui/alert/index.js";
+
+
     // Props passed to the component
     export let relayUrl: string;
     export let nip11: Writable<Nip11 | undefined>;
@@ -218,11 +221,15 @@
 </script>
 
 <div class="p-6 min-h-screen text-white">
+
+    <Alert.Root class="mb-2">
+        <Alert.Title>Notice</Alert.Title>
+        <Alert.Description>
+            The relay audit feature is alpha and very experimental. Presently, `AUTH` relays will return false negatives. Only a few NIPs presently have testing suites.
+        </Alert.Description>
+    </Alert.Root>
+
     <div class="mb-8">
-        <h2 class="text-3xl font-bold">
-            Running NIP Audit
-            <a href="{relayUrl}" target="_blank" class="text-blue-400 hover:underline">{relayUrl}</a>
-        </h2>
         {#if $auditResults.length === 0}
             <p class="text-gray-400 mt-2">No audit results yet.</p>
         {/if}

diff --git a/apps/gui/src/lib/services/Nip11Service/index.ts b/apps/gui/src/lib/services/Nip11Service/index.ts
@@ -4,6 +4,7 @@ import type { nip11 } from 'nostr-tools';
 import { nip11sLocal } from '$lib/stores/nip11s.js';
 import { Nip11, type RelayInformation } from '@nostrwatch/nip66/models';
 import { getRelayErrorSubject, setRelayError, type RelayErrorMessages } from '$lib/stores/relay-errors.js';
+import { relaysErrors } from '$lib/stores/relay-errors';
 
 export type Nip11ServiceMessage = {
     relay: string,
@@ -31,16 +32,19 @@ export class Nip11Service {
         while(!result && !error){
             result = (get(nip11sLocal) as Map<string, Nip11>)?.get(relay)
             error = getRelayErrorSubject(relay, 'nip11')
+            console.log('n11s relays errors (from store in whjile loop)', get(relaysErrors), getRelayErrorSubject(relay, 'nip11'))
             await new Promise( resolve => setTimeout( resolve, 200 ))
         }
+        console.log('n11s done?!?!?')
         return result;
     }
 
     private onmessage(message: MessageEvent<Nip11ServiceMessage>){
+        console.log('N11S recieved nip11 service message', message)
         const { relay, nip11:_nip11, error } = message.data;
-        if(!_nip11) return;
         const nip11 = new Nip11(_nip11 as RelayInformation)
         if(error) {
+            console.log('N11S setting error in store', error.message)
             setRelayError(relay, 'nip11', error.message)
             return
         }

diff --git a/apps/gui/src/lib/services/Nip11Service/nip11.worker.ts b/apps/gui/src/lib/services/Nip11Service/nip11.worker.ts
@@ -7,7 +7,7 @@ const check = async (relay: string): Promise<nip11.RelayInformation> => {
 
 const timeoutMessage = (relay: string) => {
     const error = `Request for NIP-11 from ${relay} timed out.`
-    console.error(error)
+    console.error('TIMEOUT ERROR', error)
     self.postMessage({ relay, error } as Nip11ServiceMessage)
 }
 
@@ -24,15 +24,18 @@ self.onmessage = ({ data }) => {
         .then((nip11: nip11.RelayInformation) => {
             if(timedOut) return;
             clearTimeout(timeout)
+            console.error('CHECK CATCH RESOLVE', error)
             self.postMessage({ relay, nip11 } as Nip11ServiceMessage)
         })
         .catch((error: any) => { 
             if(timedOut) return;
             clearTimeout(timeout)
+            console.error('CHECK CATCH ERROR', error)
             self.postMessage({ relay, error } as Nip11ServiceMessage)
         })
 }
 
-self.onerror = () => {
+self.onerror = (err: any) => {
+    console.log('WORKER ERROR', err)
     self.postMessage({ error: 'timed out.' } as Nip11ServiceMessage)
 }
diff --git a/apps/gui/src/lib/stores/relay-errors.ts b/apps/gui/src/lib/stores/relay-errors.ts
@@ -4,6 +4,7 @@ export type RelayErrorMessage = string
 export type RelayErrorMessages = RelayErrorMessage[]
 export type RelayErrors = Map<RelayErrorSubject, RelayErrorMessages>
 export type RelaysErrors = Map<string, RelayErrors>
+
 export const relaysErrors: Writable<RelaysErrors> = writable(new Map())
 
 export const getRelayErrors = (relay: string): RelayErrors | undefined => {
@@ -24,6 +25,9 @@ export const setRelayError = (relay: string, subject: RelayErrorSubject, message
     if(typeof messages === 'undefined') messages = [];
     (messages as RelayErrorMessages).push(message)
     relayErrors.set(subject, messages)
+    console.log('n11s relayErrors', relay, relayErrors)
     $relaysErrors.set(relay, relayErrors)
+    console.log('n11s relays errors', $relaysErrors)
     relaysErrors.set($relaysErrors);
+    console.log('n11s relays errors (from store)', get(relaysErrors))
 }
diff --git a/apps/gui/src/routes/relays/[protocol]/[...relay]/+page.svelte b/apps/gui/src/routes/relays/[protocol]/[...relay]/+page.svelte
@@ -3,11 +3,12 @@
   import { onDestroy, onMount } from 'svelte';
   import { doBootstrap } from '$lib/stores/routines.js';
   import { derived, writable, type Readable, type Writable } from 'svelte/store';
-  import { Nip66Event, PubkeyProfile, PubkeyRelays, type Monitor, type INip11 } from '@nostrwatch/nip66/models';
+  import { Nip66Event, PubkeyProfile, PubkeyRelays, type Monitor, type INip11, type IEvent } from '@nostrwatch/nip66/models';
   import { relayAggregates, relayCheckAggregator } from '$lib/stores/checks.js';
   import { nip11s, nip11Service, nip11sLocal } from '$lib/stores/nip11s.js';
   import { isSeeded } from '$lib/stores/app.js';
   import { eventsArray } from '$lib/stores/events.js';
+  import { relaysErrors } from '$lib/stores/relay-errors.js';
   import { isHex } from '$lib/utils/nostr.js';
   import { Nip11 } from '@nostrwatch/nip66/models';
   import { isLivesyncing, doAggregateCache, hasBeenBoostrapped } from '$lib/stores/app';
@@ -17,6 +18,7 @@
   import { Skeleton } from "$lib/components/ui/skeleton";
 	import { nip66Ready } from '$lib/stores/app';
 	import { nip66 } from '$lib/stores';
+	import { getRelayErrorSubject } from '$lib/stores/relay-errors';
 
   let ProfileCompact: typeof import('$lib/components/partials/ProfileCompact.svelte').default | null = null;
   let RelayChecks: typeof import('$lib/components/partials/relay-single/RelayChecks.svelte').default | null = null;
@@ -69,8 +71,9 @@
   export let params: { protocol: string; relay: string };
   let currentRelay: string = '';
   let loading: boolean = true;
-  let nip11Ready: Writable<boolean> = writable(false);
-
+  
+  const nip11Ready: Writable<boolean> = writable(false);
+  const operatorMetaReady: Writable<boolean> = writable(false);
   const operatorProfile: Writable<PubkeyProfile | null> = writable(null);
   const operatorRelays: Writable<PubkeyRelays | null> = writable(null);
   const monitors: Writable<Monitor[]> = writable([]);
@@ -147,12 +150,12 @@
   };
 
   const loadNip11 = async () => {
-      await $nip11Service.check(relayUrl);
+      await $nip11Service.check(relayUrl)
       nip11Ready.set(true);
   };
 
   const loadOperatorMeta = async () => {
-      if (!operatorPubkey) return;
+      if (!operatorPubkey) return operatorMetaReady.set(true);
       const onevent = (event: IEvent) => {
           if (event.kind === 0 && !$operatorProfile) {
               operatorProfile.set(new PubkeyProfile(event));
@@ -162,6 +165,7 @@
           }
       };
       await $nip66?.services?.relay?.fetchOperatorMeta(operatorPubkey, { onevent });
+      operatorMetaReady.set(true)
   };
 
   const mount = async () => {
@@ -246,6 +250,8 @@
 
   $: showAuditTab = relayUrl && $activeTab === 'audit';
 
+  $: errors = $relaysErrors?.get(relayUrl)
+
   let [minColWidth, maxColWidth, gap] = [400, 800, 21];
   let width: number, height: number;
 </script>
@@ -290,7 +296,7 @@
           <Tabs.Trigger value="overview" class="text-lg flex-grow" on:click={() => activeTab.set('overview')}>Overview</Tabs.Trigger>
           <Tabs.Trigger value="checks" class="text-lg flex-grow" on:click={() => activeTab.set('checks')}>Checks</Tabs.Trigger>
           <Tabs.Trigger disabled={!$nip11} value="nip11" class="text-lg flex-grow" on:click={() => activeTab.set('nip11')}>NIP-11</Tabs.Trigger>
-          <Tabs.Trigger disabled={operatorPubkey && $operatorRelays?.relays?.length} value="operator-feed" class="text-lg flex-grow" on:click={() => activeTab.set('operator-feed')}>Operator Feed</Tabs.Trigger>
+          <Tabs.Trigger disabled={!(operatorPubkey && $operatorRelays?.relays?.length)} value="operator-feed" class="text-lg flex-grow" on:click={() => activeTab.set('operator-feed')}>Operator Feed</Tabs.Trigger>
           <Tabs.Trigger value="audit" class="text-lg flex-grow" on:click={() => activeTab.set('audit')}>Audits</Tabs.Trigger>
         </Tabs.List>
         <div class="p-4">
@@ -328,10 +334,19 @@
                     {/if}
                   {/if}
                   {#if item === 'nips'}
-                    {#if CardNips && $nip11 && $nip11?.supportedNips?.length}
-                      <CardNips supportedNips={$nip11.supportedNips} />
+
+                    {#if CardNips && supportedNips}
+                      <CardNips {supportedNips} />
                     {:else}
-                      <Skeleton class="h-40 w-full" />
+                      {#if errors?.get('nip11')?.length}
+                      <div><ul>
+                        {#each errors?.get('nip11') as nip11Error}
+                          <li>{nip11Error}</li>
+                        {/each}
+                      </ul> </div>
+                      {:else}
+                        <!-- <Skeleton class="h-40 w-full" /> -->
+                      {/if}
                     {/if}
                   {/if}
                   {#if item === 'checks'}
@@ -358,7 +373,7 @@
                   {#if item === 'operator'}
                     {#if CardOperator && $operatorProfile && operatorPubkey}
                       <CardOperator {relayUrl} pubkey={operatorPubkey} profile={$operatorProfile} monitors={$monitors} />
-                    {:else}
+                    {:else if !$operatorMetaReady}
                       <Skeleton class="h-36 w-full" />
                     {/if}
                   {/if}
@@ -381,18 +396,20 @@
           {/if}
 
           <Tabs.Content value="nip11">
-            {$nip11s.get(relayUrl)?.length ?? 0} NIP-11s from NIP-66 events [{$nip11s.get(relayUrl)?.[0] ? true : false}] <br />
-            {#if $nip11sLocal?.get(relayUrl)}
+            <!-- {$nip11s.get(relayUrl)?.length ?? 0} NIP-11s from NIP-66 events [{$nip11s.get(relayUrl)?.[0] ? true : false}] <br /> -->
+            <!-- {#if $nip11sLocal?.get(relayUrl)}
               NIP-11 found locally <br />
-            {/if}
+            {/if} -->
             <pre class="py-6 px-8 bg-white/5 rounded-lg">{JSON.stringify($nip11?.json, null, 4)}</pre>
           </Tabs.Content>
 
-          {#if OperatorFeed && operatorPubkey && $activeTab === 'operator-feed'}
-            <Tabs.Content value="operator-feed">
+
+          <Tabs.Content value="operator-feed">
+              {#if OperatorFeed && operatorPubkey && $activeTab === 'operator-feed'}
               <OperatorFeed pubkey={operatorPubkey} />
-            </Tabs.Content>
-          {/if}
+              {/if}
+          </Tabs.Content>
+
 
           {#if RelayAudits}
             <Tabs.Content value="audit">
@@ -442,7 +459,7 @@
         word-wrap: break-word;
     }
 
-    .relay-card {
+    body .relay-card {
         @apply bg-white/5;
     }
 </style>
diff --git a/apps/gui/vite.production.js b/apps/gui/vite.production.js
@@ -2,7 +2,7 @@ import { defineConfig } from 'vite';
 import { sveltekit } from '@sveltejs/kit/vite';
 import path from 'path';
 import fs from 'fs';
-import fetch from 'node-fetch';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
 
 function patchSvelteSpeedometer() {
   return {
@@ -33,11 +33,13 @@ export default defineConfig({
   worker: {
     plugins: [
       sveltekit(),
-      patchSvelteSpeedometer()
+      patchSvelteSpeedometer(),
+      nodePolyfills()
     ]
   },
   build: {
     minify: 'terser', 
+    sourcemap: true,
     assetsInlineLimit: 0,
     rollupOptions: {
       output: {
@@ -63,7 +65,10 @@ export default defineConfig({
       target: "esnext",
     },
     exclude: [
-      'svelte-speedometer'
+      'svelte-speedometer',
+      '@nostrwatch/worker-relays',
+      "@nostrwatch/auditor",
+      "@nostrwatch/nocap"
     ]
   },
   plugins: [

diff --git a/libraries/nip66/src/services/MonitorService.ts b/libraries/nip66/src/services/MonitorService.ts
@@ -87,7 +87,7 @@ export class MonitorService extends Service {
     this.manager.loadMonitors(monitors);
   }
 
-  async fetch(args: FetchOptions, callbacks?: SubscribeHandlers): Promise<IEvent[] | boolean | undefined> {
+  async fetch(args: FetchOptions, callbacks?: SubscribeHandlers): Promise<IEvent[]> {
     const { filters, relays, options } = args;
     const message: WebsocketRequestBody = { filters, relays, options };
     return this._fetch(message, callbacks);

diff --git a/libraries/nip66/src/services/RelayService.ts b/libraries/nip66/src/services/RelayService.ts
@@ -83,7 +83,7 @@ export class RelayService extends Service {
       keepAlive: false,
       stream: false
     }
-    const events: IEvent[] | boolean | undefined = await this._fetch( { relays, filters, options } );
+    const events: IEvent[] = await this.fetch( { relays, filters, options } );
     if(!events) return;
     const checks: Nip66Event[] = events.map((event: IEvent) => new Nip66Event(event));  
     return checks;
@@ -100,10 +100,7 @@ export class RelayService extends Service {
       keepAlive: false,
       stream: false
     }
-    if(callbacks){
-      options.stream = true; 
-    }
-    return this._fetch( { relays, filters, options }, callbacks );
+    return this.fetch( { relays, filters, options }, callbacks );
   }
 
   async monitorInstancesFromChecks(checks: Nip66Event[], type: 'map' | 'array' = 'map'): Promise<Map<string, Monitor> | Monitor[] | undefined> {

diff --git a/libraries/nip66/src/services/Service.ts b/libraries/nip66/src/services/Service.ts
@@ -66,7 +66,7 @@ export class Service {
     return filters;
   }
 
-  async subscribe(args: FetchOptions, callbacks?: SubscribeHandlers): Promise<IEvent[] | boolean | undefined> {
+  async subscribe(args: FetchOptions, callbacks?: SubscribeHandlers): Promise<IEvent[]> {
     let { filters, relays, options, hash } = args;
     if(!hash) {
       hash = deterministicHash(args)
@@ -75,7 +75,7 @@ export class Service {
     this.subscriptions.add(hash)
     const result = await this.websocketAdapter.subscribe(message, callbacks);
     this.subscriptions.delete(hash)
-    return result;
+    return typeof result === 'boolean'? []: result;
   }
 
   async unsubscribe(hash: string) {
@@ -92,7 +92,7 @@ export class Service {
     this.websocketAdapter.unsubscribeAll();
   }
 
-  async fetch(args: FetchOptions, callbacks?: SubscribeHandlers): Promise<IEvent[] | boolean | undefined> {
+  async fetch(args: FetchOptions, callbacks?: SubscribeHandlers): Promise<IEvent[]> {
     if(!args.hash) {  
       args.hash = deterministicHash(args);
     }
@@ -193,6 +193,7 @@ export class Service {
     }
 
     const websocketEvents = await this.fetchFromWebsocket(args, _callbacks);
+    console.log('fetchFromWebsocket resolved')
     websocketEvents.forEach(maybeAddEventToMap);
 
     const finalEvents = Array.from(events.values());