@kehto/services 0.10.1 → 0.11.1

package/dist/index.js

@@ -14,12 +14,12 @@ function createAudioService(options) {
   return {
     descriptor,
     handleMessage(windowId, message, send) {
-      if (message.type !== "ifc.emit") return;
-      const ifcMessage = message;
-      const topic = typeof ifcMessage.topic === "string" ? ifcMessage.topic : void 0;
+      if (message.type !== "inc.emit") return;
+      const incMessage = message;
+      const topic = typeof incMessage.topic === "string" ? incMessage.topic : void 0;
       if (!topic?.startsWith("audio:")) return;
       const action = topic.slice(6);
-      const payload = ifcMessage.payload && typeof ifcMessage.payload === "object" ? ifcMessage.payload : {};
+      const payload = incMessage.payload && typeof incMessage.payload === "object" ? incMessage.payload : {};
       switch (action) {
         case "register": {
           const nappletClass = typeof payload.nappletClass === "string" ? payload.nappletClass : "";
@@ -51,7 +51,7 @@ function createAudioService(options) {
             source.muted = muted;
             notify2();
           }
-          send({ type: "ifc.event", topic: "napplet:audio-muted", payload: { muted } });
+          send({ type: "inc.event", topic: "napplet:audio-muted", payload: { muted } });
           break;
         }
         default:
@@ -168,13 +168,13 @@ function handleNotifyEnvelope(store, windowId, action, msg, send) {
       break;
   }
 }
-function handleIfcNotification(store, windowId, action, payload, send) {
+function handleIncNotification(store, windowId, action, payload, send) {
   switch (action) {
     case "create": {
       const title = typeof payload.title === "string" ? payload.title : "";
       const body = typeof payload.body === "string" ? payload.body : "";
       const notification = createNotification(store, windowId, title, body);
-      send({ type: "ifc.event", topic: "notifications:created", payload: { id: notification.id } });
+      send({ type: "inc.event", topic: "notifications:created", payload: { id: notification.id } });
       break;
     }
     case "dismiss": {
@@ -189,7 +189,7 @@ function handleIfcNotification(store, windowId, action, payload, send) {
     }
     case "list": {
       const windowNotifs = store.notifications.get(windowId) ?? [];
-      send({ type: "ifc.event", topic: "notifications:listed", payload: { notifications: windowNotifs } });
+      send({ type: "inc.event", topic: "notifications:listed", payload: { notifications: windowNotifs } });
       break;
     }
     default:
@@ -215,11 +215,11 @@ function createNotificationService(options) {
         handleNotifyEnvelope(store, windowId, message.type.slice(7), msg, send);
         return;
       }
-      if (message.type !== "ifc.emit") return;
+      if (message.type !== "inc.emit") return;
       const topic = msg.topic;
       if (!topic?.startsWith("notifications:")) return;
       const payload = msg.payload ?? {};
-      handleIfcNotification(store, windowId, topic.slice(14), payload, send);
+      handleIncNotification(store, windowId, topic.slice(14), payload, send);
     },
     onWindowDestroyed(windowId) {
       if (store.notifications.delete(windowId)) {
@@ -231,124 +231,193 @@ function createNotificationService(options) {
 
 // src/identity-service.ts
 var IDENTITY_SERVICE_VERSION = "1.0.0";
+function sendProviderError(send, result, fallback, err) {
+  send({
+    ...result,
+    error: err?.message ?? fallback
+  });
+}
+async function getCurrentPubkey(options) {
+  const currentSigner = options.getSigner();
+  if (!currentSigner?.getPublicKey) return "";
+  try {
+    return await currentSigner.getPublicKey() ?? "";
+  } catch {
+    return "";
+  }
+}
+function sendOptionalProviderResult(options, send, fallbackResult, errorFallback, buildResult) {
+  if (!buildResult) {
+    send(fallbackResult);
+    return;
+  }
+  Promise.resolve(getCurrentPubkey(options)).then((pubkey) => buildResult(pubkey)).then((result) => send(result)).catch((err) => sendProviderError(send, fallbackResult, errorFallback, err));
+}
+function sendIdentityError(send, id, typeBase, error) {
+  send({ type: `${typeBase}.error`, id, error });
+}
+function sendSignerError(send, id, typeBase, fallback, err) {
+  sendIdentityError(send, id, typeBase, err?.message ?? fallback);
+}
+function handleGetPublicKey(options, id, send) {
+  const signer = options.getSigner();
+  if (!signer) {
+    const result = {
+      type: "identity.getPublicKey.result",
+      id,
+      pubkey: ""
+    };
+    send(result);
+    return;
+  }
+  Promise.resolve(signer.getPublicKey?.()).then((pubkey) => {
+    const result = {
+      type: "identity.getPublicKey.result",
+      id,
+      pubkey: pubkey ?? ""
+    };
+    send(result);
+  }).catch((err) => sendSignerError(send, id, "identity.getPublicKey", "getPublicKey failed", err));
+}
+function handleGetRelays(options, id, send) {
+  const signer = options.getSigner();
+  if (!signer) {
+    sendIdentityError(send, id, "identity.getRelays", "no signer configured");
+    return;
+  }
+  Promise.resolve(signer.getRelays?.() ?? {}).then((relays) => {
+    const result = {
+      type: "identity.getRelays.result",
+      id,
+      relays
+    };
+    send(result);
+  }).catch((err) => sendSignerError(send, id, "identity.getRelays", "getRelays failed", err));
+}
+function handleReadProvider(options, id, message, send) {
+  switch (message.type) {
+    case "identity.getProfile":
+      sendOptionalProviderResult(
+        options,
+        send,
+        { type: "identity.getProfile.result", id, profile: null },
+        "getProfile failed",
+        options.getProfile ? async (pubkey) => ({
+          type: "identity.getProfile.result",
+          id,
+          profile: await options.getProfile(pubkey, message)
+        }) : void 0
+      );
+      return true;
+    case "identity.getFollows":
+      sendOptionalProviderResult(
+        options,
+        send,
+        { type: "identity.getFollows.result", id, pubkeys: [] },
+        "getFollows failed",
+        options.getFollows ? async (pubkey) => ({
+          type: "identity.getFollows.result",
+          id,
+          pubkeys: await options.getFollows(pubkey, message)
+        }) : void 0
+      );
+      return true;
+    case "identity.getList":
+      handleGetList(options, id, message, send);
+      return true;
+    case "identity.getZaps":
+      sendOptionalProviderResult(
+        options,
+        send,
+        { type: "identity.getZaps.result", id, zaps: [] },
+        "getZaps failed",
+        options.getZaps ? async (pubkey) => ({
+          type: "identity.getZaps.result",
+          id,
+          zaps: await options.getZaps(pubkey, message)
+        }) : void 0
+      );
+      return true;
+    case "identity.getMutes":
+      sendOptionalProviderResult(
+        options,
+        send,
+        { type: "identity.getMutes.result", id, pubkeys: [] },
+        "getMutes failed",
+        options.getMutes ? async (pubkey) => ({
+          type: "identity.getMutes.result",
+          id,
+          pubkeys: await options.getMutes(pubkey, message)
+        }) : void 0
+      );
+      return true;
+    case "identity.getBlocked":
+      sendOptionalProviderResult(
+        options,
+        send,
+        { type: "identity.getBlocked.result", id, pubkeys: [] },
+        "getBlocked failed",
+        options.getBlocked ? async (pubkey) => ({
+          type: "identity.getBlocked.result",
+          id,
+          pubkeys: await options.getBlocked(pubkey, message)
+        }) : void 0
+      );
+      return true;
+    case "identity.getBadges":
+      sendOptionalProviderResult(
+        options,
+        send,
+        { type: "identity.getBadges.result", id, badges: [] },
+        "getBadges failed",
+        options.getBadges ? async (pubkey) => ({
+          type: "identity.getBadges.result",
+          id,
+          badges: await options.getBadges(pubkey, message)
+        }) : void 0
+      );
+      return true;
+    default:
+      return false;
+  }
+}
+function handleGetList(options, id, message, send) {
+  sendOptionalProviderResult(
+    options,
+    send,
+    { type: "identity.getList.result", id, entries: [] },
+    "getList failed",
+    options.getList ? async (pubkey) => ({
+      type: "identity.getList.result",
+      id,
+      entries: await options.getList(message.listType, pubkey, message)
+    }) : void 0
+  );
+}
+function handleIdentityServiceMessage(options, message, send) {
+  const id = message.id ?? "";
+  switch (message.type) {
+    case "identity.getPublicKey":
+      handleGetPublicKey(options, id, send);
+      return;
+    case "identity.getRelays":
+      handleGetRelays(options, id, send);
+      return;
+    default:
+      if (!handleReadProvider(options, id, message, send)) {
+        sendIdentityError(send, id, message.type, `Unknown identity method: ${message.type}`);
+      }
+  }
+}
 function createIdentityService(options) {
   return {
     descriptor: {
       name: "identity",
       version: IDENTITY_SERVICE_VERSION,
-      description: "NIP-5D identity NUB reference handler (9 read-only identity queries)"
+      description: "NIP-5D identity NAP reference handler (9 read-only identity queries)"
     },
     handleMessage(_windowId, message, send) {
-      const id = message.id ?? "";
-      function sendError(typeBase, error) {
-        send({ type: `${typeBase}.error`, id, error });
-      }
-      function sendSignerError(typeBase, fallback, err) {
-        sendError(typeBase, err?.message ?? fallback);
-      }
-      const signer = options.getSigner();
-      switch (message.type) {
-        case "identity.getPublicKey": {
-          if (!signer) {
-            const result = {
-              type: "identity.getPublicKey.result",
-              id,
-              pubkey: ""
-            };
-            send(result);
-            return;
-          }
-          Promise.resolve(signer.getPublicKey?.()).then((pubkey) => {
-            const result = {
-              type: "identity.getPublicKey.result",
-              id,
-              pubkey: pubkey ?? ""
-            };
-            send(result);
-          }).catch((err) => sendSignerError("identity.getPublicKey", "getPublicKey failed", err));
-          return;
-        }
-        case "identity.getRelays": {
-          if (!signer) {
-            sendError("identity.getRelays", "no signer configured");
-            return;
-          }
-          Promise.resolve(signer.getRelays?.() ?? {}).then((relays) => {
-            const result = {
-              type: "identity.getRelays.result",
-              id,
-              relays
-            };
-            send(result);
-          }).catch((err) => sendSignerError("identity.getRelays", "getRelays failed", err));
-          return;
-        }
-        case "identity.getProfile": {
-          const result = {
-            type: "identity.getProfile.result",
-            id,
-            profile: null
-          };
-          send(result);
-          return;
-        }
-        case "identity.getFollows": {
-          const result = {
-            type: "identity.getFollows.result",
-            id,
-            pubkeys: []
-          };
-          send(result);
-          return;
-        }
-        case "identity.getList": {
-          const result = {
-            type: "identity.getList.result",
-            id,
-            entries: []
-          };
-          send(result);
-          return;
-        }
-        case "identity.getZaps": {
-          const result = {
-            type: "identity.getZaps.result",
-            id,
-            zaps: []
-          };
-          send(result);
-          return;
-        }
-        case "identity.getMutes": {
-          const result = {
-            type: "identity.getMutes.result",
-            id,
-            pubkeys: []
-          };
-          send(result);
-          return;
-        }
-        case "identity.getBlocked": {
-          const result = {
-            type: "identity.getBlocked.result",
-            id,
-            pubkeys: []
-          };
-          send(result);
-          return;
-        }
-        case "identity.getBadges": {
-          const result = {
-            type: "identity.getBadges.result",
-            id,
-            badges: []
-          };
-          send(result);
-          return;
-        }
-        default:
-          sendError(message.type, `Unknown identity method: ${message.type}`);
-      }
+      handleIdentityServiceMessage(options, message, send);
     },
     // Identity service has no per-window state to clean up.
     onWindowDestroyed(_windowId) {
@@ -383,7 +452,8 @@ function createRelayPoolService(options) {
           send({ type: "relay.eose", subId });
           return;
         }
-        const relayUrls = options.selectRelayTier(filters);
+        const relayHint = typeof relayMessage.relay === "string" && relayMessage.relay.length > 0 ? relayMessage.relay : void 0;
+        const relayUrls = relayHint ? [relayHint] : options.selectRelayTier(filters);
         let eoseSent = false;
         const eoseTimer = setTimeout(() => {
           if (!eoseSent) {
@@ -563,7 +633,8 @@ function createCoordinatedRelay(options) {
               maybeSendEose(subKey, subId, send);
             }
           }, timeoutMs);
-          const relayUrls = options.relayPool.selectRelayTier(filters);
+          const relayHint = typeof relayMessage.relay === "string" && relayMessage.relay.length > 0 ? relayMessage.relay : void 0;
+          const relayUrls = relayHint ? [relayHint] : options.relayPool.selectRelayTier(filters);
           tracked.relayHandle = options.relayPool.subscribe(filters, (item) => {
             if (item === "EOSE") {
               clearTimeout(tracked.eoseTimer);
@@ -656,7 +727,7 @@ function createKeysService(options = {}) {
   const descriptor = {
     name: "keys",
     version: KEYS_SERVICE_VERSION,
-    description: options.hostBridge ? "NIP-5D keys NUB reference handler (host-bridge delegated)" : "NIP-5D keys NUB reference handler (document-level chord listener)"
+    description: options.hostBridge ? "NIP-5D keys NAP reference handler (host-bridge delegated)" : "NIP-5D keys NAP reference handler (document-level chord listener)"
   };
   function chordSpecKey(spec) {
     return `${spec.ctrl}|${spec.alt}|${spec.shift}|${spec.meta}|${spec.key}`;
@@ -979,8 +1050,8 @@ function createBrowserMediaBridge(opts = {}) {
   }
   function applyActionHandlers(actions = DEFAULT_MEDIA_ACTIONS) {
     if (!ms) return;
-    for (const [domAction, nubAction] of ACTION_MATRIX) {
-      if (!actions.includes(nubAction)) {
+    for (const [domAction, napAction] of ACTION_MATRIX) {
+      if (!actions.includes(napAction)) {
         try {
           ms.setActionHandler(domAction, null);
         } catch {
@@ -989,9 +1060,9 @@ function createBrowserMediaBridge(opts = {}) {
       }
       ms.setActionHandler(domAction, (details) => {
         if (!activeSessionId) return;
-        const value = nubAction === "seek" && typeof details?.seekTime === "number" ? details.seekTime : void 0;
+        const value = napAction === "seek" && typeof details?.seekTime === "number" ? details.seekTime : void 0;
         for (const cb of actionCallbacks) {
-          cb(activeSessionId, nubAction, value);
+          cb(activeSessionId, napAction, value);
         }
       });
     }
@@ -1275,7 +1346,7 @@ function createMediaService(options = {}) {
   const descriptor = {
     name: "media",
     version: MEDIA_SERVICE_VERSION,
-    description: options.hostBridge ? "NIP-5D media NUB reference handler (host-bridge delegated)" : "NIP-5D media NUB reference handler (navigator.mediaSession mirror)"
+    description: options.hostBridge ? "NIP-5D media NAP reference handler (host-bridge delegated)" : "NIP-5D media NAP reference handler (navigator.mediaSession mirror)"
   };
   const bridge = options.hostBridge ?? createBrowserMediaBridge({
     mediaSessionTarget: options.mediaSessionTarget,
@@ -1311,7 +1382,7 @@ function createNotifyService(options = {}) {
   const descriptor = {
     name: "notify",
     version: NOTIFY_SERVICE_VERSION,
-    description: "NIP-5D notify NUB reference handler (stub)"
+    description: "NIP-5D notify NAP reference handler (stub)"
   };
   return {
     descriptor,
@@ -1373,7 +1444,7 @@ function createThemeService(options = {}) {
   const descriptor = {
     name: "theme",
     version: THEME_SERVICE_VERSION,
-    description: "NIP-5D theme NUB reference handler"
+    description: "NIP-5D theme NAP reference handler"
   };
   const handler = {
     descriptor,
@@ -1475,7 +1546,7 @@ function createConfigService(options) {
   const descriptor = {
     name: "config",
     version: CONFIG_SERVICE_VERSION,
-    description: "NUB-CONFIG reference service \u2014 shell-writes, napplet-reads configuration"
+    description: "NAP-CONFIG reference service \u2014 shell-writes, napplet-reads configuration"
   };
   const handler = {
     descriptor,
@@ -1672,7 +1743,7 @@ function createResourceService(options) {
   const descriptor = {
     name: "resource",
     version: RESOURCE_SERVICE_VERSION,
-    description: "NUB-RESOURCE reference service \u2014 shell-proxied authenticated fetch (RESOURCE-01..06)"
+    description: "NAP-RESOURCE reference service \u2014 shell-proxied authenticated fetch (RESOURCE-01..06)"
   };
   const handler = {
     descriptor,