wireweave 0.1.2 → 0.1.3

package/src/settings.js

@@ -0,0 +1,72 @@
+const VALID_BITRATES = [8000, 16000, 24000, 48000, 96000];
+const clampBitrate = (v) => VALID_BITRATES.reduce((prev, cur) => Math.abs(cur - v) < Math.abs(prev - v) ? cur : prev);
+
+export class Settings extends EventTarget {
+  constructor({ relayPool, auth, roles }) {
+    super();
+    if (!relayPool || !auth || !roles) throw new Error('Settings: deps required');
+    this.pool = relayPool; this.auth = auth; this.roles = roles;
+    this.store = new Map();
+    this.sub = null;
+  }
+
+  getBitrate(serverId) { return this.store.get(serverId)?.opusBitrate || 24000; }
+
+  async setBitrate(serverId, bitrate) {
+    if (!this.roles.isOwner(serverId) && !this.roles.isAdmin(serverId)) throw new Error('Insufficient permissions');
+    const clamped = clampBitrate(Number(bitrate));
+    const existing = this.store.get(serverId) || {};
+    const next = { ...existing, opusBitrate: clamped };
+    this.store.set(serverId, next);
+    const signed = await this.auth.sign({ kind: 30078, created_at: Math.floor(Date.now() / 1000), tags: [['d', 'zellous-settings:' + serverId]], content: JSON.stringify(next) });
+    this.pool.publish(signed);
+    this.dispatchEvent(new CustomEvent('updated', { detail: { serverId, next } }));
+    return clamped;
+  }
+
+  getEmbedAllowlist(serverId) {
+    const s = this.store.get(serverId);
+    if (!s?.embedAllowlist) return [];
+    return typeof s.embedAllowlist === 'string' ? s.embedAllowlist.split(',').map(d => d.trim()).filter(Boolean) : s.embedAllowlist;
+  }
+
+  async setEmbedAllowlist(serverId, domainsStr) {
+    if (!this.roles.isOwner(serverId) && !this.roles.isAdmin(serverId)) throw new Error('Insufficient permissions');
+    const domains = domainsStr.split(',').map(d => d.trim()).filter(Boolean);
+    const existing = this.store.get(serverId) || {};
+    const next = { ...existing, embedAllowlist: domains };
+    this.store.set(serverId, next);
+    const signed = await this.auth.sign({ kind: 30078, created_at: Math.floor(Date.now() / 1000), tags: [['d', 'zellous-settings:' + serverId]], content: JSON.stringify(next) });
+    this.pool.publish(signed);
+    this.dispatchEvent(new CustomEvent('updated', { detail: { serverId, next } }));
+    return domains;
+  }
+
+  isOriginAllowed(serverId, origin) {
+    if (!origin) return false;
+    const allowlist = this.getEmbedAllowlist(serverId);
+    if (!allowlist.length) return true;
+    let url; try { url = new URL(origin); } catch { return false; }
+    return allowlist.some(p => {
+      if (p === '*') return true;
+      if (p.startsWith('*.')) { const s = p.slice(2); return url.hostname === s || url.hostname.endsWith('.' + s); }
+      return url.hostname === p || url.hostname === p.replace(/^https?:\/\//, '');
+    });
+  }
+
+  subscribe(serverId) {
+    if (this.sub) { this.pool.unsubscribe(this.sub); this.sub = null; }
+    if (!serverId) return;
+    const creator = serverId.split(':')[0];
+    if (!creator) return;
+    this.sub = 'settings-' + serverId;
+    this.pool.subscribe(this.sub,
+      [{ kinds: [30078], authors: [creator], '#d': ['zellous-settings:' + serverId] }],
+      (event) => {
+        if (event.pubkey !== creator) return;
+        try { this.store.set(serverId, JSON.parse(event.content)); this.dispatchEvent(new CustomEvent('updated', { detail: { serverId, next: this.store.get(serverId) } })); } catch {}
+      });
+  }
+}
+
+export const createSettings = (opts) => new Settings(opts);

package/src/wireweave.js

@@ -0,0 +1,89 @@
+import { createRelayPool } from './relay-pool.js';
+import { createAuth } from './auth.js';
+import { createFSM } from './fsm.js';
+import { createVoiceSession } from './voice.js';
+import { createChat } from './chat.js';
+import { createChannels } from './channels.js';
+import { createServers } from './servers.js';
+import { createMessageBus } from './message.js';
+import { createBans } from './bans.js';
+import { createRoles } from './roles.js';
+import { createSettings } from './settings.js';
+import { createMedia } from './media.js';
+import { createPages } from './pages.js';
+import { register } from './debug.js';
+
+export const createWireweave = ({
+  nostrTools,
+  xstate,
+  storage = (typeof localStorage !== 'undefined' ? localStorage : null),
+  extension = (typeof window !== 'undefined' ? window.nostr : null),
+  relays = ['wss://relay.damus.io', 'wss://relay.primal.net', 'wss://nos.lol', 'wss://relay.snort.social'],
+  mediaDevices = (typeof navigator !== 'undefined' ? navigator.mediaDevices : null),
+  WebSocketImpl = (typeof WebSocket !== 'undefined' ? WebSocket : null)
+} = {}) => {
+  if (!nostrTools) throw new Error('wireweave: nostrTools required');
+  if (!xstate) throw new Error('wireweave: xstate required');
+
+  const fsm = createFSM(xstate);
+  const pool = createRelayPool({ relays, verifyEvent: nostrTools.verifyEvent, WebSocketImpl });
+  const auth = createAuth({ nostrTools, storage, extension });
+  const message = createMessageBus();
+  const bans = createBans({ relayPool: pool });
+  const roles = createRoles({ relayPool: pool, auth });
+  const settings = createSettings({ relayPool: pool, auth, roles });
+  const pages = createPages({ relayPool: pool, auth, roles });
+  const media = createMedia({ relayPool: pool, auth });
+  const channels = createChannels({ relayPool: pool, auth });
+
+  let currentChannelId = null;
+  const chat = createChat({
+    relayPool: pool, auth,
+    getChannelContext: () => ({ channelId: currentChannelId, serverId: servers.currentServerId || '' }),
+    isAdmin: (sid) => roles.isAdmin(sid)
+  });
+
+  const servers = createServers({
+    relayPool: pool, auth, storage,
+    onSwitch: async (serverId) => {
+      roles.subscribe(serverId);
+      settings.subscribe(serverId);
+      bans.subscribe(serverId);
+      pages.subscribe(serverId);
+      if (serverId) {
+        await new Promise((resolve) => {
+          let done = false;
+          const finish = () => { if (done) return; done = true; resolve(); };
+          channels.load(serverId, finish);
+          setTimeout(finish, 3000);
+        });
+      }
+      const firstText = channels.channels.find(c => c.type === 'text');
+      if (firstText) {
+        currentChannelId = firstText.id;
+        chat.loadHistory(firstText.id);
+      }
+    }
+  });
+
+  let voice = null;
+  const ensureVoice = ({ serverId, displayName, onAudioTrack, onVideoTrack }) => {
+    if (!voice) voice = createVoiceSession({ fsm, xstate, relayPool: pool, auth, mediaDevices, bans, serverId, onAudioTrack, onVideoTrack });
+    else voice.serverId = serverId;
+    return voice;
+  };
+
+  const setCurrentChannel = (id) => { currentChannelId = id; if (id) chat.loadHistory(id); };
+
+  const api = {
+    pool, auth, fsm, message, bans, roles, settings, pages, media, channels, servers, chat,
+    get voice() { return voice; },
+    ensureVoice,
+    setCurrentChannel,
+    get currentChannelId() { return currentChannelId; },
+    get currentServerId() { return servers.currentServerId; }
+  };
+
+  register('wireweave', api);
+  return api;
+};

package/src/legacy/README.md

@@ -1,71 +0,0 @@
-# legacy/
-
-browser-globals port of the full zellous networking + voice stack. these files are the original scripts copied verbatim from `zellous/docs/js/`. they assign to `window.*` (`window.nostrNet`, `window.nostrVoice`, `window.auth`, etc.) and expect co-resident globals (`state`, `XState`, `NostrTools`, `ui`, `auth`, `message`).
-
-this is the honest "move everything" checkpoint. the SDK-shaped ES-module exports in `../` are the forward path — `relay-pool.js` + `auth.js` today, voice / chat / channels / servers to follow.
-
-## load order
-
-scripts must load in this order (same order zellous uses):
-
-```
-nostr-state-patch.js
-nostr-fsm.js
-nostr-network.js
-nostr-auth.js
-nostr-message.js
-nostr-bans.js
-nostr-roles.js
-nostr-settings.js
-nostr-voice.js
-nostr-voice-rtc.js
-nostr-voice-sfu.js
-nostr-voice-camera.js
-nostr-chat.js
-nostr-channels.js
-nostr-servers.js
-nostr-media.js
-nostr-pages.js
-```
-
-## prerequisites already on window
-
-- `window.state`, `window.stateSignals`, `window.config` (zellous/state.js or equivalent)
-- `window.XState` — `{ createMachine, createActor }` from xstate v5
-- `window.NostrTools` — `nostr-tools` (generateSecretKey, getPublicKey, nip19, finalizeEvent, verifyEvent)
-- preact signals for reactive state
-- `window.ui` bindings (optional for headless)
-
-## files
-
-| file | bytes | assigns |
-|---|---|---|
-| nostr-state-patch.js | 507 | state signal patches |
-| nostr-fsm.js | 1018 | `voiceMachine`, `peerMachine` |
-| nostr-network.js | 7595 | `nostrNet` relay pool |
-| nostr-auth.js | 8501 | `auth` key mgmt |
-| nostr-message.js | 529 | `message` system msg dispatch |
-| nostr-bans.js | 2422 | `nostrBans` moderation |
-| nostr-roles.js | 3077 | `serverRoles` |
-| nostr-settings.js | 4231 | `serverSettings` encoder config |
-| nostr-voice.js | 13458 | `nostrVoice` session |
-| nostr-voice-rtc.js | 11636 | `nostrVoiceRtc` perfect-negotiation |
-| nostr-voice-sfu.js | 4773 | `nostrVoiceSfu` hub election |
-| nostr-voice-camera.js | 2355 | `nostrVoiceCamera` |
-| nostr-chat.js | 6513 | `chat` kind-28 messaging |
-| nostr-channels.js | 5369 | `channelManager` |
-| nostr-servers.js | 10718 | `serverManager` communities |
-| nostr-media.js | 3524 | `nostrMedia` blossom uploads |
-| nostr-pages.js | 7909 | `serverPages` |
-
-## CDN load (via jsDelivr)
-
-```html
-<script src="https://cdn.jsdelivr.net/npm/wireweave@latest/src/legacy/nostr-fsm.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/wireweave@latest/src/legacy/nostr-network.js"></script>
-<!-- etc in order above -->
-```
-
-## status
-
-probably emerging 🌀

package/src/legacy/index.js

@@ -1,49 +0,0 @@
-export const LEGACY_LOAD_ORDER = [
-  'nostr-state-patch.js',
-  'nostr-fsm.js',
-  'nostr-network.js',
-  'nostr-auth.js',
-  'nostr-message.js',
-  'nostr-bans.js',
-  'nostr-roles.js',
-  'nostr-settings.js',
-  'nostr-voice.js',
-  'nostr-voice-rtc.js',
-  'nostr-voice-sfu.js',
-  'nostr-voice-camera.js',
-  'nostr-chat.js',
-  'nostr-channels.js',
-  'nostr-servers.js',
-  'nostr-media.js',
-  'nostr-pages.js'
-];
-
-export const loadLegacy = async ({ base = 'https://cdn.jsdelivr.net/npm/wireweave@latest/src/legacy/', prereqsReady = () => true } = {}) => {
-  if (!prereqsReady()) throw new Error('wireweave/legacy: prereqs not ready (state, XState, NostrTools must be on window)');
-  for (const f of LEGACY_LOAD_ORDER) {
-    await new Promise((resolve, reject) => {
-      const s = document.createElement('script');
-      s.src = base + f;
-      s.onload = resolve;
-      s.onerror = () => reject(new Error('failed: ' + f));
-      document.head.appendChild(s);
-    });
-  }
-  return {
-    net: window.nostrNet,
-    auth: window.auth,
-    voice: window.nostrVoice,
-    chat: window.chat,
-    channels: window.channelManager,
-    servers: window.serverManager,
-    message: window.message,
-    bans: window.nostrBans,
-    roles: window.serverRoles,
-    settings: window.serverSettings,
-    pages: window.serverPages,
-    media: window.nostrMedia,
-    voiceRtc: window.nostrVoiceRtc,
-    voiceSfu: window.nostrVoiceSfu,
-    voiceCamera: window.nostrVoiceCamera
-  };
-};

package/src/legacy/nostr-auth.js

@@ -1,217 +0,0 @@
-const auth = {
-  get user() {
-    const pk = state.nostrPubkey;
-    if (!pk) return null;
-    const short = auth.npubShort(pk);
-    return { id: pk, username: short, displayName: state.nostrProfile?.name || short };
-  },
-
-  init() {
-    const skHex = localStorage.getItem('zn_sk');
-    const pkHex = localStorage.getItem('zn_pk');
-    if (!skHex || !pkHex) return false;
-    try {
-      state.nostrPrivkey = auth._hex2b(skHex);
-      state.nostrPubkey = pkHex;
-      const short = auth.npubShort(pkHex);
-      const nameEl = document.getElementById('userPanelName');
-      const tagEl = document.getElementById('userPanelTag');
-      const avatarEl = document.getElementById('userPanelAvatar');
-      if (nameEl) nameEl.textContent = short;
-      if (tagEl) tagEl.textContent = short;
-      if (avatarEl) { const n = avatarEl.childNodes[0]; if (n?.nodeType === 3) n.textContent = short[0].toUpperCase(); }
-      document.getElementById('userStatusDot')?.classList.add('online');
-      return true;
-    } catch { return false; }
-  },
-
-  generateKey() {
-    const NT = window.NostrTools;
-    const sk = NT.generateSecretKey();
-    const pk = NT.getPublicKey(sk);
-    localStorage.setItem('zn_sk', auth._b2hex(sk));
-    localStorage.setItem('zn_pk', pk);
-    state.nostrPrivkey = sk;
-    state.nostrPubkey = pk;
-    return { pubkey: pk, privkey: sk };
-  },
-
-  importKey(input) {
-    try {
-      const NT = window.NostrTools;
-      const sk = input.startsWith('nsec')
-        ? (() => { const d = NT.nip19.decode(input); if (d.type !== 'nsec') throw 0; return d.data; })()
-        : auth._hex2b(input);
-      const pk = NT.getPublicKey(sk);
-      localStorage.setItem('zn_sk', auth._b2hex(sk));
-      localStorage.setItem('zn_pk', pk);
-      state.nostrPrivkey = sk;
-      state.nostrPubkey = pk;
-      return true;
-    } catch { return false; }
-  },
-
-  async loginWithExtension() {
-    const pk = await window.nostr.getPublicKey();
-    state.nostrPubkey = pk;
-    state.nostrPrivkey = null;
-    return pk;
-  },
-
-  async sign(eventTemplate) {
-    if (state.nostrPrivkey) return window.NostrTools.finalizeEvent(eventTemplate, state.nostrPrivkey);
-    return window.nostr.signEvent(eventTemplate);
-  },
-
-  async setDisplayName(name) {
-    if (!state.nostrPubkey) throw new Error('Not logged in');
-    if (!name || typeof name !== 'string') throw new Error('Invalid display name');
-    const template = {
-      kind: 0,
-      created_at: Math.floor(Date.now() / 1000),
-      tags: [],
-      content: JSON.stringify({ name: name.trim(), ...(state.nostrProfile || {}) })
-    };
-    const signed = await auth.sign(template);
-    if (window.nostrNet && window.nostrNet.publish) {
-      await window.nostrNet.publish(signed);
-    }
-    state.nostrProfile = { ...(state.nostrProfile || {}), name: name.trim() };
-    const nameEl = document.getElementById('userPanelName');
-    const avatarEl = document.getElementById('userPanelAvatar');
-    if (nameEl) nameEl.textContent = state.nostrProfile.name;
-    if (avatarEl) { const n = avatarEl.childNodes[0]; if (n?.nodeType === 3) n.textContent = state.nostrProfile.name[0].toUpperCase(); }
-    if (window.chat) chat.updateProfile(state.nostrPubkey, state.nostrProfile);
-  },
-
-  logout() {
-    localStorage.removeItem('zn_sk');
-    localStorage.removeItem('zn_pk');
-    state.nostrPubkey = '';
-    state.nostrPrivkey = null;
-    state.nostrProfile = null;
-    const nameEl = document.getElementById('userPanelName');
-    const tagEl = document.getElementById('userPanelTag');
-    const avatarEl = document.getElementById('userPanelAvatar');
-    if (nameEl) nameEl.textContent = 'Not logged in';
-    if (tagEl) tagEl.textContent = 'Click to login';
-    if (avatarEl) { const n = avatarEl.childNodes[0]; if (n?.nodeType === 3) n.textContent = '?'; }
-    document.getElementById('userStatusDot')?.classList.remove('online');
-    if (window.nostrNet?.disconnect) nostrNet.disconnect();
-  },
-
-  getToken() { return state.nostrPubkey || null; },
-  isLoggedIn() { return !!state.nostrPubkey; },
-
-  npubShort(pubkey) {
-    if (!pubkey) return '';
-    const npub = window.NostrTools.nip19.npubEncode(pubkey);
-    return npub.slice(0, 8) + '...' + npub.slice(-4);
-  },
-
-  showModal() {
-    const modal = document.getElementById('authModal');
-    if (!modal) return;
-    modal.style.display = 'flex';
-    const cv = document.getElementById('nostrConnectView');
-    const lv = document.getElementById('nostrLoggedInView');
-    const loggedIn = auth.isLoggedIn();
-    if (cv) cv.style.display = loggedIn ? 'none' : 'flex';
-    if (lv) lv.style.display = loggedIn ? 'flex' : 'none';
-    if (loggedIn) {
-      const d = document.getElementById('nostrNpubDisplay');
-      if (d) d.textContent = auth.npubShort(state.nostrPubkey);
-      const inp = document.getElementById('displayNameInput');
-      if (inp) inp.value = state.nostrProfile?.name || '';
-    }
-  },
-
-  hideModal() {
-    const modal = document.getElementById('authModal');
-    if (modal) modal.style.display = 'none';
-  },
-
-  _afterLogin() {
-    const d = document.getElementById('nostrNpubDisplay');
-    if (d) d.textContent = auth.npubShort(state.nostrPubkey);
-    const cv = document.getElementById('nostrConnectView');
-    const lv = document.getElementById('nostrLoggedInView');
-    if (cv) cv.style.display = 'none';
-    if (lv) lv.style.display = 'flex';
-    const err = document.getElementById('nostrAuthError');
-    if (err) err.textContent = '';
-    const short = auth.npubShort(state.nostrPubkey);
-    const nameEl = document.getElementById('userPanelName');
-    const tagEl = document.getElementById('userPanelTag');
-    const avatarEl = document.getElementById('userPanelAvatar');
-    if (nameEl) nameEl.textContent = state.nostrProfile?.name || short;
-    if (tagEl) tagEl.textContent = short;
-    if (avatarEl) { const n = avatarEl.childNodes[0]; if (n?.nodeType === 3) n.textContent = (state.nostrProfile?.name || short)[0].toUpperCase(); }
-    document.getElementById('userStatusDot')?.classList.add('online');
-    document.dispatchEvent(new CustomEvent('nostr:login'));
-    setTimeout(() => auth.hideModal(), 1000);
-  },
-
-  _err(msg) {
-    const el = document.getElementById('nostrAuthError');
-    if (el) el.textContent = msg;
-  },
-
-  bindUI() {
-    const $ = id => document.getElementById(id);
-    const on = (id, fn) => { const el = $(id); if (el) el.addEventListener('click', fn); };
-
-    on('connectExtensionBtn', async () => {
-      try {
-        if (!window.nostr) throw new Error('No Nostr extension found');
-        await auth.loginWithExtension();
-        auth._afterLogin();
-      } catch (e) { auth._err(e.message); }
-    });
-
-    on('generateKeyBtn', () => {
-      try { auth.generateKey(); auth._afterLogin(); }
-      catch (e) { auth._err(e.message); }
-    });
-
-    on('importKeyBtn', () => {
-      const inp = $('importKeyInput');
-      const val = inp ? inp.value.trim() : '';
-      if (!val) { auth._err('Enter a key'); return; }
-      auth.importKey(val) ? auth._afterLogin() : auth._err('Invalid key');
-    });
-
-    on('copyNpubBtn', () => {
-      const pk = state.nostrPubkey;
-      if (pk) navigator.clipboard.writeText(window.NostrTools.nip19.npubEncode(pk)).catch(() => {});
-    });
-
-    on('saveDisplayNameBtn', async () => {
-      const inp = $('displayNameInput');
-      const val = inp ? inp.value.trim() : '';
-      if (!val) { auth._err('Enter a display name'); return; }
-      try {
-        await auth.setDisplayName(val);
-        if (inp) inp.value = val;
-      } catch (e) { auth._err(e.message); }
-    });
-
-    on('nostrLogoutBtn', () => { auth.logout(); auth.showModal(); });
-
-    const modal = document.getElementById('authModal');
-    if (modal) modal.addEventListener('click', (e) => { if (e.target === modal) auth.hideModal(); });
-
-    const avatarArea = document.querySelector('.user-avatar, .username-area, [data-action="show-auth"]');
-    if (avatarArea) avatarArea.addEventListener('click', () => auth.showModal());
-  },
-
-  _b2hex(bytes) { return Array.from(bytes).map(b => b.toString(16).padStart(2, '0')).join(''); },
-  _hex2b(hex) {
-    const a = new Uint8Array(hex.length / 2);
-    for (let i = 0; i < a.length; i++) a[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
-    return a;
-  }
-};
-
-window.__zellous.auth = auth;
-window.auth = auth;

package/src/legacy/nostr-bans.js

@@ -1,59 +0,0 @@
-var nostrBans = {
-  _store: new Map(),
-  _sub: null,
-
-  isBanned(serverId, pubkey) {
-    var bans = nostrBans._store.get(serverId) || {};
-    return !!(bans.banned || []).includes(pubkey);
-  },
-
-  isTimedOut(serverId, pubkey) {
-    var bans = nostrBans._store.get(serverId) || {};
-    var timeout = bans.timeouts && bans.timeouts[pubkey];
-    if (!timeout) return false;
-    return timeout.expiry > Math.floor(Date.now() / 1000);
-  },
-
-  subscribe(serverId) {
-    if (nostrBans._sub) { nostrNet.unsubscribe(nostrBans._sub); nostrBans._sub = null; }
-    if (!serverId) return;
-    var creator = serverId.split(':')[0];
-    if (!creator) return;
-    nostrBans._sub = 'bans-' + serverId;
-    nostrNet.subscribe(nostrBans._sub,
-      [{ kinds: [30078], authors: [creator], '#d': ['zellous-ban:' + serverId, 'zellous-timeout:' + serverId] }],
-      function(event) {
-        if (event.pubkey !== creator) return;
-        try {
-          var dTag = event.tags.find(function(t) { return t[0] === 'd'; });
-          if (!dTag || !dTag[1]) return;
-          var prefix = dTag[1].split(':')[0];
-          var banData = nostrBans._store.get(serverId) || { banned: [], timeouts: {} };
-          if (prefix === 'zellous-ban') {
-            var pubkey = dTag[1].split(':')[2];
-            if (pubkey && !banData.banned.includes(pubkey)) banData.banned.push(pubkey);
-          } else if (prefix === 'zellous-timeout') {
-            var pubkey = dTag[1].split(':')[2];
-            if (pubkey) {
-              var data = JSON.parse(event.content);
-              if (data.expiry > Math.floor(Date.now() / 1000)) {
-                if (!banData.timeouts) banData.timeouts = {};
-                banData.timeouts[pubkey] = { expiry: data.expiry };
-              } else if (banData.timeouts && banData.timeouts[pubkey]) {
-                delete banData.timeouts[pubkey];
-              }
-            }
-          }
-          nostrBans._store.set(serverId, banData);
-          if (window.__debug && window.__debug.bans) window.__debug.bans = Object.fromEntries(nostrBans._store);
-        } catch(e) {}
-      },
-      function() {}
-    );
-  }
-};
-
-window.__zellous.bans = nostrBans;
-window.nostrBans = nostrBans;
-if (!window.__debug) window.__debug = {};
-Object.defineProperty(window.__debug, 'bans', { get: function() { return Object.fromEntries(nostrBans._store); }, configurable: true });