Turn default relays into required relays

tests/helpers/mock-nostr.js

@@ -49,11 +49,19 @@ export class MockNostrDataService extends Service {
     return [];
   }
 
-  get defaultReadRelays() {
+  get requiredReadRelays() {
     return [];
   }
 
-  get defaultWriteRelays() {
+  get requiredWriteRelays() {
+    return [];
+  }
+
+  get mailboxReadRelays() {
+    return [];
+  }
+
+  get mailboxWriteRelays() {
     return [];
   }
 

tests/integration/components/app-menu/settings/nostr-test.gjs

@@ -0,0 +1,177 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'marco/tests/helpers';
+import { click, fillIn, render } from '@ember/test-helpers';
+import Service, { service } from '@ember/service';
+import AppMenuSettingsNostr from 'marco/components/app-menu/settings/nostr';
+import {
+  excludeRequiredRelays,
+  mergeRequiredRelays,
+  uniqNormalizedRelays,
+} from 'marco/utils/nostr';
+
+class MockNostrDataService extends Service {
+  @service settings;
+
+  requiredReadRelays = ['wss://nostr.kosmos.org'];
+  requiredWriteRelays = [];
+
+  mailboxReadRelays = ['wss://mailbox.example.com'];
+  mailboxWriteRelays = ['wss://mailbox-write.example.com'];
+
+  get configuredReadRelays() {
+    const configured = uniqNormalizedRelays([
+      ...this.mailboxReadRelays,
+      ...(this.settings.nostrReadRelays || []),
+    ]);
+
+    return excludeRequiredRelays(
+      configured,
+      this.settings.nostrReadRelayExclusions || []
+    );
+  }
+
+  get configuredWriteRelays() {
+    const configured = uniqNormalizedRelays([
+      ...this.mailboxWriteRelays,
+      ...(this.settings.nostrWriteRelays || []),
+    ]);
+
+    return excludeRequiredRelays(
+      configured,
+      this.settings.nostrWriteRelayExclusions || []
+    );
+  }
+
+  get activeReadRelays() {
+    return mergeRequiredRelays(this.requiredReadRelays, this.configuredReadRelays);
+  }
+
+  get activeWriteRelays() {
+    return mergeRequiredRelays(
+      this.requiredWriteRelays,
+      this.configuredWriteRelays
+    );
+  }
+
+  async clearCache() {}
+}
+
+function readRows(element) {
+  const list = element.querySelectorAll('.relay-list')[0];
+  return [...list.querySelectorAll('li')];
+}
+
+function writeRows(element) {
+  const list = element.querySelectorAll('.relay-list')[1];
+  return [...list.querySelectorAll('li')];
+}
+
+function rowByText(rows, text) {
+  return rows.find((row) => row.textContent.includes(text));
+}
+
+module('Integration | Component | app-menu/settings/nostr', function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function () {
+    localStorage.removeItem('marco:settings');
+
+    this.owner.register('service:nostrData', MockNostrDataService);
+    this.settings = this.owner.lookup('service:settings');
+    this.onChange = () => {};
+  });
+
+  hooks.afterEach(function () {
+    localStorage.removeItem('marco:settings');
+  });
+
+  async function renderAndOpenDetails(context) {
+    await render(
+      <template><AppMenuSettingsNostr @onChange={{this.onChange}} /></template>
+    );
+    await click('summary');
+    return context.element;
+  }
+
+  test('required read relay is first and non-removable', async function (assert) {
+    const element = await renderAndOpenDetails(this);
+    const rows = readRows(element);
+
+    assert.dom(rows[0]).includesText('nostr.kosmos.org');
+
+    const requiredRow = rowByText(rows, 'nostr.kosmos.org');
+    const mailboxRow = rowByText(rows, 'mailbox.example.com');
+
+    assert.dom(requiredRow.querySelector('.btn-remove-relay')).doesNotExist();
+    assert.dom(mailboxRow.querySelector('.btn-remove-relay')).exists();
+  });
+
+  test('removing mailbox read relay stores exclusion override', async function (assert) {
+    const element = await renderAndOpenDetails(this);
+    const mailboxRow = rowByText(readRows(element), 'mailbox.example.com');
+
+    await click(mailboxRow.querySelector('.btn-remove-relay'));
+
+    assert.deepEqual(this.settings.nostrReadRelayExclusions, [
+      'wss://mailbox.example.com',
+    ]);
+    assert.strictEqual(this.settings.nostrReadRelays, null);
+  });
+
+  test('removing custom read relay updates custom list without exclusions', async function (assert) {
+    this.settings.update('nostrReadRelays', ['wss://custom.example.com']);
+
+    const element = await renderAndOpenDetails(this);
+    const customRow = rowByText(readRows(element), 'custom.example.com');
+
+    await click(customRow.querySelector('.btn-remove-relay'));
+
+    assert.strictEqual(this.settings.nostrReadRelays, null);
+    assert.strictEqual(this.settings.nostrReadRelayExclusions, null);
+  });
+
+  test('adding read relay clears existing exclusion for same relay', async function (assert) {
+    this.settings.update('nostrReadRelayExclusions', ['wss://mailbox.example.com']);
+
+    const element = await renderAndOpenDetails(this);
+
+    await fillIn('#new-read-relay', 'Mailbox.EXAMPLE.com/');
+    await click(element.querySelector('#new-read-relay').nextElementSibling);
+
+    assert.deepEqual(this.settings.nostrReadRelays, ['wss://mailbox.example.com']);
+    assert.strictEqual(this.settings.nostrReadRelayExclusions, null);
+  });
+
+  test('reset read relays clears additions and exclusions', async function (assert) {
+    this.settings.update('nostrReadRelays', ['wss://custom.example.com']);
+    this.settings.update('nostrReadRelayExclusions', ['wss://mailbox.example.com']);
+
+    const element = await renderAndOpenDetails(this);
+    await click(element.querySelectorAll('.reset-relays')[0]);
+
+    assert.strictEqual(this.settings.nostrReadRelays, null);
+    assert.strictEqual(this.settings.nostrReadRelayExclusions, null);
+
+    const requiredRow = rowByText(readRows(element), 'nostr.kosmos.org');
+    assert.dom(requiredRow).exists();
+  });
+
+  test('write relays are removable and mailbox delete stores exclusion', async function (assert) {
+    this.settings.update('nostrWriteRelays', ['wss://custom-write.example.com']);
+
+    const element = await renderAndOpenDetails(this);
+    const rows = writeRows(element);
+
+    assert.true(
+      rows.every((row) => row.querySelector('.btn-remove-relay')),
+      'all write relays can be removed'
+    );
+
+    const mailboxRow = rowByText(rows, 'mailbox-write.example.com');
+    await click(mailboxRow.querySelector('.btn-remove-relay'));
+
+    assert.deepEqual(this.settings.nostrWriteRelayExclusions, [
+      'wss://mailbox-write.example.com',
+    ]);
+  });
+});

tests/unit/utils/nostr-test.js

@@ -1,5 +1,11 @@
 import { module, test } from 'qunit';
-import { normalizeRelayUrl, parsePlacePhotos } from 'marco/utils/nostr';
+import {
+  excludeRequiredRelays,
+  mergeRequiredRelays,
+  normalizeRelayUrl,
+  parsePlacePhotos,
+  uniqNormalizedRelays,
+} from 'marco/utils/nostr';
 
 module('Unit | Utility | nostr', function () {
   test('normalizeRelayUrl normalizes protocol, case, and slashes', function (assert) {
@@ -141,4 +147,56 @@ module('Unit | Utility | nostr', function () {
     assert.strictEqual(photos[0].placeIdentifier, 'osm:node:123');
     assert.strictEqual(photos[1].placeIdentifier, 'osm:node:456');
   });
+
+  test('uniqNormalizedRelays returns normalized unique relays', function (assert) {
+    const relays = uniqNormalizedRelays([
+      'Relay.example.com',
+      'wss://relay.example.com/',
+      'wss://other.example.com',
+    ]);
+
+    assert.deepEqual(relays, [
+      'wss://relay.example.com',
+      'wss://other.example.com',
+    ]);
+  });
+
+  test('mergeRequiredRelays keeps required relays as-is and merges normalized custom relays', function (assert) {
+    const relays = mergeRequiredRelays(
+      ['wss://required.example.com', 'required-2.example.com'],
+      ['required-2.example.com/', 'wss://custom.example.com']
+    );
+
+    assert.deepEqual(relays, [
+      'wss://required.example.com',
+      'required-2.example.com',
+      'wss://required-2.example.com',
+      'wss://custom.example.com',
+    ]);
+  });
+
+  test('excludeRequiredRelays removes required relays from normalized custom list', function (assert) {
+    const relays = excludeRequiredRelays(
+      [
+        'wss://required.example.com',
+        'custom.example.com',
+        'ws://custom2.example.com',
+      ],
+      ['wss://required.example.com']
+    );
+
+    assert.deepEqual(relays, [
+      'wss://custom.example.com',
+      'ws://custom2.example.com',
+    ]);
+  });
+
+  test('excludeRequiredRelays trusts required list without normalizing it', function (assert) {
+    const relays = excludeRequiredRelays(
+      ['Required.example.com', 'custom.example.com'],
+      ['required.example.com']
+    );
+
+    assert.deepEqual(relays, ['wss://required.example.com', 'wss://custom.example.com']);
+  });
 });