creditdaddy 1.6.5 → 1.6.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/build.json +3 -3
- package/package.json +2 -2
- package/src/checkin.js +4 -1
- package/src/daemon.js +7 -3
- package/src/i18n/en.json +5 -2
- package/src/i18n/ja.json +6 -3
- package/src/i18n/ko.json +5 -2
- package/src/i18n/zh-TW.json +5 -2
- package/src/loomyClient.js +5 -3
- package/src/loomyLocal.js +15 -3
- package/src/minimaxGateway.js +5 -0
- package/src/panel.html +13 -5
- package/src/qoderApp.js +23 -0
- package/src/tenrouter.js +16 -4
- package/src/traeClient.js +31 -9
- package/src/traeGateway.js +6 -0
- package/src/workbuddyClient.js +1 -0
- package/src/workbuddyLocal.js +179 -16
- package/src/zcodeClient.js +1 -0
package/README.md
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
# CreditDaddy
|
|
6
6
|
|
|
7
|
-
**AI 编程工具多账号本地管理 + 每日积分自动领取(领鸡蛋)助手:Qoder · WorkBuddy · ZCode · mirasim · 妙手 · Trae · MiniMax · ModelScope ·
|
|
7
|
+
**AI 编程工具多账号本地管理 + 每日积分自动领取(领鸡蛋)助手:Qoder · WorkBuddy · ZCode · mirasim · 妙手 · Trae · MiniMax · ModelScope · 豆包 Doubao · 讯飞 Loomy,集成 10Router 额度总览、用量同步与网页会话额度卡(Token Harbor / 小米 MiMo / River / ModelScope 魔搭 / LongCat)**
|
|
8
8
|
|
|
9
9
|
[](https://github.com/techysy/CreditDaddy/releases/latest)
|
|
10
10
|
[](https://github.com/techysy/CreditDaddy/actions/workflows/ci.yml)
|
package/build.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "creditdaddy",
|
|
3
|
-
"version": "1.6.
|
|
4
|
-
"description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae / MiniMax / ModelScope / 豆包 多账号本地管理与每日积分自动签到助手,及 10Router 供应商 Cookie 会话捕获与外部配额(Token Harbor / 小米 MiMo / River / ModelScope 魔搭 / LongCat)",
|
|
3
|
+
"version": "1.6.6",
|
|
4
|
+
"description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae / MiniMax / ModelScope / 豆包 Doubao / 讯飞 Loomy 多账号本地管理与每日积分自动签到助手,及 10Router 供应商 Cookie 会话捕获与外部配额(Token Harbor / 小米 MiMo / River / ModelScope 魔搭 / LongCat)",
|
|
5
5
|
"homepage": "https://github.com/techysy/CreditDaddy",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
package/src/checkin.js
CHANGED
|
@@ -9,6 +9,7 @@ import { productOf, PROVIDER_LABEL } from './constants.js';
|
|
|
9
9
|
import { startUsageSyncScheduler } from './tenrouter.js';
|
|
10
10
|
import { refreshContext } from './accounts.js';
|
|
11
11
|
import { zcodeAutoClaim } from './zcodeAutoClaim.js';
|
|
12
|
+
import { traePrimaryIds } from './traeClient.js';
|
|
12
13
|
import { clearQuotaMark } from './zcodeGateway.js';
|
|
13
14
|
import {
|
|
14
15
|
autoClaimEnabled, autoClaimUntil, enableAutoClaimFor, setAutoClaimEnabled,
|
|
@@ -252,6 +253,8 @@ async function runTickInner(opts) {
|
|
|
252
253
|
const today = dayKey();
|
|
253
254
|
const results = [];
|
|
254
255
|
let deviceClaim = state?.deviceClaim?.day === today ? state.deviceClaim : null;
|
|
256
|
+
// Trae 同机多账号:真机 deviceId 只给每个设备的首账号(其余走派生号),按全量账号顺序定
|
|
257
|
+
const traePrimary = traePrimaryIds(allAccounts);
|
|
255
258
|
|
|
256
259
|
for (const account of accounts) {
|
|
257
260
|
const pTag = `[${PROVIDER_LABEL[account.provider] || account.provider}]`;
|
|
@@ -264,7 +267,7 @@ async function runTickInner(opts) {
|
|
|
264
267
|
continue;
|
|
265
268
|
}
|
|
266
269
|
|
|
267
|
-
const ctx = refreshContext(account, (message) => logger.info('CHECKIN', '{label}:{msg}', { label, msg: message }));
|
|
270
|
+
const ctx = { ...refreshContext(account, (message) => logger.info('CHECKIN', '{label}:{msg}', { label, msg: message })), traePrimaryIds: traePrimary };
|
|
268
271
|
let outcome = await productImpl(account.provider).checkin(account, ctx);
|
|
269
272
|
outcome = { accountId: account.id, account: label, provider: account.provider, ...outcome };
|
|
270
273
|
if (account.provider === 'qoder' && outcome.risk) {
|
package/src/daemon.js
CHANGED
|
@@ -1047,7 +1047,7 @@ async function handleApi(req, res, url) {
|
|
|
1047
1047
|
return json(res, 200, { ok: true, ...r });
|
|
1048
1048
|
} catch (e) {
|
|
1049
1049
|
logger.warn('DAEMON', 'Loomy 切换到 {name} 失败:{err}', { name: target.name || target.id, err: e.message });
|
|
1050
|
-
return json(res, e.
|
|
1050
|
+
return json(res, e.loomyNotInstalled ? 409 : 400, { error: e.message, code: e.loomyNotInstalled ? 'LOOMY_NOT_INSTALLED' : undefined });
|
|
1051
1051
|
}
|
|
1052
1052
|
}
|
|
1053
1053
|
if (target.provider === 'qoder' || target.provider === 'qoder-cn') {
|
|
@@ -1793,8 +1793,12 @@ async function handleApi(req, res, url) {
|
|
|
1793
1793
|
// 「同步到 10Router」的口径,不被本机凭据线(如 minimax)搭车
|
|
1794
1794
|
if (body?.webSessionOnly === true) {
|
|
1795
1795
|
const accounts = await loadAccounts();
|
|
1796
|
-
|
|
1797
|
-
|
|
1796
|
+
// 用户显式取消勾选的渠道(10R 已有同源连接防重复卡)在这里同样要尊重——
|
|
1797
|
+
// pushQuotaCards 的 disabled 过滤只在无 onlySources 时生效,本分支自带 source 清单
|
|
1798
|
+
const trCfg = tenrouter.loadConfig();
|
|
1799
|
+
const disabled = Array.isArray(trCfg.quotaPushDisabledProviders) ? trCfg.quotaPushDisabledProviders : [];
|
|
1800
|
+
const wsAccounts = accounts.filter((a) => (a.meta?.cookieSiteId || a.provider === 'tokenharbor') && !disabled.includes(a.provider));
|
|
1801
|
+
const sources = new Set(disabled.includes('tokenharbor') ? [] : ['tokenharbor']); // tokenharbor 单一 source(聚合卡),无账号也可能要清旧卡
|
|
1798
1802
|
for (const a of wsAccounts) {
|
|
1799
1803
|
if (a.provider === 'xiaomi-mimo' || a.meta?.cookieSiteId === 'xiaomi-mimo') {
|
|
1800
1804
|
const { buildXiaomiMimoQuotaPayload } = await import('./xiaomiMimoClient.js');
|
package/src/i18n/en.json
CHANGED
|
@@ -1760,7 +1760,6 @@
|
|
|
1760
1760
|
"邀请码已提交": "Invite code submitted",
|
|
1761
1761
|
"<button class=\"icon-btn\" data-act=\"invite\" title=\"填写邀请码(绑定后 +5000 永久积分,每号仅一次)\">": "<button class=\"icon-btn\" data-act=\"invite\" title=\"Fill in invite code (binds +5,000 permanent points, once per account)\">",
|
|
1762
1762
|
" <span class=\"dim\">客户端:未安装(本机导入 / 切换需要 Windows Loomy 客户端)</span>": " <span class=\"dim\">Client: not installed (local import / switching needs the Windows Loomy client)</span>",
|
|
1763
|
-
"\\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\\nSwitching closes and reopens the Loomy client. Note: the client UI keeps its login state in its own storage — if it still shows the old account after reopening, log out inside the client and sign in again.",
|
|
1764
1763
|
"已重新打开 Loomy 客户端。注意:Loomy 的界面登录态存在客户端内部存储——若仍显示旧账号,请在客户端「退出登录」后重新登录目标账号": "Loomy client reopened. Note: the client UI keeps its login state in its own storage — if it still shows the old account, log out inside the client and sign in with the target account.",
|
|
1765
1764
|
"请输入正确的 11 位手机号": "Enter a valid 11-digit phone number",
|
|
1766
1765
|
"发送中…": "Sending…",
|
|
@@ -1822,6 +1821,10 @@
|
|
|
1822
1821
|
"暂不可领:": "Not claimable now: ",
|
|
1823
1822
|
"没有可领取的活动": "No claimable activities",
|
|
1824
1823
|
"已领取:": "Claimed: ",
|
|
1824
|
+
"未找到 Loomy 客户端可执行文件": "Loomy client executable not found",
|
|
1825
1825
|
"\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\nSwitching closes and reopens the Loomy client. Note: the client UI keeps its login state in its own storage — if it still shows the old account after reopening, log out inside the client and sign in again.",
|
|
1826
|
-
"
|
|
1826
|
+
"本机未安装 Loomy 客户端,无法切换(切换是把登录写入客户端凭据,由客户端应用)": "Loomy client is not installed on this machine; cannot switch (switching writes the login into the client credential for the client to apply)",
|
|
1827
|
+
"Loomy 客户端仅支持 Windows,本平台无法切换": "The Loomy client is Windows-only; switching is not possible on this platform",
|
|
1828
|
+
"调度轮读取配置失败,跳过本轮:{err}": "Scheduler round failed to read config, skipping this round: {err}",
|
|
1829
|
+
"无法切换账号:目标账号为 WorkBuddy 5.6+ 加密凭据,但未能获取客户端解密密钥": "Cannot switch account: the target account uses WorkBuddy 5.6+ encrypted credentials, but the client decryption key could not be obtained"
|
|
1827
1830
|
}
|
package/src/i18n/ja.json
CHANGED
|
@@ -1760,7 +1760,6 @@
|
|
|
1760
1760
|
"邀请码已提交": "招待コードを送信しました",
|
|
1761
1761
|
"<button class=\"icon-btn\" data-act=\"invite\" title=\"填写邀请码(绑定后 +5000 永久积分,每号仅一次)\">": "<button class=\"icon-btn\" data-act=\"invite\" title=\"招待コードを入力(バインドで永久ポイント +5,000、1アカウント1回)\">",
|
|
1762
1762
|
" <span class=\"dim\">客户端:未安装(本机导入 / 切换需要 Windows Loomy 客户端)</span>": " <span class=\"dim\">クライアント: 未インストール(ローカル取り込み / 切替には Windows 版 Loomy クライアントが必要)</span>",
|
|
1763
|
-
"\\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\\n切替すると Loomy クライアントを一旦終了して再起動します。注意: クライアント UI のログイン状態は内部ストアに保持されるため、再起動後も旧アカウントが表示される場合はクライアント内でログアウト→再ログインしてください。",
|
|
1764
1763
|
"已重新打开 Loomy 客户端。注意:Loomy 的界面登录态存在客户端内部存储——若仍显示旧账号,请在客户端「退出登录」后重新登录目标账号": "Loomy クライアントを再起動しました。注意: Loomy の UI ログイン状態はクライアント内部ストアに保持されます——旧アカウントが表示され続ける場合は、クライアントでログアウトして対象アカウントで再ログインしてください。",
|
|
1765
1764
|
"请输入正确的 11 位手机号": "正しい 11 桁の電話番号を入力してください",
|
|
1766
1765
|
"发送中…": "送信中…",
|
|
@@ -1819,9 +1818,13 @@
|
|
|
1819
1818
|
"请输入 6 位短信验证码": "6 桁の SMS 認証コードを入力してください",
|
|
1820
1819
|
"<span class=\"lbl\">积分合计</span><span class=\"val\">": "<span class=\"lbl\">ポイント合計</span><span class=\"val\">",
|
|
1821
1820
|
"已领过:": "取得済み:",
|
|
1822
|
-
"暂不可领:": "
|
|
1821
|
+
"暂不可领:": "現在取得不可:",
|
|
1823
1822
|
"没有可领取的活动": "取得できるアクティビティがありません",
|
|
1824
1823
|
"已领取:": "取得しました:",
|
|
1824
|
+
"未找到 Loomy 客户端可执行文件": "Loomy クライアントの実行ファイルが見つかりません",
|
|
1825
1825
|
"\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\n切替すると Loomy クライアントを一旦終了して再起動します。注意: クライアント UI のログイン状態は内部ストアに保持されるため、再起動後も旧アカウントが表示される場合はクライアント内でログアウト→再ログインしてください。",
|
|
1826
|
-
"
|
|
1826
|
+
"本机未安装 Loomy 客户端,无法切换(切换是把登录写入客户端凭据,由客户端应用)": "このマシンに Loomy クライアントは未インストールのため切替できません(切替はログイン情報をクライアントの認証情報に書き込み、クライアントが適用します)",
|
|
1827
|
+
"Loomy 客户端仅支持 Windows,本平台无法切换": "Loomy クライアントは Windows のみ対応で、このプラットフォームでは切替できません",
|
|
1828
|
+
"调度轮读取配置失败,跳过本轮:{err}": "スケジュール輪の設定読込に失敗、本輪をスキップ:{err}",
|
|
1829
|
+
"无法切换账号:目标账号为 WorkBuddy 5.6+ 加密凭据,但未能获取客户端解密密钥": "アカウントを切替できません:対象アカウントは WorkBuddy 5.6+ 暗号化認証情報ですが、クライアントの復号鍵を取得できませんでした"
|
|
1827
1830
|
}
|
package/src/i18n/ko.json
CHANGED
|
@@ -1760,7 +1760,6 @@
|
|
|
1760
1760
|
"邀请码已提交": "초대 코드 제출됨",
|
|
1761
1761
|
"<button class=\"icon-btn\" data-act=\"invite\" title=\"填写邀请码(绑定后 +5000 永久积分,每号仅一次)\">": "<button class=\"icon-btn\" data-act=\"invite\" title=\"초대 코드 입력(바인딩 시 영구 포인트 +5,000, 계정당 1회)\">",
|
|
1762
1762
|
" <span class=\"dim\">客户端:未安装(本机导入 / 切换需要 Windows Loomy 客户端)</span>": " <span class=\"dim\">클라이언트: 미설치(로컬 가져오기 / 전환에는 Windows Loomy 클라이언트 필요)</span>",
|
|
1763
|
-
"\\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\\n전환하면 Loomy 클라이언트를 닫았다가 다시 엽니다. 주의: 클라이언트 UI의 로그인 상태는 내부 저장소에 유지되므로, 재기동 후에도 이전 계정이 보이면 클라이언트 내에서 로그아웃 후 다시 로그인하세요.",
|
|
1764
1763
|
"已重新打开 Loomy 客户端。注意:Loomy 的界面登录态存在客户端内部存储——若仍显示旧账号,请在客户端「退出登录」后重新登录目标账号": "Loomy 클라이언트를 다시 열었습니다. 주의: Loomy UI 로그인 상태는 클라이언트 내부 저장소에 유지됩니다——이전 계정이 계속 표시되면 클라이언트에서 로그아웃한 뒤 대상 계정으로 다시 로그인하세요.",
|
|
1765
1764
|
"请输入正确的 11 位手机号": "올바른 11자리 휴대폰 번호를 입력하세요",
|
|
1766
1765
|
"发送中…": "전송 중…",
|
|
@@ -1822,6 +1821,10 @@
|
|
|
1822
1821
|
"暂不可领:": "현재 수령 불가:",
|
|
1823
1822
|
"没有可领取的活动": "수령 가능한 활동이 없습니다",
|
|
1824
1823
|
"已领取:": "수령 완료:",
|
|
1824
|
+
"未找到 Loomy 客户端可执行文件": "Loomy 클라이언트 실행 파일을 찾을 수 없습니다",
|
|
1825
1825
|
"\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\n전환하면 Loomy 클라이언트를 닫았다가 다시 엽니다. 주의: 클라이언트 UI의 로그인 상태는 내부 저장소에 유지되므로, 재기동 후에도 이전 계정이 보이면 클라이언트 내에서 로그아웃 후 다시 로그인하세요.",
|
|
1826
|
-
"
|
|
1826
|
+
"本机未安装 Loomy 客户端,无法切换(切换是把登录写入客户端凭据,由客户端应用)": "이 기기에 Loomy 클라이언트가 설치되지 않아 전환할 수 없습니다(전환은 로그인을 클라이언트 자격증명에 기록하여 클라이언트가 적용함)",
|
|
1827
|
+
"Loomy 客户端仅支持 Windows,本平台无法切换": "Loomy 클라이언트는 Windows 전용이므로 이 플랫폼에서 전환할 수 없습니다",
|
|
1828
|
+
"调度轮读取配置失败,跳过本轮:{err}": "스케줄 라운드 설정 읽기 실패, 이번 라운드 건너뜀:{err}",
|
|
1829
|
+
"无法切换账号:目标账号为 WorkBuddy 5.6+ 加密凭据,但未能获取客户端解密密钥": "계정을 전환할 수 없습니다: 대상 계정은 WorkBuddy 5.6+ 암호화 자격 증명이지만 클라이언트 복호화 키를 가져오지 못했습니다"
|
|
1827
1830
|
}
|
package/src/i18n/zh-TW.json
CHANGED
|
@@ -1760,7 +1760,6 @@
|
|
|
1760
1760
|
"邀请码已提交": "邀請碼已提交",
|
|
1761
1761
|
"<button class=\"icon-btn\" data-act=\"invite\" title=\"填写邀请码(绑定后 +5000 永久积分,每号仅一次)\">": "<button class=\"icon-btn\" data-act=\"invite\" title=\"填寫邀請碼(綁定後 +5000 永久積分,每號僅一次)\">",
|
|
1762
1762
|
" <span class=\"dim\">客户端:未安装(本机导入 / 切换需要 Windows Loomy 客户端)</span>": " <span class=\"dim\">客戶端:未安裝(本機導入 / 切換需要 Windows Loomy 客戶端)</span>",
|
|
1763
|
-
"\\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\\n切換會先關閉並重新開啟 Loomy 客戶端。注意:客戶端介面的登入態存在其內部儲存,若重開後仍顯示舊帳號,需在客戶端內「退出登入」後重新登入。",
|
|
1764
1763
|
"已重新打开 Loomy 客户端。注意:Loomy 的界面登录态存在客户端内部存储——若仍显示旧账号,请在客户端「退出登录」后重新登录目标账号": "已重新開啟 Loomy 客戶端。注意:Loomy 的介面登入態存在客戶端內部儲存——若仍顯示舊帳號,請在客戶端「退出登入」後重新登入目標帳號。",
|
|
1765
1764
|
"请输入正确的 11 位手机号": "請輸入正確的 11 位手機號",
|
|
1766
1765
|
"发送中…": "發送中…",
|
|
@@ -1822,6 +1821,10 @@
|
|
|
1822
1821
|
"暂不可领:": "暫不可領:",
|
|
1823
1822
|
"没有可领取的活动": "沒有可領取的活動",
|
|
1824
1823
|
"已领取:": "已領取:",
|
|
1824
|
+
"未找到 Loomy 客户端可执行文件": "未找到 Loomy 客戶端可執行檔",
|
|
1825
1825
|
"\n切换会先关闭并重新打开 Loomy 客户端。注意:客户端界面的登录态存在其内部存储,若重开后仍显示旧账号,需在客户端内「退出登录」后重新登录。": "\n切換會先關閉並重新開啟 Loomy 客戶端。注意:客戶端介面的登入態存在其內部儲存,若重開後仍顯示舊帳號,需在客戶端內「退出登入」後重新登入。",
|
|
1826
|
-
"
|
|
1826
|
+
"本机未安装 Loomy 客户端,无法切换(切换是把登录写入客户端凭据,由客户端应用)": "本機未安裝 Loomy 客戶端,無法切換(切換是將登入寫入客戶端憑據,由客戶端套用)",
|
|
1827
|
+
"Loomy 客户端仅支持 Windows,本平台无法切换": "Loomy 客戶端僅支援 Windows,本平台無法切換",
|
|
1828
|
+
"调度轮读取配置失败,跳过本轮:{err}": "排程輪讀取設定失敗,跳過本輪:{err}",
|
|
1829
|
+
"无法切换账号:目标账号为 WorkBuddy 5.6+ 加密凭据,但未能获取客户端解密密钥": "無法切換帳號:目標帳號為 WorkBuddy 5.6+ 加密憑據,但未能取得客戶端解密金鑰"
|
|
1827
1830
|
}
|
package/src/loomyClient.js
CHANGED
|
@@ -119,7 +119,6 @@ export async function verifyLoomyAccount(account) {
|
|
|
119
119
|
export function normalizePointsBalance(data) {
|
|
120
120
|
const d = data?.data || data || {};
|
|
121
121
|
const num = (v) => (Number.isFinite(Number(v)) ? Number(v) : 0);
|
|
122
|
-
const hasAny = d && typeof d === 'object' && Object.keys(d).length > 0;
|
|
123
122
|
const permanent = num(d.balance ?? d.permanentPoints ?? d.currentBalance ?? d.longTermPoints);
|
|
124
123
|
const daily = num(d.dailyBalance ?? d.dailyPoints ?? d.dailyGiftPoints);
|
|
125
124
|
// 每日上限:服务端显式给了就用它的值(哪怕是 0);没给才按客户端文案口径缺省 5000——
|
|
@@ -127,7 +126,10 @@ export function normalizePointsBalance(data) {
|
|
|
127
126
|
const limitRaw = d.dailyLimitPoints ?? d.dailyLimit ?? d.daily_limit;
|
|
128
127
|
const hasLimit = limitRaw !== undefined && limitRaw !== null && limitRaw !== '';
|
|
129
128
|
const dailyLimit = hasLimit ? num(limitRaw) : ((permanent > 0 || daily > 0) ? 5000 : 0);
|
|
130
|
-
|
|
129
|
+
// 总额 = 永久 + 每日上限(容量口径),remaining = 永久 + 每日剩余(余额口径)——
|
|
130
|
+
// 两者相等会让进度条恒满、used 段永远看不见(#审查)
|
|
131
|
+
const total = permanent + dailyLimit;
|
|
132
|
+
const remaining = permanent + daily;
|
|
131
133
|
const parts = [];
|
|
132
134
|
if (permanent > 0) parts.push({ name: '永久积分', total: permanent, used: 0, remaining: permanent, expiresAt: null, recurring: false, unit: '积分' });
|
|
133
135
|
// 服务端上报的 dailyConsumedPoints 存在即直读(哪怕是 0——「今日确实没消耗」),
|
|
@@ -141,7 +143,7 @@ export function normalizePointsBalance(data) {
|
|
|
141
143
|
return {
|
|
142
144
|
total,
|
|
143
145
|
used: dailyUsed,
|
|
144
|
-
remaining
|
|
146
|
+
remaining,
|
|
145
147
|
unit: '积分',
|
|
146
148
|
plan: null,
|
|
147
149
|
parts,
|
package/src/loomyLocal.js
CHANGED
|
@@ -160,12 +160,24 @@ const napAsync = (ms) => new Promise((r) => setTimeout(r, ms));
|
|
|
160
160
|
* 注意:Loomy 客户端界面登录态真源在其渲染层 localStorage(启动时反向推给主进程),
|
|
161
161
|
* 本函数落定的是主进程/opencode 侧的凭据;界面换号仍需在客户端内退出重登。
|
|
162
162
|
*/
|
|
163
|
-
export async function hardSwitchLoomy(account) {
|
|
163
|
+
export async function hardSwitchLoomy(account, { requireClient = true } = {}) {
|
|
164
164
|
if (!account?.token) throw new Error('目标账号缺少 session token');
|
|
165
|
+
// 非 Windows / 未安装客户端:写凭据是死路(凭据文件路径是虚构的、客户端不存在),
|
|
166
|
+
// 不能报「切换成功」——与 WorkBuddy 的 WORKBUDDY_NOT_INSTALLED 同款边界。
|
|
167
|
+
// requireClient=false 仅供测试注入(非 Windows 环境验证写入/复核逻辑)
|
|
168
|
+
if (requireClient && !candidateClientPath()) {
|
|
169
|
+
const err = new Error(process.platform === 'win32'
|
|
170
|
+
? '本机未安装 Loomy 客户端,无法切换(切换是把登录写入客户端凭据,由客户端应用)'
|
|
171
|
+
: 'Loomy 客户端仅支持 Windows,本平台无法切换');
|
|
172
|
+
err.loomyNotInstalled = true;
|
|
173
|
+
throw err;
|
|
174
|
+
}
|
|
165
175
|
const cred = readCredential();
|
|
166
176
|
// 凭据文件缺失(未装过客户端 / 用户在客户端里退出登录把它清空)不该挡切换——
|
|
167
|
-
// 目标账号的 session/userid/phone
|
|
168
|
-
|
|
177
|
+
// 目标账号的 session/userid/phone 在账号库里齐全,直接写就是。
|
|
178
|
+
// userid 只认目标账号自己的:回退到旧凭据的 userid 会把目标 session 配上别人的身份,
|
|
179
|
+
// 徽章(按 uid 比对)会亮在刚切走的账号上
|
|
180
|
+
const userid = account.uid;
|
|
169
181
|
if (!userid) throw new Error('目标账号缺少 userid,无法写入 Loomy 凭据(请重新登录该账号后再切换)');
|
|
170
182
|
if (cred && account.token === cred.session) {
|
|
171
183
|
return { switched: false, alreadyActive: true, closedClient: false, verified: true };
|
package/src/minimaxGateway.js
CHANGED
|
@@ -78,6 +78,11 @@ export function forgetAccount(id) {
|
|
|
78
78
|
dead.delete(id);
|
|
79
79
|
weights.delete(id);
|
|
80
80
|
if (stickyId === id) stickyId = null;
|
|
81
|
+
// 在途权重刷新 resolve 后会把 id 写回 weights——清掉 inflight 句柄并在其落地后补删,
|
|
82
|
+
// 否则删号后残留条目永不回收(无界增长泄漏)
|
|
83
|
+
const inflight = weightInflight.get(id);
|
|
84
|
+
weightInflight.delete(id);
|
|
85
|
+
if (inflight) inflight.catch(() => {}).then(() => { weights.delete(id); });
|
|
81
86
|
}
|
|
82
87
|
|
|
83
88
|
function markCooling(id, ms = ACCOUNT_COOLING_MS) {
|
package/src/panel.html
CHANGED
|
@@ -2855,6 +2855,7 @@ function renderFreePool() {
|
|
|
2855
2855
|
+ '</div>'
|
|
2856
2856
|
+ '<div style="display:flex;align-items:center;gap:6px">' + btn + pasteBtn + clearBtn + eyeBtn + '</div>'
|
|
2857
2857
|
+ '</div>'
|
|
2858
|
+
+ warn
|
|
2858
2859
|
+ hint
|
|
2859
2860
|
+ '</div>'
|
|
2860
2861
|
+ accRows
|
|
@@ -3437,10 +3438,15 @@ async function loadQuotas(ids, opts) {
|
|
|
3437
3438
|
const worker = async () => {
|
|
3438
3439
|
while (queue.length && run === quotaRun) {
|
|
3439
3440
|
const id = queue.shift();
|
|
3440
|
-
|
|
3441
|
-
|
|
3442
|
-
|
|
3443
|
-
|
|
3441
|
+
// fetch 期间可能有新一轮 loadQuotas 进来(如卡片点「刷新」走 live):
|
|
3442
|
+
// 守卫必须在 await **之后**重判——await 前判恒为真,旧批次的结果会盖掉新 live 值
|
|
3443
|
+
let quota = null, err = null;
|
|
3444
|
+
try { quota = (await api('/api/accounts/' + encodeURIComponent(id) + '/quota' + (live ? '?live=1' : ''))).quota; }
|
|
3445
|
+
catch (e) { err = e; }
|
|
3446
|
+
if (run !== quotaRun) continue; // 已被新一轮取代:丢弃本条,不写不渲染
|
|
3447
|
+
if (err) state.quotas[id] = { error: err.message };
|
|
3448
|
+
else state.quotas[id] = quota;
|
|
3449
|
+
render();
|
|
3444
3450
|
}
|
|
3445
3451
|
};
|
|
3446
3452
|
await Promise.all([worker(), worker(), worker()]);
|
|
@@ -3617,7 +3623,9 @@ async function onCardClick(e) {
|
|
|
3617
3623
|
let r;
|
|
3618
3624
|
try { r = await doSwitch(false); }
|
|
3619
3625
|
catch (err) {
|
|
3620
|
-
|
|
3626
|
+
// LOOMY_RUNNING 是死码:Loomy 走硬切换(总是先关再写),不会再回 409;
|
|
3627
|
+
// LOOMY_NOT_INSTALLED 不在列——未装客户端时直接 toast 报错,不该诱导强制切换
|
|
3628
|
+
if (err.code !== 'ZCODE_RUNNING' && err.code !== 'MIRASIM_RUNNING' && err.code !== 'CATPAW_RUNNING' && err.code !== 'TRAE_RUNNING' && err.code !== 'QODER_RUNNING') throw err;
|
|
3621
3629
|
if (!(await uiConfirm(err.message + T('\n\n仍要强制切换吗?强制切换会先关闭客户端再写入登录,重新打开客户端即为新账号。'), client + T(' 正在运行'), T('关闭并强制切换')))) return;
|
|
3622
3630
|
r = await doSwitch(true);
|
|
3623
3631
|
}
|
package/src/qoderApp.js
CHANGED
|
@@ -292,6 +292,8 @@ function riskRunner(provider) {
|
|
|
292
292
|
if (app) return { exe: app.runtimeInfo, env: (VARIANTS.find((v) => v.provider === provider) || VARIANTS[0]).riskEnv, source: 'app' };
|
|
293
293
|
const cli = installedUmid() || bundledCliUmid(provider);
|
|
294
294
|
if (cli) return { exe: cli.path, env: CLI_RISK_ENV[provider] ?? CLI_RISK_ENV.qoder, source: 'cli' };
|
|
295
|
+
const localBin = qodercliRuntimeInfo(provider);
|
|
296
|
+
if (localBin) return { exe: localBin, env: CLI_RISK_ENV[provider] ?? CLI_RISK_ENV.qoder, source: 'cli' };
|
|
295
297
|
return null;
|
|
296
298
|
}
|
|
297
299
|
|
|
@@ -311,6 +313,27 @@ function bundledCliUmid(provider) {
|
|
|
311
313
|
return null;
|
|
312
314
|
}
|
|
313
315
|
|
|
316
|
+
/** macOS:官方 qodercli(@qoder-ai/qodercli)把 runtime-info 设备身份组件解压到 ~\.qoder\.bin\runtime-info-darwin-<arch>-*(国内版 ~\.qoder-cn) */
|
|
317
|
+
function qodercliRuntimeInfo(provider) {
|
|
318
|
+
if (process.platform !== 'darwin') return null;
|
|
319
|
+
const homes = provider === 'qoder-cn' ? ['.qoder-cn', '.qoder'] : ['.qoder', '.qoder-cn'];
|
|
320
|
+
for (const h of homes) {
|
|
321
|
+
const bin = path.join(os.homedir(), h, '.bin');
|
|
322
|
+
let entries = [];
|
|
323
|
+
try { entries = fs.readdirSync(bin, { withFileTypes: true }).filter((n) => n.name.startsWith(`runtime-info-darwin-${process.arch}`)); } catch {}
|
|
324
|
+
if (!entries.length) continue;
|
|
325
|
+
// 版本排序(1.2.10 > 1.2.9,字典序会反);目录形态时拼组件名,文件形态直接用;
|
|
326
|
+
// 必须 exists 校验——升级残留的旧条目/坏条目不能静默选中
|
|
327
|
+
const ver = (name) => name.split('-').slice(-1)[0].split('.').map((x) => Number(x) || 0);
|
|
328
|
+
const cmp = (a, b) => { const va = ver(a), vb = ver(b); for (let i = 0; i < Math.max(va.length, vb.length); i++) { if ((va[i] || 0) !== (vb[i] || 0)) return (va[i] || 0) - (vb[i] || 0); } return 0; };
|
|
329
|
+
for (const e of entries.sort((a, b) => cmp(b.name, a.name))) {
|
|
330
|
+
const p = e.isDirectory() ? path.join(bin, e.name, RUNTIME_INFO_EXE) : path.join(bin, e.name);
|
|
331
|
+
try { if (fs.statSync(p).isFile()) return p; } catch { /* 坏条目跳过,试下一个 */ }
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
return null;
|
|
335
|
+
}
|
|
336
|
+
|
|
314
337
|
/** 获取某账号的设备风控身份;本机既没有 Qoder 客户端也没装设备身份组件时返回 null。 */
|
|
315
338
|
export async function getRiskIdentity(provider, uid) {
|
|
316
339
|
if (!uid) return null;
|
package/src/tenrouter.js
CHANGED
|
@@ -83,11 +83,16 @@ async function saveConfig(c) {
|
|
|
83
83
|
fs.mkdirSync(dataDir(), { recursive: true, mode: 0o700 });
|
|
84
84
|
const { atomicWrite } = await import('./store.js');
|
|
85
85
|
const file = FILE();
|
|
86
|
-
// 同 saveAccounts:写前留一份 .bak,主文件损坏(断电半写/杀软截断)时 loadConfig
|
|
86
|
+
// 同 saveAccounts:写前留一份 .bak,主文件损坏(断电半写/杀软截断)时 loadConfig 有路可回。
|
|
87
|
+
// 只有主文件本身可解析时才允许它覆盖 .bak——否则「从 .bak 恢复后第一次保存」会把
|
|
88
|
+
// 仍损坏的主文件内容写进 .bak,把唯一的退路也毁掉
|
|
87
89
|
try {
|
|
88
90
|
const existing = fs.readFileSync(file, 'utf8');
|
|
89
|
-
if (existing.trim().length > 2)
|
|
90
|
-
|
|
91
|
+
if (existing.trim().length > 2) {
|
|
92
|
+
JSON.parse(existing); // 抛 = 主文件是坏的,.bak 保持原样
|
|
93
|
+
await atomicWrite(file + '.bak', existing);
|
|
94
|
+
}
|
|
95
|
+
} catch { /* 主文件不存在/读不了/已损坏:没有可备份的,.bak 不动 */ }
|
|
91
96
|
await atomicWrite(file, JSON.stringify(c, null, 2));
|
|
92
97
|
}
|
|
93
98
|
|
|
@@ -358,7 +363,14 @@ export function startUsageSyncScheduler() {
|
|
|
358
363
|
let lastSyncAt = 0;
|
|
359
364
|
let lastPushAt = 0;
|
|
360
365
|
const tick = () => {
|
|
361
|
-
|
|
366
|
+
// loadConfig 在读失败(杀软/同步盘瞬时占用、JSON 损坏且无备份)时会抛——
|
|
367
|
+
// setInterval 回调里的未捕获异常会直接干掉整个 daemon(无 uncaughtException 兜底),
|
|
368
|
+
// 跳过这一轮即可,下一轮再试
|
|
369
|
+
let c;
|
|
370
|
+
try { c = loadConfig(); } catch (e) {
|
|
371
|
+
logger.warn('10R', '调度轮读取配置失败,跳过本轮:{err}', { err: e.message });
|
|
372
|
+
return;
|
|
373
|
+
}
|
|
362
374
|
if (!isConfigured(c)) return;
|
|
363
375
|
const now = Date.now();
|
|
364
376
|
// 1) 用量同步:每 1 小时一轮(需开启自动开关)
|
package/src/traeClient.js
CHANGED
|
@@ -52,14 +52,32 @@ function seeded(uid, salt, n) {
|
|
|
52
52
|
return out.slice(0, n);
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
+
/**
|
|
56
|
+
* 同机多账号的设备分离(issue #28):同一个真机 deviceId 只能给「该设备的首账号」用
|
|
57
|
+
* (服务端按设备限每日一领,第二个号起必吃 9074)。首账号按账号顺序定,与签到轮顺序一致。
|
|
58
|
+
* 返回 Set<accountId>;调用方对非首账号不得传 storedDeviceId(走派生号)。
|
|
59
|
+
*/
|
|
60
|
+
export function traePrimaryIds(accounts) {
|
|
61
|
+
const seen = new Set();
|
|
62
|
+
const primary = new Set();
|
|
63
|
+
for (const a of accounts || []) {
|
|
64
|
+
if (!a || a.provider !== 'trae') continue;
|
|
65
|
+
const dev = String(a.meta?.deviceId || '').trim();
|
|
66
|
+
if (!dev || seen.has(dev)) continue;
|
|
67
|
+
seen.add(dev);
|
|
68
|
+
primary.add(a.id);
|
|
69
|
+
}
|
|
70
|
+
return primary;
|
|
71
|
+
}
|
|
72
|
+
|
|
55
73
|
export function traeDevice(uid, storedDeviceId, attempt = 0) {
|
|
56
74
|
// 首选**登录时注册的真机号**(meta.deviceId,本机导入时从 storage.json 抓的):
|
|
57
75
|
// 服务端大概率把「号-设备」绑在登录时注册的那台上——陌生设备号打接口吃 9074
|
|
58
76
|
//(issue #31 报告者实测派生号一律被拒、同一时刻真机号可领;本机实测同现象:
|
|
59
77
|
// 导入首日派生号签到成功,之后每天 9074,重试换派生号 3 轮也全拒)。
|
|
60
|
-
//
|
|
61
|
-
//
|
|
62
|
-
//
|
|
78
|
+
// 注意:同机导入的 N 个账号 meta.deviceId 相同(traeLocal 导入时盖同一个值)——
|
|
79
|
+
// 真机号只能给该设备的首账号(见 traePrimaryIds),其余账号由调用方传 null 走派生,
|
|
80
|
+
// 否则第二个号起每天 9074(issue #28 的回归)。attempt>0 一律轮换派生号。
|
|
63
81
|
if (attempt === 0 && storedDeviceId && /^\d{8,}$/.test(String(storedDeviceId))) {
|
|
64
82
|
const m = seeded(`${uid}`, 'market:0', 16);
|
|
65
83
|
m[6] = (m[6] & 0x0f) | 0x40;
|
|
@@ -118,12 +136,13 @@ function findField(obj, key, depth = 0) {
|
|
|
118
136
|
return undefined;
|
|
119
137
|
}
|
|
120
138
|
|
|
121
|
-
/** 统一 POST → { status, body };401 / code 1001 抛 auth 错误(凭据失效)。attempt 透传给设备派生(9074
|
|
122
|
-
|
|
139
|
+
/** 统一 POST → { status, body };401 / code 1001 抛 auth 错误(凭据失效)。attempt 透传给设备派生(9074 轮换重试用)。
|
|
140
|
+
* storedDeviceId 显式传 null = 强制走派生号(同机非首账号,见 traePrimaryIds);缺省读 account.meta.deviceId */
|
|
141
|
+
async function post(url, account, body = {}, attempt = 0, storedDeviceId) {
|
|
123
142
|
const jwt = account.token;
|
|
124
143
|
if (!jwt) throw new Error('账号缺少 Trae 登录 token(请到 Trae 客户端登录后用「本机导入」同步)');
|
|
125
144
|
const uid = account.uid || uidFromJwt(jwt);
|
|
126
|
-
const dev = traeDevice(uid || 'anonymous', account.meta?.deviceId, attempt);
|
|
145
|
+
const dev = traeDevice(uid || 'anonymous', storedDeviceId !== undefined ? storedDeviceId : account.meta?.deviceId, attempt);
|
|
127
146
|
const res = await fetchJsonRace(url, {
|
|
128
147
|
method: 'POST',
|
|
129
148
|
headers: traeHeaders(jwt, dev),
|
|
@@ -233,9 +252,12 @@ export async function checkinTrae(account, ctx = {}) {
|
|
|
233
252
|
const uid = account.uid || uidFromJwt(account.token || '');
|
|
234
253
|
const label = account.name || account.id;
|
|
235
254
|
const base = { accountId: account.id, account: label, provider: 'trae' };
|
|
255
|
+
// 同机多账号:真机号只给该 deviceId 的首账号(ctx.traePrimaryIds 由签到循环按全量
|
|
256
|
+
// trae 账号算好),非首账号强制派生号——否则第二个号起每天 9074(issue #28)
|
|
257
|
+
const devArg = (!ctx.traePrimaryIds || ctx.traePrimaryIds.has(account.id)) ? undefined : null;
|
|
236
258
|
let r;
|
|
237
259
|
try {
|
|
238
|
-
r = await post(STATUS_URL, account);
|
|
260
|
+
r = await post(STATUS_URL, account, {}, 0, devArg);
|
|
239
261
|
} catch (e) {
|
|
240
262
|
if (authDead(e)) throw e;
|
|
241
263
|
return { ...base, status: 'failed', message: e.message, uid };
|
|
@@ -251,7 +273,7 @@ export async function checkinTrae(account, ctx = {}) {
|
|
|
251
273
|
// 注册的设备号。因此重试时**轮换派生设备号**(attempt 递增),退避 + 换号双管齐下;
|
|
252
274
|
// 重试耗尽归 failed(不写签到 memo,下一轮还试)
|
|
253
275
|
if (r.code === 9074) {
|
|
254
|
-
return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i)), base, uid, TRAE_DEFAULT_DAILY_CREDITS);
|
|
276
|
+
return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i, devArg)), base, uid, TRAE_DEFAULT_DAILY_CREDITS);
|
|
255
277
|
}
|
|
256
278
|
return { ...base, status: 'failed', message: withCode(r.message || `code ${r.code}`, r.code), uid };
|
|
257
279
|
}
|
|
@@ -264,7 +286,7 @@ export async function checkinTrae(account, ctx = {}) {
|
|
|
264
286
|
// claim 接口有时只返回 { code: 0, message: "success" } 而不包含 credits 字段,作为 fallback 避免 +0
|
|
265
287
|
const expectedCredits = Number(findField(r.body, 'credits') ?? findField(r.body, 'extra_credits')) || TRAE_DEFAULT_DAILY_CREDITS;
|
|
266
288
|
|
|
267
|
-
return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i)), base, uid, expectedCredits);
|
|
289
|
+
return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i, devArg)), base, uid, expectedCredits);
|
|
268
290
|
}
|
|
269
291
|
|
|
270
292
|
/**
|
package/src/traeGateway.js
CHANGED
|
@@ -58,6 +58,12 @@ export function forgetAccount(id) {
|
|
|
58
58
|
dead.delete(id);
|
|
59
59
|
weights.delete(id);
|
|
60
60
|
swrr.delete(id);
|
|
61
|
+
// 在途的权重刷新 resolve 后会把 id 写回 weights——清掉 inflight 句柄,
|
|
62
|
+
// 让它落地时发现 Map 里已无自己(weightRefresh 的 finally 只删「仍是自己」的条目),
|
|
63
|
+
// 否则删号后残留条目永不回收(无界增长泄漏)
|
|
64
|
+
const inflight = weightInflight.get(id);
|
|
65
|
+
weightInflight.delete(id);
|
|
66
|
+
if (inflight) inflight.catch(() => {}).then(() => { weights.delete(id); swrr.delete(id); });
|
|
61
67
|
}
|
|
62
68
|
|
|
63
69
|
// ── 账号轮换状态(进程内) ──
|
package/src/workbuddyClient.js
CHANGED
|
@@ -51,6 +51,7 @@ export function inspectToken(token) {
|
|
|
51
51
|
uid: typeof c.sub === 'string' ? c.sub : null,
|
|
52
52
|
expiresAt: Number.isFinite(c.exp) ? new Date(c.exp * 1000).toISOString() : null,
|
|
53
53
|
name: c.name || c.preferred_username || c.nickname || null,
|
|
54
|
+
phone: [c.phone_number, c.phoneNumber, c.mobile, c.preferred_username].map((v) => String(v == null ? '' : v).trim()).find((v) => /^1\d{10}$/.test(v)) || null,
|
|
54
55
|
};
|
|
55
56
|
}
|
|
56
57
|
|
package/src/workbuddyLocal.js
CHANGED
|
@@ -16,8 +16,128 @@ import fs from 'node:fs';
|
|
|
16
16
|
import os from 'node:os';
|
|
17
17
|
import path from 'node:path';
|
|
18
18
|
import crypto from 'node:crypto';
|
|
19
|
+
import cp from 'node:child_process';
|
|
19
20
|
import { inspectToken } from './workbuddyClient.js';
|
|
20
21
|
|
|
22
|
+
// ===================== WorkBuddy 5.6+ $wbEncrypted 信封加解密 =====================
|
|
23
|
+
|
|
24
|
+
export function isWbEncrypted(val) {
|
|
25
|
+
return !!val && typeof val === 'object' && !Array.isArray(val) && val.$wbEncrypted === 1 && typeof val.envelope === 'string';
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export function buildEnvelopeAAD(env) {
|
|
29
|
+
const FRAMING_FIELD = 2, FMT_FIELD = 'WBEV1', AAD_DOMAIN = Buffer.from('WB-AAD\0', 'ascii');
|
|
30
|
+
const lp = (s) => { const b = Buffer.from(s, 'utf8'); const l = Buffer.alloc(4); l.writeUInt32BE(b.length); return Buffer.concat([l, b]); };
|
|
31
|
+
const u32 = (n) => { const b = Buffer.alloc(4); b.writeUInt32BE(n); return b; };
|
|
32
|
+
return Buffer.concat([
|
|
33
|
+
AAD_DOMAIN, Buffer.from([1]), lp(FMT_FIELD), lp('sym-v1'), u32(env.suite || 1),
|
|
34
|
+
lp(env.keyId || ''), Buffer.from([FRAMING_FIELD]), Buffer.from([0]), Buffer.from([0]),
|
|
35
|
+
]);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export function openEnvelope(encObj, key) {
|
|
39
|
+
const env = JSON.parse(Buffer.from(encObj.envelope, 'base64').toString('utf8'));
|
|
40
|
+
const decipher = crypto.createDecipheriv('aes-256-gcm', key, Buffer.from(env.nonce, 'base64'), { authTagLength: 16 });
|
|
41
|
+
decipher.setAAD(buildEnvelopeAAD(env));
|
|
42
|
+
decipher.setAuthTag(Buffer.from(env.authTag, 'base64'));
|
|
43
|
+
return Buffer.concat([decipher.update(Buffer.from(env.ciphertext, 'base64')), decipher.final()]).toString('utf8');
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export function sealEnvelope(plaintext, key, template = {}) {
|
|
47
|
+
const nonce = crypto.randomBytes(12);
|
|
48
|
+
const cipher = crypto.createCipheriv('aes-256-gcm', key, nonce, { authTagLength: 16 });
|
|
49
|
+
const env = {
|
|
50
|
+
suite: template.suite || 1,
|
|
51
|
+
keyId: template.keyId || '',
|
|
52
|
+
nonce: nonce.toString('base64'),
|
|
53
|
+
};
|
|
54
|
+
cipher.setAAD(buildEnvelopeAAD(env));
|
|
55
|
+
const ciphertext = Buffer.concat([cipher.update(String(plaintext || ''), 'utf8'), cipher.final()]);
|
|
56
|
+
env.authTag = cipher.getAuthTag().toString('base64');
|
|
57
|
+
env.ciphertext = ciphertext.toString('base64');
|
|
58
|
+
return {
|
|
59
|
+
$wbEncrypted: 1,
|
|
60
|
+
envelope: Buffer.from(JSON.stringify(env)).toString('base64'),
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
let cachedMasterKey = null;
|
|
65
|
+
let masterKeyFailAt = 0;
|
|
66
|
+
const KEY_RETRY_MS = 60000;
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* 经 WorkBuddy 官方 Electron(ELECTRON_RUN_AS_NODE=1)子进程调用原生存储绑定提取密钥。
|
|
70
|
+
* 内存缓存,失败 60s 内退避;绝不写盘,绝不写日志。
|
|
71
|
+
*/
|
|
72
|
+
export function getWorkbuddyMasterKey(clientPath) {
|
|
73
|
+
if (cachedMasterKey) return cachedMasterKey;
|
|
74
|
+
if (masterKeyFailAt && Date.now() - masterKeyFailAt < KEY_RETRY_MS) return null;
|
|
75
|
+
const exe = clientPath || detectWorkbuddy().clientPath;
|
|
76
|
+
if (!exe) return null;
|
|
77
|
+
|
|
78
|
+
try {
|
|
79
|
+
const code = [
|
|
80
|
+
"const b = process._linkedBinding('electron_browser_workbuddy_storage');",
|
|
81
|
+
"const p = JSON.parse(b.loggerGet());",
|
|
82
|
+
"if (p && typeof p.atRestSecretKey === 'string') process.stdout.write(p.atRestSecretKey);",
|
|
83
|
+
].join('\n');
|
|
84
|
+
const r = cp.spawnSync(exe, ['-e', code], {
|
|
85
|
+
env: { ...process.env, ELECTRON_RUN_AS_NODE: '1' },
|
|
86
|
+
timeout: 5000,
|
|
87
|
+
encoding: 'utf8',
|
|
88
|
+
});
|
|
89
|
+
const keyRaw = String(r.stdout || '').trim();
|
|
90
|
+
if (r.status === 0 && keyRaw.length >= 16) {
|
|
91
|
+
cachedMasterKey = crypto.createHash('sha256').update(keyRaw, 'utf8').digest();
|
|
92
|
+
masterKeyFailAt = 0;
|
|
93
|
+
return cachedMasterKey;
|
|
94
|
+
}
|
|
95
|
+
} catch {
|
|
96
|
+
/* 子进程执行异常,进入退避 */
|
|
97
|
+
}
|
|
98
|
+
masterKeyFailAt = Date.now();
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
export function resetMasterKeyCacheForTest(key = null) {
|
|
103
|
+
cachedMasterKey = key;
|
|
104
|
+
masterKeyFailAt = 0;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** 深度解密 JSON 中的 $wbEncrypted 信封,返回包含明文的浅拷贝/深拷贝 */
|
|
108
|
+
export function decryptSessionJson(session, clientPath) {
|
|
109
|
+
if (!session || typeof session !== 'object') return session;
|
|
110
|
+
let key = null;
|
|
111
|
+
const clone = JSON.parse(JSON.stringify(session));
|
|
112
|
+
|
|
113
|
+
const walk = (node) => {
|
|
114
|
+
if (!node || typeof node !== 'object') return;
|
|
115
|
+
if (Array.isArray(node)) {
|
|
116
|
+
for (const item of node) walk(item);
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
for (const [k, v] of Object.entries(node)) {
|
|
120
|
+
if (isWbEncrypted(v)) {
|
|
121
|
+
if (!key) key = getWorkbuddyMasterKey(clientPath);
|
|
122
|
+
if (key) {
|
|
123
|
+
try {
|
|
124
|
+
node[k] = openEnvelope(v, key);
|
|
125
|
+
} catch {
|
|
126
|
+
/* 解密失败保留原信封 */
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
} else if (v && typeof v === 'object') {
|
|
130
|
+
walk(v);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
};
|
|
134
|
+
|
|
135
|
+
walk(clone);
|
|
136
|
+
return clone;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
// ===================== 凭据与会话管理 =====================
|
|
140
|
+
|
|
21
141
|
export function workbuddyAuthDir() {
|
|
22
142
|
const home = os.homedir();
|
|
23
143
|
const tail = ['CodeBuddyExtension', 'Data', 'Public', 'auth'];
|
|
@@ -32,7 +152,9 @@ const CURRENT_RE = /^[a-z0-9-]+\.info$/i; // workbuddy-desktop.info
|
|
|
32
152
|
const HISTORY_RE = /^[a-z0-9-]+\.\d{4}-.*\.info$/i; // workbuddy-desktop.<时间戳>.<pid>.<uuid>.info
|
|
33
153
|
|
|
34
154
|
/** 会话 JSON → 账号记录(供 addAccount),不含网络请求 */
|
|
35
|
-
export function sessionToAccount(
|
|
155
|
+
export function sessionToAccount(rawSession, source, clientPath) {
|
|
156
|
+
// 如果会话包含 $wbEncrypted 信封,先进行安全解密
|
|
157
|
+
const session = decryptSessionJson(rawSession, clientPath);
|
|
36
158
|
const token = session?.auth?.accessToken;
|
|
37
159
|
if (typeof token !== 'string' || !token) return null;
|
|
38
160
|
const info = inspectToken(token);
|
|
@@ -40,8 +162,15 @@ export function sessionToAccount(session, source) {
|
|
|
40
162
|
const acc = session.account || {};
|
|
41
163
|
const auth = session.auth || {};
|
|
42
164
|
const iso = (ms) => (Number.isFinite(ms) ? new Date(ms).toISOString() : null);
|
|
43
|
-
|
|
44
|
-
|
|
165
|
+
|
|
166
|
+
// 手机号:优先未脱敏的 phoneNumber;若被客户端脱敏(含 *)或为空,回退到从 JWT 解析的大陆手机号
|
|
167
|
+
const rawPhone = typeof acc.phoneNumber === 'string' ? acc.phoneNumber.trim() : '';
|
|
168
|
+
const isRedacted = rawPhone.includes('*');
|
|
169
|
+
const phone = (!rawPhone || isRedacted) ? (info.phone || rawPhone || null) : rawPhone;
|
|
170
|
+
|
|
171
|
+
// 原 rawSession 结构原样保留在 meta.session,便于切换账号时原汁原味还原
|
|
172
|
+
const rawAuth = rawSession?.auth || auth;
|
|
173
|
+
const { accessToken: _a, refreshToken: _r, ...authRest } = rawAuth;
|
|
45
174
|
return {
|
|
46
175
|
provider: info.provider,
|
|
47
176
|
token,
|
|
@@ -54,11 +183,13 @@ export function sessionToAccount(session, source) {
|
|
|
54
183
|
meta: {
|
|
55
184
|
domain: auth.domain || info.host,
|
|
56
185
|
enterpriseId: acc.enterpriseId || null,
|
|
57
|
-
phone
|
|
186
|
+
phone,
|
|
58
187
|
refreshExpiresAt: iso(auth.refreshExpiresAt),
|
|
59
188
|
session: {
|
|
60
|
-
account:
|
|
61
|
-
|
|
189
|
+
account: rawSession?.account || acc,
|
|
190
|
+
auth: authRest,
|
|
191
|
+
accounts: Array.isArray(rawSession?.accounts) ? rawSession.accounts : (session.accounts || []),
|
|
192
|
+
...(Array.isArray(rawSession?.allAccounts || session.allAccounts) ? { allAccounts: rawSession?.allAccounts || session.allAccounts } : {}),
|
|
62
193
|
},
|
|
63
194
|
},
|
|
64
195
|
};
|
|
@@ -68,8 +199,9 @@ export function sessionToAccount(session, source) {
|
|
|
68
199
|
* 读取本机 WorkBuddy 会话:当前会话 + 历史会话(按 uid 去重,保留最新)。
|
|
69
200
|
* @returns {{ dir, accounts: Array<{...账号记录, current: boolean, file, fileTime}>, errors }}
|
|
70
201
|
*/
|
|
71
|
-
export function readWorkbuddySessions() {
|
|
72
|
-
const dir = workbuddyAuthDir();
|
|
202
|
+
export function readWorkbuddySessions(options = {}) {
|
|
203
|
+
const dir = options.dir || workbuddyAuthDir();
|
|
204
|
+
const clientPath = options.clientPath !== undefined ? options.clientPath : detectWorkbuddy().clientPath;
|
|
73
205
|
const out = { dir, accounts: [], errors: [] };
|
|
74
206
|
let names = [];
|
|
75
207
|
try { names = fs.readdirSync(dir); } catch { return out; }
|
|
@@ -80,7 +212,7 @@ export function readWorkbuddySessions() {
|
|
|
80
212
|
try {
|
|
81
213
|
const current = !HISTORY_RE.test(name);
|
|
82
214
|
if (current && fs.existsSync(`${file}.logged-out`)) continue; // 已登出
|
|
83
|
-
const rec = sessionToAccount(JSON.parse(fs.readFileSync(file, 'utf8')), current ? 'WorkBuddy 当前登录' : 'WorkBuddy 历史会话');
|
|
215
|
+
const rec = sessionToAccount(JSON.parse(fs.readFileSync(file, 'utf8')), current ? 'WorkBuddy 当前登录' : 'WorkBuddy 历史会话', clientPath);
|
|
84
216
|
if (!rec) continue;
|
|
85
217
|
const fileTime = fs.statSync(file).mtimeMs;
|
|
86
218
|
const item = { ...rec, current, file, fileTime };
|
|
@@ -104,13 +236,22 @@ export function currentWorkbuddyUid() {
|
|
|
104
236
|
// (无客户端时静默切换留下的空壳目录),拿目录判断会把没装客户端的机器误报成已安装。
|
|
105
237
|
const CLIENT_CANDIDATES = process.platform === 'win32'
|
|
106
238
|
? [
|
|
107
|
-
['Programs', 'CodeBuddy', 'CodeBuddy.exe'],
|
|
108
239
|
['Programs', 'WorkBuddy', 'WorkBuddy.exe'],
|
|
109
|
-
['
|
|
240
|
+
['Programs', 'WorkBuddyAI', 'WorkBuddyAI.exe'],
|
|
241
|
+
['Programs', 'CodeBuddy CN', 'CodeBuddy CN.exe'],
|
|
242
|
+
['Programs', 'CodeBuddy', 'CodeBuddy.exe'],
|
|
110
243
|
['WorkBuddy', 'WorkBuddy.exe'],
|
|
244
|
+
['WorkBuddyAI', 'WorkBuddyAI.exe'],
|
|
245
|
+
['CodeBuddy CN', 'CodeBuddy CN.exe'],
|
|
246
|
+
['CodeBuddy', 'CodeBuddy.exe'],
|
|
111
247
|
]
|
|
112
248
|
: process.platform === 'darwin'
|
|
113
|
-
? [
|
|
249
|
+
? [
|
|
250
|
+
'/Applications/WorkBuddy.app',
|
|
251
|
+
'/Applications/WorkBuddy AI.app',
|
|
252
|
+
'/Applications/CodeBuddy CN.app',
|
|
253
|
+
'/Applications/CodeBuddy.app',
|
|
254
|
+
]
|
|
114
255
|
: [];
|
|
115
256
|
|
|
116
257
|
/**
|
|
@@ -129,7 +270,7 @@ export function detectWorkbuddy() {
|
|
|
129
270
|
: cand;
|
|
130
271
|
try { if (fs.existsSync(p)) { clientPath = p; break; } } catch { /* 下一个候选 */ }
|
|
131
272
|
}
|
|
132
|
-
const sessions = dirExists ? readWorkbuddySessions() : { accounts: [] };
|
|
273
|
+
const sessions = dirExists ? readWorkbuddySessions({ dir, clientPath }) : { accounts: [] };
|
|
133
274
|
return {
|
|
134
275
|
dir,
|
|
135
276
|
dirExists,
|
|
@@ -141,9 +282,10 @@ export function detectWorkbuddy() {
|
|
|
141
282
|
|
|
142
283
|
/**
|
|
143
284
|
* 把账号写成 WorkBuddy 当前会话(切换账号)。需要账号带有导入时保存的会话信息。
|
|
285
|
+
* 如果原模板是 $wbEncrypted 信封格式,写回时将自动封包为合法信封。
|
|
144
286
|
* @returns {{ file, previousUid }}
|
|
145
287
|
*/
|
|
146
|
-
export function writeWorkbuddySession(account) {
|
|
288
|
+
export function writeWorkbuddySession(account, { clientPath } = {}) {
|
|
147
289
|
const s = account.meta?.session;
|
|
148
290
|
if (!s?.account) throw new Error('该账号缺少 WorkBuddy 会话信息,请从本机重新导入后再切换');
|
|
149
291
|
const dir = workbuddyAuthDir();
|
|
@@ -153,12 +295,33 @@ export function writeWorkbuddySession(account) {
|
|
|
153
295
|
try { previousUid = JSON.parse(fs.readFileSync(file, 'utf8'))?.account?.uid || null; } catch {}
|
|
154
296
|
|
|
155
297
|
const ms = (iso) => (iso ? new Date(iso).getTime() : undefined);
|
|
298
|
+
const rawAuth = s.auth || {};
|
|
299
|
+
|
|
300
|
+
// 判断是否需要信封封包写入(原会话 auth 字段包含 $wbEncrypted)
|
|
301
|
+
let isEncryptedTemplate = isWbEncrypted(rawAuth.accessToken) || isWbEncrypted(rawAuth.refreshToken);
|
|
302
|
+
let masterKey = null;
|
|
303
|
+
if (isEncryptedTemplate) {
|
|
304
|
+
masterKey = getWorkbuddyMasterKey(clientPath);
|
|
305
|
+
if (!masterKey) {
|
|
306
|
+
throw new Error('无法切换账号:目标账号为 WorkBuddy 5.6+ 加密凭据,但未能获取客户端解密密钥');
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
const accessPayload = isEncryptedTemplate
|
|
311
|
+
? sealEnvelope(account.token, masterKey, isWbEncrypted(rawAuth.accessToken) ? JSON.parse(Buffer.from(rawAuth.accessToken.envelope, 'base64').toString('utf8')) : {})
|
|
312
|
+
: account.token;
|
|
313
|
+
|
|
314
|
+
const refreshVal = account.refreshToken || rawAuth.refreshToken;
|
|
315
|
+
const refreshPayload = isEncryptedTemplate && refreshVal
|
|
316
|
+
? sealEnvelope(refreshVal, masterKey, isWbEncrypted(rawAuth.refreshToken) ? JSON.parse(Buffer.from(rawAuth.refreshToken.envelope, 'base64').toString('utf8')) : {})
|
|
317
|
+
: refreshVal;
|
|
318
|
+
|
|
156
319
|
const session = {
|
|
157
320
|
account: s.account,
|
|
158
321
|
auth: {
|
|
159
322
|
...s.auth,
|
|
160
|
-
accessToken:
|
|
161
|
-
refreshToken:
|
|
323
|
+
accessToken: accessPayload,
|
|
324
|
+
refreshToken: refreshPayload,
|
|
162
325
|
expiresAt: ms(account.expiresAt) ?? s.auth?.expiresAt,
|
|
163
326
|
lastRefreshTime: Date.now(),
|
|
164
327
|
},
|
package/src/zcodeClient.js
CHANGED
|
@@ -383,6 +383,7 @@ const platform = () => `${process.platform}-${process.arch === 'arm64' ? 'arm64'
|
|
|
383
383
|
* 活动过期后条目留在表里无害(claim 返回 1002 跳过);新活动出现时在此追加一行。
|
|
384
384
|
*/
|
|
385
385
|
export const ZCODE_KNOWN_CLAIM_PLANS = [
|
|
386
|
+
{ planId: 'zcode-v3-start-plan-1102', name: 'ZCODE GLOBAL BUILD' },
|
|
386
387
|
{ planId: 'zcode-v3-start-plan-1030-wk', name: 'ZCODE WEEKEND BUILD' },
|
|
387
388
|
];
|
|
388
389
|
|