dsh-composer-plus 1.24.0 → 1.25.0

package/tether/gateway/admin.html

@@ -193,6 +193,11 @@ function render(s) {
   put('devices', s.devices.map(d => '<tr><td><span class="dot ' + (d.connections ? 'ok' : '') + '"></span>' + esc(d.name) +
     ' <span class="mute">' + (d.connections ? 'online' : d.lastSeenAt ? 'last seen ' + esc(when(d.lastSeenAt)) : 'never connected') + '</span>' +
     (d.createdAt ? '<br><span class="sub">Paired ' + esc(new Date(d.createdAt).toLocaleDateString()) + '</span>' : '') +
+    // Notifications while Tether is closed: on, off (the phone sent no device token), or why the last push failed.
+    (s.pushKey ? '<br><span class="sub">' + (d.pushFail ? 'Last push failed: ' + esc(d.pushFail.reason) + ' (' + esc(when(d.pushFail.at)) + ')'
+      : d.push ? 'Notifications while Tether is closed: on'
+      : d.pushReason ? 'Notifications while Tether is closed: off. The iPhone says: ' + esc(d.pushReason)
+      : 'Notifications while Tether is closed: off. In Tether, turn on Settings › Send notifications.') + '</span>' : '') +
     '</td><td><button class="link" data-revoke="' + esc(d.id) + '" data-name="' + esc(d.name) + '" aria-label="Remove ' + esc(d.name) + '">Remove</button></td></tr>').join('')
     || '<tr><td class="mute">No iPhone yet.</td></tr>')
   // An older gateway (before a dsh restart) has no Tailscale only setting and no log: hide them.

package/tether/gateway/server.mjs

@@ -51,7 +51,7 @@ export const PLUS = new Map([
   ['queue-move', ['POST']], ['queue-edit', ['POST']], ['branches', ['GET']], ['predict', ['POST']], ['complete', ['POST']], ['improve', ['POST']], ['unread', ['GET', 'POST']],
   ['worktrees', ['GET', 'POST']], ['new-session-workspace', ['POST']], ['memory-edit', ['GET', 'POST']], ['memory-history', ['GET', 'POST']], ['memory-export', ['POST']], ['memory-copy', ['GET', 'POST']], ['memory-stale', ['GET']], ['memory-chat', ['GET', 'POST']], ['memory-suggest', ['POST']], ['handoff', ['POST']], ['context', ['GET']],
   ['board-chats', ['GET', 'POST']], ['board-progress', ['GET']], ['secret-answer', ['GET', 'POST']], ['side-chat', ['GET', 'POST']],
-  ['issue-report', ['POST']], ['assistant', ['GET']],
+  ['issue-report', ['POST']], ['assistant', ['GET']], ['assistant-status', ['GET']],
 ])
 /** Allow for this chat: an Auto Review ask (`approval/request` with this reason) for a tool that the chat granted. */
 export const AUTO_REVIEW_ASK = 'Auto review denied tool '
@@ -125,6 +125,26 @@ function reply(res, status, obj) {
   res.writeHead(status, { 'content-type': 'application/json', 'cache-control': 'no-store' })
   res.end(JSON.stringify(obj))
 }
+const escHtml = (s) => String(s).replace(/[&<>"']/g, (c) => `&#${c.charCodeAt(0)};`)
+/** A message of the relay as a page: in the middle of the window, in dsh's light or dark colors, with no script.
+ * `retry`: a link that loads the same address again (for a computer that was asleep). */
+function messagePage(title, hint, retry) {
+  return `<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>${escHtml(title)}</title><style>
+:root{color-scheme:light dark;--bg:#fff;--fg:#0f1115;--sub:#61666b;--line:rgba(0,0,0,.12)}
+@media (prefers-color-scheme:dark){:root{--bg:#151517;--fg:#f9fafb;--sub:#cfd3d6;--line:rgba(255,255,255,.16)}}
+html,body{height:100%;margin:0}
+body{display:grid;place-items:center;padding:24px;box-sizing:border-box;background:var(--bg);color:var(--fg);font:14px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif}
+main{max-width:420px;text-align:center}
+svg{color:var(--sub)}
+h1{font-size:17px;font-weight:600;line-height:1.35;margin:12px 0 6px}
+p{margin:0;color:var(--sub)}
+a{display:inline-block;margin-top:20px;padding:6px 16px;border:.5px solid var(--line);border-radius:8px;background:rgba(127,127,127,.12);color:var(--fg);font-size:13px;font-weight:500;text-decoration:none}
+a:hover{background:rgba(127,127,127,.2)}
+</style></head><body><main>
+<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="3" y="4.5" width="18" height="12" rx="2"/><path d="M8.5 20h7M12 16.5V20"/></svg>
+<h1>${escHtml(title)}</h1>${hint ? `<p>${escHtml(hint)}</p>` : ''}${retry ? '<a href="">Try again</a>' : ''}
+</main></body></html>`
+}
 function readBody(req, max) {
   return new Promise((ok, bad) => {
     const parts = []; let n = 0
@@ -337,11 +357,16 @@ export function createRelay({ host, port, fp, token, ticketTtlMs = 60e3, onUnaut
     return site === undefined || site === 'same-origin' || site === 'none'
   }
   const ancestors = ["'self'", ...frameAncestors].join(' ')
-  const text = (res, status, body) => { if (!res.headersSent) res.writeHead(status, { 'content-type': 'text/plain; charset=utf-8', 'cache-control': 'no-store' }); res.end(body) }
+  // The relay's own message: a page for a browser that asks for HTML (the window, dsh's Browser tab), else plain text.
+  const text = (res, status, title, hint = '', retry = false) => {
+    const html = /text\/html/.test(res.req?.headers?.accept ?? '')
+    if (!res.headersSent) res.writeHead(status, html ? { 'content-type': 'text/html; charset=utf-8', 'cache-control': 'no-store', 'content-security-policy': `default-src 'none'; style-src 'unsafe-inline'; frame-ancestors ${ancestors}` } : { 'content-type': 'text/plain; charset=utf-8', 'cache-control': 'no-store' })
+    res.end(html ? messagePage(title, hint, retry) : hint ? `${title} ${hint}` : title)
+  }
   const next = (req) => ({ agent, headers: hopHeaders(req.headers, { host: `${host}:${port}`, authorization: `Bearer ${token}`, ...(req.headers.origin !== undefined ? { origin: `https://${host}:${port}` } : {}) }) })
   // The computer no longer knows this Mac (it removed it, or the token is too old): say so, and drop the computer's answer.
   const status = (code) => { if (code === 401) { onUnauthorized?.(); return 'skip' } }
-  const UNPAIRED = 'That Mac removed this one, or the pairing is too old. Remove it in Settings → Composer Plus → Remote computers and pair again.'
+  const UNPAIRED = ['That Mac removed this one, or the pairing is too old.', 'Remove it in Settings → Composer Plus → Remote computers and pair again.']
   async function onRequest(req, res) {
     if (!trusted(req)) return text(res, 403, 'Forbidden')
     const url = new URL(req.url, 'http://x')
@@ -349,7 +374,7 @@ export function createRelay({ host, port, fp, token, ticketTtlMs = 60e3, onUnaut
     if (ticket !== null) {
       const exp = tickets.get(ticket)
       tickets.delete(ticket) // one use, also when it is too old
-      if (req.method !== 'GET' || url.pathname !== '/' || exp === undefined || exp < Date.now()) return text(res, 403, 'This link was already used or is too old. Pick the computer again.')
+      if (req.method !== 'GET' || url.pathname !== '/' || exp === undefined || exp < Date.now()) return text(res, 403, 'This link was already used or is too old.', 'Pick the computer again.')
       res.writeHead(303, { location: './', 'cache-control': 'no-store', 'referrer-policy': 'no-referrer', 'content-security-policy': `frame-ancestors ${ancestors}`, 'set-cookie': `${cookieName()}=${cookieValue}; Path=/; HttpOnly; SameSite=Strict` })
       return res.end()
     }
@@ -360,8 +385,13 @@ export function createRelay({ host, port, fp, token, ticketTtlMs = 60e3, onUnaut
     if (url.pathname.startsWith(RELAY_OWN)) return ownPath(req, res, url.pathname.slice(RELAY_OWN.length))
     let unpaired = false
     await pipeHttp(req, res, next(req), { onStatus: (code) => { const r = status(code); if (r === 'skip') unpaired = true; return r },
-      onError: (r) => text(r, 502, fail === 'pin' ? 'This computer shows another certificate. Pair it again in dsh.' : 'This computer does not answer over Tailscale. Make sure that it is awake and that Tailscale is on.') })
-    if (unpaired) text(res, 401, UNPAIRED)
+      onError: (r) => {
+        // A page (not a fetch) got the relay's own page in place of dsh: this Mac loads the computer again at the next pick.
+        if (/text\/html/.test(req.headers.accept ?? '')) peer?.signal({ failed: fail ?? 'unreachable' })
+        return fail === 'pin' ? text(r, 502, 'This computer shows another certificate.', 'Pair it again in dsh.')
+          : text(r, 502, 'This computer does not answer over Tailscale.', 'Make sure that it is awake and that Tailscale is on.', true)
+      } })
+    if (unpaired) text(res, 401, ...UNPAIRED)
   }
   /** The other Mac's page (in this Mac's window) reads this Mac's computers and switches the window: nothing else. */
   async function ownPath(req, res, name) {
@@ -594,6 +624,7 @@ export function createGateway(opts = {}) {
   // A Remote computers front door has no phones.
   const apns = computer ? {} : opts.apns ? { push: apnsSender(opts.apns, { origin: opts.apns.origin }) } : loadApns(join(dir, 'apns.json'))
   const pushTo = () => apns.push ? devices.filter(d => d.push?.on === true && typeof d.push.token === 'string') : []
+  const pushFails = new Map() // device id → { reason, at } of its last failed push (memory only)
   /** One alert to each phone that wants this Mac's notifications now (switched on, inside its hours). The subtitle names
    * this Mac and the chat's project; the body is the chat's title, then `detail` (the reply, tool, question or error).
    * `opts.about(sessionId)` gives `{ chat, project }` (the Host half); without it the subtitle is the Mac name only. */
@@ -610,6 +641,8 @@ export function createGateway(opts = {}) {
     for (const d of to) {
       const token = d.push.token
       apns.push.send(token, d.push.sandbox === true, { aps: { alert: { title, subtitle, body }, sound: 'default' } }).then(r => {
+        // The Mac page shows why the last push to this phone failed (no secret in it: APNs' reason or the HTTP status).
+        if (r.status === 200) pushFails.delete(d.id); else pushFails.set(d.id, { reason: String(r.reason || (r.status ? 'HTTP ' + r.status : 'no answer')).slice(0, 100), at: new Date().toISOString() })
         // The app left the iPhone (or the token is not for this app): forget the token; the phone sends a new one.
         if ((r.status === 410 || r.reason === 'BadDeviceToken') && d.push?.token === token) { delete d.push.token; saveDevices() }
       }, () => {})
@@ -622,7 +655,9 @@ export function createGateway(opts = {}) {
     const mins = v => Number.isInteger(v) && v >= 0 && v < 1440
     const hours = b?.hours === null ? null : mins(b?.hours?.from) && mins(b.hours.to) && typeof b.hours.tz === 'string' && b.hours.tz.length <= 64 ? { from: b.hours.from, to: b.hours.to, tz: b.hours.tz } : undefined
     if (typeof b?.on !== 'boolean' || (b.on && (!/^[0-9a-f]{64,200}$/i.test(b.token ?? '') || typeof b.sandbox !== 'boolean' || hours === undefined))) return reply(res, 400, { error: 'bad request' })
-    dev.push = b.on ? { on: true, token: b.token.toLowerCase(), sandbox: b.sandbox, hours } : { on: false }
+    // Switched on but no device token: the phone says why (iOS's error), and the Mac page shows it.
+    const reason = !b.on && typeof b.reason === 'string' && b.reason.trim() !== '' ? b.reason.trim().slice(0, 200) : undefined
+    dev.push = b.on ? { on: true, token: b.token.toLowerCase(), sandbox: b.sandbox, hours } : { on: false, ...(reason ? { reason } : {}) }
     saveDevices()
     reply(res, 200, { push: b.on })
   }
@@ -1027,7 +1062,9 @@ export function createGateway(opts = {}) {
     pending: [...pending.values()].map(({ id, name, ip, at }) => ({ id, name, ip, at, expiresAt: new Date(at + approveTtl).toISOString() })),
     last: last && Date.now() - last.at < 60e3 ? { ...last, at: new Date(last.at).toISOString() } : null,
     // The APNs device token stays here: the Mac page shows only whether the phone gets pushes.
-    devices: devices.map(({ tokenHash, push, ...d }) => ({ ...d, push: push?.on === true && typeof push.token === 'string', connections: devSockets.get(d.id)?.size ?? 0 })),
+    // `pushKey`: this Mac has an APNs key (else no phone gets pushes). `pushFail`: why the last push to a phone failed.
+    devices: devices.map(({ tokenHash, push, ...d }) => ({ ...d, push: push?.on === true && typeof push.token === 'string', ...(pushFails.has(d.id) ? { pushFail: pushFails.get(d.id) } : {}), ...(push?.reason ? { pushReason: push.reason } : {}), connections: devSockets.get(d.id)?.size ?? 0 })),
+    pushKey: apns.push !== undefined,
     ...(apns.error ? { pushError: apns.error } : {}),
   })