@openclaw/nostr 2026.8.1-beta.2 → 2026.9.1-beta.1

package/dist/api.js

@@ -1,14 +1,14 @@
-import { s as resolveNostrAccount } from "./setup-surface-DAhyNOcb.js";
+import { s as resolveNostrAccount } from "./setup-surface-CzjfhV72.js";
 import { getPluginRuntimeGatewayRequestScope } from "./runtime-api.js";
 import { n as NostrProfileSchema } from "./config-schema-CkYd8ACn.js";
-import { a as getNostrRuntime, i as contentToProfile, n as nostrPlugin, o as setNostrRuntime, r as publishNostrProfile, t as getNostrProfileState } from "./channel-BifOvAwp.js";
+import { a as getNostrRuntime, i as contentToProfile, n as nostrPlugin, o as setNostrRuntime, r as publishNostrProfile, t as getNostrProfileState } from "./channel-BwnvE_wr.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { z } from "zod";
 import { SimplePool } from "nostr-tools";
+import { createFixedWindowRateLimiter as createFixedWindowRateLimiter$1 } from "openclaw/plugin-sdk/webhook-ingress";
 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";
 //#region extensions/nostr/src/nostr-profile-url-safety.ts
 function validateUrlSafety(urlStr) {
@@ -184,7 +184,7 @@ function mergeProfiles(local, imported) {
 }
 //#endregion
 //#region extensions/nostr/src/nostr-profile-http.ts
-const profileRateLimiter = createFixedWindowRateLimiter({
+const profileRateLimiter = createFixedWindowRateLimiter$1({
 	windowMs: 6e4,
 	maxRequests: 5,
 	maxTrackedKeys: 2048

package/dist/{channel-BifOvAwp.js → channel-BwnvE_wr.js}

@@ -1,6 +1,6 @@
-import { a as listNostrAccountIds, c as normalizePubkey, l as validatePrivateKey, n as nostrSetupContract, o as resolveDefaultNostrAccountId, r as nostrSetupWizard, s as resolveNostrAccount } from "./setup-surface-DAhyNOcb.js";
+import { a as listNostrAccountIds, c as normalizePubkey, n as nostrSetupContract, o as resolveDefaultNostrAccountId, r as nostrSetupWizard, s as resolveNostrAccount } from "./setup-surface-CzjfhV72.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-CkYd8ACn.js";
-import { s as DEFAULT_RELAYS } from "./setup-adapter-DLthHa2q.js";
+import { c as validatePrivateKey, l as DEFAULT_RELAYS } from "./setup-adapter-KJ_iGKiG.js";
 import { t as normalizeNostrStateAccountId } from "./state-account-id-CvBZ9s6P.js";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { createScopedDmSecurityResolver, createTopLevelChannelConfigAdapter } from "openclaw/plugin-sdk/channel-config-helpers";
@@ -18,6 +18,9 @@ import { chunkTextForOutbound, sanitizeAssistantVisibleText, stripMarkdown } fro
 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";
+import { createFixedWindowRateLimiter } from "openclaw/plugin-sdk/webhook-ingress";
+import { retryAsync } from "openclaw/plugin-sdk/retry-runtime";
+import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
 import { buildChannelOutboundSessionRoute, stripChannelTargetPrefix } from "openclaw/plugin-sdk/core";
@@ -289,19 +292,16 @@ function createNostrCursorStateWriter(options) {
 	let activeFlush;
 	let recoveryFlush;
 	const writeWithRetry = async (cursor) => {
-		let lastError;
-		for (const delayMs of CURSOR_WRITE_RETRY_MS) {
-			if (delayMs > 0) await new Promise((resolve) => {
-				setTimeout(resolve, delayMs);
+		try {
+			await retryAsync(() => options.write(cursor), {
+				attempts: CURSOR_WRITE_RETRY_MS.length,
+				minDelayMs: 0,
+				delayMs: ({ attempt }) => CURSOR_WRITE_RETRY_MS[attempt] ?? 0,
+				sleep: (delayMs) => sleepWithAbort(delayMs)
 			});
-			try {
-				await options.write(cursor);
-				return;
-			} catch (error) {
-				lastError = error;
-			}
+		} catch (error) {
+			throw new Error("Nostr cursor state write failed.", { cause: error });
 		}
-		throw new Error("Nostr cursor state write failed.", { cause: lastError });
 	};
 	const enqueueWrite = (cursor) => {
 		const write = writeTail.then(() => writeWithRetry(cursor));
@@ -548,12 +548,8 @@ function createNostrIngress(options) {
 		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.");
-		let lastError;
-		for (const delayMs of NOSTR_INGRESS_APPEND_RETRY_MS) {
-			if (delayMs > 0) await new Promise((resolve) => {
-				setTimeout(resolve, delayMs);
-			});
-			try {
+		try {
+			return await retryAsync(async () => {
 				const result = await getQueue().enqueue(prepared.facts.eventId, prepared.payload, {
 					receivedAt: prepared.receivedAt,
 					laneKey: prepared.facts.laneKey
@@ -561,11 +557,15 @@ function createNostrIngress(options) {
 				options.afterDurableAppend(prepared.event);
 				monitor.requestDrain();
 				return result.kind === "accepted" ? "accepted" : "duplicate";
-			} catch (error) {
-				lastError = error;
-			}
+			}, {
+				attempts: NOSTR_INGRESS_APPEND_RETRY_MS.length,
+				minDelayMs: 0,
+				delayMs: ({ attempt }) => NOSTR_INGRESS_APPEND_RETRY_MS[attempt] ?? 0,
+				sleep: (delayMs) => sleepWithAbort(delayMs)
+			});
+		} catch (error) {
+			throw new Error(`Nostr durable admission failed: ${formatErrorMessage(error)}`, { cause: error });
 		}
-		throw new Error(`Nostr durable admission failed: ${formatErrorMessage(lastError)}`, { cause: lastError });
 	};
 	return {
 		ready: async () => {
@@ -742,48 +742,6 @@ async function publishProfile(pool, sk, relays, profile, lastPublishedAt) {
 	return publishProfileEvent(pool, relays, createProfileEvent(sk, profile, lastPublishedAt));
 }
 //#endregion
-//#region extensions/nostr/src/nostr-rate-limiter.ts
-function createFixedWindowRateLimiter(params) {
-	const windowMs = Math.max(1, Math.floor(params.windowMs));
-	const maxRequests = Math.max(1, Math.floor(params.maxRequests));
-	const maxTrackedKeys = Math.max(1, Math.floor(params.maxTrackedKeys));
-	const state = /* @__PURE__ */ new Map();
-	const touch = (key, value) => {
-		state.delete(key);
-		state.set(key, value);
-	};
-	const prune = (nowMs) => {
-		for (const [key, entry] of state) if (nowMs - entry.windowStartMs >= windowMs) state.delete(key);
-		while (state.size > maxTrackedKeys) {
-			const oldest = state.keys().next().value;
-			if (!oldest) break;
-			state.delete(oldest);
-		}
-	};
-	return {
-		isRateLimited: (key, nowMs = Date.now()) => {
-			if (!key) return false;
-			prune(nowMs);
-			const existing = state.get(key);
-			if (!existing || nowMs - existing.windowStartMs >= windowMs) {
-				touch(key, {
-					count: 1,
-					windowStartMs: nowMs
-				});
-				return false;
-			}
-			const nextCount = existing.count + 1;
-			touch(key, {
-				count: nextCount,
-				windowStartMs: existing.windowStartMs
-			});
-			return nextCount > maxRequests;
-		},
-		size: () => state.size,
-		clear: () => state.clear()
-	};
-}
-//#endregion
 //#region extensions/nostr/src/nostr-relay-subscription.ts
 const DEFAULT_EOSE_CONFIRM_DEADLINE_MS = 1e4;
 const LIBRARY_EOSE_TIMEOUT_MARGIN_MS = 1e3;
@@ -1357,7 +1315,6 @@ async function sendEncryptedDm(pool, sk, toPubkey, text, relays, metrics, circui
 //#endregion
 //#region extensions/nostr/src/gateway.ts
 const activeBuses = /* @__PURE__ */ new Map();
-const metricsSnapshots = /* @__PURE__ */ new Map();
 const ACCESS_GROUP_PREFIX = "accessGroup:";
 function normalizeRelayLifecycleKey(relay) {
 	return new URL(relay).toString();
@@ -1426,7 +1383,6 @@ const startNostrGatewayAccount = async (ctx) => {
 		allowFrom: account.config.allowFrom,
 		command: runtime.channel.commands.shouldComputeCommandAuthorized(rawBody, ctx.cfg) ? { modeWhenAccessGroupsOff: "configured" } : void 0
 	});
-	let busHandle = null;
 	const connectedRelays = /* @__PURE__ */ new Set();
 	const authorizeSender = async (input) => {
 		const resolved = await resolveInboundAccess(input.senderId, "");
@@ -1534,17 +1490,13 @@ const startNostrGatewayAccount = async (ctx) => {
 					else if (event.name === "relay.circuit_breaker.open") ctx.log?.warn?.(`[${account.accountId}] Circuit breaker opened for relay: ${event.labels?.relay}`);
 					else if (event.name === "relay.circuit_breaker.close") ctx.log?.info?.(`[${account.accountId}] Circuit breaker closed for relay: ${event.labels?.relay}`);
 					else if (event.name === "relay.error") ctx.log?.debug?.(`[${account.accountId}] Relay error: ${event.labels?.relay}`);
-					if (busHandle) metricsSnapshots.set(account.accountId, busHandle.getMetrics());
 				}
 			});
-			busHandle = bus;
 			activeBuses.set(account.accountId, bus);
 			ctx.log?.info?.(`[${account.accountId}] Nostr provider started with ${account.relays.length} configured relay(s)`);
 			return { stop: async () => {
-				await bus.close();
-				if (busHandle === bus) busHandle = null;
 				if (activeBuses.get(account.accountId) === bus) activeBuses.delete(account.accountId);
-				metricsSnapshots.delete(account.accountId);
+				await bus.close();
 				ctx.log?.info?.(`[${account.accountId}] Nostr provider stopped`);
 			} };
 		},

package/dist/channel-plugin-api.js

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

package/dist/index.js

@@ -27,6 +27,10 @@ var nostr_default = defineBundledChannelEntry({
 		specifier: "./channel-plugin-api.js",
 		exportName: "nostrPlugin"
 	},
+	secrets: {
+		specifier: "./secret-contract-api.js",
+		exportName: "channelSecrets"
+	},
 	runtime: {
 		specifier: "./api.js",
 		exportName: "setNostrRuntime"

package/dist/secret-contract-api.js

@@ -0,0 +1,37 @@
+import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
+import { collectSecretInputAssignment, createChannelSecretTargetRegistryEntries, getChannelRecord } from "openclaw/plugin-sdk/channel-secret-basic-runtime";
+//#region extensions/nostr/src/secret-contract.ts
+const secretTargetRegistryEntries = createChannelSecretTargetRegistryEntries({
+	channelKey: "nostr",
+	channel: ["privateKey"]
+});
+function collectRuntimeConfigAssignments(params) {
+	const nostr = getChannelRecord(params.config, "nostr");
+	if (!nostr) return;
+	const accountId = normalizeAccountId(typeof nostr.defaultAccount === "string" ? nostr.defaultAccount : void 0);
+	collectSecretInputAssignment({
+		value: nostr.privateKey,
+		path: "channels.nostr.privateKey",
+		expected: "string",
+		defaults: params.defaults,
+		context: params.context,
+		active: nostr.enabled !== false,
+		inactiveReason: "Nostr channel is disabled.",
+		owner: {
+			ownerKind: "account",
+			ownerId: `nostr:${accountId}`,
+			requiredForGateway: false,
+			disposition: "isolate",
+			contract: nostr
+		},
+		apply: (value) => {
+			nostr.privateKey = value;
+		}
+	});
+}
+const channelSecrets = {
+	secretTargetRegistryEntries,
+	collectRuntimeConfigAssignments
+};
+//#endregion
+export { channelSecrets, collectRuntimeConfigAssignments, secretTargetRegistryEntries };

package/dist/{setup-adapter-DLthHa2q.js → setup-adapter-KJ_iGKiG.js}

@@ -1,5 +1,6 @@
 import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { hasConfiguredSecretInput, normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";
+import { decode } from "nostr-tools/nip19";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
 import { createSetupTranslator, createStandardChannelSetupStatus, patchTopLevelChannelConfigSection, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
@@ -8,6 +9,32 @@ const DEFAULT_RELAYS = ["wss://relay.damus.io", "wss://nos.lol"];
 //#endregion
 //#region extensions/nostr/src/private-key.ts
 const NOSTR_PRIVATE_KEY_ENV_VAR = "NOSTR_PRIVATE_KEY";
+const SECP256K1_ORDER = BigInt("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141");
+/** Validate and normalize a private key (hex or NIP-19 nsec). */
+function validatePrivateKey(key) {
+	const trimmed = key.trim();
+	let bytes;
+	if (trimmed.startsWith("nsec1") || trimmed.startsWith("NSEC1")) {
+		let decoded;
+		try {
+			decoded = decode(trimmed);
+		} catch {
+			throw new Error("Invalid nsec private key");
+		}
+		if (decoded.type !== "nsec") throw new Error("Invalid nsec key type");
+		bytes = decoded.data;
+	} else {
+		if (!/^[0-9a-fA-F]{64}$/.test(trimmed)) throw new Error("Private key must be 64 hex characters or nsec bech32 format");
+		bytes = Uint8Array.from({ length: 32 }, (_, index) => Number.parseInt(trimmed.slice(index * 2, index * 2 + 2), 16));
+	}
+	if (bytes.length !== 32) throw new Error("Private key must decode to 32 bytes");
+	const scalar = Array.from(bytes).reduce((value, byte) => value << 8n | BigInt(byte), 0n);
+	if (scalar === 0n || scalar >= SECP256K1_ORDER) throw new Error("Private key scalar is out of range");
+	return bytes;
+}
+function hasConfiguredNostrPrivateKey(value) {
+	return hasConfiguredSecretInput(value) || Boolean(process.env["NOSTR_PRIVATE_KEY"]?.trim());
+}
 function resolveNostrPrivateKey(value) {
 	const configured = normalizeSecretInputString(value);
 	if (configured || hasConfiguredSecretInput(value)) return configured ?? "";
@@ -53,7 +80,11 @@ function createNostrSetupAdapter(params) {
 			if (!input.useEnv) {
 				const privateKey = input.privateKey?.trim();
 				if (!privateKey) return "Nostr requires --private-key or --use-env.";
-				if (!params.validatePrivateKey(privateKey)) return "Nostr private key must be valid nsec or 64-character hex.";
+				try {
+					validatePrivateKey(privateKey);
+				} catch {
+					return "Nostr private key must be valid nsec or 64-character hex.";
+				}
 			}
 			if (input.relayUrls?.trim()) return parseRelayUrls(input.relayUrls).error ?? null;
 			return null;
@@ -124,4 +155,4 @@ function createNostrSetupStatus(resolveAccount) {
 	});
 }
 //#endregion
-export { parseRelayUrls as a, createNostrSetupStatus as i, createNostrSetupAdapter as n, resolveNostrPrivateKey as o, createNostrSetupContract as r, DEFAULT_RELAYS as s, buildNostrSetupPatch as t };
+export { parseRelayUrls as a, validatePrivateKey as c, createNostrSetupStatus as i, DEFAULT_RELAYS as l, createNostrSetupAdapter as n, hasConfiguredNostrPrivateKey as o, createNostrSetupContract as r, resolveNostrPrivateKey as s, buildNostrSetupPatch as t };

package/dist/setup-api.js

@@ -1,2 +1,2 @@
-import { r as nostrSetupWizard, t as nostrSetupAdapter } from "./setup-surface-DAhyNOcb.js";
+import { r as nostrSetupWizard, t as nostrSetupAdapter } from "./setup-surface-CzjfhV72.js";
 export { nostrSetupAdapter, nostrSetupWizard };

package/dist/setup-entry.js

@@ -5,6 +5,10 @@ var setup_entry_default = defineBundledChannelSetupEntry({
 	plugin: {
 		specifier: "./setup-plugin-api.js",
 		exportName: "nostrSetupPlugin"
+	},
+	secrets: {
+		specifier: "./secret-contract-api.js",
+		exportName: "channelSecrets"
 	}
 });
 //#endregion

package/dist/setup-plugin-api.js

@@ -1,21 +1,21 @@
 import { i as buildChannelConfigSchema, t as NostrConfigSchema } from "./config-schema-CkYd8ACn.js";
-import { i as createNostrSetupStatus, n as createNostrSetupAdapter, o as resolveNostrPrivateKey, r as createNostrSetupContract, s as DEFAULT_RELAYS } from "./setup-adapter-DLthHa2q.js";
+import { i as createNostrSetupStatus, l as DEFAULT_RELAYS, n as createNostrSetupAdapter, o as hasConfiguredNostrPrivateKey, r as createNostrSetupContract, s as resolveNostrPrivateKey } from "./setup-adapter-KJ_iGKiG.js";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
-import { DEFAULT_ACCOUNT_ID, createDelegatedSetupWizardProxy } from "openclaw/plugin-sdk/setup-runtime";
+import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
+import { createDelegatedSetupWizardProxy } from "openclaw/plugin-sdk/setup-runtime";
 //#region extensions/nostr/src/channel.setup.ts
 const channel = "nostr";
 function getNostrConfig(cfg) {
 	return cfg.channels?.nostr;
 }
 function resolveDefaultSetupNostrAccountId(cfg) {
-	const configured = getNostrConfig(cfg)?.defaultAccount;
-	return typeof configured === "string" && configured.trim() ? configured.trim() : DEFAULT_ACCOUNT_ID;
+	return normalizeAccountId(getNostrConfig(cfg)?.defaultAccount);
 }
 function resolveSetupNostrAccount(params) {
 	const nostrCfg = getNostrConfig(params.cfg);
-	const accountId = params.accountId?.trim() || resolveDefaultSetupNostrAccountId(params.cfg);
+	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultSetupNostrAccountId(params.cfg));
 	const privateKey = resolveNostrPrivateKey(nostrCfg?.privateKey);
-	const configured = Boolean(privateKey);
+	const configured = hasConfiguredNostrPrivateKey(nostrCfg?.privateKey);
 	return {
 		accountId,
 		name: typeof nostrCfg?.name === "string" ? nostrCfg.name : void 0,
@@ -38,7 +38,7 @@ function resolveSetupNostrAccount(params) {
 }
 const nostrSetupWizard = createDelegatedSetupWizardProxy({
 	channel,
-	loadWizard: async () => (await import("./setup-surface-DAhyNOcb.js").then((n) => n.i)).nostrSetupWizard,
+	loadWizard: async () => (await import("./setup-surface-CzjfhV72.js").then((n) => n.i)).nostrSetupWizard,
 	status: createNostrSetupStatus(resolveSetupNostrAccount),
 	resolveShouldPromptAccountIds: () => false,
 	delegatePrepare: true,
@@ -61,10 +61,7 @@ const nostrSetupPlugin = {
 	},
 	reload: { configPrefixes: ["channels.nostr"] },
 	configSchema: buildChannelConfigSchema(NostrConfigSchema),
-	setupContract: createNostrSetupContract(createNostrSetupAdapter({
-		resolveAccountId: (cfg, accountId) => accountId?.trim() || resolveDefaultSetupNostrAccountId(cfg),
-		validatePrivateKey: (privateKey) => /^(?:nsec1|NSEC1)|^[0-9a-fA-F]{64}$/u.test(privateKey)
-	})),
+	setupContract: createNostrSetupContract(createNostrSetupAdapter({ resolveAccountId: (cfg, accountId) => accountId?.trim() || resolveDefaultSetupNostrAccountId(cfg) })),
 	setupWizard: nostrSetupWizard,
 	config: {
 		listAccountIds: (cfg) => resolveSetupNostrAccount({ cfg }).configured ? [resolveDefaultSetupNostrAccountId(cfg)] : [],

package/dist/{setup-surface-DAhyNOcb.js → setup-surface-CzjfhV72.js}

@@ -1,8 +1,9 @@
-import { a as parseRelayUrls, i as createNostrSetupStatus, n as createNostrSetupAdapter, o as resolveNostrPrivateKey, r as createNostrSetupContract, s as DEFAULT_RELAYS, t as buildNostrSetupPatch } from "./setup-adapter-DLthHa2q.js";
+import { a as parseRelayUrls, c as validatePrivateKey, i as createNostrSetupStatus, l as DEFAULT_RELAYS, n as createNostrSetupAdapter, o as hasConfiguredNostrPrivateKey, r as createNostrSetupContract, s as resolveNostrPrivateKey, t as buildNostrSetupPatch } from "./setup-adapter-KJ_iGKiG.js";
 import { createAccountListHelpers } from "openclaw/plugin-sdk/account-helpers";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { hasConfiguredSecretInput, normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";
-import { getPublicKey, nip19 } from "nostr-tools";
+import { decode } from "nostr-tools/nip19";
+import { getPublicKey } from "nostr-tools/pure";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1 } from "openclaw/plugin-sdk/routing";
 import { createSetupTranslator, createTopLevelChannelDmPolicy, createTopLevelChannelParsedAllowFromPrompt, defineTokenCredential, formatDocsLink, mergeAllowFromEntries, parseSetupEntriesWithParser, patchTopLevelChannelConfigSection, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
@@ -19,34 +20,13 @@ var __exportAll = (all, no_symbols) => {
 };
 //#endregion
 //#region extensions/nostr/src/nostr-key-utils.ts
-/**
-* Validate and normalize a private key (accepts hex or nsec format)
-*/
-function validatePrivateKey(key) {
-	const trimmed = key.trim();
-	if (trimmed.startsWith("nsec1") || trimmed.startsWith("NSEC1")) {
-		const decoded = nip19.decode(trimmed);
-		if (decoded.type !== "nsec") throw new Error("Invalid nsec key: wrong type");
-		return decoded.data;
-	}
-	if (!/^[0-9a-fA-F]{64}$/.test(trimmed)) throw new Error("Private key must be 64 hex characters or nsec bech32 format");
-	const bytes = /* @__PURE__ */ new Uint8Array(32);
-	for (let i = 0; i < 32; i++) bytes[i] = Number.parseInt(trimmed.slice(i * 2, i * 2 + 2), 16);
-	return bytes;
-}
-/**
-* Get public key from private key (hex or nsec format)
-*/
 function getPublicKeyFromPrivate(privateKey) {
 	return getPublicKey(validatePrivateKey(privateKey));
 }
-/**
-* Normalize a pubkey to hex format (accepts npub or hex)
-*/
 function normalizePubkey(input) {
 	const trimmed = input.trim();
 	if (trimmed.startsWith("npub1") || trimmed.startsWith("NPUB1")) {
-		const decoded = nip19.decode(trimmed);
+		const decoded = decode(trimmed);
 		if (decoded.type !== "npub" || typeof decoded.data !== "string") throw new Error("Invalid npub key");
 		return decoded.data.toLowerCase();
 	}
@@ -59,7 +39,7 @@ const { listAccountIds: listNostrAccountIds, resolveDefaultAccountId: resolveDef
 	fallbackAccountIdWhenEmpty: false,
 	resolveImplicitAccountId: (cfg) => {
 		const account = cfg.channels?.nostr;
-		return resolveNostrPrivateKey(account?.privateKey) ? normalizeOptionalAccountId(account?.defaultAccount) ?? DEFAULT_ACCOUNT_ID : void 0;
+		return hasConfiguredNostrPrivateKey(account?.privateKey) ? normalizeOptionalAccountId(account?.defaultAccount) ?? DEFAULT_ACCOUNT_ID : void 0;
 	}
 });
 /**
@@ -70,7 +50,7 @@ function resolveNostrAccount(opts) {
 	const nostrCfg = opts.cfg.channels?.nostr;
 	const baseEnabled = nostrCfg?.enabled !== false;
 	const privateKey = resolveNostrPrivateKey(nostrCfg?.privateKey);
-	const configured = Boolean(privateKey);
+	const configured = hasConfiguredNostrPrivateKey(nostrCfg?.privateKey);
 	let publicKey = "";
 	if (privateKey) try {
 		publicKey = getPublicKeyFromPrivate(privateKey);
@@ -146,17 +126,7 @@ const nostrDmPolicy = createTopLevelChannelDmPolicy({
 		mergeEntries: ({ existing, parsed }) => mergeAllowFromEntries(existing, parsed)
 	})
 });
-const nostrSetupAdapter = createNostrSetupAdapter({
-	resolveAccountId: (cfg, accountId) => accountId?.trim() || resolveDefaultNostrAccountId(cfg),
-	validatePrivateKey: (privateKey) => {
-		try {
-			getPublicKeyFromPrivate(privateKey);
-			return true;
-		} catch {
-			return false;
-		}
-	}
-});
+const nostrSetupAdapter = createNostrSetupAdapter({ resolveAccountId: (cfg, accountId) => accountId?.trim() || resolveDefaultNostrAccountId(cfg) });
 const nostrSetupContract = createNostrSetupContract(nostrSetupAdapter);
 const nostrSetupWizard = {
 	channel,
@@ -244,4 +214,4 @@ const nostrSetupWizard = {
 	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false)
 };
 //#endregion
-export { listNostrAccountIds as a, normalizePubkey as c, setup_surface_exports as i, validatePrivateKey as l, nostrSetupContract as n, resolveDefaultNostrAccountId as o, nostrSetupWizard as r, resolveNostrAccount as s, nostrSetupAdapter as t };
+export { listNostrAccountIds as a, normalizePubkey as c, setup_surface_exports as i, nostrSetupContract as n, resolveDefaultNostrAccountId as o, nostrSetupWizard as r, resolveNostrAccount as s, nostrSetupAdapter as t };

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

@@ -650,10 +650,12 @@ var Subscription = class {
       this.closed = true;
     }
     this.relay.openSubs.delete(this.id);
-    this.relay.ongoingOperations--;
-    if (this.relay.ongoingOperations === 0) {
-      this.relay.idleSince = Date.now();
-      this.relay.scheduleIdleClose();
+    if (!this.id.startsWith("<forced-ping>")) {
+      this.relay.ongoingOperations--;
+      if (this.relay.ongoingOperations === 0) {
+        this.relay.idleSince = Date.now();
+        this.relay.scheduleIdleClose();
+      }
     }
     this.onclose?.(reason);
   }
@@ -1004,7 +1006,7 @@ var AbstractSimplePool = class {
         });
       } catch (err) {
         this.onRelayConnectionFailure?.(url);
-        return String("connection failure: " + String(err));
+        return Promise.reject("connection failure: " + String(err));
       }
       return r.publish(event).catch(async (err) => {
         if (err instanceof Error && err.message.startsWith("auth-required: ") && params?.onauth) {