creditdaddy 0.9.3 → 1.1.1

package/src/providers.js

@@ -9,10 +9,11 @@
  */
 
 import { productOf } from './constants.js';
-import { checkinOne as checkinQoder, fetchQuotaUsage, fetchUserinfo } from './qoderClient.js';
+import { checkinOne as checkinQoder, fetchQuotaUsage, fetchUserinfo, fetchUsageDetail } from './qoderClient.js';
 import { checkinWorkbuddy, checkinWorkbuddyIntl, fetchWorkbuddyQuota, inspectToken } from './workbuddyClient.js';
 import { fetchZcodeQuota } from './zcodeClient.js';
-
+import { fetchMirasimQuota, fetchMirasimProfile } from './mirasimClient.js';
+import { fetchCatpawQuota, fetchCatpawProfile } from './catpawClient.js';
 /** 从 userinfo 响应中挑一个可读的显示名 */
 export function displayNameFrom(ui) {
   const pick = [ui?.nickname, ui?.name, ui?.username, ui?.email]
@@ -21,11 +22,11 @@ export function displayNameFrom(ui) {
   return pick || null;
 }
 
-/** Qoder /api/v2/quota/usage → 统一积分结构 */
-export function normalizeQoderQuota(q) {
+/** Qoder /api/v2/quota/usage → 统一积分结构；detail 为网页端逐资源包明细（可选，已按 uid 校验） */
+export function normalizeQoderQuota(q, detail = null) {
   const names = [['userQuota', '套餐额度', true], ['addOnQuota', '附加额度', false], ['orgResourcePackage', '组织资源包', false]];
-  const expiresAt = Number(q?.expiresAt) > 0 && Number(q.expiresAt) < 253400000000000 ? new Date(Number(q.expiresAt)).toISOString() : null;
-  const parts = names
+  const fmtExpiry = (v) => (Number(v) > 0 && Number(v) < 253400000000000 ? new Date(Number(v)).toISOString() : null);
+  let parts = names
     .map(([k, name, recurring]) => ({ x: q?.[k], name, recurring }))
     .filter(({ x }) => x && Number(x.total) > 0)
     .map(({ x, name, recurring }) => ({
@@ -33,17 +34,87 @@ export function normalizeQoderQuota(q) {
       total: Number(x.total) || 0,
       used: Number(x.used) || 0,
       remaining: Number(x.remaining) || 0,
-      expiresAt,
+      expiresAt: fmtExpiry(q?.expiresAt),
     }));
+  // 网页端明细可用时按「每个资源包一条」展开（含各自到期时间），比聚合值更精确
+  const detailParts = detail ? detailQuotaParts(detail, fmtExpiry) : null;
+  if (detailParts) parts = detailParts;
   const sum = (k) => Math.round(parts.reduce((s, p) => s + p[k], 0) * 100) / 100;
   return { total: sum('total'), used: sum('used'), remaining: sum('remaining'), parts, exceeded: Boolean(q?.isQuotaExceeded) };
 }
 
+/** 网页端用量明细的分组 → 统一 parts（组内为空 / 全 0 时返回 null 让调用方回落聚合数据） */
+const DETAIL_SOURCE_NAME = {
+  PLAN: '套餐额度',
+  RESOURCE_PACKAGE_SOURCE_BONUS: '获赠资源包',
+  RESOURCE_PACKAGE_SOURCE_PURCHASE: '购买资源包',
+  RESOURCE_PACKAGE_SOURCE_ORG: '组织资源包',
+};
+function detailQuotaParts(detail, fmtExpiry) {
+  const groups = [['plan_quota', '套餐额度', true], ['resource_package_quota', '资源包', false], ['dedicated_resource_package_quota', '组织资源包', false]];
+  const parts = [];
+  for (const [key, fallbackName, recurring] of groups) {
+    const rows = detail?.[key]?.quota_detail;
+    if (!Array.isArray(rows)) continue;
+    for (const r of rows) {
+      const total = Number(r?.limit_value) || 0;
+      if (total <= 0) continue;
+      parts.push({
+        name: DETAIL_SOURCE_NAME[r?.source] || fallbackName,
+        recurring,
+        total,
+        used: Number(r?.used_value) || 0,
+        remaining: Number(r?.remaining_value) || 0,
+        expiresAt: fmtExpiry(r?.expires_at),
+      });
+    }
+  }
+  return parts.length ? parts : null;
+}
+
+/**
+ * 网页端逐资源包明细（best-effort）：无会话 Cookie 返回 null；
+ * 会话失效（401/403）时清除 Cookie 并回调 ctx.onWebSessionExpired 提示重新登录，同样回落。
+ * 明细里的 user_id 与账号 uid 不一致时丢弃（防止把别人的资源包显示到这个账号上）。
+ */
+async function qoderWebDetail(account, ctx = {}) {
+  try {
+    const d = await fetchUsageDetail(account);
+    if (!d) return null;
+    if (account.uid && d.user_id && d.user_id !== account.uid) {
+      ctx.log?.('网页会话与账号不匹配，忽略资源包明细');
+      return null;
+    }
+    return d;
+  } catch (e) {
+    if (e.auth) {
+      await clearQoderWebSession(account, ctx);
+      ctx.log?.('Qoder 网页会话已失效，无法显示逐资源包明细（面板里重新登录一次即可）');
+    }
+    return null;
+  }
+}
+
+/** 删除账号上的网页会话 Cookie（失效时），并通知桌面壳可以重新抓取 */
+async function clearQoderWebSession(account, ctx = {}) {
+  const { withAccounts } = await import('./store.js');
+  await withAccounts((list) => {
+    const cur = list.find((a) => a.id === account.id);
+    if (cur?.meta?.qoderWebSession) {
+      const { qoderWebSession, ...meta } = cur.meta;
+      cur.meta = meta;
+      cur.updatedAt = new Date().toISOString();
+      if (account.meta) delete account.meta.qoderWebSession;
+    }
+  });
+  ctx.onWebSessionExpired?.();
+}
+
 const PRODUCTS = {
   qoder: {
     label: 'Qoder',
     checkin: (account) => checkinQoder(account),
-    quota: async (account) => normalizeQoderQuota(await fetchQuotaUsage(account)),
+    quota: async (account, ctx = {}) => normalizeQoderQuota(await fetchQuotaUsage(account), await qoderWebDetail(account, ctx)),
     verify: async (account) => {
       const ui = await fetchUserinfo(account);
       return { name: displayNameFrom(ui), uid: typeof ui?.id === 'string' ? ui.id : null, email: ui?.email || null };
@@ -69,6 +140,40 @@ const PRODUCTS = {
       throw new Error('ZCode 账号请通过「本机导入」添加（需要客户端的完整登录快照才能查询额度与切换）');
     },
   },
+  mirasim: {
+    label: 'mirasim',
+    // 无 checkin：mirasim 额度按 5h/7d 滚动窗口分配，不设签到。
+    // token 约 1 小时过期：quota 内部 401 时自动用 refreshToken 续期，
+    // ctx.onRefresh（refreshContext）回写账号库后，这里再把新凭据同步回 setting.json（若该账号是客户端当前登录）。
+    quota: async (account, ctx = {}) => {
+      const mirasimLocal = await import('./mirasimLocal.js');
+      const wrapped = {
+        ...ctx,
+        onRefresh: async (creds) => {
+          await ctx.onRefresh?.(creds);
+          try {
+            const synced = await mirasimLocal.writeMirasimAuth({ uid: account.uid, token: creds.token, refreshToken: creds.refreshToken, expiresAt: creds.expiresAt });
+            if (synced) ctx.log?.('已同步新 token 到 mirasim 客户端');
+          } catch (e) { ctx.log?.('同步到 mirasim 客户端失败：' + e.message); }
+        },
+      };
+      return fetchMirasimQuota(account, wrapped);
+    },
+    verify: async (account) => {
+      const p = await fetchMirasimProfile(account.token);
+      return { name: p.name || p.email, uid: p.id, email: p.email };
+    },
+  },
+  catpaw: {
+    label: '妙手',
+    // 无 checkin：妙手（美团 CatPaw）按套餐发放 Credits，无每日签到活动。
+    // 凭据由妙手客户端登录管理（无对外 refresh）：401 时提示到客户端重新登录后重新本机导入。
+    quota: (account) => fetchCatpawQuota(account),
+    verify: async (account) => {
+      const p = await fetchCatpawProfile(account.token);
+      return { name: p.name, uid: p.userId, email: null };
+    },
+  },
 };
 
 export function productImpl(provider) {