@puddle-code/cli 0.2.21 → 0.3.0

package/dist/public/notification-worker.js

@@ -1,8 +1,81 @@
-/* global self, indexedDB */
+/* global self, indexedDB, crypto, TextEncoder, TextDecoder */
 /* Notifications only: no fetch interception or caching of host content. */
 let queue = Promise.resolve();
 let database;
 const uuid = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i;
+function targetOf(value) {
+  if (
+    !value ||
+    !/^[0-9a-f]{10}$/.test(value.project) ||
+    !uuid.test(value.session) ||
+    (value.host !== undefined && !uuid.test(value.host))
+  )
+    return undefined;
+  return {
+    project: value.project,
+    session: value.session,
+    ...(value.host ? { host: value.host } : {}),
+  };
+}
+function validContent(value) {
+  return (
+    value &&
+    typeof value.title === 'string' &&
+    value.title.length > 0 &&
+    value.title.length <= 160 &&
+    typeof value.body === 'string' &&
+    value.body.length > 0 &&
+    value.body.length <= 256 &&
+    targetOf(value)
+  );
+}
+function bytes(hex) {
+  return Uint8Array.from(hex.match(/../g), (byte) => parseInt(byte, 16));
+}
+async function decryptPreview(payload) {
+  const preview = payload.preview;
+  if (
+    !preview ||
+    !uuid.test(preview.key) ||
+    !/^[a-f0-9]{24}$/.test(preview.iv) ||
+    typeof preview.ciphertext !== 'string' ||
+    preview.ciphertext.length > 3072 ||
+    !/^(?:[a-f0-9]{2}){16,}$/.test(preview.ciphertext)
+  )
+    return null;
+  const db = await new Promise((resolve, reject) => {
+    const request = indexedDB.open('puddle-notification-keys', 1);
+    request.onupgradeneeded = () => request.result.createObjectStore('keys', { keyPath: 'host' });
+    request.onsuccess = () => resolve(request.result);
+    request.onerror = () => reject(request.error);
+  });
+  try {
+    const saved = await new Promise((resolve, reject) => {
+      const request = db.transaction('keys').objectStore('keys').get(payload.host);
+      request.onsuccess = () => resolve(request.result);
+      request.onerror = () => reject(request.error);
+    });
+    if (!saved || saved.id !== preview.key || !/^[a-f0-9]{64}$/.test(saved.secret)) return null;
+    const key = await crypto.subtle.importKey('raw', bytes(saved.secret), 'AES-GCM', false, [
+      'decrypt',
+    ]);
+    const clear = await crypto.subtle.decrypt(
+      {
+        name: 'AES-GCM',
+        iv: bytes(preview.iv),
+        additionalData: new TextEncoder().encode(
+          JSON.stringify(['puddle-notification-v1', payload.host, payload.id, preview.key]),
+        ),
+      },
+      key,
+      bytes(preview.ciphertext),
+    );
+    const content = JSON.parse(new TextDecoder().decode(clear));
+    return validContent(content) ? content : null;
+  } finally {
+    db.close();
+  }
+}
 function receipts() {
   if (!database)
     database = new Promise((resolve, reject) => {
@@ -46,6 +119,7 @@ async function seen(id, save = false) {
 }
 function show(request, host, fromPush = false, client) {
   const task = queue.then(async () => {
+    if (typeof request === 'function') request = await request();
     const deduplicate = request.id.startsWith('puddle-event-');
     // Every push must call showNotification: Safari revokes permission for
     // silent pushes. Matching tags replace a racing live alert without renotify.
@@ -55,7 +129,10 @@ function show(request, host, fromPush = false, client) {
       tag: request.id,
       silent: true,
       renotify: false,
-      data: host ? { host } : { client },
+      data: {
+        ...(host ? { host } : { client }),
+        ...(targetOf(request.target) ? { target: targetOf(request.target) } : {}),
+      },
       icon: '/puddle-app.png',
     });
     if (deduplicate) await seen(request.id, true).catch(() => {});
@@ -96,7 +173,18 @@ self.addEventListener('push', (event) => {
   if (!uuid.test(payload?.id) || !uuid.test(payload?.host)) return;
   event.waitUntil(
     show(
-      { id: `puddle-event-${payload.id}`, title: 'Puddle', body: 'An agent needs your attention.' },
+      async () => {
+        // A missing/rotated key or damaged ciphertext must still produce a visible push.
+        const content = await decryptPreview(payload).catch(() => null);
+        return {
+          id: `puddle-event-${payload.id}`,
+          title: content?.title ?? 'Puddle',
+          body: content?.body ?? 'An agent needs your attention.',
+          ...(content
+            ? { target: { project: content.project, session: content.session, host: payload.host } }
+            : {}),
+        };
+      },
       payload.host,
       true,
     ),
@@ -104,8 +192,13 @@ self.addEventListener('push', (event) => {
 });
 self.addEventListener('notificationclick', (event) => {
   event.notification.close();
-  const host = event.notification.data?.host;
-  const target = uuid.test(host) ? `/?notificationHost=${host}` : '/';
+  const destination = targetOf(event.notification.data?.target);
+  const host = destination?.host ?? event.notification.data?.host;
+  const target = uuid.test(host)
+    ? `/?notificationHost=${host}${destination ? `&notificationProject=${destination.project}&notificationSession=${destination.session}` : ''}`
+    : destination
+      ? `/project/${destination.project}/session/${destination.session}`
+      : '/';
   event.waitUntil(
     (async () => {
       const windows = await self.clients.matchAll({ type: 'window', includeUncontrolled: true });
@@ -121,11 +214,16 @@ self.addEventListener('notificationclick', (event) => {
           new URL(client.url).pathname === '/preview.html'
         )
           continue;
-        await client.focus();
+        try {
+          await client.focus();
+        } catch {
+          continue;
+        }
         client.postMessage({
           t: 'notification-click',
           id: event.notification.tag,
           ...(uuid.test(host) ? { host } : {}),
+          ...(destination ? { target: destination } : {}),
         });
         return;
       }