@openclaw/nostr 2026.3.13 → 2026.5.2-beta.1

package/src/types.ts

@@ -3,16 +3,22 @@ import {
   normalizeAccountId,
   normalizeOptionalAccountId,
 } from "openclaw/plugin-sdk/account-id";
-import type { OpenClawConfig } from "openclaw/plugin-sdk/nostr";
+import {
+  listCombinedAccountIds,
+  resolveListedDefaultAccountId,
+} from "openclaw/plugin-sdk/account-resolution";
+import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";
+import { normalizeSecretInputString, type SecretInput } from "openclaw/plugin-sdk/secret-input";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
 import type { NostrProfile } from "./config-schema.js";
-import { getPublicKeyFromPrivate } from "./nostr-bus.js";
-import { DEFAULT_RELAYS } from "./nostr-bus.js";
+import { DEFAULT_RELAYS } from "./default-relays.js";
+import { getPublicKeyFromPrivate } from "./nostr-key-utils.js";
 
-export interface NostrAccountConfig {
+interface NostrAccountConfig {
   enabled?: boolean;
   name?: string;
   defaultAccount?: string;
-  privateKey?: string;
+  privateKey?: SecretInput;
   relays?: string[];
   dmPolicy?: "pairing" | "allowlist" | "open" | "disabled";
   allowFrom?: Array<string | number>;
@@ -45,28 +51,23 @@ export function listNostrAccountIds(cfg: OpenClawConfig): string[] {
   const nostrCfg = (cfg.channels as Record<string, unknown> | undefined)?.nostr as
     | NostrAccountConfig
     | undefined;
-
-  // If privateKey is configured at top level, we have a default account
-  if (nostrCfg?.privateKey) {
-    return [resolveConfiguredDefaultNostrAccountId(cfg) ?? DEFAULT_ACCOUNT_ID];
-  }
-
-  return [];
+  const privateKey = normalizeSecretInputString(nostrCfg?.privateKey);
+  return listCombinedAccountIds({
+    configuredAccountIds: [],
+    implicitAccountId: privateKey
+      ? (resolveConfiguredDefaultNostrAccountId(cfg) ?? DEFAULT_ACCOUNT_ID)
+      : undefined,
+  });
 }
 
 /**
  * Get the default account ID
  */
 export function resolveDefaultNostrAccountId(cfg: OpenClawConfig): string {
-  const preferred = resolveConfiguredDefaultNostrAccountId(cfg);
-  if (preferred) {
-    return preferred;
-  }
-  const ids = listNostrAccountIds(cfg);
-  if (ids.includes(DEFAULT_ACCOUNT_ID)) {
-    return DEFAULT_ACCOUNT_ID;
-  }
-  return ids[0] ?? DEFAULT_ACCOUNT_ID;
+  return resolveListedDefaultAccountId({
+    accountIds: listNostrAccountIds(cfg),
+    configuredDefaultAccountId: resolveConfiguredDefaultNostrAccountId(cfg),
+  });
 }
 
 /**
@@ -82,11 +83,11 @@ export function resolveNostrAccount(opts: {
     | undefined;
 
   const baseEnabled = nostrCfg?.enabled !== false;
-  const privateKey = nostrCfg?.privateKey ?? "";
-  const configured = Boolean(privateKey.trim());
+  const privateKey = normalizeSecretInputString(nostrCfg?.privateKey) ?? "";
+  const configured = Boolean(privateKey);
 
   let publicKey = "";
-  if (configured) {
+  if (privateKey) {
     try {
       publicKey = getPublicKeyFromPrivate(privateKey);
     } catch {
@@ -96,7 +97,7 @@ export function resolveNostrAccount(opts: {
 
   return {
     accountId,
-    name: nostrCfg?.name?.trim() || undefined,
+    name: normalizeOptionalString(nostrCfg?.name),
     enabled: baseEnabled,
     configured,
     privateKey,

package/test-api.ts

@@ -0,0 +1 @@
+export { nostrPlugin } from "./src/channel.js";

package/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../tsconfig.package-boundary.base.json",
+  "compilerOptions": {
+    "rootDir": "."
+  },
+  "include": ["./*.ts", "./src/**/*.ts"],
+  "exclude": [
+    "./**/*.test.ts",
+    "./dist/**",
+    "./node_modules/**",
+    "./src/test-support/**",
+    "./src/**/*test-helpers.ts",
+    "./src/**/*test-harness.ts",
+    "./src/**/*test-support.ts"
+  ]
+}

package/CHANGELOG.md

@@ -1,116 +0,0 @@
-# Changelog
-
-## 2026.3.13
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.12
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.11
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.10
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.9
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.8-beta.1
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.8
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.7
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.3
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.2
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.3.1
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.2.26
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.2.25
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.2.24
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.2.22
-
-### Changes
-
-- Version alignment with core OpenClaw release numbers.
-
-## 2026.1.19-1
-
-Initial release.
-
-### Features
-
-- NIP-04 encrypted DM support (kind:4 events)
-- Key validation (hex and nsec formats)
-- Multi-relay support with sequential fallback
-- Event signature verification
-- TTL-based deduplication (24h)
-- Access control via dmPolicy (pairing, allowlist, open, disabled)
-- Pubkey normalization (hex/npub)
-
-### Protocol Support
-
-- NIP-01: Basic event structure
-- NIP-04: Encrypted direct messages
-
-### Planned for v2
-
-- NIP-17: Gift-wrapped DMs
-- NIP-44: Versioned encryption
-- Media attachments

package/src/types.test.ts

@@ -1,175 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { listNostrAccountIds, resolveDefaultNostrAccountId, resolveNostrAccount } from "./types.js";
-
-const TEST_PRIVATE_KEY = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
-
-describe("listNostrAccountIds", () => {
-  it("returns empty array when not configured", () => {
-    const cfg = { channels: {} };
-    expect(listNostrAccountIds(cfg)).toEqual([]);
-  });
-
-  it("returns empty array when nostr section exists but no privateKey", () => {
-    const cfg = { channels: { nostr: { enabled: true } } };
-    expect(listNostrAccountIds(cfg)).toEqual([]);
-  });
-
-  it("returns default when privateKey is configured", () => {
-    const cfg = {
-      channels: {
-        nostr: { privateKey: TEST_PRIVATE_KEY },
-      },
-    };
-    expect(listNostrAccountIds(cfg)).toEqual(["default"]);
-  });
-
-  it("returns configured defaultAccount when privateKey is configured", () => {
-    const cfg = {
-      channels: {
-        nostr: { privateKey: TEST_PRIVATE_KEY, defaultAccount: "work" },
-      },
-    };
-    expect(listNostrAccountIds(cfg)).toEqual(["work"]);
-  });
-});
-
-describe("resolveDefaultNostrAccountId", () => {
-  it("returns default when configured", () => {
-    const cfg = {
-      channels: {
-        nostr: { privateKey: TEST_PRIVATE_KEY },
-      },
-    };
-    expect(resolveDefaultNostrAccountId(cfg)).toBe("default");
-  });
-
-  it("returns default when not configured", () => {
-    const cfg = { channels: {} };
-    expect(resolveDefaultNostrAccountId(cfg)).toBe("default");
-  });
-
-  it("prefers configured defaultAccount when present", () => {
-    const cfg = {
-      channels: {
-        nostr: { privateKey: TEST_PRIVATE_KEY, defaultAccount: "work" },
-      },
-    };
-    expect(resolveDefaultNostrAccountId(cfg)).toBe("work");
-  });
-});
-
-describe("resolveNostrAccount", () => {
-  it("resolves configured account", () => {
-    const cfg = {
-      channels: {
-        nostr: {
-          privateKey: TEST_PRIVATE_KEY,
-          name: "Test Bot",
-          relays: ["wss://test.relay"],
-          dmPolicy: "pairing" as const,
-        },
-      },
-    };
-    const account = resolveNostrAccount({ cfg });
-
-    expect(account.accountId).toBe("default");
-    expect(account.name).toBe("Test Bot");
-    expect(account.enabled).toBe(true);
-    expect(account.configured).toBe(true);
-    expect(account.privateKey).toBe(TEST_PRIVATE_KEY);
-    expect(account.publicKey).toMatch(/^[0-9a-f]{64}$/);
-    expect(account.relays).toEqual(["wss://test.relay"]);
-  });
-
-  it("resolves unconfigured account with defaults", () => {
-    const cfg = { channels: {} };
-    const account = resolveNostrAccount({ cfg });
-
-    expect(account.accountId).toBe("default");
-    expect(account.enabled).toBe(true);
-    expect(account.configured).toBe(false);
-    expect(account.privateKey).toBe("");
-    expect(account.publicKey).toBe("");
-    expect(account.relays).toContain("wss://relay.damus.io");
-    expect(account.relays).toContain("wss://nos.lol");
-  });
-
-  it("handles disabled channel", () => {
-    const cfg = {
-      channels: {
-        nostr: {
-          enabled: false,
-          privateKey: TEST_PRIVATE_KEY,
-        },
-      },
-    };
-    const account = resolveNostrAccount({ cfg });
-
-    expect(account.enabled).toBe(false);
-    expect(account.configured).toBe(true);
-  });
-
-  it("handles custom accountId parameter", () => {
-    const cfg = {
-      channels: {
-        nostr: { privateKey: TEST_PRIVATE_KEY },
-      },
-    };
-    const account = resolveNostrAccount({ cfg, accountId: "custom" });
-
-    expect(account.accountId).toBe("custom");
-  });
-
-  it("handles allowFrom config", () => {
-    const cfg = {
-      channels: {
-        nostr: {
-          privateKey: TEST_PRIVATE_KEY,
-          allowFrom: ["npub1test", "0123456789abcdef"],
-        },
-      },
-    };
-    const account = resolveNostrAccount({ cfg });
-
-    expect(account.config.allowFrom).toEqual(["npub1test", "0123456789abcdef"]);
-  });
-
-  it("handles invalid private key gracefully", () => {
-    const cfg = {
-      channels: {
-        nostr: {
-          privateKey: "invalid-key",
-        },
-      },
-    };
-    const account = resolveNostrAccount({ cfg });
-
-    expect(account.configured).toBe(true); // key is present
-    expect(account.publicKey).toBe(""); // but can't derive pubkey
-  });
-
-  it("preserves all config options", () => {
-    const cfg = {
-      channels: {
-        nostr: {
-          privateKey: TEST_PRIVATE_KEY,
-          name: "Bot",
-          enabled: true,
-          relays: ["wss://relay1", "wss://relay2"],
-          dmPolicy: "allowlist" as const,
-          allowFrom: ["pubkey1", "pubkey2"],
-        },
-      },
-    };
-    const account = resolveNostrAccount({ cfg });
-
-    expect(account.config).toEqual({
-      privateKey: TEST_PRIVATE_KEY,
-      name: "Bot",
-      enabled: true,
-      relays: ["wss://relay1", "wss://relay2"],
-      dmPolicy: "allowlist",
-      allowFrom: ["pubkey1", "pubkey2"],
-    });
-  });
-});