@jsonstudio/rcc 0.89.942 → 0.89.1083
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/README.md +1 -42
- package/dist/build-info.js +2 -2
- package/dist/build-info.js.map +1 -1
- package/dist/cli.js +106 -10
- package/dist/cli.js.map +1 -1
- package/dist/commands/quota-daemon.d.ts +2 -0
- package/dist/commands/quota-daemon.js +89 -0
- package/dist/commands/quota-daemon.js.map +1 -0
- package/dist/docs/daemon-admin-ui.html +958 -0
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/manager/modules/quota/index.d.ts +34 -0
- package/dist/manager/modules/quota/index.js +291 -0
- package/dist/manager/modules/quota/index.js.map +1 -1
- package/dist/manager/modules/token/index.js +13 -2
- package/dist/manager/modules/token/index.js.map +1 -1
- package/dist/manager/quota/provider-quota-center.d.ts +48 -0
- package/dist/manager/quota/provider-quota-center.js +239 -0
- package/dist/manager/quota/provider-quota-center.js.map +1 -0
- package/dist/manager/quota/provider-quota-store.d.ts +17 -0
- package/dist/manager/quota/provider-quota-store.js +88 -0
- package/dist/manager/quota/provider-quota-store.js.map +1 -0
- package/dist/providers/auth/token-scanner/index.js +11 -3
- package/dist/providers/auth/token-scanner/index.js.map +1 -1
- package/dist/providers/core/runtime/http-request-executor.js +24 -7
- package/dist/providers/core/runtime/http-request-executor.js.map +1 -1
- package/dist/providers/core/runtime/http-transport-provider.js +11 -3
- package/dist/providers/core/runtime/http-transport-provider.js.map +1 -1
- package/dist/providers/core/runtime/responses-provider.js +9 -3
- package/dist/providers/core/runtime/responses-provider.js.map +1 -1
- package/dist/providers/core/utils/http-client.d.ts +1 -0
- package/dist/providers/core/utils/http-client.js +139 -4
- package/dist/providers/core/utils/http-client.js.map +1 -1
- package/dist/providers/core/utils/snapshot-writer.d.ts +12 -0
- package/dist/providers/core/utils/snapshot-writer.js +99 -18
- package/dist/providers/core/utils/snapshot-writer.js.map +1 -1
- package/dist/providers/mock/mock-provider-runtime.d.ts +3 -0
- package/dist/providers/mock/mock-provider-runtime.js +176 -4
- package/dist/providers/mock/mock-provider-runtime.js.map +1 -1
- package/dist/server/handlers/chat-handler.js +13 -1
- package/dist/server/handlers/chat-handler.js.map +1 -1
- package/dist/server/handlers/handler-utils.js +5 -0
- package/dist/server/handlers/handler-utils.js.map +1 -1
- package/dist/server/handlers/messages-handler.js +13 -1
- package/dist/server/handlers/messages-handler.js.map +1 -1
- package/dist/server/handlers/responses-handler.js +73 -1
- package/dist/server/handlers/responses-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js +174 -2
- package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/providers-handler.js +519 -0
- package/dist/server/runtime/http-server/daemon-admin/providers-handler.js.map +1 -1
- package/dist/server/runtime/http-server/executor-response.js +6 -0
- package/dist/server/runtime/http-server/executor-response.js.map +1 -1
- package/dist/server/runtime/http-server/index.d.ts +5 -0
- package/dist/server/runtime/http-server/index.js +205 -4
- package/dist/server/runtime/http-server/index.js.map +1 -1
- package/dist/server/runtime/http-server/middleware.d.ts +2 -0
- package/dist/server/runtime/http-server/middleware.js +63 -0
- package/dist/server/runtime/http-server/middleware.js.map +1 -1
- package/dist/server/runtime/http-server/request-executor.d.ts +2 -0
- package/dist/server/runtime/http-server/request-executor.js +57 -10
- package/dist/server/runtime/http-server/request-executor.js.map +1 -1
- package/dist/server/runtime/http-server/routes.js +38 -1
- package/dist/server/runtime/http-server/routes.js.map +1 -1
- package/dist/server/runtime/http-server/stats-manager.d.ts +55 -0
- package/dist/server/runtime/http-server/stats-manager.js +462 -4
- package/dist/server/runtime/http-server/stats-manager.js.map +1 -1
- package/dist/server/runtime/http-server/types.d.ts +1 -0
- package/dist/token-daemon/token-daemon.js +70 -25
- package/dist/token-daemon/token-daemon.js.map +1 -1
- package/dist/token-daemon/token-utils.d.ts +1 -0
- package/dist/token-daemon/token-utils.js +9 -1
- package/dist/token-daemon/token-utils.js.map +1 -1
- package/dist/tools/semantic-replay.js +29 -0
- package/dist/tools/semantic-replay.js.map +1 -1
- package/dist/utils/snapshot-writer.d.ts +2 -0
- package/dist/utils/snapshot-writer.js +47 -4
- package/dist/utils/snapshot-writer.js.map +1 -1
- package/package.json +2 -3
- package/scripts/analyze-codex-error-failures.mjs +24 -14
- package/scripts/classify-codex-samples.mjs +0 -35
- package/scripts/copy-modules-config.mjs +17 -1
- package/scripts/generate-snapshot-data.mjs +41 -11
- package/scripts/mock-provider/extract.mjs +239 -21
- package/scripts/mock-provider/run-regressions.mjs +79 -16
- package/scripts/quota-dryrun.mjs +124 -0
- package/scripts/tests/apply-patch-loop.mjs +5 -1
- package/scripts/tests/exec-command-loop.mjs +16 -19
- package/scripts/verify-apply-patch.mjs +335 -5
- package/scripts/verify-e2e-toolcall.mjs +49 -10
- package/scripts/toon-suite.mjs +0 -141
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
export type QuotaReason = 'ok' | 'cooldown' | 'blacklist' | 'quotaDepleted' | 'fatal';
|
|
2
|
+
export interface StaticQuotaConfig {
|
|
3
|
+
priorityTier?: number | null;
|
|
4
|
+
rateLimitPerMinute?: number | null;
|
|
5
|
+
tokenLimitPerMinute?: number | null;
|
|
6
|
+
totalTokenLimit?: number | null;
|
|
7
|
+
}
|
|
8
|
+
export interface QuotaState {
|
|
9
|
+
providerKey: string;
|
|
10
|
+
inPool: boolean;
|
|
11
|
+
reason: QuotaReason;
|
|
12
|
+
priorityTier: number;
|
|
13
|
+
rateLimitPerMinute: number | null;
|
|
14
|
+
tokenLimitPerMinute: number | null;
|
|
15
|
+
totalTokenLimit: number | null;
|
|
16
|
+
windowStartMs: number;
|
|
17
|
+
requestsThisWindow: number;
|
|
18
|
+
tokensThisWindow: number;
|
|
19
|
+
totalTokensUsed: number;
|
|
20
|
+
cooldownUntil: number | null;
|
|
21
|
+
blacklistUntil: number | null;
|
|
22
|
+
lastErrorSeries: ErrorSeries | null;
|
|
23
|
+
consecutiveErrorCount: number;
|
|
24
|
+
}
|
|
25
|
+
export type ErrorSeries = 'E429' | 'E5XX' | 'ENET' | 'EFATAL' | 'EOTHER';
|
|
26
|
+
export interface ErrorEventForQuota {
|
|
27
|
+
providerKey: string;
|
|
28
|
+
code?: string | null;
|
|
29
|
+
httpStatus?: number | null;
|
|
30
|
+
fatal?: boolean | null;
|
|
31
|
+
timestampMs?: number;
|
|
32
|
+
}
|
|
33
|
+
export interface SuccessEventForQuota {
|
|
34
|
+
providerKey: string;
|
|
35
|
+
usedTokens?: number | null;
|
|
36
|
+
timestampMs?: number;
|
|
37
|
+
}
|
|
38
|
+
export interface UsageEventForQuota {
|
|
39
|
+
providerKey: string;
|
|
40
|
+
requestedTokens?: number | null;
|
|
41
|
+
timestampMs?: number;
|
|
42
|
+
}
|
|
43
|
+
export declare function createInitialQuotaState(providerKey: string, staticConfig?: StaticQuotaConfig, nowMs?: number): QuotaState;
|
|
44
|
+
export declare function normalizeErrorSeries(event: ErrorEventForQuota): ErrorSeries;
|
|
45
|
+
export declare function applyErrorEvent(state: QuotaState, event: ErrorEventForQuota, nowMs?: number): QuotaState;
|
|
46
|
+
export declare function applySuccessEvent(state: QuotaState, event: SuccessEventForQuota, nowMs?: number): QuotaState;
|
|
47
|
+
export declare function applyUsageEvent(state: QuotaState, event: UsageEventForQuota, nowMs?: number): QuotaState;
|
|
48
|
+
export declare function tickQuotaStateTime(state: QuotaState, nowMs: number): QuotaState;
|
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
const WINDOW_DURATION_MS = 60_000;
|
|
2
|
+
const COOLDOWN_1_MS = 1 * 60_000;
|
|
3
|
+
const COOLDOWN_2_MS = 3 * 60_000;
|
|
4
|
+
const COOLDOWN_3_MS = 5 * 60_000;
|
|
5
|
+
const BLACKLIST_MS = 6 * 60 * 60_000;
|
|
6
|
+
const NETWORK_ERROR_CODES = ['ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'EAI_AGAIN'];
|
|
7
|
+
export function createInitialQuotaState(providerKey, staticConfig, nowMs = Date.now()) {
|
|
8
|
+
const priorityTier = staticConfig && typeof staticConfig.priorityTier === 'number'
|
|
9
|
+
? staticConfig.priorityTier
|
|
10
|
+
: 100;
|
|
11
|
+
const rateLimitPerMinute = staticConfig && typeof staticConfig.rateLimitPerMinute === 'number'
|
|
12
|
+
? staticConfig.rateLimitPerMinute
|
|
13
|
+
: null;
|
|
14
|
+
const tokenLimitPerMinute = staticConfig && typeof staticConfig.tokenLimitPerMinute === 'number'
|
|
15
|
+
? staticConfig.tokenLimitPerMinute
|
|
16
|
+
: null;
|
|
17
|
+
const totalTokenLimit = staticConfig && typeof staticConfig.totalTokenLimit === 'number'
|
|
18
|
+
? staticConfig.totalTokenLimit
|
|
19
|
+
: null;
|
|
20
|
+
return {
|
|
21
|
+
providerKey,
|
|
22
|
+
inPool: true,
|
|
23
|
+
reason: 'ok',
|
|
24
|
+
priorityTier,
|
|
25
|
+
rateLimitPerMinute,
|
|
26
|
+
tokenLimitPerMinute,
|
|
27
|
+
totalTokenLimit,
|
|
28
|
+
windowStartMs: nowMs,
|
|
29
|
+
requestsThisWindow: 0,
|
|
30
|
+
tokensThisWindow: 0,
|
|
31
|
+
totalTokensUsed: 0,
|
|
32
|
+
cooldownUntil: null,
|
|
33
|
+
blacklistUntil: null,
|
|
34
|
+
lastErrorSeries: null,
|
|
35
|
+
consecutiveErrorCount: 0
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
export function normalizeErrorSeries(event) {
|
|
39
|
+
if (event.fatal) {
|
|
40
|
+
return 'EFATAL';
|
|
41
|
+
}
|
|
42
|
+
const status = typeof event.httpStatus === 'number' ? event.httpStatus : null;
|
|
43
|
+
const rawCode = String(event.code || '').toUpperCase();
|
|
44
|
+
if (status === 429 || rawCode.includes('429') || rawCode.includes('RATE') || rawCode.includes('QUOTA')) {
|
|
45
|
+
return 'E429';
|
|
46
|
+
}
|
|
47
|
+
if (status && status >= 500) {
|
|
48
|
+
return 'E5XX';
|
|
49
|
+
}
|
|
50
|
+
if (NETWORK_ERROR_CODES.some((code) => rawCode.includes(code))) {
|
|
51
|
+
return 'ENET';
|
|
52
|
+
}
|
|
53
|
+
if (rawCode.includes('AUTH') ||
|
|
54
|
+
rawCode.includes('UNAUTHORIZED') ||
|
|
55
|
+
rawCode.includes('CONFIG') ||
|
|
56
|
+
rawCode.includes('FATAL')) {
|
|
57
|
+
return 'EFATAL';
|
|
58
|
+
}
|
|
59
|
+
return 'EOTHER';
|
|
60
|
+
}
|
|
61
|
+
function computeCooldownMs(consecutive) {
|
|
62
|
+
if (consecutive <= 0) {
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
if (consecutive === 1) {
|
|
66
|
+
return COOLDOWN_1_MS;
|
|
67
|
+
}
|
|
68
|
+
if (consecutive === 2) {
|
|
69
|
+
return COOLDOWN_2_MS;
|
|
70
|
+
}
|
|
71
|
+
if (consecutive >= 3) {
|
|
72
|
+
return COOLDOWN_3_MS;
|
|
73
|
+
}
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
export function applyErrorEvent(state, event, nowMs = event.timestampMs ?? Date.now()) {
|
|
77
|
+
// 如果已经处于 fatal 黑名单且还在锁定窗口内,错误事件不再改变状态。
|
|
78
|
+
if (state.reason === 'fatal' && state.blacklistUntil && nowMs < state.blacklistUntil) {
|
|
79
|
+
return state;
|
|
80
|
+
}
|
|
81
|
+
const series = normalizeErrorSeries(event);
|
|
82
|
+
// 不可恢复错误:直接 6 小时锁定。
|
|
83
|
+
if (series === 'EFATAL') {
|
|
84
|
+
return {
|
|
85
|
+
...state,
|
|
86
|
+
inPool: false,
|
|
87
|
+
reason: 'fatal',
|
|
88
|
+
blacklistUntil: nowMs + BLACKLIST_MS,
|
|
89
|
+
cooldownUntil: null,
|
|
90
|
+
lastErrorSeries: series,
|
|
91
|
+
consecutiveErrorCount: state.consecutiveErrorCount + 1
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
const sameSeries = state.lastErrorSeries === series;
|
|
95
|
+
const nextCount = sameSeries ? state.consecutiveErrorCount + 1 : 1;
|
|
96
|
+
// 连续三次同类错误:锁定 6 小时。
|
|
97
|
+
if (nextCount >= 3) {
|
|
98
|
+
return {
|
|
99
|
+
...state,
|
|
100
|
+
inPool: false,
|
|
101
|
+
reason: 'blacklist',
|
|
102
|
+
cooldownUntil: null,
|
|
103
|
+
blacklistUntil: nowMs + BLACKLIST_MS,
|
|
104
|
+
lastErrorSeries: series,
|
|
105
|
+
consecutiveErrorCount: nextCount
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
const cooldownMs = computeCooldownMs(nextCount);
|
|
109
|
+
const cooldownUntil = cooldownMs ? nowMs + cooldownMs : null;
|
|
110
|
+
return {
|
|
111
|
+
...state,
|
|
112
|
+
inPool: false,
|
|
113
|
+
reason: 'cooldown',
|
|
114
|
+
cooldownUntil,
|
|
115
|
+
lastErrorSeries: series,
|
|
116
|
+
consecutiveErrorCount: nextCount
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
export function applySuccessEvent(state, event, nowMs = event.timestampMs ?? Date.now()) {
|
|
120
|
+
const usedTokens = typeof event.usedTokens === 'number' && event.usedTokens > 0 ? event.usedTokens : 0;
|
|
121
|
+
const totalTokensUsed = state.totalTokensUsed + usedTokens;
|
|
122
|
+
// fatal 黑名单在锁定期内不自动恢复,成功事件只更新统计信息。
|
|
123
|
+
if (state.reason === 'fatal' && state.blacklistUntil && nowMs < state.blacklistUntil) {
|
|
124
|
+
return {
|
|
125
|
+
...state,
|
|
126
|
+
totalTokensUsed,
|
|
127
|
+
lastErrorSeries: null,
|
|
128
|
+
consecutiveErrorCount: 0
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
const withinBlacklist = state.blacklistUntil !== null && nowMs < state.blacklistUntil;
|
|
132
|
+
const clearedCooldown = state.cooldownUntil !== null && nowMs >= state.cooldownUntil;
|
|
133
|
+
let nextReason = state.reason;
|
|
134
|
+
let nextInPool = state.inPool;
|
|
135
|
+
let nextCooldownUntil = state.cooldownUntil;
|
|
136
|
+
if (!withinBlacklist) {
|
|
137
|
+
// 非黑名单情况下,成功会把冷却结束的 provider 恢复为 ok。
|
|
138
|
+
if (clearedCooldown || state.reason === 'cooldown') {
|
|
139
|
+
nextReason = 'ok';
|
|
140
|
+
nextInPool = true;
|
|
141
|
+
nextCooldownUntil = null;
|
|
142
|
+
}
|
|
143
|
+
if (state.reason === 'quotaDepleted' && !state.totalTokenLimit) {
|
|
144
|
+
// 软配额耗尽:窗口翻转后由 tickWindow 恢复;成功本身不改变。
|
|
145
|
+
nextReason = state.reason;
|
|
146
|
+
nextInPool = state.inPool;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
return {
|
|
150
|
+
...state,
|
|
151
|
+
totalTokensUsed,
|
|
152
|
+
reason: nextReason,
|
|
153
|
+
inPool: nextInPool,
|
|
154
|
+
cooldownUntil: nextCooldownUntil,
|
|
155
|
+
lastErrorSeries: null,
|
|
156
|
+
consecutiveErrorCount: 0
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
export function applyUsageEvent(state, event, nowMs = event.timestampMs ?? Date.now()) {
|
|
160
|
+
const requestedTokens = typeof event.requestedTokens === 'number' && event.requestedTokens > 0
|
|
161
|
+
? event.requestedTokens
|
|
162
|
+
: 0;
|
|
163
|
+
let next = tickQuotaStateTime(state, nowMs);
|
|
164
|
+
const requestsThisWindow = next.requestsThisWindow + 1;
|
|
165
|
+
const tokensThisWindow = next.tokensThisWindow + requestedTokens;
|
|
166
|
+
const totalTokensUsed = next.totalTokensUsed + requestedTokens;
|
|
167
|
+
next = {
|
|
168
|
+
...next,
|
|
169
|
+
requestsThisWindow,
|
|
170
|
+
tokensThisWindow,
|
|
171
|
+
totalTokensUsed
|
|
172
|
+
};
|
|
173
|
+
let quotaExceeded = false;
|
|
174
|
+
if (next.rateLimitPerMinute !== null && next.rateLimitPerMinute >= 0) {
|
|
175
|
+
if (requestsThisWindow > next.rateLimitPerMinute) {
|
|
176
|
+
quotaExceeded = true;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
if (next.tokenLimitPerMinute !== null && next.tokenLimitPerMinute >= 0) {
|
|
180
|
+
if (tokensThisWindow > next.tokenLimitPerMinute) {
|
|
181
|
+
quotaExceeded = true;
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
if (next.totalTokenLimit !== null && next.totalTokenLimit >= 0) {
|
|
185
|
+
if (totalTokensUsed > next.totalTokenLimit) {
|
|
186
|
+
quotaExceeded = true;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
if (!quotaExceeded) {
|
|
190
|
+
return next;
|
|
191
|
+
}
|
|
192
|
+
return {
|
|
193
|
+
...next,
|
|
194
|
+
inPool: false,
|
|
195
|
+
reason: 'quotaDepleted'
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
export function tickQuotaStateTime(state, nowMs) {
|
|
199
|
+
let next = state;
|
|
200
|
+
// 冷却与黑名单窗口到期处理。
|
|
201
|
+
if (next.blacklistUntil !== null && nowMs >= next.blacklistUntil) {
|
|
202
|
+
next = {
|
|
203
|
+
...next,
|
|
204
|
+
blacklistUntil: null,
|
|
205
|
+
cooldownUntil: null,
|
|
206
|
+
inPool: true,
|
|
207
|
+
reason: 'ok',
|
|
208
|
+
lastErrorSeries: null,
|
|
209
|
+
consecutiveErrorCount: 0
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
else if (next.cooldownUntil !== null && nowMs >= next.cooldownUntil) {
|
|
213
|
+
next = {
|
|
214
|
+
...next,
|
|
215
|
+
cooldownUntil: null,
|
|
216
|
+
inPool: true,
|
|
217
|
+
reason: next.reason === 'cooldown' ? 'ok' : next.reason
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
// 配额时间窗口翻转。
|
|
221
|
+
if (nowMs - next.windowStartMs >= WINDOW_DURATION_MS) {
|
|
222
|
+
const resetState = {
|
|
223
|
+
...next,
|
|
224
|
+
windowStartMs: nowMs,
|
|
225
|
+
requestsThisWindow: 0,
|
|
226
|
+
tokensThisWindow: 0
|
|
227
|
+
};
|
|
228
|
+
if (resetState.reason === 'quotaDepleted' && !resetState.totalTokenLimit) {
|
|
229
|
+
return {
|
|
230
|
+
...resetState,
|
|
231
|
+
inPool: true,
|
|
232
|
+
reason: 'ok'
|
|
233
|
+
};
|
|
234
|
+
}
|
|
235
|
+
return resetState;
|
|
236
|
+
}
|
|
237
|
+
return next;
|
|
238
|
+
}
|
|
239
|
+
//# sourceMappingURL=provider-quota-center.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-quota-center.js","sourceRoot":"","sources":["../../../src/manager/quota/provider-quota-center.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { QuotaState } from './provider-quota-center.js';
|
|
2
|
+
export interface ProviderQuotaSnapshot {
|
|
3
|
+
version: number;
|
|
4
|
+
updatedAt: string;
|
|
5
|
+
providers: Record<string, QuotaState>;
|
|
6
|
+
}
|
|
7
|
+
export interface ProviderErrorEventRecord {
|
|
8
|
+
ts: string;
|
|
9
|
+
providerKey: string;
|
|
10
|
+
code?: string;
|
|
11
|
+
httpStatus?: number;
|
|
12
|
+
message?: string;
|
|
13
|
+
details?: unknown;
|
|
14
|
+
}
|
|
15
|
+
export declare function loadProviderQuotaSnapshot(): Promise<ProviderQuotaSnapshot | null>;
|
|
16
|
+
export declare function saveProviderQuotaSnapshot(providers: Record<string, QuotaState>, now?: Date): Promise<void>;
|
|
17
|
+
export declare function appendProviderErrorEvent(event: ProviderErrorEventRecord): Promise<void>;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import os from 'node:os';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import fs from 'node:fs/promises';
|
|
4
|
+
function resolveQuotaDir() {
|
|
5
|
+
const home = os.homedir();
|
|
6
|
+
const base = path.join(home, '.routecodex', 'quota');
|
|
7
|
+
return base;
|
|
8
|
+
}
|
|
9
|
+
function resolveQuotaSnapshotPath() {
|
|
10
|
+
return path.join(resolveQuotaDir(), 'provider-quota.json');
|
|
11
|
+
}
|
|
12
|
+
function resolveErrorLogPath() {
|
|
13
|
+
return path.join(resolveQuotaDir(), 'provider-errors.ndjson');
|
|
14
|
+
}
|
|
15
|
+
export async function loadProviderQuotaSnapshot() {
|
|
16
|
+
const filePath = resolveQuotaSnapshotPath();
|
|
17
|
+
try {
|
|
18
|
+
const raw = await fs.readFile(filePath, 'utf8');
|
|
19
|
+
const trimmed = raw.trim();
|
|
20
|
+
if (!trimmed) {
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
const parsed = JSON.parse(trimmed);
|
|
24
|
+
if (!parsed || typeof parsed !== 'object' || !parsed.providers || typeof parsed.providers !== 'object') {
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
27
|
+
return parsed;
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
export async function saveProviderQuotaSnapshot(providers, now = new Date()) {
|
|
34
|
+
const dir = resolveQuotaDir();
|
|
35
|
+
const filePath = resolveQuotaSnapshotPath();
|
|
36
|
+
const payload = {
|
|
37
|
+
version: 1,
|
|
38
|
+
updatedAt: now.toISOString(),
|
|
39
|
+
providers
|
|
40
|
+
};
|
|
41
|
+
try {
|
|
42
|
+
await fs.mkdir(dir, { recursive: true });
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
// best-effort
|
|
46
|
+
}
|
|
47
|
+
const tmpPath = `${filePath}.tmp`;
|
|
48
|
+
const text = `${JSON.stringify(payload, null, 2)}\n`;
|
|
49
|
+
try {
|
|
50
|
+
await fs.writeFile(tmpPath, text, 'utf8');
|
|
51
|
+
await fs.rename(tmpPath, filePath);
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
// 写入失败不应影响主流程
|
|
55
|
+
try {
|
|
56
|
+
await fs.unlink(tmpPath);
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
// ignore
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
export async function appendProviderErrorEvent(event) {
|
|
64
|
+
const dir = resolveQuotaDir();
|
|
65
|
+
const filePath = resolveErrorLogPath();
|
|
66
|
+
try {
|
|
67
|
+
await fs.mkdir(dir, { recursive: true });
|
|
68
|
+
}
|
|
69
|
+
catch {
|
|
70
|
+
// best-effort
|
|
71
|
+
}
|
|
72
|
+
const envelope = {
|
|
73
|
+
ts: event.ts,
|
|
74
|
+
providerKey: event.providerKey,
|
|
75
|
+
...(event.code ? { code: event.code } : {}),
|
|
76
|
+
...(typeof event.httpStatus === 'number' ? { httpStatus: event.httpStatus } : {}),
|
|
77
|
+
...(event.message ? { message: event.message } : {}),
|
|
78
|
+
...(event.details !== undefined ? { details: event.details } : {})
|
|
79
|
+
};
|
|
80
|
+
const line = `${JSON.stringify(envelope)}\n`;
|
|
81
|
+
try {
|
|
82
|
+
await fs.appendFile(filePath, line, 'utf8');
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
// 追加失败不影响主流程
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=provider-quota-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-quota-store.js","sourceRoot":"","sources":["../../../src/manager/quota/provider-quota-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,14 @@
|
|
|
7
7
|
import fs from 'fs/promises';
|
|
8
8
|
import path from 'path';
|
|
9
9
|
import { homedir } from 'os';
|
|
10
|
-
|
|
10
|
+
function resolveAuthDir() {
|
|
11
|
+
const override = String(process.env.ROUTECODEX_AUTH_DIR || process.env.RCC_AUTH_DIR || '').trim();
|
|
12
|
+
if (override) {
|
|
13
|
+
return path.isAbsolute(override) ? override : path.resolve(override);
|
|
14
|
+
}
|
|
15
|
+
const home = String(process.env.HOME || '').trim() || homedir();
|
|
16
|
+
return path.join(home, '.routecodex', 'auth');
|
|
17
|
+
}
|
|
11
18
|
/**
|
|
12
19
|
* 匹配token文件名的正则
|
|
13
20
|
* 格式: <provider>-oauth-<序号>-<alias>.json
|
|
@@ -19,7 +26,8 @@ const TOKEN_FILE_PATTERN = /^(.+)-oauth-(\d+)(?:-(.+))?\.json$/;
|
|
|
19
26
|
*/
|
|
20
27
|
export async function scanProviderTokenFiles(provider) {
|
|
21
28
|
try {
|
|
22
|
-
const
|
|
29
|
+
const authDir = resolveAuthDir();
|
|
30
|
+
const entries = await fs.readdir(authDir);
|
|
23
31
|
const matches = [];
|
|
24
32
|
const normalizedProvider = provider.toLowerCase();
|
|
25
33
|
const acceptedPrefixes = [normalizedProvider];
|
|
@@ -50,7 +58,7 @@ export async function scanProviderTokenFiles(provider) {
|
|
|
50
58
|
continue;
|
|
51
59
|
}
|
|
52
60
|
matches.push({
|
|
53
|
-
filePath: path.join(
|
|
61
|
+
filePath: path.join(authDir, entry),
|
|
54
62
|
providerPrefix,
|
|
55
63
|
sequence,
|
|
56
64
|
alias: alias || 'default'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/providers/auth/token-scanner/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAS7B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/providers/auth/token-scanner/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,12 @@ export class HttpRequestExecutor {
|
|
|
27
27
|
finalHeaders = this.deps.applyStreamModeHeaders(finalHeaders, wantsSse);
|
|
28
28
|
const targetUrl = `${this.deps.getEffectiveBaseUrl().replace(/\/$/, '')}/${endpoint.startsWith('/') ? endpoint.slice(1) : endpoint}`;
|
|
29
29
|
const finalBody = this.deps.buildHttpRequestBody(processedRequest);
|
|
30
|
-
const
|
|
30
|
+
const meta = context.metadata;
|
|
31
|
+
const metaEntryEndpoint = meta && typeof meta === 'object' && typeof meta.entryEndpoint === 'string'
|
|
32
|
+
? meta.entryEndpoint
|
|
33
|
+
: undefined;
|
|
34
|
+
const entryEndpoint = this.deps.getEntryEndpointFromPayload(processedRequest) ||
|
|
35
|
+
metaEntryEndpoint;
|
|
31
36
|
if (wantsSse) {
|
|
32
37
|
this.deps.prepareSseRequestBody(finalBody, context);
|
|
33
38
|
}
|
|
@@ -37,7 +42,9 @@ export class HttpRequestExecutor {
|
|
|
37
42
|
entryEndpoint,
|
|
38
43
|
requestId: context.requestId,
|
|
39
44
|
routeName: context.routeName,
|
|
40
|
-
clientRequestId
|
|
45
|
+
clientRequestId,
|
|
46
|
+
providerKey: context.providerKey,
|
|
47
|
+
providerId: context.providerId
|
|
41
48
|
});
|
|
42
49
|
// Debug: 打印完整的HTTP请求信息(用于对比gcli2api)
|
|
43
50
|
const debugAntigravity = process.env.ROUTECODEX_DEBUG_ANTIGRAVITY === '1' ||
|
|
@@ -90,7 +97,9 @@ export class HttpRequestExecutor {
|
|
|
90
97
|
wantsSse: options.wantsSse
|
|
91
98
|
}),
|
|
92
99
|
entryEndpoint: options.entryEndpoint,
|
|
93
|
-
clientRequestId: options.clientRequestId ?? options.requestId
|
|
100
|
+
clientRequestId: options.clientRequestId ?? options.requestId,
|
|
101
|
+
providerKey: options.providerKey,
|
|
102
|
+
providerId: options.providerId
|
|
94
103
|
});
|
|
95
104
|
}
|
|
96
105
|
catch {
|
|
@@ -114,7 +123,9 @@ export class HttpRequestExecutor {
|
|
|
114
123
|
headers: requestInfo.headers,
|
|
115
124
|
url: requestInfo.targetUrl,
|
|
116
125
|
entryEndpoint: requestInfo.entryEndpoint,
|
|
117
|
-
clientRequestId: requestInfo.clientRequestId
|
|
126
|
+
clientRequestId: requestInfo.clientRequestId,
|
|
127
|
+
providerKey: context.providerKey,
|
|
128
|
+
providerId: context.providerId
|
|
118
129
|
});
|
|
119
130
|
}
|
|
120
131
|
catch {
|
|
@@ -154,7 +165,9 @@ export class HttpRequestExecutor {
|
|
|
154
165
|
headers: requestInfo.headers,
|
|
155
166
|
url: requestInfo.targetUrl,
|
|
156
167
|
entryEndpoint: requestInfo.entryEndpoint,
|
|
157
|
-
clientRequestId: requestInfo.clientRequestId
|
|
168
|
+
clientRequestId: requestInfo.clientRequestId,
|
|
169
|
+
providerKey: context.providerKey,
|
|
170
|
+
providerId: context.providerId
|
|
158
171
|
})
|
|
159
172
|
: upstreamStream;
|
|
160
173
|
const wrapped = await this.deps.wrapUpstreamSseResponse(streamForHost, context);
|
|
@@ -167,7 +180,9 @@ export class HttpRequestExecutor {
|
|
|
167
180
|
headers: requestInfo.headers,
|
|
168
181
|
url: requestInfo.targetUrl,
|
|
169
182
|
entryEndpoint: requestInfo.entryEndpoint,
|
|
170
|
-
clientRequestId: requestInfo.clientRequestId
|
|
183
|
+
clientRequestId: requestInfo.clientRequestId,
|
|
184
|
+
providerKey: context.providerKey,
|
|
185
|
+
providerId: context.providerId
|
|
171
186
|
});
|
|
172
187
|
}
|
|
173
188
|
catch {
|
|
@@ -185,7 +200,9 @@ export class HttpRequestExecutor {
|
|
|
185
200
|
headers: requestInfo.headers,
|
|
186
201
|
url: requestInfo.targetUrl,
|
|
187
202
|
entryEndpoint: requestInfo.entryEndpoint,
|
|
188
|
-
clientRequestId: requestInfo.clientRequestId
|
|
203
|
+
clientRequestId: requestInfo.clientRequestId,
|
|
204
|
+
providerKey: context.providerKey,
|
|
205
|
+
providerId: context.providerId
|
|
189
206
|
});
|
|
190
207
|
}
|
|
191
208
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-request-executor.js","sourceRoot":"","sources":["../../../../src/providers/core/runtime/http-request-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,oCAAoC,EACpC,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,yBAAyB,CAAC;AA4CjC,MAAM,OAAO,mBAAmB;IAEX;IACA;IAFnB,YACmB,UAAsB,EACtB,IAA6B;QAD7B,eAAU,GAAV,UAAU,CAAY;QACtB,SAAI,GAAJ,IAAI,CAAyB;IAC5C,CAAC;IAEL,KAAK,CAAC,OAAO,CAAC,gBAA+B,EAAE,OAAwB;QACrE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;QACvF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAClG,MAAM,UAAU,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,gBAA+B,EAC/B,OAAwB;QAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;QACrF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACtD,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACrF,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACrI,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;QACnE,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"http-request-executor.js","sourceRoot":"","sources":["../../../../src/providers/core/runtime/http-request-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -506,6 +506,8 @@ export class HttpTransportProvider extends BaseProvider {
|
|
|
506
506
|
url: requestInfo.targetUrl,
|
|
507
507
|
entryEndpoint: requestInfo.entryEndpoint,
|
|
508
508
|
clientRequestId: requestInfo.clientRequestId,
|
|
509
|
+
providerKey: context.providerKey,
|
|
510
|
+
providerId: context.providerId,
|
|
509
511
|
extra: { retry: true }
|
|
510
512
|
})
|
|
511
513
|
: upstreamStream;
|
|
@@ -519,7 +521,9 @@ export class HttpTransportProvider extends BaseProvider {
|
|
|
519
521
|
headers: finalRetryHeaders,
|
|
520
522
|
url: requestInfo.targetUrl,
|
|
521
523
|
entryEndpoint: requestInfo.entryEndpoint,
|
|
522
|
-
clientRequestId: requestInfo.clientRequestId
|
|
524
|
+
clientRequestId: requestInfo.clientRequestId,
|
|
525
|
+
providerKey: context.providerKey,
|
|
526
|
+
providerId: context.providerId
|
|
523
527
|
});
|
|
524
528
|
}
|
|
525
529
|
catch { /* non-blocking */ }
|
|
@@ -535,7 +539,9 @@ export class HttpTransportProvider extends BaseProvider {
|
|
|
535
539
|
headers: finalRetryHeaders,
|
|
536
540
|
url: requestInfo.targetUrl,
|
|
537
541
|
entryEndpoint: requestInfo.entryEndpoint,
|
|
538
|
-
clientRequestId: requestInfo.clientRequestId
|
|
542
|
+
clientRequestId: requestInfo.clientRequestId,
|
|
543
|
+
providerKey: context.providerKey,
|
|
544
|
+
providerId: context.providerId
|
|
539
545
|
});
|
|
540
546
|
}
|
|
541
547
|
catch { /* non-blocking */ }
|
|
@@ -589,7 +595,9 @@ export class HttpTransportProvider extends BaseProvider {
|
|
|
589
595
|
headers: requestInfo.headers,
|
|
590
596
|
url: requestInfo.targetUrl,
|
|
591
597
|
entryEndpoint: requestInfo.entryEndpoint ?? this.getEntryEndpointFromPayload(processedRequest),
|
|
592
|
-
clientRequestId: requestInfo.clientRequestId ?? this.getClientRequestIdFromContext(context)
|
|
598
|
+
clientRequestId: requestInfo.clientRequestId ?? this.getClientRequestIdFromContext(context),
|
|
599
|
+
providerKey: context.providerKey,
|
|
600
|
+
providerId: context.providerId
|
|
593
601
|
});
|
|
594
602
|
}
|
|
595
603
|
catch { /* non-blocking */ }
|