@xixka/dsh-hub 0.2.5 → 0.2.7
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/lib/account-pool.d.ts +1 -2
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +4 -8
- package/lib/account-pool.js.map +1 -1
- package/lib/client/jet-hub.js +27 -27
- package/lib/cline-adapter.d.ts +9 -1
- package/lib/cline-adapter.d.ts.map +1 -1
- package/lib/cline-adapter.js +11 -3
- package/lib/cline-adapter.js.map +1 -1
- package/lib/cline-models.d.ts +12 -10
- package/lib/cline-models.d.ts.map +1 -1
- package/lib/cline-models.js +40 -8
- package/lib/cline-models.js.map +1 -1
- package/lib/codearts-credits.d.ts +8 -88
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +14 -189
- package/lib/codearts-credits.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +27 -12
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +2 -0
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +11 -60
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +1 -1
- package/lib/llm-adapter.d.ts +1 -39
- package/lib/llm-adapter.d.ts.map +1 -1
- package/lib/llm-adapter.js +22 -167
- package/lib/llm-adapter.js.map +1 -1
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +8 -0
- package/lib/login.js.map +1 -1
- package/lib/models.d.ts +0 -12
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +0 -6
- package/lib/models.js.map +1 -1
- package/lib/oauth.d.ts +0 -23
- package/lib/oauth.d.ts.map +1 -1
- package/lib/oauth.js +13 -98
- package/lib/oauth.js.map +1 -1
- package/lib/service.d.ts +6 -46
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +16 -104
- package/lib/service.js.map +1 -1
- package/lib/types.d.ts +9 -4
- package/lib/types.d.ts.map +1 -1
- package/lib/webdav-auto-sync.d.ts +9 -4
- package/lib/webdav-auto-sync.d.ts.map +1 -1
- package/lib/webdav-auto-sync.js +0 -0
- package/lib/webdav-auto-sync.js.map +1 -1
- package/lib/webdav-rpc.d.ts +13 -0
- package/lib/webdav-rpc.d.ts.map +1 -0
- package/lib/webdav-rpc.js +137 -0
- package/lib/webdav-rpc.js.map +1 -0
- package/lib/webdav-sync.d.ts +0 -3
- package/lib/webdav-sync.d.ts.map +1 -1
- package/lib/webdav-sync.js +2 -9
- package/lib/webdav-sync.js.map +1 -1
- package/package.json +1 -1
package/lib/oauth.d.ts
CHANGED
|
@@ -87,29 +87,6 @@ export declare function refreshTokenExpiresAt(credential: {
|
|
|
87
87
|
}): number | undefined;
|
|
88
88
|
/** 导出给单测:直接解一个 JWT 的 `exp`/`iat`(毫秒)。 */
|
|
89
89
|
export declare const __readJwtTimeForTest: typeof readJwtTime;
|
|
90
|
-
/**
|
|
91
|
-
* `requestToken` 的**网络层失败**(fetch 抛错:连接被拒/重置、DNS、超时、证书…)。
|
|
92
|
-
*
|
|
93
|
-
* ## 为什么必须是独立类型(真实报障 2026-11-04)
|
|
94
|
-
*
|
|
95
|
-
* ```
|
|
96
|
-
* 本轮运行失败 CodeArts token request network error: TypeError: fetch failed
|
|
97
|
-
* ```
|
|
98
|
-
*
|
|
99
|
-
* 这条错误杀了整轮运行且**宿主不重试**:dsh-llm 的 `normalizeLlmFailure` 把
|
|
100
|
-
* 非 LlmError 的普通 `Error` 归为 `UNKNOWN` 码,而 `UNKNOWN` 不在任何
|
|
101
|
-
* retryableCodes 里。模型请求路径(`llm-adapter.ts` 的 `stream()`)必须识别
|
|
102
|
-
* 本类型并转成 `LlmError(…, 'TRANSPORT')`,才能进宿主的慢速重试梯度。
|
|
103
|
-
*
|
|
104
|
-
* 同时保留 `cause`:undici 的 `TypeError: fetch failed` 把真实原因
|
|
105
|
-
* (`ECONNRESET` / `ETIMEDOUT` / `ENOTFOUND` / 证书错误…)藏在 `error.cause` 里,
|
|
106
|
-
* 丢掉它 = 不可诊断(报障原文连「连不上」还是「被重置」都分不出)。
|
|
107
|
-
*/
|
|
108
|
-
export declare class TokenRequestNetworkError extends Error {
|
|
109
|
-
constructor(message: string, options?: {
|
|
110
|
-
cause?: unknown;
|
|
111
|
-
});
|
|
112
|
-
}
|
|
113
90
|
/** 向 STS token 端点发起一次带 DPoP 的 token 请求。 */
|
|
114
91
|
export declare function requestToken(body: Record<string, string>, keyPair: DpopKeyPair, fetcher?: typeof fetch): Promise<TokenResponse>;
|
|
115
92
|
/** 授权码换取(登录回调收到 code 后调用)。 */
|
package/lib/oauth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,uEAAuE;AACvE,eAAO,MAAM,SAAS,mBAAmB,CAAA;AACzC,yCAAyC;AACzC,eAAO,MAAM,aAAa,oBAAoB,CAAA;AAC9C,8CAA8C;AAC9C,eAAO,MAAM,kBAAkB,8DAA8D,CAAA;AAC7F,2BAA2B;AAC3B,eAAO,MAAM,gBAAgB,QAAS,CAAA;AACtC,mBAAmB;AACnB,eAAO,MAAM,wBAAwB,uBAAuB,CAAA;AAC5D,oBAAoB;AACpB,eAAO,MAAM,mBAAmB,kBAAkB,CAAA;AAElD,6BAA6B;AAC7B,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,iCAAiC;AACjC,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,IAAI,CAAA;IACT,GAAG,EAAE,OAAO,CAAA;IACZ,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,6CAA6C;AAC7C,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD,CAAC,EAAE,MAAM,CAAA;CACV;AAED,wBAAwB;AACxB,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,cAAc,CAAA;IAC7B,YAAY,EAAE,aAAa,CAAA;CAC5B;AAED,sCAAsC;AACtC,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE;QACZ,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;QAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,+DAA+D;AAC/D,wBAAgB,gBAAgB,IAAI,QAAQ,CAI3C;AAED,sCAAsC;AACtC,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,WAAW,CAAC,CAMhE;AAED,4DAA4D;AAC5D,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWjG;AAED,6CAA6C;AAC7C,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAI5B;AAED;;;;;;;;;GASG;AACH,iBAAS,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,SAAS,CAsB5E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE;IAChD,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,GAAG,MAAM,GAAG,SAAS,CAIrB;AAED,yCAAyC;AACzC,eAAO,MAAM,oBAAoB,oBAAc,CAAA;AAE/C
|
|
1
|
+
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,uEAAuE;AACvE,eAAO,MAAM,SAAS,mBAAmB,CAAA;AACzC,yCAAyC;AACzC,eAAO,MAAM,aAAa,oBAAoB,CAAA;AAC9C,8CAA8C;AAC9C,eAAO,MAAM,kBAAkB,8DAA8D,CAAA;AAC7F,2BAA2B;AAC3B,eAAO,MAAM,gBAAgB,QAAS,CAAA;AACtC,mBAAmB;AACnB,eAAO,MAAM,wBAAwB,uBAAuB,CAAA;AAC5D,oBAAoB;AACpB,eAAO,MAAM,mBAAmB,kBAAkB,CAAA;AAElD,6BAA6B;AAC7B,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,iCAAiC;AACjC,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,IAAI,CAAA;IACT,GAAG,EAAE,OAAO,CAAA;IACZ,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,6CAA6C;AAC7C,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD,CAAC,EAAE,MAAM,CAAA;CACV;AAED,wBAAwB;AACxB,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,cAAc,CAAA;IAC7B,YAAY,EAAE,aAAa,CAAA;CAC5B;AAED,sCAAsC;AACtC,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE;QACZ,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;QAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,+DAA+D;AAC/D,wBAAgB,gBAAgB,IAAI,QAAQ,CAI3C;AAED,sCAAsC;AACtC,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,WAAW,CAAC,CAMhE;AAED,4DAA4D;AAC5D,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWjG;AAED,6CAA6C;AAC7C,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAI5B;AAED;;;;;;;;;GASG;AACH,iBAAS,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,SAAS,CAsB5E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE;IAChD,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,GAAG,MAAM,GAAG,SAAS,CAIrB;AAED,yCAAyC;AACzC,eAAO,MAAM,oBAAoB,oBAAc,CAAA;AAE/C,2CAA2C;AAC3C,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,aAAa,CAAC,CAiExB;AAED,8BAA8B;AAC9B,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,EACpB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,aAAa,CAAC,CAQxB;AAED,oBAAoB;AACpB,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,WAAW,EACpB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,aAAa,CAAC,CAOxB;AAED,wCAAwC;AACxC,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,WAAW,GACnB,kBAAkB,CAWpB;AAED,sDAAsD;AACtD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,WAAW,CAKrE"}
|
package/lib/oauth.js
CHANGED
|
@@ -105,108 +105,23 @@ export function refreshTokenExpiresAt(credential) {
|
|
|
105
105
|
}
|
|
106
106
|
/** 导出给单测:直接解一个 JWT 的 `exp`/`iat`(毫秒)。 */
|
|
107
107
|
export const __readJwtTimeForTest = readJwtTime;
|
|
108
|
-
/**
|
|
109
|
-
* `requestToken` 的**网络层失败**(fetch 抛错:连接被拒/重置、DNS、超时、证书…)。
|
|
110
|
-
*
|
|
111
|
-
* ## 为什么必须是独立类型(真实报障 2026-11-04)
|
|
112
|
-
*
|
|
113
|
-
* ```
|
|
114
|
-
* 本轮运行失败 CodeArts token request network error: TypeError: fetch failed
|
|
115
|
-
* ```
|
|
116
|
-
*
|
|
117
|
-
* 这条错误杀了整轮运行且**宿主不重试**:dsh-llm 的 `normalizeLlmFailure` 把
|
|
118
|
-
* 非 LlmError 的普通 `Error` 归为 `UNKNOWN` 码,而 `UNKNOWN` 不在任何
|
|
119
|
-
* retryableCodes 里。模型请求路径(`llm-adapter.ts` 的 `stream()`)必须识别
|
|
120
|
-
* 本类型并转成 `LlmError(…, 'TRANSPORT')`,才能进宿主的慢速重试梯度。
|
|
121
|
-
*
|
|
122
|
-
* 同时保留 `cause`:undici 的 `TypeError: fetch failed` 把真实原因
|
|
123
|
-
* (`ECONNRESET` / `ETIMEDOUT` / `ENOTFOUND` / 证书错误…)藏在 `error.cause` 里,
|
|
124
|
-
* 丢掉它 = 不可诊断(报障原文连「连不上」还是「被重置」都分不出)。
|
|
125
|
-
*/
|
|
126
|
-
export class TokenRequestNetworkError extends Error {
|
|
127
|
-
constructor(message, options) {
|
|
128
|
-
super(message, options);
|
|
129
|
-
this.name = 'TokenRequestNetworkError';
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
/**
|
|
133
|
-
* 展开 error 的 cause 链(最多 3 层)成可读字符串。
|
|
134
|
-
*
|
|
135
|
-
* Node/undici 的惯例:外层是笼统的 `TypeError: fetch failed`,真正的原因
|
|
136
|
-
* (`Error: read ECONNRESET`、`Error: getaddrinfo ENOTFOUND sts.cn-north-4…`)
|
|
137
|
-
* 挂在 `cause` 上,嵌套还可能再深一层。`String(error)` 只打印最外层 ——
|
|
138
|
-
* 这正是报障原文只剩一句 `TypeError: fetch failed` 的原因。
|
|
139
|
-
*/
|
|
140
|
-
function describeNetworkError(error) {
|
|
141
|
-
const parts = [String(error)];
|
|
142
|
-
let cause = error?.cause;
|
|
143
|
-
for (let depth = 0; cause !== undefined && cause !== null && depth < 3; depth += 1) {
|
|
144
|
-
parts.push(String(cause));
|
|
145
|
-
cause = cause.cause;
|
|
146
|
-
}
|
|
147
|
-
return parts.join(' ← ');
|
|
148
|
-
}
|
|
149
|
-
/**
|
|
150
|
-
* token 请求网络层失败的**冷却重试延迟**(毫秒)。
|
|
151
|
-
*
|
|
152
|
-
* 默认 10 秒(对齐 llm-adapter 的 `DSH_CODEARTS_TRANSIENT_RETRY_DELAY_MS`
|
|
153
|
-
* 惯例:网络瞬断的恢复是秒级,立刻重发只会撞同一个抖动);`0` 关闭重试。
|
|
154
|
-
*/
|
|
155
|
-
function resolveTokenRetryDelayMs() {
|
|
156
|
-
const raw = Number(process.env.DSH_CODEARTS_TOKEN_RETRY_DELAY_MS);
|
|
157
|
-
return Number.isFinite(raw) && raw >= 0 ? raw : 10_000;
|
|
158
|
-
}
|
|
159
108
|
/** 向 STS token 端点发起一次带 DPoP 的 token 请求。 */
|
|
160
109
|
export async function requestToken(body, keyPair, fetcher = fetch) {
|
|
161
110
|
const dpop = await signDpopJws(keyPair, 'POST', STS_TOKEN_ENDPOINT);
|
|
162
|
-
const retryDelayMs = resolveTokenRetryDelayMs();
|
|
163
|
-
// 「循环要么带响应 break、要么 throw」的结构保证必然赋值。
|
|
164
111
|
let response;
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
*
|
|
179
|
-
* HTTP 响应(4xx/5xx)有自己的语义与终态判据(`STS5.1806`、`invalid_grant`),
|
|
180
|
-
* 在这里盲目重发会掩盖服务端真实结论;那些路径的处置维持原样。
|
|
181
|
-
*
|
|
182
|
-
* ## 模型请求路径的第二层兜底
|
|
183
|
-
*
|
|
184
|
-
* 这里重试耗尽后抛 {@link TokenRequestNetworkError},
|
|
185
|
-
* `llm-adapter.ts` 会把它转成 `LlmError(…, 'TRANSPORT')` —— 宿主按
|
|
186
|
-
* 慢速梯度(5/10/20/40/60s)重试整个模型请求,届时网络若已恢复则
|
|
187
|
-
* 续期自然成功。两层各司其职:这里管「秒级抖动自愈」,宿主管「本轮不弃」。
|
|
188
|
-
*/
|
|
189
|
-
for (let attempt = 0;; attempt += 1) {
|
|
190
|
-
try {
|
|
191
|
-
response = await fetcher(STS_TOKEN_ENDPOINT, {
|
|
192
|
-
method: 'POST',
|
|
193
|
-
headers: {
|
|
194
|
-
DPoP: dpop,
|
|
195
|
-
'Content-Type': 'application/x-www-form-urlencoded',
|
|
196
|
-
},
|
|
197
|
-
body: new URLSearchParams(body).toString(),
|
|
198
|
-
signal: AbortSignal.timeout(TOKEN_TIMEOUT_MS),
|
|
199
|
-
});
|
|
200
|
-
break;
|
|
201
|
-
}
|
|
202
|
-
catch (error) {
|
|
203
|
-
const described = `CodeArts token request network error: ${describeNetworkError(error)}`;
|
|
204
|
-
if (attempt >= 1 || retryDelayMs === 0) {
|
|
205
|
-
// `cause` 全链保留:诊断时能看到 undici 包裹下的真实 errno。
|
|
206
|
-
throw new TokenRequestNetworkError(described, { cause: error });
|
|
207
|
-
}
|
|
208
|
-
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
|
209
|
-
}
|
|
112
|
+
try {
|
|
113
|
+
response = await fetcher(STS_TOKEN_ENDPOINT, {
|
|
114
|
+
method: 'POST',
|
|
115
|
+
headers: {
|
|
116
|
+
DPoP: dpop,
|
|
117
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
118
|
+
},
|
|
119
|
+
body: new URLSearchParams(body).toString(),
|
|
120
|
+
signal: AbortSignal.timeout(TOKEN_TIMEOUT_MS),
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
catch (error) {
|
|
124
|
+
throw new Error(`CodeArts token request network error: ${String(error)}`);
|
|
210
125
|
}
|
|
211
126
|
let data = null;
|
|
212
127
|
try {
|
package/lib/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"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"}
|
package/lib/service.d.ts
CHANGED
|
@@ -222,29 +222,9 @@ export declare class CodeArtsAuth extends Service {
|
|
|
222
222
|
* (`CODEARTS_ACCOUNT_XXX`)。早期签名不接收 `pool` 并直接读固定 ref,
|
|
223
223
|
* 移除单凭据后那样会恒返回空列表。
|
|
224
224
|
*
|
|
225
|
-
*
|
|
226
|
-
*
|
|
227
|
-
*
|
|
228
|
-
* 挑账号;而 SecurityToken 可能被服务端**提前吊销**、或本地时钟与签发端有偏差
|
|
229
|
-
* —— 池内未过期但服务端已死 ⇒ 三条目录腿(gateway / builtin / AgentCenter)
|
|
230
|
-
* 全用这份死凭据 ⇒ 复发「AgentCenter 动态窗口不可用」告警(目录本身从
|
|
231
|
-
* SWR/磁盘旧缓存端出去,看起来不受影响)。同仓对同一形态已有既定策略:
|
|
232
|
-
* 推理路径 `isAuthError` 刷一次重发、领取路径 `claimCodeArtsWithAuthRetry`
|
|
233
|
-
* 续期重领一次 —— 本方法补齐目录这第三条路。
|
|
234
|
-
*
|
|
235
|
-
* ⚠️ **为什么是「换账号」而不是「续期重试」**:`refreshAccountCredential`
|
|
236
|
-
* 内部有 lead-time 守卫(距过期不足 1 小时才真发续期请求),对「池内未过期、
|
|
237
|
-
* 服务端已死」的凭据是**空操作**;而在目录轮里强行续期会把网络抖动也当鉴权
|
|
238
|
-
* 失败、白白烧 refresh_token(旧凭据被签发后即刻失效,风险不成比例)。目录是
|
|
239
|
-
* **账号无关**的(同一华为云账号体系下发同一份目录),换下一份凭据重试一轮
|
|
240
|
-
* 即可全链路恢复(上午报障同款结论)。
|
|
241
|
-
*
|
|
242
|
-
* ⚠️ **最多两轮**(优选一轮 + 退化时轮换一轮):与领取路径「只试一次、无
|
|
243
|
-
* 无限循环」同款边界;账号池再多也不会把一次目录刷新放大成 N 轮请求。
|
|
244
|
-
*
|
|
245
|
-
* ⚠️ **判据是「本轮健康度」**:目录非空 **且** AgentCenter 窗口腿取到
|
|
246
|
-
* (`lastCatalogOutcome.agentCenterOk`,未注入 out-param 的直调场景窗口腿
|
|
247
|
-
* 按「未知」处理 —— 行为与改动前一致:拿到非空目录就收工)。
|
|
225
|
+
* 为什么用「可用账号」而不是遍历全部账号:模型目录是**账号无关**的(同一个
|
|
226
|
+
* 华为云账号体系下发同一份目录),取第一个能解析出 AK/SK 的账号即可,
|
|
227
|
+
* 无需为每个账号各拉一次。
|
|
248
228
|
*/
|
|
249
229
|
/**
|
|
250
230
|
* ⚠️ 返回**完整 `RemoteModel`**(含 `rateLabel`),不是只有 `{id, name}`。
|
|
@@ -265,32 +245,12 @@ export declare class CodeArtsAuth extends Service {
|
|
|
265
245
|
*/
|
|
266
246
|
lastCatalogOutcome: RemoteCatalogOutcome | undefined;
|
|
267
247
|
/**
|
|
268
|
-
*
|
|
269
|
-
* (组内保持池序;2026-11-02 上午修的优选语义原样保留)。
|
|
248
|
+
* 取账号池里第一个**凭据可解析且含 AK/SK** 的账号凭据。
|
|
270
249
|
*
|
|
271
|
-
* 按 `readAccounts()` 的既有顺序(用户的 Jet Hub
|
|
250
|
+
* 按 `readAccounts()` 的既有顺序(用户的 Jet Hub 拖拽顺序)遍历,短路返回。
|
|
272
251
|
* `getAvailableAccount` 不适合这里:它会按 `enabled` 与限流状态过滤,而
|
|
273
252
|
* 「拉模型目录」既不需要账号处于启用状态、也与限流无关。
|
|
274
|
-
*
|
|
275
|
-
* ## 为什么必须按过期新鲜度优选(真实报障:2026-11-02 09:55)
|
|
276
|
-
*
|
|
277
|
-
* 原实现「第一个 AK/SK 齐全就返回」:池序靠前的账号一旦 STS 过期,整个
|
|
278
|
-
* 目录链路(builtin / gateway-config / AgentCenter 两步)就全用这份死
|
|
279
|
-
* 凭据 ⇒ `fetchAgentCenterWindows` 恒空 ⇒ 报「AgentCenter 动态窗口不可用,
|
|
280
|
-
* 窗口分母将退化到静态兜底表」—— 即便排在后面的账号活得很好(同轮报障里
|
|
281
|
-
* 另一号领取成功可证)。目录是**账号无关**的,换一份活凭据即可全链路恢复。
|
|
282
|
-
*
|
|
283
|
-
* ⚠️ **全部过期时保持原行为**(优选列表仍含第一个 AK/SK 齐全的):不让
|
|
284
|
-
* 「更挑」变成「更没有」。本方法不负责续期(那是 refreshAll / 积分入口按需
|
|
285
|
-
* 自愈的职责,见 `jet-hub-rpc.ts` 的 `healExpiredAccounts`)。`expires_at`
|
|
286
|
-
* 解析失败(缺失/非法)按「不新鲜」处理:只影响排序、不阻断兜底路径。
|
|
287
|
-
*
|
|
288
|
-
* ## 为什么从「取第一个」改成「返回有序列表」(2026-11-02 15:41 二次报障)
|
|
289
|
-
*
|
|
290
|
-
* 优选只看**本地元数据**;SecurityToken 被服务端提前吊销 / 时钟偏差时,
|
|
291
|
-
* 「未过期」的那份照样是死的,而排在后面的账号可能活得很好。调用方
|
|
292
|
-
* ({@link refreshModels})需要拿到**后备名单**才能在优选轮退化时轮换重试。
|
|
293
253
|
*/
|
|
294
|
-
private
|
|
254
|
+
private firstUsableCredential;
|
|
295
255
|
}
|
|
296
256
|
//# sourceMappingURL=service.d.ts.map
|
package/lib/service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAShF,OAAO,KAAK,EAAsB,gBAAgB,EAAyC,MAAM,YAAY,CAAA;AAC7G,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAoD/C,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,WAAW,EACjB,MAAM,aAAa,CAAA;AAEpB;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/lib/service.js
CHANGED
|
@@ -53,15 +53,6 @@ import { fetchCodeArtsRemoteModels, saveModelsCache, setMemoryCache, } from './m
|
|
|
53
53
|
* 凭据一律存放在账号池条目对应的 `CODEARTS_ACCOUNT_XXX` 下。
|
|
54
54
|
*/
|
|
55
55
|
export const CODEARTS_CREDENTIAL_REF = 'CODEARTS_ACCESS_TOKEN';
|
|
56
|
-
/**
|
|
57
|
-
* 一次目录刷新最多尝试几份凭据(2026-11-02 15:41 二次报障后引入)。
|
|
58
|
-
*
|
|
59
|
-
* 优选一轮 + 退化时轮换一轮。与领取路径 `claimCodeArtsWithAuthRetry` 的
|
|
60
|
-
* 「只试一次、无无限循环」同款边界:账号池再大也不会把一次后台目录刷新
|
|
61
|
-
* 放大成 N 轮请求(每轮 = gateway + builtin + AgentCenter 两步,最坏 4 个
|
|
62
|
-
* 请求 × 2 轮)。
|
|
63
|
-
*/
|
|
64
|
-
const CATALOG_ROTATION_MAX_ROUNDS = 2;
|
|
65
56
|
/** 从存储值解析凭据 JSON;解析失败返回 undefined。 */
|
|
66
57
|
function parseCredential(value) {
|
|
67
58
|
try {
|
|
@@ -516,29 +507,9 @@ export class CodeArtsAuth extends Service {
|
|
|
516
507
|
* (`CODEARTS_ACCOUNT_XXX`)。早期签名不接收 `pool` 并直接读固定 ref,
|
|
517
508
|
* 移除单凭据后那样会恒返回空列表。
|
|
518
509
|
*
|
|
519
|
-
*
|
|
520
|
-
*
|
|
521
|
-
*
|
|
522
|
-
* 挑账号;而 SecurityToken 可能被服务端**提前吊销**、或本地时钟与签发端有偏差
|
|
523
|
-
* —— 池内未过期但服务端已死 ⇒ 三条目录腿(gateway / builtin / AgentCenter)
|
|
524
|
-
* 全用这份死凭据 ⇒ 复发「AgentCenter 动态窗口不可用」告警(目录本身从
|
|
525
|
-
* SWR/磁盘旧缓存端出去,看起来不受影响)。同仓对同一形态已有既定策略:
|
|
526
|
-
* 推理路径 `isAuthError` 刷一次重发、领取路径 `claimCodeArtsWithAuthRetry`
|
|
527
|
-
* 续期重领一次 —— 本方法补齐目录这第三条路。
|
|
528
|
-
*
|
|
529
|
-
* ⚠️ **为什么是「换账号」而不是「续期重试」**:`refreshAccountCredential`
|
|
530
|
-
* 内部有 lead-time 守卫(距过期不足 1 小时才真发续期请求),对「池内未过期、
|
|
531
|
-
* 服务端已死」的凭据是**空操作**;而在目录轮里强行续期会把网络抖动也当鉴权
|
|
532
|
-
* 失败、白白烧 refresh_token(旧凭据被签发后即刻失效,风险不成比例)。目录是
|
|
533
|
-
* **账号无关**的(同一华为云账号体系下发同一份目录),换下一份凭据重试一轮
|
|
534
|
-
* 即可全链路恢复(上午报障同款结论)。
|
|
535
|
-
*
|
|
536
|
-
* ⚠️ **最多两轮**(优选一轮 + 退化时轮换一轮):与领取路径「只试一次、无
|
|
537
|
-
* 无限循环」同款边界;账号池再多也不会把一次目录刷新放大成 N 轮请求。
|
|
538
|
-
*
|
|
539
|
-
* ⚠️ **判据是「本轮健康度」**:目录非空 **且** AgentCenter 窗口腿取到
|
|
540
|
-
* (`lastCatalogOutcome.agentCenterOk`,未注入 out-param 的直调场景窗口腿
|
|
541
|
-
* 按「未知」处理 —— 行为与改动前一致:拿到非空目录就收工)。
|
|
510
|
+
* 为什么用「可用账号」而不是遍历全部账号:模型目录是**账号无关**的(同一个
|
|
511
|
+
* 华为云账号体系下发同一份目录),取第一个能解析出 AK/SK 的账号即可,
|
|
512
|
+
* 无需为每个账号各拉一次。
|
|
542
513
|
*/
|
|
543
514
|
/**
|
|
544
515
|
* ⚠️ 返回**完整 `RemoteModel`**(含 `rateLabel`),不是只有 `{id, name}`。
|
|
@@ -551,8 +522,8 @@ export class CodeArtsAuth extends Service {
|
|
|
551
522
|
async refreshModels(pool) {
|
|
552
523
|
if (!this.active)
|
|
553
524
|
return [];
|
|
554
|
-
const
|
|
555
|
-
if (
|
|
525
|
+
const credential = await this.firstUsableCredential(pool);
|
|
526
|
+
if (credential === undefined) {
|
|
556
527
|
// 无凭据 ⇒ 两个来源都没取到 ⇒ 不能判成「完整」(否则残缺目录永久固化)。
|
|
557
528
|
if (this.lastCatalogOutcome !== undefined) {
|
|
558
529
|
this.lastCatalogOutcome.gatewayOk = false;
|
|
@@ -560,42 +531,12 @@ export class CodeArtsAuth extends Service {
|
|
|
560
531
|
}
|
|
561
532
|
return [];
|
|
562
533
|
}
|
|
563
|
-
const
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
// 后备轮次的分数**高过**前面才算数:等分保留先到的(稳定的优选语义)。
|
|
568
|
-
let best = [];
|
|
569
|
-
let bestRank = -1;
|
|
570
|
-
let bestFlags;
|
|
571
|
-
const rounds = Math.min(CATALOG_ROTATION_MAX_ROUNDS, candidates.length);
|
|
572
|
-
for (let i = 0; i < rounds; i++) {
|
|
573
|
-
const models = await fetchCodeArtsRemoteModels(candidates[i], this.fetchImpl, outcome);
|
|
574
|
-
// out-param 被**原地覆写**:先快照本轮成败,循环结束后用「选中那轮」回填,
|
|
575
|
-
// 保证适配器读到的完整性与返回值同源。
|
|
576
|
-
const flags = outcome === undefined
|
|
577
|
-
? undefined
|
|
578
|
-
: { gatewayOk: outcome.gatewayOk, builtinOk: outcome.builtinOk, agentCenterOk: outcome.agentCenterOk };
|
|
579
|
-
const rank = (models.length > 0 ? 1 : 0) + (outcome?.agentCenterOk === true ? 2 : 0);
|
|
580
|
-
if (rank > bestRank) {
|
|
581
|
-
bestRank = rank;
|
|
582
|
-
best = models;
|
|
583
|
-
bestFlags = flags;
|
|
584
|
-
}
|
|
585
|
-
// 本轮健康(目录非空、窗口腿没报退化)⇒ 不再轮换。
|
|
586
|
-
if (models.length > 0 && outcome?.agentCenterOk !== false)
|
|
587
|
-
break;
|
|
588
|
-
}
|
|
589
|
-
if (outcome !== undefined && bestFlags !== undefined) {
|
|
590
|
-
outcome.gatewayOk = bestFlags.gatewayOk;
|
|
591
|
-
outcome.builtinOk = bestFlags.builtinOk;
|
|
592
|
-
outcome.agentCenterOk = bestFlags.agentCenterOk;
|
|
534
|
+
const models = await fetchCodeArtsRemoteModels(credential, this.fetchImpl, this.lastCatalogOutcome);
|
|
535
|
+
if (models.length > 0) {
|
|
536
|
+
setMemoryCache(models);
|
|
537
|
+
saveModelsCache(models);
|
|
593
538
|
}
|
|
594
|
-
|
|
595
|
-
setMemoryCache(best);
|
|
596
|
-
saveModelsCache(best);
|
|
597
|
-
}
|
|
598
|
-
return best;
|
|
539
|
+
return models;
|
|
599
540
|
}
|
|
600
541
|
/**
|
|
601
542
|
* 最近一次 {@link refreshModels} 的各来源成败(issue IKJVTF,审计 I3)。
|
|
@@ -607,51 +548,22 @@ export class CodeArtsAuth extends Service {
|
|
|
607
548
|
*/
|
|
608
549
|
lastCatalogOutcome;
|
|
609
550
|
/**
|
|
610
|
-
*
|
|
611
|
-
* (组内保持池序;2026-11-02 上午修的优选语义原样保留)。
|
|
551
|
+
* 取账号池里第一个**凭据可解析且含 AK/SK** 的账号凭据。
|
|
612
552
|
*
|
|
613
|
-
* 按 `readAccounts()` 的既有顺序(用户的 Jet Hub
|
|
553
|
+
* 按 `readAccounts()` 的既有顺序(用户的 Jet Hub 拖拽顺序)遍历,短路返回。
|
|
614
554
|
* `getAvailableAccount` 不适合这里:它会按 `enabled` 与限流状态过滤,而
|
|
615
555
|
* 「拉模型目录」既不需要账号处于启用状态、也与限流无关。
|
|
616
|
-
*
|
|
617
|
-
* ## 为什么必须按过期新鲜度优选(真实报障:2026-11-02 09:55)
|
|
618
|
-
*
|
|
619
|
-
* 原实现「第一个 AK/SK 齐全就返回」:池序靠前的账号一旦 STS 过期,整个
|
|
620
|
-
* 目录链路(builtin / gateway-config / AgentCenter 两步)就全用这份死
|
|
621
|
-
* 凭据 ⇒ `fetchAgentCenterWindows` 恒空 ⇒ 报「AgentCenter 动态窗口不可用,
|
|
622
|
-
* 窗口分母将退化到静态兜底表」—— 即便排在后面的账号活得很好(同轮报障里
|
|
623
|
-
* 另一号领取成功可证)。目录是**账号无关**的,换一份活凭据即可全链路恢复。
|
|
624
|
-
*
|
|
625
|
-
* ⚠️ **全部过期时保持原行为**(优选列表仍含第一个 AK/SK 齐全的):不让
|
|
626
|
-
* 「更挑」变成「更没有」。本方法不负责续期(那是 refreshAll / 积分入口按需
|
|
627
|
-
* 自愈的职责,见 `jet-hub-rpc.ts` 的 `healExpiredAccounts`)。`expires_at`
|
|
628
|
-
* 解析失败(缺失/非法)按「不新鲜」处理:只影响排序、不阻断兜底路径。
|
|
629
|
-
*
|
|
630
|
-
* ## 为什么从「取第一个」改成「返回有序列表」(2026-11-02 15:41 二次报障)
|
|
631
|
-
*
|
|
632
|
-
* 优选只看**本地元数据**;SecurityToken 被服务端提前吊销 / 时钟偏差时,
|
|
633
|
-
* 「未过期」的那份照样是死的,而排在后面的账号可能活得很好。调用方
|
|
634
|
-
* ({@link refreshModels})需要拿到**后备名单**才能在优选轮退化时轮换重试。
|
|
635
556
|
*/
|
|
636
|
-
async
|
|
637
|
-
const fresh = [];
|
|
638
|
-
const stale = [];
|
|
557
|
+
async firstUsableCredential(pool) {
|
|
639
558
|
for (const entry of pool.listAccountsByProvider('codearts')) {
|
|
640
559
|
const resolved = await this.ctx.credentials.resolve(credentialRef(entry.credentialRef));
|
|
641
560
|
if (!resolved)
|
|
642
561
|
continue;
|
|
643
562
|
const credential = parseCredential(resolved.value);
|
|
644
|
-
if (
|
|
645
|
-
|
|
646
|
-
// 与 `CODEARTS_EXPIRY_ACCESSORS.expiresAtOf` / llm-adapter 入口预判同口径:
|
|
647
|
-
// `Date.parse(expires_at)`,解析不出按「不新鲜」处理(见方法头注释)。
|
|
648
|
-
const expiresAt = credential.expires_at ? Date.parse(credential.expires_at) : Number.NaN;
|
|
649
|
-
if (Number.isFinite(expiresAt) && expiresAt > Date.now())
|
|
650
|
-
fresh.push(credential);
|
|
651
|
-
else
|
|
652
|
-
stale.push(credential);
|
|
563
|
+
if (credential?.access_key_id && credential.secret_access_key)
|
|
564
|
+
return credential;
|
|
653
565
|
}
|
|
654
|
-
return
|
|
566
|
+
return undefined;
|
|
655
567
|
}
|
|
656
568
|
}
|
|
657
569
|
//# sourceMappingURL=service.js.map
|
package/lib/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAgB,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAsB,MAAM,8BAA8B,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAyB,MAAM,YAAY,CAAA;AAC9F,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,YAAY,CAAA;AAGnB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EACjC,iBAAiB,GAElB,MAAM,kBAAkB,CAAA;AAEzB;;;;;;;;;;GAUG;AACH,SAAS,qBAAqB,CAAC,UAA8B;IAC3D,OAAO,OAAO,CACZ,UAAU,CAAC,aAAa;WACrB,UAAU,CAAC,aAAa;WACxB,UAAU,CAAC,oBAAoB,CACnC,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,yBAAyB,GAAwC;IACrE,WAAW,EAAE,CAAC,UAAU,EAAE,EAAE;QAC1B,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;QACrF,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;IACrD,CAAC;IACD,aAAa,EAAE,qBAAqB;IACpC,sDAAsD;IACtD,sDAAsD;IACtD,4CAA4C;IAC5C,0DAA0D;IAC1D,mDAAmD;IACnD,qCAAqC;IACrC,0BAA0B;IAC1B,kBAAkB,EAAE,qBAAqB;IACzC,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,IAAI,EAAE;CAC3D,CAAA;AACD,OAAO,EACL,yBAAyB,EACzB,eAAe,EACf,cAAc,GAGf,MAAM,aAAa,CAAA;AAEpB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,uBAAuB,CAAA;AAE9D;;;;;;;GAOG;AACH,MAAM,2BAA2B,GAAG,CAAC,CAAA;AAsBrC,sCAAsC;AACtC,SAAS,eAAe,CAAC,KAAa;IACpC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAuB,CAAA;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,OAAO,YAAa,SAAQ,OAAO;IACvC,kDAAkD;IAC1C,MAAM,GAAG,IAAI,CAAA;IACrB,kCAAkC;IAC1B,SAAS,GAAiB,KAAK,CAAA;IACvC;;;;;;;;;;;;;;;;OAgBG;IACc,aAAa,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC/D;;;;;OAKG;IACc,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAA;IAE3D,YAAY,GAAY,EAAE,UAAsC,EAAE;QAChE,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;QAC1B,IAAI,OAAO,CAAC,OAAO;YAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAA;IACvD,CAAC;IAED,2BAA2B;IACnB,QAAQ,CAAC,OAAe;QAC9B,IAAI,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC3C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,KAAK,GAAG,IAAI,WAAW,EAAE,CAAA;YACzB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,4CAA4C;IACpC,KAAK,CAAC,cAAc,CAAC,OAAe;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;QAC3E,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAA;QAC/B,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACxC,CAAC;IAED;;;;;OAKG;IACK,cAAc,CAAC,CAAqB,EAAE,CAAqB;QACjE,OAAO,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,aAAa;eACrC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU;eAC7B,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,aAAa,CAAA;IAC1C,CAAC;IAED,sDAAsD;IACtD,KAAK,CAAC,KAAK,CAAC,UAAsH,EAAE;QAClI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,MAAM,IAAI,GAAoB,OAAO,CAAC,IAAI,KAAK,QAAQ;YACrD,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC;YAC7B,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,UAAU,CACd,UAA2F,EAAE;QAE7F,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,MAAM,OAAO,GAAqB,MAAM,cAAc,CAAC,OAAO,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;QAC9E,2CAA2C;QAC3C,oCAAoC;QACpC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QACtB,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAA;IACrE,CAAC;IAED;;;;;;;;;;OAUG;IACK,KAAK,CAAC,YAAY,CACxB,IAAqB,EACrB,UAAwE,EAAE;QAE1E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,uBAAuB,CAAA;QAC1D,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;QAClC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAChD,sBAAsB;QACtB,EAAE;QACF,0DAA0D;QAC1D,mDAAmD;QACnD,4BAA4B;QAC5B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QACvD,CAAC;QACD,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/C,8BAA8B;QAC9B,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACtC,MAAM,SAAS,GAAG,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACxF,MAAM,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC5B,EAAE,EAAE,OAAO,CAAC,SAAS;gBACrB,QAAQ,EAAE,UAAU;gBACpB,QAAQ,EAAE,OAAO,CAAC,SAAS;gBAC3B,OAAO,EAAE,IAAI;gBACb,aAAa,EAAE,OAAO;gBACtB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBAC1D,WAAW,EAAE,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC;aAChD,CAAC,CAAA;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG;YACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,WAAW,EAAE,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC;SAChD,CAAA;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,KAAK,CAAC,wBAAwB,CAC5B,OAAe,EACf,IAAkB,EAClB,SAAkB;QAElB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1C,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;YAClC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;YACrD,IAAI,UAAU,KAAK,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;YACtD,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;YAChF,+BAA+B;YAC/B,wBAAwB;YACxB,mDAAmD;YACnD,4CAA4C;YAC5C,IAAI,CAAC,iCAAiC,CAAC;gBACrC,WAAW,EAAE,yBAAyB,CAAC,WAAW,CAAC,UAAU,CAAC;gBAC9D,kBAAkB,EAAE,qBAAqB,CAAC,UAAU,CAAC;aACtD,CAAC,EAAE,CAAC;gBACH,MAAM,iBAAiB,CAAC;oBACtB,IAAI;oBACJ,QAAQ,EAAE,UAAU;oBACpB,UAAU;oBACV,SAAS,EAAE,yBAAyB;oBACpC,SAAS;oBACT,GAAG,EAAE,YAAY;oBACjB,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC;iBACpD,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;YAC1D,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;YAC9D,MAAM,iBAAiB,CAAC;gBACtB,IAAI;gBACJ,QAAQ,EAAE,UAAU;gBACpB,UAAU,EAAE,SAAS;gBACrB,SAAS,EAAE,yBAAyB;gBACpC,SAAS;gBACT,GAAG,EAAE,YAAY;gBACjB,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC;aACpD,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;;;;;;;;OAUG;IACK,KAAK,CAAC,0BAA0B,CACtC,OAAe,EACf,UAA8B;QAE9B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YACjD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,UAAU,CAAA;YACjE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC;mBACvC,CAAC,iCAAiC,CAAC;oBACpC,WAAW,EAAE,yBAAyB,CAAC,WAAW,CAAC,MAAM,CAAC;oBAC1D,kBAAkB,EAAE,qBAAqB,CAAC,MAAM,CAAC;iBAClD,CAAC,EAAE,CAAC;gBACL,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,oDAAoD,CACrD,CAAA;gBACD,OAAO,MAAM,CAAA;YACf,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,iBAAiB,CAAC,UAA8B;QAC5D,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAA;QAC7C,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAA;QAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,CAAA;QAC/C,2CAA2C;QAC3C,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAC1C,CAAC;QACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAA;QAC7C,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAC7F,MAAM,SAAS,GAAG,2BAA2B,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;QAClG,0CAA0C;QAC1C,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;QAC1C,SAAS,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAA;QACtC,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;QAC1C,IAAI,UAAU,CAAC,iBAAiB;YAAE,SAAS,CAAC,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,CAAA;QAC5F,OAAO,SAAS,CAAA;IAClB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,KAAK,CAAC,UAAU,CAAC,IAAiB;QAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;QACpD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YAC9C,IAAI,UAA0C,CAAA;YAC9C,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,yCAAyC;oBACzC,IAAI,KAAK,CAAC,WAAW;wBAAE,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;oBACjF,SAAQ;gBACV,CAAC;gBACD,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC5C,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;oBACnE,IAAI,KAAK,CAAC,WAAW;wBAAE,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;oBACjF,SAAQ;gBACV,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;oBACvB,uCAAuC;oBACvC,8DAA8D;oBAC9D,oDAAoD;oBACpD,yBAAyB;oBACzB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,iBAAiB,KAAK,CAAC,EAAE,iCAAiC,CAC3D,CAAA;gBACH,CAAC;gBACD,MAAM,2BAA2B,CAAC;oBAChC,IAAI;oBACJ,QAAQ,EAAE,UAAU;oBACpB,GAAG,EAAE,YAAY;oBACjB,SAAS,EAAE,KAAK,CAAC,EAAE;oBACnB,UAAU;oBACV,SAAS,EAAE,yBAAyB;oBACpC,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC;oBACvE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC7D,iBAAiB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,wBAAwB,CAAC,OAAO,CAAC;oBACrE,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC;oBACnD,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC;iBACpD,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,wBAAwB,EAAE,CAAC;oBAC9C,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACrE,oDAAoD;oBACpD,uCAAuC;oBACvC,sCAAsC;oBACtC,sCAAsC;oBACtC,0BAA0B;oBAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;oBACpF,IAAI,MAAM,KAAK,SAAS;2BACnB,qBAAqB,CAAC,MAAM,CAAC;2BAC7B,UAAU,KAAK,SAAS;2BACxB,MAAM,CAAC,aAAa,KAAK,UAAU,CAAC,aAAa,EAAE,CAAC;wBACvD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,iBAAiB,KAAK,CAAC,EAAE,uBAAuB;8BAC9C,kBAAkB,CACrB,CAAA;wBACD,MAAM,iBAAiB,CAAC;4BACtB,IAAI;4BACJ,QAAQ,EAAE,UAAU;4BACpB,UAAU,EAAE,MAAM;4BAClB,SAAS,EAAE,yBAAyB;4BACpC,SAAS,EAAE,KAAK,CAAC,EAAE;4BACnB,OAAO,EAAE,KAAK;4BACd,GAAG,EAAE,YAAY;4BACjB,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC;yBACpD,CAAC,CAAA;wBACF,SAAQ;oBACV,CAAC;oBACD,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;wBACtB,IAAI,CAAC;4BACH,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;wBAC5D,CAAC;wBAAC,MAAM,CAAC;4BACP,yBAAyB;wBAC3B,CAAC;oBACH,CAAC;oBACD,oCAAoC;oBACpC,4BAA4B;oBAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;oBACzD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;wBACpB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;wBACpD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,iBAAiB,KAAK,CAAC,EAAE,sCAAsC;8BAC7D,UAAU,MAAM,EAAE,CACrB,CAAA;oBACH,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,8CAA8C;oBAC9C,4BAA4B;oBAC5B,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACrE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,iBAAiB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAC3C,CAAA;oBACD,+CAA+C;oBAC/C,EAAE;oBACF,+CAA+C;oBAC/C,kDAAkD;oBAClD,gCAAgC;oBAChC,EAAE;oBACF,mDAAmD;oBACnD,4DAA4D;oBAC5D,qCAAqC;oBACrC,qCAAqC;oBACrC,EAAE;oBACF,oDAAoD;oBACpD,mCAAmC;oBACnC,gCAAgC;oBAChC,EAAE;oBACF,uCAAuC;oBACvC,yCAAyC;oBACzC,4BAA4B;oBAC5B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;wBAC7B,MAAM,KAAK,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAA;wBAC/C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;4BAC/C,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gCACpE,0BAA0B;4BAC5B,CAAC,CAAC,CAAA;4BACF,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,aAAa,UAAU,CAAC,CAAA;4BACxE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gCACtB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,aAAa,UAAU,EAAE,MAAM,CAAC,CAAA;gCACjE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,iBAAiB,KAAK,CAAC,EAAE,mCAAmC;sCAC1D,gDAAgD;sCAChD,QAAQ,MAAM,EAAE,CACnB,CAAA;4BACH,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,aAAa;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,IAAI;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;IACrB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACH;;;;;;;OAOG;IACH,KAAK,CAAC,aAAa,CAAC,IAAiB;QACnC,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAA;QAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACrD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,yCAAyC;YACzC,IAAI,IAAI,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;gBAC1C,IAAI,CAAC,kBAAkB,CAAC,SAAS,GAAG,KAAK,CAAA;gBACzC,IAAI,CAAC,kBAAkB,CAAC,SAAS,GAAG,KAAK,CAAA;YAC3C,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAA;QACvC,+CAA+C;QAC/C,8CAA8C;QAC9C,+BAA+B;QAC/B,uCAAuC;QACvC,IAAI,IAAI,GAAkB,EAAE,CAAA;QAC5B,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAA;QACjB,IAAI,SAA2C,CAAA;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;QACvE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACtF,8CAA8C;YAC9C,qBAAqB;YACrB,MAAM,KAAK,GAAqC,OAAO,KAAK,SAAS;gBACnE,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAA;YACxG,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACpF,IAAI,IAAI,GAAG,QAAQ,EAAE,CAAC;gBACpB,QAAQ,GAAG,IAAI,CAAA;gBACf,IAAI,GAAG,MAAM,CAAA;gBACb,SAAS,GAAG,KAAK,CAAA;YACnB,CAAC;YACD,4BAA4B;YAC5B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,EAAE,aAAa,KAAK,KAAK;gBAAE,MAAK;QAClE,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YACrD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAA;YACvC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAA;YACvC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,aAAa,CAAA;QACjD,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,cAAc,CAAC,IAAI,CAAC,CAAA;YACpB,eAAe,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;OAOG;IACH,kBAAkB,CAAkC;IAEpD;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACK,KAAK,CAAC,iBAAiB,CAAC,IAAiB;QAC/C,MAAM,KAAK,GAAyB,EAAE,CAAA;QACtC,MAAM,KAAK,GAAyB,EAAE,CAAA;QACtC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,CAAC;YAC5D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAA;YACvF,IAAI,CAAC,QAAQ;gBAAE,SAAQ;YACvB,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YAClD,IAAI,CAAC,UAAU,EAAE,aAAa,IAAI,CAAC,UAAU,CAAC,iBAAiB;gBAAE,SAAQ;YACzE,mEAAmE;YACnE,iDAAiD;YACjD,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;YACxF,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;;gBAC3E,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7B,CAAC;QACD,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,CAAA;IAC7B,CAAC;CAEF"}
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -2228,8 +2228,11 @@ export interface WebdavSyncAccount {
|
|
|
2228
2228
|
remotePath: string;
|
|
2229
2229
|
/** 同步口令(快照加密用;**多台设备必须一致**才能互相解密)。 */
|
|
2230
2230
|
passphrase: string;
|
|
2231
|
-
/**
|
|
2232
|
-
|
|
2231
|
+
/**
|
|
2232
|
+
* 是否启用账号同步。关闭时保留其余配置,但停止自动及手动同步请求。
|
|
2233
|
+
* 旧配置缺少此字段时由清洗层补为 `true`,保持升级前的行为。
|
|
2234
|
+
*/
|
|
2235
|
+
enabled: boolean;
|
|
2233
2236
|
}
|
|
2234
2237
|
/** RPC: 读取已保存的 WebDAV 同步账号。 */
|
|
2235
2238
|
export interface RpcWebdavSyncConfigGetResponse {
|
|
@@ -2266,7 +2269,7 @@ export interface RpcWebdavSyncTestResponse {
|
|
|
2266
2269
|
/** RPC: 上传加密快照。请求体里的快照信封(浏览器侧已加密)。 */
|
|
2267
2270
|
export interface RpcWebdavSyncPushRequest {
|
|
2268
2271
|
/**
|
|
2269
|
-
* 同步信封:`{ format, version, savedAt,
|
|
2272
|
+
* 同步信封:`{ format, version, savedAt, accountCount, container }`,
|
|
2270
2273
|
* `container` 是 `backup-crypto` 的加密容器。本端点只做**传输**,不解析
|
|
2271
2274
|
* 也不解密内容 —— 字面量校验只认 `format` 字符串(防误推脏数据)。
|
|
2272
2275
|
*/
|
|
@@ -2298,7 +2301,9 @@ export interface RpcWebdavSyncPullResponse {
|
|
|
2298
2301
|
/** RPC: 自动双向同步的常驻状态(不包含密码、口令或凭据)。 */
|
|
2299
2302
|
export interface RpcWebdavSyncStatusResponse {
|
|
2300
2303
|
configured: boolean;
|
|
2301
|
-
|
|
2304
|
+
/** 已配置但关闭同步时为 `false`;未配置时也为 `false`。 */
|
|
2305
|
+
enabled: boolean;
|
|
2306
|
+
state: 'unconfigured' | 'disabled' | 'idle' | 'syncing' | 'error';
|
|
2302
2307
|
running: boolean;
|
|
2303
2308
|
lastError?: string;
|
|
2304
2309
|
/** 最近一次实际发生上传/下载/合并的时间;空闲探测不改变它。 */
|