From f69c0f1072edb95485aa085eb8ada6324cd67cd6 Mon Sep 17 00:00:00 2001
From: SondreB <sondre@outlook.com>
Date: Sun, 29 Jan 2023 21:36:34 +0100
Subject: [PATCH] Setup default relays when empty

---
 src/app/app.ts                  |  1 -
 src/app/home/home.ts            | 21 ++++++---------------
 src/app/services/relay.ts       | 32 +++++++++++++++-----------------
 src/app/types/storage.ts        |  2 +-
 src/app/workers/relay.worker.ts |  2 +-
 5 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/app/app.ts b/src/app/app.ts
index e2187ff..14bffbf 100644
--- a/src/app/app.ts
+++ b/src/app/app.ts
@@ -186,7 +186,6 @@ export class AppComponent {
   /** Run initialize whenever user has been authenticated. */
   async initialize() {
     console.log('INITIALIZE IS RUNNING....');
-    debugger;
 
     // await this.storage.open();
     // await this.storage.initialize();
diff --git a/src/app/home/home.ts b/src/app/home/home.ts
index 887dedf..178b830 100644
--- a/src/app/home/home.ts
+++ b/src/app/home/home.ts
@@ -169,24 +169,16 @@ export class HomeComponent {
   }
 
   async clearDatabase() {
-    // this.db
-    //   .delete()
-    //   .then(() => {
-    //     console.log('Database successfully deleted');
-    //   })
-    //   .catch((err) => {
-    //     console.error('Could not delete database');
-    //   })
-    //   .finally(() => {
-    //     // Do what should be done next...
-    //   });
-
     console.log('Deleting storage...');
 
-    await this.db.storage.delete();
+    try {
+      this.db.close();
+      await this.db.storage.delete();
+    } catch (err) {
+      console.error(err);
+    }
 
     console.log('Reloading!');
-
     location.reload();
   }
 
@@ -273,7 +265,6 @@ export class HomeComponent {
 
     this.subscriptions.push(
       this.appState.initialized$.subscribe(async (value) => {
-        debugger;
         if (value) {
           this.latestItems = await this.db.storage.getEventsByCreated(undefined, 7);
         }
diff --git a/src/app/services/relay.ts b/src/app/services/relay.ts
index eed0e8b..d8b07a8 100644
--- a/src/app/services/relay.ts
+++ b/src/app/services/relay.ts
@@ -584,6 +584,21 @@ export class RelayService {
   async initialize() {
     this.items2 = await this.db.storage.getRelays();
 
+    // If there are no relay metatadata in database, get it from extension or default
+    if (this.items2.length == 0) {
+      let relays;
+
+      try {
+        const gt = globalThis as any;
+        relays = await gt.nostr.getRelays();
+      } catch (err) {
+        relays = this.defaultRelays;
+      }
+
+      // First append whatever the extension give us of relays.
+      await this.appendRelays(relays);
+    }
+
     for (let index = 0; index < this.items2.length; index++) {
       const relay = this.items2[index];
 
@@ -591,22 +606,5 @@ export class RelayService {
         this.createRelayWorker(relay.url);
       }
     }
-
-    // If there are no relay metatadata in database, get it from extension or default
-    // const items = await this.table.toArray();
-
-    // if (items.length === 0) {
-    //   let relays;
-
-    //   try {
-    //     const gt = globalThis as any;
-    //     relays = await gt.nostr.getRelays();
-    //   } catch (err) {
-    //     relays = this.defaultRelays;
-    //   }
-
-    //   // First append whatever the extension give us of relays.
-    //   await this.appendRelays(relays);
-    // }
   }
 }
diff --git a/src/app/types/storage.ts b/src/app/types/storage.ts
index 18b50d2..5ed2d7f 100644
--- a/src/app/types/storage.ts
+++ b/src/app/types/storage.ts
@@ -173,7 +173,7 @@ export class Storage {
   async delete() {
     await deleteDB(this.name, {
       blocked() {
-        // …
+        console.log('BLOCKED...');
       },
     });
   }
diff --git a/src/app/workers/relay.worker.ts b/src/app/workers/relay.worker.ts
index 31ca203..1fa9a6d 100644
--- a/src/app/workers/relay.worker.ts
+++ b/src/app/workers/relay.worker.ts
@@ -59,7 +59,7 @@ addEventListener('message', async (ev: MessageEvent) => {
   switch (request.type) {
     case 'connect':
       // If the relay worker is already connected and valid, avoid re-creating.
-      if (relayWorker && relayWorker.relay.status == 1) {
+      if (relayWorker && relayWorker.relay && relayWorker.relay.status == 1) {
         console.log('Already connected...');
         break;
       } else {