@archipelagolab/lobi 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +164 -0
- package/ENDOFFILE +0 -0
- package/EOF +0 -0
- package/LICENSE +21 -0
- package/SPEC-SUPPORT.md +116 -0
- package/YAMLEND +0 -0
- package/api.ts +18 -0
- package/archipelagolab-lobi-1.0.0.tgz +0 -0
- package/auth-presence.ts +56 -0
- package/channel-plugin-api.ts +3 -0
- package/cli-metadata.ts +11 -0
- package/contract-api.ts +17 -0
- package/docs/CHECKLIST.md +83 -0
- package/docs/FORK_SDK_GUIDE.md +279 -0
- package/helper-api.ts +3 -0
- package/index.test.ts +61 -0
- package/index.ts +65 -0
- package/openclaw.plugin.json +23 -0
- package/package.json +52 -0
- package/plugin-entry.handlers.runtime.ts +1 -0
- package/runtime-api.ts +54 -0
- package/runtime-heavy-api.ts +1 -0
- package/scripts/migrate-to-lobi.sh +72 -0
- package/secret-contract-api.ts +5 -0
- package/setup-entry.ts +13 -0
- package/src/account-selection.test.ts +124 -0
- package/src/account-selection.ts +226 -0
- package/src/actions.account-propagation.test.ts +251 -0
- package/src/actions.test.ts +251 -0
- package/src/actions.ts +336 -0
- package/src/approval-auth.test.ts +23 -0
- package/src/approval-auth.ts +25 -0
- package/src/approval-handler.runtime.test.ts +46 -0
- package/src/approval-handler.runtime.ts +400 -0
- package/src/approval-ids.ts +6 -0
- package/src/approval-native.test.ts +329 -0
- package/src/approval-native.ts +336 -0
- package/src/approval-reactions.test.ts +107 -0
- package/src/approval-reactions.ts +158 -0
- package/src/auth-precedence.ts +61 -0
- package/src/channel-account-paths.ts +92 -0
- package/src/channel.account-paths.test.ts +102 -0
- package/src/channel.directory.test.ts +601 -0
- package/src/channel.resolve.test.ts +38 -0
- package/src/channel.runtime.ts +16 -0
- package/src/channel.setup.test.ts +269 -0
- package/src/channel.ts +570 -0
- package/src/cli-metadata.ts +19 -0
- package/src/cli.test.ts +1015 -0
- package/src/cli.ts +1198 -0
- package/src/config-adapter.ts +41 -0
- package/src/config-schema.test.ts +90 -0
- package/src/config-schema.ts +114 -0
- package/src/directory-live.test.ts +200 -0
- package/src/directory-live.ts +238 -0
- package/src/doctor-contract.ts +287 -0
- package/src/doctor.test.ts +440 -0
- package/src/doctor.ts +262 -0
- package/src/env-vars.ts +92 -0
- package/src/exec-approval-resolver.test.ts +68 -0
- package/src/exec-approval-resolver.ts +23 -0
- package/src/exec-approvals.test.ts +483 -0
- package/src/exec-approvals.ts +290 -0
- package/src/group-mentions.ts +41 -0
- package/src/legacy-crypto-inspector-availability.test.ts +81 -0
- package/src/legacy-crypto-inspector-availability.ts +60 -0
- package/src/legacy-crypto.test.ts +234 -0
- package/src/legacy-crypto.ts +549 -0
- package/src/legacy-state.test.ts +86 -0
- package/src/legacy-state.ts +156 -0
- package/src/matrix/account-config.ts +150 -0
- package/src/matrix/accounts.readiness.test.ts +27 -0
- package/src/matrix/accounts.test.ts +757 -0
- package/src/matrix/accounts.ts +194 -0
- package/src/matrix/actions/client.test.ts +215 -0
- package/src/matrix/actions/client.ts +31 -0
- package/src/matrix/actions/devices.test.ts +114 -0
- package/src/matrix/actions/devices.ts +34 -0
- package/src/matrix/actions/limits.test.ts +15 -0
- package/src/matrix/actions/limits.ts +6 -0
- package/src/matrix/actions/messages.test.ts +289 -0
- package/src/matrix/actions/messages.ts +123 -0
- package/src/matrix/actions/pins.test.ts +74 -0
- package/src/matrix/actions/pins.ts +64 -0
- package/src/matrix/actions/polls.test.ts +71 -0
- package/src/matrix/actions/polls.ts +109 -0
- package/src/matrix/actions/profile.test.ts +109 -0
- package/src/matrix/actions/profile.ts +37 -0
- package/src/matrix/actions/reactions.test.ts +135 -0
- package/src/matrix/actions/reactions.ts +59 -0
- package/src/matrix/actions/room.test.ts +79 -0
- package/src/matrix/actions/room.ts +71 -0
- package/src/matrix/actions/summary.test.ts +87 -0
- package/src/matrix/actions/summary.ts +88 -0
- package/src/matrix/actions/types.ts +82 -0
- package/src/matrix/actions/verification.test.ts +105 -0
- package/src/matrix/actions/verification.ts +237 -0
- package/src/matrix/actions.ts +37 -0
- package/src/matrix/active-client.ts +26 -0
- package/src/matrix/async-lock.ts +18 -0
- package/src/matrix/backup-health.ts +115 -0
- package/src/matrix/client/config-runtime-api.ts +14 -0
- package/src/matrix/client/config-secret-input.runtime.ts +1 -0
- package/src/matrix/client/config.ts +982 -0
- package/src/matrix/client/create-client.test.ts +115 -0
- package/src/matrix/client/create-client.ts +101 -0
- package/src/matrix/client/env-auth.ts +6 -0
- package/src/matrix/client/file-sync-store.test.ts +265 -0
- package/src/matrix/client/file-sync-store.ts +289 -0
- package/src/matrix/client/logging.ts +123 -0
- package/src/matrix/client/migration-snapshot.runtime.ts +1 -0
- package/src/matrix/client/private-network-host.ts +56 -0
- package/src/matrix/client/runtime.ts +4 -0
- package/src/matrix/client/shared.test.ts +344 -0
- package/src/matrix/client/shared.ts +306 -0
- package/src/matrix/client/storage.test.ts +634 -0
- package/src/matrix/client/storage.ts +544 -0
- package/src/matrix/client/types.ts +50 -0
- package/src/matrix/client-bootstrap.test.ts +84 -0
- package/src/matrix/client-bootstrap.ts +164 -0
- package/src/matrix/client-resolver.test-helpers.ts +147 -0
- package/src/matrix/client.test.ts +1521 -0
- package/src/matrix/client.ts +23 -0
- package/src/matrix/config-paths.ts +31 -0
- package/src/matrix/config-update.test.ts +237 -0
- package/src/matrix/config-update.ts +291 -0
- package/src/matrix/credentials-read.ts +206 -0
- package/src/matrix/credentials-write.runtime.ts +26 -0
- package/src/matrix/credentials.test.ts +501 -0
- package/src/matrix/credentials.ts +95 -0
- package/src/matrix/deps.test.ts +74 -0
- package/src/matrix/deps.ts +225 -0
- package/src/matrix/device-health.test.ts +45 -0
- package/src/matrix/device-health.ts +31 -0
- package/src/matrix/direct-management.test.ts +350 -0
- package/src/matrix/direct-management.ts +347 -0
- package/src/matrix/direct-room.test.ts +61 -0
- package/src/matrix/direct-room.ts +128 -0
- package/src/matrix/draft-stream.test.ts +406 -0
- package/src/matrix/draft-stream.ts +216 -0
- package/src/matrix/encryption-guidance.ts +27 -0
- package/src/matrix/errors.ts +21 -0
- package/src/matrix/format.test.ts +340 -0
- package/src/matrix/format.ts +428 -0
- package/src/matrix/legacy-crypto-inspector.ts +95 -0
- package/src/matrix/media-errors.ts +20 -0
- package/src/matrix/media-text.ts +169 -0
- package/src/matrix/monitor/access-state.test.ts +45 -0
- package/src/matrix/monitor/access-state.ts +77 -0
- package/src/matrix/monitor/ack-config.test.ts +57 -0
- package/src/matrix/monitor/ack-config.ts +26 -0
- package/src/matrix/monitor/allowlist.test.ts +45 -0
- package/src/matrix/monitor/allowlist.ts +94 -0
- package/src/matrix/monitor/auto-join.test.ts +203 -0
- package/src/matrix/monitor/auto-join.ts +86 -0
- package/src/matrix/monitor/config.test.ts +197 -0
- package/src/matrix/monitor/config.ts +303 -0
- package/src/matrix/monitor/context-summary.ts +43 -0
- package/src/matrix/monitor/direct.test.ts +529 -0
- package/src/matrix/monitor/direct.ts +270 -0
- package/src/matrix/monitor/events.test.ts +1524 -0
- package/src/matrix/monitor/events.ts +213 -0
- package/src/matrix/monitor/handler.body-for-agent.test.ts +396 -0
- package/src/matrix/monitor/handler.group-history.test.ts +648 -0
- package/src/matrix/monitor/handler.media-failure.test.ts +267 -0
- package/src/matrix/monitor/handler.test-helpers.ts +308 -0
- package/src/matrix/monitor/handler.test.ts +2952 -0
- package/src/matrix/monitor/handler.thread-root-media.test.ts +82 -0
- package/src/matrix/monitor/handler.ts +1679 -0
- package/src/matrix/monitor/inbound-dedupe.test.ts +146 -0
- package/src/matrix/monitor/inbound-dedupe.ts +267 -0
- package/src/matrix/monitor/index.test.ts +920 -0
- package/src/matrix/monitor/index.ts +434 -0
- package/src/matrix/monitor/legacy-crypto-restore.test.ts +206 -0
- package/src/matrix/monitor/legacy-crypto-restore.ts +139 -0
- package/src/matrix/monitor/location.ts +100 -0
- package/src/matrix/monitor/media.test.ts +159 -0
- package/src/matrix/monitor/media.ts +119 -0
- package/src/matrix/monitor/mentions.test.ts +289 -0
- package/src/matrix/monitor/mentions.ts +177 -0
- package/src/matrix/monitor/reaction-events.test.ts +326 -0
- package/src/matrix/monitor/reaction-events.ts +187 -0
- package/src/matrix/monitor/recent-invite.test.ts +92 -0
- package/src/matrix/monitor/recent-invite.ts +30 -0
- package/src/matrix/monitor/replies.test.ts +265 -0
- package/src/matrix/monitor/replies.ts +136 -0
- package/src/matrix/monitor/reply-context.test.ts +276 -0
- package/src/matrix/monitor/reply-context.ts +92 -0
- package/src/matrix/monitor/room-history.test.ts +258 -0
- package/src/matrix/monitor/room-history.ts +301 -0
- package/src/matrix/monitor/room-info.test.ts +201 -0
- package/src/matrix/monitor/room-info.ts +126 -0
- package/src/matrix/monitor/rooms.test.ts +121 -0
- package/src/matrix/monitor/rooms.ts +52 -0
- package/src/matrix/monitor/route.test.ts +255 -0
- package/src/matrix/monitor/route.ts +178 -0
- package/src/matrix/monitor/runtime-api.ts +31 -0
- package/src/matrix/monitor/startup-verification.test.ts +294 -0
- package/src/matrix/monitor/startup-verification.ts +237 -0
- package/src/matrix/monitor/startup.test.ts +257 -0
- package/src/matrix/monitor/startup.ts +218 -0
- package/src/matrix/monitor/status.ts +111 -0
- package/src/matrix/monitor/sync-lifecycle.test.ts +224 -0
- package/src/matrix/monitor/sync-lifecycle.ts +91 -0
- package/src/matrix/monitor/task-runner.ts +38 -0
- package/src/matrix/monitor/thread-context.test.ts +149 -0
- package/src/matrix/monitor/thread-context.ts +108 -0
- package/src/matrix/monitor/threads.test.ts +68 -0
- package/src/matrix/monitor/threads.ts +85 -0
- package/src/matrix/monitor/types.ts +30 -0
- package/src/matrix/monitor/verification-events.ts +627 -0
- package/src/matrix/monitor/verification-utils.test.ts +47 -0
- package/src/matrix/monitor/verification-utils.ts +46 -0
- package/src/matrix/outbound-media-runtime.ts +1 -0
- package/src/matrix/poll-summary.ts +110 -0
- package/src/matrix/poll-types.test.ts +205 -0
- package/src/matrix/poll-types.ts +433 -0
- package/src/matrix/probe.runtime.ts +4 -0
- package/src/matrix/probe.test.ts +154 -0
- package/src/matrix/probe.ts +96 -0
- package/src/matrix/profile.test.ts +154 -0
- package/src/matrix/profile.ts +184 -0
- package/src/matrix/reaction-common.test.ts +96 -0
- package/src/matrix/reaction-common.ts +147 -0
- package/src/matrix/sdk/crypto-bootstrap.test.ts +505 -0
- package/src/matrix/sdk/crypto-bootstrap.ts +341 -0
- package/src/matrix/sdk/crypto-facade.test.ts +197 -0
- package/src/matrix/sdk/crypto-facade.ts +207 -0
- package/src/matrix/sdk/crypto-node.runtime.test.ts +27 -0
- package/src/matrix/sdk/crypto-node.runtime.ts +9 -0
- package/src/matrix/sdk/crypto-runtime.ts +11 -0
- package/src/matrix/sdk/decrypt-bridge.ts +356 -0
- package/src/matrix/sdk/event-helpers.test.ts +60 -0
- package/src/matrix/sdk/event-helpers.ts +71 -0
- package/src/matrix/sdk/http-client.test.ts +134 -0
- package/src/matrix/sdk/http-client.ts +87 -0
- package/src/matrix/sdk/idb-persistence-lock.ts +51 -0
- package/src/matrix/sdk/idb-persistence.lock-order.test.ts +108 -0
- package/src/matrix/sdk/idb-persistence.test-helpers.ts +88 -0
- package/src/matrix/sdk/idb-persistence.test.ts +149 -0
- package/src/matrix/sdk/idb-persistence.ts +283 -0
- package/src/matrix/sdk/logger.test.ts +25 -0
- package/src/matrix/sdk/logger.ts +108 -0
- package/src/matrix/sdk/read-response-with-limit.ts +19 -0
- package/src/matrix/sdk/recovery-key-store.test.ts +385 -0
- package/src/matrix/sdk/recovery-key-store.ts +430 -0
- package/src/matrix/sdk/transport.test.ts +161 -0
- package/src/matrix/sdk/transport.ts +344 -0
- package/src/matrix/sdk/types.ts +236 -0
- package/src/matrix/sdk/verification-manager.test.ts +509 -0
- package/src/matrix/sdk/verification-manager.ts +694 -0
- package/src/matrix/sdk/verification-status.ts +23 -0
- package/src/matrix/sdk.test.ts +2568 -0
- package/src/matrix/sdk.ts +1789 -0
- package/src/matrix/send/client.test.ts +174 -0
- package/src/matrix/send/client.ts +90 -0
- package/src/matrix/send/formatting.ts +189 -0
- package/src/matrix/send/media.ts +244 -0
- package/src/matrix/send/targets.test.ts +254 -0
- package/src/matrix/send/targets.ts +104 -0
- package/src/matrix/send/types.ts +134 -0
- package/src/matrix/send.test.ts +958 -0
- package/src/matrix/send.ts +609 -0
- package/src/matrix/session-store-metadata.ts +108 -0
- package/src/matrix/startup-abort.ts +44 -0
- package/src/matrix/sync-state.ts +27 -0
- package/src/matrix/target-ids.ts +102 -0
- package/src/matrix/thread-bindings-shared.ts +201 -0
- package/src/matrix/thread-bindings.test.ts +673 -0
- package/src/matrix/thread-bindings.ts +577 -0
- package/src/matrix-migration.runtime.ts +9 -0
- package/src/migration-config.test.ts +228 -0
- package/src/migration-config.ts +243 -0
- package/src/migration-snapshot-backup.ts +117 -0
- package/src/migration-snapshot.test.ts +184 -0
- package/src/migration-snapshot.ts +55 -0
- package/src/onboarding.resolve.test.ts +55 -0
- package/src/onboarding.test-harness.ts +158 -0
- package/src/onboarding.test.ts +665 -0
- package/src/onboarding.ts +773 -0
- package/src/outbound.test.ts +173 -0
- package/src/outbound.ts +78 -0
- package/src/plugin-entry.runtime.js +159 -0
- package/src/plugin-entry.runtime.test.ts +108 -0
- package/src/plugin-entry.runtime.ts +68 -0
- package/src/profile-update.ts +68 -0
- package/src/record-shared.ts +3 -0
- package/src/resolve-targets.test.ts +178 -0
- package/src/resolve-targets.ts +175 -0
- package/src/resolver.ts +21 -0
- package/src/runtime-api.ts +144 -0
- package/src/runtime.ts +7 -0
- package/src/secret-contract.ts +174 -0
- package/src/session-route.test.ts +315 -0
- package/src/session-route.ts +113 -0
- package/src/setup-bootstrap.ts +94 -0
- package/src/setup-config.ts +222 -0
- package/src/setup-contract.ts +89 -0
- package/src/setup-core.test.ts +326 -0
- package/src/setup-core.ts +50 -0
- package/src/setup-surface.ts +4 -0
- package/src/startup-maintenance.test.ts +227 -0
- package/src/startup-maintenance.ts +114 -0
- package/src/storage-paths.ts +92 -0
- package/src/test-helpers.ts +42 -0
- package/src/test-mocks.ts +55 -0
- package/src/test-runtime.ts +72 -0
- package/src/test-support/monitor-route-test-support.ts +8 -0
- package/src/tool-actions.runtime.ts +1 -0
- package/src/tool-actions.test.ts +422 -0
- package/src/tool-actions.ts +498 -0
- package/src/types.ts +230 -0
- package/test-api.ts +2 -0
- package/thread-bindings-runtime.ts +4 -0
- package/tsconfig.json +16 -0
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
import {
|
|
2
|
+
applyAccountNameToChannelSection,
|
|
3
|
+
DEFAULT_ACCOUNT_ID,
|
|
4
|
+
normalizeAccountId,
|
|
5
|
+
normalizeSecretInputString,
|
|
6
|
+
type ChannelSetupInput,
|
|
7
|
+
} from "openclaw/plugin-sdk/setup";
|
|
8
|
+
import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
|
|
9
|
+
import { resolveMatrixEnvAuthReadiness } from "./matrix/client/env-auth.js";
|
|
10
|
+
import { updateMatrixAccountConfig } from "./matrix/config-update.js";
|
|
11
|
+
import { isSupportedMatrixAvatarSource } from "./matrix/profile.js";
|
|
12
|
+
import {
|
|
13
|
+
matrixNamedAccountPromotionKeys,
|
|
14
|
+
resolveSingleAccountPromotionTarget,
|
|
15
|
+
matrixSingleAccountKeysToMove,
|
|
16
|
+
} from "./setup-contract.js";
|
|
17
|
+
import type { CoreConfig } from "./types.js";
|
|
18
|
+
|
|
19
|
+
const channel = "matrix" as const;
|
|
20
|
+
const COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE = new Set([
|
|
21
|
+
"name",
|
|
22
|
+
"enabled",
|
|
23
|
+
"httpPort",
|
|
24
|
+
"webhookPath",
|
|
25
|
+
"webhookUrl",
|
|
26
|
+
"webhookSecret",
|
|
27
|
+
"service",
|
|
28
|
+
"region",
|
|
29
|
+
"homeserver",
|
|
30
|
+
"userId",
|
|
31
|
+
"accessToken",
|
|
32
|
+
"password",
|
|
33
|
+
"deviceName",
|
|
34
|
+
"url",
|
|
35
|
+
"code",
|
|
36
|
+
"dmPolicy",
|
|
37
|
+
"allowFrom",
|
|
38
|
+
"groupPolicy",
|
|
39
|
+
"groupAllowFrom",
|
|
40
|
+
"defaultTo",
|
|
41
|
+
]);
|
|
42
|
+
const MATRIX_SINGLE_ACCOUNT_KEYS_TO_MOVE = new Set<string>(matrixSingleAccountKeysToMove);
|
|
43
|
+
const MATRIX_NAMED_ACCOUNT_PROMOTION_KEYS = new Set<string>(matrixNamedAccountPromotionKeys);
|
|
44
|
+
|
|
45
|
+
function cloneIfObject<T>(value: T): T {
|
|
46
|
+
if (value && typeof value === "object") {
|
|
47
|
+
return structuredClone(value);
|
|
48
|
+
}
|
|
49
|
+
return value;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function resolveSetupAvatarUrl(input: ChannelSetupInput): string | undefined {
|
|
53
|
+
const avatarUrl = input.avatarUrl;
|
|
54
|
+
if (typeof avatarUrl !== "string") {
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
const trimmed = avatarUrl.trim();
|
|
58
|
+
return trimmed || undefined;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
function resolveExistingMatrixAccountKey(
|
|
62
|
+
accounts: Record<string, Record<string, unknown>>,
|
|
63
|
+
targetAccountId: string,
|
|
64
|
+
): string {
|
|
65
|
+
const normalizedTargetAccountId = normalizeAccountId(targetAccountId);
|
|
66
|
+
return (
|
|
67
|
+
Object.keys(accounts).find(
|
|
68
|
+
(accountId) => normalizeAccountId(accountId) === normalizedTargetAccountId,
|
|
69
|
+
) ?? targetAccountId
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export function moveSingleMatrixAccountConfigToNamedAccount(cfg: CoreConfig): CoreConfig {
|
|
74
|
+
const channels = cfg.channels as Record<string, unknown> | undefined;
|
|
75
|
+
const baseConfig = channels?.[channel];
|
|
76
|
+
const base =
|
|
77
|
+
typeof baseConfig === "object" && baseConfig
|
|
78
|
+
? (baseConfig as Record<string, unknown>)
|
|
79
|
+
: undefined;
|
|
80
|
+
if (!base) {
|
|
81
|
+
return cfg;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
const accounts =
|
|
85
|
+
typeof base.accounts === "object" && base.accounts
|
|
86
|
+
? (base.accounts as Record<string, Record<string, unknown>>)
|
|
87
|
+
: {};
|
|
88
|
+
const hasNamedAccounts = Object.keys(accounts).filter(Boolean).length > 0;
|
|
89
|
+
const keysToMove = Object.entries(base)
|
|
90
|
+
.filter(([key, value]) => {
|
|
91
|
+
if (key === "accounts" || key === "enabled" || value === undefined) {
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
if (
|
|
95
|
+
!COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE.has(key) &&
|
|
96
|
+
!MATRIX_SINGLE_ACCOUNT_KEYS_TO_MOVE.has(key)
|
|
97
|
+
) {
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
if (hasNamedAccounts && !MATRIX_NAMED_ACCOUNT_PROMOTION_KEYS.has(key)) {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
return true;
|
|
104
|
+
})
|
|
105
|
+
.map(([key]) => key);
|
|
106
|
+
if (keysToMove.length === 0) {
|
|
107
|
+
return cfg;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
const targetAccountId = resolveSingleAccountPromotionTarget({ channel: base });
|
|
111
|
+
const resolvedTargetAccountId = resolveExistingMatrixAccountKey(accounts, targetAccountId);
|
|
112
|
+
|
|
113
|
+
const nextAccount: Record<string, unknown> = { ...accounts[resolvedTargetAccountId] };
|
|
114
|
+
for (const key of keysToMove) {
|
|
115
|
+
nextAccount[key] = cloneIfObject(base[key]);
|
|
116
|
+
}
|
|
117
|
+
const nextChannel = { ...base };
|
|
118
|
+
for (const key of keysToMove) {
|
|
119
|
+
delete nextChannel[key];
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
return {
|
|
123
|
+
...cfg,
|
|
124
|
+
channels: {
|
|
125
|
+
...cfg.channels,
|
|
126
|
+
[channel]: {
|
|
127
|
+
...nextChannel,
|
|
128
|
+
accounts: {
|
|
129
|
+
...accounts,
|
|
130
|
+
[resolvedTargetAccountId]: nextAccount,
|
|
131
|
+
},
|
|
132
|
+
},
|
|
133
|
+
},
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
export function validateMatrixSetupInput(params: {
|
|
138
|
+
accountId: string;
|
|
139
|
+
input: ChannelSetupInput;
|
|
140
|
+
}): string | null {
|
|
141
|
+
const avatarUrl = resolveSetupAvatarUrl(params.input);
|
|
142
|
+
if (avatarUrl && !isSupportedMatrixAvatarSource(avatarUrl)) {
|
|
143
|
+
return "Matrix avatar URL must be an mxc:// URI or an http(s) URL.";
|
|
144
|
+
}
|
|
145
|
+
if (params.input.useEnv) {
|
|
146
|
+
const envReadiness = resolveMatrixEnvAuthReadiness(params.accountId, process.env);
|
|
147
|
+
return envReadiness.ready ? null : envReadiness.missingMessage;
|
|
148
|
+
}
|
|
149
|
+
if (!params.input.homeserver?.trim()) {
|
|
150
|
+
return "Matrix requires --homeserver";
|
|
151
|
+
}
|
|
152
|
+
const accessToken = params.input.accessToken?.trim();
|
|
153
|
+
const password = normalizeSecretInputString(params.input.password);
|
|
154
|
+
const userId = params.input.userId?.trim();
|
|
155
|
+
if (!accessToken && !password) {
|
|
156
|
+
return "Matrix requires --access-token or --password";
|
|
157
|
+
}
|
|
158
|
+
if (!accessToken) {
|
|
159
|
+
if (!userId) {
|
|
160
|
+
return "Matrix requires --user-id when using --password";
|
|
161
|
+
}
|
|
162
|
+
if (!password) {
|
|
163
|
+
return "Matrix requires --password when using --user-id";
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
return null;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
export function applyMatrixSetupAccountConfig(params: {
|
|
170
|
+
cfg: CoreConfig;
|
|
171
|
+
accountId: string;
|
|
172
|
+
input: ChannelSetupInput;
|
|
173
|
+
}): CoreConfig {
|
|
174
|
+
const normalizedAccountId = normalizeAccountId(params.accountId);
|
|
175
|
+
const migratedCfg =
|
|
176
|
+
normalizedAccountId !== DEFAULT_ACCOUNT_ID
|
|
177
|
+
? moveSingleMatrixAccountConfigToNamedAccount(params.cfg)
|
|
178
|
+
: params.cfg;
|
|
179
|
+
const next = applyAccountNameToChannelSection({
|
|
180
|
+
cfg: migratedCfg,
|
|
181
|
+
channelKey: channel,
|
|
182
|
+
accountId: normalizedAccountId,
|
|
183
|
+
name: params.input.name,
|
|
184
|
+
}) as CoreConfig;
|
|
185
|
+
const avatarUrl = resolveSetupAvatarUrl(params.input);
|
|
186
|
+
|
|
187
|
+
if (params.input.useEnv) {
|
|
188
|
+
return updateMatrixAccountConfig(next, normalizedAccountId, {
|
|
189
|
+
enabled: true,
|
|
190
|
+
homeserver: null,
|
|
191
|
+
allowPrivateNetwork: null,
|
|
192
|
+
proxy: null,
|
|
193
|
+
userId: null,
|
|
194
|
+
accessToken: null,
|
|
195
|
+
password: null,
|
|
196
|
+
deviceId: null,
|
|
197
|
+
deviceName: null,
|
|
198
|
+
avatarUrl,
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
const accessToken = params.input.accessToken?.trim();
|
|
203
|
+
const password = normalizeSecretInputString(params.input.password);
|
|
204
|
+
const userId = params.input.userId?.trim();
|
|
205
|
+
return updateMatrixAccountConfig(next, normalizedAccountId, {
|
|
206
|
+
enabled: true,
|
|
207
|
+
homeserver: params.input.homeserver?.trim(),
|
|
208
|
+
allowPrivateNetwork:
|
|
209
|
+
typeof params.input.dangerouslyAllowPrivateNetwork === "boolean"
|
|
210
|
+
? params.input.dangerouslyAllowPrivateNetwork
|
|
211
|
+
: typeof params.input.allowPrivateNetwork === "boolean"
|
|
212
|
+
? params.input.allowPrivateNetwork
|
|
213
|
+
: undefined,
|
|
214
|
+
proxy: normalizeOptionalString(params.input.proxy),
|
|
215
|
+
userId: password && !userId ? null : userId,
|
|
216
|
+
accessToken: accessToken || (password ? null : undefined),
|
|
217
|
+
password: password || (accessToken ? null : undefined),
|
|
218
|
+
deviceName: params.input.deviceName?.trim(),
|
|
219
|
+
avatarUrl,
|
|
220
|
+
initialSyncLimit: params.input.initialSyncLimit,
|
|
221
|
+
});
|
|
222
|
+
}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/routing";
|
|
2
|
+
|
|
3
|
+
export const matrixSingleAccountKeysToMove = [
|
|
4
|
+
"deviceId",
|
|
5
|
+
"avatarUrl",
|
|
6
|
+
"initialSyncLimit",
|
|
7
|
+
"encryption",
|
|
8
|
+
"allowlistOnly",
|
|
9
|
+
"allowBots",
|
|
10
|
+
"blockStreaming",
|
|
11
|
+
"replyToMode",
|
|
12
|
+
"threadReplies",
|
|
13
|
+
"textChunkLimit",
|
|
14
|
+
"chunkMode",
|
|
15
|
+
"responsePrefix",
|
|
16
|
+
"ackReaction",
|
|
17
|
+
"ackReactionScope",
|
|
18
|
+
"reactionNotifications",
|
|
19
|
+
"threadBindings",
|
|
20
|
+
"startupVerification",
|
|
21
|
+
"startupVerificationCooldownHours",
|
|
22
|
+
"mediaMaxMb",
|
|
23
|
+
"autoJoin",
|
|
24
|
+
"autoJoinAllowlist",
|
|
25
|
+
"dm",
|
|
26
|
+
"groups",
|
|
27
|
+
"rooms",
|
|
28
|
+
"actions",
|
|
29
|
+
] as const;
|
|
30
|
+
|
|
31
|
+
export const matrixNamedAccountPromotionKeys = [
|
|
32
|
+
// When named accounts already exist, only move auth/bootstrap fields into the
|
|
33
|
+
// promoted account. Shared delivery-policy fields stay at the top level.
|
|
34
|
+
"name",
|
|
35
|
+
"homeserver",
|
|
36
|
+
"userId",
|
|
37
|
+
"accessToken",
|
|
38
|
+
"password",
|
|
39
|
+
"deviceId",
|
|
40
|
+
"deviceName",
|
|
41
|
+
"avatarUrl",
|
|
42
|
+
"initialSyncLimit",
|
|
43
|
+
"encryption",
|
|
44
|
+
] as const;
|
|
45
|
+
|
|
46
|
+
export const singleAccountKeysToMove = [...matrixSingleAccountKeysToMove];
|
|
47
|
+
export const namedAccountPromotionKeys = [...matrixNamedAccountPromotionKeys];
|
|
48
|
+
|
|
49
|
+
export function resolveSingleAccountPromotionTarget(params: {
|
|
50
|
+
channel: Record<string, unknown>;
|
|
51
|
+
}): string {
|
|
52
|
+
const accounts =
|
|
53
|
+
typeof params.channel.accounts === "object" && params.channel.accounts
|
|
54
|
+
? (params.channel.accounts as Record<string, unknown>)
|
|
55
|
+
: {};
|
|
56
|
+
const normalizedDefaultAccount =
|
|
57
|
+
typeof params.channel.defaultAccount === "string" && params.channel.defaultAccount.trim()
|
|
58
|
+
? normalizeAccountId(params.channel.defaultAccount)
|
|
59
|
+
: undefined;
|
|
60
|
+
const matchedAccountId = normalizedDefaultAccount
|
|
61
|
+
? Object.entries(accounts).find(
|
|
62
|
+
([accountId, value]) =>
|
|
63
|
+
accountId &&
|
|
64
|
+
value &&
|
|
65
|
+
typeof value === "object" &&
|
|
66
|
+
normalizeAccountId(accountId) === normalizedDefaultAccount,
|
|
67
|
+
)?.[0]
|
|
68
|
+
: undefined;
|
|
69
|
+
if (matchedAccountId) {
|
|
70
|
+
return matchedAccountId;
|
|
71
|
+
}
|
|
72
|
+
if (normalizedDefaultAccount) {
|
|
73
|
+
return DEFAULT_ACCOUNT_ID;
|
|
74
|
+
}
|
|
75
|
+
const namedAccounts = Object.entries(accounts).filter(
|
|
76
|
+
([accountId, value]) => accountId && typeof value === "object" && value,
|
|
77
|
+
);
|
|
78
|
+
if (namedAccounts.length === 1) {
|
|
79
|
+
return namedAccounts[0][0];
|
|
80
|
+
}
|
|
81
|
+
if (
|
|
82
|
+
namedAccounts.length > 1 &&
|
|
83
|
+
accounts[DEFAULT_ACCOUNT_ID] &&
|
|
84
|
+
typeof accounts[DEFAULT_ACCOUNT_ID] === "object"
|
|
85
|
+
) {
|
|
86
|
+
return DEFAULT_ACCOUNT_ID;
|
|
87
|
+
}
|
|
88
|
+
return DEFAULT_ACCOUNT_ID;
|
|
89
|
+
}
|
|
@@ -0,0 +1,326 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { matrixSetupAdapter } from "./setup-core.js";
|
|
3
|
+
import type { CoreConfig } from "./types.js";
|
|
4
|
+
|
|
5
|
+
function applyOpsAccountConfig(cfg: CoreConfig): CoreConfig {
|
|
6
|
+
return matrixSetupAdapter.applyAccountConfig({
|
|
7
|
+
cfg,
|
|
8
|
+
accountId: "ops",
|
|
9
|
+
input: {
|
|
10
|
+
name: "Ops",
|
|
11
|
+
homeserver: "https://matrix.example.org",
|
|
12
|
+
accessToken: "ops-token",
|
|
13
|
+
},
|
|
14
|
+
}) as CoreConfig;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function expectPromotedDefaultAccount(next: CoreConfig): void {
|
|
18
|
+
expect(next.channels?.matrix?.accounts?.Default).toMatchObject({
|
|
19
|
+
enabled: true,
|
|
20
|
+
deviceName: "Legacy raw key",
|
|
21
|
+
homeserver: "https://matrix.example.org",
|
|
22
|
+
userId: "@default:example.org",
|
|
23
|
+
accessToken: "default-token",
|
|
24
|
+
avatarUrl: "mxc://example.org/default-avatar",
|
|
25
|
+
});
|
|
26
|
+
expect(next.channels?.matrix?.accounts?.default).toBeUndefined();
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
function expectOpsAccount(next: CoreConfig): void {
|
|
30
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
31
|
+
name: "Ops",
|
|
32
|
+
enabled: true,
|
|
33
|
+
homeserver: "https://matrix.example.org",
|
|
34
|
+
accessToken: "ops-token",
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
describe("matrixSetupAdapter", () => {
|
|
39
|
+
it("moves legacy default config before writing a named account", () => {
|
|
40
|
+
const cfg = {
|
|
41
|
+
channels: {
|
|
42
|
+
matrix: {
|
|
43
|
+
homeserver: "https://matrix.example.org",
|
|
44
|
+
userId: "@default:example.org",
|
|
45
|
+
accessToken: "default-token",
|
|
46
|
+
deviceName: "Default device",
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
} as CoreConfig;
|
|
50
|
+
|
|
51
|
+
const next = matrixSetupAdapter.applyAccountConfig({
|
|
52
|
+
cfg,
|
|
53
|
+
accountId: "ops",
|
|
54
|
+
input: {
|
|
55
|
+
name: "Ops",
|
|
56
|
+
homeserver: "https://matrix.example.org",
|
|
57
|
+
userId: "@ops:example.org",
|
|
58
|
+
accessToken: "ops-token",
|
|
59
|
+
},
|
|
60
|
+
}) as CoreConfig;
|
|
61
|
+
|
|
62
|
+
expect(next.channels?.matrix?.homeserver).toBeUndefined();
|
|
63
|
+
expect(next.channels?.matrix?.userId).toBeUndefined();
|
|
64
|
+
expect(next.channels?.matrix?.accessToken).toBeUndefined();
|
|
65
|
+
expect(next.channels?.matrix?.accounts?.default).toMatchObject({
|
|
66
|
+
homeserver: "https://matrix.example.org",
|
|
67
|
+
userId: "@default:example.org",
|
|
68
|
+
accessToken: "default-token",
|
|
69
|
+
deviceName: "Default device",
|
|
70
|
+
});
|
|
71
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
72
|
+
name: "Ops",
|
|
73
|
+
enabled: true,
|
|
74
|
+
homeserver: "https://matrix.example.org",
|
|
75
|
+
userId: "@ops:example.org",
|
|
76
|
+
accessToken: "ops-token",
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it("reuses an existing raw default-account key during promotion", () => {
|
|
81
|
+
const cfg = {
|
|
82
|
+
channels: {
|
|
83
|
+
matrix: {
|
|
84
|
+
defaultAccount: "default",
|
|
85
|
+
homeserver: "https://matrix.example.org",
|
|
86
|
+
userId: "@default:example.org",
|
|
87
|
+
accessToken: "default-token",
|
|
88
|
+
avatarUrl: "mxc://example.org/default-avatar",
|
|
89
|
+
accounts: {
|
|
90
|
+
Default: {
|
|
91
|
+
enabled: true,
|
|
92
|
+
deviceName: "Legacy raw key",
|
|
93
|
+
},
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
},
|
|
97
|
+
} as CoreConfig;
|
|
98
|
+
|
|
99
|
+
const next = applyOpsAccountConfig(cfg);
|
|
100
|
+
|
|
101
|
+
expectPromotedDefaultAccount(next);
|
|
102
|
+
expectOpsAccount(next);
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
it("reuses an existing raw default-like key during promotion when defaultAccount is unset", () => {
|
|
106
|
+
const cfg = {
|
|
107
|
+
channels: {
|
|
108
|
+
matrix: {
|
|
109
|
+
homeserver: "https://matrix.example.org",
|
|
110
|
+
userId: "@default:example.org",
|
|
111
|
+
accessToken: "default-token",
|
|
112
|
+
avatarUrl: "mxc://example.org/default-avatar",
|
|
113
|
+
accounts: {
|
|
114
|
+
Default: {
|
|
115
|
+
enabled: true,
|
|
116
|
+
deviceName: "Legacy raw key",
|
|
117
|
+
},
|
|
118
|
+
support: {
|
|
119
|
+
homeserver: "https://matrix.example.org",
|
|
120
|
+
accessToken: "support-token",
|
|
121
|
+
},
|
|
122
|
+
},
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
} as CoreConfig;
|
|
126
|
+
|
|
127
|
+
const next = applyOpsAccountConfig(cfg);
|
|
128
|
+
|
|
129
|
+
expectPromotedDefaultAccount(next);
|
|
130
|
+
expect(next.channels?.matrix?.accounts?.support).toMatchObject({
|
|
131
|
+
homeserver: "https://matrix.example.org",
|
|
132
|
+
accessToken: "support-token",
|
|
133
|
+
});
|
|
134
|
+
expectOpsAccount(next);
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
it("clears stored auth fields when switching an account to env-backed auth", () => {
|
|
138
|
+
const cfg = {
|
|
139
|
+
channels: {
|
|
140
|
+
matrix: {
|
|
141
|
+
accounts: {
|
|
142
|
+
ops: {
|
|
143
|
+
name: "Ops",
|
|
144
|
+
homeserver: "https://matrix.example.org",
|
|
145
|
+
proxy: "http://127.0.0.1:7890",
|
|
146
|
+
userId: "@ops:example.org",
|
|
147
|
+
accessToken: "ops-token",
|
|
148
|
+
password: "secret",
|
|
149
|
+
deviceId: "DEVICE",
|
|
150
|
+
deviceName: "Ops device",
|
|
151
|
+
},
|
|
152
|
+
},
|
|
153
|
+
},
|
|
154
|
+
},
|
|
155
|
+
} as CoreConfig;
|
|
156
|
+
|
|
157
|
+
const next = matrixSetupAdapter.applyAccountConfig({
|
|
158
|
+
cfg,
|
|
159
|
+
accountId: "ops",
|
|
160
|
+
input: {
|
|
161
|
+
name: "Ops",
|
|
162
|
+
useEnv: true,
|
|
163
|
+
},
|
|
164
|
+
}) as CoreConfig;
|
|
165
|
+
|
|
166
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
167
|
+
name: "Ops",
|
|
168
|
+
enabled: true,
|
|
169
|
+
});
|
|
170
|
+
expect(next.channels?.matrix?.accounts?.ops?.homeserver).toBeUndefined();
|
|
171
|
+
expect(next.channels?.matrix?.accounts?.ops?.proxy).toBeUndefined();
|
|
172
|
+
expect(next.channels?.matrix?.accounts?.ops?.userId).toBeUndefined();
|
|
173
|
+
expect(next.channels?.matrix?.accounts?.ops?.accessToken).toBeUndefined();
|
|
174
|
+
expect(next.channels?.matrix?.accounts?.ops?.password).toBeUndefined();
|
|
175
|
+
expect(next.channels?.matrix?.accounts?.ops?.deviceId).toBeUndefined();
|
|
176
|
+
expect(next.channels?.matrix?.accounts?.ops?.deviceName).toBeUndefined();
|
|
177
|
+
});
|
|
178
|
+
|
|
179
|
+
it("keeps avatarUrl when switching an account to env-backed auth", () => {
|
|
180
|
+
const cfg = {
|
|
181
|
+
channels: {
|
|
182
|
+
matrix: {
|
|
183
|
+
accounts: {
|
|
184
|
+
ops: {
|
|
185
|
+
name: "Ops",
|
|
186
|
+
homeserver: "https://matrix.example.org",
|
|
187
|
+
accessToken: "ops-token",
|
|
188
|
+
},
|
|
189
|
+
},
|
|
190
|
+
},
|
|
191
|
+
},
|
|
192
|
+
} as CoreConfig;
|
|
193
|
+
|
|
194
|
+
const next = matrixSetupAdapter.applyAccountConfig({
|
|
195
|
+
cfg,
|
|
196
|
+
accountId: "ops",
|
|
197
|
+
input: {
|
|
198
|
+
name: "Ops",
|
|
199
|
+
useEnv: true,
|
|
200
|
+
avatarUrl: " mxc://example.org/ops-avatar ",
|
|
201
|
+
},
|
|
202
|
+
}) as CoreConfig;
|
|
203
|
+
|
|
204
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
205
|
+
name: "Ops",
|
|
206
|
+
enabled: true,
|
|
207
|
+
avatarUrl: "mxc://example.org/ops-avatar",
|
|
208
|
+
});
|
|
209
|
+
expect(next.channels?.matrix?.accounts?.ops?.homeserver).toBeUndefined();
|
|
210
|
+
expect(next.channels?.matrix?.accounts?.ops?.accessToken).toBeUndefined();
|
|
211
|
+
});
|
|
212
|
+
|
|
213
|
+
it("stores proxy in account setup updates", () => {
|
|
214
|
+
const next = matrixSetupAdapter.applyAccountConfig({
|
|
215
|
+
cfg: {} as CoreConfig,
|
|
216
|
+
accountId: "ops",
|
|
217
|
+
input: {
|
|
218
|
+
homeserver: "https://matrix.example.org",
|
|
219
|
+
accessToken: "ops-token",
|
|
220
|
+
proxy: "http://127.0.0.1:7890",
|
|
221
|
+
},
|
|
222
|
+
}) as CoreConfig;
|
|
223
|
+
|
|
224
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
225
|
+
enabled: true,
|
|
226
|
+
homeserver: "https://matrix.example.org",
|
|
227
|
+
accessToken: "ops-token",
|
|
228
|
+
proxy: "http://127.0.0.1:7890",
|
|
229
|
+
});
|
|
230
|
+
});
|
|
231
|
+
|
|
232
|
+
it("stores avatarUrl from setup input on the target account", () => {
|
|
233
|
+
const next = matrixSetupAdapter.applyAccountConfig({
|
|
234
|
+
cfg: {} as CoreConfig,
|
|
235
|
+
accountId: "ops",
|
|
236
|
+
input: {
|
|
237
|
+
homeserver: "https://matrix.example.org",
|
|
238
|
+
accessToken: "ops-token",
|
|
239
|
+
avatarUrl: " mxc://example.org/ops-avatar ",
|
|
240
|
+
},
|
|
241
|
+
}) as CoreConfig;
|
|
242
|
+
|
|
243
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
244
|
+
enabled: true,
|
|
245
|
+
homeserver: "https://matrix.example.org",
|
|
246
|
+
accessToken: "ops-token",
|
|
247
|
+
avatarUrl: "mxc://example.org/ops-avatar",
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
|
|
251
|
+
it("rejects unsupported avatar URL schemes during setup validation", () => {
|
|
252
|
+
const validationError = matrixSetupAdapter.validateInput?.({
|
|
253
|
+
cfg: {} as CoreConfig,
|
|
254
|
+
accountId: "ops",
|
|
255
|
+
input: {
|
|
256
|
+
homeserver: "https://matrix.example.org",
|
|
257
|
+
accessToken: "ops-token",
|
|
258
|
+
avatarUrl: "file:///tmp/avatar.png",
|
|
259
|
+
},
|
|
260
|
+
});
|
|
261
|
+
|
|
262
|
+
expect(validationError).toBe("Matrix avatar URL must be an mxc:// URI or an http(s) URL.");
|
|
263
|
+
});
|
|
264
|
+
|
|
265
|
+
it("stores canonical dangerous private-network opt-in from setup input", () => {
|
|
266
|
+
const next = matrixSetupAdapter.applyAccountConfig({
|
|
267
|
+
cfg: {} as CoreConfig,
|
|
268
|
+
accountId: "ops",
|
|
269
|
+
input: {
|
|
270
|
+
homeserver: "http://matrix.internal:8008",
|
|
271
|
+
accessToken: "ops-token",
|
|
272
|
+
dangerouslyAllowPrivateNetwork: true,
|
|
273
|
+
},
|
|
274
|
+
}) as CoreConfig;
|
|
275
|
+
|
|
276
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
277
|
+
enabled: true,
|
|
278
|
+
homeserver: "http://matrix.internal:8008",
|
|
279
|
+
accessToken: "ops-token",
|
|
280
|
+
network: {
|
|
281
|
+
dangerouslyAllowPrivateNetwork: true,
|
|
282
|
+
},
|
|
283
|
+
});
|
|
284
|
+
});
|
|
285
|
+
|
|
286
|
+
it("keeps top-level block streaming as a shared default when named accounts already exist", () => {
|
|
287
|
+
const cfg = {
|
|
288
|
+
channels: {
|
|
289
|
+
matrix: {
|
|
290
|
+
homeserver: "https://matrix.example.org",
|
|
291
|
+
userId: "@default:example.org",
|
|
292
|
+
accessToken: "default-token",
|
|
293
|
+
blockStreaming: true,
|
|
294
|
+
accounts: {
|
|
295
|
+
support: {
|
|
296
|
+
homeserver: "https://matrix.example.org",
|
|
297
|
+
userId: "@support:example.org",
|
|
298
|
+
accessToken: "support-token",
|
|
299
|
+
},
|
|
300
|
+
},
|
|
301
|
+
},
|
|
302
|
+
},
|
|
303
|
+
} as CoreConfig;
|
|
304
|
+
|
|
305
|
+
const next = matrixSetupAdapter.applyAccountConfig({
|
|
306
|
+
cfg,
|
|
307
|
+
accountId: "ops",
|
|
308
|
+
input: {
|
|
309
|
+
name: "Ops",
|
|
310
|
+
homeserver: "https://matrix.example.org",
|
|
311
|
+
userId: "@ops:example.org",
|
|
312
|
+
accessToken: "ops-token",
|
|
313
|
+
},
|
|
314
|
+
}) as CoreConfig;
|
|
315
|
+
|
|
316
|
+
expect(next.channels?.matrix?.blockStreaming).toBe(true);
|
|
317
|
+
expect(next.channels?.matrix?.accounts?.ops).toMatchObject({
|
|
318
|
+
name: "Ops",
|
|
319
|
+
enabled: true,
|
|
320
|
+
homeserver: "https://matrix.example.org",
|
|
321
|
+
userId: "@ops:example.org",
|
|
322
|
+
accessToken: "ops-token",
|
|
323
|
+
});
|
|
324
|
+
expect(next.channels?.matrix?.accounts?.ops?.blockStreaming).toBeUndefined();
|
|
325
|
+
});
|
|
326
|
+
});
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import {
|
|
2
|
+
DEFAULT_ACCOUNT_ID,
|
|
3
|
+
normalizeAccountId,
|
|
4
|
+
prepareScopedSetupConfig,
|
|
5
|
+
type ChannelSetupAdapter,
|
|
6
|
+
} from "openclaw/plugin-sdk/setup";
|
|
7
|
+
import { applyMatrixSetupAccountConfig, validateMatrixSetupInput } from "./setup-config.js";
|
|
8
|
+
import type { CoreConfig } from "./types.js";
|
|
9
|
+
|
|
10
|
+
const channel = "matrix" as const;
|
|
11
|
+
|
|
12
|
+
function resolveMatrixSetupAccountId(params: { accountId?: string; name?: string }): string {
|
|
13
|
+
return normalizeAccountId(params.accountId?.trim() || params.name?.trim() || DEFAULT_ACCOUNT_ID);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export const matrixSetupAdapter: ChannelSetupAdapter = {
|
|
17
|
+
resolveAccountId: ({ accountId, input }) =>
|
|
18
|
+
resolveMatrixSetupAccountId({
|
|
19
|
+
accountId,
|
|
20
|
+
name: input?.name,
|
|
21
|
+
}),
|
|
22
|
+
resolveBindingAccountId: ({ accountId, agentId }) =>
|
|
23
|
+
resolveMatrixSetupAccountId({
|
|
24
|
+
accountId,
|
|
25
|
+
name: agentId,
|
|
26
|
+
}),
|
|
27
|
+
applyAccountName: ({ cfg, accountId, name }) =>
|
|
28
|
+
prepareScopedSetupConfig({
|
|
29
|
+
cfg: cfg as CoreConfig,
|
|
30
|
+
channelKey: channel,
|
|
31
|
+
accountId,
|
|
32
|
+
name,
|
|
33
|
+
}) as CoreConfig,
|
|
34
|
+
validateInput: ({ accountId, input }) => validateMatrixSetupInput({ accountId, input }),
|
|
35
|
+
applyAccountConfig: ({ cfg, accountId, input }) =>
|
|
36
|
+
applyMatrixSetupAccountConfig({
|
|
37
|
+
cfg: cfg as CoreConfig,
|
|
38
|
+
accountId,
|
|
39
|
+
input,
|
|
40
|
+
}),
|
|
41
|
+
afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
|
|
42
|
+
const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap.js");
|
|
43
|
+
await runMatrixSetupBootstrapAfterConfigWrite({
|
|
44
|
+
previousCfg: previousCfg as CoreConfig,
|
|
45
|
+
cfg: cfg as CoreConfig,
|
|
46
|
+
accountId,
|
|
47
|
+
runtime,
|
|
48
|
+
});
|
|
49
|
+
},
|
|
50
|
+
};
|