@kehto/services 0.13.2 → 0.15.0

package/dist/index.js

@@ -231,9 +231,9 @@ function createNotificationService(options) {
 
 // src/identity-service.ts
 var IDENTITY_SERVICE_VERSION = "1.0.0";
-function sendProviderError(send, result, fallback, err2) {
+function sendProviderError(send, result2, fallback, err2) {
   send({
-    ...result,
+    ...result2,
     error: err2?.message ?? fallback
   });
 }
@@ -251,7 +251,7 @@ function sendOptionalProviderResult(options, send, fallbackResult, errorFallback
     send(fallbackResult);
     return;
   }
-  Promise.resolve(getCurrentPubkey(options)).then((pubkey) => buildResult(pubkey)).then((result) => send(result)).catch((err2) => sendProviderError(send, fallbackResult, errorFallback, err2));
+  Promise.resolve(getCurrentPubkey(options)).then((pubkey) => buildResult(pubkey)).then((result2) => send(result2)).catch((err2) => sendProviderError(send, fallbackResult, errorFallback, err2));
 }
 function sendIdentityError(send, id, typeBase, error) {
   send({ type: `${typeBase}.error`, id, error });
@@ -262,21 +262,21 @@ function sendSignerError(send, id, typeBase, fallback, err2) {
 function handleGetPublicKey(options, id, send) {
   const signer = options.getSigner();
   if (!signer) {
-    const result = {
+    const result2 = {
       type: "identity.getPublicKey.result",
       id,
       pubkey: ""
     };
-    send(result);
+    send(result2);
     return;
   }
   Promise.resolve(signer.getPublicKey?.()).then((pubkey) => {
-    const result = {
+    const result2 = {
       type: "identity.getPublicKey.result",
       id,
       pubkey: pubkey ?? ""
     };
-    send(result);
+    send(result2);
   }).catch((err2) => sendSignerError(send, id, "identity.getPublicKey", "getPublicKey failed", err2));
 }
 function handleGetRelays(options, id, send) {
@@ -286,12 +286,12 @@ function handleGetRelays(options, id, send) {
     return;
   }
   Promise.resolve(signer.getRelays?.() ?? {}).then((relays) => {
-    const result = {
+    const result2 = {
       type: "identity.getRelays.result",
       id,
       relays
     };
-    send(result);
+    send(result2);
   }).catch((err2) => sendSignerError(send, id, "identity.getRelays", "getRelays failed", err2));
 }
 function handleReadProvider(options, id, message, send) {
@@ -426,6 +426,7 @@ function createIdentityService(options) {
 }
 
 // src/relay-pool-service.ts
+import { createRelayEventResultWithHints } from "@kehto/runtime";
 var EOSE_FALLBACK_MS = 15e3;
 function createRelayPoolService(options) {
   const tracked = /* @__PURE__ */ new Map();
@@ -470,7 +471,7 @@ function createRelayPoolService(options) {
             }
             return;
           }
-          send({ type: "relay.event", subId, event: item });
+          send({ type: "relay.event", subId, result: createRelayEventResultWithHints(item, relayUrls2) });
         }, relayUrls2);
         tracked.set(subKey, { handle, eoseTimer });
         return;
@@ -516,6 +517,7 @@ function createRelayPoolService(options) {
 }
 
 // src/cache-service.ts
+import { createRelayEventResult } from "@kehto/runtime";
 function createCacheService(options) {
   return {
     descriptor: {
@@ -535,7 +537,7 @@ function createCacheService(options) {
         }
         options.query(filters).then((events) => {
           for (const event of events) {
-            send({ type: "relay.event", subId, event });
+            send({ type: "relay.event", subId, result: createRelayEventResult(event) });
           }
           send({ type: "relay.eose", subId });
         }).catch(() => {
@@ -560,7 +562,94 @@ function createCacheService(options) {
   };
 }
 
+// src/count-service.ts
+var DEFAULT_MAX_FILTERS = 16;
+function createCountService(options) {
+  return {
+    descriptor: {
+      name: "count",
+      version: "1.0.0",
+      description: "Runtime-mediated NIP-01 filter counts"
+    },
+    handleMessage(windowId, message, send) {
+      if (message.type !== "count.query") return;
+      const countMessage = message;
+      const id = typeof countMessage.id === "string" ? countMessage.id : "";
+      const filters = countMessage.filters;
+      if (!isValidFilterArray(filters)) {
+        send(result(id, { ok: false, error: "invalid-filter", reason: "count.query requires a non-empty filters array" }));
+        return;
+      }
+      const maxFilters = options.maxFilters ?? DEFAULT_MAX_FILTERS;
+      if (filters.length > maxFilters) {
+        send(result(id, { ok: false, error: "too-expensive", reason: `count.query accepts at most ${maxFilters} filters` }));
+        return;
+      }
+      for (let i = 0; i < filters.length; i++) {
+        const supported = options.isFilterSupported?.(filters[i], i) ?? true;
+        if (supported !== true) {
+          send(result(id, {
+            ok: false,
+            error: "unsupported-filter",
+            reason: typeof supported === "string" ? supported : `filter ${i} is not supported by this count backend`
+          }));
+          return;
+        }
+      }
+      const request = {
+        filters,
+        windowId,
+        ...isPlainObject(countMessage.options) ? { options: countMessage.options } : {}
+      };
+      Promise.resolve(options.count(request)).then((countResult) => {
+        send(result(id, normalizeCountResult(countResult)));
+      }).catch((error) => {
+        send(result(id, {
+          ok: false,
+          error: "count-unavailable",
+          reason: error instanceof Error ? error.message : "count backend failed"
+        }));
+      });
+    }
+  };
+}
+function result(id, value) {
+  return {
+    type: "count.query.result",
+    id,
+    ok: value.ok,
+    ...typeof value.count === "number" ? { count: value.count } : {},
+    ...typeof value.approximate === "boolean" ? { approximate: value.approximate } : {},
+    ...typeof value.hll === "string" ? { hll: value.hll } : {},
+    ...Array.isArray(value.relays) ? { relays: value.relays.filter((relay) => typeof relay === "string") } : {},
+    ...typeof value.error === "string" ? { error: value.error } : {},
+    ...typeof value.reason === "string" ? { reason: value.reason } : {}
+  };
+}
+function normalizeCountResult(value) {
+  if (typeof value === "number") {
+    return Number.isFinite(value) && value >= 0 ? { ok: true, count: Math.floor(value), approximate: false } : { ok: false, error: "count-unavailable", reason: "count backend returned an invalid count" };
+  }
+  const count = typeof value.count === "number" && Number.isFinite(value.count) && value.count >= 0 ? Math.floor(value.count) : void 0;
+  return {
+    ok: value.ok === true,
+    ...count !== void 0 ? { count } : {},
+    ...typeof value.approximate === "boolean" ? { approximate: value.approximate } : {},
+    ...typeof value.hll === "string" ? { hll: value.hll } : {},
+    ...Array.isArray(value.relays) ? { relays: value.relays } : {},
+    ...typeof value.error === "string" ? { error: value.error } : {},
+    ...typeof value.reason === "string" ? { reason: value.reason } : {}
+  };
+}
+function isValidFilterArray(value) {
+  return Array.isArray(value) && value.length > 0 && value.every((filter) => isPlainObject(filter));
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/coordinated-relay.ts
+import { createRelayEventResult as createRelayEventResult2, createRelayEventResultWithHints as createRelayEventResultWithHints2 } from "@kehto/runtime";
 var DEFAULT_EOSE_TIMEOUT_MS = 15e3;
 function createCoordinatedRelay(options) {
   const timeoutMs = options.eoseTimeoutMs ?? DEFAULT_EOSE_TIMEOUT_MS;
@@ -583,10 +672,13 @@ function createCoordinatedRelay(options) {
     handleMessage(windowId, message, send) {
       const relayMessage = message;
       if (message.type === "relay.subscribe") {
-        let deliver2 = function(event) {
+        let deliver2 = function(event, relayHints) {
           if (tracked.seenIds.has(event.id)) return;
           tracked.seenIds.add(event.id);
-          if (subs.has(subKey)) send({ type: "relay.event", subId, event });
+          if (subs.has(subKey)) {
+            const result2 = relayHints ? createRelayEventResultWithHints2(event, relayHints) : createRelayEventResult2(event);
+            send({ type: "relay.event", subId, result: result2 });
+          }
         };
         var deliver = deliver2;
         const subId = relayMessage.subId;
@@ -642,7 +734,7 @@ function createCoordinatedRelay(options) {
               maybeSendEose(subKey, subId, send);
               return;
             }
-            deliver2(item);
+            deliver2(item, relayUrls2);
             if (cacheAvailable) {
               try {
                 options.cache.store(item);
@@ -807,13 +899,13 @@ function createKeysService(options = {}) {
                 return;
               }
             }
-            const result = {
+            const result2 = {
               type: "keys.registerAction.result",
               id: m.id,
               actionId: m.action.id,
               ...m.action.defaultKey ? { binding: m.action.defaultKey } : {}
             };
-            send(result);
+            send(result2);
             return;
           }
           case "keys.unregisterAction": {
@@ -954,13 +1046,13 @@ function createKeysService(options = {}) {
               return;
             }
           }
-          const result = {
+          const result2 = {
             type: "keys.registerAction.result",
             id: m.id,
             actionId: m.action.id,
             ...m.action.defaultKey ? { binding: m.action.defaultKey } : {}
           };
-          send(result);
+          send(result2);
           return;
         }
         case "keys.unregisterAction": {
@@ -1391,12 +1483,12 @@ function createNotifyService(options = {}) {
         case "notify.send": {
           const m = message;
           options.onSend?.(windowId, m);
-          const result = {
+          const result2 = {
             type: "notify.send.result",
             id: m.id,
             notificationId: gen()
           };
-          send(result);
+          send(result2);
           return;
         }
         case "notify.dismiss":
@@ -1405,12 +1497,12 @@ function createNotifyService(options = {}) {
           return;
         case "notify.permission.request": {
           const m = message;
-          const result = {
+          const result2 = {
             type: "notify.permission.result",
             id: m.id,
             granted: defaultGrant
           };
-          send(result);
+          send(result2);
           return;
         }
         default: {
@@ -1451,12 +1543,12 @@ function createThemeService(options = {}) {
     handleMessage(_windowId, message, send) {
       const id = message.id ?? "";
       if (message.type === "theme.get") {
-        const result = {
+        const result2 = {
           type: "theme.get.result",
           id,
           theme: currentTheme
         };
-        send(result);
+        send(result2);
         return;
       }
       send({
@@ -1580,14 +1672,14 @@ function createConfigService(options) {
         case "config.registerSchema": {
           const m = message;
           const validation = options.registerSchema ? options.registerSchema(windowId, m.schema, m.version) : validateCoreSubset(m.schema);
-          const result = validation.ok ? { type: "config.registerSchema.result", id: m.id, ok: true } : {
+          const result2 = validation.ok ? { type: "config.registerSchema.result", id: m.id, ok: true } : {
             type: "config.registerSchema.result",
             id: m.id,
             ok: false,
             code: validation.code,
             error: validation.error
           };
-          send(result);
+          send(result2);
           return;
         }
         case "config.openSettings": {
@@ -1958,45 +2050,42 @@ function buildEventQuery(eventId, eventOptions) {
   if (eventOptions?.timeoutMs !== void 0) queryOptions.timeoutMs = eventOptions.timeoutMs;
   return { filter, queryOptions };
 }
-function eventResultFromQuery(eventId, result) {
-  const event = result.events.find((candidate) => candidate.id === eventId);
-  const eventResult = {
-    relays: event ? result.relays[eventId] ?? [] : []
-  };
-  if (event) eventResult.event = event;
-  if (!event) eventResult.error = result.error ?? "not found";
-  else if (result.error !== void 0) eventResult.error = result.error;
-  if (result.incomplete !== void 0) eventResult.incomplete = result.incomplete;
+function eventResultFromQuery(eventId, result2) {
+  const relayResult = result2.events.find((candidate) => candidate.event.id === eventId);
+  const eventResult = {};
+  if (relayResult) eventResult.result = relayResult;
+  if (!relayResult) eventResult.error = result2.error ?? "not found";
+  else if (result2.error !== void 0) eventResult.error = result2.error;
+  if (result2.incomplete !== void 0) eventResult.incomplete = result2.incomplete;
   return eventResult;
 }
 function fallbackGetEvent(router, eventId, eventOptions) {
   const { filter, queryOptions } = buildEventQuery(eventId, eventOptions);
-  return router.query([filter], queryOptions).then((result) => eventResultFromQuery(eventId, result));
+  return router.query([filter], queryOptions).then((result2) => eventResultFromQuery(eventId, result2));
 }
-function sendEventResult(id, eventId, result, send) {
-  if (result.event && result.event.id !== eventId) {
-    send({ type: "outbox.getEvent.result", id, relays: [], error: "not found" });
+function sendEventResult(id, eventId, result2, send) {
+  if (result2.result && result2.result.event.id !== eventId) {
+    send({ type: "outbox.getEvent.result", id, error: "not found" });
     return;
   }
   send({
     type: "outbox.getEvent.result",
     id,
-    ...result.event === void 0 ? {} : { event: result.event },
-    relays: result.relays,
-    ...result.incomplete === void 0 ? {} : { incomplete: result.incomplete },
-    ...result.error === void 0 ? {} : { error: result.error }
+    ...result2.result === void 0 ? {} : { result: result2.result },
+    ...result2.incomplete === void 0 ? {} : { incomplete: result2.incomplete },
+    ...result2.error === void 0 ? {} : { error: result2.error }
   });
 }
 function handleGetEvent(router, msg, send) {
   const m = msg;
   const id = m.id ?? "";
   if (typeof m.eventId !== "string" || m.eventId.length === 0) {
-    send({ type: "outbox.getEvent.result", id, relays: [], error: "invalid filter" });
+    send({ type: "outbox.getEvent.result", id, error: "invalid filter" });
     return;
   }
   const getEvent = router.getEvent ?? ((eventId, eventOptions) => fallbackGetEvent(router, eventId, eventOptions));
-  void getEvent(m.eventId, m.options).then((result) => sendEventResult(id, m.eventId, result, send)).catch(
-    (err2) => send({ type: "outbox.getEvent.result", id, relays: [], error: toErrorMessage(err2) })
+  void getEvent(m.eventId, m.options).then((result2) => sendEventResult(id, m.eventId, result2, send)).catch(
+    (err2) => send({ type: "outbox.getEvent.result", id, error: toErrorMessage(err2) })
   );
 }
 function createOutboxService(options) {
@@ -2010,20 +2099,19 @@ function createOutboxService(options) {
     const id = m.id ?? "";
     const filters = normalizeFilters(m.filters);
     if (!filters) {
-      send({ type: "outbox.query.result", id, events: [], relays: {}, error: "invalid filter" });
+      send({ type: "outbox.query.result", id, events: [], error: "invalid filter" });
       return;
     }
     void router.query(filters, m.options).then(
-      (result) => send({
+      (result2) => send({
         type: "outbox.query.result",
         id,
-        events: result.events,
-        relays: result.relays,
-        ...result.incomplete === void 0 ? {} : { incomplete: result.incomplete },
-        ...result.error === void 0 ? {} : { error: result.error }
+        events: result2.events,
+        ...result2.incomplete === void 0 ? {} : { incomplete: result2.incomplete },
+        ...result2.error === void 0 ? {} : { error: result2.error }
       })
     ).catch(
-      (err2) => send({ type: "outbox.query.result", id, events: [], relays: {}, error: toErrorMessage(err2) })
+      (err2) => send({ type: "outbox.query.result", id, events: [], error: toErrorMessage(err2) })
     );
   }
   function handleSubscribe(windowId, msg, send) {
@@ -2039,8 +2127,7 @@ function createOutboxService(options) {
       return;
     }
     const sink = {
-      event: (event, relay) => send({ type: "outbox.event", subId, event, ...relay === void 0 ? {} : { relay } }),
-      eose: () => send({ type: "outbox.eose", subId }),
+      event: (result2) => send({ type: "outbox.event", subId, result: result2 }),
       closed: (reason) => {
         subscriptions.delete(subKey);
         send({ type: "outbox.closed", subId, ...reason === void 0 ? {} : { reason } });
@@ -2065,14 +2152,14 @@ function createOutboxService(options) {
       return;
     }
     void router.publish(m.event, m.options).then(
-      (result) => send({
+      (result2) => send({
         type: "outbox.publish.result",
         id,
-        ok: result.ok,
-        ...result.event === void 0 ? {} : { event: result.event },
-        ...result.eventId === void 0 ? {} : { eventId: result.eventId },
-        ...result.relays === void 0 ? {} : { relays: result.relays },
-        ...result.error === void 0 ? {} : { error: result.error }
+        ok: result2.ok,
+        ...result2.event === void 0 ? {} : { event: result2.event },
+        ...result2.eventId === void 0 ? {} : { eventId: result2.eventId },
+        ...result2.relays === void 0 ? {} : { relays: result2.relays },
+        ...result2.error === void 0 ? {} : { error: result2.error }
       })
     ).catch(
       (err2) => send({ type: "outbox.publish.result", id, ok: false, error: toErrorMessage(err2) })
@@ -2133,6 +2220,7 @@ function toErrorMessage(err2) {
 }
 
 // src/relay-pool-outbox-router.ts
+import { createRelayEventResultWithHints as createRelayEventResultWithHints3 } from "@kehto/runtime";
 var DEFAULT_QUERY_TIMEOUT_MS = 4e3;
 function defaultRelayAllowed(url) {
   return typeof url === "string" && (url.startsWith("wss://") || url.startsWith("ws://"));
@@ -2206,10 +2294,10 @@ function admitEvent(ctx, collector, event) {
   );
 }
 function buildCollectResult(collector, timedOut) {
-  const events = [...collector.seen.values()];
-  const relayObj = {};
-  for (const event of events) relayObj[event.id] = [...collector.relayMap.get(event.id) ?? []];
-  return { events, relayMap: relayObj, incomplete: timedOut };
+  const events = [...collector.seen.values()].map(
+    (event) => createRelayEventResultWithHints3(event, [...collector.relayMap.get(event.id) ?? []])
+  );
+  return { events, incomplete: timedOut };
 }
 function collectFromRelays(ctx, filters, relayUrls2, timeoutMs) {
   return new Promise((resolve) => {
@@ -2254,28 +2342,28 @@ function relayPoolSubscribe(ctx, filters, relayUrl, cb) {
 }
 async function queryImpl(ctx, filters, options) {
   if (!ctx.relayPool.isAvailable()) {
-    return { events: [], relays: {}, incomplete: true, error: "relay list unavailable" };
+    return { events: [], incomplete: true, error: "relay list unavailable" };
   }
   const strategy = options?.strategy ?? "auto";
   const authors = deriveAuthors(filters, options?.authors);
   const plan = await resolvePlan(ctx, authors, "read", strategy, options?.relays);
   if (plan.relays.length === 0) {
-    return { events: [], relays: {}, incomplete: true, error: "relay list unavailable" };
+    return { events: [], incomplete: true, error: "relay list unavailable" };
   }
   const timeoutMs = options?.timeoutMs ?? ctx.defaultTimeoutMs;
   const collected = await collectFromRelays(ctx, filters, plan.relays, timeoutMs);
   const incomplete = collected.incomplete || (plan.missingAuthors?.length ?? 0) > 0;
   let events = collected.events;
   if (options?.limit !== void 0 && events.length > options.limit) {
-    events = [...events].sort((a, b) => b.created_at - a.created_at).slice(0, options.limit);
+    events = [...events].sort((a, b) => b.event.created_at - a.event.created_at).slice(0, options.limit);
   }
-  const result = { events, relays: collected.relayMap };
-  if (incomplete) result.incomplete = true;
-  return result;
+  const result2 = { events };
+  if (incomplete) result2.incomplete = true;
+  return result2;
 }
 async function getEventImpl(ctx, eventId, options) {
   if (typeof eventId !== "string" || eventId.length === 0) {
-    return { relays: [], error: "invalid filter" };
+    return { error: "invalid filter" };
   }
   const filter = { ids: [eventId] };
   const queryOptions = { limit: 1 };
@@ -2287,15 +2375,13 @@ async function getEventImpl(ctx, eventId, options) {
   if (options?.strategy !== void 0) queryOptions.strategy = options.strategy;
   if (options?.timeoutMs !== void 0) queryOptions.timeoutMs = options.timeoutMs;
   const queryResult = await queryImpl(ctx, [filter], queryOptions);
-  const event = queryResult.events.find((candidate) => candidate.id === eventId);
-  const result = {
-    relays: event ? queryResult.relays[eventId] ?? [] : []
-  };
-  if (event) result.event = event;
-  if (!event) result.error = queryResult.error ?? "not found";
-  else if (queryResult.error !== void 0) result.error = queryResult.error;
-  if (queryResult.incomplete !== void 0) result.incomplete = queryResult.incomplete;
-  return result;
+  const eventResult = queryResult.events.find((candidate) => candidate.event.id === eventId);
+  const result2 = {};
+  if (eventResult) result2.result = eventResult;
+  if (!eventResult) result2.error = queryResult.error ?? "not found";
+  else if (queryResult.error !== void 0) result2.error = queryResult.error;
+  if (queryResult.incomplete !== void 0) result2.incomplete = queryResult.incomplete;
+  return result2;
 }
 function closeLiveSub(sub) {
   for (const handle of sub.handles) {
@@ -2313,7 +2399,6 @@ function attachLiveRelay(ctx, sub, filters, relayUrl, live, sink) {
       sub.eoseCount += 1;
       if (!sub.eoseSent && sub.eoseCount >= sub.relayCount) {
         sub.eoseSent = true;
-        sink.eose();
         if (!live) {
           sub.closed = true;
           closeLiveSub(sub);
@@ -2326,7 +2411,7 @@ function attachLiveRelay(ctx, sub, filters, relayUrl, live, sink) {
     void ctx.verify(item).then((ok) => {
       if (!ok || sub.closed || sub.seen.has(item.id)) return;
       sub.seen.add(item.id);
-      sink.event(item, relayUrl);
+      sink.event(createRelayEventResultWithHints3(item, [relayUrl]));
     });
   }));
 }
@@ -2384,9 +2469,9 @@ async function publishImpl(ctx, template, options) {
     return { ok: false, event: signed, eventId: signed.id, error: err2 instanceof Error ? err2.message : "publish failed" };
   }
   const ok = Object.values(relays).some(Boolean);
-  const result = { ok, event: signed, eventId: signed.id, relays };
-  if (!ok) result.error = "publish denied";
-  return result;
+  const result2 = { ok, event: signed, eventId: signed.id, relays };
+  if (!ok) result2.error = "publish denied";
+  return result2;
 }
 function createRelayPoolOutboxRouter(options) {
   if (!options || typeof options.relayPool !== "object" || options.relayPool === null) {
@@ -2496,8 +2581,8 @@ function createUploadService(options) {
         send({ type: "upload.status.changed", status: stamped });
       }
     };
-    void uploader.upload(request, ctx).then((result) => {
-      const stamped = { ...result, uploadId };
+    void uploader.upload(request, ctx).then((result2) => {
+      const stamped = { ...result2, uploadId };
       const entry = entries.get(key);
       if (entry) entry.status = { ...stamped, updatedAt: now() };
       send({ type: "upload.upload.result", id, result: stamped });
@@ -2634,7 +2719,7 @@ async function uploadNip96(args) {
 function fromNip94Tags(uploadId, rail, tags, fallbackSize, fallbackSha) {
   const get = (name) => tags.find((t) => t[0] === name)?.[1];
   const url = get("url");
-  const result = {
+  const result2 = {
     ok: Boolean(url),
     uploadId,
     status: url ? "complete" : "failed",
@@ -2642,19 +2727,19 @@ function fromNip94Tags(uploadId, rail, tags, fallbackSize, fallbackSha) {
     sha256: get("x") ?? fallbackSha,
     nip94: tags
   };
-  if (url) result.url = url;
+  if (url) result2.url = url;
   const ox = get("ox");
-  if (ox) result.originalSha256 = ox;
+  if (ox) result2.originalSha256 = ox;
   const size = get("size");
-  result.size = size ? Number(size) : fallbackSize;
+  result2.size = size ? Number(size) : fallbackSize;
   const m = get("m");
-  if (m) result.mimeType = m;
+  if (m) result2.mimeType = m;
   const dim = parseDimensions(get("dim"));
-  if (dim) result.dimensions = dim;
+  if (dim) result2.dimensions = dim;
   const blurhash = get("blurhash");
-  if (blurhash) result.blurhash = blurhash;
-  if (!url) result.error = "server returned no url";
-  return result;
+  if (blurhash) result2.blurhash = blurhash;
+  if (!url) result2.error = "server returned no url";
+  return result2;
 }
 async function uploadBlossom(args) {
   const { request, ctx, server, bytes, sha256, signEvent, fetchFn, nowS } = args;
@@ -2683,7 +2768,7 @@ async function uploadBlossom(args) {
   if (!blob.url) {
     return failed(ctx.uploadId, "blossom", "server returned no url", sha256);
   }
-  const result = {
+  const result2 = {
     ok: true,
     uploadId: ctx.uploadId,
     status: "complete",
@@ -2692,8 +2777,8 @@ async function uploadBlossom(args) {
     sha256: blob.sha256 ?? sha256,
     size: blob.size ?? bytes.byteLength
   };
-  if (blob.type) result.mimeType = blob.type;
-  return result;
+  if (blob.type) result2.mimeType = blob.type;
+  return result2;
 }
 function failed(uploadId, rail, error, sha256) {
   return { ok: false, uploadId, status: "failed", rail, error, ...sha256 ? { sha256 } : {} };
@@ -2781,7 +2866,7 @@ function createIntentService(options) {
       send,
       "intent.invoke.result",
       id,
-      (result) => ({ type: "intent.invoke.result", id, result })
+      (result2) => ({ type: "intent.invoke.result", id, result: result2 })
     );
   }
   function handleAvailable(msg, send) {
@@ -3111,12 +3196,12 @@ async function handleOpen(options, windowId, message, send) {
     return;
   }
   try {
-    const result = await options.open({ windowId, url: parsed, options: message.options });
+    const result2 = await options.open({ windowId, url: parsed, options: message.options });
     send({
       type: "link.open.result",
       id: message.id,
-      status: result.status,
-      ...result.status === "denied" ? { error: "blocked-by-policy" } : {}
+      status: result2.status,
+      ...result2.status === "denied" ? { error: "blocked-by-policy" } : {}
     });
   } catch {
     send(denied(message.id, "blocked-by-policy"));
@@ -3188,7 +3273,7 @@ function settleMutation(hook, message, context, send, resultType) {
     () => hook(message.list, message.items, message.options, context),
     send,
     (error) => ({ type: resultType, id: message.id, ok: false, error: "list-unavailable", reason: error }),
-    (result) => ({ type: resultType, id: message.id, ...result })
+    (result2) => ({ type: resultType, id: message.id, ...result2 })
   );
 }
 function createListsService(options = {}) {
@@ -3274,7 +3359,7 @@ function createSerialService(options = {}) {
           () => options.open(serialMessage.request, context),
           send,
           (error) => ({ type: "serial.open.result", id, error }),
-          (result) => ({ type: "serial.open.result", id, session: result.session })
+          (result2) => ({ type: "serial.open.result", id, session: result2.session })
         );
         return;
       }
@@ -3371,7 +3456,7 @@ function createBleService(options = {}) {
           () => options.open(bleMessage.request, context),
           send,
           (error) => ({ type: "ble.open.result", id, error }),
-          (result) => ({ type: "ble.open.result", id, session: result.session })
+          (result2) => ({ type: "ble.open.result", id, session: result2.session })
         );
         return;
       }
@@ -3524,7 +3609,7 @@ function createWebrtcService(options = {}) {
           () => options.open(webrtcMessage.request, context),
           send,
           (error) => ({ type: "webrtc.open.result", id, error }),
-          (result) => ({ type: "webrtc.open.result", id, session: result.session })
+          (result2) => ({ type: "webrtc.open.result", id, session: result2.session })
         );
         return;
       }
@@ -3675,7 +3760,7 @@ function decodeNrelay(value) {
 function convertBits(data, fromBits, toBits, pad) {
   let acc = 0;
   let bits = 0;
-  const result = [];
+  const result2 = [];
   const maxv = (1 << toBits) - 1;
   const maxAcc = (1 << fromBits + toBits - 1) - 1;
   for (const value of data) {
@@ -3684,15 +3769,15 @@ function convertBits(data, fromBits, toBits, pad) {
     bits += fromBits;
     while (bits >= toBits) {
       bits -= toBits;
-      result.push(acc >> bits & maxv);
+      result2.push(acc >> bits & maxv);
     }
   }
   if (pad) {
-    if (bits > 0) result.push(acc << toBits - bits & maxv);
+    if (bits > 0) result2.push(acc << toBits - bits & maxv);
   } else if (bits >= fromBits || (acc << toBits - bits & maxv) !== 0) {
     throw new Error("invalid bech32 padding");
   }
-  return result;
+  return result2;
 }
 function settle5(call, send, okFalse, onValue) {
   let pending;
@@ -3712,14 +3797,14 @@ function createCommonService(options = {}) {
       const context = { windowId };
       if (message.type === "common.encodeNip19") {
         const input = message.input;
-        const result = input ? encodeNip19(input) : { ok: false, error: "invalid input" };
-        send({ type: "common.encodeNip19.result", id, ...result });
+        const result2 = input ? encodeNip19(input) : { ok: false, error: "invalid input" };
+        send({ type: "common.encodeNip19.result", id, ...result2 });
         return;
       }
       if (message.type === "common.decodeNip19") {
         const value = message.value;
-        const result = typeof value === "string" ? decodeNip19Value(value) : { ok: false, error: "invalid value" };
-        send({ type: "common.decodeNip19.result", id, ...result });
+        const result2 = typeof value === "string" ? decodeNip19Value(value) : { ok: false, error: "invalid value" };
+        send({ type: "common.decodeNip19.result", id, ...result2 });
         return;
       }
       if (message.type === "common.getProfile") {
@@ -3732,7 +3817,7 @@ function createCommonService(options = {}) {
           () => options.getProfile(target, context),
           send,
           (error) => ({ type: "common.getProfile.result", id, ok: false, pubkey: target ?? "", error }),
-          (result) => ({ type: "common.getProfile.result", id, ...result })
+          (result2) => ({ type: "common.getProfile.result", id, ...result2 })
         );
         return;
       }
@@ -3745,7 +3830,7 @@ function createCommonService(options = {}) {
           () => options.follows(context),
           send,
           (error) => ({ type: "common.follows.result", id, ok: false, pubkeys: [], error }),
-          (result) => ({ type: "common.follows.result", id, ...result })
+          (result2) => ({ type: "common.follows.result", id, ...result2 })
         );
         return;
       }
@@ -3769,7 +3854,7 @@ function createCommonService(options = {}) {
           () => options.react(m.targetEventId, m.reaction, m.customEmojiHref, context),
           send,
           (error) => ({ type: "common.react.result", id, ok: false, error }),
-          (result) => ({ type: "common.react.result", id, ...result })
+          (result2) => ({ type: "common.react.result", id, ...result2 })
         );
         return;
       }
@@ -3783,7 +3868,7 @@ function createCommonService(options = {}) {
           () => options.report(m.target, m.reason, m.text, context),
           send,
           (error) => ({ type: "common.report.result", id, ok: false, error }),
-          (result) => ({ type: "common.report.result", id, ...result })
+          (result2) => ({ type: "common.report.result", id, ...result2 })
         );
         return;
       }
@@ -3806,7 +3891,7 @@ function settleAction(action, pubkeys, context, send, resultType, id, unavailabl
     () => action(pubkeys, context),
     send,
     (error) => ({ type: resultType, id, ok: false, error }),
-    (result) => ({ type: resultType, id, ...result })
+    (result2) => ({ type: resultType, id, ...result2 })
   );
 }
 
@@ -3861,7 +3946,7 @@ function createDmService(options) {
           );
           return;
         case "dm.send":
-          void adapter.send(message).then((result) => send({ type: "dm.send.result", id: requestId, ...result })).catch((error) => send({ type: "dm.send.result", id: requestId, error: err(error) }));
+          void adapter.send(message).then((result2) => send({ type: "dm.send.result", id: requestId, ...result2 })).catch((error) => send({ type: "dm.send.result", id: requestId, error: err(error) }));
           return;
         case "dm.subscribe": {
           let activeSubscriptionId = "";
@@ -4463,6 +4548,7 @@ export {
   createCoordinatedRelay,
   createCordnDmAdapter,
   createCordnRelayCoordinatorClient,
+  createCountService,
   createCvmService,
   createDmService,
   createHttpUploader,