@kehto/paja 0.5.1 → 0.6.0

package/dist/browser-host.js

@@ -1079,6 +1079,41 @@ function createEventBuffer(sendToNapplet, sessionRegistry2, enforce, subscriptio
     }
   };
 }
+function stringList(value) {
+  if (!Array.isArray(value)) return void 0;
+  const out = [...new Set(value.filter((item) => typeof item === "string" && item.length > 0))];
+  return out.length > 0 ? out : void 0;
+}
+function sidecarFromUnknown(value) {
+  if (!value || typeof value !== "object") return void 0;
+  const input = value;
+  const sidecar = {};
+  if (Array.isArray(input.resources) && input.resources.length > 0) sidecar.resources = input.resources;
+  const relayHints = stringList(input.relayHints);
+  if (relayHints) sidecar.relayHints = relayHints;
+  return sidecar.resources || sidecar.relayHints ? sidecar : void 0;
+}
+function createRelayEventResult(event, sidecar) {
+  const normalized = sidecarFromUnknown(sidecar);
+  return normalized ? { event, sidecar: normalized } : { event };
+}
+function createRelayEventResultWithHints(event, relayHints) {
+  return createRelayEventResult(event, relayHints && relayHints.length > 0 ? { relayHints } : void 0);
+}
+function relayEventResultFromCarrier(carrier) {
+  if (carrier.result && typeof carrier.result === "object") {
+    const result2 = carrier.result;
+    if (result2.event && typeof result2.event === "object") return createRelayEventResult(result2.event, result2.sidecar);
+  }
+  if (carrier.event && typeof carrier.event === "object") {
+    const sidecar = sidecarFromUnknown(carrier.sidecar) ?? sidecarFromUnknown({ resources: carrier.resources });
+    const relayHints = typeof carrier.relay === "string" && carrier.relay.length > 0 ? [carrier.relay] : void 0;
+    const merged = sidecar ? { ...sidecar } : {};
+    if (relayHints) merged.relayHints = relayHints;
+    return createRelayEventResult(carrier.event, merged);
+  }
+  return null;
+}
 function notifyServiceWindowDestroyed(windowId, services) {
   for (const handler of Object.values(services)) {
     try {
@@ -1119,6 +1154,15 @@ function relayServiceFrom(context) {
 function isShellKindQuery(filters) {
   return filters.length > 0 && filters.every((filter) => filter.kinds?.every((kind) => kind >= 29e3 && kind < 3e4));
 }
+function sendRelayEvent(hooks, windowId, subId, result2) {
+  hooks.sendToNapplet(windowId, { type: "relay.event", subId, result: result2 });
+}
+function normalizeRelayServiceResponse(resp) {
+  const m = resp;
+  if (m.type !== "relay.event") return resp;
+  const result2 = relayEventResultFromCarrier(m);
+  return result2 ? { type: "relay.event", subId: m.subId, result: result2 } : resp;
+}
 function handleRelaySubscribe(context, windowId, msg, m) {
   const { eventBuffer, hooks, serviceRegistry, subscriptions } = context;
   const subId = m.subId ?? "";
@@ -1127,11 +1171,11 @@ function handleRelaySubscribe(context, windowId, msg, m) {
   const subKey = `${windowId}:${subId}`;
   subscriptions.set(subKey, { windowId, filters });
   const seenIds = /* @__PURE__ */ new Set();
-  function deliver(event) {
+  function deliver(event, relayHints) {
     if (seenIds.has(event.id)) return;
     seenIds.add(event.id);
     if (subscriptions.has(subKey)) {
-      hooks.sendToNapplet(windowId, { type: "relay.event", subId, event });
+      sendRelayEvent(hooks, windowId, subId, createRelayEventResultWithHints(event, relayHints));
     }
   }
   for (const bufferedEvent of eventBuffer.getBufferedEvents()) {
@@ -1143,12 +1187,12 @@ function handleRelaySubscribe(context, windowId, msg, m) {
   if (!isShellKind && relayService) {
     relayService.handleMessage(windowId, msg, (resp) => {
       if (!subscriptions.has(subKey)) return;
-      hooks.sendToNapplet(windowId, resp);
+      hooks.sendToNapplet(windowId, normalizeRelayServiceResponse(resp));
     });
     if (cacheService) {
       cacheService.handleMessage(windowId, msg, (resp) => {
         if (!subscriptions.has(subKey)) return;
-        hooks.sendToNapplet(windowId, resp);
+        hooks.sendToNapplet(windowId, normalizeRelayServiceResponse(resp));
       });
     }
     return;
@@ -1188,10 +1232,11 @@ function deliverFromRuntimeBackends(context, windowId, subId, subKey, filters, i
       }
       return;
     }
-    deliver(item);
+    const event = item;
+    deliver(event, relayUrls);
     if (cache2?.isAvailable() && !isShellKind) {
       try {
-        cache2.store(item);
+        cache2.store(event);
       } catch {
         return;
       }
@@ -1330,7 +1375,7 @@ function handleRelayQuery(context, windowId, m) {
   for (const event of eventBuffer.getBufferedEvents()) {
     if (matchesAnyFilter(event, filters) && !seenIds.has(event.id)) {
       seenIds.add(event.id);
-      events.push(event);
+      events.push(createRelayEventResult(event));
     }
   }
   let settled = false;
@@ -1363,9 +1408,10 @@ function handleRelayQuery(context, windowId, m) {
     }, makeCollector2 = function() {
       return function collector(resp) {
         const r = resp;
-        if (r.type === "relay.event" && r.event && !seenIds.has(r.event.id)) {
-          seenIds.add(r.event.id);
-          events.push(r.event);
+        const result2 = r.type === "relay.event" ? relayEventResultFromCarrier(r) : null;
+        if (result2 && !seenIds.has(result2.event.id)) {
+          seenIds.add(result2.event.id);
+          events.push(result2);
         } else if (r.type === "relay.eose") {
           onBackendEose2();
         }
@@ -1407,7 +1453,7 @@ function handleRelayQuery(context, windowId, m) {
       for (const event of cachedEvents) {
         if (!seenIds.has(event.id)) {
           seenIds.add(event.id);
-          events.push(event);
+          events.push(createRelayEventResult(event));
         }
       }
     }).catch(() => {
@@ -1434,7 +1480,7 @@ function handleRelayQuery(context, windowId, m) {
     const event = item;
     if (!seenIds.has(event.id)) {
       seenIds.add(event.id);
-      events.push(event);
+      events.push(createRelayEventResultWithHints(event, relayUrls));
     }
     if (cache2?.isAvailable()) {
       try {
@@ -7499,7 +7545,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;
@@ -8878,12 +8924,10 @@ function buildEventQuery(eventId, eventOptions) {
   return { filter, queryOptions };
 }
 function eventResultFromQuery(eventId, result2) {
-  const event = result2.events.find((candidate) => candidate.id === eventId);
-  const eventResult = {
-    relays: event ? result2.relays[eventId] ?? [] : []
-  };
-  if (event) eventResult.event = event;
-  if (!event) eventResult.error = result2.error ?? "not found";
+  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;
@@ -8893,15 +8937,14 @@ function fallbackGetEvent(router, eventId, eventOptions) {
   return router.query([filter], queryOptions).then((result2) => eventResultFromQuery(eventId, result2));
 }
 function sendEventResult(id, eventId, result2, send) {
-  if (result2.event && result2.event.id !== eventId) {
-    send({ type: "outbox.getEvent.result", id, relays: [], error: "not found" });
+  if (result2.result && result2.result.event.id !== eventId) {
+    send({ type: "outbox.getEvent.result", id, error: "not found" });
     return;
   }
   send({
     type: "outbox.getEvent.result",
     id,
-    ...result2.event === void 0 ? {} : { event: result2.event },
-    relays: result2.relays,
+    ...result2.result === void 0 ? {} : { result: result2.result },
     ...result2.incomplete === void 0 ? {} : { incomplete: result2.incomplete },
     ...result2.error === void 0 ? {} : { error: result2.error }
   });
@@ -8910,12 +8953,12 @@ 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((result2) => sendEventResult(id, m.eventId, result2, send)).catch(
-    (err2) => send({ type: "outbox.getEvent.result", id, relays: [], error: toErrorMessage(err2) })
+    (err2) => send({ type: "outbox.getEvent.result", id, error: toErrorMessage(err2) })
   );
 }
 function createOutboxService(options) {
@@ -8929,7 +8972,7 @@ 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(
@@ -8937,12 +8980,11 @@ function createOutboxService(options) {
         type: "outbox.query.result",
         id,
         events: result2.events,
-        relays: result2.relays,
         ...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 handleSubscribe2(windowId, msg, send) {
@@ -8958,8 +9000,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 } });
@@ -10478,13 +10519,13 @@ function createOutboxRouter(pool, getSimulation, confirmRequest, signerProvider)
           error: () => resolve(out)
         });
       });
-      return { events, relays: Object.fromEntries(events.map((event) => [event.id, relayUrls])) };
+      return { events: events.map((event) => createRelayEventResultWithHints(event, relayUrls)) };
     },
     subscribe(filters, _options, sink) {
       const relayUrls = getRelayUrls(getSimulation());
       const sub = pool.subscription(relayUrls, filters).subscribe((item) => {
-        if (item === "EOSE") sink.eose();
-        else sink.event(item, relayUrls[0]);
+        if (item === "EOSE") return;
+        sink.event(createRelayEventResultWithHints(item, relayUrls[0] ? [relayUrls[0]] : relayUrls));
       });
       return { close: () => sub.unsubscribe() };
     },