@kehto/paja 0.16.2 → 0.16.3

package/README.md

@@ -186,7 +186,8 @@ When `PAJA_UPLOAD_SERVERS` is set, the runtime enables the Blossom upload rail
 and also makes those servers explicit NAP-RESOURCE fallbacks. It is not needed
 for read-side discovery: resources learned through OUTBOX use their event hints
 and hinted-author/publisher server lists first, then the active shell user's
-published list.
+published list, the current window's verified pointer-manifest servers, and
+finally configured runtime fallbacks.
 
 ## Installed intent handlers and delivery
 
@@ -324,8 +325,8 @@ without prefetching bytes. Resolution tries request and
 event-local server hints first, then lazily queries hinted authors' and the
 event publisher's newest BUD-03 kind `10063` lists through the verified
 NIP-65-aware OUTBOX router, then queries the active shell user's BUD-03 list
-through that same router, then uses host-configured runtime-pointer and
-upload-runtime fallbacks. The user-list
+through that same router, then uses the current window's verified
+pointer-manifest servers, followed by upload-runtime fallbacks. The user-list
 lookup works independently of upload mode; an upload runtime may reuse the same
 servers when present. ROM-specific event and publisher locations retain
 priority over the user/runtime fallbacks. The combined list is capped at eight
@@ -333,8 +334,14 @@ candidates. The only accepted identifier is `blossom:sha256:<hex>`;
 Paja refuses redirects, verifies the requested SHA-256, and permits plain-HTTP
 transport only for configured loopback development defaults. Browser-only Paja
 cannot pin DNS results, so production runtimes must add the draft's DNS-time
-private-address checks. This behavior targets draft
-[NAP-RESOURCE at `9511232`](https://github.com/napplet/naps/blob/9511232f69313aa7953d110e35d32cc28d506f66/naps/NAP-RESOURCE.md), with the merged package implementation
+private-address checks. The current
+[NAP-RESOURCE draft at `fa6bcc6`](https://github.com/napplet/naps/blob/fa6bcc6935aa19e7b70ab2a2c721dafca77c78e1/naps/NAP-RESOURCE.md)
+assigns fetching and policy to the runtime and defines no wire-level Blossom
+server-hint field. Retaining verified manifest servers per window is therefore
+Paja host policy, informed by the current
+[NIP-5D draft at `24711d9`](https://github.com/nostr-protocol/nips/blob/24711d9c47bbdd07908bf1d52bf677d9cbc530f0/5D.md),
+which defines manifest `server` tags. The existing request-server compatibility
+path comes from the earlier NAP-RESOURCE draft at `9511232`, with the merged package implementation
 [`napplet/web#206@19e0029b`](https://github.com/napplet/web/pull/206) released as
 `@napplet/core`/`@napplet/nap` 0.32.0, `@napplet/shim` 0.30.0, and
 `@napplet/sdk` 0.28.0. Publisher discovery follows

package/dist/browser-host.js

@@ -17220,6 +17220,7 @@ function createPajaBlossomEventResolver(options) {
   const now2 = options.now ?? Date.now;
   const ttl = Math.max(0, options.serverListTtlMs ?? DEFAULT_SERVER_LIST_TTL_MS);
   const windows = /* @__PURE__ */ new Map();
+  const windowServers = /* @__PURE__ */ new Map();
   const serverLists = /* @__PURE__ */ new Map();
   const pendingServerLists = /* @__PURE__ */ new Map();
   function observe(windowId, results) {
@@ -17297,9 +17298,20 @@ function createPajaBlossomEventResolver(options) {
       );
       for (const list of lists) appendUnique(servers, list);
     }
+    if (windowId) appendUnique(servers, windowServers.get(windowId) ?? []);
     appendUnique(servers, options.getConfiguredServers());
     return servers.slice(0, PAJA_RESOURCE_MAX_SERVERS);
   }
+  function setWindowServers(windowId, servers) {
+    if (!windowId) return;
+    const normalized = [];
+    for (const value of servers) {
+      const server = normalizePublicBlossomServer(value);
+      if (server) appendUnique(normalized, [server]);
+    }
+    if (normalized.length > 0) windowServers.set(windowId, normalized);
+    else windowServers.delete(windowId);
+  }
   async function discoverServerList(pubkey2) {
     const cached = serverLists.get(pubkey2);
     if (cached && cached.expiresAt > now2()) return [...cached.servers];
@@ -17344,7 +17356,11 @@ function createPajaBlossomEventResolver(options) {
     observe,
     decorate,
     getServers,
-    clearWindow: (windowId) => windows.delete(windowId)
+    setWindowServers,
+    clearWindow(windowId) {
+      windows.delete(windowId);
+      windowServers.delete(windowId);
+    }
   };
 }
 function extractEventResourceLocations(event) {
@@ -20240,7 +20256,11 @@ function createDevServices(backend, getSimulation, relayConfig, onThemeService,
     return wasWebrtcEnabled !== webrtcEnabled || dmChanged;
   }
   refreshAvailability();
-  return { services, refreshAvailability };
+  return {
+    services,
+    refreshAvailability,
+    setWindowBlossomServers: blossomEventResolver.setWindowServers
+  };
 }
 function createPajaAdapter(config, getSimulation, onThemeService, onThemeBroadcast, confirmRequest, signerProvider, getIdentity, onEnvironmentChanged, intentHost, userActivation, notifyOptions, configOptions) {
   const resolveIdentity = (windowId) => getIdentity?.(windowId) ?? {
@@ -20308,6 +20328,7 @@ function createPajaAdapter(config, getSimulation, onThemeService, onThemeBroadca
   });
   return {
     ready,
+    setWindowBlossomServers: serviceBundle.setWindowBlossomServers,
     relayPool: createPajaRelayHooks(relayBackend, getSimulation, relayConfig),
     relayConfig,
     windowManager: { createWindow: () => null },
@@ -20400,7 +20421,7 @@ async function resolvePajaPointer(value, options = {}) {
   const ownsPool = options.pool === void 0;
   try {
     const event = await resolvePointerEvent(pointer, pool, relays, normalizeMaxWaitMs(options.maxWaitMs));
-    const blossomServers = [...options.blossomServers ?? []];
+    const blossomServers = resolvePointerBlossomServers(event, options.blossomServers ?? []);
     const resolved = await resolveNapplet({
       event,
       cache: await openNappletArtifactCache({ requireStorageEstimate: false }),
@@ -20427,6 +20448,20 @@ async function resolvePajaPointer(value, options = {}) {
     }
   }
 }
+function resolvePointerBlossomServers(event, configured) {
+  const servers = [];
+  for (const value of event.tags.flatMap(
+    (tag) => tag[0] === "server" && tag[1] ? [tag[1]] : []
+  )) {
+    const normalized = normalizePublicBlossomServer(value);
+    if (normalized && !servers.includes(normalized)) servers.push(normalized);
+  }
+  for (const value of configured) {
+    const server = normalizePublicBlossomServer(value) ?? value;
+    if (!servers.includes(server)) servers.push(server);
+  }
+  return servers;
+}
 function injectPajaRuntimeCsp(html, origins) {
   const grantedOrigins = [...new Set(origins)].sort();
   const connectSrc = grantedOrigins.length > 0 ? `connect-src ${grantedOrigins.join(" ")}` : "connect-src 'none'";
@@ -21852,6 +21887,9 @@ function resolvedTargetKey(target) {
 function runtimeTabGenerationId(tab) {
   return `${tab.id}:${tab.generation}`;
 }
+function bindRuntimeTabBlossomServers(adapter, windowId, resolvedTarget) {
+  adapter.setWindowBlossomServers(windowId, resolvedTarget.blossomServers);
+}
 function getActiveTab(state) {
   return state.tabs.find((tab) => tab.id === state.activeTabId) ?? null;
 }
@@ -22129,23 +22167,25 @@ function startRuntimeTabNavigation(tab, state, context) {
   tab.status = "booting";
   context.setStatus(state, "booting");
   renderRuntimeTabs(state);
+  const windowId = runtimeTabWindowId(context.config, tab);
+  bindRuntimeTabBlossomServers(context.adapter, windowId, tab.resolvedTarget);
   void context.navigateFrame(
     tab.frame,
     context.config,
     generation,
     context.adapter,
     tab.resolvedTarget,
-    runtimeTabWindowId(context.config, tab),
+    windowId,
     () => tab.generation === generation,
-    (windowId) => {
+    (windowId2) => {
       if (tab.generation !== generation) return;
-      tab.windowId = windowId;
-      if (state.activeTabId === tab.id) context.runtime.currentWindowId = windowId;
+      tab.windowId = windowId2;
+      if (state.activeTabId === tab.id) context.runtime.currentWindowId = windowId2;
     }
-  ).then((windowId) => {
+  ).then((windowId2) => {
     if (tab.generation !== generation) return;
-    tab.windowId = windowId;
-    if (state.activeTabId === tab.id) context.runtime.currentWindowId = windowId;
+    tab.windowId = windowId2;
+    if (state.activeTabId === tab.id) context.runtime.currentWindowId = windowId2;
   }).catch((error) => {
     if (tab.generation !== generation) return;
     tab.frame.removeAttribute("src");