creditdaddy 1.8.0 → 1.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +720 -21
- package/README.md +18 -10
- package/bin/creditdaddy.js +61 -1
- package/build.json +3 -3
- package/package.json +2 -2
- package/src/checkin.js +106 -3
- package/src/cookieSites.js +348 -340
- package/src/daemon.js +86 -11
- package/src/externalQuota.js +34 -2
- package/src/i18n/en.json +129 -1
- package/src/i18n/ja.json +129 -1
- package/src/i18n/ko.json +129 -1
- package/src/i18n/zh-TW.json +129 -1
- package/src/panel.html +374 -42
- package/src/store.js +58 -4
- package/src/tray/autostart.js +199 -0
- package/src/tray/icon-brand.png +0 -0
- package/src/tray/icon-mono-black.ico +0 -0
- package/src/tray/icon-mono-white.ico +0 -0
- package/src/tray/icon-template.png +0 -0
- package/src/tray/icon.ico +0 -0
- package/src/tray/icon.png +0 -0
- package/src/tray/tray.js +249 -0
- package/src/tray/tray.ps1 +130 -0
- package/src/tray/trayRuntime.js +90 -0
- package/src/tray/trayWin.js +121 -0
- package/src/zcodeAutoClaim.js +53 -6
- package/src/zcodeClient.js +72 -3
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* systray2 运行时懒装 — 移植自 10Router cli/hooks/trayRuntime.js(AGPL-3.0 同族)。
|
|
3
|
+
*
|
|
4
|
+
* npm 发布包不携带签名 Go 二进制(杀软误报防线):macOS/Linux 的托盘二进制
|
|
5
|
+
* 首次使用时按需 npm install 进用户数据目录 runtime/node_modules。Windows 不需要
|
|
6
|
+
* (PowerShell 方案零二进制)。
|
|
7
|
+
*/
|
|
8
|
+
import { spawnSync } from 'node:child_process';
|
|
9
|
+
import fs from 'node:fs';
|
|
10
|
+
import path from 'node:path';
|
|
11
|
+
|
|
12
|
+
const SYSTRAY_PKG = 'systray2';
|
|
13
|
+
const SYSTRAY_VERSION = '2.1.4';
|
|
14
|
+
const LEGACY_SYSTRAY_PKG = 'systray';
|
|
15
|
+
|
|
16
|
+
function getRuntimeDir() {
|
|
17
|
+
// <数据目录>/runtime —— 与账号库同盘同权限纪律;store.js 的 dataDir 惰性求值
|
|
18
|
+
try {
|
|
19
|
+
const { dataDir } = require('../store.js');
|
|
20
|
+
return path.join(dataDir(), 'runtime');
|
|
21
|
+
} catch (e) {
|
|
22
|
+
// store 不可用(极端)退回 os.homedir()
|
|
23
|
+
return path.join(require('node:os').homedir(), '.creditdaddy', 'runtime');
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function getRuntimeNodeModules() {
|
|
28
|
+
return path.join(getRuntimeDir(), 'node_modules');
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function hasSystray() {
|
|
32
|
+
return fs.existsSync(path.join(getRuntimeNodeModules(), SYSTRAY_PKG, 'package.json'));
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** 清理旧版 systray@1.0.5(其 Go 二进制 Mach-O 头被 macOS 14+ dyld 拒绝,托盘静默失败) */
|
|
36
|
+
function cleanupLegacySystray({ silent = false } = {}) {
|
|
37
|
+
const targets = [
|
|
38
|
+
path.join(getRuntimeNodeModules(), LEGACY_SYSTRAY_PKG),
|
|
39
|
+
];
|
|
40
|
+
for (const dir of targets) {
|
|
41
|
+
if (fs.existsSync(dir)) {
|
|
42
|
+
try {
|
|
43
|
+
fs.rmSync(dir, { recursive: true, force: true });
|
|
44
|
+
if (!silent) console.log(`[tray] removed legacy systray: ${dir}`);
|
|
45
|
+
} catch (e) {
|
|
46
|
+
if (!silent) console.warn(`[tray] failed to remove ${dir}: ${e.message}`);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** spawnSync npm install;npm 不可用 / 网络不通时返回 null(托盘降级无图标,daemon 照常) */
|
|
53
|
+
function runNpmInstall({ silent = false } = {}) {
|
|
54
|
+
const runtimeDir = getRuntimeDir();
|
|
55
|
+
try {
|
|
56
|
+
fs.mkdirSync(runtimeDir, { recursive: true });
|
|
57
|
+
} catch (e) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
61
|
+
const res = spawnSync(npmCmd, ['install', '--no-audit', '--no-fund', '--omit-dev', `${SYSTRAY_PKG}@${SYSTRAY_VERSION}`], {
|
|
62
|
+
cwd: runtimeDir,
|
|
63
|
+
encoding: 'utf8',
|
|
64
|
+
timeout: 120_000,
|
|
65
|
+
windowsHide: true,
|
|
66
|
+
});
|
|
67
|
+
if (res.status !== 0) {
|
|
68
|
+
if (!silent) console.warn(`[tray] systray2 install failed: ${res.stderr || res.error || 'exit ' + res.status}`);
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
return path.join(getRuntimeNodeModules(), SYSTRAY_PKG);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* 确保托盘运行时就绪(CLI 启动时调用)。失败不抛——托盘是增强能力,不是 daemon 的依赖。
|
|
76
|
+
* @returns {{installed: boolean, cleaned: boolean}}
|
|
77
|
+
*/
|
|
78
|
+
function ensureTrayRuntime({ silent = false } = {}) {
|
|
79
|
+
if (process.platform === 'win32') return { installed: false, cleaned: false }; // Windows 用 PowerShell 方案
|
|
80
|
+
let cleaned = false;
|
|
81
|
+
try {
|
|
82
|
+
cleanupLegacySystray({ silent });
|
|
83
|
+
cleaned = true;
|
|
84
|
+
} catch (e) {}
|
|
85
|
+
if (hasSystray()) return { installed: true, cleaned };
|
|
86
|
+
const installed = Boolean(runNpmInstall({ silent }));
|
|
87
|
+
return { installed, cleaned };
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
export { ensureTrayRuntime, getRuntimeDir, getRuntimeNodeModules, hasSystray, cleanupLegacySystray };
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Windows 托盘(PowerShell NotifyIcon)— 移植自 10Router cli/src/cli/tray/trayWin.js(AGPL-3.0 同族,10R ← CD 双向移植免记账)。
|
|
3
|
+
*
|
|
4
|
+
* 为什么不用 systray 的 Go 二进制:杀软误报(Kaspersky 等 flag tray_windows.exe),
|
|
5
|
+
* PowerShell 方案零二进制依赖、免签名。IPC:stdin JSON 命令 / stdout JSON 事件。
|
|
6
|
+
*/
|
|
7
|
+
import { spawn, execSync } from 'node:child_process';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import fs from 'node:fs';
|
|
10
|
+
import readline from 'node:readline';
|
|
11
|
+
|
|
12
|
+
let psProcess = null;
|
|
13
|
+
let clickHandler = null;
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Windows 托盘背景主题:true = 浅色,false = 深色(默认)。
|
|
17
|
+
* 任务栏颜色跟随「Windows 模式」(SystemUsesLightTheme),不是「应用模式」
|
|
18
|
+
* (AppsUseLightTheme)——自定义主题下两者可不同,优先读任务栏自己的值。
|
|
19
|
+
*/
|
|
20
|
+
function isWindowsLightTheme() {
|
|
21
|
+
const key = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize';
|
|
22
|
+
try {
|
|
23
|
+
const out = execSync(`reg query "${key}" /v SystemUsesLightTheme`, {
|
|
24
|
+
encoding: 'utf8', timeout: 2000, windowsHide: true,
|
|
25
|
+
});
|
|
26
|
+
return /0x1\b/.test(out);
|
|
27
|
+
} catch (e) { /* fall through to app mode */ }
|
|
28
|
+
try {
|
|
29
|
+
const out = execSync(`reg query "${key}" /v AppsUseLightTheme`, {
|
|
30
|
+
encoding: 'utf8', timeout: 2000, windowsHide: true,
|
|
31
|
+
});
|
|
32
|
+
return /0x1\b/.test(out);
|
|
33
|
+
} catch (e) {
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** 单色托盘图标跟随系统主题(深任务栏白色 / 浅任务栏黑色),缺资源回落品牌彩图标 */
|
|
39
|
+
function winTrayIconPath() {
|
|
40
|
+
const mono = path.join(__dirname, isWindowsLightTheme() ? 'icon-mono-black.ico' : 'icon-mono-white.ico');
|
|
41
|
+
try {
|
|
42
|
+
if (fs.existsSync(mono)) return mono;
|
|
43
|
+
} catch (e) {}
|
|
44
|
+
return path.join(__dirname, 'icon.ico');
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function sendCommand(cmd) {
|
|
48
|
+
if (psProcess && psProcess.stdin.writable) {
|
|
49
|
+
psProcess.stdin.write(`${JSON.stringify(cmd)}\n`, 'utf8');
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* 初始化 Windows 托盘
|
|
55
|
+
* @param {Object} options - { iconPath, tooltip, items, onClick }
|
|
56
|
+
* @returns {Object|null} controller with updateItem/setTooltip/kill
|
|
57
|
+
*/
|
|
58
|
+
function initWinTray(options) {
|
|
59
|
+
const { iconPath, tooltip, items, onClick } = options;
|
|
60
|
+
clickHandler = onClick;
|
|
61
|
+
|
|
62
|
+
const scriptPath = path.join(__dirname, 'tray.ps1');
|
|
63
|
+
|
|
64
|
+
try {
|
|
65
|
+
psProcess = spawn(
|
|
66
|
+
'powershell.exe',
|
|
67
|
+
[
|
|
68
|
+
'-NoProfile',
|
|
69
|
+
'-ExecutionPolicy', 'Bypass',
|
|
70
|
+
'-WindowStyle', 'Hidden',
|
|
71
|
+
'-InputFormat', 'Text',
|
|
72
|
+
'-OutputFormat', 'Text',
|
|
73
|
+
'-File', scriptPath,
|
|
74
|
+
'-IconPath', iconPath,
|
|
75
|
+
'-Tooltip', tooltip,
|
|
76
|
+
],
|
|
77
|
+
{ windowsHide: true, stdio: ['pipe', 'pipe', 'pipe'] },
|
|
78
|
+
);
|
|
79
|
+
} catch (err) {
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
const rl = readline.createInterface({ input: psProcess.stdout });
|
|
84
|
+
rl.on('line', (line) => {
|
|
85
|
+
try {
|
|
86
|
+
const evt = JSON.parse(line);
|
|
87
|
+
if (evt.type === 'click' && clickHandler) {
|
|
88
|
+
clickHandler(evt.index);
|
|
89
|
+
}
|
|
90
|
+
} catch (e) {}
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
psProcess.on('error', () => {});
|
|
94
|
+
psProcess.stderr.on('data', () => {});
|
|
95
|
+
|
|
96
|
+
items.forEach((item, index) => {
|
|
97
|
+
sendCommand({ action: 'add-item', index, title: item.title, enabled: item.enabled });
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
return {
|
|
101
|
+
updateItem(index, title, enabled) {
|
|
102
|
+
sendCommand({ action: 'update-item', index, title, enabled });
|
|
103
|
+
},
|
|
104
|
+
setTooltip(text) {
|
|
105
|
+
sendCommand({ action: 'set-tooltip', text });
|
|
106
|
+
},
|
|
107
|
+
kill() {
|
|
108
|
+
try {
|
|
109
|
+
sendCommand({ action: 'kill' });
|
|
110
|
+
} catch (e) {}
|
|
111
|
+
setTimeout(() => {
|
|
112
|
+
if (psProcess && !psProcess.killed) {
|
|
113
|
+
try { psProcess.kill(); } catch (e) {}
|
|
114
|
+
}
|
|
115
|
+
psProcess = null;
|
|
116
|
+
}, 300);
|
|
117
|
+
},
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
export { initWinTray, isWindowsLightTheme, winTrayIconPath };
|
package/src/zcodeAutoClaim.js
CHANGED
|
@@ -27,6 +27,34 @@ function snoozeUntilMs(account) {
|
|
|
27
27
|
return Math.max(meta, proc);
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
+
// ── 验证码失败退避(2026-11-17 用户实测「验证码失败还重复尝试,有封号风险」)──
|
|
31
|
+
// 3007 两轮验证码全拒后(needManual 路径),原实现只标卡片、不设任何退避——下一个
|
|
32
|
+
// tick(最短 1 分钟)原样再撞一轮,用户配 5 分钟周期时一天空撞 288 次失败验证码 + claim,
|
|
33
|
+
// 正是风控眼里的「高频失败画像」,有封号风险。现按连续失败轮数指数退避:
|
|
34
|
+
// 1 轮失败 → 30 分钟;2 轮 → 1 小时;3 轮 → 2 小时;封顶 6 小时。
|
|
35
|
+
// 退避只压自动轮询(手动领取照常直进,见 zcodeAutoClaim 的 source 参数);成功或 1003
|
|
36
|
+
// 即清零。进程内缓存即可——重启清零重新从 30 分钟起步,比落盘更保守也更简单。
|
|
37
|
+
const CAPTCHA_BACKOFF_MS = [0, 30 * 60_000, 60 * 60_000, 120 * 60_000, 360 * 60_000];
|
|
38
|
+
const captchaFailCount = new Map(); // accountId → 连续「两轮验证码全拒」次数
|
|
39
|
+
const captchaBackoffUntil = new Map(); // accountId → ms 时间戳
|
|
40
|
+
|
|
41
|
+
function captchaBackoffMs(account) {
|
|
42
|
+
return captchaBackoffUntil.get(account.id) || 0;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
function recordCaptchaFailure(account) {
|
|
46
|
+
const n = (captchaFailCount.get(account.id) || 0) + 1;
|
|
47
|
+
captchaFailCount.set(account.id, n);
|
|
48
|
+
const ms = CAPTCHA_BACKOFF_MS[Math.min(n, CAPTCHA_BACKOFF_MS.length - 1)];
|
|
49
|
+
captchaBackoffUntil.set(account.id, Date.now() + ms);
|
|
50
|
+
return { fails: n, backoffMin: Math.round(ms / 60_000) };
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
function recordCaptchaSuccess(account) {
|
|
54
|
+
captchaFailCount.delete(account.id);
|
|
55
|
+
captchaBackoffUntil.delete(account.id);
|
|
56
|
+
}
|
|
57
|
+
|
|
30
58
|
// 桌面版(Electron 主进程)注册的隐藏窗口验证码实现;NAS / CLI 为 null(走「需手动领取」分支)
|
|
31
59
|
let captchaProvider = null;
|
|
32
60
|
export function setZcodeCaptchaProvider(fn) { captchaProvider = typeof fn === 'function' ? fn : null; }
|
|
@@ -34,20 +62,34 @@ export function hasZcodeCaptchaProvider() { return Boolean(captchaProvider); }
|
|
|
34
62
|
export function getZcodeCaptchaProvider() { return captchaProvider; }
|
|
35
63
|
|
|
36
64
|
/** 账号被删除时清掉额满暂休缓存(daemon DELETE /api/accounts/:id 调用;落盘份随账号一起删) */
|
|
37
|
-
export function forgetAccount(id) {
|
|
65
|
+
export function forgetAccount(id) {
|
|
66
|
+
snoozeUntil.delete(id);
|
|
67
|
+
captchaFailCount.delete(id);
|
|
68
|
+
captchaBackoffUntil.delete(id);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/** 测试辅助:清空全部进程内暂休/退避状态(跨用例状态泄漏防线) */
|
|
72
|
+
export function _resetBackoffForTests() {
|
|
73
|
+
snoozeUntil.clear();
|
|
74
|
+
captchaFailCount.clear();
|
|
75
|
+
captchaBackoffUntil.clear();
|
|
76
|
+
}
|
|
38
77
|
|
|
39
78
|
const grantsText = (plan) => (plan.grants && plan.grants.length ? plan.grants.join(';') : '');
|
|
40
79
|
|
|
41
80
|
/**
|
|
42
81
|
* 为单个 ZCode 账号执行一次自动领取。
|
|
82
|
+
* @param {{ source?: 'auto'|'manual' }} opts source='manual'(用户手动点领取)跳过暂休窗口——
|
|
83
|
+
* 暂休只保护自动轮询不空打,不该挡用户的手(手动被静默吞掉比多打一次 claim 更伤信任)。
|
|
43
84
|
* @returns {null | { status, message, claims: Array }} null = preview 为空或查询失败(已记日志,不上卡片)
|
|
44
85
|
*/
|
|
45
|
-
export async function zcodeAutoClaim(account) {
|
|
86
|
+
export async function zcodeAutoClaim(account, { source = 'auto' } = {}) {
|
|
46
87
|
const label = account.name || account.uid || account.id;
|
|
47
|
-
{
|
|
48
|
-
const until = snoozeUntilMs(account);
|
|
88
|
+
if (source !== 'manual') {
|
|
89
|
+
const until = Math.max(snoozeUntilMs(account), captchaBackoffMs(account));
|
|
49
90
|
if (until && until > Date.now()) {
|
|
50
|
-
|
|
91
|
+
const isBackoff = captchaBackoffMs(account) > Date.now();
|
|
92
|
+
logger.debug('ZCODE-CLAIM', '{label} 自动轮询暂休到 {until}({why})', { label, until: new Date(until).toISOString(), why: isBackoff ? '验证码连续失败退避' : '服务端计划结束点' });
|
|
51
93
|
return null;
|
|
52
94
|
}
|
|
53
95
|
}
|
|
@@ -80,12 +122,14 @@ export async function zcodeAutoClaim(account) {
|
|
|
80
122
|
// 「待生效」,用户以为没领上。
|
|
81
123
|
claims.push({ plan: planName, via: 'direct', ok: true, startsAt: r?.startsAt || null });
|
|
82
124
|
anySuccess = true;
|
|
125
|
+
recordCaptchaSuccess(account); // 任何成功都清验证码退避计数
|
|
83
126
|
logger.info('ZCODE-CLAIM', '{label} 已领取「{plan}」(免验证码){grants}', { label, plan: planName, grants: grantsText(plan) ? ':' + grantsText(plan) : '' });
|
|
84
127
|
continue;
|
|
85
128
|
} catch (e) {
|
|
86
129
|
if (e.code === 1003) {
|
|
87
130
|
claims.push({ plan: planName, ok: true, already: true });
|
|
88
131
|
logger.info('ZCODE-CLAIM', '{label}「{plan}」已领取过', { label, plan: planName });
|
|
132
|
+
recordCaptchaSuccess(account); // 已领过=服务端认识这个号,清退避
|
|
89
133
|
continue;
|
|
90
134
|
}
|
|
91
135
|
if (e.code === 1005 && e.nextAt) {
|
|
@@ -125,6 +169,7 @@ export async function zcodeAutoClaim(account) {
|
|
|
125
169
|
}
|
|
126
170
|
claims.push({ plan: planName, via: 'captcha', ok: true, startsAt: r2?.startsAt || null });
|
|
127
171
|
anySuccess = true;
|
|
172
|
+
recordCaptchaSuccess(account);
|
|
128
173
|
logger.info('ZCODE-CLAIM', '{label} 已领取「{plan}」(静默验证码){grants}', { label, plan: planName, grants: grantsText(plan) ? ':' + grantsText(plan) : '' });
|
|
129
174
|
} catch (e2) {
|
|
130
175
|
if (e2.code === 1005 && e2.nextAt) {
|
|
@@ -134,9 +179,11 @@ export async function zcodeAutoClaim(account) {
|
|
|
134
179
|
//(claim 前置校验比验证码本身更严),如实带原始报错引导用户去客户端
|
|
135
180
|
needManual = true;
|
|
136
181
|
claims.push({ plan: planName, ok: false, needManual: true, message: e2.message });
|
|
137
|
-
|
|
182
|
+
const bf = recordCaptchaFailure(account); // 指数退避:连续全拒自动轮逐轮拉长间隔(防高频失败画像触发风控/封号)
|
|
183
|
+
logger.warn('ZCODE-CLAIM', '{label}「{plan}」验证码未完成:{err}(可在面板手动领取或到官方客户端领取)。自动轮退避 {min} 分钟(连续第 {n} 轮全拒)', { label, plan: planName, err: e2.message, min: bf.backoffMin, n: bf.fails });
|
|
138
184
|
}
|
|
139
185
|
}
|
|
186
|
+
// 验证码退避优先级高于 1005 暂休(退避更短更保守,取较早到期者由两把锁共同约束)
|
|
140
187
|
// 1005 名额已满 → 按服务端 ends_at 将本账号挂进跳过窗口,下一轮自动轮询在该时间点前不再空打
|
|
141
188
|
if (snoozeAt > 0) {
|
|
142
189
|
snoozeUntil.set(account.id, snoozeAt);
|
package/src/zcodeClient.js
CHANGED
|
@@ -100,14 +100,27 @@ function netPref() {
|
|
|
100
100
|
autoClaimUntil: Number.isFinite(j.autoClaimUntil) ? j.autoClaimUntil : null,
|
|
101
101
|
claimIntervalMin: Number.isFinite(j.claimIntervalMin) ? Number(j.claimIntervalMin) : null,
|
|
102
102
|
claimWindowMin: Number.isFinite(j.claimWindowMin) ? Number(j.claimWindowMin) : null,
|
|
103
|
+
dailyPlanEnabled: j.dailyPlan?.enabled === true,
|
|
104
|
+
dailyPlanHour: Number.isFinite(j.dailyPlan?.hour) ? Math.round(j.dailyPlan.hour) : null,
|
|
105
|
+
dailyPlanMinute: Number.isFinite(j.dailyPlan?.minute) ? Math.round(j.dailyPlan.minute) : null,
|
|
106
|
+
dailyPlanLastDay: typeof j.dailyPlan?.lastRunDay === 'string' ? j.dailyPlan.lastRunDay : null,
|
|
103
107
|
};
|
|
104
|
-
} catch { netPrefCache = { proxyFirst: false, proxyUrl: null, autoClaim: false, autoClaimUntil: null, claimIntervalMin: null, claimWindowMin: null }; }
|
|
108
|
+
} catch { netPrefCache = { proxyFirst: false, proxyUrl: null, autoClaim: false, autoClaimUntil: null, claimIntervalMin: null, claimWindowMin: null, dailyPlanEnabled: false, dailyPlanHour: null, dailyPlanMinute: null, dailyPlanLastDay: null }; }
|
|
105
109
|
return netPrefCache;
|
|
106
110
|
}
|
|
107
111
|
function writeNetPref(p) {
|
|
108
112
|
netPrefCache = p;
|
|
109
113
|
fs.mkdirSync(codeHome(), { recursive: true, mode: 0o700 });
|
|
110
|
-
fs.writeFileSync(NET_PREFS_FILE(), JSON.stringify({
|
|
114
|
+
fs.writeFileSync(NET_PREFS_FILE(), JSON.stringify({
|
|
115
|
+
proxyFirst: p.proxyFirst, proxyUrl: p.proxyUrl, autoClaim: p.autoClaim, autoClaimUntil: p.autoClaimUntil || null,
|
|
116
|
+
claimIntervalMin: p.claimIntervalMin ?? null, claimWindowMin: p.claimWindowMin ?? null,
|
|
117
|
+
dailyPlan: {
|
|
118
|
+
enabled: p.dailyPlanEnabled === true,
|
|
119
|
+
hour: p.dailyPlanHour ?? 8,
|
|
120
|
+
minute: p.dailyPlanMinute ?? 0,
|
|
121
|
+
lastRunDay: p.dailyPlanLastDay || null,
|
|
122
|
+
},
|
|
123
|
+
}, null, 2), { mode: 0o600 });
|
|
111
124
|
}
|
|
112
125
|
export function proxyFirst() { return netPref().proxyFirst; }
|
|
113
126
|
export function proxyUrl() { return netPref().proxyUrl; }
|
|
@@ -158,6 +171,46 @@ export function setClaimWindowMin(v) {
|
|
|
158
171
|
if (!Number.isFinite(n) || n < 0 || n > 1440 || (n > 0 && n < 5)) throw new Error('运行时长需为 0(一直运行)或 5–1440 分钟');
|
|
159
172
|
writeNetPref({ ...netPref(), claimWindowMin: n });
|
|
160
173
|
}
|
|
174
|
+
|
|
175
|
+
// ── 每日定时计划:每天 HH:MM 到点自动开启一轮「自动领取计划」窗口(复用轮询周期/运行时长)──
|
|
176
|
+
// 动机:活动包由服务端在每日 0 点左右刷新放出,用户想让机器在每天早上 8 点自动开始轮询,
|
|
177
|
+
// 而不是每天手动点一次「保存并启用」。计划本身落 zcode-net.json(0600),重启后仍生效。
|
|
178
|
+
// 防重跑:lastRunDay 记业务日(本地日历日),一天只触发一次;手动停用不受影响——
|
|
179
|
+
// 计划到点会重新拉起窗口,用户手动关掉的是「这一轮」,第二天计划照常。
|
|
180
|
+
|
|
181
|
+
/** 每日计划配置。hour 0–23(默认 8),minute 0–59(默认 0);enabled 默认关 */
|
|
182
|
+
export function dailyClaimPlan() {
|
|
183
|
+
const p = netPref();
|
|
184
|
+
const hour = Number.isFinite(p.dailyPlanHour) && p.dailyPlanHour >= 0 && p.dailyPlanHour <= 23 ? p.dailyPlanHour : 8;
|
|
185
|
+
const minute = Number.isFinite(p.dailyPlanMinute) && p.dailyPlanMinute >= 0 && p.dailyPlanMinute <= 59 ? p.dailyPlanMinute : 0;
|
|
186
|
+
return { enabled: p.dailyPlanEnabled === true, hour, minute, lastRunDay: p.dailyPlanLastDay };
|
|
187
|
+
}
|
|
188
|
+
export function setDailyClaimPlan({ enabled, hour, minute } = {}) {
|
|
189
|
+
const cur = dailyClaimPlan();
|
|
190
|
+
let h = cur.hour;
|
|
191
|
+
let m = cur.minute;
|
|
192
|
+
if (hour !== undefined) {
|
|
193
|
+
const n = Math.round(Number(hour));
|
|
194
|
+
if (!Number.isFinite(n) || n < 0 || n > 23) throw new Error('计划时间的小时需在 0–23 之间');
|
|
195
|
+
h = n;
|
|
196
|
+
}
|
|
197
|
+
if (minute !== undefined) {
|
|
198
|
+
const n = Math.round(Number(minute));
|
|
199
|
+
if (!Number.isFinite(n) || n < 0 || n > 59) throw new Error('计划时间的分钟需在 0–59 之间');
|
|
200
|
+
m = n;
|
|
201
|
+
}
|
|
202
|
+
writeNetPref({
|
|
203
|
+
...netPref(),
|
|
204
|
+
dailyPlanEnabled: enabled !== undefined ? enabled === true : cur.enabled,
|
|
205
|
+
dailyPlanHour: h,
|
|
206
|
+
dailyPlanMinute: m,
|
|
207
|
+
dailyPlanLastDay: cur.lastRunDay,
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
/** 记录「业务日 <day> 已按计划跑过」(防同日重触发;重启后状态仍在文件里) */
|
|
211
|
+
export function markDailyClaimRan(day) {
|
|
212
|
+
writeNetPref({ ...netPref(), dailyPlanLastDay: String(day || '') });
|
|
213
|
+
}
|
|
161
214
|
export function setProxyFirst(v) { writeNetPref({ ...netPref(), proxyFirst: v === true }); }
|
|
162
215
|
export function setProxyUrl(u) {
|
|
163
216
|
const t = typeof u === 'string' ? u.trim() : '';
|
|
@@ -702,7 +755,18 @@ export function normalizeBalance(balanceResp) {
|
|
|
702
755
|
const d = balanceResp?.data || {};
|
|
703
756
|
const epochMs = (v) => iso(Number(v) * (Number(v) < 1e12 ? 1000 : 1));
|
|
704
757
|
const plans = Array.isArray(d.plans) ? d.plans.filter((p) => String(p.status || '').toLowerCase() === 'active') : [];
|
|
705
|
-
|
|
758
|
+
// 过期包过滤(2026-11-19 用户实测:已过期的资源包还挂在卡上,有时还配着「已领取」徽章):
|
|
759
|
+
// 服务端的 balances 不清理过期行(expire_at 已过仍返 remaining=3亿),直接全量映射会让
|
|
760
|
+
// 面板展示已失效的额度。expire_at 已过的行丢弃——one_time 包过期即无意义;周期包
|
|
761
|
+
// (recurring)的 expire_at 是下一轮重置点,不算过期(period_end 语义),不过滤。
|
|
762
|
+
// 注意 epochMs 返回 ISO 字符串(经 iso() 包装),比较前转数字
|
|
763
|
+
const expired = (ms) => { if (!ms) return false; const t = new Date(ms).getTime(); return Number.isFinite(t) && t <= Date.now(); };
|
|
764
|
+
const balanceParts = (Array.isArray(d.balances) ? d.balances : [])
|
|
765
|
+
.filter((b) => {
|
|
766
|
+
const exp = epochMs(b.expire_at || 0);
|
|
767
|
+
return !(expired(exp) && String(b.period || 'one_time').toLowerCase() === 'one_time');
|
|
768
|
+
})
|
|
769
|
+
.map((b) => {
|
|
706
770
|
const total = Number(b.total_units);
|
|
707
771
|
const used = Number(b.used_units);
|
|
708
772
|
const remaining = Number(b.remaining_units ?? b.available_units);
|
|
@@ -722,6 +786,11 @@ export function normalizeBalance(balanceResp) {
|
|
|
722
786
|
const entitlementParts = plans.flatMap((p) =>
|
|
723
787
|
(Array.isArray(p.entitlements) ? p.entitlements : [])
|
|
724
788
|
.filter((e) => e.unit_type === 'token' && Number(e.grant_units) > 0)
|
|
789
|
+
// 同款过期过滤:one_time 包的 plan.ends_at 已过 = 该活动额度已失效,不再派生展示
|
|
790
|
+
.filter((e) => {
|
|
791
|
+
const endsAt = epochMs(p.ends_at);
|
|
792
|
+
return !(expired(endsAt) && String(e.period || 'one_time').toLowerCase() === 'one_time');
|
|
793
|
+
})
|
|
725
794
|
.map((e) => {
|
|
726
795
|
const grant = Number(e.grant_units);
|
|
727
796
|
const startsAt = epochMs(e.effective_at || p.starts_at);
|