Setup default relays when empty

This commit is contained in:
SondreB 2023-01-29 21:36:34 +01:00
parent a55a92fbb1
commit f69c0f1072
No known key found for this signature in database
GPG Key ID: D6CC44C75005FDBF
5 changed files with 23 additions and 35 deletions

View File

@ -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();

View File

@ -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);
}

View File

@ -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);
// }
}
}

View File

@ -173,7 +173,7 @@ export class Storage {
async delete() {
await deleteDB(this.name, {
blocked() {
// …
console.log('BLOCKED...');
},
});
}

View File

@ -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 {