@xixka/dsh-hub 0.2.1-rc.9 → 0.2.2
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 +60 -889
- package/lib/accio-adapter.d.ts.map +1 -1
- package/lib/accio-adapter.js +3 -1
- package/lib/accio-adapter.js.map +1 -1
- package/lib/account-pool.d.ts +128 -0
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +252 -15
- package/lib/account-pool.js.map +1 -1
- package/lib/aggregate-adapter.d.ts +38 -0
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +145 -12
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-expiry.d.ts.map +1 -1
- package/lib/aggregate-expiry.js +4 -0
- package/lib/aggregate-expiry.js.map +1 -1
- package/lib/analyze-image.d.ts.map +1 -1
- package/lib/analyze-image.js.map +1 -1
- package/lib/astudio-adapter.d.ts.map +1 -1
- package/lib/astudio-adapter.js +3 -1
- package/lib/astudio-adapter.js.map +1 -1
- package/lib/buddy-adapter.d.ts.map +1 -1
- package/lib/buddy-adapter.js +22 -4
- package/lib/buddy-adapter.js.map +1 -1
- package/lib/buddy.d.ts +7 -2
- package/lib/buddy.d.ts.map +1 -1
- package/lib/buddy.js +7 -2
- package/lib/buddy.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +20 -0
- package/lib/canonical-models.js.map +1 -1
- package/lib/chromium-session.d.ts +174 -0
- package/lib/chromium-session.d.ts.map +1 -1
- package/lib/chromium-session.js +418 -1
- package/lib/chromium-session.js.map +1 -1
- package/lib/client/jet-hub.js +287 -13918
- package/lib/codearts-credits.d.ts +123 -13
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +168 -25
- package/lib/codearts-credits.js.map +1 -1
- package/lib/codearts-vision.d.ts +95 -4
- package/lib/codearts-vision.d.ts.map +1 -1
- package/lib/codearts-vision.js +136 -5
- package/lib/codearts-vision.js.map +1 -1
- package/lib/codely-adapter.d.ts +36 -3
- package/lib/codely-adapter.d.ts.map +1 -1
- package/lib/codely-adapter.js +252 -11
- package/lib/codely-adapter.js.map +1 -1
- package/lib/codely-auth-service.d.ts +17 -0
- package/lib/codely-auth-service.d.ts.map +1 -1
- package/lib/codely-auth-service.js +40 -3
- package/lib/codely-auth-service.js.map +1 -1
- package/lib/codely-auth.d.ts.map +1 -1
- package/lib/codely-auth.js +23 -0
- package/lib/codely-auth.js.map +1 -1
- package/lib/codely-credits.d.ts.map +1 -1
- package/lib/codely-credits.js +18 -1
- package/lib/codely-credits.js.map +1 -1
- package/lib/codely-product.d.ts +10 -5
- package/lib/codely-product.d.ts.map +1 -1
- package/lib/codely-product.js +4 -2
- package/lib/codely-product.js.map +1 -1
- package/lib/credential-resolver.d.ts +41 -1
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +31 -6
- package/lib/credential-resolver.js.map +1 -1
- package/lib/image-budget.d.ts +3 -11
- package/lib/image-budget.d.ts.map +1 -1
- package/lib/image-budget.js +43 -5
- package/lib/image-budget.js.map +1 -1
- package/lib/image-data-cache.d.ts +87 -0
- package/lib/image-data-cache.d.ts.map +1 -0
- package/lib/image-data-cache.js +144 -0
- package/lib/image-data-cache.js.map +1 -0
- package/lib/index.d.ts +0 -51
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +290 -164
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +14 -19
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +812 -496
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +52 -0
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +52 -4
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/llm-adapter.d.ts +96 -5
- package/lib/llm-adapter.d.ts.map +1 -1
- package/lib/llm-adapter.js +742 -62
- package/lib/llm-adapter.js.map +1 -1
- package/lib/lobsterai-adapter.d.ts.map +1 -1
- package/lib/lobsterai-adapter.js +54 -15
- package/lib/lobsterai-adapter.js.map +1 -1
- package/lib/login.d.ts +5 -13
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +75 -14
- package/lib/login.js.map +1 -1
- package/lib/loomy-adapter.d.ts +3 -0
- package/lib/loomy-adapter.d.ts.map +1 -1
- package/lib/loomy-adapter.js +11 -3
- package/lib/loomy-adapter.js.map +1 -1
- package/lib/loomy-auth.d.ts +51 -0
- package/lib/loomy-auth.d.ts.map +1 -1
- package/lib/loomy-auth.js +149 -2
- package/lib/loomy-auth.js.map +1 -1
- package/lib/loomy-oauth.d.ts +44 -0
- package/lib/loomy-oauth.d.ts.map +1 -1
- package/lib/loomy-oauth.js +48 -1
- package/lib/loomy-oauth.js.map +1 -1
- package/lib/loomy-sms-login.d.ts +61 -0
- package/lib/loomy-sms-login.d.ts.map +1 -0
- package/lib/loomy-sms-login.js +330 -0
- package/lib/loomy-sms-login.js.map +1 -0
- package/lib/loomy.d.ts +22 -0
- package/lib/loomy.d.ts.map +1 -1
- package/lib/loomy.js +10 -0
- package/lib/loomy.js.map +1 -1
- package/lib/magicrew-adapter.d.ts +201 -0
- package/lib/magicrew-adapter.d.ts.map +1 -0
- package/lib/magicrew-adapter.js +595 -0
- package/lib/magicrew-adapter.js.map +1 -0
- package/lib/magicrew-auth.d.ts +494 -0
- package/lib/magicrew-auth.d.ts.map +1 -0
- package/lib/magicrew-auth.js +951 -0
- package/lib/magicrew-auth.js.map +1 -0
- package/lib/magicrew-browser-login.d.ts +333 -0
- package/lib/magicrew-browser-login.d.ts.map +1 -0
- package/lib/magicrew-browser-login.js +740 -0
- package/lib/magicrew-browser-login.js.map +1 -0
- package/lib/magicrew-catalog.d.ts +19 -0
- package/lib/magicrew-catalog.d.ts.map +1 -0
- package/lib/magicrew-catalog.js +80 -0
- package/lib/magicrew-catalog.js.map +1 -0
- package/lib/magicrew-credits.d.ts +112 -0
- package/lib/magicrew-credits.d.ts.map +1 -0
- package/lib/magicrew-credits.js +319 -0
- package/lib/magicrew-credits.js.map +1 -0
- package/lib/magicrew-local-browser.d.ts +123 -0
- package/lib/magicrew-local-browser.d.ts.map +1 -0
- package/lib/magicrew-local-browser.js +321 -0
- package/lib/magicrew-local-browser.js.map +1 -0
- package/lib/magicrew-product.d.ts +127 -0
- package/lib/magicrew-product.d.ts.map +1 -0
- package/lib/magicrew-product.js +159 -0
- package/lib/magicrew-product.js.map +1 -0
- package/lib/magicrew-profile.d.ts +74 -0
- package/lib/magicrew-profile.d.ts.map +1 -0
- package/lib/magicrew-profile.js +148 -0
- package/lib/magicrew-profile.js.map +1 -0
- package/lib/magicrew.d.ts +185 -0
- package/lib/magicrew.d.ts.map +1 -0
- package/lib/magicrew.js +215 -0
- package/lib/magicrew.js.map +1 -0
- package/lib/model-catalog.d.ts +8 -0
- package/lib/model-catalog.d.ts.map +1 -1
- package/lib/model-catalog.js +127 -5
- package/lib/model-catalog.js.map +1 -1
- package/lib/models.d.ts +216 -32
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +500 -47
- package/lib/models.js.map +1 -1
- package/lib/modelscope-adapter.d.ts.map +1 -1
- package/lib/modelscope-adapter.js +7 -2
- package/lib/modelscope-adapter.js.map +1 -1
- package/lib/modelscope-product.d.ts +44 -6
- package/lib/modelscope-product.d.ts.map +1 -1
- package/lib/modelscope-product.js +98 -9
- package/lib/modelscope-product.js.map +1 -1
- package/lib/officeace-adapter.d.ts.map +1 -1
- package/lib/officeace-adapter.js +147 -21
- package/lib/officeace-adapter.js.map +1 -1
- package/lib/officeace-auth.d.ts +15 -0
- package/lib/officeace-auth.d.ts.map +1 -1
- package/lib/officeace-auth.js +99 -2
- package/lib/officeace-auth.js.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.d.ts.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.js +28 -3
- package/lib/openai-gateway/tencent-fingerprint.js.map +1 -1
- package/lib/opencode-adapter.d.ts +27 -0
- package/lib/opencode-adapter.d.ts.map +1 -1
- package/lib/opencode-adapter.js +57 -8
- package/lib/opencode-adapter.js.map +1 -1
- package/lib/opencode-bun-tls.d.ts +103 -0
- package/lib/opencode-bun-tls.d.ts.map +1 -0
- package/lib/opencode-bun-tls.js +212 -0
- package/lib/opencode-bun-tls.js.map +1 -0
- package/lib/opencode-messages.d.ts +0 -19
- package/lib/opencode-messages.d.ts.map +1 -1
- package/lib/opencode-messages.js +30 -33
- package/lib/opencode-messages.js.map +1 -1
- package/lib/opencode-official-prompt.d.ts +62 -0
- package/lib/opencode-official-prompt.d.ts.map +1 -0
- package/lib/opencode-official-prompt.js +119 -0
- package/lib/opencode-official-prompt.js.map +1 -0
- package/lib/opencode-official-tools.d.ts +27 -0
- package/lib/opencode-official-tools.d.ts.map +1 -0
- package/lib/opencode-official-tools.js +340 -0
- package/lib/opencode-official-tools.js.map +1 -0
- package/lib/opencode-product.d.ts.map +1 -1
- package/lib/opencode-product.js +3 -2
- package/lib/opencode-product.js.map +1 -1
- package/lib/opencode-stream.d.ts.map +1 -1
- package/lib/opencode-stream.js +8 -7
- package/lib/opencode-stream.js.map +1 -1
- package/lib/product.d.ts +15 -3
- package/lib/product.d.ts.map +1 -1
- package/lib/product.js +44 -11
- package/lib/product.js.map +1 -1
- package/lib/provider-credits.d.ts +2 -0
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +46 -17
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-expiry.d.ts.map +1 -1
- package/lib/provider-expiry.js +29 -0
- package/lib/provider-expiry.js.map +1 -1
- package/lib/provider-http-pool.d.ts +85 -0
- package/lib/provider-http-pool.d.ts.map +1 -0
- package/lib/provider-http-pool.js +224 -0
- package/lib/provider-http-pool.js.map +1 -0
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +73 -39
- package/lib/provider-registry.js.map +1 -1
- package/lib/qiniu-adapter.d.ts +276 -0
- package/lib/qiniu-adapter.d.ts.map +1 -0
- package/lib/qiniu-adapter.js +689 -0
- package/lib/qiniu-adapter.js.map +1 -0
- package/lib/qiniu-auth.d.ts +130 -0
- package/lib/qiniu-auth.d.ts.map +1 -0
- package/lib/qiniu-auth.js +234 -0
- package/lib/qiniu-auth.js.map +1 -0
- package/lib/qiniu-messages.d.ts +96 -0
- package/lib/qiniu-messages.d.ts.map +1 -0
- package/lib/qiniu-messages.js +97 -0
- package/lib/qiniu-messages.js.map +1 -0
- package/lib/qiniu-product.d.ts +126 -0
- package/lib/qiniu-product.d.ts.map +1 -0
- package/lib/qiniu-product.js +269 -0
- package/lib/qiniu-product.js.map +1 -0
- package/lib/qiniu-rpc.d.ts +119 -0
- package/lib/qiniu-rpc.d.ts.map +1 -0
- package/lib/qiniu-rpc.js +214 -0
- package/lib/qiniu-rpc.js.map +1 -0
- package/lib/qiniu.d.ts +145 -0
- package/lib/qiniu.d.ts.map +1 -0
- package/lib/qiniu.js +164 -0
- package/lib/qiniu.js.map +1 -0
- package/lib/raccoon-adapter.d.ts +18 -2
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +154 -21
- package/lib/raccoon-adapter.js.map +1 -1
- package/lib/raccoon-auth.d.ts +6 -0
- package/lib/raccoon-auth.d.ts.map +1 -1
- package/lib/raccoon-auth.js +9 -1
- package/lib/raccoon-auth.js.map +1 -1
- package/lib/raccoon-credits.d.ts +38 -5
- package/lib/raccoon-credits.d.ts.map +1 -1
- package/lib/raccoon-credits.js +127 -6
- package/lib/raccoon-credits.js.map +1 -1
- package/lib/raccoon.d.ts +14 -2
- package/lib/raccoon.d.ts.map +1 -1
- package/lib/raccoon.js +14 -2
- package/lib/raccoon.js.map +1 -1
- package/lib/service.d.ts +46 -6
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +104 -16
- package/lib/service.js.map +1 -1
- package/lib/session-balance.d.ts +203 -0
- package/lib/session-balance.d.ts.map +1 -0
- package/lib/session-balance.js +279 -0
- package/lib/session-balance.js.map +1 -0
- package/lib/sign.d.ts +97 -1
- package/lib/sign.d.ts.map +1 -1
- package/lib/sign.js +174 -2
- package/lib/sign.js.map +1 -1
- package/lib/token-ledger-store.d.ts.map +1 -1
- package/lib/token-ledger-store.js +121 -27
- package/lib/token-ledger-store.js.map +1 -1
- package/lib/trae-adapter.d.ts.map +1 -1
- package/lib/trae-adapter.js +3 -1
- package/lib/trae-adapter.js.map +1 -1
- package/lib/types.d.ts +75 -15
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/usage-badge.d.ts +77 -7
- package/lib/usage-badge.d.ts.map +1 -1
- package/lib/usage-badge.js +190 -28
- package/lib/usage-badge.js.map +1 -1
- package/lib/webdav-auto-sync.d.ts +96 -0
- package/lib/webdav-auto-sync.d.ts.map +1 -0
- package/lib/webdav-auto-sync.js +0 -0
- package/lib/webdav-auto-sync.js.map +1 -0
- package/lib/webdav-sync-crypto.d.ts +18 -0
- package/lib/webdav-sync-crypto.d.ts.map +1 -0
- package/lib/webdav-sync-crypto.js +72 -0
- package/lib/webdav-sync-crypto.js.map +1 -0
- package/lib/webdav-sync-merge.d.ts +31 -0
- package/lib/webdav-sync-merge.d.ts.map +1 -0
- package/lib/webdav-sync-merge.js +0 -0
- package/lib/webdav-sync-merge.js.map +1 -0
- package/lib/webdav-sync.d.ts +43 -7
- package/lib/webdav-sync.d.ts.map +1 -1
- package/lib/webdav-sync.js +72 -11
- package/lib/webdav-sync.js.map +1 -1
- package/lib/zcode-adapter.d.ts +4 -2
- package/lib/zcode-adapter.d.ts.map +1 -1
- package/lib/zcode-adapter.js +132 -37
- package/lib/zcode-adapter.js.map +1 -1
- package/lib/zcode-upstream.d.ts +59 -0
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +137 -2
- package/lib/zcode-upstream.js.map +1 -1
- package/package.json +5 -4
- package/lib/stepcode-adapter.d.ts +0 -158
- package/lib/stepcode-adapter.d.ts.map +0 -1
- package/lib/stepcode-adapter.js +0 -318
- package/lib/stepcode-adapter.js.map +0 -1
- package/lib/stepcode-auth.d.ts +0 -154
- package/lib/stepcode-auth.d.ts.map +0 -1
- package/lib/stepcode-auth.js +0 -287
- package/lib/stepcode-auth.js.map +0 -1
- package/lib/stepcode-oauth.d.ts +0 -194
- package/lib/stepcode-oauth.d.ts.map +0 -1
- package/lib/stepcode-oauth.js +0 -496
- package/lib/stepcode-oauth.js.map +0 -1
- package/lib/stepcode-product.d.ts +0 -255
- package/lib/stepcode-product.d.ts.map +0 -1
- package/lib/stepcode-product.js +0 -256
- package/lib/stepcode-product.js.map +0 -1
- package/lib/stepcode.d.ts +0 -230
- package/lib/stepcode.d.ts.map +0 -1
- package/lib/stepcode.js +0 -300
- package/lib/stepcode.js.map +0 -1
- package/lib/teleagent-adapter.d.ts +0 -116
- package/lib/teleagent-adapter.d.ts.map +0 -1
- package/lib/teleagent-adapter.js +0 -293
- package/lib/teleagent-adapter.js.map +0 -1
- package/lib/teleagent-auth.d.ts +0 -279
- package/lib/teleagent-auth.d.ts.map +0 -1
- package/lib/teleagent-auth.js +0 -512
- package/lib/teleagent-auth.js.map +0 -1
- package/lib/teleagent-cdp-login.d.ts +0 -100
- package/lib/teleagent-cdp-login.d.ts.map +0 -1
- package/lib/teleagent-cdp-login.js +0 -402
- package/lib/teleagent-cdp-login.js.map +0 -1
- package/lib/teleagent-credits.d.ts +0 -120
- package/lib/teleagent-credits.d.ts.map +0 -1
- package/lib/teleagent-credits.js +0 -288
- package/lib/teleagent-credits.js.map +0 -1
- package/lib/teleagent-product.d.ts +0 -196
- package/lib/teleagent-product.d.ts.map +0 -1
- package/lib/teleagent-product.js +0 -212
- package/lib/teleagent-product.js.map +0 -1
- package/lib/teleagent.d.ts +0 -288
- package/lib/teleagent.d.ts.map +0 -1
- package/lib/teleagent.js +0 -450
- package/lib/teleagent.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webdav-sync-merge.js","sourceRoot":"","sources":["../src/webdav-sync-merge.ts"],"names":[],"mappings":"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"}
|
package/lib/webdav-sync.d.ts
CHANGED
|
@@ -36,8 +36,40 @@
|
|
|
36
36
|
import type { WebdavSyncAccount } from './types.js';
|
|
37
37
|
/** 同步信封的格式标记(push 侧的防呆校验用;客户端 `sync-panel.js` 有同值副本)。 */
|
|
38
38
|
export declare const WEBDAV_SYNC_FORMAT = "dsh-hub/webdav-sync";
|
|
39
|
-
/**
|
|
40
|
-
export declare const WEBDAV_SYNC_VERSION =
|
|
39
|
+
/** 同步信封的格式版本:v2 增加自动同步修订号(旧客户端会忽略它)。 */
|
|
40
|
+
export declare const WEBDAV_SYNC_VERSION = 2;
|
|
41
|
+
/** 云端加密信封。container 的形状由同步加密模块与浏览器共同约定。 */
|
|
42
|
+
export interface WebdavSyncEnvelope {
|
|
43
|
+
format: typeof WEBDAV_SYNC_FORMAT;
|
|
44
|
+
version: number;
|
|
45
|
+
savedAt: string;
|
|
46
|
+
device: string;
|
|
47
|
+
accountCount: number;
|
|
48
|
+
/** 每次上传随机生成;用于区分相同秒内的连续写入与 UI 刷新。 */
|
|
49
|
+
revision?: string;
|
|
50
|
+
container: unknown;
|
|
51
|
+
}
|
|
52
|
+
/** GET 的远端并发凭据;PUT 的 If-Match 用它防止覆盖别台设备的新写入。 */
|
|
53
|
+
export interface WebdavSnapshotMetadata {
|
|
54
|
+
lastModified?: string;
|
|
55
|
+
etag?: string;
|
|
56
|
+
}
|
|
57
|
+
/** 多设备写入冲突(HTTP 412/409),协调器必须重新下载、合并后再试。 */
|
|
58
|
+
export declare class WebdavSyncConflictError extends Error {
|
|
59
|
+
constructor();
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* 服务器限流(HTTP 429 / 503)—— 坚果云等按 QPS 限流的 WebDAV 服务在
|
|
63
|
+
* 短时间连发(或限流窗口内继续请求)时的典型形态。
|
|
64
|
+
*
|
|
65
|
+
* ⚠ 单独一个类是因为协调器对它的处置与其它错误**根本不同**:
|
|
66
|
+
* 固定 5 秒后原样重试 = 限流窗口内持续敲门,只会一直撞墙(真实报障:
|
|
67
|
+
* 「自动同步失败:WebDAV 下载失败(HTTP 503)」,坚果云 QPS 限制)。
|
|
68
|
+
* 协调器见它要走**指数退避**(见 `webdav-auto-sync.ts`),并放慢稳态轮询。
|
|
69
|
+
*/
|
|
70
|
+
export declare class WebdavSyncRateLimitedError extends Error {
|
|
71
|
+
constructor(status: number);
|
|
72
|
+
}
|
|
41
73
|
/** 快照在远程目录里的固定文件名(多设备互认的锚点,不带日期后缀)。 */
|
|
42
74
|
export declare const WEBDAV_SYNC_FILENAME = "dsh-hub-sync.json";
|
|
43
75
|
/** 远程目录缺省值(`remotePath` 为空时使用)。 */
|
|
@@ -70,14 +102,17 @@ export declare function webdavSyncUrls(account: WebdavSyncAccount): {
|
|
|
70
102
|
fileUrl: string;
|
|
71
103
|
};
|
|
72
104
|
/**
|
|
73
|
-
*
|
|
74
|
-
*
|
|
75
|
-
* 返回字节数与 `Last-Modified`(展示用;缺席不报错 —— 部分服务器不回它)。
|
|
76
|
-
* 请求体是 `JSON.stringify(data)`;**data 已是加密信封**,本层不触碰明文。
|
|
105
|
+
* 清空目录验证缓存(**仅测试用**):模块级状态会跨用例存活,传输层用例
|
|
106
|
+
* 每条都要从「首次 MKCOL」开始计数,beforeEach 里重置。
|
|
77
107
|
*/
|
|
78
|
-
export declare function
|
|
108
|
+
export declare function resetWebdavDirectoryCacheForTests(): void;
|
|
109
|
+
export declare function webdavPutSnapshot(account: WebdavSyncAccount, data: unknown, options?: {
|
|
110
|
+
ifMatch?: string;
|
|
111
|
+
ifNoneMatch?: boolean;
|
|
112
|
+
}): Promise<{
|
|
79
113
|
bytes: number;
|
|
80
114
|
lastModified?: string;
|
|
115
|
+
etag?: string;
|
|
81
116
|
}>;
|
|
82
117
|
/**
|
|
83
118
|
* 下载加密快照(GET)。
|
|
@@ -89,6 +124,7 @@ export declare function webdavGetSnapshot(account: WebdavSyncAccount): Promise<{
|
|
|
89
124
|
found: boolean;
|
|
90
125
|
text?: string;
|
|
91
126
|
lastModified?: string;
|
|
127
|
+
etag?: string;
|
|
92
128
|
}>;
|
|
93
129
|
/**
|
|
94
130
|
* 测试连接(PROPFIND 目录,Depth 0)。
|
package/lib/webdav-sync.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webdav-sync.d.ts","sourceRoot":"","sources":["../src/webdav-sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,wBAAwB,CAAA;AAEvD,
|
|
1
|
+
{"version":3,"file":"webdav-sync.d.ts","sourceRoot":"","sources":["../src/webdav-sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,wBAAwB,CAAA;AAEvD,wCAAwC;AACxC,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAEpC,2CAA2C;AAC3C,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,OAAO,kBAAkB,CAAA;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,iDAAiD;AACjD,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,6CAA6C;AAC7C,qBAAa,uBAAwB,SAAQ,KAAK;;CAKjD;AAED;;;;;;;;GAQG;AACH,qBAAa,0BAA2B,SAAQ,KAAK;gBACvC,MAAM,EAAE,MAAM;CAI3B;AAED,uCAAuC;AACvC,eAAO,MAAM,oBAAoB,sBAAsB,CAAA;AAEvD,mCAAmC;AACnC,eAAO,MAAM,0BAA0B,cAAc,CAAA;AAoCrD;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB,GAAG,SAAS,CAkCrF;AAED,mDAAmD;AACnD,wBAAgB,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAM/D;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,iBAAiB,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CASpG;AAmDD;;;GAGG;AACH,wBAAgB,iCAAiC,IAAI,IAAI,CAExD;AAyBD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,OAAO,EACb,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAyClE;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0BlF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAyClD;AAED,8CAA8C;AAC9C,wBAAgB,iBAAiB,IAAI,MAAM,CAG1C;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAIhE"}
|
package/lib/webdav-sync.js
CHANGED
|
@@ -36,8 +36,30 @@
|
|
|
36
36
|
import { hostname } from 'node:os';
|
|
37
37
|
/** 同步信封的格式标记(push 侧的防呆校验用;客户端 `sync-panel.js` 有同值副本)。 */
|
|
38
38
|
export const WEBDAV_SYNC_FORMAT = 'dsh-hub/webdav-sync';
|
|
39
|
-
/**
|
|
40
|
-
export const WEBDAV_SYNC_VERSION =
|
|
39
|
+
/** 同步信封的格式版本:v2 增加自动同步修订号(旧客户端会忽略它)。 */
|
|
40
|
+
export const WEBDAV_SYNC_VERSION = 2;
|
|
41
|
+
/** 多设备写入冲突(HTTP 412/409),协调器必须重新下载、合并后再试。 */
|
|
42
|
+
export class WebdavSyncConflictError extends Error {
|
|
43
|
+
constructor() {
|
|
44
|
+
super('云端快照已被另一台设备更新,正在重新合并');
|
|
45
|
+
this.name = 'WebdavSyncConflictError';
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* 服务器限流(HTTP 429 / 503)—— 坚果云等按 QPS 限流的 WebDAV 服务在
|
|
50
|
+
* 短时间连发(或限流窗口内继续请求)时的典型形态。
|
|
51
|
+
*
|
|
52
|
+
* ⚠ 单独一个类是因为协调器对它的处置与其它错误**根本不同**:
|
|
53
|
+
* 固定 5 秒后原样重试 = 限流窗口内持续敲门,只会一直撞墙(真实报障:
|
|
54
|
+
* 「自动同步失败:WebDAV 下载失败(HTTP 503)」,坚果云 QPS 限制)。
|
|
55
|
+
* 协调器见它要走**指数退避**(见 `webdav-auto-sync.ts`),并放慢稳态轮询。
|
|
56
|
+
*/
|
|
57
|
+
export class WebdavSyncRateLimitedError extends Error {
|
|
58
|
+
constructor(status) {
|
|
59
|
+
super(`服务器限流(HTTP ${status}):请求过于频繁,稍后自动恢复`);
|
|
60
|
+
this.name = 'WebdavSyncRateLimitedError';
|
|
61
|
+
}
|
|
62
|
+
}
|
|
41
63
|
/** 快照在远程目录里的固定文件名(多设备互认的锚点,不带日期后缀)。 */
|
|
42
64
|
export const WEBDAV_SYNC_FILENAME = 'dsh-hub-sync.json';
|
|
43
65
|
/** 远程目录缺省值(`remotePath` 为空时使用)。 */
|
|
@@ -186,7 +208,29 @@ function isAuthFailure(status) {
|
|
|
186
208
|
* 去网盘里把父目录建出来,而不是替用户猜一层层建;
|
|
187
209
|
* - 其余状态码按失败处理,带状态码数字(不含响应体,避免把服务器回显的
|
|
188
210
|
* 请求头 / URL 原样透给用户)。
|
|
211
|
+
*
|
|
212
|
+
* ## ⚠ 已验证目录缓存(QPS 限流服务器的 burst 消除,2026-11-01)
|
|
213
|
+
*
|
|
214
|
+
* 自动同步的每个周期都会走 `webdavPutSnapshot` ⇒ 每周期都先发一次 MKCOL
|
|
215
|
+
* ——对坚果云这类按 QPS 限流的服务器,MKCOL+GET+PUT 毫秒级连发就是一次
|
|
216
|
+
* 超限 burst(实测「WebDAV 下载失败(HTTP 503)」)。
|
|
217
|
+
*
|
|
218
|
+
* ⚠ **缓存键 = `directoryUrl`**(不是 account 对象身份):装配层每次
|
|
219
|
+
* `pool.webdavSyncAccount()` 都构造新对象,按对象缓存恒失效。
|
|
220
|
+
* ⚠ **只缓存成功**(201/405),失败不缓存 ⇒ 目录被用户删掉后下轮自动恢复;
|
|
221
|
+
* ⚠ **内存缓存**(进程级):目录被外部删除是罕见事件,代价只是下轮 MKCOL
|
|
222
|
+
* 重新验证,不影响正确性(PUT 只要求目录存在,不要求本轮刚验证过)。
|
|
223
|
+
* ⚠ 手动「上传备份」(`sync.push`)也走同一条 PUT 路径 ⇒ 同样受益。
|
|
189
224
|
*/
|
|
225
|
+
const verifiedDirectories = new Set();
|
|
226
|
+
/**
|
|
227
|
+
* 清空目录验证缓存(**仅测试用**):模块级状态会跨用例存活,传输层用例
|
|
228
|
+
* 每条都要从「首次 MKCOL」开始计数,beforeEach 里重置。
|
|
229
|
+
*/
|
|
230
|
+
export function resetWebdavDirectoryCacheForTests() {
|
|
231
|
+
verifiedDirectories.clear();
|
|
232
|
+
}
|
|
233
|
+
/** MKCOL 目录(幂等)。只被 {@link webdavPutSnapshot} 在目录未验证时调用。 */
|
|
190
234
|
async function ensureDirectory(account) {
|
|
191
235
|
const { directoryUrl } = webdavSyncUrls(account);
|
|
192
236
|
let response;
|
|
@@ -207,17 +251,16 @@ async function ensureDirectory(account) {
|
|
|
207
251
|
if (response.status === 409) {
|
|
208
252
|
throw new Error(`远程目录的上级目录不存在(${account.remotePath}),请先在网盘上创建它`);
|
|
209
253
|
}
|
|
254
|
+
if (response.status === 429 || response.status === 503)
|
|
255
|
+
throw new WebdavSyncRateLimitedError(response.status);
|
|
210
256
|
throw new Error(`WebDAV 创建目录失败(HTTP ${response.status})`);
|
|
211
257
|
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
export async function webdavPutSnapshot(account, data) {
|
|
219
|
-
await ensureDirectory(account);
|
|
220
|
-
const { fileUrl } = webdavSyncUrls(account);
|
|
258
|
+
export async function webdavPutSnapshot(account, data, options = {}) {
|
|
259
|
+
const { directoryUrl, fileUrl } = webdavSyncUrls(account);
|
|
260
|
+
if (!verifiedDirectories.has(directoryUrl)) {
|
|
261
|
+
await ensureDirectory(account);
|
|
262
|
+
verifiedDirectories.add(directoryUrl);
|
|
263
|
+
}
|
|
221
264
|
const body = JSON.stringify(data);
|
|
222
265
|
let response;
|
|
223
266
|
try {
|
|
@@ -226,6 +269,8 @@ export async function webdavPutSnapshot(account, data) {
|
|
|
226
269
|
headers: {
|
|
227
270
|
Authorization: authorizationHeader(account),
|
|
228
271
|
'Content-Type': 'application/json',
|
|
272
|
+
...(options.ifMatch !== undefined ? { 'If-Match': options.ifMatch } : {}),
|
|
273
|
+
...(options.ifNoneMatch === true ? { 'If-None-Match': '*' } : {}),
|
|
229
274
|
},
|
|
230
275
|
body,
|
|
231
276
|
});
|
|
@@ -237,8 +282,18 @@ export async function webdavPutSnapshot(account, data) {
|
|
|
237
282
|
return {
|
|
238
283
|
bytes: Buffer.byteLength(body, 'utf8'),
|
|
239
284
|
lastModified: response.headers.get('last-modified') ?? undefined,
|
|
285
|
+
etag: response.headers.get('etag') ?? undefined,
|
|
240
286
|
};
|
|
241
287
|
}
|
|
288
|
+
if (response.status === 409 || response.status === 412) {
|
|
289
|
+
// 409 可能是「目录被用户在网盘上删了」(PUT 的上级不存在)——失效缓存,
|
|
290
|
+
// 让协调器的重试路径重新 MKCOL 自愈;412 是 ETag 冲突(目录在),
|
|
291
|
+
// 失效只是下轮多一次幂等 MKCOL(405),代价可忽略。
|
|
292
|
+
verifiedDirectories.delete(directoryUrl);
|
|
293
|
+
throw new WebdavSyncConflictError();
|
|
294
|
+
}
|
|
295
|
+
if (response.status === 429 || response.status === 503)
|
|
296
|
+
throw new WebdavSyncRateLimitedError(response.status);
|
|
242
297
|
if (isAuthFailure(response.status)) {
|
|
243
298
|
throw new Error('WebDAV 鉴权失败:请核对用户名与应用密码');
|
|
244
299
|
}
|
|
@@ -264,6 +319,8 @@ export async function webdavGetSnapshot(account) {
|
|
|
264
319
|
}
|
|
265
320
|
if (response.status === 404)
|
|
266
321
|
return { found: false };
|
|
322
|
+
if (response.status === 429 || response.status === 503)
|
|
323
|
+
throw new WebdavSyncRateLimitedError(response.status);
|
|
267
324
|
if (isAuthFailure(response.status)) {
|
|
268
325
|
throw new Error('WebDAV 鉴权失败:请核对用户名与应用密码');
|
|
269
326
|
}
|
|
@@ -275,6 +332,7 @@ export async function webdavGetSnapshot(account) {
|
|
|
275
332
|
found: true,
|
|
276
333
|
text,
|
|
277
334
|
lastModified: response.headers.get('last-modified') ?? undefined,
|
|
335
|
+
etag: response.headers.get('etag') ?? undefined,
|
|
278
336
|
};
|
|
279
337
|
}
|
|
280
338
|
/**
|
|
@@ -326,6 +384,9 @@ export async function webdavTestConnection(account) {
|
|
|
326
384
|
if (fallback.status === 200 || fallback.status === 404) {
|
|
327
385
|
return { reachable: true, message: '连接成功(服务器不支持 PROPFIND,已用文件探测)' };
|
|
328
386
|
}
|
|
387
|
+
if (fallback.status === 429 || fallback.status === 503) {
|
|
388
|
+
return { reachable: false, message: `服务器限流(HTTP ${fallback.status}):稍等片刻再测一次(坚果云等有 QPS 限制)` };
|
|
389
|
+
}
|
|
329
390
|
if (isAuthFailure(fallback.status)) {
|
|
330
391
|
return { reachable: false, message: '鉴权失败:请核对用户名与应用密码(坚果云需用应用密码)' };
|
|
331
392
|
}
|
package/lib/webdav-sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webdav-sync.js","sourceRoot":"","sources":["../src/webdav-sync.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"webdav-sync.js","sourceRoot":"","sources":["../src/webdav-sync.ts"],"names":[],"mappings":"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"}
|
package/lib/zcode-adapter.d.ts
CHANGED
|
@@ -83,8 +83,10 @@ export declare function reasoningEffortLabel(id: string): string;
|
|
|
83
83
|
export interface ZcodeAdapterOptions {
|
|
84
84
|
/** 单凭据回退 ref(无账号池时)。 */
|
|
85
85
|
credentialRef: CredentialRef;
|
|
86
|
-
/**
|
|
87
|
-
resolveCredential: (modelId?: string
|
|
86
|
+
/** 解析当前可用凭据(第二参是 DSH 会话 id;zcode 用它做账号亲和)。 */
|
|
87
|
+
resolveCredential: (modelId?: string, sessionId?: string, picked?: {
|
|
88
|
+
accountId?: string;
|
|
89
|
+
}) => Promise<ZcodeCredential | undefined>;
|
|
88
90
|
/**
|
|
89
91
|
* 凭据失效时的处理。
|
|
90
92
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zcode-adapter.d.ts","sourceRoot":"","sources":["../src/zcode-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAuB,UAAU,EAA+B,MAAM,sBAAsB,CAAA;AACnG,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,eAAe,EACf,oBAAoB,EACpB,WAAW,EACZ,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"zcode-adapter.d.ts","sourceRoot":"","sources":["../src/zcode-adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/zcode-adapter.js
CHANGED
|
@@ -52,10 +52,11 @@
|
|
|
52
52
|
* 的旧结论,已被 `zcode-captcha.ts` 的 `CAPTCHA_PAGE_ORIGIN` 修正推翻,两者无关。
|
|
53
53
|
*/
|
|
54
54
|
import { EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, ReasoningEffortId } from '@deepseek-ai/dsh-llm';
|
|
55
|
+
import { providerPooledFetch } from './provider-http-pool.js';
|
|
55
56
|
import { createModelCatalog, isCatalogFresh, isCatalogFreshFor } from './model-catalog.js';
|
|
56
57
|
import { RemoteCatalogGate } from './remote-catalog-gate.js';
|
|
57
58
|
import { broadcastCatalogChanged } from './catalog-broadcast.js';
|
|
58
|
-
import { collectImages, serializeMessages } from './openai-compat.js';
|
|
59
|
+
import { collectImages, isTransportError, serializeMessages } from './openai-compat.js';
|
|
59
60
|
import { projectRequestImage } from './image-budget.js';
|
|
60
61
|
import { ZCODE } from './zcode-product.js';
|
|
61
62
|
import { buildChannelRequest, describeChannels, resolveChannelFor, shouldFallbackToOtherChannel, } from './zcode-transport.js';
|
|
@@ -68,8 +69,57 @@ import { registerAdapterIdempotent, } from './llm-register-compat.js';
|
|
|
68
69
|
import { captchaRequirementKey, clearCaptchaRequirement, isCaptchaKnownRequired, noteCaptchaRequired, noteKnownRequiredHit, noteProbeFirst, noteUpfrontCaptcha, } from './captcha-requirement.js';
|
|
69
70
|
import { describeZcodeRequestShape, extractZcodeLogId, formatZcodeDiagnostic, formatZcodeEdgePageHint, formatZcodeUnusualActivityMessage, hasZcodeUnusualActivity, looksLikeZcodeEsaPage, looksLikeZcodeHtmlPage, noteZcodeRequestFailed, noteZcodeRequestOk, noteZcodeRequestSent, readZcodeBusinessCodeFromBody, } from './zcode-diagnostics.js';
|
|
70
71
|
import { planSessionTitleThinking } from './session-title.js';
|
|
72
|
+
import { sessionBalanceEnabled } from './session-balance.js';
|
|
71
73
|
/** 本适配器注册的 provider 路由名(等价于 `ZCODE.id`)。 */
|
|
72
74
|
export const PROVIDER = 'zcode';
|
|
75
|
+
/**
|
|
76
|
+
* 传输瞬态「冷却重发」的次数上限(2026-10-31,与 codearts / raccoon /
|
|
77
|
+
* lobsterai 三家同款策略对齐)。
|
|
78
|
+
*
|
|
79
|
+
* ## 为什么 zcode 也需要(此前是 8 家接池适配器里唯二没这层的)
|
|
80
|
+
*
|
|
81
|
+
* - 连接池把空闲复用窗口从 4s 放宽到 120s,**放大了「复用被服务端/中间盒
|
|
82
|
+
* 掐死的连接 → `ECONNRESET` / `fetch failed`」的失败面**:undici 维护者
|
|
83
|
+
* 对同款问题的定性(nodejs/undici #3492)是「*always retry the request
|
|
84
|
+
* if the other side is closed… also for POST*」——Node 不像 Go 的
|
|
85
|
+
* net/http 那样对可重放请求在断连时透明重试,应用层必须自己做;
|
|
86
|
+
* - 只覆盖**传输级**(`isTransportError`)失败,与 5xx 同源;HTTP 4xx
|
|
87
|
+
* (含 3007/3009 的验证与限流)仍走既有 attempt 循环,互不重叠。
|
|
88
|
+
*
|
|
89
|
+
* 取 1:与三家先例一致——两次连续断连基本是持续故障,多发只会把真正的
|
|
90
|
+
* 持续故障拖长、掩盖问题(同日修复的结论)。
|
|
91
|
+
*
|
|
92
|
+
* ⚠️ 2026-11-01 改为 **2**(用户实发报障:本修复上线后仍见
|
|
93
|
+
* 「fetch failed — self-signed certificate in certificate chain」—— 说明
|
|
94
|
+
* 1 次重发不够):本机 HTTPS 检查代理约 **50%** 概率打断请求(minimax
|
|
95
|
+
* 2026-10-15 的实测口径),只重发 1 次时「两连败」概率 ≈ 25%;3 发全败
|
|
96
|
+
* ≈ 12.5%。与 `zcode-upstream.ts` 的 `ZCODE_TRANSPORT_RETRIES`(额度 /
|
|
97
|
+
* 签到腿)取同值。代价:真·持续故障从 1 次冷却(10s)拖长到 2 次(20s)
|
|
98
|
+
* 才报错 —— 可接受。
|
|
99
|
+
*/
|
|
100
|
+
const ZCODE_TRANSIENT_RETRY_MAX = 2;
|
|
101
|
+
/**
|
|
102
|
+
* 瞬时传输故障冷却毫秒数;可用环境变量覆盖(测试注入用)。
|
|
103
|
+
* 默认 10 秒(与 codearts / raccoon / lobsterai 完全一致:宿主自己的重试
|
|
104
|
+
* 退避只有几百毫秒,撞上的还是同一个挣扎中的链路——冷却必须长于它)。
|
|
105
|
+
*/
|
|
106
|
+
function resolveZcodeTransientRetryDelayMs() {
|
|
107
|
+
const raw = Number(process.env.DSH_ZCODE_TRANSIENT_RETRY_DELAY_MS);
|
|
108
|
+
return Number.isFinite(raw) && raw > 0 ? raw : 10_000;
|
|
109
|
+
}
|
|
110
|
+
/** 可中止的休眠;信号中止时立即 resolve(与 codearts / raccoon 的 delay 同款语义)。 */
|
|
111
|
+
function zcodeDelay(ms, signal) {
|
|
112
|
+
return new Promise((resolve) => {
|
|
113
|
+
if (signal?.aborted)
|
|
114
|
+
return resolve();
|
|
115
|
+
const onAbort = () => { clearTimeout(timer); resolve(); };
|
|
116
|
+
const timer = setTimeout(() => {
|
|
117
|
+
signal?.removeEventListener('abort', onAbort);
|
|
118
|
+
resolve();
|
|
119
|
+
}, ms);
|
|
120
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
121
|
+
});
|
|
122
|
+
}
|
|
73
123
|
/**
|
|
74
124
|
* 思考档位的**展示名**。
|
|
75
125
|
*
|
|
@@ -191,7 +241,8 @@ export class ZcodeAdapter extends LlmAdapter {
|
|
|
191
241
|
super();
|
|
192
242
|
this.options = options;
|
|
193
243
|
this.product = options.product ?? ZCODE;
|
|
194
|
-
|
|
244
|
+
// 与 codearts / raccoon / lobsterai 共用长 keep-alive 的 undici Agent;测试仍注入 fetchImpl。
|
|
245
|
+
this.fetchImpl = options.fetchImpl ?? providerPooledFetch;
|
|
195
246
|
this.fallbackIndex = new Map(this.product.fallbackModels.map((model) => [model.id, model]));
|
|
196
247
|
this.gate = options.gate ?? new ModelGate({
|
|
197
248
|
serialize: this.product.serializeUpstream,
|
|
@@ -650,8 +701,9 @@ export class ZcodeAdapter extends LlmAdapter {
|
|
|
650
701
|
* 里那次 add + 写进池的 `modelRateLimits`),**单点删除任一处行为断言仍全绿**,
|
|
651
702
|
* 故必须直接断言「首次切号时 `tried` 含失败账号、且标记已写下」。
|
|
652
703
|
*/
|
|
653
|
-
|
|
654
|
-
let
|
|
704
|
+
const resolved = await this.resolveCredentialOrThrow(options);
|
|
705
|
+
let credential = resolved.credential;
|
|
706
|
+
let activeAccountId = resolved.accountId ?? this.options.currentAccountId?.();
|
|
655
707
|
if (activeAccountId !== undefined && activeAccountId.length > 0)
|
|
656
708
|
tried.add(activeAccountId);
|
|
657
709
|
/**
|
|
@@ -1268,16 +1320,18 @@ export class ZcodeAdapter extends LlmAdapter {
|
|
|
1268
1320
|
* 而「拿不到 → refresh → 再拿」这套顺序必须与既有实现逐字一致。
|
|
1269
1321
|
*/
|
|
1270
1322
|
async resolveCredentialOrThrow(options) {
|
|
1271
|
-
|
|
1323
|
+
/** 本次请求私有的「实际选中账号」出口;不读进程级 Map,避免并发会话串号。 */
|
|
1324
|
+
const picked = {};
|
|
1325
|
+
let credential = await this.options.resolveCredential(options.model, options.sessionId, picked);
|
|
1272
1326
|
if (credential === undefined) {
|
|
1273
1327
|
await this.options.refresh();
|
|
1274
|
-
credential = await this.options.resolveCredential(options.model);
|
|
1328
|
+
credential = await this.options.resolveCredential(options.model, options.sessionId, picked);
|
|
1275
1329
|
}
|
|
1276
1330
|
if (credential === undefined) {
|
|
1277
1331
|
throw new LlmError('zcode: 没有可用的凭据 —— 请在 Jet Hub 的 ZCode 面板点「添加账号」完成登录'
|
|
1278
1332
|
+ '(本插件只用它自己的授权流程,不会读取本机 ZCode 客户端的登录态)', 'MISSING_CREDENTIAL');
|
|
1279
1333
|
}
|
|
1280
|
-
return credential;
|
|
1334
|
+
return { credential, accountId: picked.accountId };
|
|
1281
1335
|
}
|
|
1282
1336
|
/**
|
|
1283
1337
|
* 把**一次**上游请求经过闸门发出去,并把传输层异常翻译成 harness 的错误类别。
|
|
@@ -1296,36 +1350,67 @@ export class ZcodeAdapter extends LlmAdapter {
|
|
|
1296
1350
|
*/
|
|
1297
1351
|
async sendUpstream(input) {
|
|
1298
1352
|
const { url, headers, body, signal, userSignal, timeoutMs, model } = input;
|
|
1299
|
-
|
|
1300
|
-
|
|
1301
|
-
|
|
1302
|
-
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
|
|
1306
|
-
|
|
1307
|
-
|
|
1308
|
-
|
|
1309
|
-
|
|
1310
|
-
|
|
1311
|
-
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
|
|
1322
|
-
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
|
|
1326
|
-
|
|
1353
|
+
/**
|
|
1354
|
+
* ★ 传输瞬态冷却重发(2026-10-31):`TypeError: fetch failed` /
|
|
1355
|
+
* `ECONNRESET` 这类**连接级**失败在当前账号上冷却 10 秒后**整段重发**
|
|
1356
|
+
* 一次(不换账号——换谁都撞同一个刚被掐死的连接;额度耗尽的换号轮换
|
|
1357
|
+
* 仍归既有分支)。策略与 codearts / raccoon / lobsterai 三家逐字一致。
|
|
1358
|
+
*
|
|
1359
|
+
* ⚠ **重新过闸门**(而不是循环里只重发 fetch):10 秒冷却里排队的其他
|
|
1360
|
+
* 请求可能已经发车,重新 `gate.run` 才尊重同模型最小发车间隔。
|
|
1361
|
+
*
|
|
1362
|
+
* ⚠ 重发沿用**同一份 captcha param**:若首发已被上游消费,重发会收到
|
|
1363
|
+
* `3007`——那正是既有 attempt 循环「补产重发」分支的自愈输入
|
|
1364
|
+
* (`isCaptchaKnownRequired` / `probeRejected` 记忆),无需在此特判。
|
|
1365
|
+
*/
|
|
1366
|
+
let transportRetries = 0;
|
|
1367
|
+
for (;;) {
|
|
1368
|
+
try {
|
|
1369
|
+
return await this.gate.run(model, async () => await this.fetchImpl(url, {
|
|
1370
|
+
method: 'POST',
|
|
1371
|
+
headers,
|
|
1372
|
+
body: JSON.stringify(body),
|
|
1373
|
+
signal,
|
|
1374
|
+
}), { signal });
|
|
1375
|
+
}
|
|
1376
|
+
catch (error) {
|
|
1377
|
+
/**
|
|
1378
|
+
* ⚠ 用户中断(无论是等待闸门还是 fetch 本身)**必须原样上抛** ——
|
|
1379
|
+
* 让 harness 归为 aborted;把它翻译成 TIMEOUT/TRANSPORT 会让
|
|
1380
|
+
* 「用户主动取消」变成「一次可重试的失败」(AGENTS.md 记过这条)。
|
|
1381
|
+
*/
|
|
1382
|
+
if (error instanceof GateAbortedError)
|
|
1383
|
+
throw error;
|
|
1384
|
+
if (userSignal?.aborted === true)
|
|
1385
|
+
throw error;
|
|
1386
|
+
/**
|
|
1387
|
+
* ⚠ 超时必须归 `TIMEOUT`(它在 harness 的可重试集合里),不能混进
|
|
1388
|
+
* `TRANSPORT`:两者语义不同,文案也不该说「传输错误」。
|
|
1389
|
+
*
|
|
1390
|
+
* ⚠ 这里**不做** `clearTimeout` / `removeEventListener` —— 清理在
|
|
1391
|
+
* `stream()` 的 finally(覆盖整轮)。旧实现在 fetch 脚下就清理,
|
|
1392
|
+
* 于是流式读取阶段既无超时、也失了中断通道(见 `stream()` 的说明)。
|
|
1393
|
+
*/
|
|
1394
|
+
const timeoutFailure = () => new LlmError(`zcode: 请求超时(${timeoutMs}ms 内未完成)—— 上游可能长时间不返回数据`, 'TIMEOUT', { cause: error });
|
|
1395
|
+
if (signal.aborted)
|
|
1396
|
+
throw timeoutFailure();
|
|
1397
|
+
// ★ 只对传输级失败冷却重发(判定与 raccoon 同款);HTTP 4xx/5xx
|
|
1398
|
+
// 有 response,不走这条 catch——验证码/限流/换号仍是原语义。
|
|
1399
|
+
if (transportRetries >= ZCODE_TRANSIENT_RETRY_MAX || !isTransportError(error)) {
|
|
1400
|
+
throw new LlmError(`zcode: 请求失败:${error instanceof Error ? error.message : String(error)}`, 'TRANSPORT', { cause: error });
|
|
1401
|
+
}
|
|
1402
|
+
transportRetries += 1;
|
|
1403
|
+
await zcodeDelay(resolveZcodeTransientRetryDelayMs(), userSignal);
|
|
1404
|
+
// ⚠️ delay 在 abort 时静默 resolve——必须复检,否则用户按「停止」后
|
|
1405
|
+
// 还会再发一次完整请求(codearts 签名重试审计同款坑)。
|
|
1406
|
+
// ⚠️ 用真值判定(raccoon 同款):`=== true` 会被上面那次判定的类型
|
|
1407
|
+
// 收窄判成「无交集」(TS2367)——运行时语义完全等价。
|
|
1408
|
+
if (userSignal?.aborted)
|
|
1409
|
+
throw error;
|
|
1410
|
+
if (signal.aborted)
|
|
1411
|
+
throw timeoutFailure();
|
|
1412
|
+
// 冷却后整段重发(重新过闸门;SSE 被掐断时连接多半已换新)。
|
|
1327
1413
|
}
|
|
1328
|
-
throw new LlmError(`zcode: 请求失败:${error instanceof Error ? error.message : String(error)}`, 'TRANSPORT', { cause: error });
|
|
1329
1414
|
}
|
|
1330
1415
|
}
|
|
1331
1416
|
/**
|
|
@@ -1362,7 +1447,17 @@ export class ZcodeAdapter extends LlmAdapter {
|
|
|
1362
1447
|
await pool.updateModelRateLimit(activeAccountId, options.model, nextUtc8DayStartMs());
|
|
1363
1448
|
tried.add(activeAccountId);
|
|
1364
1449
|
}
|
|
1365
|
-
|
|
1450
|
+
// ⚠ 生产 `AccountPool` 一定有 `getAvailableAccountForSession`;单测里的
|
|
1451
|
+
// 结构化替身可能只实现 `getAvailableAccount`,故保留同语义的回落。
|
|
1452
|
+
// ⚠ 总开关 = **池里的面板开关**(Jet Hub 页头,每次现读);替身没实现
|
|
1453
|
+
// `sessionBalanceEnabled` 时退回环境变量 `DSH_ZCODE_SESSION_BALANCE`
|
|
1454
|
+
// (默认开)。与 `credential-resolver.ts` ③ 处同一套判据,不会分叉。
|
|
1455
|
+
const poolSwitch = typeof pool.sessionBalanceEnabled === 'function'
|
|
1456
|
+
? pool.sessionBalanceEnabled()
|
|
1457
|
+
: sessionBalanceEnabled();
|
|
1458
|
+
const next = poolSwitch && typeof pool.getAvailableAccountForSession === 'function'
|
|
1459
|
+
? await pool.getAvailableAccountForSession(this.product.id, options.model, options.sessionId, tried)
|
|
1460
|
+
: await pool.getAvailableAccount(this.product.id, options.model, tried);
|
|
1366
1461
|
if (next === null || next === undefined || tried.has(next.entry.id))
|
|
1367
1462
|
return undefined;
|
|
1368
1463
|
tried.add(next.entry.id);
|