creditdaddy 1.3.2 → 1.4.1

package/src/zcodeAutoClaim.js

@@ -12,7 +12,20 @@
  */
 
 import { logger } from './logger.js';
+import { t } from './i18n.js';
 import { fetchClaimPlans, claimPlan, fetchCaptchaConfig } from './zcodeClient.js';
+import { withAccounts } from './store.js';
+
+// 额满（1005）时消费服务端 nextAt（plan.ends_at）：
+// 下轮自动轮询（claimIntervalMin 分钟一触）在 nextAt 之前跳过该号,不做无谓抢。
+// 进程内缓存 + 落盘 account.meta.zcodeClaimNextAt 双轨（重启保护）。
+const snoozeUntil = new Map();  // accountId → ms 时间戳
+
+function snoozeUntilMs(account) {
+  const meta = Number(new Date(account?.meta?.zcodeClaimNextAt || 0)) || 0;
+  const proc = snoozeUntil.get(account.id) || 0;
+  return Math.max(meta, proc);
+}
 
 // 桌面版（Electron 主进程）注册的隐藏窗口验证码实现；NAS / CLI 为 null（走「需手动领取」分支）
 let captchaProvider = null;
@@ -28,11 +41,18 @@ const grantsText = (plan) => (plan.grants && plan.grants.length ? plan.grants.jo
  */
 export async function zcodeAutoClaim(account) {
   const label = account.name || account.uid || account.id;
+  {
+    const until = snoozeUntilMs(account);
+    if (until && until > Date.now()) {
+        logger.debug('ZCODE-CLAIM', '{label} 名额已领完,跳过直到 {until}(服务端计划结束点)', { label, until: new Date(until).toISOString() });
+      return null;
+    }
+  }
   let plans;
   try {
     plans = (await fetchClaimPlans(account)).plans;
   } catch (e) {
-    logger.debug('ZCODE-CLAIM', `${label} 活动查询失败：${e.message}`);
+        logger.debug('ZCODE-CLAIM', '{label} 活动查询失败:{err}', { label, err: e.message });
     return null;
   }
   if (!plans.length) return null;
@@ -41,6 +61,7 @@ export async function zcodeAutoClaim(account) {
   let anySuccess = false;
   let needManual = false;
 
+  let snoozeAt = 0;
   for (const plan of plans) {
     const planName = plan.name || plan.planId;
     // 第 2 步：先试不带验证码
@@ -48,17 +69,20 @@ export async function zcodeAutoClaim(account) {
       const r = await claimPlan(account, plan.planId, {});
       claims.push({ plan: planName, via: 'direct', ok: true });
       anySuccess = true;
-      logger.info('ZCODE-CLAIM', `${label} 已领取「${planName}」（免验证码）${grantsText(plan) ? '：' + grantsText(plan) : ''}`);
+            logger.info('ZCODE-CLAIM', '{label} 已领取「{plan}」(免验证码){grants}', { label, plan: planName, grants: grantsText(plan) ? ':' + grantsText(plan) : '' });
       continue;
     } catch (e) {
       if (e.code === 1003) {
         claims.push({ plan: planName, ok: true, already: true });
-        logger.info('ZCODE-CLAIM', `${label}「${planName}」已领取过`);
+                logger.info('ZCODE-CLAIM', '{label}「{plan}」已领取过', { label, plan: planName });
         continue;
       }
+      if (e.code === 1005 && e.nextAt) {
+        snoozeAt = Math.max(snoozeAt, Number(new Date(e.nextAt)) || 0);
+      }
       if (e.code !== 3007 && e.code !== 3001) {
         claims.push({ plan: planName, ok: false, message: e.message });
-        logger.warn('ZCODE-CLAIM', `${label} 领取「${planName}」失败：${e.message}`);
+                logger.warn('ZCODE-CLAIM', '{label} 领取「{plan}」失败:{err}', { label, plan: planName, err: e.message });
         continue;
       }
     }
@@ -66,7 +90,7 @@ export async function zcodeAutoClaim(account) {
     if (!captchaProvider) {
       needManual = true;
       claims.push({ plan: planName, ok: false, needManual: true });
-      logger.info('ZCODE-CLAIM', `${label}「${planName}」需要验证码，本环境无法自动通过，请在面板手动领取`);
+            logger.info('ZCODE-CLAIM', '{label}「{plan}」需要验证码,本环境无法自动通过,请在面板手动领取', { label, plan: planName });
       continue;
     }
     try {
@@ -76,13 +100,29 @@ export async function zcodeAutoClaim(account) {
       await claimPlan(account, plan.planId, { captchaParam, region });
       claims.push({ plan: planName, via: 'captcha', ok: true });
       anySuccess = true;
-      logger.info('ZCODE-CLAIM', `${label} 已领取「${planName}」（静默验证码）${grantsText(plan) ? '：' + grantsText(plan) : ''}`);
+            logger.info('ZCODE-CLAIM', '{label} 已领取「{plan}」(静默验证码){grants}', { label, plan: planName, grants: grantsText(plan) ? ':' + grantsText(plan) : '' });
     } catch (e2) {
+      if (e2.code === 1005 && e2.nextAt) {
+        snoozeAt = Math.max(snoozeAt, Number(new Date(e2.nextAt)) || 0);
+      }
       needManual = true;
       claims.push({ plan: planName, ok: false, needManual: true, message: e2.message });
-      logger.warn('ZCODE-CLAIM', `${label}「${planName}」验证码未完成：${e2.message}（可在面板手动领取）`);
+            logger.warn('ZCODE-CLAIM', '{label}「{plan}」验证码未完成:{err}(可在面板手动领取)', { label, plan: planName, err: e2.message });
     }
   }
+  // 1005 名额已满 → 按服务端 ends_at 将本账号挂进跳过窗口，下一轮自动轮询在该时间点前不再空打
+  if (snoozeAt > 0) {
+    snoozeUntil.set(account.id, snoozeAt);
+    try {
+      await withAccounts((list) => {
+        const cur = list.find((a) => a.id === account.id);
+        if (cur) {
+          cur.meta = cur.meta && typeof cur.meta === 'object' && !Array.isArray(cur.meta) ? cur.meta : {};
+          cur.meta.zcodeClaimNextAt = new Date(snoozeAt).toISOString();
+        }
+      });
+    } catch {}
+  }
 
   const names = claims.filter((c) => c.ok && !c.already).map((c) => c.plan);
   const status = names.length ? 'checked-in'

package/src/zcodeClient.js

@@ -293,7 +293,7 @@ function combineSignals({ wallSignal, connectSignal, external }) {
  *     跑几分钟，不能因为「连接快、生成慢」被误杀。
  * 不传 connectMs 时退回单段 timeoutMs（旧行为，所有既有调用方不受影响）。
  */
-export async function fetchJsonRace(url, { method = 'GET', headers = {}, body = null, timeoutMs = 15000, connectMs = null, signal = null } = {}) {
+export async function fetchJsonRace(url, { method = 'GET', headers = {}, body = null, timeoutMs = 15000, connectMs = null, signal = null, preferProxy = false, redirect = 'manual' } = {}) {
   const useProxy = Boolean(effectiveProxy()) && !proxyBypass(url);
   const twoPhase = Number.isFinite(connectMs) && connectMs > 0 && connectMs < timeoutMs;
   // 超时信号必须每次尝试各建一个：共用一个的话，代理优先模式下第一条路吃完 timeoutMs，
@@ -302,7 +302,8 @@ export async function fetchJsonRace(url, { method = 'GET', headers = {}, body =
     const wallSignal = AbortSignal.timeout(timeoutMs);
     const connectSignal = twoPhase ? AbortSignal.timeout(connectMs) : null;
     const { signal: abortSignal, releaseConnect } = combineSignals({ wallSignal, connectSignal, external: signal });
-    const base = { method, headers: { ...headers }, ...(body != null ? { body: typeof body === 'string' ? body : JSON.stringify(body) } : {}), signal: abortSignal };
+    // redirect 默认 manual：follow 的 301/302 会把 POST 转 GET 丢 body、307 会把大 body 重放。
+    const base = { method, headers: { ...headers }, ...(body != null ? { body: typeof body === 'string' ? body : JSON.stringify(body) } : {}), signal: abortSignal, redirect };
     return {
       // 响应头到达 = 连接段成功：摘掉 connectSignal 转发，此后只有墙钟/外部取消能中断流
       direct: async () => { const r = await fetch(url, base); releaseConnect(); return r; },
@@ -315,7 +316,11 @@ export async function fetchJsonRace(url, { method = 'GET', headers = {}, body =
       },
     };
   };
-  const order = useProxy ? (proxyFirst() ? ['viaProxy', 'direct'] : ['direct', 'viaProxy']) : ['direct'];
+  // preferProxy：该域名按 IP 识别地区（如 qoder.com 国际版），配置了代理就该优先走代理、
+  // 直连只作兜底——直连「成功返回 403 风控页」也算成功响应，走默认顺序永远不会轮到代理
+  const order = useProxy
+    ? (preferProxy || proxyFirst() ? ['viaProxy', 'direct'] : ['direct', 'viaProxy'])
+    : ['direct'];
   let lastErr = null;
   for (const which of order) {
     const attempts = makeAttempt();

package/src/zcodeGateway.js

@@ -39,7 +39,8 @@ export function getZcodeCompletionProvider() { return completionProvider; }
 import { loadAccounts, loadSettings, saveSettings, loadState, withState } from './store.js';
 import crypto from 'node:crypto';
 import os from 'node:os';
-import { logger, summarizeAttempts } from './logger.js';
+import { logger, summarizeAttempts } from './logger.js';
+import { t } from './i18n.js';
 
 const PLAN_MESSAGES_URL = 'https://zcode.z.ai/api/v1/zcode-plan/anthropic/v1/messages';
 const CAPTCHA_CACHE_TTL_MS = 30_000;
@@ -108,7 +109,7 @@ function isDead(account) {
   if (fp === credFingerprint(account)) return true;
   dead.delete(account.id);
   cooling.delete(account.id);
-  logger.info('ZCODE-GW', `${account.name || account.uid || account.id} 凭据已更新，解除拉黑`);
+  logger.info('ZCODE-GW', '{label} 凭据已更新,解除拉黑', { label: account.name || account.uid || account.id });
   return false;
 }
 
@@ -368,7 +369,13 @@ export function remoteAllowed(remote, allowList) {
   return (Array.isArray(allowList) ? allowList : []).some((entry) => {
     const e = String(entry || '').trim();
     if (!e) return false;
-    if (e.endsWith('*')) return host.toLowerCase().startsWith(e.slice(0, -1).toLowerCase());
+    if (e.endsWith('*')) {
+      // 通配要求带点段尾：防止 192.168.31.1* 这类把 .100-.199 整段一起放行的怪手。
+      // 要扩整段子网，把写法统一为 192.168.31.*（带尾句点）。
+      const prefix = e.slice(0, -1);
+      if (!prefix.endsWith('.')) return false;
+      return host.toLowerCase().startsWith(prefix.toLowerCase());
+    }
     return host.toLowerCase() === e.toLowerCase();
   });
 }
@@ -487,7 +494,7 @@ export async function handleGateway(req, res) {
           if (isAuthError(200, text)) {
             markDead(account);
             attempted.push({ account: label, ok: false, error: 'JWT 已失效，账号拉黑' });
-            logger.warn('ZCODE-GW', `${label} JWT 失效（200 业务码）`);
+            logger.warn('ZCODE-GW', '{label} JWT 失效(200 业务码)', { label });
             continue;
           }
           if (isExhausted(200, text)) {
@@ -509,20 +516,20 @@ export async function handleGateway(req, res) {
             }
             continue;
           }
-          logger.warn('ZCODE-GW', `${label} 上游 200 业务错误：${formatUpstreamError(200, text)} (${text.slice(0, 80)})`);
+          logger.warn('ZCODE-GW', '{label} 上游 200 业务错误:{err} ({snippet})', { label, err: formatUpstreamError(200, text), snippet: text.slice(0, 80) });
           res.writeHead(502, { 'Content-Type': 'application/json' });
           res.end(text);
           return true;
         }
         // 真 Message（非流式）——原样转发
-        logger.debug('ZCODE-GW', `${label} 补全成功 (${upstream.status})`);
+        logger.debug('ZCODE-GW', '{label} 补全成功 ({status})', { label, status: upstream.status });
         stats.lastAccount = label;
         cooling.delete(account.id);
         res.writeHead(upstream.status, { 'Content-Type': ct || 'application/json', 'Cache-Control': 'no-cache' });
         res.end(text);
         return true;
       }
-      logger.debug('ZCODE-GW', `${label} 补全成功 (${upstream.status})`);
+      logger.debug('ZCODE-GW', '{label} 补全成功 ({status})', { label, status: upstream.status });
       stats.lastAccount = label;
       cooling.delete(account.id);
       // 注意：undici 已自动解压上游 gzip——body 是明文，绝不能再带 content-encoding 头
@@ -543,7 +550,7 @@ export async function handleGateway(req, res) {
         }
       } catch (e) {
         // 客户端主动断开（点停止/换一句）就会在这里结束——属正常收尾，不是故障，降为 debug
-        logger.debug('ZCODE-GW', `流式转发中断：${e.message}`);
+        logger.debug('ZCODE-GW', '流式转发中断:{err}', { err: e.message });
       }
       res.end();
       return true;
@@ -554,9 +561,9 @@ export async function handleGateway(req, res) {
     if (isCaptchaError(upstream.status, text)) {
       invalidateCaptcha();
       attempted.push({ account: label, ok: false, error: `验证码被拒（${upstream.status}）`, captcha: true });
-      logger.warn('ZCODE-GW', `${label} 验证码被拒 (${formatUpstreamError(upstream.status, text)})`);
+      logger.warn('ZCODE-GW', '{label} 验证码被拒 ({err})', { label, err: formatUpstreamError(upstream.status, text) });
       try { captcha = await ensureCaptcha(true); } catch (e) {
-        logger.warn('ZCODE-GW', `验证码重解失败：${e.message}`);
+        logger.warn('ZCODE-GW', '验证码重解失败:{err}', { err: e.message });
         captcha = null;
       }
       continue;
@@ -564,31 +571,31 @@ export async function handleGateway(req, res) {
     if (isAuthError(upstream.status, text)) {
       markDead(account);
       attempted.push({ account: label, ok: false, error: 'JWT 已失效，账号拉黑（重新登录后再导入）' });
-      logger.debug('ZCODE-GW', `${label} JWT 失效，拉黑`);
+      logger.debug('ZCODE-GW', '{label} JWT 失效,拉黑', { label });
       continue;
     }
     if (isExhausted(upstream.status, text)) {
       markCooling(account.id, 30 * 60_000);
       attempted.push({ account: label, ok: false, error: '额度不足/无资源包' });
-      logger.debug('ZCODE-GW', `${label} 额度不足 (${upstream.status})`);
+      logger.debug('ZCODE-GW', '{label} 额度不足 ({status})', { label, status: upstream.status });
       continue;
     }
     if (upstream.status === 429) {
       markCooling(account.id);
       attempted.push({ account: label, ok: false, error: '429 限流，冷却 5 分钟' });
-      logger.debug('ZCODE-GW', `${label} 429 限流，冷却 5 分钟`);
+      logger.debug('ZCODE-GW', '{label} 429 限流,冷却 5 分钟', { label });
       continue;
     }
     // 其他错误：友好化展示 + 原样透传给客户端
     const errorSummary = formatUpstreamError(upstream.status, text);
-    logger.warn('ZCODE-GW', `${label} 上游错误 ${upstream.status} — ${errorSummary}`);
+    logger.warn('ZCODE-GW', '{label} 上游错误 {status} — {summary}', { label, status: upstream.status, summary: errorSummary });
     res.writeHead(upstream.status, { 'Content-Type': 'application/json' });
     res.end(text);
     return true;
   }
 
   const failedDetail = summarizeAttempts(attempted);
-  logger.warn('ZCODE-GW', `全部 ${attempted.length} 次尝试失败${failedDetail ? '：' + failedDetail : ''}（下一请求自动重试）`);
+  logger.warn('ZCODE-GW', '全部 {n} 次尝试失败{detail}(下一请求自动重试)', { n: attempted.length, detail: failedDetail ? ':' + failedDetail : '' });
   res.writeHead(502, { 'Content-Type': 'application/json' });
   res.end(JSON.stringify({ error: 'ZCode 网关：所有账号尝试均失败', attempts: attempted }));
   return true;