@xixka/dsh-hub 0.3.2 → 0.3.3
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 +56 -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/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/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/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/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 +38 -4
- package/lib/provider-http-pool.d.ts.map +1 -1
- package/lib/provider-http-pool.js +52 -7
- 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/types.d.ts +62 -2
- package/lib/types.d.ts.map +1 -1
- package/lib/types.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/jet-hub-rpc.d.ts
CHANGED
|
@@ -47,6 +47,7 @@ import type { QiniuAuth } from './qiniu-auth.js';
|
|
|
47
47
|
import type { MonkeycodeAuth } from './monkeycode-auth.js';
|
|
48
48
|
import { type AstudioAuth } from './astudio-auth.js';
|
|
49
49
|
import { type MagicrewAuth } from './magicrew-auth.js';
|
|
50
|
+
import { type MarvisAuth } from './marvis-auth.js';
|
|
50
51
|
import type { CodelyAuth } from './codely-auth-service.js';
|
|
51
52
|
import type { BuddyCredential } from './buddy.js';
|
|
52
53
|
import { type CheckinStatus, type ClaimOutcome, type CreditBalance } from './credits.js';
|
|
@@ -804,6 +805,15 @@ export interface JetHubAuths {
|
|
|
804
805
|
* `tests/unit/credits-balance-self-heal.spec.ts` 的 `SELF_HEAL_EXEMPT` 记录理由。
|
|
805
806
|
*/
|
|
806
807
|
readonly baizhi: BaizhiAuth;
|
|
808
|
+
/**
|
|
809
|
+
* 腾讯 Marvis(`marvis`,2026-11-09)—— **本 fork 独有**。
|
|
810
|
+
*
|
|
811
|
+
* ⚠️ 值是 `MarvisAuth` **Service 实例**(与 modelscope / qiniu 同款)。
|
|
812
|
+
* ⚠️ 它**有**真实 refresh 端点(`POST /marvis_client_login/marvis_refresh_token`)
|
|
813
|
+
* ⇒ **必须**登记进 `SELF_HEAL_REFRESHABLE_PROVIDERS`(漏了症状是积分行
|
|
814
|
+
* 恒「未登录」而上游其实只需一次 refresh,且日志零字 —— issue IKKHL5)。
|
|
815
|
+
*/
|
|
816
|
+
readonly marvis: MarvisAuth;
|
|
807
817
|
}
|
|
808
818
|
/**
|
|
809
819
|
* 按 provider id 取 auth 实例。
|
package/lib/jet-hub-rpc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jet-hub-rpc.d.ts","sourceRoot":"","sources":["../src/jet-hub-rpc.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAGhF,OAAO,EAAE,WAAW,EAAe,MAAM,mBAAmB,CAAA;AAE5D,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAa9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAyChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAIhD,OAAO,EAAwB,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAQrD,OAAO,KAAK,EAAE,WAAW,EAA2B,MAAM,mBAAmB,CAAA;AAO7E,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAA;AAI1E,OAAO,KAAK,KAAK,mBAAmB,MAAM,qBAAqB,CAAA;AAC/D,oFAAoF;AACpF,KAAK,aAAa,GAAG,OAAO,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAItD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAS1D,OAAO,EAA0B,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC5E,OAAO,EAKL,KAAK,YAAY,EAElB,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"jet-hub-rpc.d.ts","sourceRoot":"","sources":["../src/jet-hub-rpc.ts"],"names":[],"mappings":"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"}
|
package/lib/jet-hub-rpc.js
CHANGED
|
@@ -99,6 +99,13 @@ import { magicrewCredentialFingerprint, magicrewDisplayNickname, magicrewExpires
|
|
|
99
99
|
// ⚠️ 2026-11-01:MagiCrew 国际版(`magicrewintl`)接入 —— 登录/导入/轮询分支
|
|
100
100
|
// 两站共用同一份实现,只差这个 `product` 常量(host / webOrigin / 凭据 ref 前缀)。
|
|
101
101
|
import { MAGICREW, MAGICREW_INTL } from './magicrew-product.js';
|
|
102
|
+
// ⚠️ 腾讯 Marvis(2026-11-09,本 fork 独有):OAuth(QQ / 微信)+ 从 magpie 导入。
|
|
103
|
+
import { importCredentialFromMagpie } from './marvis-auth.js';
|
|
104
|
+
import { MARVIS } from './marvis-product.js';
|
|
105
|
+
import {
|
|
106
|
+
// ⚠️ 必须改名:本文件已从 `buddy.ts` 导入了同名的 `credentialExpiresAtMs`
|
|
107
|
+
// (buddy 系的凭据是 `{expiresAt}`,Marvis 的是毫秒**字符串**)。
|
|
108
|
+
credentialExpiresAtMs as marvisCredentialExpiresAtMs, marvisAccountLabel, parseMarvisCredential, } from './marvis.js';
|
|
102
109
|
import { isAstudioRefreshable } from './astudio.js';
|
|
103
110
|
import { loginNeedsExternalAction } from './login-failure.js';
|
|
104
111
|
import { pollAstudioWechatScan, bindAstudioWechatSession, startAstudioLoginFlow, } from './astudio-oauth.js';
|
|
@@ -1293,6 +1300,47 @@ function magicrewExpiresAtPatch(credential) {
|
|
|
1293
1300
|
const expiresAt = magicrewExpiresAtMs(credential);
|
|
1294
1301
|
return expiresAt === undefined ? {} : { expiresAt };
|
|
1295
1302
|
}
|
|
1303
|
+
/**
|
|
1304
|
+
* 腾讯 Marvis 的 `expiresAt` 补丁(与 {@link magicrewExpiresAtPatch} 同形)。
|
|
1305
|
+
*
|
|
1306
|
+
* ⚠️ `MarvisCredential.expires_at` 是**毫秒时间戳字符串**(上游 `Set-Cookie` 的
|
|
1307
|
+
* `access_token_expire_time` 原样),`credentialExpiresAtMs` 负责「秒 / 毫秒」
|
|
1308
|
+
* 两种口径的归一(`> 1e12` 当毫秒,否则 ×1000)。
|
|
1309
|
+
*/
|
|
1310
|
+
function marvisExpiresAtPatch(credential) {
|
|
1311
|
+
const expiresAt = marvisCredentialExpiresAtMs(credential);
|
|
1312
|
+
return expiresAt === undefined ? {} : { expiresAt };
|
|
1313
|
+
}
|
|
1314
|
+
/**
|
|
1315
|
+
* 在账号池里找「**同一个 Marvis 账号**」的既有条目 —— 唯一一份判重实现。
|
|
1316
|
+
*
|
|
1317
|
+
* ## 判据:`openid`
|
|
1318
|
+
* `account.create` 每次都生成新的 `${provider}-${shortId()}` 与
|
|
1319
|
+
* `MARVIS_ACCOUNT_${suffix}`,而同一个 QQ / 微信账号反复登录拿到的是**同一个
|
|
1320
|
+
* `openid`**(它是账号的稳定身份;`access_token` 会随重登轮换、
|
|
1321
|
+
* `guid` 每次登录都是新造的虚拟设备)⇒ 只有 `openid` 能判重。
|
|
1322
|
+
*
|
|
1323
|
+
* ⚠️ 与 magicrew 的三条边界逐条同款:读不到凭据的账号**跳过**(无法判定 ≠ 失配)、
|
|
1324
|
+
* 非 JSON / 缺 `openid` 的条目**跳过**、`skipAccountId` 排除本次自己的占位条目。
|
|
1325
|
+
*/
|
|
1326
|
+
async function findMarvisAccountByOpenid(params) {
|
|
1327
|
+
const { ctx, pool, openid, skipAccountId } = params;
|
|
1328
|
+
if (openid.length === 0)
|
|
1329
|
+
return undefined;
|
|
1330
|
+
for (const existing of pool.listAccountsByProvider(MARVIS.id)) {
|
|
1331
|
+
if (existing.id === skipAccountId)
|
|
1332
|
+
continue;
|
|
1333
|
+
const resolved = await ctx.credentials.resolve(credentialRef(existing.credentialRef))
|
|
1334
|
+
.catch(() => undefined);
|
|
1335
|
+
// ⚠️ 边界 ①:读不到 ⇒ 跳过(既不判「重复」也不判「不重复」)。
|
|
1336
|
+
if (resolved === undefined)
|
|
1337
|
+
continue;
|
|
1338
|
+
const parsed = parseMarvisCredential(resolved.value);
|
|
1339
|
+
if (parsed !== undefined && parsed.openid === openid)
|
|
1340
|
+
return existing;
|
|
1341
|
+
}
|
|
1342
|
+
return undefined;
|
|
1343
|
+
}
|
|
1296
1344
|
/**
|
|
1297
1345
|
* 在账号池里找「**同一个超级麦吉账号**」的既有条目 —— **唯一一份判重实现**。
|
|
1298
1346
|
*
|
|
@@ -1948,6 +1996,15 @@ function registerJetHubEndpoints(ctx, pool, auths, modelAdapters) {
|
|
|
1948
1996
|
// 一次性终态「需人工重新登录」,不进重试循环。
|
|
1949
1997
|
// 漏登记的后果与 accio 同款:凭据其实只需一次重取,面板却永报「未登录」。
|
|
1950
1998
|
ASTUDIO.id,
|
|
1999
|
+
// ⚠️ 腾讯 Marvis(2026-11-09):**有**真实 refresh 端点
|
|
2000
|
+
// (`POST /marvis_client_login/marvis_refresh_token`,body 的
|
|
2001
|
+
// `loginType` 恒 Marvis 这个字面量、不是 QC/WX 码)⇒ 不属
|
|
2002
|
+
// 「设计上没有 refresh 端点」的那类豁免。
|
|
2003
|
+
// ⚠️ 本注释**不得**出现带单引号的 Marvis 字面量 —— 对应的守卫会扫
|
|
2004
|
+
// Set 体里的单引号字符串,注释里的引号会被当成一个 Set 成员(实测踩过)。
|
|
2005
|
+
// ⚠️ 上游的 access_token **不变**、只重置有效期 ⇒ 续期必须把新的
|
|
2006
|
+
// `expires_at` 写回池(否则调度器永不武装)。
|
|
2007
|
+
MARVIS.id,
|
|
1951
2008
|
AUTOCLAW.id,
|
|
1952
2009
|
// ⚠️ autoclawintl(AutoClaw 国际版,2026-10-20):与 `autoclaw` 共用同一个
|
|
1953
2010
|
// auth 类,**有**真实 refresh 端点(`/userapi/v1/refresh`,实测国际站
|
|
@@ -2448,7 +2505,12 @@ function registerJetHubEndpoints(ctx, pool, auths, modelAdapters) {
|
|
|
2448
2505
|
&& entry.provider !== MONKEYCODE_INTL.id
|
|
2449
2506
|
// ⚠️ 百智云同款:它的三段式(`baizhi.startSession` 走的是另一个入口,
|
|
2450
2507
|
// 但 `account.create { mode:'browser' }` 那条同样登记了 pendingAt)。
|
|
2451
|
-
&& entry.provider !== BAIZHI.id
|
|
2508
|
+
&& entry.provider !== BAIZHI.id
|
|
2509
|
+
// ⚠️ 腾讯 Marvis 同款(2026-11-09 评审 I1):它的 `account.create
|
|
2510
|
+
// { mode:'browser' }` 分支同样登记 `magicrewBrowserLoginPendingAt`。
|
|
2511
|
+
// 漏这一家 ⇒ 宿主崩溃/重启后那张「凭据未配置」的幽灵卡片**永不收口**,
|
|
2512
|
+
// 用户只能自己删号(且删除会连带清掉可能已写好的凭据)。
|
|
2513
|
+
&& entry.provider !== MARVIS.id)
|
|
2452
2514
|
continue;
|
|
2453
2515
|
// 判据 1:有在途任务 ⇒ 用户可能正在窗口里登录,绝不碰。
|
|
2454
2516
|
if (magicrewBrowserLoginInFlight.has(entry.id))
|
|
@@ -4134,6 +4196,190 @@ function registerJetHubEndpoints(ctx, pool, auths, modelAdapters) {
|
|
|
4134
4196
|
* 会把同一个账号认成新账号)。命中既有账号时把新凭据写回**它自己的 ref**
|
|
4135
4197
|
* 并回填昵称 / 有效期,返回**原来的** `accountId`。
|
|
4136
4198
|
*/
|
|
4199
|
+
/**
|
|
4200
|
+
* ## 腾讯 Marvis(2026-11-09)
|
|
4201
|
+
*
|
|
4202
|
+
* 两条登录路径,按 `req.mode` 分流:
|
|
4203
|
+
*
|
|
4204
|
+
* | mode | 形态 | 时长 | 失败形态 |
|
|
4205
|
+
* |---|---|---|---|
|
|
4206
|
+
* | `'browser'` | 开隔离浏览器 → QQ / 微信 授权 → 回调带 `code` → 兑换 | 分钟级(等用户) | 先建占位条目,`login.poll` 报终态并**删掉**它 |
|
|
4207
|
+
* | `'magpie-import'` | **宿主自己读**本机 magpie 的 `plugin-auth.json`(凭据已含 access/refresh/openid/guid) | 毫秒级(无上游请求) | 立刻回可读错误、**不建账号** |
|
|
4208
|
+
*
|
|
4209
|
+
* ⚠️ 判重按 **`openid`**(不是 `access_token`):Marvis 续期**不换**
|
|
4210
|
+
* access_token 只重置有效期,但重登会签发新的 ⇒ 用 token 判重会
|
|
4211
|
+
* 「每登一次多一张卡」(`src/account-pool.ts` 里 AutoClaw 的同型事故)。
|
|
4212
|
+
* ⚠️ `guid` 每次登录都**新造**(token 与设备绑定,用本机 svid 会让多个
|
|
4213
|
+
* 账号互相顶号)⇒ 它绝不能当身份判据。
|
|
4214
|
+
*/
|
|
4215
|
+
if (provider === MARVIS.id && req.mode === 'magpie-import') {
|
|
4216
|
+
/**
|
|
4217
|
+
* ## 为什么默认由**宿主**去读文件
|
|
4218
|
+
*
|
|
4219
|
+
* 2026-11-09 用户报障:弹窗里放 textarea 让用户自己打开
|
|
4220
|
+
* `~/.config/magpie/plugin-auth.json` 抄一段 JSON —— 而这个文件就在
|
|
4221
|
+
* 本机、插件自己就能读。把「找文件 + 精确复制」外包给用户没有任何收益,
|
|
4222
|
+
* 只会多出「漏一个括号就报凭据不完整」的失败面。
|
|
4223
|
+
*
|
|
4224
|
+
* `req.magpieCredential` 仍然接受(自动化脚本 / 老客户端),但**空串与
|
|
4225
|
+
* 缺省都当作「没给」**⇒ 走文件读取。判据必须是 `trim() !== ''`:
|
|
4226
|
+
* 客户端如果发来空串(表单没填就点了按钮),不能把它当成「用户提供了
|
|
4227
|
+
* 一段空 JSON」而报解析失败 —— 那样用户看到的原因是错的。
|
|
4228
|
+
*/
|
|
4229
|
+
const pasted = typeof req.magpieCredential === 'string' ? req.magpieCredential.trim() : '';
|
|
4230
|
+
const imported = pasted === ''
|
|
4231
|
+
? auths.marvis.readMagpieCredential()
|
|
4232
|
+
: (() => {
|
|
4233
|
+
const credential = importCredentialFromMagpie(pasted);
|
|
4234
|
+
return credential === undefined
|
|
4235
|
+
? { error: '没有从粘贴内容里读到 Marvis 凭据:需要 access / refresh / metadata.openid / metadata.guid 四个字段。' }
|
|
4236
|
+
: { credential };
|
|
4237
|
+
})();
|
|
4238
|
+
if ('error' in imported) {
|
|
4239
|
+
// ⚠️ 读不到 ⇒ **不建账号**(占位条目只会变成幽灵卡片)。
|
|
4240
|
+
//
|
|
4241
|
+
// ⚠️⚠️ `error` **必须是对象**(`{code,message}`),不能是字符串:
|
|
4242
|
+
// `reply()` 会用 `{...result.error, details:{}}` 归一化,而展开
|
|
4243
|
+
// 一个字符串得到的是 `{"0":"没","1":"有",…}` ⇒ 客户端拿不到
|
|
4244
|
+
// `code`/`message`,直接抛
|
|
4245
|
+
// `connection: invalid server-response failure`(2026-11-09 真机
|
|
4246
|
+
// 报障:弹窗里只有这一句,用户看不出是「文件没读到」)。
|
|
4247
|
+
return { ok: false, error: { code: 'bad-request', message: imported.error } };
|
|
4248
|
+
}
|
|
4249
|
+
const credential = imported.credential;
|
|
4250
|
+
// ⚠️ 顺序:先写凭据、再建/改账号(与 magicrew 的 local-browser 分支同款)。
|
|
4251
|
+
const existing = await findMarvisAccountByOpenid({
|
|
4252
|
+
ctx,
|
|
4253
|
+
pool,
|
|
4254
|
+
openid: credential.openid,
|
|
4255
|
+
skipAccountId: id,
|
|
4256
|
+
});
|
|
4257
|
+
if (existing !== undefined) {
|
|
4258
|
+
await ctx.credentials.set(credentialRef(existing.credentialRef), JSON.stringify(credential));
|
|
4259
|
+
await pool.updateAccount(existing.id, {
|
|
4260
|
+
nickname: marvisAccountLabel(credential.nickname, credential.login_type),
|
|
4261
|
+
...marvisExpiresAtPatch(credential),
|
|
4262
|
+
});
|
|
4263
|
+
return { ok: true, value: { accountId: existing.id, loginUrl: '', reused: true } };
|
|
4264
|
+
}
|
|
4265
|
+
await ctx.credentials.set(credentialRef(refName), JSON.stringify(credential));
|
|
4266
|
+
await pool.addAccount({
|
|
4267
|
+
id,
|
|
4268
|
+
provider: MARVIS.id,
|
|
4269
|
+
nickname: marvisAccountLabel(credential.nickname, credential.login_type),
|
|
4270
|
+
enabled: true,
|
|
4271
|
+
credentialRef: refName,
|
|
4272
|
+
refreshable: true,
|
|
4273
|
+
createdAt: Date.now(),
|
|
4274
|
+
...marvisExpiresAtPatch(credential),
|
|
4275
|
+
});
|
|
4276
|
+
return { ok: true, value: { accountId: id, loginUrl: '' } };
|
|
4277
|
+
}
|
|
4278
|
+
if (provider === MARVIS.id && req.mode === 'browser') {
|
|
4279
|
+
/**
|
|
4280
|
+
* ① 占位条目:**先登记再开窗**。顺序不可颠倒 —— `login.poll` 在这之后
|
|
4281
|
+
* 任何一刻到达都必须能查到它(客户端 1 秒一拍,而开浏览器要几百毫秒)。
|
|
4282
|
+
*/
|
|
4283
|
+
await pool.addAccount({
|
|
4284
|
+
id,
|
|
4285
|
+
provider: MARVIS.id,
|
|
4286
|
+
nickname: id,
|
|
4287
|
+
enabled: true,
|
|
4288
|
+
credentialRef: refName,
|
|
4289
|
+
refreshable: true,
|
|
4290
|
+
createdAt: Date.now(),
|
|
4291
|
+
});
|
|
4292
|
+
magicrewBrowserLoginPendingAt.set(id, Date.now());
|
|
4293
|
+
/** 登录渠道:缺省 QQ(`'1'`),`'2'` = 微信。 */
|
|
4294
|
+
const loginType = req.marvisLoginType === '2' ? '2' : '1';
|
|
4295
|
+
/**
|
|
4296
|
+
* ② 后台任务(**不 await**):开窗 → 等用户扫码/点授权 → 截获回调 →
|
|
4297
|
+
* 兑换凭据 → 落库。与 magicrew / monkeycode 同一条纪律。
|
|
4298
|
+
*/
|
|
4299
|
+
const task = (async () => {
|
|
4300
|
+
let credential;
|
|
4301
|
+
try {
|
|
4302
|
+
credential = await auths.marvis.loginViaBrowser(loginType);
|
|
4303
|
+
}
|
|
4304
|
+
catch (error) {
|
|
4305
|
+
// 抛错 = 真失败(浏览器起不来 / 兑换被拒)。文案原样交给 `failLogin`。
|
|
4306
|
+
const message = await failLogin(id, error);
|
|
4307
|
+
return message === undefined
|
|
4308
|
+
? { done: true, success: true }
|
|
4309
|
+
: { done: true, success: false, error: message };
|
|
4310
|
+
}
|
|
4311
|
+
if (credential === undefined) {
|
|
4312
|
+
// `undefined` = 用户没登完(超时 / 关窗)。仍是**终态**:
|
|
4313
|
+
// 占位条目留着就是幽灵卡片(IKLI7J 的形态)⇒ 同样走 `failLogin`。
|
|
4314
|
+
const message = await failLogin(id, new Error('网页登录未完成(超时或窗口已关闭)'));
|
|
4315
|
+
return message === undefined
|
|
4316
|
+
? { done: true, success: true }
|
|
4317
|
+
: { done: true, success: false, error: message };
|
|
4318
|
+
}
|
|
4319
|
+
// 这一步之后凭据已在库里 ⇒ 任何失败都**不得**再删号(`failLogin` 自己会判)。
|
|
4320
|
+
const existing = await findMarvisAccountByOpenid({
|
|
4321
|
+
ctx,
|
|
4322
|
+
pool,
|
|
4323
|
+
openid: credential.openid,
|
|
4324
|
+
skipAccountId: id,
|
|
4325
|
+
});
|
|
4326
|
+
if (existing !== undefined) {
|
|
4327
|
+
/**
|
|
4328
|
+
* ⚠️⚠️ **必须**先记合并重定向(2026-11-09 评审 C1,IKLI7J 同型)。
|
|
4329
|
+
*
|
|
4330
|
+
* 本分支会删掉自己的占位条目 ⇒ `login.poll` 的四道出口全部落空:
|
|
4331
|
+
* `loginFailureOf`(undefined) → `accounts.find`(占位已删) →
|
|
4332
|
+
* `takeFreshLoginMergedRedirect`(从没记过) →
|
|
4333
|
+
* `magicrewBrowserLoginInFlight.has`(任务已结束) ⇒ 永远
|
|
4334
|
+
* `{done:false}`。用户看到的是「授权成功、账号也建好了,弹窗却转
|
|
4335
|
+
* 5 分钟圈然后报超时」,且该路径不 `loadAccounts()` ⇒ 卡片不刷新。
|
|
4336
|
+
*
|
|
4337
|
+
* 这是**主路径**:`findMarvisAccountByOpenid` 按 openid 判重,
|
|
4338
|
+
* 同一账号第二次登录必然命中本分支。
|
|
4339
|
+
*/
|
|
4340
|
+
rememberLoginMergedRedirect(id, existing.id);
|
|
4341
|
+
/**
|
|
4342
|
+
* ⚠️ **顺序不能反:先删自己的占位,再写旧卡的凭据**(2026-11-02 二审自纠)。
|
|
4343
|
+
*
|
|
4344
|
+
* `account-pool.removeAccount` 内部会 `credentials.unset(自己条目的 ref)`。
|
|
4345
|
+
* 正常情况两张卡的 ref 由不同的 Key 派生、不会相同;但**万一相同**
|
|
4346
|
+
* (上游哪天改成复用同一把 Key),先写后删就会把刚写进旧卡的那份凭据
|
|
4347
|
+
* 一起清掉 —— 表现为旧卡突然「凭据未配置」,且没有任何错误日志。
|
|
4348
|
+
* 反过来先删,最坏只是旧卡没写成、占位已消失,用户重登一次即可。
|
|
4349
|
+
*/
|
|
4350
|
+
await pool.removeAccount(id).catch(() => undefined);
|
|
4351
|
+
await ctx.credentials.set(credentialRef(existing.credentialRef), JSON.stringify(credential));
|
|
4352
|
+
await pool.updateAccount(existing.id, {
|
|
4353
|
+
nickname: marvisAccountLabel(credential.nickname, credential.login_type),
|
|
4354
|
+
...marvisExpiresAtPatch(credential),
|
|
4355
|
+
});
|
|
4356
|
+
return { done: true, success: true };
|
|
4357
|
+
}
|
|
4358
|
+
await ctx.credentials.set(credentialRef(refName), JSON.stringify(credential));
|
|
4359
|
+
await pool.updateAccount(id, {
|
|
4360
|
+
nickname: marvisAccountLabel(credential.nickname, credential.login_type),
|
|
4361
|
+
...marvisExpiresAtPatch(credential),
|
|
4362
|
+
});
|
|
4363
|
+
return { done: true, success: true };
|
|
4364
|
+
})();
|
|
4365
|
+
magicrewBrowserLoginInFlight.set(id, task);
|
|
4366
|
+
/**
|
|
4367
|
+
* ③ 任务结束后**必须**清两张表(`finally` 而不是 `.then`):否则一次失败
|
|
4368
|
+
* 就把这个 id 永久钉在表里(表无界增长、同一 id 再也开不了新一轮)。
|
|
4369
|
+
*/
|
|
4370
|
+
void (async () => {
|
|
4371
|
+
try {
|
|
4372
|
+
await task;
|
|
4373
|
+
}
|
|
4374
|
+
catch {
|
|
4375
|
+
// 不该发生:上面两个分支都把异常收成了返回值。仍要兜住 ——
|
|
4376
|
+
// 一次未捕获拒绝会跳过下面的清理。
|
|
4377
|
+
}
|
|
4378
|
+
magicrewBrowserLoginInFlight.delete(id);
|
|
4379
|
+
magicrewBrowserLoginPendingAt.delete(id);
|
|
4380
|
+
})();
|
|
4381
|
+
return { ok: true, value: { accountId: id, loginUrl: '' } };
|
|
4382
|
+
}
|
|
4137
4383
|
if (magicrewSite !== undefined && magicrewAuthOf !== undefined && req.mode === 'local-browser') {
|
|
4138
4384
|
let credential;
|
|
4139
4385
|
try {
|
|
@@ -9535,6 +9781,44 @@ function registerJetHubEndpoints(ctx, pool, auths, modelAdapters) {
|
|
|
9535
9781
|
const value = { enabled: pool.sessionBalanceEnabled() };
|
|
9536
9782
|
return { ok: true, value };
|
|
9537
9783
|
}
|
|
9784
|
+
// ── 「严格手动顺序」(账号面板上每张渠道卡片一个开关)──
|
|
9785
|
+
//
|
|
9786
|
+
// 语义:**开** = 拖拽顺序是**唯一**的选号优先级(余额档位退化为「可用 /
|
|
9787
|
+
// 不可用」判据,「锁定永久积分」照旧生效);**关**(缺键默认)= 升级前行为
|
|
9788
|
+
// (余额分档优先、档内才看手动顺序)。
|
|
9789
|
+
//
|
|
9790
|
+
// 消费方是 `credential-resolver.ts` 的分档编排(每次现读
|
|
9791
|
+
// `pool.strictManualOrder(providerId)`)。没有它时面板文案
|
|
9792
|
+
//「拖动卡片调整排序,按顺序选号」对**走余额分档的渠道**是一句假话 ——
|
|
9793
|
+
// 那正是「拖拽时灵时不灵」这条报障的根。
|
|
9794
|
+
case 'strictManualOrder.getEnabled': {
|
|
9795
|
+
const req = payload;
|
|
9796
|
+
if (typeof req?.provider !== 'string' || req.provider.length === 0) {
|
|
9797
|
+
return { ok: false, error: { code: 'bad-request', message: 'provider 必填' } };
|
|
9798
|
+
}
|
|
9799
|
+
const value = {
|
|
9800
|
+
enabled: pool.strictManualOrder(req.provider),
|
|
9801
|
+
};
|
|
9802
|
+
return { ok: true, value };
|
|
9803
|
+
}
|
|
9804
|
+
case 'strictManualOrder.setEnabled': {
|
|
9805
|
+
const req = payload;
|
|
9806
|
+
if (typeof req?.provider !== 'string' || req.provider.length === 0) {
|
|
9807
|
+
return { ok: false, error: { code: 'bad-request', message: 'provider 必填' } };
|
|
9808
|
+
}
|
|
9809
|
+
// ⚠️ 与 `sessionBalance.setEnabled` 同约定:**不做默认值猜测** ——
|
|
9810
|
+
// 默认成 true 会静默打开用户特意关闭的开关(而本开关会改变选号策略,
|
|
9811
|
+
// 静默打开等于用户不知情地开始按拖拽序发请求)。
|
|
9812
|
+
if (typeof req.enabled !== 'boolean') {
|
|
9813
|
+
return { ok: false, error: { code: 'bad-request', message: '非空布尔 enabled 必填' } };
|
|
9814
|
+
}
|
|
9815
|
+
await pool.setStrictManualOrder(req.provider, req.enabled);
|
|
9816
|
+
// 不刷新任何缓存:选号路径**每次现读** `pool.strictManualOrder(provider)`。
|
|
9817
|
+
ctx.logger.info(`[jet-hub] ${req.enabled ? '打开' : '关闭'} ${req.provider} 的严格手动顺序`
|
|
9818
|
+
+ `${req.enabled ? '(选号完全按拖拽序,余额档位只判可用性)' : '(回到余额分档优先)'}`);
|
|
9819
|
+
const value = { enabled: pool.strictManualOrder(req.provider) };
|
|
9820
|
+
return { ok: true, value };
|
|
9821
|
+
}
|
|
9538
9822
|
// ── 「面板入口」(插件详情页设置卡片里的下拉)──
|
|
9539
9823
|
//
|
|
9540
9824
|
// 语义:Jet Hub 的**唯一**入口位置,两个取值严格互斥 ——
|
|
@@ -10045,11 +10329,28 @@ function registerJetHubEndpoints(ctx, pool, auths, modelAdapters) {
|
|
|
10045
10329
|
}
|
|
10046
10330
|
}
|
|
10047
10331
|
}
|
|
10048
|
-
/**
|
|
10332
|
+
/**
|
|
10333
|
+
* 构造带 rpcId 的响应 JSON。
|
|
10334
|
+
*
|
|
10335
|
+
* ⚠️ 失败结果的 `error` 有**两种**形状:`{ code, message }`(正常)与裸字符串
|
|
10336
|
+
* (早期几个分支的写法)。后者若直接透传,客户端会看到
|
|
10337
|
+
* `{"0":"没","1":"有",…}` ⇒ 拿不到 `code`/`message` ⇒ 抛
|
|
10338
|
+
* `connection: invalid server-response failure`(2026-11-09 marvis 真机报障)。
|
|
10339
|
+
* ⇒ 这里**统一兜底**成对象:字符串包成 `bad-request`,缺 `details` 的补空对象。
|
|
10340
|
+
* 各分支自己的形状保持不变(只是不再能漏到 wire 上)。
|
|
10341
|
+
*/
|
|
10049
10342
|
function reply(rpcId, result) {
|
|
10050
|
-
|
|
10051
|
-
|
|
10052
|
-
|
|
10343
|
+
let value = result;
|
|
10344
|
+
if (typeof result === 'object' && result !== null && result.ok === false) {
|
|
10345
|
+
const record = result;
|
|
10346
|
+
const error = record.error;
|
|
10347
|
+
value = {
|
|
10348
|
+
...record,
|
|
10349
|
+
error: typeof error === 'string'
|
|
10350
|
+
? { code: 'bad-request', message: error, details: {} }
|
|
10351
|
+
: { ...error, details: {} },
|
|
10352
|
+
};
|
|
10353
|
+
}
|
|
10053
10354
|
return Response.json({ type: 'server-response', rpcId, result: value });
|
|
10054
10355
|
}
|
|
10055
10356
|
//# sourceMappingURL=jet-hub-rpc.js.map
|