domma-cms 0.116.0 → 0.116.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.116.0",
+  "version": "0.116.2",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/plugins/_lib/mail/imapPool.js

@@ -206,7 +206,7 @@ export function createPool(config) {
             } catch {
                 // Already down - nothing to close.
             }
-            return {ok: false, error: describeError(err)};
+            return {ok: false, error: describeError(err, connection)};
         }
     }
 
@@ -261,19 +261,52 @@ export function createPool(config) {
 }
 
 /**
- * Turn an IMAP/network error into something worth showing a user.
+ * Turn an IMAP/SMTP/network error into something worth showing a user.
  *
  * ImapFlow's own messages are decent but its auth failures surface as raw
- * server responses, which vary by server and read like a stack trace.
+ * server responses, which vary by server and read like a stack trace. TLS
+ * failures are worse: OpenSSL's text ("…:tls_validate_record_header:wrong
+ * version number:…") names nothing the user can change. nodemailer also wraps
+ * every socket error as `ESOCKET`, dropping the TLS code, so those are
+ * recognised by `reason`/message as well as by code.
  *
- * @param   {Error & {code?: string, authenticationFailed?: boolean}} err
+ * @param   {Error & {code?: string, reason?: string, authenticationFailed?: boolean}} err
+ * @param   {{host?: string, port?: number, secure?: boolean}} [connection] - what was tried, so the message can name it
  * @returns {string}
  */
-export function describeError(err) {
+export function describeError(err, connection = {}) {
     if (!err) return 'Unknown error.';
-    if (err.authenticationFailed) return 'The mail server rejected that username and password.';
+    if (err.authenticationFailed || err.code === 'EAUTH') return 'The mail server rejected that username and password.';
 
-    switch (err.code) {
+    const host = connection.host || 'The mail server';
+    const port = connection.port ? `Port ${connection.port}` : 'That port';
+    const text = `${err.reason || ''} ${err.message || ''}`;
+
+    // Implicit TLS against a port that starts in plain text (587, 143, 25):
+    // the "server hello" is a greeting line, which OpenSSL reads as a bad version.
+    if (err.code === 'ERR_SSL_WRONG_VERSION_NUMBER' || /wrong version number/i.test(text)) {
+        return connection.secure
+            ? `${port} does not start with TLS, so Implicit TLS must be off for it - ports 587 and 143 switch to TLS with STARTTLS. Untick Implicit TLS, or use the implicit-TLS port (465 to send, 993 to read).`
+            : `${port} answered in a different TLS mode from the one chosen. Check the port and the Implicit TLS setting.`;
+    }
+    if (['DEPTH_ZERO_SELF_SIGNED_CERT', 'SELF_SIGNED_CERT_IN_CHAIN'].includes(err.code) || /self[- ]signed certificate/i.test(text)) {
+        return `${host === 'The mail server' ? 'The mail server’s' : `${host}’s`} TLS certificate is self-signed, so the server cannot prove who it is. `
+            + `Install a trusted certificate (Let’s Encrypt, for example) that covers this hostname on the mail server. `
+            + `For a server you control, the plugin’s allowInsecureTLS setting accepts it instead.`;
+    }
+    if (err.code === 'ERR_TLS_CERT_ALTNAME_INVALID' || /altnames|does not match certificate/i.test(text)) {
+        return `The mail server’s TLS certificate does not cover ${connection.host || 'that hostname'}. Use the hostname the certificate was issued for, or reissue it to include this one.`;
+    }
+    if (err.code === 'CERT_HAS_EXPIRED' || /certificate has expired/i.test(text)) {
+        return 'The mail server’s TLS certificate has expired. It needs renewing on the server.';
+    }
+    if (['UNABLE_TO_VERIFY_LEAF_SIGNATURE', 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY'].includes(err.code) || /unable to (verify the first certificate|get local issuer)/i.test(text)) {
+        return 'The mail server’s TLS certificate could not be verified - it is missing its intermediate certificate, or was issued by an authority this server does not trust.';
+    }
+
+    // nodemailer reports these as ESOCKET/EDNS; the system code survives only in the message.
+    const netCode = text.match(/\b(ENOTFOUND|EAI_AGAIN|ECONNREFUSED|ETIMEDOUT|ECONNRESET)\b/)?.[1] ?? err.code;
+    switch (netCode) {
         case 'ENOTFOUND':
         case 'EAI_AGAIN':
             return 'That mail server hostname could not be resolved.';
@@ -282,11 +315,6 @@ export function describeError(err) {
         case 'ETIMEDOUT':
         case 'ECONNRESET':
             return 'The mail server did not respond in time.';
-        case 'CERT_HAS_EXPIRED':
-        case 'DEPTH_ZERO_SELF_SIGNED_CERT':
-        case 'SELF_SIGNED_CERT_IN_CHAIN':
-        case 'ERR_TLS_CERT_ALTNAME_INVALID':
-            return 'The mail server’s TLS certificate could not be verified.';
         default:
             return err.message || 'The mail server connection failed.';
     }

package/plugins/_lib/mail/send.js

@@ -13,6 +13,7 @@ import {createRequire} from 'node:module';
 import nodemailer from 'nodemailer';
 
 import {bareAddress, formatFrom} from '../admin/mail/identity.js';
+import {describeError} from './imapPool.js';
 import {normalisePriority, priorityHeaders} from './priority.js';
 
 // MailComposer is not on nodemailer's public export, but it is the piece that
@@ -389,7 +390,7 @@ export async function verifySmtp(transportConfig, allowInsecureTLS = false) {
         await transport.verify();
         return {ok: true};
     } catch (err) {
-        return {ok: false, error: err.message};
+        return {ok: false, error: describeError(err, transportConfig)};
     } finally {
         transport.close();
     }

package/plugins/free-tier.lock.json

@@ -1,6 +1,6 @@
 {
   "note": "Written by `make sync-free-tier` in dcms-marketplace. Do not edit these plugins here - edit them there and sync.",
-  "source": "dcms-marketplace@33c799d",
+  "source": "dcms-marketplace@149aff8",
   "plugins": {
     "blog": {
       "version": "1.9.4",
@@ -224,25 +224,25 @@
       }
     },
     "support": {
-      "version": "1.0.2",
+      "version": "1.1.0",
       "files": {
-        "CLAUDE.md": "a54f3af90bc273622e67d0da0502da39a9e0962633d43d82eebf1228cf996f79",
-        "admin/css/index.css": "43a792dbc08acafc9f79757ac96c3675a49abb39aab05a553c6871f6f2050a1e",
-        "admin/lib/kit.js": "bc52d8dfe031b470b49c51e7170d46689a6b2892871e53ec0d6a44f37a91afc1",
+        "CLAUDE.md": "ff42515f210dfdbeb1b14992012177ad8513323a340a0d4fe69a6ec13773db5a",
+        "admin/css/index.css": "bad02a487ebb131b64ee55e2a4533c8b79d6ada80fffd34b0952bf3b68204a36",
+        "admin/lib/kit.js": "22f02768625bcad9d9c8e64bf0a8fe95f7c5ff6dcf8abb189df8203362a7a4e1",
         "admin/templates/support.html": "2bb69d0443a367a402e6160fe68f4af3e8983b578cfff9575b4df9a534fcb480",
-        "admin/views/desk.js": "f0770c750dd340b83438c8f41b222b814c0937081201cb06b851a3fdea2952fd",
-        "admin/views/inbox.js": "53321d9efba883b7fb2b26fcfe72e902f484b9cb1eb85eb0e043b228a7035252",
-        "admin/views/support.js": "f5621fd99782e40d9faeeddf187c5c8b0412ee621ab53f03fb96d60b3f144478",
-        "collections/support-tickets.json": "aa1e6b4814fdfbbcd46d097edd93dfb838cc49f5232a86ba76b54c9b29d82ac5",
+        "admin/views/desk.js": "ac043630ad08c8f2053f3f908be18586d9a4798976d20427cf5215ee042c807c",
+        "admin/views/inbox.js": "f570595d7b2c831d151e0aaf85ff903e6e2b7066124b3f9d23c2c24f5b1734cf",
+        "admin/views/support.js": "360a50ff54b81f93fcd6fb6949710e0cff5d342bb8573408415ef3faf3fd29ff",
+        "collections/support-tickets.json": "55a0856bacd66c2e8f1e3c85bdf3638e5ff826560943cda854a8f2d336a88905",
         "config.js": "eb7ccc1169fa8b2be52a213536825492fedaec5fa73fd749cba9f498dd54b503",
         "lib/mail.js": "d14aae3a59aad6af61451863cdaaf94fc4a87810b16e1dcb9c655dda6c803b3b",
-        "lib/receiver.js": "ef958be2a8fadcec10169ff76f10404d395f9c6b401a51642ede9218547d6262",
-        "lib/sender.js": "71e9146729e443df401a1b84e9778e9243d057012462e48a05e32a73f7309aa2",
-        "lib/shape.js": "7bef95c823ee4c6d4041152a58fdb2279dbe6797710a89e1339f8aca60cd0f89",
-        "plugin.js": "7ff5ec08e469cc14aabca09c560d53d57d8c406eff44937c5464f8b60ae3b88f",
-        "plugin.json": "f41c2b77ab2f8986a67912c219b3a137af7fa500b5017d89ba43324a970d9508",
-        "tests/api.test.js": "c9483f1583d4449c6cb28624455b727e781063033878a79bd569162110980d36",
-        "tests/shape.test.js": "6d7b7a23dcb1933e4ed6e2f4b9fce2bf0b50125073f6ec60d15d6f2e6d7f8aa1"
+        "lib/receiver.js": "b95c569932c261a48849f0a6b7005f649d9c2a50d319b098a47d02da9363050c",
+        "lib/sender.js": "b20aaee34ade89814a897f68467f9902693843fa6b5c8eb0090c4059193c8227",
+        "lib/shape.js": "04d840b589d20700ccb2cfa4c72072f8d9f8e03f0573e2ea1177a7a83a383bea",
+        "plugin.js": "e3c50a05fa99cb24375782bbb3ca8c58cf5ddc3036937e6115f4d963715c120e",
+        "plugin.json": "e6efaf06f7f2c99b196909e56f0a0b6d65b438ffd6d616aa4207769861f9bd66",
+        "tests/api.test.js": "1fa87f6ae12c48fc34a5fb2b5bbeed6cfaa36329610674d4fae05d64734dbb15",
+        "tests/shape.test.js": "364c6b7680699f59fcd449cd448184486488838300f155135daea4c05387cf74"
       }
     }
   }

package/plugins/support/CLAUDE.md

@@ -39,6 +39,25 @@ registration by where it runs.
 - **The CMS version comes from the manager's registry** (`sites.json` `cmsVersion`), not the payload: a
   child site's package.json is the manager's, so its own answer is wrong.
 
+## Archive, remove and the row menus (1.1.0)
+
+Both screens are domma-reactive throughout (lists AND the request panel: the thread is a `data-each` over
+`threadRows()`, status/urgent/archived are computeds over the list's copy, so a move from a row menu shows in
+an open panel at once). Every row has ONE menu definition (`menuItems`) reached by right-click, the ⋮ kebab
+and Shift+F10 (`rowKeys()` in kit.js); click/Enter opens. The panel's thread has its own menu (copy; on the
+manager also "Quote in reply").
+
+- **Manager archive** = `data.archived` (PUT `/tickets/:id {archived}`), Domma's own filing: the site never
+  sees it, `/count` ignores archived requests, and `addTurn()` takes a request OUT of the archive when the
+  customer writes again (a close does not).
+- **Site shelf** = the outbox's `shelf` (`{ref: {state: archived|removed, dommaAt}}`), this site's own tidying
+  - Domma keeps every request. `applyShelf()` (pure) marks archived and drops removed, and either comes back
+  the moment `lastDommaAt` moves past the recorded `dommaAt`: a reply is never hidden. `remember()` prunes
+  entries Domma deleted or has written to since. Shelving marks the reply read. Removing a request that
+  never reached Domma (`discard()`) cancels it - it and its follow-ups leave the outbox. Writing to an
+  archived request unshelves it.
+- Manager **Delete** stays a real delete (with `deleted.json`); the confirm suggests archiving instead.
+
 ## Files
 
 - `plugin.js` - both route sets (see its header); `options.mode` / `mail` / `fetch` / `env` /

package/plugins/support/admin/css/index.css

@@ -36,6 +36,7 @@
 .sp-seg button { border: 1px solid var(--dm-border); background: none; color: var(--dm-text-secondary); border-radius: var(--dm-radius-full);
   padding: .2rem .7rem; font-size: var(--dm-font-size-sm); cursor: pointer; }
 .sp-seg button b { font-weight: 600; margin-left: .2rem; }
+.sp-seg button:focus-visible { outline: 2px solid var(--dm-primary); outline-offset: 1px; }
 .sp-seg button.is-on { background: var(--dm-primary-light); color: var(--dm-text); border-color: var(--dm-primary); }
 .sp-search { flex: 1; min-width: 12rem; max-width: 20rem; }
 
@@ -48,6 +49,8 @@
 .sp-main { flex: 1; min-width: 0; display: flex; flex-direction: column; }
 .sp-main strong { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .sp-main small { color: var(--dm-text-secondary); font-size: var(--dm-font-size-xs); }
+.sp-kebab { border: 0; background: none; color: var(--dm-text-secondary); cursor: pointer; font-size: 1.1rem; line-height: 1; padding: .2rem .4rem; border-radius: var(--dm-radius-md); flex: none; }
+.sp-kebab:hover, .sp-kebab:focus-visible { background: var(--dm-hover-bg); color: var(--dm-text); outline: none; }
 .sp-dot { width: .55rem; height: .55rem; border-radius: 50%; background: var(--dm-primary); flex: none; }
 .sp-urgent { font-size: var(--dm-font-size-xs); font-weight: 700; color: var(--dm-danger); text-transform: uppercase; letter-spacing: .03em; }
 .sp-chip { font-size: var(--dm-font-size-xs); font-weight: 600; padding: .12rem .55rem; border-radius: var(--dm-radius-full); white-space: nowrap;
@@ -55,6 +58,7 @@
 .sp-chip.is-info { background: color-mix(in srgb, var(--dm-info) 18%, transparent); }
 .sp-chip.is-warning { background: color-mix(in srgb, var(--dm-warning) 22%, transparent); }
 .sp-chip.is-success { background: color-mix(in srgb, var(--dm-success) 20%, transparent); }
+.sp-chip.is-muted { color: var(--dm-text-secondary); }
 .sp-chip.is-bad { background: color-mix(in srgb, var(--dm-danger) 20%, transparent); }
 
 /* Forms */

package/plugins/support/admin/lib/kit.js

@@ -1,7 +1,7 @@
 /**
  * Support admin - what both screens share: the admin's helpers (loaded at run
  * time; a plugin never imports admin/ statically - the updater replaces it),
- * the API, escaping, dates, slideovers and the conversation thread.
+ * the API, escaping, dates, slideovers, the row menus and the conversation thread.
  *
  * @module support/admin/lib/kit
  */
@@ -21,6 +21,10 @@ export function loadKit() {
             import('/admin/js/lib/help-popover.js').catch(() => ({}))
         ]).then(([tk, help]) => ({
             onceClosed: tk.onceClosed || ((so, fn) => { const c = so.close.bind(so); so.close = (...a) => { const r = c(...a); fn?.(); return r; }; }),
+            openMenuAt: tk.openMenuAt || ((el) => {
+                const r = el.getBoundingClientRect();
+                el.dispatchEvent(new MouseEvent('contextmenu', {bubbles: true, cancelable: true, clientX: r.left, clientY: r.bottom, view: window}));
+            }),
             viewLifetime: tk.viewLifetime || (() => ({add() {}, reset() {}})),
             helpPopovers: help.helpPopovers || (() => () => {})
         }));
@@ -38,6 +42,8 @@ export const api = {
     write: (ref, body) => H.post(`${BASE}/tickets/${seg(ref)}/messages`, {body}),
     close: (ref) => H.post(`${BASE}/tickets/${seg(ref)}/close`, {}),
     seen: (ref, at) => H.put(`${BASE}/tickets/${seg(ref)}/seen`, {at}),
+    /** `at`: Domma's latest reply as the screen showed it (omitted for an offline copy, which has none). */
+    shelf: (ref, state, at) => H.put(`${BASE}/tickets/${seg(ref)}/shelf`, {state, ...(at !== undefined && {at})}),
     // manager
     ticket: (id) => H.get(`${BASE}/tickets/${seg(id)}`),
     reply: (id, d) => H.post(`${BASE}/tickets/${seg(id)}/reply`, d),
@@ -88,17 +94,60 @@ export const telHref = (phone) => `tel:${String(phone || '').replace(/[^\d+]/g,
 export const TONE = {open: 'warning', answered: 'info', closed: 'success', waiting: 'warning', refused: 'bad'};
 
 /**
- * The conversation, oldest first, as HTML with every user string escaped.
- * `mine` says which side is "us" (customer on a site, domma on the manager).
+ * The conversation, oldest first, as rows for THREAD. `mine` says which side is
+ * "us" (customer on a site, domma on the manager).
  */
-export function threadHtml(messages = [], mine) {
-    if (!messages.length) return '<p class="sp-note">Nothing here yet.</p>';
-    return `<ol class="sp-thread">${messages.map(m => `
-<li class="sp-msg ${m.from === mine ? 'is-mine' : 'is-theirs'}${m.from === 'domma' ? ' is-domma' : ''}">
-  <div class="sp-msg-head"><strong>${esc(m.from === 'domma' ? `${m.name || 'Domma'} · Domma Support` : (m.name || 'Customer'))}</strong>
-    <small>${esc(stamp(m.at))}${m.pending ? ' · waiting to send' : ''}${m.refused ? ' · not accepted' : ''}</small></div>
-  <div class="sp-msg-body">${esc(m.body)}</div>
-</li>`).join('')}</ol>`;
+export function threadRows(messages = [], mine) {
+    return messages.map((m, i) => ({
+        key: m.id || `m${i}`,
+        cls: `${m.from === mine ? 'is-mine' : 'is-theirs'}${m.from === 'domma' ? ' is-domma' : ''}`,
+        who: m.from === 'domma' ? `${m.name || 'Domma'} · Domma Support` : (m.name || 'Customer'),
+        when: `${stamp(m.at)}${m.pending ? ' · waiting to send' : ''}${m.refused ? ' · not accepted' : ''}`,
+        body: m.body || ''
+    }));
+}
+
+/** The thread, bound to a `thread` observable of threadRows(). Text bindings only: nothing is parsed as HTML. */
+export const THREAD = `
+<p class="sp-note" data-bind-hidden="thread.value.length">Nothing here yet.</p>
+<ol class="sp-thread" data-each="thread.value key=key"><li class="sp-msg" data-bind-class="cls" data-key="{{key}}" tabindex="-1">
+  <div class="sp-msg-head"><strong data-bind-text="who"></strong><small data-bind-text="when"></small></div>
+  <div class="sp-msg-body" data-bind-text="body"></div>
+</li></ol>`;
+
+/** Copy text, with a toast either way. */
+export async function copyText(text, what = 'Copied') {
+    try {
+        await navigator.clipboard.writeText(String(text ?? ''));
+        E.toast(`${what}.`, {type: 'success'});
+    } catch {
+        E.toast('Your browser would not let us copy that.', {type: 'warning'});
+    }
+}
+
+/**
+ * The one way into a list's row menu besides right-click: the row's ⋮ button
+ * and Shift+F10. Click (or Enter) on the row itself does `primary`.
+ *
+ * @returns {Function} removes the listeners
+ */
+export function rowKeys(listEl, {rowSel, kebabSel, openMenuAt, primary}) {
+    const onClick = (e) => {
+        const row = e.target.closest(rowSel);
+        if (!row) return;
+        const kebab = e.target.closest(kebabSel);
+        if (kebab) { e.stopPropagation(); openMenuAt(kebab); return; }
+        primary(row.dataset.id);
+    };
+    const onKey = (e) => {
+        const row = e.target.closest(rowSel);
+        if (!row) return;
+        if ((e.key === 'F10' && e.shiftKey) || e.key === 'ContextMenu') { e.preventDefault(); openMenuAt(row); }
+        else if ((e.key === 'Enter' || e.key === ' ') && e.target === row) { e.preventDefault(); primary(row.dataset.id); }
+    };
+    listEl.addEventListener('click', onClick);
+    listEl.addEventListener('keydown', onKey);
+    return () => { listEl.removeEventListener('click', onClick); listEl.removeEventListener('keydown', onKey); };
 }
 
 /**