handmux 0.21.0 → 0.22.0

package/public/index.html

@@ -48,8 +48,8 @@
       @keyframes bootDot { 0%,100% { opacity: .22; transform: translateY(0); } 40% { opacity: 1; transform: translateY(-3px); } }
       @media (prefers-reduced-motion: reduce) { .boot-glow, .boot-dots i { animation: none; opacity: .8; } }
     </style>
-    <script type="module" crossorigin src="/assets/index-DgkdA9oQ.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-WH6Olfjg.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" crossorigin href="/assets/index-WH6Olfjg.css"></noscript>
+    <script type="module" crossorigin src="/assets/index-CzlitgRX.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CRAlQZDz.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" crossorigin href="/assets/index-CRAlQZDz.css"></noscript>
   </head>
   <body>
     <div id="boot-splash" aria-hidden="true">

package/src/push.js

@@ -39,6 +39,7 @@ function ensureInit() {
 }
 
 const genKey = () => crypto.randomBytes(18).toString('base64url');
+const VALID_PUSH_KEY = /^[A-Za-z0-9_-]{16,128}$/;
 
 let subs = load();
 
@@ -56,13 +57,20 @@ export function isConfigured() { ensureInit(); return configured; }
 export function publicKey() { ensureInit(); return process.env.VAPID_PUBLIC || null; }
 export function count() { return subs.length; }
 
-export function addSubscription(sub, boundSessions = []) {
+export function addSubscription(sub, boundSessions = [], preferredPushKey = null) {
   if (!sub || typeof sub.endpoint !== 'string') return false;
-  const i = subs.findIndex((s) => s.subscription.endpoint === sub.endpoint);
-  if (i === -1) subs.push({ subscription: sub, boundSessions, pushKey: genKey() });
-  else subs[i] = { subscription: sub, boundSessions, pushKey: subs[i].pushKey || genKey() };
+  const endpointRecord = subs.find((s) => s.subscription.endpoint === sub.endpoint);
+  const requestedKey = VALID_PUSH_KEY.test(preferredPushKey || '') ? preferredPushKey : null;
+  const keyRecord = requestedKey ? subs.find((s) => s.pushKey === requestedKey) : null;
+  const pushKey = keyRecord?.pushKey || endpointRecord?.pushKey || requestedKey || genKey();
+
+  // A browser PushSubscription is transport state, not device identity. Re-enabling push can produce a
+  // different endpoint; replace the old endpoint that owns this stable key instead of creating a new
+  // script-push target. Also collapse any legacy duplicate for the new endpoint.
+  subs = subs.filter((s) => s.subscription.endpoint !== sub.endpoint && s.pushKey !== pushKey);
+  subs.push({ subscription: sub, boundSessions, pushKey });
   persist();
-  return true;
+  return pushKey;
 }
 
 export function updateBound(endpoint, boundSessions = []) {
@@ -71,9 +79,10 @@ export function updateBound(endpoint, boundSessions = []) {
 }
 
 export function removeSubscription(endpoint) {
-  const before = subs.length;
+  const removed = subs.find((s) => s.subscription.endpoint === endpoint);
   subs = subs.filter((s) => s.subscription.endpoint !== endpoint);
-  if (subs.length !== before) persist();
+  if (removed) persist();
+  return removed?.pushKey || null;
 }
 
 // The device-addressing id (NOT an auth credential — see /api/push/send-local). Lazy-generate for

package/src/routes/push.js

@@ -16,10 +16,11 @@ export function pushRoutes({ push, notifications }) {
   // the toggle proves the whole pipe (subscribe → push service → SW → notification) end to end.
   r.post('/push/subscribe', async (req, res, next) => {
     const sub = req.body?.subscription;
+    const preferredPushKey = req.body?.pushKey;
     const boundSessions = Array.isArray(req.body?.boundSessions) ? req.body.boundSessions : [];
     if (!sub || typeof sub.endpoint !== 'string') return res.status(400).json({ error: 'bad subscription' });
     try {
-      push.addSubscription(sub, boundSessions);
+      const pushKey = push.addSubscription(sub, boundSessions, preferredPushKey);
       const delivery = await push.sendToOne(sub, { title: '通知已开启 ✅', body: '会话「需要你」或「已完成」时提醒你', tag: 'handmux-welcome' }, { topic: 'handmux', urgency: 'high' });
       // `deliver` deliberately contains failures so an automatic pane push can never break the polling
       // loop. Enabling notifications is different: its welcome push is the end-to-end health check, so a
@@ -30,14 +31,14 @@ export function pushRoutes({ push, notifications }) {
           error: expired ? 'push subscription expired' : 'push delivery rejected',
         });
       }
-      res.json({ ok: true, count: push.count(), pushKey: push.getPushKey(sub.endpoint) });
+      res.json({ ok: true, count: push.count(), pushKey });
     } catch (e) { next(e); }
   });
 
   r.post('/push/unsubscribe', (req, res) => {
     const endpoint = req.body?.endpoint;
-    if (typeof endpoint === 'string') push.removeSubscription(endpoint);
-    res.json({ ok: true });
+    const pushKey = typeof endpoint === 'string' ? push.removeSubscription(endpoint) : null;
+    res.json({ ok: true, pushKey });
   });
 
   // Manual "send me a test" — pushes to every stored subscription.

package/src/routes/terminal.js

@@ -137,6 +137,18 @@ export function terminalRoutes({ commands }) {
     catch (e) { next(e); }
   });
 
+  // Restore only the pane arrangement. Window sizing remains untouched; handing the whole window
+  // back to an attached client is the separate `auto` resize operation below.
+  r.post('/layout', async (req, res, next) => {
+    const { window, layout } = req.body || {};
+    if (!isWindowId(window)) return res.status(400).json({ error: 'bad window id' });
+    if (typeof layout !== 'string' || !layout) return res.status(400).json({ error: 'bad window layout' });
+    try {
+      await commands.applyWindowLayout(window, layout);
+      res.json({ ok: true });
+    } catch (e) { next(e); }
+  });
+
   r.post('/resize', async (req, res, next) => {
     const { window, pane, cols, rows, auto, layout } = req.body || {};
     const c = Math.min(Math.max(Number(cols) || 0, 20), 500);