ciphermesh 2.3.0 → 2.4.0

package/README.md

@@ -95,6 +95,12 @@ Prefer a prebuilt image? Pull the relay from GHCR (published on each release):
 docker run -p 3600:3600 ghcr.io/felipekreulich/secret-chat-lan:latest
 ```
 
+**Hosting it publicly?** [`deploy/`](deploy/README.md) has a Caddy + Docker
+setup that gets a Let's Encrypt certificate automatically — clients then verify
+the server against a real CA (no trust-on-first-use window), and a host that
+once served a valid certificate can never be silently downgraded to a
+self-signed one.
+
 **No Node on the host?** Every release ships a standalone relay binary for
 macOS and Linux (arm64/x64) — download it from the
 [releases page](https://github.com/FelipeKreulich/secret-chat-lan/releases),
@@ -116,7 +122,10 @@ and use the `Internet` address from the banner — full walkthrough in
 Already in the chat? Run `/invite <your-ip>:3600` and send the string (or the
 QR code) to whoever you want to pull in.
 
-**No server at all?** `npm run p2p` — peers find each other via mDNS.
+**No server at all?** `npm run p2p` — peers find each other via mDNS. P2P mode
+now speaks nearly the same command set as the relay client (presence, `/lock`,
+`/contacts`, `/mentions`, `/topic`, encrypted history and more); only
+`/invite`, `/create` and `/nick` are relay-specific by nature.
 
 ## 💬 Commands
 
@@ -130,6 +139,8 @@ QR code) to whoever you want to pull in.
 | `/users` | Who's online (with away/status) |
 | `/msg <nick> <text>` | Private message (DM) |
 | `/reply <text>` | Reply quoting the last received message |
+| `/me <action>` | Third-person action — *«felipe is compiling»* |
+| `/watch [add\|remove\|clear]` | Alert on a keyword in **any** room, like a mention |
 | `/invite [host:port]` | Generate a `ciphermesh://` invite + QR code |
 | `/nick <new>` | Change nickname (before joining — recovers from "nickname taken") |
 | `/quit` | Leave |
@@ -146,6 +157,7 @@ QR code) to whoever you want to pull in.
 | `/create <room> <password>` | Create a **private room** 🔒 — see below |
 | `/rooms` | List rooms (🔒 marks private ones) |
 | `/room` | Current room + your buffer list |
+| `/topic [text\|clear]` | Show or set the room topic — shown in the status bar and synced to whoever joins later |
 | `/owner` | Room owner |
 | `/kick` `/mute` `/ban` | Owner moderation |
 
@@ -198,7 +210,8 @@ A green **✓** next to a name marks a SAS-verified peer; a red **✗** flags a
 | `/play [path]` | Play the last received voice note (`afplay`/`sox`/`ffplay`) |
 | `/accept [id]` / `/reject [id]` | Accept / decline an incoming file offer |
 | `/img [path]` | Render the last received image in **full resolution** (kitty/iTerm2) |
-| `/search <term>` | Search the encrypted local history |
+| `/search <term>` | Search the encrypted local history (on disk, across sessions) |
+| `/find [term]` — **Ctrl+F** | Search **this room's scrollback** and press Enter to **jump to the message**, highlighted |
 | `/history [n]` | Last n messages from history |
 | `/retention <7d\|24h\|30m>` | Purge local history older than the given age |
 | `/export [path]` | Export history as .txt or .json (plaintext!) |

package/README.pt-BR.md

@@ -95,6 +95,12 @@ Prefere imagem pronta? Baixe o relay do GHCR (publicado a cada release):
 docker run -p 3600:3600 ghcr.io/felipekreulich/secret-chat-lan:latest
 ```
 
+**Vai hospedar publicamente?** A pasta [`deploy/`](deploy/README.md) tem um
+setup com Caddy + Docker que pega certificado Let's Encrypt sozinho — aí os
+clientes verificam o servidor contra uma CA de verdade (sem janela de
+trust-on-first-use), e um host que já apresentou certificado válido nunca pode
+ser rebaixado silenciosamente para um self-signed.
+
 **Sem Node na máquina?** Todo release traz um binário standalone do relay para
 macOS e Linux (arm64/x64) — baixe da
 [página de releases](https://github.com/FelipeKreulich/secret-chat-lan/releases),
@@ -116,7 +122,10 @@ em [docs/SETUP.md](docs/SETUP.md).
 Já está no chat? Rode `/invite <seu-ip>:3600` e mande a string (ou o QR) pra
 quem você quiser puxar pra conversa.
 
-**Sem servidor nenhum?** `npm run p2p` — os peers se encontram via mDNS.
+**Sem servidor nenhum?** `npm run p2p` — os peers se encontram via mDNS. O modo
+P2P agora fala quase o mesmo conjunto de comandos do cliente relay (presença,
+`/lock`, `/contacts`, `/mentions`, `/topic`, histórico cifrado e mais); só
+`/invite`, `/create` e `/nick` são específicos do relay por natureza.
 
 ## 💬 Comandos
 
@@ -130,6 +139,8 @@ quem você quiser puxar pra conversa.
 | `/users` | Quem está online (com away/status) |
 | `/msg <nick> <texto>` | Mensagem privada (DM) |
 | `/reply <texto>` | Responde citando a última mensagem recebida |
+| `/me <ação>` | Ação em terceira pessoa — *«felipe está compilando»* |
+| `/watch [add\|remove\|clear]` | Alerta quando uma palavra aparece em **qualquer** sala, como uma menção |
 | `/invite [host:porta]` | Gera convite `ciphermesh://` + QR code |
 | `/nick <novo>` | Troca de apelido (antes de entrar — recupera de "apelido em uso") |
 | `/quit` | Sair |
@@ -146,6 +157,7 @@ quem você quiser puxar pra conversa.
 | `/create <sala> <senha>` | Cria uma **sala privada** 🔒 — veja abaixo |
 | `/rooms` | Lista salas (🔒 marca as privadas) |
 | `/room` | Sala atual + sua lista de buffers |
+| `/topic [texto\|clear]` | Mostra ou define o assunto da sala — aparece na barra de status e é sincronizado para quem entra depois |
 | `/owner` | Dono da sala |
 | `/kick` `/mute` `/ban` | Moderação (dono da sala) |
 
@@ -199,7 +211,8 @@ Um **✓** verde ao lado de um nome indica um peer verificado por SAS; um **✗*
 | `/accept [id]` / `/reject [id]` | Aceita / recusa uma oferta de arquivo recebida |
 | `/img [caminho]` | Renderiza a última imagem recebida em **alta resolução** (kitty/iTerm2) |
 | `/retention <7d\|24h\|30m>` | Purga o histórico local mais antigo que o tempo dado |
-| `/search <termo>` | Busca no histórico local cifrado |
+| `/search <termo>` | Busca no histórico local cifrado (em disco, entre sessões) |
+| `/find [termo]` — **Ctrl+F** | Busca **no histórico da sala na tela** e, com Enter, **salta para a mensagem** destacada |
 | `/history [n]` | Últimas n mensagens do histórico |
 | `/export [caminho]` | Exporta o histórico em .txt ou .json (texto plano!) |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ciphermesh",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Secure terminal chat for the local network (LAN) with real end-to-end encryption (E2EE) using libsodium",
   "type": "module",
   "main": "src/client/index.js",

package/src/client/ChatController.js

@@ -52,7 +52,13 @@ import { tipAt, TIPS } from '../shared/tips.js';
 import { setTheme, getThemeName, themeNames } from '../shared/themes.js';
 import { panicWipe } from '../shared/panic.js';
 import { farewellBanner } from '../shared/banner.js';
-import { parseDndWindow, shouldNotify, nowMinutes, mentionsMe } from '../shared/dnd.js';
+import {
+  parseDndWindow,
+  shouldNotify,
+  nowMinutes,
+  mentionsMe,
+  matchesKeyword,
+} from '../shared/dnd.js';
 import { saveLastSession } from '../shared/lastSession.js';
 import { COMMANDS } from './UI.js';
 
@@ -111,6 +117,7 @@ export class ChatController {
   #autoAwayTimer = null;
   #autoAwaySet = false; // whether the current away was set automatically
   #mentions = []; // session mention log: { nickname, text, room, at }
+  #watchWords = new Set(); // /watch — keywords that alert like a mention does
   #awayUnread = 0; // messages received while away
   #awayMentions = 0; // …of which mentioned me
   #autoLockMs = 0; // idle screen-lock timeout (0 = off)
@@ -232,6 +239,12 @@ export class ChatController {
       this.#ui.addSystemMessage(`Reconnecting in ${delay / 1000}s...`);
     });
 
+    this.#connection.on('cert-ca-valid', ({ issuer }) => {
+      this.#ui.addSystemMessage(
+        `TLS verified against a public CA (${issuer}) — no trust-on-first-use window`,
+      );
+    });
+
     this.#connection.on('cert-pinned', ({ fingerprint }) => {
       const fp = fingerprint ? fingerprint.slice(0, 17) + '...' : '?';
       this.#ui.addSystemMessage(`Server certificate pinned (trust on first use): ${fp}`);
@@ -466,6 +479,13 @@ export class ChatController {
           this.#ui.addErrorMessage(
             `${msg.message}. Use /nick <other> to pick a different nickname.`,
           );
+        } else if (typeof msg.message === 'string' && msg.message.startsWith('Protocol mismatch')) {
+          // Reconnecting cannot fix a version gap — say so instead of letting
+          // the user watch an endless retry loop.
+          this.#ui.addErrorMessage(msg.message);
+          this.#ui.addInfoMessage(
+            'Reconnecting will not help until both sides run the same version.',
+          );
         } else if (msg.code === ERR.ROOM_AUTH_FAILED || msg.code === ERR.ROOM_EXISTS) {
           // Join/create refused — drop the derived secrets for that attempt.
           freeRoomSecrets(this.#pendingRoomSecrets);
@@ -592,6 +612,7 @@ export class ChatController {
         owner,
         secrets,
         pins: [],
+        topic: null, // { text, by, at } — E2EE among members, never on the relay
       });
       this.#bufferOrder.push(room);
     }
@@ -645,6 +666,7 @@ export class ChatController {
     this.#currentRoomOwner = buf.owner;
     this.#ui.switchBuffer(room);
     this.#rebuildActivePeers();
+    this.#applyTopicToUI();
     this.#updateBufferBar();
     this.#updatePrivateIndicator();
     this.#saveLastSession(buf.private);
@@ -663,6 +685,11 @@ export class ChatController {
     this.#ui.setPeerNames([...this.#peers.values()].map((p) => p.nickname));
   }
 
+  #applyTopicToUI() {
+    const topic = this.#buffers.get(this.#currentRoom)?.topic;
+    this.#ui.setTopic(topic?.text || null);
+  }
+
   #updateBufferBar() {
     this.#ui.setBufferBar(
       this.#bufferOrder.map((room) => {
@@ -761,6 +788,23 @@ export class ChatController {
     if (this.#away || this.#statusText) {
       this.#sendPayloadToPeer(peer.sessionId, this.#presencePayload());
     }
+
+    // …nor the room topic. Everyone who has it answers; the timestamp settles
+    // any disagreement, and `silent` keeps the sync out of the chat log.
+    const topic = this.#buffers.get(room)?.topic;
+    if (topic) {
+      this.#sendPayloadToPeer(
+        peer.sessionId,
+        JSON.stringify({
+          action: 'set_topic',
+          room,
+          text: topic.text,
+          at: topic.at,
+          silent: true,
+          sentAt: Date.now(),
+        }),
+      );
+    }
   }
 
   // One-time-per-session nudge to verify an unverified peer's identity.
@@ -1144,6 +1188,33 @@ export class ChatController {
         return;
       }
 
+      if (data.action === 'set_topic') {
+        const buf = this.#buffers.get(msgRoom);
+        if (buf && typeof data.text === 'string') {
+          const at = Number(data.at) || 0;
+          // Last write wins. On join everyone who knows the topic answers, so
+          // the timestamp is what keeps those replies from fighting.
+          if (!buf.topic || at >= buf.topic.at) {
+            const text = data.text.slice(0, 200);
+            const changed = buf.topic?.text !== text;
+            buf.topic = { text, by: peer.nickname, at };
+            if (msgRoom === this.#currentRoom) {
+              this.#applyTopicToUI();
+            }
+            if (changed && !data.silent) {
+              this.#ui.toBuffer(msgRoom, () => {
+                this.#ui.addSystemMessage(
+                  text
+                    ? `📋 ${peer.nickname} set the topic of #${msgRoom}: ${text}`
+                    : `📋 ${peer.nickname} cleared the topic of #${msgRoom}`,
+                );
+              });
+            }
+          }
+        }
+        return;
+      }
+
       if (data.action === 'pin_message') {
         const pins = roomActive ? this.#pinnedMessages : this.#buffers.get(msgRoom)?.pins;
         pins?.push({
@@ -1194,7 +1265,14 @@ export class ChatController {
         });
       }
 
-      const mentioned = this.#mentionsMe(data.text) && !data.isDM;
+      const watchHit = this.#matchedWatch(data.text);
+      // A watched keyword deserves the same attention a mention gets.
+      const mentioned = (this.#mentionsMe(data.text) || !!watchHit) && !data.isDM;
+      if (watchHit) {
+        this.#ui.toBuffer(msgRoom, () => {
+          this.#ui.addSystemMessage(`👁 "${watchHit}" mentioned by ${peer.nickname} in #${msgRoom}`);
+        });
+      }
       if (mentioned) {
         this.#mentions.push({
           nickname: peer.nickname,
@@ -1225,15 +1303,17 @@ export class ChatController {
         if (data.replyTo?.nickname && typeof data.replyTo.excerpt === 'string') {
           this.#ui.addQuoteLine(String(data.replyTo.nickname), data.replyTo.excerpt.slice(0, 80));
         }
-        ({ lineIndex } = this.#ui.addMessage(
-          peer.nickname,
-          data.text,
-          !!data.isDM,
-          ephLabel,
-          isDeniable || !!data.deniable,
-          mentioned,
-          trust,
-        ));
+        ({ lineIndex } = data.isAction
+          ? this.#ui.addActionMessage(peer.nickname, data.text)
+          : this.#ui.addMessage(
+              peer.nickname,
+              data.text,
+              !!data.isDM,
+              ephLabel,
+              isDeniable || !!data.deniable,
+              mentioned,
+              trust,
+            ));
       });
       this.#noteBufferUnread(msgRoom, mentioned);
       const notify = shouldNotify(this.#dndMode, this.#dndWindow, nowMinutes(), mentioned);
@@ -1288,6 +1368,16 @@ export class ChatController {
     return mentionsMe(text, this.#nickname);
   }
 
+  // The first /watch keyword present in the text, or null.
+  #matchedWatch(text) {
+    for (const word of this.#watchWords) {
+      if (matchesKeyword(text, word)) {
+        return word;
+      }
+    }
+    return null;
+  }
+
   // ── User input handling ───────────────────────────────────────
   #handleUserInput(text) {
     this.#noteActive();
@@ -1311,7 +1401,9 @@ export class ChatController {
         this.#ui.addInfoMessage('  /users               - List online users');
         this.#ui.addInfoMessage('  /msg <nick> <text>   - Send a private message (DM)');
         this.#ui.addInfoMessage('  /reply <text>        - Reply to the last received message');
+        this.#ui.addInfoMessage('  /me <action>         - Third-person action message');
         this.#ui.addInfoMessage('  /mentions [n]        - Recent mentions of you (this session)');
+        this.#ui.addInfoMessage('  /watch [add|remove|clear] - Alert on a keyword in any room');
         this.#ui.addInfoMessage('  /contacts [add|remove|all] - Contact book (aliases for peers)');
         this.#ui.addInfoMessage(
           '  /away [reason]       - Mark yourself as away (unreads are counted)',
@@ -1323,6 +1415,7 @@ export class ChatController {
         this.#ui.addInfoMessage('  /status <text|off>   - Set a status (accepts :emoji:)');
         this.#ui.addInfoMessage('  /join <room> [pass]  - Join a room as a new buffer (Alt+1..9)');
         this.#ui.addInfoMessage('  /leave [room]        - Leave a room (its buffer closes)');
+        this.#ui.addInfoMessage('  /topic [text|clear]  - Show or set the room topic');
         this.#ui.addInfoMessage('  /create <room> <pass> - Create a private room 🔒');
         this.#ui.addInfoMessage('  /invite [host:port]  - Generate an invite with QR code');
         this.#ui.addInfoMessage('  /rooms               - List available rooms');
@@ -1346,6 +1439,7 @@ export class ChatController {
           '  /dnd [on|off|mentions|HH:MM-HH:MM] - Do not disturb / mentions only',
         );
         this.#ui.addInfoMessage('  /search <term>       - Search the encrypted local history');
+        this.#ui.addInfoMessage('  /find [term]         - Find in this room and jump (Ctrl+F)');
         this.#ui.addInfoMessage('  /history [n]         - Last n messages from history');
         this.#ui.addInfoMessage('  /export [path]       - Export the history (.txt or .json)');
         this.#ui.addInfoMessage('  /audit [N]           - Show the last N audit events');
@@ -1818,6 +1912,83 @@ export class ChatController {
         break;
       }
 
+      case '/topic': {
+        const buf = this.#buffers.get(this.#currentRoom);
+        const newTopic = parts.slice(1).join(' ').trim();
+
+        if (!newTopic) {
+          const t = buf?.topic;
+          this.#ui.addInfoMessage(
+            t?.text
+              ? `Topic of #${this.#currentRoom}: ${t.text}  (set by ${t.by})`
+              : `#${this.#currentRoom} has no topic. Set one with /topic <text>`,
+          );
+          break;
+        }
+
+        const text = newTopic === 'clear' ? '' : applyShortcodes(newTopic).slice(0, 200);
+        const at = Date.now();
+        if (buf) {
+          buf.topic = { text, by: this.#nickname, at };
+        }
+        this.#applyTopicToUI();
+        this.#paceOrSend(
+          JSON.stringify({ action: 'set_topic', room: this.#currentRoom, text, at, sentAt: at }),
+        );
+        this.#ui.addSystemMessage(
+          text ? `📋 You set the topic: ${text}` : '📋 You cleared the topic',
+        );
+        break;
+      }
+
+      case '/me': {
+        const actionText = parts.slice(1).join(' ').trim();
+        if (!actionText) {
+          this.#ui.addErrorMessage('Usage: /me <action>  — e.g. /me is compiling');
+          break;
+        }
+        this.#sendMessageToAll(actionText, null, true);
+        break;
+      }
+
+      case '/watch': {
+        const sub = (parts[1] || 'list').toLowerCase();
+        if (sub === 'add') {
+          const word = parts.slice(2).join(' ').trim();
+          if (!word) {
+            this.#ui.addErrorMessage('Usage: /watch add <keyword>');
+            break;
+          }
+          this.#watchWords.add(word.toLowerCase());
+          this.#ui.addInfoMessage(`Watching for "${word.toLowerCase()}" in every room`);
+          break;
+        }
+        if (sub === 'remove' || sub === 'rm') {
+          const word = parts.slice(2).join(' ').trim().toLowerCase();
+          if (this.#watchWords.delete(word)) {
+            this.#ui.addInfoMessage(`No longer watching "${word}"`);
+          } else {
+            this.#ui.addErrorMessage(`"${word}" is not being watched`);
+          }
+          break;
+        }
+        if (sub === 'clear') {
+          this.#watchWords.clear();
+          this.#ui.addInfoMessage('Watch list cleared');
+          break;
+        }
+        if (sub !== 'list') {
+          this.#ui.addErrorMessage('Usage: /watch [add <word> | remove <word> | clear]');
+          break;
+        }
+        if (this.#watchWords.size === 0) {
+          this.#ui.addInfoMessage('Not watching any keyword. Use /watch add <word>');
+          break;
+        }
+        this.#ui.addInfoMessage(`Watching: ${[...this.#watchWords].join(', ')}`);
+        break;
+      }
+
       case '/mentions': {
         if (this.#mentions.length === 0) {
           this.#ui.addInfoMessage('No mentions in this session yet.');
@@ -2000,6 +2171,13 @@ export class ChatController {
         break;
       }
 
+      case '/find': {
+        const term = parts.slice(1).join(' ').trim();
+        // Opens the same overlay as Ctrl+F, pre-filled when a term is given.
+        this.#ui.openFinder(term);
+        break;
+      }
+
       case '/search': {
         if (!this.#historyStore?.isOpen) {
           this.#ui.addErrorMessage('History disabled — start the client with a passphrase');
@@ -2019,6 +2197,11 @@ export class ChatController {
         for (const e of results) {
           this.#ui.addInfoMessage(`  ${this.#formatHistoryEntry(e)}`);
         }
+        // /search reads the on-disk history (possibly from other sessions);
+        // point at the navigable finder for what is actually on screen.
+        this.#ui.addInfoMessage(
+          `Tip: /find ${term} (or Ctrl+F) searches this room's scrollback and jumps to the message.`,
+        );
         break;
       }
 
@@ -3090,7 +3273,7 @@ export class ChatController {
   }
 
   // ── Send encrypted message to all peers ───────────────────────
-  #sendMessageToAll(text, replyTo = null) {
+  #sendMessageToAll(text, replyTo = null, isAction = false) {
     if (!this.#connection.connected) {
       this.#ui.addErrorMessage('No connection to the server — message not sent');
       return;
@@ -3107,6 +3290,9 @@ export class ChatController {
       sentAt: Date.now(),
       messageId,
     };
+    if (isAction) {
+      msgObj.isAction = true;
+    }
     if (replyTo) {
       msgObj.replyTo = replyTo;
     }
@@ -3135,13 +3321,9 @@ export class ChatController {
       this.#ui.addQuoteLine(replyTo.nickname, replyTo.excerpt, true);
     }
     const ephLabel = this.#ephemeralMode ? this.#formatDuration(this.#ephemeralDurationMs) : null;
-    const { lineIndex } = this.#ui.addMessage(
-      this.#nickname,
-      text,
-      false,
-      ephLabel,
-      this.#deniableMode,
-    );
+    const { lineIndex } = isAction
+      ? this.#ui.addActionMessage(this.#nickname, text)
+      : this.#ui.addMessage(this.#nickname, text, false, ephLabel, this.#deniableMode);
 
     if (this.#ephemeralMode) {
       this.#scheduleEphemeralRemoval(lineIndex, this.#ephemeralDurationMs, this.#nickname);

package/src/client/Connection.js

@@ -11,6 +11,7 @@ export class Connection extends EventEmitter {
   #connected;
   #pinStore;
   #host;
+  #caValidated = false;
 
   constructor(url) {
     super();
@@ -28,6 +29,12 @@ export class Connection extends EventEmitter {
 
   // Trust-on-first-use pin of the server TLS certificate. Emits 'cert-pinned'
   // on first sight and 'cert-mismatch' if it later changes (possible MITM).
+  //
+  // A publicly hosted relay presents a cert signed by a real CA (Let's Encrypt
+  // et al). Node still runs the full chain + hostname check even with
+  // rejectUnauthorized:false, so `socket.authorized` tells us which world we
+  // are in: CA-valid needs no TOFU window at all (strictly stronger), while a
+  // self-signed LAN cert keeps the pin-on-first-use behaviour.
   #checkCertPin() {
     if (!this.#url.startsWith('wss://')) {
       return;
@@ -35,6 +42,18 @@ export class Connection extends EventEmitter {
     const socket = this.#ws?._socket;
     const cert = socket?.getPeerCertificate?.();
     const fingerprint = cert?.fingerprint256 || null;
+
+    if (socket?.authorized === true) {
+      this.#caValidated = true;
+      // Remember it: from now on this host is verified strictly, and a
+      // legitimate CA cert renewal no longer trips the TOFU alarm.
+      this.#pinStore.markCAValidated(this.#host);
+      this.#pinStore.repin(this.#host, fingerprint);
+      this.emit('cert-ca-valid', { host: this.#host, issuer: cert?.issuer?.O || 'CA' });
+      return;
+    }
+
+    this.#caValidated = false;
     const result = this.#pinStore.check(this.#host, fingerprint);
     if (result === PinResult.PINNED) {
       this.emit('cert-pinned', { host: this.#host, fingerprint });
@@ -53,7 +72,13 @@ export class Connection extends EventEmitter {
   }
 
   #createSocket() {
-    const opts = this.#url.startsWith('wss://') ? { rejectUnauthorized: false } : {};
+    // Hosts that already proved they have a CA-signed certificate are verified
+    // strictly from then on — an attacker cannot downgrade a hosted relay to a
+    // self-signed cert. Everything else (LAN/Tailscale self-signed) connects
+    // with verification relaxed and is protected by TOFU pinning instead.
+    const opts = this.#url.startsWith('wss://')
+      ? { rejectUnauthorized: this.#pinStore.requiresStrictTLS(this.#host) }
+      : {};
     this.#ws = new WebSocket(this.#url, opts);
 
     this.#ws.on('open', () => {
@@ -104,6 +129,11 @@ export class Connection extends EventEmitter {
     }, this.#reconnectDelay);
   }
 
+  /** True when the server's TLS cert validated against a public CA. */
+  get isCAValidated() {
+    return this.#caValidated;
+  }
+
   send(msg) {
     if (this.#connected && this.#ws.readyState === WebSocket.OPEN) {
       this.#ws.send(JSON.stringify(msg));

package/src/client/FileTransfer.js

@@ -71,7 +71,38 @@ export class FileTransfer {
     // Compute SHA-256
     const sha256 = await this.#computeSHA256(absPath);
 
-    // Send file_offer
+    // Register the transfer BEFORE announcing it. The peer can accept the
+    // instant the offer lands — on a fast LAN that easily beats reading a
+    // large file off disk — and an accept that finds no transfer would be
+    // dropped silently, killing the transfer at the accept timeout.
+    let resolveP;
+    const done = new Promise((r) => {
+      resolveP = r;
+    });
+
+    const acceptTimer = setTimeout(() => {
+      this.#outgoing.delete(transferId);
+      callbacks.onError(`${fileName}: offer was not accepted in time`);
+      resolveP();
+    }, this.#acceptTimeoutMs);
+    if (acceptTimer.unref) {
+      acceptTimer.unref();
+    }
+
+    this.#outgoing.set(transferId, {
+      interval: null,
+      resolve: resolveP,
+      chunks: null, // filled in once the file is read
+      skip: new Set(),
+      pending: true,
+      acceptedEarly: false, // accepted while we were still reading
+      acceptTimer,
+      broadcastFn,
+      callbacks,
+      fileName,
+      totalChunks,
+    });
+
     broadcastFn({
       action: 'file_offer',
       transferId,
@@ -87,29 +118,19 @@ export class FileTransfer {
     // (so files are never pushed without consent).
     const chunks = await this.#readChunks(absPath);
 
-    return new Promise((resolveP) => {
-      const acceptTimer = setTimeout(() => {
-        this.#outgoing.delete(transferId);
-        callbacks.onError(`${fileName}: offer was not accepted in time`);
-        resolveP();
-      }, this.#acceptTimeoutMs);
-      if (acceptTimer.unref) {
-        acceptTimer.unref();
-      }
+    const transfer = this.#outgoing.get(transferId);
+    if (!transfer) {
+      return done; // rejected or timed out while we were reading
+    }
+    transfer.chunks = chunks;
 
-      this.#outgoing.set(transferId, {
-        interval: null,
-        resolve: resolveP,
-        chunks,
-        skip: new Set(),
-        pending: true,
-        acceptTimer,
-        broadcastFn,
-        callbacks,
-        fileName,
-        totalChunks,
-      });
-    });
+    // The peer already said yes — start now that the bytes are ready.
+    if (transfer.acceptedEarly) {
+      transfer.pending = false;
+      this.#beginStreaming(transferId);
+    }
+
+    return done;
   }
 
   /** Receiver accepted the offer — start streaming (honouring resume `have`). */
@@ -118,7 +139,6 @@ export class FileTransfer {
     if (!transfer || !transfer.pending) {
       return;
     }
-    transfer.pending = false;
     clearTimeout(transfer.acceptTimer);
     if (Array.isArray(data.have)) {
       for (const i of data.have) {
@@ -127,6 +147,15 @@ export class FileTransfer {
         }
       }
     }
+
+    // Accepted before the file finished being read: remember the consent and
+    // let initSend start streaming as soon as the chunks are ready.
+    if (!transfer.chunks) {
+      transfer.acceptedEarly = true;
+      return;
+    }
+
+    transfer.pending = false;
     this.#beginStreaming(data.transferId);
   }