@kehto/shell 0.26.0 → 0.27.0

package/dist/index.js

@@ -28,8 +28,7 @@ function hexToBytes(hex) {
 }
 function createSendToNapplet(originRegistry2) {
   return (windowId, msg) => {
-    const win = originRegistry2.getIframeWindow(windowId);
-    if (win) win.postMessage(msg, "*");
+    originRegistry2.postToNapplet(windowId, msg);
   };
 }
 function createRelayPoolAdapter(shellHooks, originRegistry2) {
@@ -61,8 +60,8 @@ function createRelayPoolAdapter(shellHooks, originRegistry2) {
       shellHooks.relayPool.untrackSubscription(subKey);
     },
     openScopedRelay(windowId, relayUrl, subId, filters, _sendFn) {
-      const win = originRegistry2.getIframeWindow(windowId);
-      if (win) shellHooks.relayPool.openScopedRelay(windowId, relayUrl, subId, filters, win);
+      const target = originRegistry2.getNappletTarget(windowId);
+      if (target) shellHooks.relayPool.openScopedRelay(windowId, relayUrl, subId, filters, target);
     },
     closeScopedRelay(windowId) {
       shellHooks.relayPool.closeScopedRelay(windowId);
@@ -329,7 +328,21 @@ function adaptHooks(shellHooks, deps) {
 
 // src/origin-registry.ts
 var registry = /* @__PURE__ */ new Map();
+var spentWindows = /* @__PURE__ */ new WeakSet();
 var nextRegistrationId = 0;
+function entryFor(windowId) {
+  for (const entry of registry.values()) {
+    if (entry.windowId === windowId) return entry;
+  }
+  return void 0;
+}
+function closePort(entry) {
+  const port = entry.port;
+  if (!port) return;
+  entry.port = void 0;
+  port.onmessage = null;
+  port.close();
+}
 var originRegistry = {
   /**
    * Register a window reference with a windowId and optional identity metadata.
@@ -337,10 +350,17 @@ var originRegistry = {
    * @param win - The iframe's contentWindow reference
    * @param windowId - The unique identifier for this napplet window
    * @param identity - Optional NIP-5D identity metadata (dTag and aggregateHash)
+   * @throws {Error} When `win` already bound a NIP-5D port. NIP-5D identity is
+   *   bound to one document; hosts must create a fresh iframe instead.
    */
   register(win, windowId, identity) {
+    if (spentWindows.has(win)) {
+      throw new Error("NIP-5D: cannot re-bind a napplet identity to an existing iframe; create a fresh iframe");
+    }
     for (const [registeredWin, entry] of registry.entries()) {
       if (registeredWin === win || entry.windowId === windowId) {
+        closePort(entry);
+        if (registeredWin !== win) spentWindows.add(registeredWin);
         registry.delete(registeredWin);
       }
     }
@@ -359,10 +379,73 @@ var originRegistry = {
   unregister(windowId) {
     for (const [win, entry] of registry.entries()) {
       if (entry.windowId === windowId) {
+        closePort(entry);
+        spentWindows.add(win);
         registry.delete(win);
       }
     }
   },
+  /**
+   * Bind the NIP-5D port from a frame's single `napplet.hello`.
+   *
+   * @param windowId - The registered window identifier
+   * @param port - The one port transferred with the hello
+   * @returns `false` when the window is unknown or already bound
+   */
+  bindPort(windowId, port) {
+    for (const [win, entry] of registry.entries()) {
+      if (entry.windowId !== windowId) continue;
+      if (entry.port || spentWindows.has(win)) return false;
+      entry.port = port;
+      spentWindows.add(win);
+      return true;
+    }
+    return false;
+  },
+  /**
+   * Look up the bound NIP-5D port for a window.
+   *
+   * @param windowId - The window identifier
+   * @returns The bound port, or undefined before `napplet.hello`
+   */
+  getPort(windowId) {
+    return entryFor(windowId)?.port;
+  },
+  /**
+   * Send one NAP envelope to a napplet over its bound port. Never falls back
+   * to `iframeWindow.postMessage`.
+   *
+   * @param windowId - The window identifier
+   * @param message - The envelope to send
+   * @returns `true` when a bound port carried the message
+   */
+  postToNapplet(windowId, message) {
+    const port = entryFor(windowId)?.port;
+    if (!port) return false;
+    port.postMessage(message);
+    return true;
+  },
+  /**
+   * Return a port-backed outbound target for one napplet window.
+   *
+   * @param windowId - The window identifier
+   * @returns A target that sends through {@link OriginRegistry.postToNapplet}, or null when unregistered
+   */
+  getNappletTarget(windowId) {
+    if (!entryFor(windowId)) return null;
+    return { postMessage: (message) => {
+      originRegistry.postToNapplet(windowId, message);
+    } };
+  },
+  /**
+   * Whether a Window already handed over (or lost) its one NIP-5D binding.
+   *
+   * @param win - The iframe `contentWindow`
+   * @returns `true` when the Window can never be registered again
+   */
+  isSpent(win) {
+    return spentWindows.has(win);
+  },
   /**
    * Look up the windowId for a given Window reference.
    *
@@ -425,9 +508,11 @@ var originRegistry = {
   getRegistrationId(win) {
     return registry.get(win)?.registrationId;
   },
-  /** Clear all registrations. */
+  /** Clear all registrations and close every bound port. */
   clear() {
+    for (const entry of registry.values()) closePort(entry);
     registry.clear();
+    spentWindows = /* @__PURE__ */ new WeakSet();
   }
 };
 
@@ -913,7 +998,7 @@ var audioManager = {
     bump();
   },
   /**
-   * Mute or unmute an audio source and notify the napplet via postMessage.
+   * Mute or unmute an audio source and notify the napplet over its bound NIP-5D port.
    *
    * @param windowId - The window identifier
    * @param muted - True to mute, false to unmute
@@ -929,8 +1014,7 @@ var audioManager = {
       src.muted = muted;
       bump();
     }
-    const iframeWindow = originRegistry.getIframeWindow(windowId);
-    if (iframeWindow) {
+    if (originRegistry.getPort(windowId)) {
       const muteEvent = {
         kind: 29e3,
         // INC_PEER — inlined numeric after Phase 24 DRIFT-01 shim removal
@@ -941,7 +1025,7 @@ var audioManager = {
         id: `audio-mute-${windowId}-${Date.now()}`,
         sig: ""
       };
-      iframeWindow.postMessage(["EVENT", "__shell__", muteEvent], "*");
+      originRegistry.postToNapplet(windowId, ["EVENT", "__shell__", muteEvent]);
     }
   },
   /**
@@ -1120,7 +1204,7 @@ function handleShellReady({
   }
   const environment = registerSourceSession({ hooks, origin, runtime, state, sourceRegistrationId, sourceWindow, windowId });
   if (!environment?.capabilities.domains.includes("shell")) return;
-  postShellInit(sourceWindow, environment);
+  postShellInit(windowId, environment);
   state.initSent.set(sourceWindow, sourceRegistrationId);
 }
 function registerSourceSession(options) {
@@ -1187,16 +1271,17 @@ function resolveNip5dIdentity(hooks, windowId, sourceWindow, existingSession) {
     aggregateHash: originIdentity.aggregateHash
   });
 }
-function postShellInit(win, environment) {
+function postShellInit(windowId, environment) {
   const initMsg = {
     type: "shell.init",
     capabilities: environment.capabilities,
     services: environment.services
   };
-  win.postMessage(initMsg, "*");
+  originRegistry.postToNapplet(windowId, initMsg);
 }
 
-// src/shell-bridge.ts
+// src/nip5d-transport.ts
+var NAPPLET_HELLO = "napplet.hello";
 function reportUnrouted(hooks, event, reason) {
   if (!hooks.onUnroutedMessage) return;
   const data = event.data;
@@ -1206,6 +1291,138 @@ function reportUnrouted(hooks, event, reason) {
   } catch {
   }
 }
+var REVOCATION_DETAIL = {
+  "window-message": "A window-level message other than the single napplet.hello arrived from the frame",
+  "second-hello": "A second napplet.hello arrived from the frame",
+  "invalid-hello": "napplet.hello did not carry exactly one MessagePort",
+  "second-load": "The frame loaded a second document (navigation or reload)",
+  "port-closed": "The bound NIP-5D port closed or failed",
+  host: "The host revoked the napplet binding"
+};
+function isHello(data) {
+  return typeof data === "object" && data !== null && data.type === NAPPLET_HELLO;
+}
+function createNip5dTransport({ hooks, runtime, state: shellReadyState }) {
+  const bindings = /* @__PURE__ */ new Map();
+  function currentBinding(windowId) {
+    const binding = bindings.get(windowId);
+    if (binding && originRegistry.getPort(windowId) !== binding.port) {
+      binding.port.onmessage = null;
+      bindings.delete(windowId);
+      return void 0;
+    }
+    return binding;
+  }
+  function revokeNapplet(windowId, reason = "host") {
+    const binding = currentBinding(windowId);
+    const registered = originRegistry.getIframeWindow(windowId) !== null;
+    if (!binding && !registered) return;
+    bindings.delete(windowId);
+    if (binding) binding.port.onmessage = null;
+    originRegistry.unregister(windowId);
+    runtime.destroyWindow(windowId);
+    runtime.sessionRegistry.unregister(windowId);
+    shellReadyState.environments.delete(windowId);
+    shellReadyState.sessionRegistration.delete(windowId);
+    try {
+      hooks.onNappletRevoked?.({ windowId, reason, detail: REVOCATION_DETAIL[reason] });
+    } catch {
+    }
+  }
+  function dispatchEnvelope(windowId, binding, msg) {
+    if (typeof msg !== "object" || msg === null || typeof msg.type !== "string") return;
+    const envelope = msg;
+    try {
+      hooks.onNappletMessage?.(windowId, envelope);
+    } catch {
+    }
+    const context = {
+      hooks,
+      origin: binding.origin,
+      runtime,
+      state: shellReadyState,
+      sourceRegistrationId: binding.registrationId,
+      sourceWindow: binding.sourceWindow,
+      windowId
+    };
+    if (!registerSourceSession(context)) return;
+    if (envelope.type === "shell.ready") {
+      handleShellReady(context);
+      return;
+    }
+    runtime.handleMessage(windowId, envelope);
+  }
+  function bindPort(windowId, sourceWindow, origin, port) {
+    if (!originRegistry.bindPort(windowId, port)) {
+      port.close();
+      revokeNapplet(windowId, "second-hello");
+      return;
+    }
+    const binding = {
+      port,
+      sourceWindow,
+      origin,
+      registrationId: originRegistry.getRegistrationId(sourceWindow) ?? 0
+    };
+    bindings.set(windowId, binding);
+    const isCurrent = () => currentBinding(windowId) === binding;
+    port.onmessage = (portEvent) => {
+      if (isCurrent()) dispatchEnvelope(windowId, binding, portEvent.data);
+    };
+    const onPortFailure = () => {
+      if (isCurrent()) revokeNapplet(windowId, "port-closed");
+    };
+    port.addEventListener("close", onPortFailure);
+    port.addEventListener("messageerror", onPortFailure);
+    port.start();
+  }
+  function handleMessage(event) {
+    const sourceWindow = event.source;
+    if (!sourceWindow) {
+      reportUnrouted(hooks, event, "no-source-window");
+      return;
+    }
+    const windowId = originRegistry.getWindowId(sourceWindow);
+    if (!windowId) {
+      reportUnrouted(hooks, event, "unregistered-window");
+      return;
+    }
+    if (currentBinding(windowId) || originRegistry.getPort(windowId)) {
+      revokeNapplet(windowId, isHello(event.data) ? "second-hello" : "window-message");
+      return;
+    }
+    if (!isHello(event.data)) {
+      revokeNapplet(windowId, "window-message");
+      return;
+    }
+    const ports = event.ports ?? [];
+    if (ports.length !== 1) {
+      for (const port of ports) port.close();
+      revokeNapplet(windowId, "invalid-hello");
+      return;
+    }
+    bindPort(windowId, sourceWindow, event.origin, ports[0]);
+  }
+  function observeFrame(frame, windowId) {
+    let loads = 0;
+    const onLoad = () => {
+      loads += 1;
+      if (loads > 1) revokeNapplet(windowId, "second-load");
+    };
+    frame.addEventListener("load", onLoad);
+    return () => frame.removeEventListener("load", onLoad);
+  }
+  function destroy() {
+    for (const [windowId, binding] of bindings) {
+      binding.port.onmessage = null;
+      if (originRegistry.getPort(windowId) === binding.port) originRegistry.unregister(windowId);
+    }
+    bindings.clear();
+  }
+  return { handleMessage, revokeNapplet, observeFrame, destroy };
+}
+
+// src/shell-bridge.ts
 function createShellBridge(hooks) {
   const shellReadyState = createShellReadyState();
   const runtimeHooks = adaptHooks(hooks, {
@@ -1224,52 +1441,17 @@ function createShellBridge(hooks) {
       const environment = shellReadyState.environments.get(entry.windowId);
       if (!environment?.capabilities.domains.includes(domain)) continue;
       if (!runtime.aclState.check(entry.pubkey, entry.dTag, entry.aggregateHash, capability)) continue;
-      const win = originRegistry.getIframeWindow(entry.windowId);
-      if (!win) continue;
-      win.postMessage(envelope, "*");
+      originRegistry.postToNapplet(entry.windowId, envelope);
     }
   }
+  const transport = createNip5dTransport({ hooks, runtime, state: shellReadyState });
   return {
-    handleMessage(event) {
-      const sourceWindow = event.source;
-      if (!sourceWindow) {
-        reportUnrouted(hooks, event, "no-source-window");
-        return;
-      }
-      const windowId = originRegistry.getWindowId(sourceWindow);
-      if (!windowId) {
-        reportUnrouted(hooks, event, "unregistered-window");
-        return;
-      }
-      const msg = event.data;
-      if (typeof msg !== "object" || msg === null || typeof msg.type !== "string") return;
-      if (!registerSourceSession({
-        hooks,
-        origin: event.origin,
-        runtime,
-        state: shellReadyState,
-        sourceRegistrationId: originRegistry.getRegistrationId(sourceWindow) ?? 0,
-        sourceWindow,
-        windowId
-      })) return;
-      if (msg.type === "shell.ready") {
-        handleShellReady({
-          hooks,
-          origin: event.origin,
-          runtime,
-          state: shellReadyState,
-          sourceRegistrationId: originRegistry.getRegistrationId(sourceWindow) ?? 0,
-          sourceWindow,
-          windowId
-        });
-        return;
-      }
-      runtime.handleMessage(windowId, msg);
-    },
+    handleMessage: transport.handleMessage,
     injectEvent(topic, payload) {
       runtime.injectEvent(topic, payload);
     },
     destroy() {
+      transport.destroy();
       runtime.destroy();
       shellReadyState.clear();
     },
@@ -1284,6 +1466,8 @@ function createShellBridge(hooks) {
       const envelope = { type: "identity.changed", pubkey };
       publishToEligibleNapplets(envelope, "identity", "identity:read");
     },
+    observeFrame: transport.observeFrame,
+    revokeNapplet: transport.revokeNapplet,
     get runtime() {
       return runtime;
     }
@@ -1515,15 +1699,19 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
     if (target.crypto?.randomUUID) return target.crypto.randomUUID();
     return `napplet-${Date.now()}-${Math.random().toString(16).slice(2)}`;
   }
+  const channel = new target.MessageChannel();
+  const port = channel.port1;
+  port.start();
+  target.parent.postMessage({ type: "napplet.hello" }, "*", [channel.port2]);
   function post(message) {
-    target.parent.postMessage(message, "*");
+    port.postMessage(message);
   }
   function listen(listener) {
-    target.addEventListener("message", listener);
-    return () => target.removeEventListener("message", listener);
+    port.addEventListener("message", listener);
+    return () => port.removeEventListener("message", listener);
   }
-  function isParentMessage(event) {
-    return event.source === target.parent;
+  function isShellMessage(event) {
+    return event.currentTarget === port;
   }
   function request(message, resultType, map, options = {}) {
     const requestId = message.id ?? id();
@@ -1544,7 +1732,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
         reject(new DOMException("Aborted", "AbortError"));
       };
       off = listen((event) => {
-        if (!isParentMessage(event)) return;
+        if (!isShellMessage(event)) return;
         const incoming = event.data;
         if (typeof incoming !== "object" || incoming === null) return;
         const msg = incoming;
@@ -1649,7 +1837,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       resolveReady = resolve;
     });
     const off = listen((event) => {
-      if (!isParentMessage(event) || environment) return;
+      if (!isShellMessage(event) || environment) return;
       const incoming = event.data;
       if (typeof incoming !== "object" || incoming === null) return;
       const message = incoming;
@@ -1703,7 +1891,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
   }
   function domainEventHandle(eventType, callback, select = (message) => message.event) {
     const off = listen((event) => {
-      if (!isParentMessage(event)) return;
+      if (!isShellMessage(event)) return;
       const msg = event.data;
       if (typeof msg === "object" && msg !== null && msg.type === eventType) callback(select(msg));
     });
@@ -1714,7 +1902,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       subscribe(filters, onEvent, onEose, options) {
         const subId = id();
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg !== "object" || msg === null || msg.subId !== subId) return;
           if (msg.type === "relay.event") onEvent(msg.result);
@@ -1861,7 +2049,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       state.pendingEvents.push(event);
     }
     listen((event) => {
-      if (!isParentMessage(event)) return;
+      if (!isShellMessage(event)) return;
       const msg = event.data;
       if (typeof msg !== "object" || msg === null || typeof msg.type !== "string") return;
       if (msg.type === "inc.channel.opened" && typeof msg.channelId === "string" && typeof msg.peer === "string") {
@@ -1896,14 +2084,14 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
           const handlers = /* @__PURE__ */ new Set();
           const subscriptionId = id();
           const offEvent = listen((event) => {
-            if (!isParentMessage(event)) return;
+            if (!isShellMessage(event)) return;
             const msg = event.data;
             if (typeof msg !== "object" || msg === null || msg.type !== "inc.event" || msg.topic !== stableTopic || typeof msg.sender !== "string") return;
             const delivered = Object.prototype.hasOwnProperty.call(msg, "payload") ? { topic: stableTopic, sender: msg.sender, payload: msg.payload } : { topic: stableTopic, sender: msg.sender };
             for (const handler of handlers) handler(delivered);
           });
           const offResult = listen((event) => {
-            if (!isParentMessage(event)) return;
+            if (!isShellMessage(event)) return;
             const msg = event.data;
             if (typeof msg !== "object" || msg === null || msg.type !== "inc.subscribe.result" || msg.id !== subscriptionId) return;
             offResult();
@@ -1958,9 +2146,9 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
           return request(
             { type: "inc.channel.list" },
             "inc.channel.list.result",
-            (msg) => Object.freeze((Array.isArray(msg.channels) ? msg.channels : []).flatMap((channel) => channel && typeof channel === "object" && typeof channel.id === "string" && typeof channel.peer === "string" ? [Object.freeze({
-              id: channel.id,
-              peer: channel.peer
+            (msg) => Object.freeze((Array.isArray(msg.channels) ? msg.channels : []).flatMap((channel2) => channel2 && typeof channel2 === "object" && typeof channel2.id === "string" && typeof channel2.peer === "string" ? [Object.freeze({
+              id: channel2.id,
+              peer: channel2.peer
             })] : []))
           );
         },
@@ -2022,7 +2210,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       getBadges: () => read("identity.getBadges", "badges", []),
       onChanged(handler) {
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg !== "object" || msg === null || msg.type !== "identity.changed") return;
           if (typeof msg.pubkey === "string") handler(msg.pubkey);
@@ -2036,7 +2224,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       get: () => request({ type: "theme.get" }, "theme.get.result", (msg) => msg.theme),
       onChanged(handler) {
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg === "object" && msg !== null && msg.type === "theme.changed") handler(msg.theme);
         });
@@ -2152,7 +2340,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
     if (keysSmartForwardingInstalled) return;
     keysSmartForwardingInstalled = true;
     listen((event) => {
-      if (!isParentMessage(event)) return;
+      if (!isShellMessage(event)) return;
       const msg = event.data;
       if (typeof msg === "object" && msg !== null && msg.type === "keys.bindings") {
         replaceKeyBindings(msg.bindings);
@@ -2206,7 +2394,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
         }
         callbacks.add(callback);
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg === "object" && msg !== null && msg.type === "keys.action" && msg.actionId === actionId) callback();
         });
@@ -2230,7 +2418,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       console.warn(`[KEHTO-MEDIA-${name}] Deprecated media API; use ${replacement}. Warned once per endpoint.`);
     };
     listen((event) => {
-      if (!isParentMessage(event)) return;
+      if (!isShellMessage(event)) return;
       const msg = event.data;
       if (!msg || typeof msg !== "object" || typeof msg.sessionId !== "string") return;
       const sessionId = msg.sessionId;
@@ -2307,7 +2495,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
   function makeNotify() {
     const on = (type, callback) => {
       const off = listen((event) => {
-        if (!isParentMessage(event)) return;
+        if (!isShellMessage(event)) return;
         const msg = event.data;
         if (typeof msg === "object" && msg !== null && msg.type === type) callback(msg);
       });
@@ -2321,9 +2509,9 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       ),
       dismiss: (notificationId) => fire({ type: "notify.dismiss", notificationId }),
       badge: (count) => fire({ type: "notify.badge", count }),
-      registerChannel: (channel) => fire({ type: "notify.channel.register", ...channel }),
-      requestPermission: (channel) => request(
-        { type: "notify.permission.request", ...channel ? { channel } : {} },
+      registerChannel: (channel2) => fire({ type: "notify.channel.register", ...channel2 }),
+      requestPermission: (channel2) => request(
+        { type: "notify.permission.request", ...channel2 ? { channel: channel2 } : {} },
         "notify.permission.result",
         (msg) => ({ granted: msg.granted })
       ),
@@ -2347,7 +2535,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       get: () => request({ type: "config.get" }, "config.values", (msg) => msg.values ?? {}),
       subscribe(callback) {
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg === "object" && msg !== null && msg.type === "config.values") callback(msg.values ?? {});
         });
@@ -2360,7 +2548,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       openSettings: (options) => fire({ type: "config.openSettings", ...options && typeof options === "object" ? options : {} }),
       onSchemaError(callback) {
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg === "object" && msg !== null && msg.type === "config.schemaError") callback(msg);
         });
@@ -2473,7 +2661,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       close: (server) => req("cvm.close", { server }, (msg) => voidResult(msg, "cvm close failed")),
       onEvent(callback) {
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg === "object" && msg !== null && msg.type === "cvm.event" && msg.server !== void 0 && msg.message !== void 0) {
             callback(msg.server, msg.message);
@@ -2497,7 +2685,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
         const subId = id();
         const handlers = { event: /* @__PURE__ */ new Set(), closed: /* @__PURE__ */ new Set() };
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg !== "object" || msg === null || msg.subId !== subId) return;
           if (msg.type === "outbox.event") for (const handler of handlers.event) handler(msg.result);
@@ -2531,7 +2719,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       status: (uploadId) => request({ type: "upload.status", uploadId }, "upload.status.result", (msg) => fieldOrThrow(msg, "status", "upload status unavailable")),
       onStatus(callback) {
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg === "object" && msg !== null && msg.type === "upload.status.changed" && msg.status !== void 0) callback(msg.status);
         });
@@ -2572,7 +2760,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       }
     }
     listen((event) => {
-      if (!isParentMessage(event)) return;
+      if (!isShellMessage(event)) return;
       const message = event.data;
       if (!message || message.type !== "intent.deliver") return;
       const value = message.delivery;
@@ -2846,7 +3034,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       });
     };
     listen((event) => {
-      if (!isParentMessage(event)) return;
+      if (!isShellMessage(event)) return;
       const incoming = event.data;
       if (!incoming || incoming.type !== "gamepad.state" || "id" in incoming || !valid(incoming)) return;
       state = copy(incoming);
@@ -2882,7 +3070,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
       unsubscribe: (subscriptionId) => req("dm.unsubscribe", { subscriptionId }),
       onMessage(callback) {
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg === "object" && msg !== null && msg.type === "dm.message" && typeof msg.subscriptionId === "string") {
             callback(msg.message, msg.subscriptionId);
@@ -2931,7 +3119,7 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
           post({ type: "llm.cancel", id: id(), requestId });
         };
         const off = listen((event) => {
-          if (!isParentMessage(event)) return;
+          if (!isShellMessage(event)) return;
           const msg = event.data;
           if (typeof msg !== "object" || msg === null) return;
           if (type === "llm.generate" && msg.type === "llm.delta" && msg.requestId === requestId) {
@@ -3265,8 +3453,7 @@ function createKeysProxy(deps) {
       deps.runtime.handleMessage(windowId, envelope);
     },
     emit(windowId, envelope) {
-      const win = deps.originRegistry.getIframeWindow(windowId);
-      if (win) win.postMessage(envelope, "*");
+      deps.originRegistry.postToNapplet(windowId, envelope);
     }
   };
 }
@@ -3278,8 +3465,7 @@ function createMediaProxy(deps) {
       deps.runtime.handleMessage(windowId, envelope);
     },
     emit(windowId, envelope) {
-      const win = deps.originRegistry.getIframeWindow(windowId);
-      if (win) win.postMessage(envelope, "*");
+      deps.originRegistry.postToNapplet(windowId, envelope);
     }
   };
 }
@@ -3291,13 +3477,13 @@ function createNotifyProxy(deps) {
       deps.runtime.handleMessage(windowId, envelope);
     },
     emit(windowId, envelope) {
-      const win = deps.originRegistry.getIframeWindow(windowId);
-      if (win) win.postMessage(envelope, "*");
+      deps.originRegistry.postToNapplet(windowId, envelope);
     }
   };
 }
 export {
   ALL_CAPABILITIES2 as ALL_CAPABILITIES,
+  NAPPLET_HELLO,
   TOPICS,
   adaptHooks,
   audioManager,