diff --git a/src/cliproxy/binary/platform-detector.ts b/src/cliproxy/binary/platform-detector.ts index 1692a356..521d72b4 100644 --- a/src/cliproxy/binary/platform-detector.ts +++ b/src/cliproxy/binary/platform-detector.ts @@ -78,6 +78,10 @@ const ARCH_MAP: Record = { arm64: 'aarch64', }; +export function mapNodeArchToReleaseArch(nodeArch: string): SupportedArch | undefined { + return ARCH_MAP[nodeArch]; +} + /** * Detect current platform and return binary info * @param version Optional version for binaryName (defaults to backend fallback) @@ -92,7 +96,7 @@ export function detectPlatform( const nodeArch = process.arch; const os = OS_MAP[nodePlatform]; - const arch = ARCH_MAP[nodeArch]; + const arch = mapNodeArchToReleaseArch(nodeArch); if (!os) { throw new Error( @@ -195,14 +199,15 @@ export function isPlatformSupported(): boolean { /** * Get human-readable platform description - * @returns Description string (e.g., "macOS aarch64") + * @returns Description string (e.g., "macOS ARM64") */ export function getPlatformDescription(): string { try { const platform = detectPlatform(); const osName = platform.os === 'darwin' ? 'macOS' : platform.os === 'linux' ? 'Linux' : 'Windows'; - return `${osName} ${platform.arch}`; + const archName = platform.arch === 'aarch64' ? 'ARM64' : platform.arch; + return `${osName} ${archName}`; } catch { return `${process.platform} ${process.arch} (unsupported)`; } diff --git a/src/cliproxy/config/__tests__/backend-selection.test.js b/src/cliproxy/config/__tests__/backend-selection.test.js index 5c547984..a8bcb4b3 100644 --- a/src/cliproxy/config/__tests__/backend-selection.test.js +++ b/src/cliproxy/config/__tests__/backend-selection.test.js @@ -34,6 +34,11 @@ describe('Backend Selection', () => { }); describe('detectPlatform', () => { + it('maps Node arm64 to CLIProxy aarch64 release assets', () => { + assert.strictEqual(platformDetector.mapNodeArchToReleaseArch('arm64'), 'aarch64'); + assert.strictEqual(platformDetector.mapNodeArchToReleaseArch('x64'), 'amd64'); + }); + it('generates correct binary name for original backend', () => { const info = platformDetector.detectPlatform('6.6.51', 'original'); assert(info.binaryName.startsWith('CLIProxyAPI_6.6.51_')); diff --git a/src/cliproxy/quota/quota-manager.ts b/src/cliproxy/quota/quota-manager.ts index 39841eb6..4493aeb6 100644 --- a/src/cliproxy/quota/quota-manager.ts +++ b/src/cliproxy/quota/quota-manager.ts @@ -524,8 +524,9 @@ export async function preflightCheck(provider: CLIProxyProvider): Promise { it('exports all platform types', () => { const os: SupportedOS = 'darwin'; const arch: SupportedArch = 'aarch64'; + const nodeArch: SupportedArch = 'arm64'; const ext: ArchiveExtension = 'tar.gz'; const info: PlatformInfo = { os, @@ -44,6 +45,7 @@ describe('types.ts backward compatibility', () => { }; expect(info.os).toBe('darwin'); expect(info.arch).toBe('aarch64'); + expect(nodeArch).toBe('arm64'); }); it('exports all binary types', () => { diff --git a/src/cliproxy/types/platform-types.ts b/src/cliproxy/types/platform-types.ts index e05646c7..84f27d2d 100644 --- a/src/cliproxy/types/platform-types.ts +++ b/src/cliproxy/types/platform-types.ts @@ -5,8 +5,8 @@ /** Supported operating systems */ export type SupportedOS = 'darwin' | 'linux' | 'windows'; -/** Supported CPU architectures */ -export type SupportedArch = 'amd64' | 'aarch64'; +/** Supported CPU architecture labels from Node.js and CLIProxy release assets */ +export type SupportedArch = 'amd64' | 'arm64' | 'aarch64'; /** Archive extension based on platform */ export type ArchiveExtension = 'tar.gz' | 'zip'; diff --git a/src/management/checks/image-analysis-check.ts b/src/management/checks/image-analysis-check.ts index d6d2dc05..50e9ba99 100644 --- a/src/management/checks/image-analysis-check.ts +++ b/src/management/checks/image-analysis-check.ts @@ -112,8 +112,9 @@ export async function runImageAnalysisCheck(results: HealthCheck): Promise * Fix image analysis configuration issues */ export async function fixImageAnalysisConfig(): Promise { - const { updateConfig, loadOrCreateUnifiedConfig } = - await import('../../config/config-loader-facade'); + const { updateConfig, loadOrCreateUnifiedConfig } = await import( + '../../config/config-loader-facade' + ); const config = loadOrCreateUnifiedConfig(); let fixed = false;