This build was committed by a bot.

2026-01-14 08:38:00 +00:00 · 2025-08-23 20:13:26 +00:00
parent 8fee072532
commit cc38fd7dcf
1 changed files with 108 additions and 190 deletions
--- a/docs/sw.js
+++ b/docs/sw.js
@@ -4,243 +4,166 @@ try {
 }
 const TARGET_SUBSTRING = "openrouter.ai/api/v1/chat/completions";
 const THREADS_KEY = "threads_v1";
-const SAVE_BYTES_THRESHOLD = 6 * 1024;
-const SAVE_TIME_THRESHOLD = 800;
-const BROADCAST_THROTTLE_MS = 600;
 const gid = () => Math.random().toString(36).slice(2, 9) + "-" + Date.now().toString(36);
 const now = () => Date.now();
 let lfAvailable = typeof localforage !== "undefined";
-let lfLoadError = lfAvailable ? null : "localforage not loaded (importScripts failed or blocked)";
+let lfLoadError = lfAvailable ? null : "localforage not present in SW";
 async function broadcast(msg) {
  try {
    const clients = await self.clients.matchAll({ includeUncontrolled: true, type: "window" });
    for (const c of clients) {
      try {
        c.postMessage(msg);
-      } catch (_) {
-      }
-    }
-  } catch (_) {
-  }
-}
-function logDebug(text) {
-  try {
-    console.log("[sw] " + text);
-  } catch {
-  }
-  broadcast({ type: "sw-debug-log", ts: now(), text: String(text) });
-}
-function sanitizeForIDB(v) {
-  try {
-    return JSON.parse(JSON.stringify(v));
      } catch (e) {
-    try {
-      if (!Array.isArray(v)) return [];
-      return v.map((t) => ({
-        id: t && t.id,
-        title: t && t.title,
-        updatedAt: t && t.updatedAt,
-        messages: Array.isArray(t && t.messages) ? t.messages.map((m) => ({ id: m && m.id, role: m && m.role, content: String(m && m.content || "") })) : []
-      }));
-    } catch (_) {
-      return [];
      }
    }
+  } catch (e) {
+  }
 }
-async function writeThreadsViaLocalForage(threadsArr) {
+async function readThreads() {
  if (!lfAvailable) throw new Error("localforage unavailable: " + lfLoadError);
-  const safeVal = sanitizeForIDB(threadsArr || []);
-  try {
-    await localforage.setItem(THREADS_KEY, safeVal);
-    return { ok: true, method: "localforage.setItem", storedAs: "object" };
-  } catch (err1) {
-    try {
-      await localforage.setItem(THREADS_KEY, JSON.stringify(safeVal));
-      return { ok: true, method: "localforage.setItem(stringified)", storedAs: "string" };
-    } catch (err2) {
-      throw new Error("setItem failed: " + (err2 && err2.message ? err2.message : String(err1)));
-    }
-  }
-}
-async function readThreadsViaLocalForage() {
-  if (!lfAvailable) throw new Error("localforage unavailable: " + lfLoadError);
-  try {
  const v = await localforage.getItem(THREADS_KEY);
-    if (typeof v === "string") {
-      try {
-        const parsed = JSON.parse(v);
-        return Array.isArray(parsed) ? parsed : [];
-      } catch {
-        return [];
-      }
-    }
-    return Array.isArray(v) ? v : [];
-  } catch (err) {
-    throw err;
-  }
+  return Array.isArray(v) ? v : v ? v : [];
+}
+async function writeThreads(threads) {
+  if (!lfAvailable) throw new Error("localforage unavailable: " + lfLoadError);
+  return localforage.setItem(THREADS_KEY, threads);
 }
 function pickLastThread(threads) {
-  if (!threads || threads.length === 0) return null;
-  const sorted = [...threads].sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0));
-  return sorted[0];
+  if (!Array.isArray(threads) || threads.length === 0) return null;
+  return threads.slice().sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0))[0];
 }
-function upsertAssistantInThreadObj(threadObj, streamId, text) {
-  threadObj.updatedAt = now();
-  threadObj.messages = threadObj.messages || [];
-  for (let i = threadObj.messages.length - 1; i >= 0; i--) {
-    const m = threadObj.messages[i];
-    if (m && m.sw_streamId === streamId) {
-      m.content = text;
-      m.contentParts = [{ type: "text", text }];
-      m.updatedAt = now();
-      m._sw_savedAt = now();
-      return threadObj;
-    }
-  }
+function upsertAssistantInThread(thread, text) {
+  thread.updatedAt = now();
+  thread.messages = thread.messages || [];
+  const last = thread.messages.length ? thread.messages[thread.messages.length - 1] : null;
+  if (last && last.role === "assistant") {
+    last.content = text;
+    last.contentParts = [{ type: "text", text }];
+    last.updatedAt = now();
+    return { threadId: thread.id, messageId: last.id || null, action: "updated" };
+  } else {
    const msg = {
-    id: "swmsg-" + gid(),
+      // intentionally do not add extra custom ids/flags beyond minimal fields
      role: "assistant",
      content: text,
-    contentParts: [{ type: "text", text }],
-    kind: "assistant",
-    sw_saved: true,
-    sw_streamId: streamId,
-    createdAt: now(),
-    updatedAt: now(),
-    _sw_savedAt: now()
+      contentParts: [{ type: "text", text }]
    };
-  threadObj.messages.push(msg);
-  return threadObj;
-}
-async function flushToLastThreadUsingLF(streamId, accumulated, meta) {
-  try {
-    const threads = await readThreadsViaLocalForage();
-    let thread = pickLastThread(threads);
-    const createdAt = now();
-    if (!thread) {
-      thread = { id: "sw-thread-" + gid(), title: "Missed while backgrounded", pinned: false, updatedAt: createdAt, messages: [] };
-      threads.unshift(thread);
-    }
-    upsertAssistantInThreadObj(thread, streamId, accumulated);
-    const writeRes = await writeThreadsViaLocalForage(threads);
-    return { ok: true, threadId: thread.id, writeRes };
-  } catch (err) {
-    return { ok: false, error: String(err && err.message ? err.message : err) };
+    thread.messages.push(msg);
+    return { threadId: thread.id, messageId: msg.id || null, action: "appended" };
  }
 }
-self.addEventListener("install", (ev) => {
-  self.skipWaiting();
-});
-self.addEventListener("activate", (ev) => {
-  ev.waitUntil(self.clients.claim());
-});
-const state = { totalIntercepted: 0, activeStreams: {}, lastStream: null };
+self.addEventListener("install", (ev) => self.skipWaiting());
+self.addEventListener("activate", (ev) => ev.waitUntil(self.clients.claim()));
 self.addEventListener("fetch", (event) => {
  try {
    const url = String(event.request.url || "");
    if (!url.includes(TARGET_SUBSTRING)) return;
    event.respondWith((async () => {
-      const upstream = await fetch(event.request);
-      if (!upstream || !upstream.body) return upstream;
-      const streamId = "sw-" + gid();
-      const meta = { url, startedAt: now(), bytes: 0, status: "started" };
-      state.totalIntercepted = (state.totalIntercepted || 0) + 1;
-      state.activeStreams[streamId] = meta;
-      broadcast({ type: "sw-intercept-start", streamId, meta });
-      const [clientStream, swStream] = upstream.body.tee();
+      const resUp = await fetch(event.request);
+      if (!resUp || !resUp.body) return resUp;
+      const meta = { url, startedAt: now(), bytes: 0 };
+      broadcast({ type: "INTERCEPT_START", meta });
+      const [clientStream, swStream] = resUp.body.tee();
      const saveTask = (async () => {
        const reader = swStream.getReader();
        const decoder = new TextDecoder("utf-8");
        let acc = "";
-        let sinceBytes = 0;
-        let lastSaveAt = 0;
-        let lastBroadcastAt = 0;
-        async function maybeFlush(force = false) {
-          const nowMs = now();
-          if (!force && sinceBytes < SAVE_BYTES_THRESHOLD && nowMs - lastSaveAt < SAVE_TIME_THRESHOLD) return;
-          const res = await flushToLastThreadUsingLF(streamId, acc, { bytes: meta.bytes });
-          lastSaveAt = nowMs;
-          sinceBytes = 0;
-          if (res.ok) {
-            const now2 = Date.now();
-            if (now2 - lastBroadcastAt > BROADCAST_THROTTLE_MS) {
-              lastBroadcastAt = now2;
-              broadcast({ type: "sw-intercept-progress", streamId, meta: { bytes: meta.bytes, savedAt: lastSaveAt, snippet: acc.slice(-1024), threadId: res.threadId, writeRes: res.writeRes } });
-            }
-          } else {
-            broadcast({ type: "sw-intercept-error", streamId, meta: { error: res.error } });
-          }
-        }
+        let lastSavedText = null;
        try {
          while (true) {
            const { value, done } = await reader.read();
            if (done) break;
-            let chunk = "";
-            try {
-              chunk = decoder.decode(value, { stream: true });
-            } catch (e) {
-              chunk = "";
-            }
+            const chunk = decoder.decode(value, { stream: true });
            acc += chunk;
-            const bytes = value ? value.byteLength || 0 : chunk.length;
-            meta.bytes += bytes;
-            sinceBytes += bytes;
-            await maybeFlush(false);
+            meta.bytes += value ? value.byteLength || 0 : chunk.length;
+            if (lastSavedText !== acc) {
+              const p = (async () => {
+                try {
+                  const threads = await readThreads();
+                  let thread = pickLastThread(threads);
+                  if (!thread) {
+                    thread = { id: "sw-thread-" + gid(), title: "Missed while backgrounded", pinned: false, updatedAt: now(), messages: [] };
+                    threads.unshift(thread);
                  }
-          await maybeFlush(true);
-          meta.status = "finished";
-          meta.endedAt = now();
-          state.lastStream = { streamId, url: meta.url, startedAt: meta.startedAt, endedAt: meta.endedAt, totalBytes: meta.bytes };
-          delete state.activeStreams[streamId];
-          broadcast({ type: "sw-intercept-end", streamId, meta: { totalBytes: meta.bytes, endedAt: meta.endedAt } });
+                  const res = upsertAssistantInThread(thread, acc);
+                  await writeThreads(threads);
+                  lastSavedText = acc;
+                  broadcast({ type: "INTERCEPT_SAVE", meta: { threadId: res.threadId, action: res.action, bytes: meta.bytes, textLen: acc.length } });
                } catch (err) {
-          meta.status = "error";
-          meta.error = String(err && err.message ? err.message : err);
-          delete state.activeStreams[streamId];
-          broadcast({ type: "sw-intercept-error", streamId, meta: { error: meta.error } });
+                  broadcast({ type: "INTERCEPT_ERROR", meta: { error: String(err && err.message ? err.message : err) } });
                }
              })();
+              try {
+                event.waitUntil(p);
+              } catch (e) {
+              }
+            }
+          }
+          if (lastSavedText !== acc) {
+            try {
+              const threads = await readThreads();
+              let thread = pickLastThread(threads);
+              if (!thread) {
+                thread = { id: "sw-thread-" + gid(), title: "Missed while backgrounded", pinned: false, updatedAt: now(), messages: [] };
+                threads.unshift(thread);
+              }
+              const res = upsertAssistantInThread(thread, acc);
+              await writeThreads(threads);
+              broadcast({ type: "INTERCEPT_SAVE", meta: { threadId: res.threadId, action: res.action, bytes: meta.bytes, textLen: acc.length } });
+            } catch (err) {
+              broadcast({ type: "INTERCEPT_ERROR", meta: { error: String(err && err.message ? err.message : err) } });
+            }
+          }
+          broadcast({ type: "INTERCEPT_END", meta: { bytes: meta.bytes, endedAt: now() } });
+        } catch (err) {
+          broadcast({ type: "INTERCEPT_ERROR", meta: { error: String(err && err.message ? err.message : err) } });
+        }
+      })();
+      try {
        event.waitUntil(saveTask);
+      } catch (e) {
+      }
      return new Response(clientStream, {
-        status: upstream.status,
-        statusText: upstream.statusText,
-        headers: upstream.headers
+        status: resUp.status,
+        statusText: resUp.statusText,
+        headers: resUp.headers
      });
    })());
  } catch (err) {
-    logDebug("fetch handler top-level error: " + (err && err.message ? err.message : String(err)));
+    broadcast({ type: "INTERCEPT_ERROR", meta: { error: String(err && err.message ? err.message : err) } });
  }
 });
 self.addEventListener("message", (event) => {
  const data = event.data || {};
  (async () => {
    try {
-      if (data && data.type === "PING") {
-        if (event.ports && event.ports[0]) event.ports[0].postMessage({ type: "PONG", ts: now(), ok: true });
-        else broadcast({ type: "PONG", ts: now(), ok: true });
+      if (data.type === "PING") {
+        if (event.ports && event.ports[0]) event.ports[0].postMessage({ type: "PONG", ts: now() });
+        else broadcast({ type: "PONG", ts: now() });
        return;
      }
-      if (data && data.type === "PING_STATUS") {
-        const reply = { type: "PONG_STATUS", ts: now(), lfAvailable, lfLoadError, totalIntercepted: state.totalIntercepted || 0, lastStream: state.lastStream || null };
+      if (data.type === "PING_STATUS") {
+        const reply = { type: "PONG_STATUS", ts: now(), lfAvailable, lfLoadError };
        if (event.ports && event.ports[0]) event.ports[0].postMessage(reply);
        else broadcast(reply);
        return;
      }
-      if (data && data.type === "TEST_WRITE") {
+      if (data.type === "TEST_WRITE") {
        if (!lfAvailable) {
-          const res = { type: "TEST_WRITE_RESULT", ok: false, error: "localforage unavailable: " + lfLoadError };
-          if (event.ports && event.ports[0]) event.ports[0].postMessage(res);
-          else broadcast(res);
+          const out = { type: "TEST_WRITE_RESULT", ok: false, error: "localforage unavailable: " + lfLoadError };
+          if (event.ports && event.ports[0]) event.ports[0].postMessage(out);
+          else broadcast(out);
          return;
        }
        try {
-          const threads = await readThreadsViaLocalForage();
+          const threads = await readThreads();
          const tid = "sw-test-" + gid();
          const nowMs = now();
-          const t = { id: tid, title: "SW test " + new Date(nowMs).toISOString(), pinned: false, updatedAt: nowMs, messages: [{ id: "swtest-" + gid(), role: "assistant", content: "sw test write @ " + new Date(nowMs).toISOString(), contentParts: [{ type: "text", text: "sw test write" }], createdAt: nowMs, updatedAt: nowMs }] };
+          const t = { id: tid, title: "SW test " + new Date(nowMs).toISOString(), pinned: false, updatedAt: nowMs, messages: [{ role: "assistant", content: "sw test write @ " + new Date(nowMs).toISOString(), contentParts: [{ type: "text", text: "sw test write" }] }] };
          threads.unshift(t);
-          const writeRes = await writeThreadsViaLocalForage(threads);
-          const out = { type: "TEST_WRITE_RESULT", ok: true, tid, writeRes };
+          await writeThreads(threads);
+          const out = { type: "TEST_WRITE_RESULT", ok: true, tid };
          if (event.ports && event.ports[0]) event.ports[0].postMessage(out);
          else broadcast(out);
        } catch (err) {
@@ -250,7 +173,7 @@ self.addEventListener("message", (event) => {
        }
        return;
      }
-      if (data && data.type === "READ_KEY") {
+      if (data.type === "READ_KEY") {
        const key = data.key || THREADS_KEY;
        if (!lfAvailable) {
          const res = { type: "READ_KEY_RESULT", ok: false, key, error: "localforage unavailable: " + lfLoadError };
@@ -259,15 +182,8 @@ self.addEventListener("message", (event) => {
          return;
        }
        try {
-          const val = await localforage.getItem(key);
-          const parsed = typeof val === "string" ? (() => {
-            try {
-              return JSON.parse(val);
-            } catch {
-              return val;
-            }
-          })() : val;
-          const out = { type: "READ_KEY_RESULT", ok: true, key, value: parsed };
+          const value = await localforage.getItem(key);
+          const out = { type: "READ_KEY_RESULT", ok: true, key, value };
          if (event.ports && event.ports[0]) event.ports[0].postMessage(out);
          else broadcast(out);
        } catch (err) {
@@ -277,7 +193,7 @@ self.addEventListener("message", (event) => {
        }
        return;
      }
-      if (data && data.type === "LIST_SW_SAVED") {
+      if (data.type === "LIST_SW_SAVED") {
        if (!lfAvailable) {
          const res = { type: "LIST_SW_SAVED_RESULT", ok: false, error: "localforage unavailable: " + lfLoadError };
          if (event.ports && event.ports[0]) event.ports[0].postMessage(res);
@@ -285,11 +201,13 @@ self.addEventListener("message", (event) => {
          return;
        }
        try {
-          const threads = await readThreadsViaLocalForage();
+          const threads = await readThreads();
          const found = [];
          for (const t of threads || []) {
            for (const m of t.messages || []) {
-              if (m && m.sw_streamId) found.push({ threadId: t.id, threadTitle: t.title, messageId: m.id, sw_streamId: m.sw_streamId, snippet: (m.content || "").slice(0, 200), updatedAt: m.updatedAt });
+              if (m && m.role === "assistant") {
+                found.push({ threadId: t.id, snippet: (m.content || "").slice(0, 200) });
+              }
            }
          }
          const out = { type: "LIST_SW_SAVED_RESULT", ok: true, found };
@@ -302,7 +220,7 @@ self.addEventListener("message", (event) => {
        }
        return;
      }
-      if (data && data.type === "CLEAR_TESTS") {
+      if (data.type === "CLEAR_TESTS") {
        if (!lfAvailable) {
          const res = { type: "CLEAR_TESTS_RESULT", ok: false, error: "localforage unavailable: " + lfLoadError };
          if (event.ports && event.ports[0]) event.ports[0].postMessage(res);
@@ -310,10 +228,10 @@ self.addEventListener("message", (event) => {
          return;
        }
        try {
-          const threads = await readThreadsViaLocalForage();
+          const threads = await readThreads();
          const before = threads.length;
          const cleaned = threads.filter((t) => !(t.id && String(t.id).startsWith("sw-test-")));
-          await writeThreadsViaLocalForage(cleaned);
+          await writeThreads(cleaned);
          const removed = before - cleaned.length;
          const out = { type: "CLEAR_TESTS_RESULT", ok: true, removed };
          if (event.ports && event.ports[0]) event.ports[0].postMessage(out);