mirror of
https://github.com/openclaw/openclaw.git
synced 2026-04-17 20:21:13 +00:00
* honor localhost private-network policy * drop flaky monitor private-network test * align mocks and imports * preserve account private-network overrides * keep default account config * strip stale private-network aliases * fix(bluebubbles): remove unused channel imports * fix: add changelog for bluebubbles private-network opt-out landing (#59373) (thanks @jpreagan) --------- Co-authored-by: Shadow <hi@shadowing.dev>
63 lines
1.8 KiB
TypeScript
63 lines
1.8 KiB
TypeScript
import {
|
|
resolveBlueBubblesAccount,
|
|
resolveBlueBubblesEffectiveAllowPrivateNetwork,
|
|
resolveBlueBubblesPrivateNetworkConfigValue,
|
|
} from "./accounts.js";
|
|
import type { OpenClawConfig } from "./runtime-api.js";
|
|
import { normalizeResolvedSecretInputString } from "./secret-input.js";
|
|
|
|
export type BlueBubblesAccountResolveOpts = {
|
|
serverUrl?: string;
|
|
password?: string;
|
|
accountId?: string;
|
|
cfg?: OpenClawConfig;
|
|
};
|
|
|
|
export function resolveBlueBubblesServerAccount(params: BlueBubblesAccountResolveOpts): {
|
|
baseUrl: string;
|
|
password: string;
|
|
accountId: string;
|
|
allowPrivateNetwork: boolean;
|
|
allowPrivateNetworkConfig?: boolean;
|
|
} {
|
|
const account = resolveBlueBubblesAccount({
|
|
cfg: params.cfg ?? {},
|
|
accountId: params.accountId,
|
|
});
|
|
const baseUrl =
|
|
normalizeResolvedSecretInputString({
|
|
value: params.serverUrl,
|
|
path: "channels.bluebubbles.serverUrl",
|
|
}) ||
|
|
normalizeResolvedSecretInputString({
|
|
value: account.config.serverUrl,
|
|
path: `channels.bluebubbles.accounts.${account.accountId}.serverUrl`,
|
|
});
|
|
const password =
|
|
normalizeResolvedSecretInputString({
|
|
value: params.password,
|
|
path: "channels.bluebubbles.password",
|
|
}) ||
|
|
normalizeResolvedSecretInputString({
|
|
value: account.config.password,
|
|
path: `channels.bluebubbles.accounts.${account.accountId}.password`,
|
|
});
|
|
if (!baseUrl) {
|
|
throw new Error("BlueBubbles serverUrl is required");
|
|
}
|
|
if (!password) {
|
|
throw new Error("BlueBubbles password is required");
|
|
}
|
|
|
|
return {
|
|
baseUrl,
|
|
password,
|
|
accountId: account.accountId,
|
|
allowPrivateNetwork: resolveBlueBubblesEffectiveAllowPrivateNetwork({
|
|
baseUrl,
|
|
config: account.config,
|
|
}),
|
|
allowPrivateNetworkConfig: resolveBlueBubblesPrivateNetworkConfigValue(account.config),
|
|
};
|
|
}
|