@openclaw/nostr 2026.7.2-beta.7 → 2026.7.33

package/dist/setup-plugin-api.js

@@ -1,113 +1,2 @@
-import { i as buildChannelConfigSchema, t as NostrConfigSchema } from "./config-schema-CelPzg1N.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
-const t = createSetupTranslator();
-const channel = "nostr";
-function getNostrConfig(cfg) {
-	return cfg.channels?.nostr;
-}
-function listSetupNostrAccountIds(cfg) {
-	const nostrCfg = getNostrConfig(cfg);
-	if (!(typeof nostrCfg?.privateKey === "string" ? nostrCfg.privateKey.trim() : "")) return [];
-	return [resolveDefaultSetupNostrAccountId(cfg)];
-}
-function resolveDefaultSetupNostrAccountId(cfg) {
-	const configured = getNostrConfig(cfg)?.defaultAccount;
-	return typeof configured === "string" && configured.trim() ? configured.trim() : DEFAULT_ACCOUNT_ID;
-}
-function resolveSetupNostrAccount(params) {
-	const nostrCfg = getNostrConfig(params.cfg);
-	const accountId = params.accountId?.trim() || resolveDefaultSetupNostrAccountId(params.cfg);
-	const privateKey = typeof nostrCfg?.privateKey === "string" ? nostrCfg.privateKey.trim() : "";
-	const configured = Boolean(privateKey);
-	return {
-		accountId,
-		name: typeof nostrCfg?.name === "string" ? nostrCfg.name : void 0,
-		enabled: nostrCfg?.enabled !== false,
-		configured,
-		privateKey,
-		publicKey: "",
-		relays: nostrCfg?.relays ?? DEFAULT_RELAYS,
-		profile: nostrCfg?.profile,
-		config: {
-			enabled: nostrCfg?.enabled,
-			name: nostrCfg?.name,
-			privateKey: nostrCfg?.privateKey,
-			relays: nostrCfg?.relays,
-			dmPolicy: nostrCfg?.dmPolicy,
-			allowFrom: nostrCfg?.allowFrom,
-			profile: nostrCfg?.profile
-		}
-	};
-}
-function looksLikeNostrPrivateKey(privateKey) {
-	return privateKey.startsWith("nsec1") || privateKey.startsWith("NSEC1") || /^[0-9a-fA-F]{64}$/.test(privateKey);
-}
-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-BJCFpe02.js").then((n) => n.i)).nostrSetupWizard,
-	status: { ...createStandardChannelSetupStatus({
-		channelLabel: "Nostr",
-		configuredLabel: t("wizard.channels.statusConfigured"),
-		unconfiguredLabel: t("wizard.channels.statusNeedsPrivateKey"),
-		configuredHint: t("wizard.channels.statusConfigured"),
-		unconfiguredHint: t("wizard.channels.statusNeedsPrivateKey"),
-		configuredScore: 1,
-		unconfiguredScore: 0,
-		includeStatusLine: true,
-		resolveConfigured: ({ cfg, accountId }) => resolveSetupNostrAccount({
-			cfg,
-			accountId
-		}).configured,
-		resolveExtraStatusLines: ({ cfg }) => {
-			return [`Relays: ${resolveSetupNostrAccount({ cfg }).relays.length || DEFAULT_RELAYS.length}`];
-		}
-	}) },
-	resolveShouldPromptAccountIds: () => false,
-	delegatePrepare: true,
-	delegateFinalize: true
-});
-const nostrSetupPlugin = {
-	id: channel,
-	meta: {
-		id: channel,
-		label: "Nostr",
-		selectionLabel: "Nostr",
-		docsPath: "/channels/nostr",
-		docsLabel: "nostr",
-		blurb: "Decentralized DMs via Nostr relays (NIP-04)",
-		order: 100
-	},
-	capabilities: {
-		chatTypes: ["direct"],
-		media: false
-	},
-	reload: { configPrefixes: ["channels.nostr"] },
-	configSchema: buildChannelConfigSchema(NostrConfigSchema),
-	setup: nostrSetupAdapter,
-	setupContract: nostrSetupContract,
-	setupWizard: nostrSetupWizard,
-	config: {
-		listAccountIds: listSetupNostrAccountIds,
-		resolveAccount: (cfg, accountId) => resolveSetupNostrAccount({
-			cfg,
-			accountId
-		}),
-		defaultAccountId: resolveDefaultSetupNostrAccountId,
-		isConfigured: (account) => account.configured,
-		describeAccount: (account) => describeAccountSnapshot({
-			account,
-			configured: account.configured,
-			extra: { publicKey: account.publicKey }
-		})
-	}
-};
-//#endregion
+import { t as nostrSetupPlugin } from "./.setup/setup-plugin-api-csfJrRxD.mjs";
 export { nostrSetupPlugin };

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

@@ -24,6 +24,9 @@ __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");
@@ -143,14 +146,12 @@ 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();
@@ -166,8 +167,6 @@ 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);
@@ -191,22 +190,6 @@ 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++;
@@ -218,11 +201,6 @@ 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;
@@ -230,7 +208,6 @@ var AbstractRelay = class {
     this._connected = false;
     this.connectionPromise = void 0;
     this.idleSince = void 0;
-    this.clearIdleTimeout();
     if (this.enableReconnect && !this.skipReconnection) {
       this.reconnect();
     } else {
@@ -253,6 +230,7 @@ var AbstractRelay = class {
           if (this.reconnectAttempts === 0) {
             this.skipReconnection = true;
           }
+          this.onclose?.();
           this.handleHardClose("relay connection timed out");
         }, opts.timeout);
       }
@@ -298,6 +276,7 @@ var AbstractRelay = class {
         if (this.reconnectAttempts === 0) {
           this.skipReconnection = true;
         }
+        this.onclose?.();
         this.handleHardClose("relay connection failed");
       };
       this.ws.onclose = (ev) => {
@@ -386,7 +365,6 @@ var AbstractRelay = class {
   }
   async publish(event) {
     this.idleSince = void 0;
-    this.clearIdleTimeout();
     this.ongoingOperations++;
     const ret = new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
@@ -408,10 +386,8 @@ 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) {
@@ -437,7 +413,6 @@ 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);
@@ -466,17 +441,10 @@ 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) {
-      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();
-      }
+    if (this.ws?.readyState === this._WebSocket.OPEN) {
+      this.ws?.close();
     }
   }
   _onmessage(ev) {
@@ -503,7 +471,7 @@ var AbstractRelay = class {
         case "EVENT": {
           const so = this.openSubs.get(data[1]);
           const event = data[2];
-          if (matchFilters(so.filters, event) && this.verifyEvent(event, this.url)) {
+          if (this.verifyEvent(event) && matchFilters(so.filters, event)) {
             so.onevent(event);
           } else {
             so.oninvalidevent?.(event);
@@ -651,14 +619,18 @@ 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);
   }
 };
 
+// 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 +657,7 @@ function newHll() {
   return new Uint8Array(M);
 }
 function hllDecode(hex) {
-  if (hex.length !== HLL_HEX_LENGTH || !/^[0-9a-f]+$/.test(hex))
+  if (hex.length !== HLL_HEX_LENGTH || !/^[0-9a-fA-F]+$/.test(hex))
     return void 0;
   const registers = new Uint8Array(M);
   for (let i = 0; i < M; i++) {
@@ -724,8 +696,8 @@ var AbstractSimplePool = class {
   verifyEvent;
   enablePing;
   enableReconnect;
-  idleTimeout = 2e4;
   automaticallyAuth;
+  trustedRelayURLs = /* @__PURE__ */ new Set();
   onRelayConnectionFailure;
   onRelayConnectionSuccess;
   allowConnectingToRelay;
@@ -736,8 +708,6 @@ 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;
@@ -749,11 +719,10 @@ var AbstractSimplePool = class {
     let relay = this.relays.get(url);
     if (!relay) {
       relay = new AbstractRelay(url, {
-        verifyEvent: this.verifyEvent,
+        verifyEvent: this.trustedRelayURLs.has(url) ? alwaysTrue : this.verifyEvent,
         websocketImplementation: this._WebSocket,
         enablePing: this.enablePing,
-        enableReconnect: this.enableReconnect,
-        idleTimeout: this.idleTimeout
+        enableReconnect: this.enableReconnect
       });
       relay.onclose = () => {
         this.relays.delete(url);
@@ -833,11 +802,11 @@ var AbstractSimplePool = class {
       }
     };
     const closesReceived = [];
-    let handleClose = (i, url, reason) => {
+    let handleClose = (i, reason) => {
       if (closesReceived[i])
         return;
       handleEose(i);
-      closesReceived[i] = { url, reason };
+      closesReceived[i] = reason;
       if (closesReceived.filter((a) => a).length === groupedRequests.length) {
         params.onclose?.(closesReceived);
         handleClose = () => {
@@ -855,7 +824,7 @@ var AbstractSimplePool = class {
     const allOpened = Promise.all(
       groupedRequests.map(async ({ url, filters }, i) => {
         if (this.allowConnectingToRelay?.(url, ["read", filters]) === false) {
-          handleClose(i, url, "connection skipped by allowConnectingToRelay");
+          handleClose(i, "connection skipped by allowConnectingToRelay");
           return;
         }
         let relay;
@@ -866,7 +835,7 @@ var AbstractSimplePool = class {
           });
         } catch (err) {
           this.onRelayConnectionFailure?.(url);
-          handleClose(i, url, err?.message || String(err));
+          handleClose(i, err?.message || String(err));
           return;
         }
         this.onRelayConnectionSuccess?.(url);
@@ -880,17 +849,17 @@ var AbstractSimplePool = class {
                   ...params,
                   oneose: () => handleEose(i),
                   onclose: (reason2) => {
-                    handleClose(i, url, reason2);
+                    handleClose(i, reason2);
                   },
                   alreadyHaveEvent: localAlreadyHaveEventHandler,
                   eoseTimeout: params.maxWait,
                   abort: params.abort
                 });
               }).catch((err) => {
-                handleClose(i, url, `auth was required and attempted, but failed with: ${err}`);
+                handleClose(i, `auth was required and attempted, but failed with: ${err}`);
               });
             } else {
-              handleClose(i, url, reason);
+              handleClose(i, reason);
             }
           },
           alreadyHaveEvent: localAlreadyHaveEventHandler,
@@ -918,7 +887,7 @@ var AbstractSimplePool = class {
         if (subcloser)
           subcloser.close(reason);
         else
-          params.onclose?.(relays.map((url) => ({ url, reason })));
+          params.onclose?.(relays.map((_) => reason));
       }
     });
     return subcloser;