wlw/ai-agent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: clean up apiBaseUrl handling in config merging

Browse Source
This commit is contained in:
mlogclub
2026-04-24 22:32:34 +08:00
parent add8cbfd89
commit 6ffbbb04ae
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/lib/im-realtime.ts
+1 -1
View File
@@ -17,7 +17,7 @@ export type ImRealtimeEnvelope = {
export function createImRealtimeConnection() { export function createImRealtimeConnection() {
const config = readKefuWidgetConfig() const config = readKefuWidgetConfig()
const apiBaseUrl = (config.apiBaseUrl || config.baseUrl || "").trim() const apiBaseUrl = (config.apiBaseUrl || "").trim()
const baseUrl = apiBaseUrl const baseUrl = apiBaseUrl
? apiBaseUrl.replace(/^http/, "ws").replace(/\/$/, "") ? apiBaseUrl.replace(/^http/, "ws").replace(/\/$/, "")
: createWebSocketBaseUrl() : createWebSocketBaseUrl()
web/lib/sdk/cs-ai-agent-sdk.js
+5 -4
View File
@@ -41,7 +41,11 @@
} }
} }
merged.baseUrl = String(merged.baseUrl || window.location.origin).replace(/\/$/, ""); merged.baseUrl = String(merged.baseUrl || window.location.origin).replace(/\/$/, "");
merged.apiBaseUrl = String(merged.apiBaseUrl || merged.baseUrl).replace(/\/$/, ""); if (merged.apiBaseUrl) {
merged.apiBaseUrl = String(merged.apiBaseUrl).replace(/\/$/, "");
} else {
delete merged.apiBaseUrl;
}
merged.channelId = String(merged.channelId || ""); merged.channelId = String(merged.channelId || "");
merged.externalSource = String(merged.externalSource || "web_chat"); merged.externalSource = String(merged.externalSource || "web_chat");
return merged; return merged;
@@ -365,9 +369,6 @@
if (!rawConfig.baseUrl) { if (!rawConfig.baseUrl) {
state.config.baseUrl = widgetBaseUrl; state.config.baseUrl = widgetBaseUrl;
} }
if (!rawConfig.apiBaseUrl) {
state.config.apiBaseUrl = state.config.baseUrl;
}
if (!state.config.channelId) { if (!state.config.channelId) {
console.error("[cs-agent-widget] channelId is required"); console.error("[cs-agent-widget] channelId is required");
return; return;
web/public/sdk/cs-ai-agent-sdk.min.js
Vendored
+5 -4
View File
@@ -41,7 +41,11 @@
} }
} }
merged.baseUrl = String(merged.baseUrl || window.location.origin).replace(/\/$/, ""); merged.baseUrl = String(merged.baseUrl || window.location.origin).replace(/\/$/, "");
merged.apiBaseUrl = String(merged.apiBaseUrl || merged.baseUrl).replace(/\/$/, ""); if (merged.apiBaseUrl) {
merged.apiBaseUrl = String(merged.apiBaseUrl).replace(/\/$/, "");
} else {
delete merged.apiBaseUrl;
}
merged.channelId = String(merged.channelId || ""); merged.channelId = String(merged.channelId || "");
merged.externalSource = String(merged.externalSource || "web_chat"); merged.externalSource = String(merged.externalSource || "web_chat");
return merged; return merged;
@@ -365,9 +369,6 @@
if (!rawConfig.baseUrl) { if (!rawConfig.baseUrl) {
state.config.baseUrl = widgetBaseUrl; state.config.baseUrl = widgetBaseUrl;
} }
if (!rawConfig.apiBaseUrl) {
state.config.apiBaseUrl = state.config.baseUrl;
}
if (!state.config.channelId) { if (!state.config.channelId) {
console.error("[cs-agent-widget] channelId is required"); console.error("[cs-agent-widget] channelId is required");
return; return;