惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

F
Fortinet All Blogs
aimingoo的专栏
aimingoo的专栏
V
Visual Studio Blog
罗磊的独立博客
爱范儿
爱范儿
J
Java Code Geeks
博客园 - 司徒正美
N
Netflix TechBlog - Medium
Microsoft Security Blog
Microsoft Security Blog
美团技术团队
小众软件
小众软件
Google DeepMind News
Google DeepMind News
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
V
V2EX
博客园 - 聂微东
云风的 BLOG
云风的 BLOG
WordPress大学
WordPress大学
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Jina AI
Jina AI
Y
Y Combinator Blog
博客园 - 叶小钗
人人都是产品经理
人人都是产品经理
Martin Fowler
Martin Fowler
Vercel News
Vercel News

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(nostr): close relay pool after subscription shutdown ...
steipete · 2026-05-29 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -1,11 +1,13 @@

11

import {

22

createStartAccountContext,

3+

createPluginRuntimeMock,

34

expectStopPendingUntilAbort,

45

startAccountAndTrackLifecycle,

56

waitForStartedMocks,

67

} from "openclaw/plugin-sdk/channel-test-helpers";

7-

import { afterEach, describe, expect, it, vi } from "vitest";

8+

import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";

89

import { getActiveNostrBuses, startNostrGatewayAccount } from "./gateway.js";

10+

import { setNostrRuntime } from "./runtime.js";

911

import { buildResolvedNostrAccount } from "./test-fixtures.js";

1012
1113

const mocks = vi.hoisted(() => ({

@@ -28,6 +30,10 @@ function createMockBus() {

2830

}

2931
3032

describe("nostr gateway lifecycle", () => {

33+

beforeEach(() => {

34+

setNostrRuntime(createPluginRuntimeMock());

35+

});

36+
3137

afterEach(() => {

3238

mocks.startNostrBus.mockReset();

3339

});

Original file line numberDiff line numberDiff line change

@@ -12,6 +12,7 @@ const mockState = vi.hoisted(() => ({

1212

} | null,

1313

subscribeMany: vi.fn(),

1414

close: vi.fn(),

15+

subscriptionClose: vi.fn(),

1516

verifyEvent: vi.fn(() => true),

1617

decrypt: vi.fn(() => "plaintext"),

1718

publishProfile: vi.fn(async () => ({

@@ -36,7 +37,7 @@ vi.mock("nostr-tools", () => {

3637

mockState.subscribeMany(relays, filters, handlers);

3738

mockState.handlers = handlers;

3839

return {

39-

close: vi.fn(),

40+

close: mockState.subscriptionClose,

4041

};

4142

}

4243

@@ -100,6 +101,7 @@ describe("startNostrBus inbound guards", () => {

100101

mockState.handlers = null;

101102

mockState.subscribeMany.mockClear();

102103

mockState.close.mockClear();

104+

mockState.subscriptionClose.mockReset();

103105

mockState.verifyEvent.mockClear();

104106

mockState.verifyEvent.mockReturnValue(true);

105107

mockState.decrypt.mockClear();

@@ -144,6 +146,32 @@ describe("startNostrBus inbound guards", () => {

144146

});

145147

});

146148
149+

it("closes the relay pool after the active subscription closes", async () => {

150+

let releaseClose = () => {};

151+

const subscriptionClosed = new Promise<void>((resolve) => {

152+

releaseClose = resolve;

153+

});

154+

mockState.subscriptionClose.mockImplementationOnce(async () => {

155+

await subscriptionClosed;

156+

});

157+

const bus = await startNostrBus({

158+

privateKey: TEST_HEX_PRIVATE_KEY,

159+

relays: ["wss://relay.example"],

160+

onMessage: vi.fn(async () => {}),

161+

onMetric: () => {},

162+

});

163+
164+

bus.close();

165+
166+

expect(mockState.subscriptionClose).toHaveBeenCalledWith("closed by caller");

167+

expect(mockState.close).not.toHaveBeenCalled();

168+
169+

releaseClose();

170+

await vi.waitFor(() => {

171+

expect(mockState.close).toHaveBeenCalledWith(["wss://relay.example"]);

172+

});

173+

});

174+
147175

it("checks sender authorization after verify and before decrypt", async () => {

148176

const onMessage = vi.fn(async () => {});

149177

const authorizeSender = vi.fn(async () => "block" as const);

Original file line numberDiff line numberDiff line change

@@ -138,7 +138,7 @@ function createFixedWindowRateLimiter(params: {

138138

}

139139
140140

export interface NostrBusHandle {

141-

/** Stop the bus and close connections */

141+

/** Stop the bus and close relay connections */

142142

close: () => void;

143143

/** Get the bot's public key */

144144

publicKey: string;

@@ -617,6 +617,7 @@ export async function startNostrBus(options: NostrBusOptions): Promise<NostrBusH

617617

const dmFilter = { kinds: [4], "#p": [pk], since } satisfies Parameters<

618618

typeof pool.subscribeMany

619619

>[1];

620+

const relayAbort = new AbortController();

620621

const sub = pool.subscribeMany(relays, dmFilter, {

621622

onevent: handleEvent,

622623

oneose: () => {

@@ -634,6 +635,7 @@ export async function startNostrBus(options: NostrBusOptions): Promise<NostrBusH

634635

}

635636

onError?.(new Error(`Subscription closed: ${reason.join(", ")}`), "subscription");

636637

},

638+

abort: relayAbort.signal,

637639

});

638640
639641

// Public sendDm function

@@ -692,8 +694,12 @@ export async function startNostrBus(options: NostrBusOptions): Promise<NostrBusH

692694
693695

return {

694696

close: () => {

695-

sub.close();

696-

setTimeout(() => pool.close(relays), 0);

697+

relayAbort.abort("closed by caller");

698+

void Promise.resolve(sub.close("closed by caller"))

699+

.catch((err) => onError?.(err as Error, "close subscription"))

700+

.finally(() => {

701+

pool.close(relays);

702+

});

697703

seen.stop();

698704

perSenderRateLimiter.clear();

699705

globalRateLimiter.clear();