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

package/dist/channel-plugin-api.js

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

package/dist/{setup-adapter-DEU3o8MF.js → setup-adapter-BjKmSwdW.js}

@@ -1,6 +1,7 @@
 import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
 import { patchTopLevelChannelConfigSection, splitSetupEntries } from "openclaw/plugin-sdk/setup";
+import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
 //#region extensions/nostr/src/default-relays.ts
 const DEFAULT_RELAYS = ["wss://relay.damus.io", "wss://nos.lol"];
 //#endregion
@@ -65,5 +66,34 @@ function createNostrSetupAdapter(params) {
 		}
 	};
 }
+function createNostrSetupContract(adapter) {
+	return defineChannelSetupContract({
+		fields: {
+			privateKey: {
+				kind: "string",
+				sensitive: true,
+				cli: {
+					flags: "--private-key <key>",
+					description: "Nostr private key"
+				}
+			},
+			relayUrls: {
+				kind: "string",
+				cli: {
+					flags: "--relay-urls <urls>",
+					description: "Nostr relay URLs"
+				}
+			},
+			useEnv: {
+				kind: "boolean",
+				cli: {
+					flags: "--use-env",
+					description: "Use NOSTR_PRIVATE_KEY"
+				}
+			}
+		},
+		legacyAdapter: adapter
+	});
+}
 //#endregion
-export { DEFAULT_RELAYS as i, createNostrSetupAdapter as n, parseRelayUrls as r, buildNostrSetupPatch as t };
+export { DEFAULT_RELAYS as a, parseRelayUrls as i, createNostrSetupAdapter as n, createNostrSetupContract as r, buildNostrSetupPatch as t };

package/dist/setup-api.js

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

package/dist/setup-plugin-api.js

@@ -1,5 +1,5 @@
 import { i as buildChannelConfigSchema, t as NostrConfigSchema } from "./config-schema-CelPzg1N.js";
-import { i as DEFAULT_RELAYS, n as createNostrSetupAdapter } from "./setup-adapter-DEU3o8MF.js";
+import { a as DEFAULT_RELAYS, n as createNostrSetupAdapter, r as createNostrSetupContract } from "./setup-adapter-BjKmSwdW.js";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { DEFAULT_ACCOUNT_ID, createDelegatedSetupWizardProxy, createSetupTranslator, createStandardChannelSetupStatus } from "openclaw/plugin-sdk/setup-runtime";
 //#region extensions/nostr/src/channel.setup.ts
@@ -49,9 +49,10 @@ const nostrSetupAdapter = createNostrSetupAdapter({
 	resolveAccountId: (cfg, accountId) => accountId?.trim() || resolveDefaultSetupNostrAccountId(cfg),
 	validatePrivateKey: looksLikeNostrPrivateKey
 });
+const nostrSetupContract = createNostrSetupContract(nostrSetupAdapter);
 const nostrSetupWizard = createDelegatedSetupWizardProxy({
 	channel,
-	loadWizard: async () => (await import("./setup-surface-BF7_7BEx.js").then((n) => n.r)).nostrSetupWizard,
+	loadWizard: async () => (await import("./setup-surface-BJCFpe02.js").then((n) => n.i)).nostrSetupWizard,
 	status: { ...createStandardChannelSetupStatus({
 		channelLabel: "Nostr",
 		configuredLabel: t("wizard.channels.statusConfigured"),
@@ -91,6 +92,7 @@ const nostrSetupPlugin = {
 	reload: { configPrefixes: ["channels.nostr"] },
 	configSchema: buildChannelConfigSchema(NostrConfigSchema),
 	setup: nostrSetupAdapter,
+	setupContract: nostrSetupContract,
 	setupWizard: nostrSetupWizard,
 	config: {
 		listAccountIds: listSetupNostrAccountIds,

package/dist/{setup-surface-BF7_7BEx.js → setup-surface-BJCFpe02.js}

@@ -1,9 +1,9 @@
-import { i as DEFAULT_RELAYS, n as createNostrSetupAdapter, r as parseRelayUrls, t as buildNostrSetupPatch } from "./setup-adapter-DEU3o8MF.js";
+import { a as DEFAULT_RELAYS, i as parseRelayUrls, n as createNostrSetupAdapter, r as createNostrSetupContract, t as buildNostrSetupPatch } from "./setup-adapter-BjKmSwdW.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 { 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, defineTokenCredential, formatDocsLink, mergeAllowFromEntries, parseSetupEntriesWithParser, patchTopLevelChannelConfigSection, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 //#region \0rolldown/runtime.js
@@ -55,29 +55,13 @@ function normalizePubkey(input) {
 }
 //#endregion
 //#region extensions/nostr/src/types.ts
-function resolveConfiguredDefaultNostrAccountId(cfg) {
-	const nostrCfg = cfg.channels?.nostr;
-	return normalizeOptionalAccountId(nostrCfg?.defaultAccount);
-}
-/**
-* List all configured Nostr account IDs
-*/
-function listNostrAccountIds(cfg) {
-	const nostrCfg = cfg.channels?.nostr;
-	return listCombinedAccountIds({
-		configuredAccountIds: [],
-		implicitAccountId: normalizeSecretInputString(nostrCfg?.privateKey) ? resolveConfiguredDefaultNostrAccountId(cfg) ?? DEFAULT_ACCOUNT_ID : void 0
-	});
-}
-/**
-* Get the default account ID
-*/
-function resolveDefaultNostrAccountId(cfg) {
-	return resolveListedDefaultAccountId({
-		accountIds: listNostrAccountIds(cfg),
-		configuredDefaultAccountId: resolveConfiguredDefaultNostrAccountId(cfg)
-	});
-}
+const { listAccountIds: listNostrAccountIds, resolveDefaultAccountId: resolveDefaultNostrAccountId } = createAccountListHelpers("nostr", {
+	fallbackAccountIdWhenEmpty: false,
+	resolveImplicitAccountId: (cfg) => {
+		const account = cfg.channels?.nostr;
+		return normalizeSecretInputString(account?.privateKey) ? normalizeOptionalAccountId(account?.defaultAccount) ?? DEFAULT_ACCOUNT_ID : void 0;
+	}
+});
 /**
 * Resolve a Nostr account from config
 */
@@ -115,6 +99,7 @@ function resolveNostrAccount(opts) {
 //#region extensions/nostr/src/setup-surface.ts
 var setup_surface_exports = /* @__PURE__ */ __exportAll({
 	nostrSetupAdapter: () => nostrSetupAdapter,
+	nostrSetupContract: () => nostrSetupContract,
 	nostrSetupWizard: () => nostrSetupWizard
 });
 const t = createSetupTranslator();
@@ -172,6 +157,7 @@ const nostrSetupAdapter = createNostrSetupAdapter({
 		}
 	}
 });
+const nostrSetupContract = createNostrSetupContract(nostrSetupAdapter);
 const nostrSetupWizard = {
 	channel,
 	resolveAccountIdForConfigure: ({ accountOverride, defaultAccountId }) => accountOverride?.trim() || defaultAccountId,
@@ -271,4 +257,4 @@ const nostrSetupWizard = {
 	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 };
+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 };

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

@@ -146,12 +146,14 @@ var AbstractRelay = class {
   openSubs = /* @__PURE__ */ new Map();
   enablePing;
   enableReconnect;
+  idleTimeout = 0;
   idleSince = Date.now();
   ongoingOperations = 0;
   reconnectTimeoutHandle;
   pingIntervalHandle;
   reconnectAttempts = 0;
   skipReconnection = false;
+  idleTimeoutHandle;
   connectionPromise;
   openCountRequests = /* @__PURE__ */ new Map();
   openEventPublishes = /* @__PURE__ */ new Map();
@@ -167,6 +169,8 @@ var AbstractRelay = class {
     this._WebSocket = opts.websocketImplementation || WebSocket;
     this.enablePing = opts.enablePing;
     this.enableReconnect = opts.enableReconnect || false;
+    if (opts.idleTimeout)
+      this.idleTimeout = opts.idleTimeout;
   }
   static async connect(url, opts) {
     const relay = new AbstractRelay(url, opts);
@@ -190,6 +194,22 @@ var AbstractRelay = class {
   get connected() {
     return this._connected;
   }
+  clearIdleTimeout() {
+    if (this.idleTimeoutHandle) {
+      clearTimeout(this.idleTimeoutHandle);
+      this.idleTimeoutHandle = void 0;
+    }
+  }
+  scheduleIdleClose() {
+    this.clearIdleTimeout();
+    if (this.idleTimeout > 0) {
+      this.idleTimeoutHandle = setTimeout(() => {
+        if (this.ongoingOperations === 0 && this.idleSince) {
+          this.close();
+        }
+      }, this.idleTimeout);
+    }
+  }
   async reconnect() {
     const backoff = this.resubscribeBackoff[Math.min(this.reconnectAttempts, this.resubscribeBackoff.length - 1)];
     this.reconnectAttempts++;
@@ -208,6 +228,7 @@ var AbstractRelay = class {
     this._connected = false;
     this.connectionPromise = void 0;
     this.idleSince = void 0;
+    this.clearIdleTimeout();
     if (this.enableReconnect && !this.skipReconnection) {
       this.reconnect();
     } else {
@@ -365,6 +386,7 @@ var AbstractRelay = class {
   }
   async publish(event) {
     this.idleSince = void 0;
+    this.clearIdleTimeout();
     this.ongoingOperations++;
     const ret = new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
@@ -386,8 +408,10 @@ var AbstractRelay = class {
       }
     }
     this.ongoingOperations--;
-    if (this.ongoingOperations === 0)
+    if (this.ongoingOperations === 0) {
       this.idleSince = Date.now();
+      this.scheduleIdleClose();
+    }
     return ret;
   }
   async count(filters, params) {
@@ -413,6 +437,7 @@ var AbstractRelay = class {
   subscribe(filters, params) {
     if (params.label !== "<forced-ping>") {
       this.idleSince = void 0;
+      this.clearIdleTimeout();
       this.ongoingOperations++;
     }
     const sub = this.prepareSubscription(filters, params);
@@ -442,6 +467,7 @@ var AbstractRelay = class {
     this.closeAllSubscriptions("relay connection closed by us");
     this._connected = false;
     this.idleSince = void 0;
+    this.clearIdleTimeout();
     this.onclose?.();
     if (this.ws?.readyState === this._WebSocket.OPEN) {
       this.ws?.close();
@@ -619,8 +645,10 @@ var Subscription = class {
     }
     this.relay.openSubs.delete(this.id);
     this.relay.ongoingOperations--;
-    if (this.relay.ongoingOperations === 0)
+    if (this.relay.ongoingOperations === 0) {
       this.relay.idleSince = Date.now();
+      this.relay.scheduleIdleClose();
+    }
     this.onclose?.(reason);
   }
 };
@@ -696,6 +724,7 @@ var AbstractSimplePool = class {
   verifyEvent;
   enablePing;
   enableReconnect;
+  idleTimeout = 2e4;
   automaticallyAuth;
   trustedRelayURLs = /* @__PURE__ */ new Set();
   onRelayConnectionFailure;
@@ -708,6 +737,8 @@ var AbstractSimplePool = class {
     this._WebSocket = opts.websocketImplementation;
     this.enablePing = opts.enablePing;
     this.enableReconnect = opts.enableReconnect || false;
+    if (opts.idleTimeout)
+      this.idleTimeout = opts.idleTimeout;
     this.automaticallyAuth = opts.automaticallyAuth;
     this.onRelayConnectionFailure = opts.onRelayConnectionFailure;
     this.onRelayConnectionSuccess = opts.onRelayConnectionSuccess;
@@ -722,7 +753,8 @@ var AbstractSimplePool = class {
         verifyEvent: this.trustedRelayURLs.has(url) ? alwaysTrue : this.verifyEvent,
         websocketImplementation: this._WebSocket,
         enablePing: this.enablePing,
-        enableReconnect: this.enableReconnect
+        enableReconnect: this.enableReconnect,
+        idleTimeout: this.idleTimeout
       });
       relay.onclose = () => {
         this.relays.delete(url);