@xixka/dsh-hub 0.3.2 → 0.3.4
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 +85 -1
- package/lib/account-pool.d.ts +31 -0
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +98 -7
- package/lib/account-pool.js.map +1 -1
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +7 -0
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-expiry.d.ts +19 -0
- package/lib/aggregate-expiry.d.ts.map +1 -1
- package/lib/aggregate-expiry.js +31 -0
- package/lib/aggregate-expiry.js.map +1 -1
- package/lib/astudio-adapter.d.ts +1 -1
- package/lib/astudio-adapter.js +1 -1
- package/lib/astudio-auth.d.ts +2 -2
- package/lib/astudio-auth.js +2 -2
- package/lib/astudio-credits.d.ts +1 -1
- package/lib/astudio-credits.js +1 -1
- package/lib/astudio-product.d.ts +21 -6
- package/lib/astudio-product.d.ts.map +1 -1
- package/lib/astudio-product.js +22 -7
- package/lib/astudio-product.js.map +1 -1
- package/lib/astudio.d.ts +3 -3
- package/lib/astudio.js +3 -3
- package/lib/auto-adapter.d.ts +6 -1
- package/lib/auto-adapter.d.ts.map +1 -1
- package/lib/auto-adapter.js +13 -1
- package/lib/auto-adapter.js.map +1 -1
- package/lib/auto-checkin.d.ts.map +1 -1
- package/lib/auto-checkin.js +20 -1
- package/lib/auto-checkin.js.map +1 -1
- package/lib/baizhi-adapter.d.ts.map +1 -1
- package/lib/baizhi-adapter.js +38 -2
- package/lib/baizhi-adapter.js.map +1 -1
- package/lib/baizhi-messages.d.ts +43 -3
- package/lib/baizhi-messages.d.ts.map +1 -1
- package/lib/baizhi-messages.js +46 -6
- package/lib/baizhi-messages.js.map +1 -1
- package/lib/baizhi-product.d.ts +31 -2
- package/lib/baizhi-product.d.ts.map +1 -1
- package/lib/baizhi-product.js +71 -18
- package/lib/baizhi-product.js.map +1 -1
- package/lib/baizhi.d.ts.map +1 -1
- package/lib/baizhi.js +2 -0
- package/lib/baizhi.js.map +1 -1
- package/lib/buddy-balance-rank.d.ts +42 -0
- package/lib/buddy-balance-rank.d.ts.map +1 -1
- package/lib/buddy-balance-rank.js +42 -0
- package/lib/buddy-balance-rank.js.map +1 -1
- package/lib/buddy-balance-selector.d.ts +15 -0
- package/lib/buddy-balance-selector.d.ts.map +1 -1
- package/lib/buddy-balance-selector.js +18 -3
- package/lib/buddy-balance-selector.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +6 -0
- package/lib/canonical-models.js.map +1 -1
- package/lib/chromium-session.d.ts +35 -0
- package/lib/chromium-session.d.ts.map +1 -1
- package/lib/chromium-session.js +47 -1
- package/lib/chromium-session.js.map +1 -1
- package/lib/client/jet-hub.js +118 -52
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +7 -6
- package/lib/codearts-credits.js.map +1 -1
- package/lib/credential-resolver.d.ts +10 -0
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +7 -1
- package/lib/credential-resolver.js.map +1 -1
- package/lib/credits.d.ts +22 -0
- package/lib/credits.d.ts.map +1 -1
- package/lib/credits.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +104 -9
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +10 -0
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +306 -5
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +49 -0
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +50 -0
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +4 -1
- package/lib/login.js.map +1 -1
- package/lib/loomy-balance-rank.d.ts +26 -0
- package/lib/loomy-balance-rank.d.ts.map +1 -1
- package/lib/loomy-balance-rank.js +29 -0
- package/lib/loomy-balance-rank.js.map +1 -1
- package/lib/loomy-balance-selector.d.ts.map +1 -1
- package/lib/loomy-balance-selector.js +6 -2
- package/lib/loomy-balance-selector.js.map +1 -1
- package/lib/magicrew-adapter.d.ts.map +1 -1
- package/lib/magicrew-adapter.js +6 -7
- package/lib/magicrew-adapter.js.map +1 -1
- package/lib/magicrew-auth.d.ts.map +1 -1
- package/lib/magicrew-auth.js +7 -4
- package/lib/magicrew-auth.js.map +1 -1
- package/lib/magicrew-catalog.d.ts +6 -0
- package/lib/magicrew-catalog.d.ts.map +1 -1
- package/lib/magicrew-catalog.js +8 -4
- package/lib/magicrew-catalog.js.map +1 -1
- package/lib/magicrew-credits.d.ts.map +1 -1
- package/lib/magicrew-credits.js +34 -18
- package/lib/magicrew-credits.js.map +1 -1
- package/lib/magicrew-product.d.ts +40 -0
- package/lib/magicrew-product.d.ts.map +1 -1
- package/lib/magicrew-product.js +41 -0
- package/lib/magicrew-product.js.map +1 -1
- package/lib/magicrew-profile.d.ts.map +1 -1
- package/lib/magicrew-profile.js +8 -4
- package/lib/magicrew-profile.js.map +1 -1
- package/lib/marvis-adapter.d.ts +142 -0
- package/lib/marvis-adapter.d.ts.map +1 -0
- package/lib/marvis-adapter.js +335 -0
- package/lib/marvis-adapter.js.map +1 -0
- package/lib/marvis-auth.d.ts +188 -0
- package/lib/marvis-auth.d.ts.map +1 -0
- package/lib/marvis-auth.js +555 -0
- package/lib/marvis-auth.js.map +1 -0
- package/lib/marvis-browser-login.d.ts +118 -0
- package/lib/marvis-browser-login.d.ts.map +1 -0
- package/lib/marvis-browser-login.js +249 -0
- package/lib/marvis-browser-login.js.map +1 -0
- package/lib/marvis-credits.d.ts +57 -0
- package/lib/marvis-credits.d.ts.map +1 -0
- package/lib/marvis-credits.js +182 -0
- package/lib/marvis-credits.js.map +1 -0
- package/lib/marvis-device.d.ts +23 -0
- package/lib/marvis-device.d.ts.map +1 -0
- package/lib/marvis-device.js +26 -0
- package/lib/marvis-device.js.map +1 -0
- package/lib/marvis-messages.d.ts +72 -0
- package/lib/marvis-messages.d.ts.map +1 -0
- package/lib/marvis-messages.js +79 -0
- package/lib/marvis-messages.js.map +1 -0
- package/lib/marvis-product.d.ts +134 -0
- package/lib/marvis-product.d.ts.map +1 -0
- package/lib/marvis-product.js +236 -0
- package/lib/marvis-product.js.map +1 -0
- package/lib/marvis.d.ts +186 -0
- package/lib/marvis.d.ts.map +1 -0
- package/lib/marvis.js +282 -0
- package/lib/marvis.js.map +1 -0
- package/lib/models-dev-cache.d.ts.map +1 -1
- package/lib/models-dev-cache.js +13 -1
- package/lib/models-dev-cache.js.map +1 -1
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +5 -1
- package/lib/models.js.map +1 -1
- package/lib/monkeycode-adapter.d.ts +11 -2
- package/lib/monkeycode-adapter.d.ts.map +1 -1
- package/lib/monkeycode-adapter.js +35 -3
- package/lib/monkeycode-adapter.js.map +1 -1
- package/lib/monkeycode-messages.d.ts +8 -0
- package/lib/monkeycode-messages.d.ts.map +1 -1
- package/lib/monkeycode-messages.js +8 -0
- package/lib/monkeycode-messages.js.map +1 -1
- package/lib/monkeycode-product.d.ts +35 -0
- package/lib/monkeycode-product.d.ts.map +1 -1
- package/lib/monkeycode-product.js +35 -8
- package/lib/monkeycode-product.js.map +1 -1
- package/lib/officeace-auth.d.ts.map +1 -1
- package/lib/officeace-auth.js +12 -7
- package/lib/officeace-auth.js.map +1 -1
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +28 -0
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-expiry.d.ts.map +1 -1
- package/lib/provider-expiry.js +13 -0
- package/lib/provider-expiry.js.map +1 -1
- package/lib/provider-http-pool.d.ts +43 -4
- package/lib/provider-http-pool.d.ts.map +1 -1
- package/lib/provider-http-pool.js +142 -14
- package/lib/provider-http-pool.js.map +1 -1
- package/lib/provider-registry.d.ts +30 -0
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +83 -0
- package/lib/provider-registry.js.map +1 -1
- package/lib/qoder-adapter.d.ts.map +1 -1
- package/lib/qoder-adapter.js +8 -1
- package/lib/qoder-adapter.js.map +1 -1
- package/lib/qoder-credits.d.ts +10 -3
- package/lib/qoder-credits.d.ts.map +1 -1
- package/lib/qoder-credits.js +65 -4
- package/lib/qoder-credits.js.map +1 -1
- package/lib/service.d.ts +9 -1
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +11 -2
- package/lib/service.js.map +1 -1
- package/lib/types.d.ts +62 -2
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/webdav-sync.d.ts +5 -2
- package/lib/webdav-sync.d.ts.map +1 -1
- package/lib/webdav-sync.js +10 -3
- package/lib/webdav-sync.js.map +1 -1
- package/lib/zcode-auth.d.ts.map +1 -1
- package/lib/zcode-auth.js +8 -1
- package/lib/zcode-auth.js.map +1 -1
- package/lib/zcode-login.d.ts.map +1 -1
- package/lib/zcode-login.js +5 -3
- package/lib/zcode-login.js.map +1 -1
- package/lib/zcode-transport.d.ts.map +1 -1
- package/lib/zcode-transport.js +3 -1
- package/lib/zcode-transport.js.map +1 -1
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +19 -8
- package/lib/zcode-upstream.js.map +1 -1
- package/package.json +2 -1
package/lib/magicrew-product.js
CHANGED
|
@@ -38,6 +38,47 @@ export const MAGICREW_MODELS_PATH = '/api/v1/flows/models';
|
|
|
38
38
|
export const MAGICREW_MODEL_POINTS_PATH = '/api/v1/products/model-points';
|
|
39
39
|
export const MAGICREW_POINTS_PATH = '/api/v1/quota/points/total';
|
|
40
40
|
export const MAGICREW_CHAT_PATH = '/v1/chat/completions';
|
|
41
|
+
/**
|
|
42
|
+
* 上游 `User-Agent` —— **全仓唯一一份**。
|
|
43
|
+
*
|
|
44
|
+
* 五个生产者(`magicrew-adapter` 聊天网关 / `magicrew-auth` gateway key /
|
|
45
|
+
* `magicrew-catalog` 目录 / `magicrew-credits` 积分与签到 / `magicrew-profile`
|
|
46
|
+
* 账号资料)**必须**引用这一个常量,不得再各留一份字面量:它们打的是同一个
|
|
47
|
+
* `product.host`,一处被 WAF 拒就是整站不可用,而复制 5 份必然出现
|
|
48
|
+
* 「改一个忘四个」⇒ 症状是「一个入口好了,别的入口照旧 405」。
|
|
49
|
+
*
|
|
50
|
+
* ⚠️⚠️⚠️ **必须是真实存在的 build 号,不许写 `.0.0.0`**(issue IKTPRV,
|
|
51
|
+
* 2026-11-08 真机四轮取证)。
|
|
52
|
+
*
|
|
53
|
+
* 国际站(`magic-service.magicrew.ai`,阿里 WAF)维护了一份**已知脚本客户端
|
|
54
|
+
* 的 UA 黑名单**,原先那条 `Chrome/141.0.0.0 Safari/537.36` 正在名单上:
|
|
55
|
+
*
|
|
56
|
+
* | 请求 | 结果 |
|
|
57
|
+
* |---|---|
|
|
58
|
+
* | 该常量(匿名 / 假 Bearer / **真实 JWT + 组织码**) | **405** + 2657 B 拦截页 |
|
|
59
|
+
* | 换成 `Chrome/140.0.0.0` 或 `Chrome/141.0.7390.55` | **200** |
|
|
60
|
+
* | 去掉 ` Safari/537.36` 尾 | 200 |
|
|
61
|
+
* | 小写 `chrome/141.0.0.0 safari/537.36` / 双空格 | **405**(大小写与空白都归一化) |
|
|
62
|
+
* | `Macintosh…Chrome/141.0.0.0` | 200 |
|
|
63
|
+
* | `MagicrewDesktop/1.0` / `curl/8.0` | **405** |
|
|
64
|
+
* | 空 UA / `MyTestAgent/1.0` | 200 |
|
|
65
|
+
*
|
|
66
|
+
* ⇒ 判据是**整串精确匹配**(不是「主版本号 ≥ 141」,也不是「非浏览器 UA 一律拒」),
|
|
67
|
+
* 而**全零 build 的假版本号正是被收录的形态**(`curl` / `MagicrewDesktop` 也在名单上
|
|
68
|
+
* ⇒ 「换成自家 UA」不是出路,空 UA 虽通但不可靠)。
|
|
69
|
+
*
|
|
70
|
+
* ⚠️ 影响面**不止业务 API**:`/v1/chat/completions` 同样 405 ⇒ 国际站账号
|
|
71
|
+
* 曾经**完全不可用**(不是「积分面板坏了」)。
|
|
72
|
+
*
|
|
73
|
+
* ⚠️ 附带推翻了「境外出口 / 地区封锁」的旧归因(`magicrew-credits.ts` 的
|
|
74
|
+
* 403/405 分支与 `docs/agent-notes/providers-magicrew.md` 七审一节):那份
|
|
75
|
+
* 10 组出口矩阵**只变出口、UA 恒为上面那条**,无法把两者分开;同一出口换个
|
|
76
|
+
* UA 就 200,所以「改出口 / 设直连」对国际站是**反向指路**。
|
|
77
|
+
* 国内站(火山引擎)是**另一层**(速率 / 瞬时封禁,约 10 分钟恢复),
|
|
78
|
+
* 同一时刻常量 UA 匿名也能 200 ⇒ **两站不可合并归因**。
|
|
79
|
+
*/
|
|
80
|
+
export const MAGICREW_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '
|
|
81
|
+
+ '(KHTML, like Gecko) Chrome/141.0.7390.55 Safari/537.36';
|
|
41
82
|
/**
|
|
42
83
|
* 每日登录积分(= 真正的「每日签到」)。
|
|
43
84
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magicrew-product.js","sourceRoot":"","sources":["../src/magicrew-product.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAiDH,uEAAuE;AACvE,MAAM,CAAC,MAAM,sBAAsB,GAAG,kBAAkB,CAAA;AACxD,MAAM,CAAC,MAAM,4BAA4B,GAAG,8BAA8B,CAAA;AAC1E,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAC1D,MAAM,CAAC,MAAM,0BAA0B,GAAG,+BAA+B,CAAA;AACzE,MAAM,CAAC,MAAM,oBAAoB,GAAG,4BAA4B,CAAA;AAChE,MAAM,CAAC,MAAM,kBAAkB,GAAG,sBAAsB,CAAA;AAExD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,oBAAoB,CAAA;AAE5D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,0BAA0B,CAAA;AAExE,iDAAiD;AACjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAE1D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAsB,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAC5F,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAA;AAE7C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAA;AAE1C;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,SAAS,CAAA;AAEzD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,wBAAwB,GAAqC,MAAM,CAAC,MAAM,CAAC;IAC/E,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,qBAAqB,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IACzG,EAAE,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,mBAAmB,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IACrG,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IAC7F,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IACzF,uDAAuD;IACvD,sEAAsE;IACtE,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IAC9F,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IAC7F,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IACzF,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IACzF,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IAC3F,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IACrF,EAAE,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,oBAAoB,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IACvG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IACzF,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IACzF,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IACzF,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE;IAChF,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IAC3F,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE;IAChF,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IACvF,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE;IAC5E,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE;IAChF,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE;IAChF,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE;IAChF,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;IACjG,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE;IAC9F,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IAChG,EAAE,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IAClG,EAAE,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;CACnG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IAC7B,GAAG,KAAK;IACR,gBAAgB,EAAE,0BAA0B;IAC5C,sBAAsB,EAAE,uBAAuB;CAChD,CAAC,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,QAAQ,GAAoB,MAAM,CAAC,MAAM,CAAC;IACrD,EAAE,EAAE,UAAU;IACd,IAAI,EAAE,IAAI;IACV,2DAA2D;IAC3D,WAAW,EAAE,MAAM;IACnB,IAAI,EAAE,sCAAsC;IAC5C,SAAS,EAAE,0BAA0B;IACrC,iBAAiB,EAAE,KAAK;IACxB,oBAAoB,EAAE,uBAAuB;IAC7C,gBAAgB,EAAE,MAAM;IACxB,mBAAmB,EAAE,MAAM;IAC3B,uCAAuC;IACvC,cAAc,EAAE,MAAM;IACtB,+CAA+C;IAC/C,cAAc,EAAE,OAAO;IACvB,cAAc,EAAE,wBAAwB;CACzC,CAAC,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,CAAC,MAAM,aAAa,GAAoB,MAAM,CAAC,MAAM,CAAC;IAC1D,EAAE,EAAE,cAAc;IAClB,IAAI,EAAE,MAAM;IACZ,2DAA2D;IAC3D,WAAW,EAAE,UAAU;IACvB,IAAI,EAAE,mCAAmC;IACzC,SAAS,EAAE,yBAAyB;IACpC;;;;;;;;;OASG;IACH,iBAAiB,EAAE,IAAI;IACvB,oBAAoB,EAAE,2BAA2B;IACjD,gBAAgB,EAAE,MAAM;IACxB,mBAAmB,EAAE,MAAM;IAC3B,cAAc,EAAE,MAAM;IACtB,cAAc,EAAE,OAAO;IACvB;;;;;;OAMG;IACH,cAAc,EAAE,wBAAwB;CACzC,CAAC,CAAA;AAEF,+CAA+C;AAC/C,MAAM,UAAU,uBAAuB,CACrC,OAAe;IAEf,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAA;IACzE,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,CAAA;AACvE,CAAC"}
|
|
1
|
+
{"version":3,"file":"magicrew-product.js","sourceRoot":"","sources":["../src/magicrew-product.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magicrew-profile.d.ts","sourceRoot":"","sources":["../src/magicrew-profile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"magicrew-profile.d.ts","sourceRoot":"","sources":["../src/magicrew-profile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEjF,6CAA6C;AAC7C,eAAO,MAAM,qBAAqB,sCAAsC,CAAA;AAExE,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC9B,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,iCAAiC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,uCAAuC;IACvC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAqBD;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,GAAG,EAAE,MAAM,CAAA;IACX,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,eAAe,CAAA;IACxB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;CACzB,GAAG,OAAO,CAAC,eAAe,CAAC,CA6E3B"}
|
package/lib/magicrew-profile.js
CHANGED
|
@@ -44,13 +44,17 @@
|
|
|
44
44
|
* `MagicrewCredential.phone`:那条字段的消费者是 `magicrewDisplayNickname` 的
|
|
45
45
|
* 11 位脱敏判据(`/^\d{11}$/`),填进去只会得到一个错位的掩码串。
|
|
46
46
|
*/
|
|
47
|
+
import { MAGICREW_USER_AGENT } from './magicrew-product.js';
|
|
47
48
|
/** 账号资料端点(⚠️ **带 `/users`**;不带的那条实测 404)。 */
|
|
48
49
|
export const MAGICREW_PROFILE_PATH = '/api/v1/contact/accounts/me/users';
|
|
49
50
|
/** 上游业务码:`1000` = ok,其余都是错误。 */
|
|
50
51
|
const MAGICREW_OK_CODE = 1000;
|
|
51
|
-
/**
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
/**
|
|
53
|
+
* 上游 UA 来自 {@link MAGICREW_USER_AGENT}(单一定义处)。
|
|
54
|
+
*
|
|
55
|
+
* ⚠️ **不要在这里恢复一份字面量**(issue IKTPRV):账号资料 GET 与其余四腿打同一个
|
|
56
|
+
* `product.host`,漏改的症状是「昵称恒回落 displayName」这类静默降级。
|
|
57
|
+
*/
|
|
54
58
|
function isObject(value) {
|
|
55
59
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
56
60
|
}
|
|
@@ -74,7 +78,7 @@ export async function fetchMagicrewProfile(params) {
|
|
|
74
78
|
authorization: `Bearer ${params.jwt}`,
|
|
75
79
|
'content-type': 'application/json',
|
|
76
80
|
accept: 'application/json',
|
|
77
|
-
'user-agent':
|
|
81
|
+
'user-agent': MAGICREW_USER_AGENT,
|
|
78
82
|
origin: product.webOrigin,
|
|
79
83
|
// ⚠️⚠️ `referer` 缺了**恒 403 空 body**(2026-11-04 真机二分实测:同一套头只差
|
|
80
84
|
// 这一条,本端点 403 ⇄ 200)。这正是「昵称恒回落 displayName」的真因。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magicrew-profile.js","sourceRoot":"","sources":["../src/magicrew-profile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;
|
|
1
|
+
{"version":3,"file":"magicrew-profile.js","sourceRoot":"","sources":["../src/magicrew-profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 腾讯 Marvis 的 DSH 适配器。
|
|
3
|
+
*
|
|
4
|
+
* ## 与其余 16 家的同构点
|
|
5
|
+
*
|
|
6
|
+
* 目录(黑名单 / 关闭供应商 / 无账号门控)、错误分类、槽轮换、Token 账本
|
|
7
|
+
* 全部走仓库的共享实现,**本文件不重写任何一条**:
|
|
8
|
+
*
|
|
9
|
+
* | 关注点 | 落点 |
|
|
10
|
+
* | --- | --- |
|
|
11
|
+
* | 目录门控与黑名单 | `model-catalog.ts` 的 `createModelCatalog` |
|
|
12
|
+
* | 请求体(工具包装 / `include_usage`) | `marvis-messages.ts` |
|
|
13
|
+
* | 流帧解析(思考 / 工具增量 / usage) | `openai-compat.ts` 的 `consumeOpenAiSse` |
|
|
14
|
+
* | 取消判定 | `aggregate-adapter.ts` 的 `isAbortLike`(**共享唯一一份**) |
|
|
15
|
+
* | 限流冷却终点 | `model-queue.ts` 的 `nextUtc8DayStartMs` |
|
|
16
|
+
*
|
|
17
|
+
* ## 本家独有的三处
|
|
18
|
+
*
|
|
19
|
+
* 1. **目录只有一条且没有远端端点**(实测 9 个候选端点全 404)⇒ `catalog()`
|
|
20
|
+
* 恒返回静态表;保留 `createModelCatalog` 是为了黑名单/门控与其余家同源。
|
|
21
|
+
* 2. **槽里是完整凭据对象**(`MarvisSlot.credential`),不是裸 Key ——
|
|
22
|
+
* 请求头需要 `openid` / `guid` / `login_type` 三格。
|
|
23
|
+
* 3. **`content-type` 闸门必须放行 `text/plain`**:实测上游对 `stream:true`
|
|
24
|
+
* 回 `text/plain; charset=utf-8`,而 body 是标准 SSE。照抄 modelscope 的
|
|
25
|
+
* `includes('text/event-stream')` 会把**每一次正常请求**都当成风控页。
|
|
26
|
+
*
|
|
27
|
+
* @module marvis-adapter
|
|
28
|
+
*/
|
|
29
|
+
import type { Context } from '@deepseek-ai/cordis';
|
|
30
|
+
import { LlmAdapter, type GenerateOptions, type LlmModelInfo, type LlmProviderInfo, type LlmResolvedModelInfo, type StreamChunk } from '@deepseek-ai/dsh-llm';
|
|
31
|
+
import type { AccountPool } from './account-pool.js';
|
|
32
|
+
import { type MarvisCredential } from './marvis.js';
|
|
33
|
+
import { type MarvisErrorInfo, type MarvisProduct } from './marvis-product.js';
|
|
34
|
+
/** 一个可用的账号槽(接线层按账号池手动顺序产出)。 */
|
|
35
|
+
export interface MarvisSlot {
|
|
36
|
+
/** 账号 id(`marvis-xxxxxxxx`)。 */
|
|
37
|
+
readonly id: string;
|
|
38
|
+
/** 解析好的凭据。 */
|
|
39
|
+
readonly credential: MarvisCredential;
|
|
40
|
+
}
|
|
41
|
+
/** 适配器选项。 */
|
|
42
|
+
export interface MarvisAdapterOptions {
|
|
43
|
+
/**
|
|
44
|
+
* 单凭据回退 ref(无账号池条目时用)。
|
|
45
|
+
*
|
|
46
|
+
* ⚠️ 类型是 `unknown` —— 本适配器不用它做解析(凭据一律经 `slots()`
|
|
47
|
+
* 由接线层解析好传进来),保留只为与其余 `registerXxxLlm` 的选项形状一致。
|
|
48
|
+
*/
|
|
49
|
+
credentialRef?: unknown;
|
|
50
|
+
/**
|
|
51
|
+
* 取当前可用槽序列(按账号池的手动顺序)。
|
|
52
|
+
*
|
|
53
|
+
* @param modelId 目标模型。**推理路径必须传**,接线层据此过滤掉
|
|
54
|
+
* 「该模型正处于限流窗口」的账号。
|
|
55
|
+
* ⚠️ **目录路径刻意不传**:目录与「哪个账号此刻被限流」无关。
|
|
56
|
+
*/
|
|
57
|
+
slots: (modelId?: string) => Promise<readonly MarvisSlot[]>;
|
|
58
|
+
/**
|
|
59
|
+
* 账号池(**黑名单、关闭意图、目录门控的唯一数据源**)。
|
|
60
|
+
*
|
|
61
|
+
* ⚠️ 省略时(单测 / 嵌入方)行为退回「不过滤、不判关闭意图」;
|
|
62
|
+
* **生产接线必须传**。
|
|
63
|
+
*/
|
|
64
|
+
accountPool?: AccountPool;
|
|
65
|
+
/** 给某账号的某模型写限流标记(到 `resetAtMs` 为止)。 */
|
|
66
|
+
markLimited?: (slotId: string, modelId: string, resetAtMs: number) => void | Promise<void>;
|
|
67
|
+
/** 警告出口(上游故障 / 换号原因)。 */
|
|
68
|
+
warn?: (message: string) => void;
|
|
69
|
+
/** 读取图片附件(`analyzeImage` 工具用)。 */
|
|
70
|
+
readImage?: (ref: unknown) => Promise<{
|
|
71
|
+
data: Uint8Array;
|
|
72
|
+
mediaType: string;
|
|
73
|
+
} | undefined>;
|
|
74
|
+
/** 产品配置;默认 {@link MARVIS}。 */
|
|
75
|
+
product?: MarvisProduct;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* 限流/额度的冷却时长。
|
|
79
|
+
*
|
|
80
|
+
* ⚠️ 额度类**必须是「到次日 UTC+8 零点」**,不是「撞墙 +24h」:Marvis 的
|
|
81
|
+
* 免费额度是**按自然日**重置的(钱包 `total_tokens` 每天回满),滑动窗口会让
|
|
82
|
+
* 23:50 烧光的账号被封到**次日 23:50**,用户看到「0 点后上游已能用、插件仍说
|
|
83
|
+
* 没到重置时间」(与 loomy 的 IKL80H 同型)。
|
|
84
|
+
*/
|
|
85
|
+
export declare function marvisRetryAfterMs(kind: MarvisErrorInfo['kind'], retryAfterMs: number | undefined, attempt: number, nowMs?: number): number;
|
|
86
|
+
/** Marvis 适配器。 */
|
|
87
|
+
export declare class MarvisAdapter extends LlmAdapter {
|
|
88
|
+
private readonly product;
|
|
89
|
+
private readonly options;
|
|
90
|
+
private readonly skeletonCatalog;
|
|
91
|
+
constructor(options: MarvisAdapterOptions);
|
|
92
|
+
private toCatalogEntry;
|
|
93
|
+
private catalogEntries;
|
|
94
|
+
/**
|
|
95
|
+
* 目录(**无远端端点**)。
|
|
96
|
+
*
|
|
97
|
+
* 门控:没有任何已登录账号 ⇒ 空目录(与其余家同源,`createModelCatalog`
|
|
98
|
+
* 读池;这里只补「槽为空」这一格)。
|
|
99
|
+
*/
|
|
100
|
+
private loadCatalogEntries;
|
|
101
|
+
/** `listAllModels` 用的同步目录(**绝不能 async**)。 */
|
|
102
|
+
private syncCatalogEntries;
|
|
103
|
+
providerInfo(provider: string): LlmProviderInfo;
|
|
104
|
+
/**
|
|
105
|
+
* **同步**全量目录。
|
|
106
|
+
*
|
|
107
|
+
* ⚠️ 消费者**不 await**(`jet-hub-rpc.ts` 的 `catalog = [...all]`),返回
|
|
108
|
+
* Promise 会抛 `TypeError: all is not iterable`(minimax 的同款真实缺陷)。
|
|
109
|
+
*/
|
|
110
|
+
listAllModels(): readonly {
|
|
111
|
+
id: string;
|
|
112
|
+
name: string;
|
|
113
|
+
}[];
|
|
114
|
+
listModels(_provider: string): Promise<readonly LlmModelInfo[]>;
|
|
115
|
+
resolveModel(provider: string, model: string, _signal?: AbortSignal): Promise<LlmResolvedModelInfo>;
|
|
116
|
+
prepareCall(provider: string, model: string, signal?: AbortSignal): Promise<{
|
|
117
|
+
model: LlmResolvedModelInfo;
|
|
118
|
+
stream: (options: GenerateOptions) => AsyncIterable<StreamChunk>;
|
|
119
|
+
}>;
|
|
120
|
+
private resolveImageUrls;
|
|
121
|
+
/**
|
|
122
|
+
* 轮换:失败按「语义」标记该槽 → 换下一槽重发。
|
|
123
|
+
*
|
|
124
|
+
* 三条硬规则(与其余家同源):
|
|
125
|
+
* 1. `tried` **跨迭代保留** —— 每次重置会让两个槽之间无限来回;
|
|
126
|
+
* 2. **已交付内容的流不重放**;
|
|
127
|
+
* 3. **认证类不写限流标记**(写它会放大成「全池被封」)。
|
|
128
|
+
*/
|
|
129
|
+
stream(options: GenerateOptions): AsyncIterable<StreamChunk>;
|
|
130
|
+
/** 指定槽发一次请求(轮换循环的复用单元)。 */
|
|
131
|
+
protected streamVia(slot: MarvisSlot, options: GenerateOptions): AsyncIterable<StreamChunk>;
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* 从 `LlmError` 还原成语义化分类。
|
|
135
|
+
*
|
|
136
|
+
* ⚠️ 事实挂在 `error.failure` 上(`LlmFailure` 契约),**不是**展开在 error
|
|
137
|
+
* 自身 —— 早期版本误按「自身属性」读响应头,`retry-after` 因此永远读不到。
|
|
138
|
+
*/
|
|
139
|
+
export declare function classifyMarvisFailure(error: unknown): MarvisErrorInfo;
|
|
140
|
+
/** 在 `ctx.llm` 上注册 marvis 路由。 */
|
|
141
|
+
export declare function registerMarvisLlm(ctx: Context, options: MarvisAdapterOptions): MarvisAdapter;
|
|
142
|
+
//# sourceMappingURL=marvis-adapter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marvis-adapter.d.ts","sourceRoot":"","sources":["../src/marvis-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,335 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 腾讯 Marvis 的 DSH 适配器。
|
|
3
|
+
*
|
|
4
|
+
* ## 与其余 16 家的同构点
|
|
5
|
+
*
|
|
6
|
+
* 目录(黑名单 / 关闭供应商 / 无账号门控)、错误分类、槽轮换、Token 账本
|
|
7
|
+
* 全部走仓库的共享实现,**本文件不重写任何一条**:
|
|
8
|
+
*
|
|
9
|
+
* | 关注点 | 落点 |
|
|
10
|
+
* | --- | --- |
|
|
11
|
+
* | 目录门控与黑名单 | `model-catalog.ts` 的 `createModelCatalog` |
|
|
12
|
+
* | 请求体(工具包装 / `include_usage`) | `marvis-messages.ts` |
|
|
13
|
+
* | 流帧解析(思考 / 工具增量 / usage) | `openai-compat.ts` 的 `consumeOpenAiSse` |
|
|
14
|
+
* | 取消判定 | `aggregate-adapter.ts` 的 `isAbortLike`(**共享唯一一份**) |
|
|
15
|
+
* | 限流冷却终点 | `model-queue.ts` 的 `nextUtc8DayStartMs` |
|
|
16
|
+
*
|
|
17
|
+
* ## 本家独有的三处
|
|
18
|
+
*
|
|
19
|
+
* 1. **目录只有一条且没有远端端点**(实测 9 个候选端点全 404)⇒ `catalog()`
|
|
20
|
+
* 恒返回静态表;保留 `createModelCatalog` 是为了黑名单/门控与其余家同源。
|
|
21
|
+
* 2. **槽里是完整凭据对象**(`MarvisSlot.credential`),不是裸 Key ——
|
|
22
|
+
* 请求头需要 `openid` / `guid` / `login_type` 三格。
|
|
23
|
+
* 3. **`content-type` 闸门必须放行 `text/plain`**:实测上游对 `stream:true`
|
|
24
|
+
* 回 `text/plain; charset=utf-8`,而 body 是标准 SSE。照抄 modelscope 的
|
|
25
|
+
* `includes('text/event-stream')` 会把**每一次正常请求**都当成风控页。
|
|
26
|
+
*
|
|
27
|
+
* @module marvis-adapter
|
|
28
|
+
*/
|
|
29
|
+
import { LlmAdapter, LlmError, } from '@deepseek-ai/dsh-llm';
|
|
30
|
+
import { createModelCatalog } from './model-catalog.js';
|
|
31
|
+
import { collectImages, consumeOpenAiSse, serializeMessages } from './openai-compat.js';
|
|
32
|
+
import { isAbortLike } from './aggregate-adapter.js';
|
|
33
|
+
import { registerAdapterIdempotent } from './llm-register-compat.js';
|
|
34
|
+
import { nextUtc8DayStartMs } from './model-queue.js';
|
|
35
|
+
import { retryAfterMsFromResponse } from './retry-after.js';
|
|
36
|
+
import { reportLedgerAccount } from './token-ledger.js';
|
|
37
|
+
import { llmHeaders, marvisAccountOf, marvisChatUrl } from './marvis.js';
|
|
38
|
+
import { buildMarvisPayload } from './marvis-messages.js';
|
|
39
|
+
import { MARVIS, MARVIS_FALLBACK_MODELS, classifyMarvisError, marvisErrorKindCode, normalizeMarvisModelId, } from './marvis-product.js';
|
|
40
|
+
/**
|
|
41
|
+
* 限流/额度的冷却时长。
|
|
42
|
+
*
|
|
43
|
+
* ⚠️ 额度类**必须是「到次日 UTC+8 零点」**,不是「撞墙 +24h」:Marvis 的
|
|
44
|
+
* 免费额度是**按自然日**重置的(钱包 `total_tokens` 每天回满),滑动窗口会让
|
|
45
|
+
* 23:50 烧光的账号被封到**次日 23:50**,用户看到「0 点后上游已能用、插件仍说
|
|
46
|
+
* 没到重置时间」(与 loomy 的 IKL80H 同型)。
|
|
47
|
+
*/
|
|
48
|
+
export function marvisRetryAfterMs(kind, retryAfterMs, attempt, nowMs = Date.now()) {
|
|
49
|
+
if (kind === 'quota')
|
|
50
|
+
return Math.max(0, nextUtc8DayStartMs(nowMs) - nowMs);
|
|
51
|
+
if (retryAfterMs !== undefined && Number.isFinite(retryAfterMs) && retryAfterMs >= 0) {
|
|
52
|
+
return retryAfterMs;
|
|
53
|
+
}
|
|
54
|
+
const backoff = 60_000 * 2 ** Math.max(0, attempt - 1);
|
|
55
|
+
return Math.min(backoff, 30 * 60_000);
|
|
56
|
+
}
|
|
57
|
+
/** Marvis 适配器。 */
|
|
58
|
+
export class MarvisAdapter extends LlmAdapter {
|
|
59
|
+
product;
|
|
60
|
+
options;
|
|
61
|
+
skeletonCatalog;
|
|
62
|
+
constructor(options) {
|
|
63
|
+
super();
|
|
64
|
+
this.options = options;
|
|
65
|
+
this.product = options.product ?? MARVIS;
|
|
66
|
+
this.skeletonCatalog = createModelCatalog(this.options.accountPool === undefined ? {} : { accountPool: this.options.accountPool }, {
|
|
67
|
+
product: this.product,
|
|
68
|
+
loadCatalog: () => this.loadCatalogEntries(),
|
|
69
|
+
syncCatalog: () => this.syncCatalogEntries(),
|
|
70
|
+
// ⚠️ 省略 = 未知 = 放行;写 `['text']` 会让图片在 dispatch 前被替换成
|
|
71
|
+
// 占位文字(`deepseek-v4-1-flash` 在 codearts 上踩过同款)。
|
|
72
|
+
unknownModelInputModalities: () => ['text', 'image'],
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
// ── 目录 ────────────────────────────────────────────────────────────────
|
|
76
|
+
toCatalogEntry(model) {
|
|
77
|
+
return {
|
|
78
|
+
id: model.id,
|
|
79
|
+
name: model.name,
|
|
80
|
+
inputModalities: model.supportsImage ? ['text', 'image'] : ['text'],
|
|
81
|
+
...(model.contextWindow > 0 ? { contextWindow: model.contextWindow } : {}),
|
|
82
|
+
// ⚠️ 刻意**不声明** `reasoning`:Marvis 的思考默认开且关不掉
|
|
83
|
+
// (`none` 才真关),声明单档会让选择器出现一个点了没区别的按钮。
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
catalogEntries() {
|
|
87
|
+
return MARVIS_FALLBACK_MODELS.map((model) => this.toCatalogEntry(model));
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* 目录(**无远端端点**)。
|
|
91
|
+
*
|
|
92
|
+
* 门控:没有任何已登录账号 ⇒ 空目录(与其余家同源,`createModelCatalog`
|
|
93
|
+
* 读池;这里只补「槽为空」这一格)。
|
|
94
|
+
*/
|
|
95
|
+
async loadCatalogEntries() {
|
|
96
|
+
const slots = await this.options.slots();
|
|
97
|
+
if (slots.length === 0)
|
|
98
|
+
return [];
|
|
99
|
+
return this.catalogEntries();
|
|
100
|
+
}
|
|
101
|
+
/** `listAllModels` 用的同步目录(**绝不能 async**)。 */
|
|
102
|
+
syncCatalogEntries() {
|
|
103
|
+
return this.catalogEntries();
|
|
104
|
+
}
|
|
105
|
+
providerInfo(provider) {
|
|
106
|
+
return { id: provider === '' ? this.product.id : provider, name: this.product.displayName };
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* **同步**全量目录。
|
|
110
|
+
*
|
|
111
|
+
* ⚠️ 消费者**不 await**(`jet-hub-rpc.ts` 的 `catalog = [...all]`),返回
|
|
112
|
+
* Promise 会抛 `TypeError: all is not iterable`(minimax 的同款真实缺陷)。
|
|
113
|
+
*/
|
|
114
|
+
listAllModels() {
|
|
115
|
+
return this.catalogEntries().map((entry) => ({ id: entry.id, name: entry.name }));
|
|
116
|
+
}
|
|
117
|
+
async listModels(_provider) {
|
|
118
|
+
return await this.skeletonCatalog.listModels(_provider);
|
|
119
|
+
}
|
|
120
|
+
async resolveModel(provider, model, _signal) {
|
|
121
|
+
const id = normalizeMarvisModelId(model);
|
|
122
|
+
const entry = MARVIS_FALLBACK_MODELS.find((m) => m.id === id);
|
|
123
|
+
const resolved = {
|
|
124
|
+
provider,
|
|
125
|
+
id,
|
|
126
|
+
name: entry?.name ?? id,
|
|
127
|
+
inputModalities: entry?.supportsImage === true ? ['text', 'image'] : ['text'],
|
|
128
|
+
};
|
|
129
|
+
// `contextWindow = 0` 是「不知道」哨兵:下发 0 会让宿主压缩算术除零。
|
|
130
|
+
const contextWindow = entry?.contextWindow ?? 0;
|
|
131
|
+
if (contextWindow > 0)
|
|
132
|
+
resolved.context = { contextWindow };
|
|
133
|
+
return resolved;
|
|
134
|
+
}
|
|
135
|
+
async prepareCall(provider, model, signal) {
|
|
136
|
+
return {
|
|
137
|
+
model: await this.resolveModel(provider, model, signal),
|
|
138
|
+
stream: (options) => this.stream(options),
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
// ── 图片 ────────────────────────────────────────────────────────────────
|
|
142
|
+
async resolveImageUrls(model, messages) {
|
|
143
|
+
const refs = new Map();
|
|
144
|
+
for (const message of messages) {
|
|
145
|
+
if (Array.isArray(message.content))
|
|
146
|
+
collectImages(message.content, refs);
|
|
147
|
+
}
|
|
148
|
+
if (refs.size === 0)
|
|
149
|
+
return undefined;
|
|
150
|
+
const id = normalizeMarvisModelId(model);
|
|
151
|
+
const entry = MARVIS_FALLBACK_MODELS.find((m) => m.id === id);
|
|
152
|
+
if (entry?.supportsImage !== true) {
|
|
153
|
+
throw new LlmError(`marvis: 模型 "${model}" 不支持图片输入(本家只有 main-auto 收图)`, 'UNSUPPORTED_CONTENT');
|
|
154
|
+
}
|
|
155
|
+
if (this.options.readImage === undefined) {
|
|
156
|
+
throw new LlmError('marvis: 图片输入需要附件服务', 'UNSUPPORTED_CONTENT');
|
|
157
|
+
}
|
|
158
|
+
const readImage = this.options.readImage;
|
|
159
|
+
const out = new Map();
|
|
160
|
+
for (const [refId, ref] of refs) {
|
|
161
|
+
const image = await readImage(ref);
|
|
162
|
+
if (image === undefined)
|
|
163
|
+
continue;
|
|
164
|
+
out.set(refId, `data:${image.mediaType};base64,${Buffer.from(image.data).toString('base64')}`);
|
|
165
|
+
}
|
|
166
|
+
return out;
|
|
167
|
+
}
|
|
168
|
+
// ── 推理 ────────────────────────────────────────────────────────────────
|
|
169
|
+
/**
|
|
170
|
+
* 轮换:失败按「语义」标记该槽 → 换下一槽重发。
|
|
171
|
+
*
|
|
172
|
+
* 三条硬规则(与其余家同源):
|
|
173
|
+
* 1. `tried` **跨迭代保留** —— 每次重置会让两个槽之间无限来回;
|
|
174
|
+
* 2. **已交付内容的流不重放**;
|
|
175
|
+
* 3. **认证类不写限流标记**(写它会放大成「全池被封」)。
|
|
176
|
+
*/
|
|
177
|
+
async *stream(options) {
|
|
178
|
+
const slots = await this.options.slots(options.model);
|
|
179
|
+
if (slots.length === 0) {
|
|
180
|
+
throw new LlmError('marvis: 没有可用账号。请在 Jet Hub 的腾讯 Marvis 面板点击「新建账号」登录 QQ 或微信。', 'MISSING_CREDENTIAL');
|
|
181
|
+
}
|
|
182
|
+
const tried = new Set();
|
|
183
|
+
const limited = [];
|
|
184
|
+
for (;;) {
|
|
185
|
+
const slot = slots.find((s) => !tried.has(s.id));
|
|
186
|
+
if (slot === undefined) {
|
|
187
|
+
throw new LlmError(`marvis: 所有账号对该模型均受限${limited.length > 0 ? `(${limited.join('、')})` : ''}`, 'QUOTA_EXCEEDED');
|
|
188
|
+
}
|
|
189
|
+
tried.add(slot.id);
|
|
190
|
+
reportLedgerAccount(this.product.id, slot.id);
|
|
191
|
+
let delivered = false;
|
|
192
|
+
try {
|
|
193
|
+
for await (const chunk of this.streamVia(slot, options)) {
|
|
194
|
+
delivered = true;
|
|
195
|
+
yield chunk;
|
|
196
|
+
}
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
catch (error) {
|
|
200
|
+
if (delivered)
|
|
201
|
+
throw error;
|
|
202
|
+
/**
|
|
203
|
+
* ⚠️⚠️ 这里**没有** `if (error.code === 'QUOTA_EXCEEDED') throw error` 这条腿
|
|
204
|
+
* (2026-11-09 评审 I2)。
|
|
205
|
+
*
|
|
206
|
+
* 从 modelscope 照抄时原样带过来过,但它在这里是**错的**:`streamVia` 把
|
|
207
|
+
* 上游 402/额度耗尽映射成 `'QUOTA_EXCEEDED'` 抛出,短路后既不换号、也不写
|
|
208
|
+
* 冷却标记 ⇒ `marvisRetryAfterMs('quota')` 的「次日 UTC+8 零点」是死代码,
|
|
209
|
+
* 且还会把「所有账号都烧光」这个终态**提前**报给用户。
|
|
210
|
+
*
|
|
211
|
+
* 真正需要短路的是「槽位耗尽」那条 —— 它在 `try` **之外**抛(见上面
|
|
212
|
+
* `slot === undefined` 分支),压根进不到 `catch`,不需要这条守卫。
|
|
213
|
+
*/
|
|
214
|
+
// ⚠️ 取消必须排在一切分类之前:否则 AbortError 落进兜底 `server`
|
|
215
|
+
// 分支会被当成「换个号再试」,用户点了取消还在继续发请求。
|
|
216
|
+
if (isAbortLike(error, options.signal))
|
|
217
|
+
throw error;
|
|
218
|
+
const info = classifyMarvisFailure(error);
|
|
219
|
+
// 400/422:**换号无益**(每个槽发的是同一个体),直接上抛原文。
|
|
220
|
+
// 4130001「无效模型id」同组:同一 model id 换号一样 400。
|
|
221
|
+
if (info.kind === 'invalid_request' || info.kind === 'model_unavailable') {
|
|
222
|
+
throw new LlmError(`marvis: 请求被上游拒绝(${info.detail})`, 'BAD_REQUEST');
|
|
223
|
+
}
|
|
224
|
+
if (info.kind === 'auth') {
|
|
225
|
+
// 认证失败:**换下一个账号,但不写限流标记**。
|
|
226
|
+
if (tried.size >= slots.length)
|
|
227
|
+
throw error;
|
|
228
|
+
limited.push(`${slot.id}(认证失败)`);
|
|
229
|
+
continue;
|
|
230
|
+
}
|
|
231
|
+
if (info.kind === 'server' || info.kind === 'transport' || info.kind === 'risk') {
|
|
232
|
+
// 上游故障 / 网络 / 风控:**不写标记**(都不是配额问题),只换下一个。
|
|
233
|
+
this.options.warn?.(`marvis: 账号 ${slot.id} ${info.kind},换下一个:${info.detail}`);
|
|
234
|
+
if (tried.size >= slots.length)
|
|
235
|
+
throw error;
|
|
236
|
+
continue;
|
|
237
|
+
}
|
|
238
|
+
if (info.kind === 'context_window') {
|
|
239
|
+
// 上下文超限**换账号也没用**(请求本身太大)⇒ 不写标记,直接抛,
|
|
240
|
+
// 让宿主走溢出压缩。漏这一格会落进下面的「限流」默认分支 ⇒
|
|
241
|
+
// 给账号写一个到次日零点的标记 ⇒ 用户只是消息太长却被封一整天。
|
|
242
|
+
throw error;
|
|
243
|
+
}
|
|
244
|
+
// 限流 / 额度:标记该槽后换下一个。
|
|
245
|
+
const resetAtMs = Date.now() + marvisRetryAfterMs(info.kind, info.retryAfterMs, tried.size);
|
|
246
|
+
await this.options.markLimited?.(slot.id, options.model, resetAtMs);
|
|
247
|
+
limited.push(`${slot.id}(${info.kind})`);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
/** 指定槽发一次请求(轮换循环的复用单元)。 */
|
|
252
|
+
async *streamVia(slot, options) {
|
|
253
|
+
const imageUrls = await this.resolveImageUrls(options.model, options.messages);
|
|
254
|
+
const messages = serializeMessages(options.messages, imageUrls);
|
|
255
|
+
const payload = buildMarvisPayload({
|
|
256
|
+
model: normalizeMarvisModelId(options.model),
|
|
257
|
+
messages,
|
|
258
|
+
...options.system !== undefined && options.system.length > 0 ? { system: options.system } : {},
|
|
259
|
+
...options.tools !== undefined ? { tools: options.tools } : {},
|
|
260
|
+
...options.temperature !== undefined ? { temperature: options.temperature } : {},
|
|
261
|
+
...options.maxTokens !== undefined ? { maxTokens: options.maxTokens } : {},
|
|
262
|
+
...options.reasoningEffort !== undefined
|
|
263
|
+
? { reasoningEffort: String(options.reasoningEffort) }
|
|
264
|
+
: {},
|
|
265
|
+
});
|
|
266
|
+
const response = await fetch(marvisChatUrl(this.product.baseUrl), {
|
|
267
|
+
method: 'POST',
|
|
268
|
+
// ⚠️ 模型网关**绝不能**带 `Ual-Access-Signature` 等业务签名头:
|
|
269
|
+
// 加了会被判「登录态过期」(403 → 401)。
|
|
270
|
+
headers: llmHeaders(marvisAccountOf(slot.credential), { accept: 'text/event-stream' }),
|
|
271
|
+
body: JSON.stringify(payload),
|
|
272
|
+
...options.signal === undefined ? {} : { signal: options.signal },
|
|
273
|
+
});
|
|
274
|
+
if (!response.ok) {
|
|
275
|
+
// ⚠️ 必须先读体:额度/限流的语义在响应体里,而 body 只能读一次。
|
|
276
|
+
const text = await response.text().catch(() => '');
|
|
277
|
+
const retryAfterMs = retryAfterMsFromResponse(response.headers);
|
|
278
|
+
const info = classifyMarvisError(response.status, text, {
|
|
279
|
+
...response.headers.get('retry-after') === null
|
|
280
|
+
? {}
|
|
281
|
+
: { 'retry-after': response.headers.get('retry-after') },
|
|
282
|
+
});
|
|
283
|
+
// ⚠️ 额度必须用字面量 `'QUOTA_EXCEEDED'`(宿主 `QUOTA_EXCEEDED_CODE`
|
|
284
|
+
// 的字面值是 `'QUOTA'`,客户端会把 message 换成「额度已用尽」)。
|
|
285
|
+
const code = marvisErrorKindCode(info.kind);
|
|
286
|
+
throw new LlmError(`marvis: HTTP ${response.status} — ${text.slice(0, 300)}`, code, {
|
|
287
|
+
status: response.status,
|
|
288
|
+
...retryAfterMs === undefined ? {} : { providerRetryAfterMs: retryAfterMs },
|
|
289
|
+
});
|
|
290
|
+
}
|
|
291
|
+
// ⚠️⚠️ **content-type 闸门**(顺手挡住「HTTP 200 + HTML 风控页」)。
|
|
292
|
+
// ⚠️ 本家**必须放行 `text/plain`**:实测 `stream:true` 回的是
|
|
293
|
+
// `text/plain; charset=utf-8` 而 body 是标准 SSE。
|
|
294
|
+
const contentType = response.headers.get('content-type') ?? '';
|
|
295
|
+
if (!contentType.includes('text/event-stream') && !contentType.includes('text/plain')) {
|
|
296
|
+
const peek = await response.text().catch(() => '');
|
|
297
|
+
throw new LlmError(`marvis: 上游未返回事件流(content-type: ${contentType || '(空)'})——`
|
|
298
|
+
+ '通常是被风控拦截(网关返回 200 + HTML 拦截页)。'
|
|
299
|
+
+ `${peek === '' ? '' : ` 服务端原文:${peek.slice(0, 200)}`}`, 'SERVER', { status: response.status });
|
|
300
|
+
}
|
|
301
|
+
yield* consumeOpenAiSse(response, options.signal !== undefined ? { signal: options.signal } : {}, {
|
|
302
|
+
label: 'marvis',
|
|
303
|
+
firstTokenTimeoutMs: this.product.chatHeaderTimeoutMs,
|
|
304
|
+
chunkTimeoutMs: this.product.chunkTimeoutMs,
|
|
305
|
+
...options.maxTokens !== undefined ? { maxTokens: options.maxTokens } : {},
|
|
306
|
+
});
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
/**
|
|
310
|
+
* 从 `LlmError` 还原成语义化分类。
|
|
311
|
+
*
|
|
312
|
+
* ⚠️ 事实挂在 `error.failure` 上(`LlmFailure` 契约),**不是**展开在 error
|
|
313
|
+
* 自身 —— 早期版本误按「自身属性」读响应头,`retry-after` 因此永远读不到。
|
|
314
|
+
*/
|
|
315
|
+
export function classifyMarvisFailure(error) {
|
|
316
|
+
const failure = (typeof error === 'object' && error !== null ? error : {});
|
|
317
|
+
const status = typeof failure.failure?.status === 'number' ? failure.failure.status : 0;
|
|
318
|
+
const providerRetryAfterMs = typeof failure.failure?.providerRetryAfterMs === 'number'
|
|
319
|
+
&& Number.isFinite(failure.failure.providerRetryAfterMs)
|
|
320
|
+
? failure.failure.providerRetryAfterMs
|
|
321
|
+
: undefined;
|
|
322
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
323
|
+
const info = classifyMarvisError(status, message);
|
|
324
|
+
return providerRetryAfterMs === undefined
|
|
325
|
+
? info
|
|
326
|
+
: { ...info, retryAfterMs: info.retryAfterMs ?? providerRetryAfterMs };
|
|
327
|
+
}
|
|
328
|
+
/** 在 `ctx.llm` 上注册 marvis 路由。 */
|
|
329
|
+
export function registerMarvisLlm(ctx, options) {
|
|
330
|
+
const product = options.product ?? MARVIS;
|
|
331
|
+
const adapter = new MarvisAdapter(options);
|
|
332
|
+
registerAdapterIdempotent(ctx.llm, [product.id], adapter);
|
|
333
|
+
return adapter;
|
|
334
|
+
}
|
|
335
|
+
//# sourceMappingURL=marvis-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marvis-adapter.js","sourceRoot":"","sources":["../src/marvis-adapter.ts"],"names":[],"mappings":"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"}
|