@christianirack/brainllm-runtime 0.4.0 → 0.6.0

package/sw/brain-sw.js

@@ -7,12 +7,21 @@
 // open tab still asks for: navigations are answered from the current build alone, so nothing old is shown by mistake.
 // After taking over it tells every tab `brain:build <sig>` (the router then does full loads). Caches that are not per
 // build are named `brain:*`. (`sw: false` is a separate kill worker emitted by the build.)
+// `cache.routes` (brain.json) adds declarative data routes: { match, prefix, strategy: cache-first | network-first |
+// stale-while-revalidate | network-only, maxEntries, maxAge (s), timeout (ms) }, each in its own `brain:route:<match>`
+// cache that survives builds, bounded by entries and age; personal responses are never stored. `cache.update:
+// "prompt"` keeps a new worker waiting (while an older one controls tabs) until a page posts `brain:skip-waiting`.
 const B = self.BRAIN_BUILD || { hash: 'dev', precache: [], offline: null }
 const BASE = B.base || '/' // app served under a base path (§23 #148); precache/offline URLs already carry it
 const BUILD = 'brain-' + B.hash, META = 'brain:meta'
 const NAV_TIMEOUT = 3000
 // responses marked personal or uncacheable are never stored
 const storable = r => r.ok && !/no-store|private/i.test(r.headers.get('cache-control') || '')
+const ROUTES = (B.routes || []).map(r => ({ ...r, cache: 'brain:route:' + r.match + (r.prefix ? '*' : '') }))
+const route = p => ROUTES.find(r => (r.prefix ? p.startsWith(r.match) : p === r.match))
+// identity-bound: an Authorization header, a response that varies by cookie/authorization/*, or one that sets a cookie
+const personal = (req, r) =>
+  !!req.headers?.has?.('authorization') || /(^|,)\s*(\*|cookie|authorization)\s*(,|$)/i.test(r.headers.get('vary') || '') || r.headers.has('set-cookie')
 const OFFLINE =
   '<!doctype html><html lang="en"><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">' +
   '<title>Offline</title><main style="font:16px/1.5 system-ui;max-width:32rem;margin:15vh auto;padding:0 16px">' +
@@ -25,7 +34,8 @@ self.addEventListener('install', e => {
       // one failing URL must not abort the install: cache what answers, the rest is cached on first use
       // default cache mode: the page just filled the HTTP cache with these immutable files, so this costs no bytes
       await Promise.allSettled(B.precache.map(u => fetch(u).then(r => r.ok && c.put(u, r))))
-      await self.skipWaiting()
+      // update: 'prompt' → an update waits for the page (appUpdate); the first install has nothing to replace
+      if (B.update !== 'prompt' || !self.registration.active) await self.skipWaiting()
     })()
   )
 })
@@ -40,13 +50,18 @@ self.addEventListener('activate', e => {
       const gens = r ? await r.json() : []
       const keep = [...gens.filter(g => g !== BUILD).slice(-1), BUILD]
       await meta.put('/__brain_generations', new Response(JSON.stringify(keep)))
-      for (const k of await caches.keys()) if (k.startsWith('brain-') && !keep.includes(k)) await caches.delete(k)
+      for (const k of await caches.keys())
+        if ((k.startsWith('brain-') && !keep.includes(k)) || (k.startsWith('brain:route:') && !ROUTES.some(r => r.cache === k))) await caches.delete(k)
       await self.clients.claim()
       for (const c of await self.clients.matchAll({ type: 'window', includeUncontrolled: true })) c.postMessage('brain:build ' + B.hash)
     })()
   )
 })
 
+self.addEventListener('message', e => {
+  if (e.data === 'brain:skip-waiting') self.skipWaiting()
+})
+
 self.addEventListener('fetch', e => {
   const req = e.request
   if (req.method !== 'GET') return
@@ -55,6 +70,8 @@ self.addEventListener('fetch', e => {
   // offline: false (B.offline null) → navigations go straight to the network: no page cache, no offline page
   if (req.mode === 'navigate') return B.offline ? e.respondWith(navigate(e)) : undefined
   if (url.pathname.startsWith(BASE + '_b/')) return e.respondWith(hashed(req))
+  const rt = route(url.pathname)
+  if (rt) return e.respondWith(rt.strategy === 'network-only' ? fetch(req) : data(e, rt))
   // only files the page itself loads (img, style, script, font, manifest…); fetch()/XHR data is never touched (§35:
   // data is not cached by default)
   if (req.destination) e.respondWith(revalidate(e))
@@ -101,3 +118,35 @@ async function revalidate(e) {
   e.waitUntil(net.catch(() => {}))
   return hit || net
 }
+
+// declared data route: entries carry their storage time (x-brain-at); older than maxAge are never served
+async function data(e, rt) {
+  const req = e.request, c = await caches.open(rt.cache)
+  const fresh = async () => {
+    const h = await c.match(req)
+    return h && (!rt.maxAge || Date.now() - Number(h.headers.get('x-brain-at') || 0) <= rt.maxAge * 1000) ? h : null
+  }
+  const save = async r => {
+    if (!storable(r) || r.status !== 200 || personal(req, r)) return
+    const h = new Headers(r.headers)
+    h.set('x-brain-at', String(Date.now()))
+    await c.put(req, new Response(await r.blob(), { status: 200, statusText: r.statusText, headers: h }))
+    const keys = await c.keys() // insertion order: the oldest first
+    for (const k of keys.slice(0, Math.max(0, keys.length - rt.maxEntries))) await c.delete(k)
+  }
+  const net = () => {
+    const p = fetch(req).then(r => (e.waitUntil(save(r.clone()).catch(() => {})), r))
+    e.waitUntil(p.catch(() => {}))
+    return p
+  }
+  if (rt.strategy === 'cache-first') return (await fresh()) || net()
+  if (rt.strategy === 'network-first') {
+    const n = net()
+    const timeout = new Promise(ok => setTimeout(() => ok(null), rt.timeout || NAV_TIMEOUT))
+    const first = await Promise.race([n, timeout]).catch(() => null)
+    return first || (await fresh()) || n
+  }
+  const hit = await fresh() // stale-while-revalidate
+  const n = net()
+  return hit || n
+}

package/ui/error-state.brain

@@ -3,18 +3,31 @@
   // One message and one action per error kind (INTERNALS §40.2), for {:catch e} and failed resources. Offline and
   // network errors retry by themselves when the connection comes back; 429 retries after its Retry-After. A cancelled
   // request (kind 'aborted') shows nothing.
+  // Texts (§37): the app's dictionary wins when it has the key (`"error_state.offline": "…"` in i18n/<locale>.json),
+  // else the English default. The table is read directly (globalThis.__brainDict, filled by brain-i18n.js `add`), like
+  // the form.* messages, so a single-language page does not load brain-i18n.js.
+  // Keys: error_state.offline network timeout schema unauthorized forbidden not_found invalid rate_limited ({n}) server
+  // sign_in retry reference ({id}).
+  const say = (key, en, vars) => {
+    const D = globalThis.__brainDict, G = globalThis, h = G.document && G.document.documentElement
+    const loc = globalThis.__brainLocale || (h && h.getAttribute('lang')) || 'en'
+    const def = (h && h.getAttribute('data-default-lang')) || 'en'
+    const m = D && ((D[loc] && D[loc]['error_state.' + key]) ?? (D[def] && D[def]['error_state.' + key]))
+    const s = typeof m === 'string' ? m : en
+    return vars ? s.replace(/\{(\w+)\}/g, (x, k) => (k in vars ? String(vars[k]) : x)) : s
+  }
   const text = (e) => {
     if (!e) return ''
-    if (e.kind === 'offline') return 'You are offline.'
-    if (e.kind === 'network') return 'The connection was lost.'
-    if (e.kind === 'timeout') return 'The server took too long to answer.'
-    if (e.kind === 'schema') return 'The server sent something unexpected.'
-    if (e.status === 401) return 'Sign in to continue.'
-    if (e.status === 403) return 'You do not have permission to see this.'
-    if (e.status === 404) return 'Not found.'
-    if (e.status === 422) return 'Check the highlighted fields.'
-    if (e.status === 429) return 'Too many requests. Trying again in ' + (e.retryAfter || 30) + ' seconds.'
-    return 'Something went wrong on our side.'
+    if (e.kind === 'offline') return say('offline', 'You are offline.')
+    if (e.kind === 'network') return say('network', 'The connection was lost.')
+    if (e.kind === 'timeout') return say('timeout', 'The server took too long to answer.')
+    if (e.kind === 'schema') return say('schema', 'The server sent something unexpected.')
+    if (e.status === 401) return say('unauthorized', 'Sign in to continue.')
+    if (e.status === 403) return say('forbidden', 'You do not have permission to see this.')
+    if (e.status === 404) return say('not_found', 'Not found.')
+    if (e.status === 422) return say('invalid', 'Check the highlighted fields.')
+    if (e.status === 429) return say('rate_limited', 'Too many requests. Trying again in {n} seconds.', { n: e.retryAfter || 30 })
+    return say('server', 'Something went wrong on our side.')
   }
   const canRetry = (e) => !!retry && !!e && (e.kind !== 'http' || e.status >= 500)
   const signIn = () => login + (globalThis.location ? '?next=' + encodeURIComponent(location.pathname + location.search) : '')
@@ -33,9 +46,9 @@
 {#if error && error.kind !== 'aborted'}
 <div class="error-state" role="alert">
   <p>{text(error)}</p>
-  {#if error && error.status === 401}<a href={signIn()}>Sign in</a>{/if}
-  {#if canRetry(error)}<button type="button" on:click={retry()}>Retry</button>{/if}
-  {#if error && error.id && error.status >= 500}<small>Reference: {error.id}</small>{/if}
+  {#if error && error.status === 401}<a href={signIn()}>{say('sign_in', 'Sign in')}</a>{/if}
+  {#if canRetry(error)}<button type="button" on:click={retry()}>{say('retry', 'Retry')}</button>{/if}
+  {#if error && error.id && error.status >= 500}<small>{say('reference', 'Reference: {id}', { id: error.id })}</small>{/if}
 </div>
 {/if}
 <style>

package/ui/tabs.brain

@@ -1,10 +1,11 @@
 <meta props="tabs:list value:str~ label:str">
 <script>
-  // tabs: [{ id: 'a', label: 'Overview' }] · the parent renders the panel of `value` in the slot
+  // tabs: [{ id: 'a', label: 'Overview' }] · the parent renders the panel of `value` in the slot; an unknown `value`
+  // selects the first tab
   let list = ref()
   const current = drv(() => tabs.find((t) => t.id === value) || tabs[0])
   const keys = (e) => {
-    const i = tabs.findIndex((t) => t.id === value)
+    const i = tabs.indexOf(current)
     let j = -1
     if (e.key === 'ArrowRight') j = (i + 1) % tabs.length
     else if (e.key === 'ArrowLeft') j = (i - 1 + tabs.length) % tabs.length
@@ -19,7 +20,7 @@
 <div class="tabs">
   <div class="list" role="tablist" aria-label={label} bind:ref={list} on:keydown={keys}>
     {#each tabs as t (t.id)}
-      <button type="button" role="tab" aria-selected={t.id === value ? 'true' : 'false'} tabindex={t.id === value ? 0 : -1} on:click={value = t.id}>{t.label}</button>
+      <button type="button" role="tab" aria-selected={t === current ? 'true' : 'false'} tabindex={t === current ? 0 : -1} on:click={value = t.id}>{t.label}</button>
     {/each}
   </div>
   <div class="panel" role="tabpanel" aria-label={current ? current.label : label} tabindex="0"><slot /></div>