vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-15 11:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dedupe channel model readers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-07 06:45:54 +01:00
parent 820201a343
commit 41b1d3647c
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/channels/account-snapshot-fields.ts
View File

@@ -1,4 +1,5 @@
import { stripUrlUserInfo } from "../shared/net/url-userinfo.js";
import { normalizeOptionalString } from "../shared/string-coerce.js";
import { isRecord } from "../utils.js";
import type { ChannelAccountSnapshot } from "./plugins/types.core.js";
@@ -17,12 +18,7 @@ const CREDENTIAL_STATUS_KEYS = [
type CredentialStatusKey = (typeof CREDENTIAL_STATUS_KEYS)[number];
function readTrimmedString(record: Record<string, unknown>, key: string): string | undefined {
const value = record[key];
if (typeof value !== "string") {
return undefined;
}
const trimmed = value.trim();
return trimmed.length > 0 ? trimmed : undefined;
return normalizeOptionalString(record[key]);
}
function readBoolean(record: Record<string, unknown>, key: string): boolean | undefined {
@@ -111,8 +107,7 @@ export function hasResolvedCredentialValue(account: unknown): boolean {
}
return (
["token", "botToken", "appToken", "signingSecret", "userToken"].some((key) => {
const value = record[key];
return typeof value === "string" && value.trim().length > 0;
return normalizeOptionalString(record[key]) !== undefined;
}) || CREDENTIAL_STATUS_KEYS.some((key) => readCredentialStatus(record, key) === "available")
);
}

35
src/channels/model-overrides.ts
View File

@@ -1,4 +1,5 @@
import type { OpenClawConfig } from "../config/config.js";
import { normalizeOptionalString } from "../shared/string-coerce.js";
import { normalizeMessageChannel } from "../utils/message-channel.js";
import {
buildChannelKeyCandidates,
@@ -36,12 +37,14 @@ function resolveProviderEntry(
modelByChannel: ChannelModelByChannelConfig | undefined,
channel: string,
): Record<string, string> | undefined {
const normalized = normalizeMessageChannel(channel) ?? channel.trim().toLowerCase();
const normalized =
normalizeMessageChannel(channel) ?? normalizeOptionalString(channel)?.toLowerCase() ?? "";
return (
modelByChannel?.[normalized] ??
modelByChannel?.[
Object.keys(modelByChannel ?? {}).find((key) => {
const normalizedKey = normalizeMessageChannel(key) ?? key.trim().toLowerCase();
const normalizedKey =
normalizeMessageChannel(key) ?? normalizeOptionalString(key)?.toLowerCase() ?? "";
return normalizedKey === normalized;
}) ?? ""
]
@@ -55,8 +58,9 @@ function buildChannelCandidates(
>,
): { keys: string[]; parentKeys: string[] } {
const normalizedChannel =
normalizeMessageChannel(params.channel ?? "") ?? params.channel?.trim().toLowerCase();
const groupId = params.groupId?.trim();
normalizeMessageChannel(params.channel ?? "") ??
normalizeOptionalString(params.channel)?.toLowerCase();
const groupId = normalizeOptionalString(params.groupId);
const sessionConversation = resolveSessionConversationRef(params.parentSessionKey);
const feishuParentOverrideFallbacks =
normalizedChannel === "feishu"
@@ -81,8 +85,8 @@ function buildChannelCandidates(
kind: groupConversationKind,
rawId: groupId ?? "",
});
const groupChannel = params.groupChannel?.trim();
const groupSubject = params.groupSubject?.trim();
const groupChannel = normalizeOptionalString(params.groupChannel);
const groupSubject = normalizeOptionalString(params.groupSubject);
const channelBare = groupChannel ? groupChannel.replace(/^#/, "") : undefined;
const subjectBare = groupSubject ? groupSubject.replace(/^#/, "") : undefined;
const channelSlug = channelBare ? normalizeChannelSlug(channelBare) : undefined;
@@ -109,29 +113,29 @@ function buildChannelCandidates(
}
function buildFeishuParentOverrideCandidates(rawId: string | undefined): string[] {
const value = rawId?.trim();
const value = normalizeOptionalString(rawId);
if (!value) {
return [];
}
const topicSenderMatch = value.match(/^(.+):topic:([^:]+):sender:([^:]+)$/i);
if (topicSenderMatch) {
const chatId = topicSenderMatch[1]?.trim().toLowerCase();
const topicId = topicSenderMatch[2]?.trim().toLowerCase();
const chatId = normalizeOptionalString(topicSenderMatch[1])?.toLowerCase();
const topicId = normalizeOptionalString(topicSenderMatch[2])?.toLowerCase();
return [`${chatId}:topic:${topicId}`, chatId].filter((entry): entry is string =>
Boolean(entry),
);
}
const topicMatch = value.match(/^(.+):topic:([^:]+)$/i);
if (topicMatch) {
const chatId = topicMatch[1]?.trim().toLowerCase();
const topicId = topicMatch[2]?.trim().toLowerCase();
const chatId = normalizeOptionalString(topicMatch[1])?.toLowerCase();
const topicId = normalizeOptionalString(topicMatch[2])?.toLowerCase();
return [`${chatId}:topic:${topicId}`, chatId].filter((entry): entry is string =>
Boolean(entry),
);
}
const senderMatch = value.match(/^(.+):sender:([^:]+)$/i);
if (senderMatch) {
const chatId = senderMatch[1]?.trim().toLowerCase();
const chatId = normalizeOptionalString(senderMatch[1])?.toLowerCase();
return chatId ? [chatId] : [];
}
return [];
@@ -140,7 +144,7 @@ function buildFeishuParentOverrideCandidates(rawId: string | undefined): string[
export function resolveChannelModelOverride(
params: ChannelModelOverrideParams,
): ChannelModelOverride | null {
const channel = params.channel?.trim();
const channel = normalizeOptionalString(params.channel);
if (!channel) {
return null;
}
@@ -170,13 +174,14 @@ export function resolveChannelModelOverride(
if (typeof raw !== "string") {
return null;
}
const model = raw.trim();
const model = normalizeOptionalString(raw);
if (!model) {
return null;
}
return {
channel: normalizeMessageChannel(channel) ?? channel.trim().toLowerCase(),
channel:
normalizeMessageChannel(channel) ?? normalizeOptionalString(channel)?.toLowerCase() ?? "",
model,
matchKey: match.matchKey,
matchSource: match.matchSource,