creditdaddy 0.8.1 → 0.9.2

package/src/checkin.js

@@ -14,6 +14,8 @@ import { productImpl } from './providers.js';
 import { productOf } from './constants.js';
 import { startUsageSyncScheduler } from './tenrouter.js';
 import { refreshContext } from './accounts.js';
+import { zcodeAutoClaim } from './zcodeAutoClaim.js';
+import { autoClaimEnabled } from './zcodeClient.js';
 import { logger } from './logger.js';
 
 const TICK_MS = 2 * 60 * 60 * 1000;        // 2 小时
@@ -70,15 +72,24 @@ async function runTickNow(opts) {
 }
 
 async function runTickInner(opts) {
+  const allAccounts = await loadAccounts();
   // 没有每日签到能力的产品（如 ZCode：积分靠需验证码的活动领取）不参与签到轮
-  const accounts = (await loadAccounts()).filter(
+  const accounts = allAccounts.filter(
     (a) => (!opts.provider || a.provider === opts.provider)
         && (!opts.product || productOf(a.provider) === opts.product)
         && (!opts.onlyAccountId || a.id === opts.onlyAccountId)
         && typeof productImpl(a.provider)?.checkin === 'function'
   );
 
-  if (accounts.length === 0) {
+  // ZCode 活动轮询领取：开关打开（标签页可切换，默认关）且未被筛选参数排除时参与
+  const zAccounts = (autoClaimEnabled()
+      && !opts.onlyAccountId
+      && (!opts.provider || opts.provider === 'zcode')
+      && (!opts.product || opts.product === 'zcode'))
+    ? allAccounts.filter((a) => a.provider === 'zcode')
+    : [];
+
+  if (accounts.length === 0 && zAccounts.length === 0) {
     return { results: [], summary: '没有匹配的账号' };
   }
 
@@ -152,6 +163,24 @@ async function runTickInner(opts) {
   });
   await saveState({ ...state, qoderDailyDone: memo, deviceClaim });
 
+  // ZCode 活动自动领取：每轮签到后顺带轮询（preview 为空时零请求副作用；需开关打开）。
+  // 桌面版已注册隐藏窗口验证码提供者，可静默过验证码；其它环境需要验证码时标记「需手动领取」。
+  for (const za of zAccounts) {
+    const label = za.name || za.uid || za.id;
+    try {
+      const r = await zcodeAutoClaim(za);
+      if (!r) continue;
+      results.push({ accountId: za.id, account: label, provider: 'zcode', status: r.status, message: r.message });
+      const lastResult = { status: r.status, message: r.message, amount: 0, at: new Date().toISOString() };
+      await withAccounts((list) => {
+        const cur = list.find((a) => a.id === za.id);
+        if (cur) cur.lastResult = lastResult;
+      });
+    } catch (e) {
+      logger.warn('ZCODE-CLAIM', `${label} 自动领取异常：${e.message}`);
+    }
+  }
+
   const claimed = results.filter((r) => r.status === 'checked-in');
   const failed = results.filter((r) => r.status === 'failed');
   const none = results.filter((r) => r.status === 'no-activity');

package/src/daemon.js

@@ -50,7 +50,7 @@ import { addAccount, importAccounts, refreshContext } from './accounts.js';
 import { productImpl } from './providers.js';
 import { readWorkbuddySessions, writeWorkbuddySession, workbuddyAuthDir, currentWorkbuddyUid } from './workbuddyLocal.js';
 import { liveToAccount as zcodeLiveAccount, switchTo as zcodeSwitchTo, currentZcodeUid, currentZcodeIdentity, detectZcode, ensureVirtualDeviceMid, terminateZcode } from './zcodeLocal.js';
-import { fetchClaimPlans, claimPlan, fetchCaptchaConfig, proxyFirst, setProxyFirst } from './zcodeClient.js';
+import { fetchClaimPlans, claimPlan, fetchCaptchaConfig, proxyFirst, setProxyFirst, proxyUrl, setProxyUrl, autoClaimEnabled, setAutoClaimEnabled } from './zcodeClient.js';
 import { exportAccounts, parseImport, TransferError } from './transfer.js';
 import { runCheckinTick, getSchedulerInfo, dayKey } from './checkin.js';
 import { detectQoderApps, readQoderAppAccounts, riskIdentityAvailable, riskIdentitySource } from './qoderApp.js';
@@ -246,6 +246,10 @@ async function handleApi(req, res, url) {
         region: typeof body.region === 'string' ? body.region : '',
       });
       logger.info('DAEMON', `ZCode ${account.name || account.id} 领取成功：${outcome.planName}`);
+      await withAccounts((list) => {
+        const cur = list.find((a) => a.id === account.id);
+        if (cur) cur.lastResult = { status: 'checked-in', message: `已领取：${outcome.planName}`, amount: 0, at: new Date().toISOString() };
+      });
       return json(res, 200, outcome);
     } catch (e) {
       logger.warn('DAEMON', `ZCode ${account.name || account.id} 领取失败：${e.message}`);
@@ -259,15 +263,21 @@ async function handleApi(req, res, url) {
       return json(res, 502, { error: e.message });
     }
   }
-  // ZCode 出口偏好：默认「直连优先、代理兜底」，可切「代理优先、直连兜底」（存数据目录 zcode-net.json）
+  // ZCode 出口偏好：默认「直连优先、代理兜底」，可切「代理优先、直连兜底」；代理地址可面板配置（存 zcode-net.json，0600）
   if (p === '/api/zcode/net' && method === 'GET') {
-    return json(res, 200, { proxyFirst: proxyFirst() });
+    const u = proxyUrl();
+    const masked = u ? (() => { try { const x = new URL(u); x.password = x.password ? '*'.repeat(4) : ''; return x.toString(); } catch { return '***'; } })() : null;
+    return json(res, 200, { proxyFirst: proxyFirst(), proxyUrlMasked: masked, autoClaim: autoClaimEnabled(), hasEnvProxy: Boolean(process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy) });
   }
   if (p === '/api/zcode/net' && method === 'PUT') {
     const body = await readBody(req).catch(() => ({}));
-    setProxyFirst(body?.proxyFirst === true);
-    logger.info('DAEMON', `ZCode 出口切换为：${proxyFirst() ? '代理优先' : '直连优先'}`);
-    return json(res, 200, { proxyFirst: proxyFirst() });
+    try {
+      if (body?.proxyFirst !== undefined) setProxyFirst(body.proxyFirst === true);
+      if (body?.proxyUrl !== undefined) setProxyUrl(body.proxyUrl);
+      if (body?.autoClaim !== undefined) setAutoClaimEnabled(body.autoClaim === true);
+    } catch (e) { return json(res, 400, { error: e.message }); }
+    logger.info('DAEMON', `ZCode 出口：${proxyFirst() ? '代理优先' : '直连优先'}，自动领取：${autoClaimEnabled() ? '开' : '关'}，代理 ${proxyUrl() || '(环境变量/未设置)'}`);
+    return json(res, 200, { proxyFirst: proxyFirst(), autoClaim: autoClaimEnabled() });
   }
 
   // 切换 WorkBuddy / ZCode 客户端当前登录账号