cardbuddy 0.19.3 → 0.21.0
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 +8 -8
- package/dist/cli.js +21 -8
- package/dist/init.js +3 -3
- package/dist/preview-editor/assets/codeBridgeHeartbeat.worker-Zb_A5RUd.js +1 -0
- package/dist/preview-editor/assets/index-C8VLzU18.css +1 -0
- package/dist/preview-editor/assets/index-CpDojF__.js +383 -0
- package/dist/preview-editor/index.html +2 -2
- package/dist/skills-upgrade.js +64 -25
- package/dist/standalone.js +49 -0
- package/dist/vendored/card-editor/components/MultiColumn.vue +19 -10
- package/dist/vendored/card-editor/runtime/card-runtime.js +1 -1
- package/dist/vendored/mcp/client.mjs +22 -3
- package/dist/vendored/server/core/ai-chat.js +92 -12
- package/dist/vendored/server/core/cardExport.js +831 -0
- package/dist/vendored/server/core/cardHistoryRemote.js +203 -0
- package/dist/vendored/server/core/cardImportMeta.js +6 -1
- package/dist/vendored/server/core/cardPublishVersions.js +91 -0
- package/dist/vendored/server/core/cardSave.js +143 -6
- package/dist/vendored/server/core/cardSync.js +467 -95
- package/dist/vendored/server/core/codeBridge.js +4 -2
- package/dist/vendored/server/core/index.js +16 -0
- package/dist/vendored/skills/finmall-card-sync/SKILL.md +46 -0
- package/dist/vendored/skills/finmall-card-sync/scripts/api_batch_sync.mjs +657 -15
- package/dist/vendored/skills/finmall-session-navigator/scripts/finmall_login.mjs +79 -8
- package/dist/vendored/skills/finmall-session-navigator/scripts/session-manager.mjs +25 -1
- package/dist/vendored/skills/mbank-design-gen/tools/screenshot.mjs +10 -1
- package/package.json +1 -1
- package/dist/preview-editor/assets/index-C_uqjKqI.css +0 -1
- package/dist/preview-editor/assets/index-DRzBK4qj.js +0 -347
|
@@ -54,6 +54,24 @@ const CHROME_CANDIDATES = [
|
|
|
54
54
|
|
|
55
55
|
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
56
56
|
|
|
57
|
+
// page.evaluate 没有默认超时:FinMall 页面主线程被占 / 页面内 fetch 挂起(实测该环境确有
|
|
58
|
+
// responseStatus=0 的常驻请求)时,裸 evaluate 永远不返回,连带 ensureFinMallSession 与
|
|
59
|
+
// 整个同步任务永久挂起——同步中间件是单飞制,一个挂死的任务会让之后每次「远端同步」都拿到
|
|
60
|
+
// 409「已有同步任务正在进行」,用户侧就是「点了同步、服务端再也不响应」。
|
|
61
|
+
// 这里给每次 evaluate 套硬超时:Node 侧停止等待并抛明确错误(页面里仍在跑的那个 evaluate
|
|
62
|
+
// 无法真正取消,但至少不会把同步任务与单飞锁一起拖死)。
|
|
63
|
+
const EVALUATE_TIMEOUT_MS = Number(process.env.CARDBUDDY_EVALUATE_TIMEOUT_MS || 30000);
|
|
64
|
+
|
|
65
|
+
function withTimeout(promise, ms, label) {
|
|
66
|
+
let timer;
|
|
67
|
+
return Promise.race([
|
|
68
|
+
promise,
|
|
69
|
+
new Promise((_, reject) => {
|
|
70
|
+
timer = setTimeout(() => reject(new Error(`${label}超时(>${ms}ms),已放弃`)), ms);
|
|
71
|
+
}),
|
|
72
|
+
]).finally(() => clearTimeout(timer));
|
|
73
|
+
}
|
|
74
|
+
|
|
57
75
|
// ---------------------------------------------------------------------------
|
|
58
76
|
// 凭据与请求体
|
|
59
77
|
// ---------------------------------------------------------------------------
|
|
@@ -329,12 +347,17 @@ async function evaluateWithRetry(page, fn, arg, maxRetries = 5) {
|
|
|
329
347
|
let lastError;
|
|
330
348
|
for (let i = 0; i < maxRetries; i++) {
|
|
331
349
|
try {
|
|
332
|
-
|
|
350
|
+
// 硬超时包裹:页面主线程被占 / 页面内 fetch 挂起时不让同步任务永久挂起
|
|
351
|
+
return await withTimeout(
|
|
352
|
+
page.evaluate(fn, arg),
|
|
353
|
+
EVALUATE_TIMEOUT_MS,
|
|
354
|
+
'page.evaluate',
|
|
355
|
+
);
|
|
333
356
|
} catch (error) {
|
|
334
357
|
lastError = error;
|
|
335
358
|
const msg = String(error?.message || error);
|
|
336
359
|
if (
|
|
337
|
-
/Execution context was destroyed|Target page.*has been closed|Frame was detached|Cannot find context
|
|
360
|
+
/Execution context was destroyed|Target page.*has been closed|Frame was detached|Cannot find context|page\.evaluate\s*超时/i.test(
|
|
338
361
|
msg,
|
|
339
362
|
)
|
|
340
363
|
) {
|
|
@@ -444,9 +467,16 @@ export async function performLogin(page, credentials) {
|
|
|
444
467
|
return evaluateWithRetry(
|
|
445
468
|
page,
|
|
446
469
|
async (input) => {
|
|
470
|
+
// 页面内 fetch 也必须自带超时:IM01001 / IM01002 挂起时(该环境实测有常驻不返回的请求),
|
|
471
|
+
// 没有 AbortController 就会把 performLogin → runFinmallLogin → ensureFinMallSession
|
|
472
|
+
// 整条链永久挂住。这里内层 abort + 外层 evaluateWithRetry 的硬超时双重设防。
|
|
473
|
+
const ctl = new AbortController();
|
|
474
|
+
const timer = setTimeout(() => ctl.abort(), input.timeoutMs);
|
|
475
|
+
try {
|
|
447
476
|
const response = await fetch(input.endpoint, {
|
|
448
477
|
method: "POST",
|
|
449
478
|
credentials: "include",
|
|
479
|
+
signal: ctl.signal,
|
|
450
480
|
headers: {
|
|
451
481
|
Accept: "application/json, text/plain, */*",
|
|
452
482
|
"Content-Type": "application/json;charset=UTF-8",
|
|
@@ -533,6 +563,7 @@ export async function performLogin(page, credentials) {
|
|
|
533
563
|
{
|
|
534
564
|
method: "POST",
|
|
535
565
|
credentials: "include",
|
|
566
|
+
signal: ctl.signal,
|
|
536
567
|
headers: {
|
|
537
568
|
Accept: "application/json, text/plain, */*",
|
|
538
569
|
"Content-Type": "application/json;charset=UTF-8",
|
|
@@ -603,8 +634,16 @@ export async function performLogin(page, credentials) {
|
|
|
603
634
|
businessFailure: businessFailure || !loginSucceeded,
|
|
604
635
|
sessionCreated: loginSucceeded,
|
|
605
636
|
};
|
|
637
|
+
} finally {
|
|
638
|
+
clearTimeout(timer);
|
|
639
|
+
}
|
|
640
|
+
},
|
|
641
|
+
{
|
|
642
|
+
endpoint: LOGIN_ENDPOINT,
|
|
643
|
+
menuEndpoint: MENU_ENDPOINT,
|
|
644
|
+
payload,
|
|
645
|
+
timeoutMs: EVALUATE_TIMEOUT_MS,
|
|
606
646
|
},
|
|
607
|
-
{ endpoint: LOGIN_ENDPOINT, menuEndpoint: MENU_ENDPOINT, payload },
|
|
608
647
|
);
|
|
609
648
|
}
|
|
610
649
|
|
|
@@ -625,7 +664,8 @@ export async function performLogin(page, credentials) {
|
|
|
625
664
|
*
|
|
626
665
|
* @param {object} [options]
|
|
627
666
|
* @param {string} [options.credentialsPath] 凭据文件路径
|
|
628
|
-
* @param {number} [options.maxAttempts=3]
|
|
667
|
+
* @param {number} [options.maxAttempts=3] 单份凭据的最大登录重试次数
|
|
668
|
+
* @param {number} [options.maxCredentialPrompts=3] 账号/密码错误时允许重新输入凭据的次数上限(仅交互终端生效)
|
|
629
669
|
* @param {number} [options.retryDelayMs=1000] 重试间隔
|
|
630
670
|
* @param {number} [options.debugPort=9222] Chrome 调试端口
|
|
631
671
|
* @param {boolean} [options.closeBrowser=false] 完成后是否关闭浏览器
|
|
@@ -635,6 +675,7 @@ export async function runFinmallLogin(options = {}) {
|
|
|
635
675
|
const {
|
|
636
676
|
credentialsPath = DEFAULT_CREDENTIALS_PATH,
|
|
637
677
|
maxAttempts = 3,
|
|
678
|
+
maxCredentialPrompts = 3,
|
|
638
679
|
retryDelayMs = 1000,
|
|
639
680
|
debugPort = DEBUG_PORT,
|
|
640
681
|
closeBrowser = false,
|
|
@@ -729,9 +770,12 @@ export async function runFinmallLogin(options = {}) {
|
|
|
729
770
|
};
|
|
730
771
|
}
|
|
731
772
|
|
|
732
|
-
//
|
|
773
|
+
// 登录流程(带重试;账号/密码错误时,交互终端下请用户重新输入)
|
|
733
774
|
const failures = [];
|
|
734
|
-
|
|
775
|
+
let credentialPrompts = 0;
|
|
776
|
+
let attempt = 0;
|
|
777
|
+
while (attempt < maxAttempts) {
|
|
778
|
+
attempt += 1;
|
|
735
779
|
try {
|
|
736
780
|
const dismissed = await clearTimeoutPrompts(page);
|
|
737
781
|
state = await waitForPageDecision(page);
|
|
@@ -779,6 +823,29 @@ export async function runFinmallLogin(options = {}) {
|
|
|
779
823
|
};
|
|
780
824
|
}
|
|
781
825
|
failures.push({ attempt, reason: "登录后未看到卡片数据列表" });
|
|
826
|
+
} else if (
|
|
827
|
+
loginResult.businessFailure &&
|
|
828
|
+
process.stdout.isTTY &&
|
|
829
|
+
credentialPrompts < maxCredentialPrompts
|
|
830
|
+
) {
|
|
831
|
+
// 账号/密码错误:交互终端下请用户重新输入,覆盖本地凭据后重来,
|
|
832
|
+
// 不消耗固定的重试次数(避免一次性输错就把次数吃光)。
|
|
833
|
+
credentialPrompts += 1;
|
|
834
|
+
console.error(
|
|
835
|
+
`✖ 登录失败:账号或密码错误。请重新输入 FinMall 凭据(${credentialPrompts}/${maxCredentialPrompts})`,
|
|
836
|
+
);
|
|
837
|
+
try {
|
|
838
|
+
credentials = await promptAndSaveCredentials(credentialsPath);
|
|
839
|
+
attempt -= 1; // 回退本次计数,下一轮用新凭据重试
|
|
840
|
+
continue;
|
|
841
|
+
} catch (promptError) {
|
|
842
|
+
failures.push({
|
|
843
|
+
attempt,
|
|
844
|
+
reason:
|
|
845
|
+
"重新输入凭据失败:" +
|
|
846
|
+
String(promptError?.message || promptError).slice(0, 200),
|
|
847
|
+
});
|
|
848
|
+
}
|
|
782
849
|
} else {
|
|
783
850
|
failures.push({
|
|
784
851
|
attempt,
|
|
@@ -807,11 +874,15 @@ export async function runFinmallLogin(options = {}) {
|
|
|
807
874
|
}
|
|
808
875
|
}
|
|
809
876
|
|
|
877
|
+
const exhaustedReason =
|
|
878
|
+
credentialPrompts >= maxCredentialPrompts && credentialPrompts > 0
|
|
879
|
+
? `已连续 ${credentialPrompts} 次重新输入凭据仍登录失败,请核对账号密码或稍后重试`
|
|
880
|
+
: "登录重试多次仍失败,服务端可能异常";
|
|
810
881
|
return {
|
|
811
882
|
success: false,
|
|
812
|
-
attempts:
|
|
883
|
+
attempts: attempt,
|
|
813
884
|
terminal: true,
|
|
814
|
-
reason:
|
|
885
|
+
reason: exhaustedReason,
|
|
815
886
|
failures,
|
|
816
887
|
};
|
|
817
888
|
} finally {
|
|
@@ -28,6 +28,13 @@ for (const key of ["NO_PROXY", "no_proxy"]) {
|
|
|
28
28
|
process.env[key] = cur && cur.length ? `${cur},${extra}` : extra;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
+
// 进程内会话缓存:runFinmallLogin 热路径固定消耗导航 + networkidle + sleep(2000)(实测 ~2.6s),
|
|
32
|
+
// 而同步/保存/历史查询等高频只读操作都会经过 ensureFinMallSession。TTL 内且 CDP 仍连通时
|
|
33
|
+
// 直接复用,跳过重复登录校验;服务端会话真过期时由 finmallPostWithHeal 的 SESSION_INVALID
|
|
34
|
+
// 自愈(清 session 重登重试)兜底,故此处缓存不削弱正确性。
|
|
35
|
+
const SESSION_CACHE_TTL_MS = Number(process.env.FINMALL_SESSION_CACHE_TTL_MS || 60000);
|
|
36
|
+
let _sessionCache = null; // { browser, login, at }
|
|
37
|
+
|
|
31
38
|
/**
|
|
32
39
|
* 确保存在一个已登录的 FinMall 后台浏览器会话(无界面 headless,端口 SYNC_PORT)。
|
|
33
40
|
*
|
|
@@ -36,6 +43,9 @@ for (const key of ["NO_PROXY", "no_proxy"]) {
|
|
|
36
43
|
* 以 headless 模式启动一个独立(detached)Chrome,并用保存的凭据自动登录。
|
|
37
44
|
* - 若 SYNC_PORT 已启动(含跨 dev server 重启复用的上一实例):直接连上并复用,
|
|
38
45
|
* 仅在 _sessionId 缺失时由 runFinmallLogin 自动登录。
|
|
46
|
+
* - 进程内热路径:距上次成功 ensure 不足 TTL 且 CDP 仍连通(isConnected)时直接返回缓存,
|
|
47
|
+
* 省去重复导航与固定等待;调用方 finally 的 browser.disconnect() 会令 isConnected()
|
|
48
|
+
* 为 false,缓存随之作废走完整流程,与原先行为一致。
|
|
39
49
|
*
|
|
40
50
|
* 注意:runFinmallLogin 只校验 _sessionId 是否存在,无法发现「服务端会话已过期」
|
|
41
51
|
* (IDC10001 列表接口不鉴权,会骗过它)。最终的服务端过期由 syncCards 以需鉴权的
|
|
@@ -51,6 +61,19 @@ for (const key of ["NO_PROXY", "no_proxy"]) {
|
|
|
51
61
|
* @returns {Promise<{ browser: import('playwright').Browser, login: object }>}
|
|
52
62
|
*/
|
|
53
63
|
export async function ensureFinMallSession({ debugPort = SYNC_PORT, headless = true } = {}) {
|
|
64
|
+
// 热路径:进程内缓存未过期且 CDP 仍连通 → 直接复用(跳过 runFinmallLogin 的
|
|
65
|
+
// 导航 + networkidle + sleep(2000),实测可从 ~2.6s 降到毫秒级)。
|
|
66
|
+
if (_sessionCache && Date.now() - _sessionCache.at < SESSION_CACHE_TTL_MS) {
|
|
67
|
+
try {
|
|
68
|
+
if (_sessionCache.browser.isConnected()) {
|
|
69
|
+
return _sessionCache;
|
|
70
|
+
}
|
|
71
|
+
} catch {
|
|
72
|
+
/* isConnected 抛错视作失效,走完整流程 */
|
|
73
|
+
}
|
|
74
|
+
_sessionCache = null;
|
|
75
|
+
}
|
|
76
|
+
|
|
54
77
|
let browser = await tryConnectBrowser(debugPort);
|
|
55
78
|
|
|
56
79
|
if (!browser) {
|
|
@@ -90,7 +113,8 @@ export async function ensureFinMallSession({ debugPort = SYNC_PORT, headless = t
|
|
|
90
113
|
throw new Error(`后台自动登录 FinMall 失败:${reason}${captchaNote}`);
|
|
91
114
|
}
|
|
92
115
|
|
|
93
|
-
|
|
116
|
+
_sessionCache = { browser, login, at: Date.now() };
|
|
117
|
+
return _sessionCache;
|
|
94
118
|
}
|
|
95
119
|
|
|
96
120
|
export { SYNC_PORT, SYNC_BROWSER_DATA_DIR };
|
|
@@ -22,7 +22,16 @@ if (!input) {
|
|
|
22
22
|
}
|
|
23
23
|
const output = positional[1] || input.replace(/\.html$/i, '') + '.png';
|
|
24
24
|
|
|
25
|
-
|
|
25
|
+
// 优先用 Playwright 自带浏览器;未下载(ms-playwright 缓存为空)时回退系统 Chrome,
|
|
26
|
+
// 与仓库「Playwright + 系统 Chrome 验证」约定一致,避免强依赖 npx playwright install。
|
|
27
|
+
let browser;
|
|
28
|
+
try {
|
|
29
|
+
browser = await chromium.launch();
|
|
30
|
+
} catch (err) {
|
|
31
|
+
if (!/Executable doesn't exist/.test(String(err?.message ?? err))) throw err;
|
|
32
|
+
console.error('[screenshot] 未找到 Playwright 内置浏览器,回退系统 Chrome');
|
|
33
|
+
browser = await chromium.launch({ channel: 'chrome' });
|
|
34
|
+
}
|
|
26
35
|
const page = await browser.newPage({
|
|
27
36
|
viewport: { width: 375, height: 812 },
|
|
28
37
|
deviceScaleFactor: 2, // @2x → 750 宽输出,与设计稿一致
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cardbuddy",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.0",
|
|
4
4
|
"description": "Local dev service for the CardBuddy card editor — decouples card CRUD (sync/save/validate/render-status/screenshot) from the static public editor, so the editor can be deployed to any static host while each developer runs a local service against their own card source.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|