mirror of
https://github.com/tiennm99/ccs.git
synced 2026-10-14 12:16:38 +00:00
fix(proxy): clarify shared port fallback and legacy 3456 handling
This commit is contained in:
1 parent
15751e2db5
commit
d5591913ef
7 files changed
+113
-29
No files matched your search
+17
-10
@@ -8,7 +8,6 @@ import type { OpenAICompatProfileConfig } from './profile-router';
|
||||
import {
|
||||
OPENAI_COMPAT_PROXY_ADAPTIVE_PORT_END,
|
||||
OPENAI_COMPAT_PROXY_ADAPTIVE_PORT_START,
|
||||
OPENAI_COMPAT_PROXY_LEGACY_DEFAULT_PORT,
|
||||
OPENAI_COMPAT_PROXY_SERVICE_NAME,
|
||||
getOpenAICompatProxyDir,
|
||||
} from './proxy-daemon-paths';
|
||||
@@ -485,16 +484,24 @@ export async function startOpenAICompatProxy(
|
||||
const host = options.host?.trim() || status.host || '127.0.0.1';
|
||||
const portPreference = resolveOpenAICompatProxyPortPreference(profile.profileName);
|
||||
const explicitPort = typeof options.port === 'number' ? options.port : undefined;
|
||||
const rawPreferredPort =
|
||||
explicitPort ??
|
||||
(portPreference.source === 'profile'
|
||||
? portPreference.port
|
||||
: portPreference.source === 'adaptive' &&
|
||||
status.port === OPENAI_COMPAT_PROXY_LEGACY_DEFAULT_PORT
|
||||
? portPreference.port
|
||||
: status.port || portPreference.port);
|
||||
const preferredPort = rawPreferredPort;
|
||||
const requiresExactPort = explicitPort !== undefined || portPreference.source === 'profile';
|
||||
if (
|
||||
status.running &&
|
||||
explicitPort === undefined &&
|
||||
portPreference.source !== 'profile' &&
|
||||
status.port &&
|
||||
(status.host || '127.0.0.1') === host
|
||||
) {
|
||||
return {
|
||||
success: true,
|
||||
alreadyRunning: true,
|
||||
pid: status.pid,
|
||||
port: status.port,
|
||||
authToken: status.authToken,
|
||||
};
|
||||
}
|
||||
|
||||
const preferredPort = explicitPort ?? portPreference.port;
|
||||
if (status.running && status.port === preferredPort && (status.host || '127.0.0.1') === host) {
|
||||
return {
|
||||
success: true,
|
||||
|
||||
@@ -2,6 +2,7 @@ import { loadOrCreateUnifiedConfig } from '../config/unified-config-loader';
|
||||
import {
|
||||
OPENAI_COMPAT_PROXY_ADAPTIVE_PORT_END,
|
||||
OPENAI_COMPAT_PROXY_ADAPTIVE_PORT_START,
|
||||
OPENAI_COMPAT_PROXY_LEGACY_DEFAULT_PORT,
|
||||
} from './proxy-daemon-paths';
|
||||
|
||||
export interface OpenAICompatProxyPortPreference {
|
||||
@@ -61,6 +62,12 @@ export function resolveOpenAICompatProxyPortPreference(
|
||||
}
|
||||
const sharedPort = config.proxy?.port;
|
||||
if (typeof sharedPort === 'number') {
|
||||
if (sharedPort === OPENAI_COMPAT_PROXY_LEGACY_DEFAULT_PORT) {
|
||||
return {
|
||||
port: resolveOpenAICompatProxyAdaptivePort(profileName),
|
||||
source: 'adaptive',
|
||||
};
|
||||
}
|
||||
return { port: sharedPort, source: 'shared' };
|
||||
}
|
||||
return {
|
||||
|
||||
Reference in new issue
Block a user