@pikecode/api-key-manager 1.2.0 → 1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/akm.js +0 -0
- package/package.json +1 -1
- package/src/commands/BaseCommand.js +1 -1
- package/src/commands/add/prompts.js +2 -13
- package/src/commands/add.js +1 -33
- package/src/commands/backup.js +0 -1
- package/src/commands/batch.js +65 -66
- package/src/commands/benchmark.js +0 -21
- package/src/commands/current.js +1 -1
- package/src/commands/edit.js +0 -1
- package/src/commands/health.js +0 -2
- package/src/commands/list.js +1 -1
- package/src/commands/remove.js +0 -1
- package/src/commands/stats.js +1 -2
- package/src/commands/switch/claude-settings-compatibility.js +113 -0
- package/src/commands/switch/provider-choices-helper.js +71 -0
- package/src/commands/switch/provider-details-helper.js +46 -0
- package/src/commands/switch/provider-edit-questions-helper.js +102 -0
- package/src/commands/switch/provider-launcher.js +20 -0
- package/src/commands/switch.js +110 -452
- package/src/commands/validate.js +17 -17
- package/src/config.js +28 -0
- package/src/navigation/EscNavigationManager.js +5 -5
- package/src/utils/codex-launcher.js +3 -0
- package/src/utils/env-utils.js +2 -2
- package/src/utils/error-handler.js +0 -1
- package/src/utils/health-checker.js +34 -34
- package/src/utils/logger.js +0 -1
- package/src/utils/provider-status-checker.js +10 -41
- package/src/utils/update-checker.js +6 -1
- package/src/utils/validator.js +1 -1
- package/src/commands/add/codexImporter.js +0 -48
package/src/commands/validate.js
CHANGED
|
@@ -107,7 +107,7 @@ class ProviderValidator {
|
|
|
107
107
|
|
|
108
108
|
try {
|
|
109
109
|
// 使用流式检查,实时显示结果
|
|
110
|
-
const results = await this.statusChecker.checkAllStreaming(providers, (
|
|
110
|
+
const results = await this.statusChecker.checkAllStreaming(providers, (_providerName, _status) => {
|
|
111
111
|
completedCount++;
|
|
112
112
|
});
|
|
113
113
|
|
|
@@ -164,7 +164,7 @@ class ProviderValidator {
|
|
|
164
164
|
console.log(chalk.gray(` OPENAI_BASE_URL: ${provider.baseUrl}`));
|
|
165
165
|
}
|
|
166
166
|
} else {
|
|
167
|
-
console.log(chalk.gray(
|
|
167
|
+
console.log(chalk.gray(' IDE: Claude Code'));
|
|
168
168
|
console.log(chalk.gray(` 认证模式: ${provider.authMode}`));
|
|
169
169
|
if (provider.baseUrl) {
|
|
170
170
|
console.log(chalk.gray(` 基础URL: ${provider.baseUrl}`));
|
|
@@ -244,11 +244,11 @@ class ProviderValidator {
|
|
|
244
244
|
*/
|
|
245
245
|
_getStateIcon(state) {
|
|
246
246
|
switch (state) {
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
247
|
+
case 'online': return '✓';
|
|
248
|
+
case 'offline': return '✗';
|
|
249
|
+
case 'degraded': return '⚠';
|
|
250
|
+
case 'pending': return '⋯';
|
|
251
|
+
default: return '?';
|
|
252
252
|
}
|
|
253
253
|
}
|
|
254
254
|
|
|
@@ -260,11 +260,11 @@ class ProviderValidator {
|
|
|
260
260
|
*/
|
|
261
261
|
_getStateLabel(state) {
|
|
262
262
|
switch (state) {
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
263
|
+
case 'online': return '可用';
|
|
264
|
+
case 'offline': return '不可用';
|
|
265
|
+
case 'degraded': return '降级';
|
|
266
|
+
case 'pending': return '检测中';
|
|
267
|
+
default: return '未知';
|
|
268
268
|
}
|
|
269
269
|
}
|
|
270
270
|
|
|
@@ -276,11 +276,11 @@ class ProviderValidator {
|
|
|
276
276
|
*/
|
|
277
277
|
_getStateColor(state) {
|
|
278
278
|
switch (state) {
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
279
|
+
case 'online': return chalk.green;
|
|
280
|
+
case 'offline': return chalk.red;
|
|
281
|
+
case 'degraded': return chalk.yellow;
|
|
282
|
+
case 'pending': return chalk.blue;
|
|
283
|
+
default: return chalk.gray;
|
|
284
284
|
}
|
|
285
285
|
}
|
|
286
286
|
}
|
package/src/config.js
CHANGED
|
@@ -399,6 +399,34 @@ class ConfigManager {
|
|
|
399
399
|
return await this.save();
|
|
400
400
|
}
|
|
401
401
|
|
|
402
|
+
async activateProvider(name, lastUsedArgs = []) {
|
|
403
|
+
await this.ensureLoaded();
|
|
404
|
+
|
|
405
|
+
if (!this.config.providers[name]) {
|
|
406
|
+
throw new Error(`供应商 '${name}' 不存在\n使用 'akm list' 查看所有已配置的供应商`);
|
|
407
|
+
}
|
|
408
|
+
|
|
409
|
+
const now = new Date().toISOString();
|
|
410
|
+
const updatedProviders = {};
|
|
411
|
+
Object.keys(this.config.providers).forEach(key => {
|
|
412
|
+
const p = this.config.providers[key];
|
|
413
|
+
if (key === name) {
|
|
414
|
+
updatedProviders[key] = {
|
|
415
|
+
...p,
|
|
416
|
+
current: true,
|
|
417
|
+
lastUsed: now,
|
|
418
|
+
lastUsedArgs,
|
|
419
|
+
usageCount: (p.usageCount || 0) + 1
|
|
420
|
+
};
|
|
421
|
+
} else {
|
|
422
|
+
updatedProviders[key] = { ...p, current: false };
|
|
423
|
+
}
|
|
424
|
+
});
|
|
425
|
+
|
|
426
|
+
this.config = { ...this.config, currentProvider: name, providers: updatedProviders };
|
|
427
|
+
return await this.save();
|
|
428
|
+
}
|
|
429
|
+
|
|
402
430
|
async setCurrentProvider(name) {
|
|
403
431
|
await this.ensureLoaded();
|
|
404
432
|
|
|
@@ -134,7 +134,7 @@ class EscNavigationManager {
|
|
|
134
134
|
setTimeout(() => {
|
|
135
135
|
try {
|
|
136
136
|
handler.onTrigger();
|
|
137
|
-
} catch
|
|
137
|
+
} catch {
|
|
138
138
|
// 在ESC回调中抛出的错误不应终止进程
|
|
139
139
|
// 交由调用方自行处理记录
|
|
140
140
|
}
|
|
@@ -155,7 +155,7 @@ class EscNavigationManager {
|
|
|
155
155
|
if (currentMax !== 0 && currentMax < 50) {
|
|
156
156
|
this.input.setMaxListeners(50);
|
|
157
157
|
}
|
|
158
|
-
} catch
|
|
158
|
+
} catch {
|
|
159
159
|
// 某些输入流可能不支持获取/设置监听器上限
|
|
160
160
|
}
|
|
161
161
|
}
|
|
@@ -165,7 +165,7 @@ class EscNavigationManager {
|
|
|
165
165
|
this.previousRawMode = typeof this.input.isRaw === 'boolean' ? this.input.isRaw : null;
|
|
166
166
|
this.input.setRawMode(true);
|
|
167
167
|
this.rawModeEnabled = true;
|
|
168
|
-
} catch
|
|
168
|
+
} catch {
|
|
169
169
|
this.supported = false;
|
|
170
170
|
this.handlers = [];
|
|
171
171
|
return;
|
|
@@ -175,7 +175,7 @@ class EscNavigationManager {
|
|
|
175
175
|
if (typeof this.input.resume === 'function') {
|
|
176
176
|
try {
|
|
177
177
|
this.input.resume();
|
|
178
|
-
} catch
|
|
178
|
+
} catch {
|
|
179
179
|
// 某些输入流不支持 resume,忽略即可
|
|
180
180
|
}
|
|
181
181
|
}
|
|
@@ -201,7 +201,7 @@ class EscNavigationManager {
|
|
|
201
201
|
try {
|
|
202
202
|
const restoreRaw = typeof this.previousRawMode === 'boolean' ? this.previousRawMode : false;
|
|
203
203
|
this.input.setRawMode(restoreRaw);
|
|
204
|
-
} catch
|
|
204
|
+
} catch {
|
|
205
205
|
// 忽略还原失败
|
|
206
206
|
}
|
|
207
207
|
|
package/src/utils/env-utils.js
CHANGED
|
@@ -35,7 +35,7 @@ function clearTerminal() {
|
|
|
35
35
|
|
|
36
36
|
try {
|
|
37
37
|
process.stdout.write('\x1bc');
|
|
38
|
-
} catch
|
|
38
|
+
} catch {
|
|
39
39
|
// 某些终端可能不支持 RIS 序列,忽略即可
|
|
40
40
|
}
|
|
41
41
|
|
|
@@ -44,7 +44,7 @@ function clearTerminal() {
|
|
|
44
44
|
: '\x1b[3J\x1b[2J\x1b[H';
|
|
45
45
|
try {
|
|
46
46
|
process.stdout.write(sequence);
|
|
47
|
-
} catch
|
|
47
|
+
} catch {
|
|
48
48
|
// 忽略清屏失败
|
|
49
49
|
}
|
|
50
50
|
}
|
|
@@ -268,15 +268,15 @@ class HealthChecker {
|
|
|
268
268
|
*/
|
|
269
269
|
_getStatusIcon(status) {
|
|
270
270
|
switch (status) {
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
271
|
+
case 'ok':
|
|
272
|
+
case 'info':
|
|
273
|
+
return '✓';
|
|
274
|
+
case 'warning':
|
|
275
|
+
return '⚠';
|
|
276
|
+
case 'error':
|
|
277
|
+
return '✗';
|
|
278
|
+
default:
|
|
279
|
+
return '?';
|
|
280
280
|
}
|
|
281
281
|
}
|
|
282
282
|
|
|
@@ -286,15 +286,15 @@ class HealthChecker {
|
|
|
286
286
|
*/
|
|
287
287
|
_getStatusColor(status) {
|
|
288
288
|
switch (status) {
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
289
|
+
case 'ok':
|
|
290
|
+
case 'info':
|
|
291
|
+
return chalk.green;
|
|
292
|
+
case 'warning':
|
|
293
|
+
return chalk.yellow;
|
|
294
|
+
case 'error':
|
|
295
|
+
return chalk.red;
|
|
296
|
+
default:
|
|
297
|
+
return chalk.gray;
|
|
298
298
|
}
|
|
299
299
|
}
|
|
300
300
|
|
|
@@ -304,14 +304,14 @@ class HealthChecker {
|
|
|
304
304
|
*/
|
|
305
305
|
_getLevelIcon(level) {
|
|
306
306
|
switch (level) {
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
307
|
+
case 'info':
|
|
308
|
+
return 'ℹ';
|
|
309
|
+
case 'warning':
|
|
310
|
+
return '⚠';
|
|
311
|
+
case 'error':
|
|
312
|
+
return '✗';
|
|
313
|
+
default:
|
|
314
|
+
return '·';
|
|
315
315
|
}
|
|
316
316
|
}
|
|
317
317
|
|
|
@@ -321,14 +321,14 @@ class HealthChecker {
|
|
|
321
321
|
*/
|
|
322
322
|
_getLevelColor(level) {
|
|
323
323
|
switch (level) {
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
324
|
+
case 'info':
|
|
325
|
+
return chalk.blue;
|
|
326
|
+
case 'warning':
|
|
327
|
+
return chalk.yellow;
|
|
328
|
+
case 'error':
|
|
329
|
+
return chalk.red;
|
|
330
|
+
default:
|
|
331
|
+
return chalk.gray;
|
|
332
332
|
}
|
|
333
333
|
}
|
|
334
334
|
|
package/src/utils/logger.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const { Anthropic, APIConnectionTimeoutError, APIConnectionError, APIError } = require('@anthropic-ai/sdk');
|
|
2
|
-
const { API_CONFIG
|
|
2
|
+
const { API_CONFIG } = require('../constants');
|
|
3
3
|
|
|
4
|
-
|
|
4
|
+
const STATUS_CACHE_MAX = 100;
|
|
5
5
|
|
|
6
6
|
// 状态缓存
|
|
7
7
|
const statusCache = new Map();
|
|
@@ -35,8 +35,7 @@ class ProviderStatusChecker {
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
_getCacheKey(provider) {
|
|
38
|
-
|
|
39
|
-
return `${provider.name}:${provider.authToken}:${provider.baseUrl}:${provider.authMode}`;
|
|
38
|
+
return `${provider.name}:${provider.authMode}:${provider.baseUrl || ''}`;
|
|
40
39
|
}
|
|
41
40
|
|
|
42
41
|
_getCachedStatus(provider) {
|
|
@@ -50,39 +49,17 @@ class ProviderStatusChecker {
|
|
|
50
49
|
|
|
51
50
|
_setCachedStatus(provider, status) {
|
|
52
51
|
const key = this._getCacheKey(provider);
|
|
53
|
-
statusCache.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
52
|
+
if (statusCache.size >= STATUS_CACHE_MAX) {
|
|
53
|
+
const oldest = [...statusCache.keys()].slice(0, 20);
|
|
54
|
+
oldest.forEach(k => statusCache.delete(k));
|
|
55
|
+
}
|
|
56
|
+
statusCache.set(key, { status, timestamp: Date.now() });
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
clearCache() {
|
|
60
60
|
statusCache.clear();
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
-
async _withAuthTokenEnv(authToken, operation) {
|
|
64
|
-
const previous = authTokenEnvLock;
|
|
65
|
-
let release;
|
|
66
|
-
authTokenEnvLock = new Promise((resolve) => {
|
|
67
|
-
release = resolve;
|
|
68
|
-
});
|
|
69
|
-
|
|
70
|
-
await previous;
|
|
71
|
-
|
|
72
|
-
const original = process.env[ENV_VARS.ANTHROPIC_AUTH_TOKEN];
|
|
73
|
-
try {
|
|
74
|
-
process.env[ENV_VARS.ANTHROPIC_AUTH_TOKEN] = authToken;
|
|
75
|
-
return await operation();
|
|
76
|
-
} finally {
|
|
77
|
-
if (original !== undefined) {
|
|
78
|
-
process.env[ENV_VARS.ANTHROPIC_AUTH_TOKEN] = original;
|
|
79
|
-
} else {
|
|
80
|
-
delete process.env[ENV_VARS.ANTHROPIC_AUTH_TOKEN];
|
|
81
|
-
}
|
|
82
|
-
release();
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
|
|
86
63
|
async check(provider, options = {}) {
|
|
87
64
|
if (!provider) {
|
|
88
65
|
return this._result('unknown', '未找到配置', null);
|
|
@@ -144,12 +121,7 @@ class ProviderStatusChecker {
|
|
|
144
121
|
return this._result('online', `可用 ${latency.toFixed(0)}ms`, latency);
|
|
145
122
|
};
|
|
146
123
|
|
|
147
|
-
|
|
148
|
-
if (provider.authMode === 'auth_token') {
|
|
149
|
-
result = await this._withAuthTokenEnv(provider.authToken, performCheck);
|
|
150
|
-
} else {
|
|
151
|
-
result = await performCheck();
|
|
152
|
-
}
|
|
124
|
+
const result = await performCheck();
|
|
153
125
|
this._setCachedStatus(provider, result);
|
|
154
126
|
return result;
|
|
155
127
|
} catch (error) {
|
|
@@ -200,13 +172,10 @@ class ProviderStatusChecker {
|
|
|
200
172
|
}
|
|
201
173
|
clientOptions.apiKey = provider.authToken;
|
|
202
174
|
} else if (provider.authMode === 'auth_token') {
|
|
203
|
-
|
|
204
|
-
// SDK 会自动从环境变量中读取认证信息
|
|
205
|
-
// 注意:check() 方法已经设置了环境变量
|
|
175
|
+
clientOptions.authToken = provider.authToken;
|
|
206
176
|
if (provider.baseUrl) {
|
|
207
177
|
clientOptions.baseURL = provider.baseUrl;
|
|
208
178
|
}
|
|
209
|
-
// 不设置 apiKey,让 SDK 从环境变量读取
|
|
210
179
|
} else {
|
|
211
180
|
return null;
|
|
212
181
|
}
|
|
@@ -47,7 +47,11 @@ function getLatestVersion(pkgName, timeoutMs = 4000) {
|
|
|
47
47
|
const t = setTimeout(() => {
|
|
48
48
|
if (done) return;
|
|
49
49
|
done = true;
|
|
50
|
-
try {
|
|
50
|
+
try {
|
|
51
|
+
child.kill();
|
|
52
|
+
} catch {
|
|
53
|
+
// npm view 超时后终止进程失败不影响更新检查结果。
|
|
54
|
+
}
|
|
51
55
|
resolve(null);
|
|
52
56
|
}, timeoutMs);
|
|
53
57
|
|
|
@@ -139,6 +143,7 @@ async function checkForUpdates({ packageName, currentVersion }) {
|
|
|
139
143
|
});
|
|
140
144
|
}
|
|
141
145
|
} catch {
|
|
146
|
+
// 更新检查必须静默失败,避免影响主命令执行。
|
|
142
147
|
}
|
|
143
148
|
}
|
|
144
149
|
|
package/src/utils/validator.js
CHANGED
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Codex configuration importer.
|
|
3
|
-
* Reads existing Codex config from ~/.codex and extracts API key and base URL.
|
|
4
|
-
*/
|
|
5
|
-
|
|
6
|
-
const { Logger } = require('../../utils/logger');
|
|
7
|
-
const { readCodexFiles, extractBaseUrlFromConfigToml } = require('../../utils/codex-files');
|
|
8
|
-
|
|
9
|
-
/**
|
|
10
|
-
* Import Codex configuration from ~/.codex directory.
|
|
11
|
-
* @returns {Promise<{apiKey: string, baseUrl: string|null}|null>}
|
|
12
|
-
*/
|
|
13
|
-
async function importCodexConfig() {
|
|
14
|
-
try {
|
|
15
|
-
const codexFiles = await readCodexFiles();
|
|
16
|
-
|
|
17
|
-
if (!codexFiles.authJson) {
|
|
18
|
-
return null;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
// 解析 auth.json 获取 API Key
|
|
22
|
-
const authData = JSON.parse(codexFiles.authJson);
|
|
23
|
-
const apiKey = authData.api_key || authData.openai_api_key || authData.OPENAI_API_KEY;
|
|
24
|
-
|
|
25
|
-
if (!apiKey) {
|
|
26
|
-
return null;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
// 从 config.toml 中读取当前激活 provider 的 base_url
|
|
30
|
-
let baseUrl = null;
|
|
31
|
-
if (codexFiles.configToml) {
|
|
32
|
-
baseUrl = extractBaseUrlFromConfigToml(codexFiles.configToml);
|
|
33
|
-
if (!baseUrl) {
|
|
34
|
-
// 兼容旧格式(akm 之前错误写入的顶层字段)
|
|
35
|
-
const legacyMatch = codexFiles.configToml.match(/^api_base_url\s*=\s*["']([^"']+)["']/m);
|
|
36
|
-
if (legacyMatch) baseUrl = legacyMatch[1];
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
Logger.success(`成功从 ${codexFiles.codexHome} 导入配置`);
|
|
41
|
-
return { apiKey, baseUrl };
|
|
42
|
-
} catch (error) {
|
|
43
|
-
Logger.warning(`导入配置失败: ${error.message}`);
|
|
44
|
-
return null;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
module.exports = { importCodexConfig };
|