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

推荐订阅源

H
Help Net Security
爱范儿
爱范儿
V
Visual Studio Blog
Last Week in AI
Last Week in AI
阮一峰的网络日志
阮一峰的网络日志
雷峰网
雷峰网
Hugging Face - Blog
Hugging Face - Blog
博客园 - 【当耐特】
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
博客园 - 三生石上(FineUI控件)
博客园 - Franky
博客园 - 叶小钗
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
The Cloudflare Blog
大猫的无限游戏
大猫的无限游戏
人人都是产品经理
人人都是产品经理
M
MIT News - Artificial intelligence
罗磊的独立博客
L
LangChain Blog
Jina AI
Jina AI
IT之家
IT之家
J
Java Code Geeks
Microsoft Azure Blog
Microsoft Azure Blog
博客园_首页

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 test: merge chat context notice checks · openclaw/openclaw@5c2f4af 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
Matrix: refresh crypto bootstrap state · openclaw/opencla...
gumadeiras · 2026-04-17 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -1,12 +1,8 @@

1-

import { logger as matrixJsSdkRootLogger } from "matrix-js-sdk/lib/logger.js";

21

import { ConsoleLogger, LogService, setMatrixConsoleLogging } from "../sdk/logger.js";

32
43

let matrixSdkLoggingConfigured = false;

54

let matrixSdkLogMode: "default" | "quiet" = "default";

65

const matrixSdkBaseLogger = new ConsoleLogger();

7-

const matrixSdkSilentMethodFactory = () => () => {};

8-

let matrixSdkRootMethodFactory: unknown;

9-

let matrixSdkRootLoggerInitialized = false;

106
117

type MatrixJsSdkLogger = {

128

trace: (...messageOrObject: unknown[]) => void;

@@ -52,22 +48,7 @@ export function createMatrixJsSdkClientLogger(prefix = "matrix"): MatrixJsSdkLog

5248

return createMatrixJsSdkLoggerInstance(prefix);

5349

}

5450
55-

function applyMatrixJsSdkRootLoggerMode(): void {

56-

const rootLogger = matrixJsSdkRootLogger as {

57-

methodFactory?: unknown;

58-

rebuild?: () => void;

59-

};

60-

if (!matrixSdkRootLoggerInitialized) {

61-

matrixSdkRootMethodFactory = rootLogger.methodFactory;

62-

matrixSdkRootLoggerInitialized = true;

63-

}

64-

rootLogger.methodFactory =

65-

matrixSdkLogMode === "quiet" ? matrixSdkSilentMethodFactory : matrixSdkRootMethodFactory;

66-

rootLogger.rebuild?.();

67-

}

68-
6951

function applyMatrixSdkLogger(): void {

70-

applyMatrixJsSdkRootLoggerMode();

7152

if (matrixSdkLogMode === "quiet") {

7253

LogService.setLogger({

7354

trace: () => {},

Original file line numberDiff line numberDiff line change

@@ -1404,6 +1404,26 @@ describe("MatrixClient crypto bootstrapping", () => {

14041404

expect(logger?.getChild).toBeTypeOf("function");

14051405

});

14061406
1407+

it("passes a custom sync filter to matrix-js-sdk startup", async () => {

1408+

const client = new MatrixClient("https://matrix.example.org", "token", {

1409+

userId: "@bot:example.org",

1410+

syncFilter: { room: { ephemeral: { not_types: ["m.receipt"] } } },

1411+

});

1412+
1413+

await client.start();

1414+
1415+

const startOpts = matrixJsClient.startClient.mock.calls[0]?.[0] as

1416+

| { filter?: { getDefinition?: () => unknown } }

1417+

| undefined;

1418+

expect(startOpts?.filter?.getDefinition?.()).toEqual({

1419+

room: {

1420+

ephemeral: {

1421+

not_types: ["m.receipt"],

1422+

},

1423+

},

1424+

});

1425+

});

1426+
14071427

it("schedules periodic crypto snapshot persistence with fake timers", async () => {

14081428

vi.useFakeTimers();

14091429

const databasesSpy = vi.spyOn(indexedDB, "databases").mockResolvedValue([]);

Original file line numberDiff line numberDiff line change

@@ -1,9 +1,11 @@

11

import { EventEmitter } from "node:events";

22

import {

33

ClientEvent,

4+

Filter,

45

MatrixEventEvent,

56

Preset,

67

createClient as createMatrixJsClient,

8+

type IFilterDefinition,

79

type MatrixClient as MatrixJsClient,

810

type MatrixEvent,

911

} from "matrix-js-sdk/lib/matrix.js";

@@ -216,6 +218,7 @@ export class MatrixClient {

216218

private readonly httpClient: MatrixAuthedHttpClient;

217219

private readonly localTimeoutMs: number;

218220

private readonly initialSyncLimit?: number;

221+

private readonly syncFilter?: IFilterDefinition;

219222

private readonly encryptionEnabled: boolean;

220223

private readonly password?: string;

221224

private readonly syncStore?: FileBackedMatrixSyncStore;

@@ -258,6 +261,7 @@ export class MatrixClient {

258261

localTimeoutMs?: number;

259262

encryption?: boolean;

260263

initialSyncLimit?: number;

264+

syncFilter?: IFilterDefinition;

261265

storagePath?: string;

262266

recoveryKeyPath?: string;

263267

idbSnapshotPath?: string;

@@ -275,6 +279,7 @@ export class MatrixClient {

275279

});

276280

this.localTimeoutMs = Math.max(1, opts.localTimeoutMs ?? 60_000);

277281

this.initialSyncLimit = opts.initialSyncLimit;

282+

this.syncFilter = opts.syncFilter;

278283

this.encryptionEnabled = opts.encryption === true;

279284

this.password = opts.password;

280285

this.syncStore = opts.storagePath ? new FileBackedMatrixSyncStore(opts.storagePath) : undefined;

@@ -496,6 +501,7 @@ export class MatrixClient {

496501
497502

await this.client.startClient({

498503

initialSyncLimit: this.initialSyncLimit,

504+

...(this.syncFilter ? { filter: Filter.fromJson(this.selfUserId, "", this.syncFilter) } : {}),

499505

});

500506

await this.waitForInitialSyncReady({

501507

abortSignal: opts.abortSignal,

@@ -1674,6 +1680,12 @@ export class MatrixClient {

16741680

"MatrixClientLite",

16751681

"No room key backup version found on server, creating one via secret storage bootstrap",

16761682

);

1683+

// matrix-js-sdk 41.3.0 can log a transient PerSessionKeyBackupDownloader

1684+

// "current backup version ... undefined" warning while setupNewKeyBackup creates

1685+

// the backup: resetKeyBackup emits key-backup cache events before its async

1686+

// checkKeyBackupAndEnable pass has populated active backup state. Keep the

1687+

// explicit server re-check below and do not hide the SDK logs; if this needs

1688+

// fixing in code, upstream a minimal Matrix SDK repro instead of patching here.

16771689

await this.recoveryKeyStore.bootstrapSecretStorageWithRecoveryKey(crypto, {

16781690

setupNewKeyBackup: true,

16791691

});

Original file line numberDiff line numberDiff line change

@@ -222,6 +222,26 @@ describe("MatrixCryptoBootstrapper", () => {

222222

);

223223

});

224224
225+

it("refreshes published cross-signing keys before importing private keys from secret storage", async () => {

226+

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

227+

const userHasCrossSigningKeys = vi.fn(async () => true);

228+

const { bootstrapper, crypto } = createBootstrapperHarness({

229+

bootstrapCrossSigning,

230+

getDeviceVerificationStatus: vi.fn(async () => createVerifiedDeviceStatus()),

231+

isCrossSigningReady: vi.fn(async () => true),

232+

userHasCrossSigningKeys,

233+

});

234+
235+

await bootstrapper.bootstrap(crypto, {

236+

allowAutomaticCrossSigningReset: false,

237+

});

238+
239+

expect(userHasCrossSigningKeys).toHaveBeenCalledWith("@bot:example.org", true);

240+

expect(userHasCrossSigningKeys.mock.invocationCallOrder[0]).toBeLessThan(

241+

bootstrapCrossSigning.mock.invocationCallOrder[0],

242+

);

243+

});

244+
225245

it("passes explicit secret-storage repair allowance only when requested", async () => {

226246

const deps = createBootstrapperDeps();

227247

const crypto = createCryptoApi({

Original file line numberDiff line numberDiff line change

@@ -142,6 +142,16 @@ export class MatrixCryptoBootstrapper<TRawEvent extends MatrixRawEvent> {

142142

return false;

143143

}

144144

};

145+

const refreshPublishedCrossSigningKeys = async (): Promise<void> => {

146+

if (typeof crypto.userHasCrossSigningKeys !== "function") {

147+

return;

148+

}

149+

try {

150+

await crypto.userHasCrossSigningKeys(userId, true);

151+

} catch {

152+

// The normal bootstrap flow below handles missing or unavailable keys.

153+

}

154+

};

145155

const isCrossSigningReady = async (): Promise<boolean> => {

146156

if (typeof crypto.isCrossSigningReady !== "function") {

147157

return true;

@@ -212,6 +222,7 @@ export class MatrixCryptoBootstrapper<TRawEvent extends MatrixRawEvent> {

212222
213223

// First pass: preserve existing cross-signing identity and ensure public keys are uploaded.

214224

try {

225+

await refreshPublishedCrossSigningKeys();

215226

await crypto.bootstrapCrossSigning({

216227

authUploadDeviceSigningKeys,

217228

});