@openclaw/nostr 2026.7.2-beta.1 → 2026.7.2-beta.2

package/dist/api.js

@@ -1,10 +1,10 @@
-import { o as resolveNostrAccount } from "./setup-surface-CKamwGa3.js";
+import { o as resolveNostrAccount } from "./setup-surface-B52P4uo2.js";
 import { getPluginRuntimeGatewayRequestScope } from "./runtime-api.js";
 import { n as NostrProfileSchema } from "./config-schema-CelPzg1N.js";
-import { a as setNostrRuntime, i as getNostrRuntime, n as nostrPlugin, o as contentToProfile, r as publishNostrProfile, t as getNostrProfileState } from "./channel-BZfbDZcY.js";
+import { a as setNostrRuntime, i as getNostrRuntime, n as nostrPlugin, o as contentToProfile, r as publishNostrProfile, t as getNostrProfileState } from "./channel-B51rExHD.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { z } from "zod";
-import { SimplePool, verifyEvent } from "nostr-tools";
+import { SimplePool } from "nostr-tools";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { readJsonBodyWithLimit, requestBodyErrorToText } from "openclaw/plugin-sdk/webhook-request-guards";
@@ -79,69 +79,42 @@ async function importProfileFromRelays(opts) {
 		relaysQueried: []
 	};
 	const pool = new SimplePool();
-	const relaysQueried = [];
-	const timers = [];
-	const scheduleTimeout = (callback) => {
-		const timer = setTimeout(callback, timeoutMs);
-		timer.unref?.();
-		timers.push(timer);
-		return timer;
-	};
+	const relaysQueried = [...relays];
+	let deadlineTimer;
+	const deadline = new Promise((resolve) => {
+		deadlineTimer = setTimeout(resolve, timeoutMs);
+		deadlineTimer.unref?.();
+	});
+	const subscriptions = [];
 	try {
 		const events = [];
-		const timeoutPromise = new Promise((resolve) => {
-			scheduleTimeout(resolve);
-		});
-		const subscriptionPromise = new Promise((resolve) => {
-			let completed = 0;
-			for (const relay of relays) {
-				relaysQueried.push(relay);
-				const profileFilter = {
-					kinds: [0],
-					authors: [pubkey],
-					limit: 1
-				};
-				const sub = pool.subscribeMany([relay], profileFilter, {
-					onevent(event) {
-						events.push({
-							event,
-							relay
-						});
-					},
-					oneose() {
-						completed++;
-						if (completed >= relays.length) resolve();
-					},
-					onclose() {
-						completed++;
-						if (completed >= relays.length) resolve();
-					}
-				});
-				scheduleTimeout(() => {
-					sub.close();
-				});
-			}
-		});
-		await Promise.race([subscriptionPromise, timeoutPromise]);
-		for (const timer of timers.splice(0)) clearTimeout(timer);
+		await Promise.race([Promise.all(relays.map((relay) => new Promise((resolve) => {
+			const subscription = pool.subscribeMany([relay], {
+				kinds: [0],
+				authors: [pubkey],
+				limit: 1
+			}, {
+				onevent(event) {
+					events.push({
+						event,
+						relay
+					});
+				},
+				oneose() {
+					resolve();
+				},
+				onclose() {
+					resolve();
+				}
+			});
+			subscriptions.push(subscription);
+		}))), deadline]);
 		if (events.length === 0) return {
 			ok: false,
 			error: "No profile found on any relay",
 			relaysQueried
 		};
-		let bestEvent = null;
-		for (const item of events) if (!bestEvent || item.event.created_at > bestEvent.event.created_at) bestEvent = item;
-		if (!bestEvent) return {
-			ok: false,
-			error: "No valid profile event found",
-			relaysQueried
-		};
-		if (!verifyEvent(bestEvent.event)) return {
-			ok: false,
-			error: "Profile event has invalid signature",
-			relaysQueried,
-			sourceRelay: bestEvent.relay
-		};
+		const bestEvent = events.reduce((current, candidate) => candidate.event.created_at > current.event.created_at ? candidate : current);
 		let content;
 		try {
 			content = JSON.parse(bestEvent.event.content);
@@ -165,7 +138,8 @@ async function importProfileFromRelays(opts) {
 			sourceRelay: bestEvent.relay
 		};
 	} finally {
-		for (const timer of timers) clearTimeout(timer);
+		if (deadlineTimer) clearTimeout(deadlineTimer);
+		for (const subscription of subscriptions) subscription.close();
 		pool.close(relays);
 	}
 }

package/dist/{channel-BZfbDZcY.js → channel-B51rExHD.js}

@@ -1,4 +1,4 @@
-import { a as resolveDefaultNostrAccountId, c as validatePrivateKey, i as listNostrAccountIds, n as nostrSetupWizard, o as resolveNostrAccount, s as normalizePubkey, t as nostrSetupAdapter } from "./setup-surface-CKamwGa3.js";
+import { a as resolveDefaultNostrAccountId, c as validatePrivateKey, i as listNostrAccountIds, n as nostrSetupWizard, o as resolveNostrAccount, s as normalizePubkey, t as nostrSetupAdapter } from "./setup-surface-B52P4uo2.js";
 import { a as collectStatusIssuesFromLastError, i as buildChannelConfigSchema, n as NostrProfileSchema, o as createDefaultChannelRuntimeState, r as DEFAULT_ACCOUNT_ID, s as formatPairingApproveHint, t as NostrConfigSchema } from "./config-schema-CelPzg1N.js";
 import { i as DEFAULT_RELAYS } from "./setup-adapter-DEU3o8MF.js";
 import { t as normalizeNostrStateAccountId } from "./state-account-id-CvBZ9s6P.js";

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { n as nostrPlugin } from "./channel-BZfbDZcY.js";
+import { n as nostrPlugin } from "./channel-B51rExHD.js";
 export { nostrPlugin };

package/dist/setup-api.js

@@ -1,2 +1,2 @@
-import { n as nostrSetupWizard, t as nostrSetupAdapter } from "./setup-surface-CKamwGa3.js";
+import { n as nostrSetupWizard, t as nostrSetupAdapter } from "./setup-surface-B52P4uo2.js";
 export { nostrSetupAdapter, nostrSetupWizard };

package/dist/setup-plugin-api.js

@@ -51,7 +51,7 @@ const nostrSetupAdapter = createNostrSetupAdapter({
 });
 const nostrSetupWizard = createDelegatedSetupWizardProxy({
 	channel,
-	loadWizard: async () => (await import("./setup-surface-CKamwGa3.js").then((n) => n.r)).nostrSetupWizard,
+	loadWizard: async () => (await import("./setup-surface-B52P4uo2.js").then((n) => n.r)).nostrSetupWizard,
 	status: { ...createStandardChannelSetupStatus({
 		channelLabel: "Nostr",
 		configuredLabel: t("wizard.channels.statusConfigured"),

package/dist/{setup-surface-CKamwGa3.js → setup-surface-B52P4uo2.js}

@@ -5,7 +5,7 @@ import { getPublicKey, nip19 } from "nostr-tools";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
 import { listCombinedAccountIds, resolveListedDefaultAccountId } from "openclaw/plugin-sdk/account-resolution";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1 } from "openclaw/plugin-sdk/routing";
-import { createSetupTranslator, createStandardChannelSetupStatus, createTopLevelChannelDmPolicy, createTopLevelChannelParsedAllowFromPrompt, formatDocsLink, mergeAllowFromEntries, parseSetupEntriesWithParser, patchTopLevelChannelConfigSection } from "openclaw/plugin-sdk/setup";
+import { createSetupTranslator, createStandardChannelSetupStatus, createTopLevelChannelDmPolicy, createTopLevelChannelParsedAllowFromPrompt, defineTokenCredential, formatDocsLink, mergeAllowFromEntries, parseSetupEntriesWithParser, patchTopLevelChannelConfigSection, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -209,8 +209,9 @@ const nostrSetupWizard = {
 			patch: buildNostrSetupPatch(accountId, {})
 		})
 	},
-	credentials: [{
+	credentials: [defineTokenCredential({
 		inputKey: "privateKey",
+		configKey: "privateKey",
 		providerHint: channel,
 		credentialLabel: "private key",
 		preferredEnvVar: "NOSTR_PRIVATE_KEY",
@@ -220,32 +221,23 @@ const nostrSetupWizard = {
 		keepPrompt: t("wizard.nostr.privateKeyKeep"),
 		inputPrompt: t("wizard.nostr.privateKeyInput"),
 		allowEnv: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID$1,
-		inspect: ({ cfg, accountId }) => {
-			const account = resolveNostrAccount({
-				cfg,
-				accountId
-			});
-			return {
-				accountConfigured: account.configured,
-				hasConfiguredValue: hasConfiguredSecretInput(account.config.privateKey),
-				resolvedValue: normalizeSecretInputString(account.config.privateKey),
-				envValue: process.env.NOSTR_PRIVATE_KEY?.trim()
-			};
-		},
-		applyUseEnv: async ({ cfg, accountId }) => patchTopLevelChannelConfigSection({
+		resolveAccount: ({ cfg, accountId }) => resolveNostrAccount({
 			cfg,
-			channel,
-			enabled: true,
-			clearFields: ["privateKey"],
-			patch: buildNostrSetupPatch(accountId, {})
+			accountId
 		}),
-		applySet: async ({ cfg, accountId, resolvedValue }) => patchTopLevelChannelConfigSection({
+		accountConfigured: (account) => account.configured,
+		resolvedValue: (account) => normalizeSecretInputString(account.config.privateKey),
+		envValue: () => process.env.NOSTR_PRIVATE_KEY?.trim(),
+		patchAccount: ({ cfg, accountId, patch, clearFields }) => patchTopLevelChannelConfigSection({
 			cfg,
 			channel,
 			enabled: true,
-			patch: buildNostrSetupPatch(accountId, { privateKey: resolvedValue })
-		})
-	}],
+			clearFields,
+			patch: buildNostrSetupPatch(accountId, patch)
+		}),
+		useEnv: { clearFields: ["privateKey"] },
+		set: { value: "resolved" }
+	})],
 	textInputs: [{
 		inputKey: "relayUrls",
 		message: t("wizard.nostr.relayUrlsPrompt"),
@@ -276,11 +268,7 @@ const nostrSetupWizard = {
 		}
 	}],
 	dmPolicy: nostrDmPolicy,
-	disable: (cfg) => patchTopLevelChannelConfigSection({
-		cfg,
-		channel,
-		patch: { enabled: false }
-	})
+	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false)
 };
 //#endregion
 export { resolveDefaultNostrAccountId as a, validatePrivateKey as c, listNostrAccountIds as i, nostrSetupWizard as n, resolveNostrAccount as o, setup_surface_exports as r, normalizePubkey as s, nostrSetupAdapter as t };

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "@openclaw/nostr",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/nostr",
-      "version": "2026.7.2-beta.1",
+      "version": "2026.7.2-beta.2",
       "dependencies": {
         "nostr-tools": "2.23.9",
         "zod": "4.4.3"
       },
       "peerDependencies": {
-        "openclaw": ">=2026.7.2-beta.1"
+        "openclaw": ">=2026.7.2-beta.2"
       },
       "peerDependenciesMeta": {
         "openclaw": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/nostr",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.2",
   "description": "OpenClaw Nostr channel plugin for NIP-04 encrypted direct messages.",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
     "zod": "4.4.3"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.7.2-beta.1"
+    "openclaw": ">=2026.7.2-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -50,10 +50,10 @@
       "minHostVersion": ">=2026.4.10"
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.1"
+      "pluginApi": ">=2026.7.2-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.1"
+      "openclawVersion": "2026.7.2-beta.2"
     },
     "release": {
       "publishToClawHub": true,