@openclaw/nostr 2026.7.2-beta.5 → 2026.7.2-beta.7

package/dist/api.js

@@ -1,15 +1,15 @@
 import { s as resolveNostrAccount } from "./setup-surface-BJCFpe02.js";
 import { getPluginRuntimeGatewayRequestScope } from "./runtime-api.js";
 import { n as NostrProfileSchema } from "./config-schema-CelPzg1N.js";
-import { a as getNostrRuntime, i as contentToProfile, n as nostrPlugin, o as setNostrRuntime, r as publishNostrProfile, t as getNostrProfileState } from "./channel-DNeI-LB-.js";
+import { a as getNostrRuntime, i as contentToProfile, n as nostrPlugin, o as setNostrRuntime, r as publishNostrProfile, t as getNostrProfileState } from "./channel-O6-jXoT5.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { z } from "zod";
 import { SimplePool } from "nostr-tools";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
+import { isBlockedHostnameOrIp, isLoopbackHost } from "openclaw/plugin-sdk/ssrf-runtime";
 import { readJsonBodyWithLimit, requestBodyErrorToText } from "openclaw/plugin-sdk/webhook-request-guards";
 import { createFixedWindowRateLimiter } from "openclaw/plugin-sdk/webhook-ingress";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
-import { isBlockedHostnameOrIp } from "openclaw/plugin-sdk/ssrf-runtime";
 //#region extensions/nostr/src/nostr-profile-url-safety.ts
 function validateUrlSafety(urlStr) {
 	try {
@@ -114,7 +114,11 @@ async function importProfileFromRelays(opts) {
 			error: "No profile found on any relay",
 			relaysQueried
 		};
-		const bestEvent = events.reduce((current, candidate) => candidate.event.created_at > current.event.created_at ? candidate : current);
+		const bestEvent = events.reduce((current, candidate) => {
+			const candidateIsNewer = candidate.event.created_at > current.event.created_at;
+			const candidateWinsTie = candidate.event.created_at === current.event.created_at && candidate.event.id < current.event.id;
+			return candidateIsNewer || candidateWinsTie ? candidate : current;
+		});
 		let parsedContent;
 		try {
 			parsedContent = JSON.parse(bestEvent.event.content);
@@ -230,8 +234,7 @@ function isLoopbackRemoteAddress(remoteAddress) {
 }
 function isLoopbackOriginLike(value) {
 	try {
-		const hostname = normalizeLowercaseStringOrEmpty(new URL(value).hostname);
-		return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1";
+		return isLoopbackHost(new URL(value).hostname);
 	} catch {
 		return false;
 	}

package/dist/{channel-DNeI-LB-.js → channel-O6-jXoT5.js}

@@ -6,14 +6,14 @@ import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { createScopedDmSecurityResolver, createTopLevelChannelConfigAdapter } from "openclaw/plugin-sdk/channel-config-helpers";
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { missingTargetError } from "openclaw/plugin-sdk/channel-feedback";
-import { DEFAULT_INGRESS_ADOPTION_STALL_MS, bindIngressLifecycleToReplyOptions, createChannelIngressMonitor, createChannelMessageAdapterFromOutbound, runPassiveAccountLifecycle } from "openclaw/plugin-sdk/channel-outbound";
+import { DEFAULT_INGRESS_ADOPTION_STALL_MS, bindIngressLifecycleToReplyOptions, createChannelIngressError, createChannelIngressMonitor, createChannelMessageAdapterFromOutbound, runPassiveAccountLifecycle } from "openclaw/plugin-sdk/channel-outbound";
 import { buildPassiveChannelStatusSummary, buildTrafficStatusSummary } from "openclaw/plugin-sdk/extension-shared";
 import { createComputedAccountStatusAdapter } from "openclaw/plugin-sdk/status-helpers";
 import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveStableChannelMessageIngress } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { createChannelPairingController } from "openclaw/plugin-sdk/channel-pairing";
 import { attachChannelToResult } from "openclaw/plugin-sdk/channel-send-result";
-import { stripMarkdown } from "openclaw/plugin-sdk/text-chunking";
+import { chunkTextForOutbound, sanitizeAssistantVisibleText, stripMarkdown } from "openclaw/plugin-sdk/text-chunking";
 import { SimplePool, finalizeEvent, getPublicKey, verifyEvent } from "nostr-tools";
 import { decrypt, encrypt } from "nostr-tools/nip04";
 import { createDirectDmPreCryptoGuardPolicy } from "openclaw/plugin-sdk/direct-dm-guard-policy";
@@ -378,8 +378,8 @@ function createNostrCursorStateWriter(options) {
 var NostrIngressPermanentError = class extends Error {
 	constructor(reason, message, options) {
 		super(message, options);
-		this.name = "NostrIngressPermanentError";
 		this.reason = reason;
+		this.name = "NostrIngressPermanentError";
 	}
 };
 function isNostrIngressRecord(value) {
@@ -426,23 +426,12 @@ const { setRuntime: setNostrRuntime, getRuntime: getNostrRuntime } = createPlugi
 //#endregion
 //#region extensions/nostr/src/nostr-ingress.ts
 const NOSTR_INGRESS_POLL_INTERVAL_MS = 500;
-const NOSTR_INGRESS_PRUNE_INTERVAL_MS = 3600 * 1e3;
-const NOSTR_INGRESS_COMPLETED_TTL_MS = 720 * 60 * 60 * 1e3;
-const NOSTR_INGRESS_COMPLETED_MAX_ENTRIES = 1e5;
-const NOSTR_INGRESS_FAILED_TTL_MS = 720 * 60 * 60 * 1e3;
-const NOSTR_INGRESS_FAILED_MAX_ENTRIES = 1e5;
 const NOSTR_INGRESS_APPEND_RETRY_MS = [
 	0,
 	100,
 	300
 ];
-var NostrIngressAdmissionRejectedError = class extends Error {
-	constructor(reason, message) {
-		super(message);
-		this.name = "NostrIngressAdmissionRejectedError";
-		this.reason = reason;
-	}
-};
+const NostrIngressAdmissionRejectedError = createChannelIngressError("NostrIngressAdmissionRejectedError", { withReason: true });
 function deserializeNostrIngressEvent(rawEvent, claimedId) {
 	let parsed;
 	try {
@@ -467,10 +456,6 @@ function createNostrIngress(options) {
 		queue ??= getNostrRuntime().state.openChannelIngressQueue({ accountId: options.accountId });
 		return queue;
 	};
-	const legacyMigration = migrateNostrLegacyRecentEventIds({
-		queue: getQueue(),
-		eventIds: options.legacyEventIds ?? []
-	});
 	const monitor = createChannelIngressMonitor({
 		queue: getQueue,
 		inspect: (event) => {
@@ -506,11 +491,8 @@ function createNostrIngress(options) {
 		deliver: (event, lifecycle) => options.deliver(event, lifecycle),
 		pollIntervalMs: options.pollIntervalMs ?? NOSTR_INGRESS_POLL_INTERVAL_MS,
 		retention: {
-			pruneIntervalMs: NOSTR_INGRESS_PRUNE_INTERVAL_MS,
-			completedTtlMs: NOSTR_INGRESS_COMPLETED_TTL_MS,
-			completedMaxEntries: NOSTR_INGRESS_COMPLETED_MAX_ENTRIES,
-			failedTtlMs: NOSTR_INGRESS_FAILED_TTL_MS,
-			failedMaxEntries: NOSTR_INGRESS_FAILED_MAX_ENTRIES
+			completedMaxEntries: 1e5,
+			failedMaxEntries: 1e5
 		},
 		drain: {
 			adoptionStallTimeoutMs: options.adoptionStallTimeoutMs ?? DEFAULT_INGRESS_ADOPTION_STALL_MS,
@@ -523,9 +505,14 @@ function createNostrIngress(options) {
 		createStoppedError,
 		onError: (error) => options.onError?.(error, "ingress drain")
 	});
-	const monitorStart = legacyMigration.then(() => {
+	const monitorStart = (async () => {
+		monitor.ensureQueueAvailable();
+		await migrateNostrLegacyRecentEventIds({
+			queue: getQueue(),
+			eventIds: options.legacyEventIds ?? []
+		});
 		if (!stopping) monitor.start();
-	});
+	})();
 	monitorStart.catch((error) => options.onError?.(error, "ingress drain"));
 	let admissionTail = Promise.resolve();
 	const prepareAdmission = (event) => {
@@ -559,7 +546,7 @@ function createNostrIngress(options) {
 		};
 	};
 	const admitOnce = async (prepared) => {
-		await legacyMigration;
+		await monitorStart;
 		const pending = await getQueue().listPending({ limit: options.maxPendingEvents });
 		const claims = await getQueue().listClaims();
 		if (pending.length + claims.length >= options.maxPendingEvents) throw new NostrIngressAdmissionRejectedError("backpressure", "Nostr event exceeds the durable ingress backlog.");
@@ -848,7 +835,7 @@ function createNostrRelaySubscriptionGroup(options) {
 						clearTimeout(deadlineTimer);
 						deadlineTimers.delete(deadlineTimer);
 						settleBackfill(relay, "incomplete");
-						if (!locallyClosing && !options.abort.aborted) options.onClose(relay, reasons);
+						if (!locallyClosing && !options.abort.aborted) options.onClose(relay, reasons.map(({ reason }) => reason));
 					},
 					maxWait: confirmDeadlineMs + LIBRARY_EOSE_TIMEOUT_MARGIN_MS,
 					abort: options.abort
@@ -1492,14 +1479,14 @@ const startNostrGatewayAccount = async (ctx) => {
 						commandAuthorized: resolvedAccess.commandAccess.requested ? resolvedAccess.commandAccess.authorized : void 0,
 						turnAdoptionLifecycle: bindIngressLifecycleToReplyOptions(lifecycle).turnAdoptionLifecycle,
 						deliver: async (payload) => {
-							const outboundText = payload && typeof payload === "object" && "text" in payload ? payload.text ?? "" : "";
-							if (!outboundText.trim()) return;
+							const sanitizedText = sanitizeAssistantVisibleText(payload && typeof payload === "object" && "text" in payload ? payload.text ?? "" : "");
+							if (!sanitizedText) return;
 							const tableMode = runtime.channel.text.resolveMarkdownTableMode({
 								cfg: ctx.cfg,
 								channel: "nostr",
 								accountId: account.accountId
 							});
-							const message = stripMarkdown(runtime.channel.text.convertMarkdownTables(outboundText, tableMode));
+							const message = stripMarkdown(runtime.channel.text.convertMarkdownTables(sanitizedText, tableMode));
 							if (message) await reply(message);
 						},
 						onRecordError: (err) => {
@@ -1564,6 +1551,8 @@ const nostrPairingTextAdapter = {
 const nostrOutboundAdapter = {
 	deliveryMode: "direct",
 	textChunkLimit: 4e3,
+	chunker: chunkTextForOutbound,
+	sanitizeText: ({ text }) => sanitizeAssistantVisibleText(text),
 	deliveryCapabilities: { durableFinal: {
 		text: true,
 		messageSendingHooks: true

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { n as nostrPlugin } from "./channel-DNeI-LB-.js";
+import { n as nostrPlugin } from "./channel-O6-jXoT5.js";
 export { nostrPlugin };

package/node_modules/nostr-tools/lib/cjs/abstract-pool.js

@@ -24,9 +24,6 @@ __export(abstract_pool_exports, {
 });
 module.exports = __toCommonJS(abstract_pool_exports);
 
-// core.ts
-var verifiedSymbol = Symbol("verified");
-
 // utils.ts
 var import_utils = require("@noble/hashes/utils.js");
 var utf8Decoder = new TextDecoder("utf-8");
@@ -221,6 +218,11 @@ var AbstractRelay = class {
     }, backoff);
   }
   handleHardClose(reason) {
+    if (this.ws) {
+      this.ws.onopen = null;
+      this.ws.onerror = null;
+      this.ws.onclose = null;
+    }
     if (this.pingIntervalHandle) {
       clearInterval(this.pingIntervalHandle);
       this.pingIntervalHandle = void 0;
@@ -251,7 +253,6 @@ var AbstractRelay = class {
           if (this.reconnectAttempts === 0) {
             this.skipReconnection = true;
           }
-          this.onclose?.();
           this.handleHardClose("relay connection timed out");
         }, opts.timeout);
       }
@@ -297,7 +298,6 @@ var AbstractRelay = class {
         if (this.reconnectAttempts === 0) {
           this.skipReconnection = true;
         }
-        this.onclose?.();
         this.handleHardClose("relay connection failed");
       };
       this.ws.onclose = (ev) => {
@@ -466,11 +466,17 @@ var AbstractRelay = class {
     }
     this.closeAllSubscriptions("relay connection closed by us");
     this._connected = false;
+    this.connectionPromise = void 0;
     this.idleSince = void 0;
     this.clearIdleTimeout();
     this.onclose?.();
-    if (this.ws?.readyState === this._WebSocket.OPEN) {
-      this.ws?.close();
+    if (this.ws) {
+      this.ws.onopen = null;
+      this.ws.onerror = null;
+      this.ws.onclose = null;
+      if (this.ws.readyState !== this._WebSocket.CLOSING && this.ws.readyState !== this._WebSocket.CLOSED) {
+        this.ws.close();
+      }
     }
   }
   _onmessage(ev) {
@@ -497,7 +503,7 @@ var AbstractRelay = class {
         case "EVENT": {
           const so = this.openSubs.get(data[1]);
           const event = data[2];
-          if (this.verifyEvent(event) && matchFilters(so.filters, event)) {
+          if (matchFilters(so.filters, event) && this.verifyEvent(event, this.url)) {
             so.onevent(event);
           } else {
             so.oninvalidevent?.(event);
@@ -653,12 +659,6 @@ var Subscription = class {
   }
 };
 
-// helpers.ts
-var alwaysTrue = (t) => {
-  t[verifiedSymbol] = true;
-  return true;
-};
-
 // nip45.ts
 var import_sha2 = require("@noble/hashes/sha2.js");
 var import_utils3 = require("@noble/hashes/utils.js");
@@ -685,7 +685,7 @@ function newHll() {
   return new Uint8Array(M);
 }
 function hllDecode(hex) {
-  if (hex.length !== HLL_HEX_LENGTH || !/^[0-9a-fA-F]+$/.test(hex))
+  if (hex.length !== HLL_HEX_LENGTH || !/^[0-9a-f]+$/.test(hex))
     return void 0;
   const registers = new Uint8Array(M);
   for (let i = 0; i < M; i++) {
@@ -726,7 +726,6 @@ var AbstractSimplePool = class {
   enableReconnect;
   idleTimeout = 2e4;
   automaticallyAuth;
-  trustedRelayURLs = /* @__PURE__ */ new Set();
   onRelayConnectionFailure;
   onRelayConnectionSuccess;
   allowConnectingToRelay;
@@ -750,7 +749,7 @@ var AbstractSimplePool = class {
     let relay = this.relays.get(url);
     if (!relay) {
       relay = new AbstractRelay(url, {
-        verifyEvent: this.trustedRelayURLs.has(url) ? alwaysTrue : this.verifyEvent,
+        verifyEvent: this.verifyEvent,
         websocketImplementation: this._WebSocket,
         enablePing: this.enablePing,
         enableReconnect: this.enableReconnect,
@@ -834,11 +833,11 @@ var AbstractSimplePool = class {
       }
     };
     const closesReceived = [];
-    let handleClose = (i, reason) => {
+    let handleClose = (i, url, reason) => {
       if (closesReceived[i])
         return;
       handleEose(i);
-      closesReceived[i] = reason;
+      closesReceived[i] = { url, reason };
       if (closesReceived.filter((a) => a).length === groupedRequests.length) {
         params.onclose?.(closesReceived);
         handleClose = () => {
@@ -856,7 +855,7 @@ var AbstractSimplePool = class {
     const allOpened = Promise.all(
       groupedRequests.map(async ({ url, filters }, i) => {
         if (this.allowConnectingToRelay?.(url, ["read", filters]) === false) {
-          handleClose(i, "connection skipped by allowConnectingToRelay");
+          handleClose(i, url, "connection skipped by allowConnectingToRelay");
           return;
         }
         let relay;
@@ -867,7 +866,7 @@ var AbstractSimplePool = class {
           });
         } catch (err) {
           this.onRelayConnectionFailure?.(url);
-          handleClose(i, err?.message || String(err));
+          handleClose(i, url, err?.message || String(err));
           return;
         }
         this.onRelayConnectionSuccess?.(url);
@@ -881,17 +880,17 @@ var AbstractSimplePool = class {
                   ...params,
                   oneose: () => handleEose(i),
                   onclose: (reason2) => {
-                    handleClose(i, reason2);
+                    handleClose(i, url, reason2);
                   },
                   alreadyHaveEvent: localAlreadyHaveEventHandler,
                   eoseTimeout: params.maxWait,
                   abort: params.abort
                 });
               }).catch((err) => {
-                handleClose(i, `auth was required and attempted, but failed with: ${err}`);
+                handleClose(i, url, `auth was required and attempted, but failed with: ${err}`);
               });
             } else {
-              handleClose(i, reason);
+              handleClose(i, url, reason);
             }
           },
           alreadyHaveEvent: localAlreadyHaveEventHandler,
@@ -919,7 +918,7 @@ var AbstractSimplePool = class {
         if (subcloser)
           subcloser.close(reason);
         else
-          params.onclose?.(relays.map((_) => reason));
+          params.onclose?.(relays.map((url) => ({ url, reason })));
       }
     });
     return subcloser;