tt-help-cli-ycl 1.3.12 → 1.3.13

package/src/watch/data-store.js

@@ -1,302 +1,431 @@
-import fs from 'fs';
-import path from 'path';
-
-function inferStatus(u) {
-  if (u.restricted) return 'restricted';
-  if (u.error) return 'error';
-  if (u.processed) return 'done';
-  return 'pending';
-}
-
-export function createStore(filePath) {
-  let data = [];
-  let clientErrors = new Map();
-
-  let backupTimer = null;
-
-  if (filePath) {
-    const resolved = path.resolve(filePath);
-    const backupDir = path.join(path.dirname(resolved), '.backup');
-    const maxBackups = 3;
-
-    if (fs.existsSync(resolved)) {
-      try {
-        const content = fs.readFileSync(resolved, 'utf-8');
-        data = JSON.parse(content);
-        if (!Array.isArray(data)) {
-          data = [];
-        }
-      } catch (e) {
-        console.error(`[data-store] 读取文件失败: ${e.message}`);
-        data = [];
-      }
-    }
-
-    function runBackup() {
-      if (!fs.existsSync(resolved)) return;
-      if (!fs.existsSync(backupDir)) fs.mkdirSync(backupDir, { recursive: true });
-      const now = new Date();
-      const timestamp = now.toISOString().replace(/[:.]/g, '-').slice(0, 13);
-      const backupFile = path.join(backupDir, `data-${timestamp}.json`);
-      try {
-        fs.copyFileSync(resolved, backupFile);
-        const files = fs.readdirSync(backupDir)
-          .filter(f => f.startsWith('data-') && f.endsWith('.json'))
-          .sort()
-          .map(f => path.join(backupDir, f));
-        while (files.length > maxBackups) {
-          fs.unlinkSync(files.shift());
-        }
-      } catch (e) {
-        console.error(`[data-store] 备份失败: ${e.message}`);
-      }
-    }
-
-    backupTimer = setInterval(runBackup, 60 * 60 * 1000);
-  }
-
-  for (const u of data) {
-    if (!u.status) u.status = inferStatus(u);
-  }
-
-  function save() {
-    if (!filePath) return;
-    const resolved = path.resolve(filePath);
-    const json = JSON.stringify(data, null, 2);
-    fs.writeFileSync(resolved, json, 'utf-8');
-  }
-
-  function stopBackup() {
-    if (backupTimer) {
-      clearInterval(backupTimer);
-      backupTimer = null;
-    }
-  }
-
-  function getUser(uid) {
-    return data.find(u => u.uniqueId === uid);
-  }
-
-  function hasUser(uid) {
-    return getUser(uid) !== undefined;
-  }
-
-  function addUser(user, append) {
-    const existing = getUser(user.uniqueId);
-    if (existing) {
-      for (const key of Object.keys(user)) {
-        if (key === 'uniqueId' || key === 'sources') continue;
-        if (user[key] !== undefined && user[key] !== null && user[key] !== '') {
-          existing[key] = user[key];
-        }
-      }
-    } else {
-      if (!user.status) user.status = inferStatus(user);
-      if (user.processed) user.processedAt = user.processedAt || Date.now();
-      if (append) data.push(user);
-      else data.unshift(user);
-    }
-  }
-
-  function getPendingUsers() {
-    return data.filter(u => u.status === 'pending');
-  }
-
-  function getProcessedUsers() {
-    return data.filter(u => u.status === 'done');
-  }
-
-  function getAllUsers() {
-    return data;
-  }
-
-  function claimNextJob(userId, expireMs = 5 * 60 * 1000) {
-    const now = Date.now();
-
-    // 0. 该客户端有未过期的任务，续期返回
-    const ongoing = data.find(u =>
-      u.status === 'processing' && u.claimedBy === userId && u.claimedAt && (now - u.claimedAt) < expireMs
-    );
-    if (ongoing) {
-      ongoing.claimedAt = now;
-      return { uniqueId: ongoing.uniqueId, nickname: ongoing.nickname, claimedAt: ongoing.claimedAt, claimedBy: userId };
-    }
-
-    let next = data.find(u => u.status === 'pending' && u.pinned);
-
-    if (!next) {
-      const expired = data.find(u =>
-        u.status === 'processing' && u.claimedAt && (now - u.claimedAt) > expireMs
-      );
-      if (expired) {
-        expired.status = 'pending';
-        delete expired.claimedAt;
-        next = expired;
-      }
-    }
-
-    if (!next) {
-      next = data.find(u => u.status === 'pending' && u.sources && u.sources.includes('seed'));
-    }
-
-    if (!next) {
-      next = data.find(u => u.status === 'pending' && u.sources && (u.sources.includes('following') || u.sources.includes('follower')));
-    }
-
-    if (!next) {
-      next = data.find(u => u.status === 'pending');
-    }
-
-    if (next) {
-      next.status = 'processing';
-      next.claimedAt = now;
-      next.claimedBy = userId;
-      return { uniqueId: next.uniqueId, nickname: next.nickname, claimedAt: next.claimedAt, claimedBy: userId };
-    }
-    return null;
-  }
-
-  function commitJob(uniqueId, result) {
-    const user = getUser(uniqueId);
-    if (!user) return { saved: false, error: 'user not found' };
-
-    if (result.restricted) {
-      user.status = 'restricted';
-      if (result.userInfo) {
-        const info = result.userInfo;
-        for (const key of Object.keys(info)) {
-          if (key === 'uniqueId' || key === 'sources') continue;
-          if (info[key] !== undefined && info[key] !== null && info[key] !== '') {
-            user[key] = info[key];
-          }
-        }
-      }
-      user.processed = true;
-      user.processedAt = Date.now();
-      user.noVideo = true;
-      user.sources = [...new Set([...(user.sources || []), 'restricted'])];
-    } else if (result.error) {
-      user.status = 'error';
-      user.error = result.error;
-      user.sources = [...new Set([...(user.sources || []), 'error'])];
-    } else {
-      user.status = 'done';
-      user.processed = true;
-      user.processedAt = Date.now();
-      user.followerCount = result.userInfo?.followerCount ?? user.followerCount;
-      user.videoCount = result.userInfo?.videoCount ?? user.videoCount;
-      user.nickname = result.userInfo?.nickname || user.nickname;
-      user.locationCreated = result.userInfo?.locationCreated || user.locationCreated;
-      user.ttSeller = result.userInfo?.ttSeller ?? user.ttSeller;
-      user.verified = result.userInfo?.verified ?? user.verified;
-      user.region = result.userInfo?.region || user.region;
-      user.signature = result.userInfo?.signature ?? user.signature;
-      user.followingCount = result.userInfo?.followingCount ?? user.followingCount;
-      user.heartCount = result.userInfo?.heartCount ?? user.heartCount;
-      if (result.userInfo?.secUid) user.secUid = result.userInfo.secUid;
-      const extraFields = ['restricted', 'error', 'userInfo', 'discoveredVideoAuthors',
-        'discoveredCommentAuthors', 'discoveredGuessAuthors', 'discoveredFollowing',
-        'discoveredFollowers', 'uniqueId', 'sources'];
-      for (const key of Object.keys(result)) {
-        if (extraFields.includes(key)) continue;
-        if (result[key] !== undefined && result[key] !== null && result[key] !== '') {
-          user[key] = result[key];
-        }
-      }
-      user.sources = [...new Set([...(user.sources || []), 'processed'])];
-
-      const discovered = [
-        ...(result.discoveredVideoAuthors || []).map(v => ({
-          uniqueId: v.uniqueId, nickname: v.nickname, locationCreated: v.locationCreated,
-          sources: ['video']
-        })),
-        ...(result.discoveredCommentAuthors || []).map(c => {
-          const id = typeof c === 'string' ? c.replace(/^@/, '') : c.uniqueId;
-          return typeof c === 'string'
-            ? { uniqueId: id, sources: ['comment'] }
-            : { uniqueId: id, ...c, sources: [...new Set([...(c.sources || []), 'comment'])] };
-        }),
-        ...(result.discoveredGuessAuthors || []).map(g => {
-          const id = typeof g === 'string' ? g.replace(/^@/, '') : g.uniqueId;
-          return typeof g === 'string'
-            ? { uniqueId: id, sources: ['guess'] }
-            : { uniqueId: id, ...g, sources: [...new Set([...(g.sources || []), 'guess'])] };
-        }),
-        ...(result.discoveredFollowing || []).map(([handle, name]) => ({
-          uniqueId: handle.replace(/^@/, ''), nickname: name, sources: ['following']
-        })),
-        ...(result.discoveredFollowers || []).map(([handle, name]) => ({
-          uniqueId: handle.replace(/^@/, ''), nickname: name, sources: ['follower']
-        })),
-      ];
-
-      for (const du of discovered) {
-        if (!du.uniqueId) continue;
-        addUser(du, true);
-      }
-    }
-
-    delete user.claimedAt;
-    save();
-    return { saved: true };
-  }
-
-  function resetJob(uniqueId) {
-    const user = getUser(uniqueId);
-    if (!user) return { saved: false, error: 'user not found' };
-    user.status = 'pending';
-    delete user.claimedAt;
-    delete user.processedAt;
-    delete user.processed;
-    delete user.error;
-    delete user.restricted;
-    delete user.noVideo;
-    save();
-    return { saved: true };
-  }
-
-  function togglePin(uniqueId) {
-    const user = getUser(uniqueId);
-    if (!user) return { saved: false, error: 'user not found' };
-    user.pinned = !user.pinned;
-    save();
-    return { saved: true, pinned: user.pinned };
-  }
-
-  function reportClientError(userId, errorType, errorMessage, username) {
-    const existing = clientErrors.get(userId);
-    if (existing) {
-      existing.errorType = errorType;
-      existing.errorMessage = errorMessage;
-      existing.username = username;
-      existing.timestamp = Date.now();
-      existing.reportCount = (existing.reportCount || 1) + 1;
-    } else {
-      clientErrors.set(userId, {
-        userId,
-        errorType,
-        errorMessage,
-        username,
-        timestamp: Date.now(),
-        reportCount: 1,
-      });
-    }
-  }
-
-  function deleteClientError(userId) {
-    clientErrors.delete(userId);
-  }
-
-  function getClientErrors() {
-    return Array.from(clientErrors.values());
-  }
-
-  return {
-    save, getUser, hasUser, addUser,
-    getPendingUsers, getProcessedUsers, getAllUsers,
-    claimNextJob, commitJob, resetJob, togglePin,
-    reportClientError, deleteClientError, getClientErrors,
-    stopBackup,
-    data,
-  };
-}
+import fs from 'fs';
+import path from 'path';
+
+function inferStatus(u) {
+  if (u.restricted) return 'restricted';
+  if (u.error) return 'error';
+  if (u.processed) return 'done';
+  return 'pending';
+}
+
+export function createStore(filePath) {
+  let data = [];
+  let clientErrors = new Map();
+
+  let backupTimer = null;
+
+  if (filePath) {
+    const resolved = path.resolve(filePath);
+    const backupDir = path.join(path.dirname(resolved), '.backup');
+    const maxBackups = 3;
+
+    if (fs.existsSync(resolved)) {
+      try {
+        const content = fs.readFileSync(resolved, 'utf-8');
+        data = JSON.parse(content);
+        if (!Array.isArray(data)) {
+          data = [];
+        }
+      } catch (e) {
+        console.error(`[data-store] 读取文件失败: ${e.message}`);
+        data = [];
+      }
+    }
+
+    function runBackup() {
+      if (!fs.existsSync(resolved)) return;
+      if (!fs.existsSync(backupDir)) fs.mkdirSync(backupDir, { recursive: true });
+      const now = new Date();
+      const timestamp = now.toISOString().replace(/[:.]/g, '-').slice(0, 13);
+      const backupFile = path.join(backupDir, `data-${timestamp}.json`);
+      try {
+        fs.copyFileSync(resolved, backupFile);
+        const files = fs.readdirSync(backupDir)
+          .filter(f => f.startsWith('data-') && f.endsWith('.json'))
+          .sort()
+          .map(f => path.join(backupDir, f));
+        while (files.length > maxBackups) {
+          fs.unlinkSync(files.shift());
+        }
+      } catch (e) {
+        console.error(`[data-store] 备份失败: ${e.message}`);
+      }
+    }
+
+    backupTimer = setInterval(runBackup, 60 * 60 * 1000);
+  }
+
+  for (const u of data) {
+    if (!u.status) u.status = inferStatus(u);
+  }
+
+  function save() {
+    if (!filePath) return;
+    const resolved = path.resolve(filePath);
+    const json = JSON.stringify(data, null, 2);
+    fs.writeFileSync(resolved, json, 'utf-8');
+  }
+
+  function stopBackup() {
+    if (backupTimer) {
+      clearInterval(backupTimer);
+      backupTimer = null;
+    }
+  }
+
+  function getUser(uid) {
+    return data.find(u => u.uniqueId === uid);
+  }
+
+  function hasUser(uid) {
+    return getUser(uid) !== undefined;
+  }
+
+  function userExists(uid) {
+    return hasUser(uid);
+  }
+
+  function addUser(user, append) {
+    const existing = getUser(user.uniqueId);
+    if (existing) {
+      for (const key of Object.keys(user)) {
+        if (key === 'uniqueId' || key === 'sources') continue;
+        if (user[key] !== undefined && user[key] !== null && user[key] !== '') {
+          existing[key] = user[key];
+        }
+      }
+    } else {
+      if (!user.status) user.status = inferStatus(user);
+      if (user.processed) user.processedAt = user.processedAt || Date.now();
+      if (append) data.push(user);
+      else data.unshift(user);
+    }
+  }
+
+  function getPendingUsers() {
+    return data.filter(u => u.status === 'pending');
+  }
+
+  function getProcessedUsers() {
+    return data.filter(u => u.status === 'done');
+  }
+
+  function getAllUsers() {
+    return data;
+  }
+
+  function claimNextJob(userId, expireMs = 5 * 60 * 1000) {
+    const now = Date.now();
+
+    // 0. 该客户端有未过期的任务，续期返回
+    const ongoing = data.find(u =>
+      u.status === 'processing' && u.claimedBy === userId && u.claimedAt && (now - u.claimedAt) < expireMs
+    );
+    if (ongoing) {
+      ongoing.claimedAt = now;
+      return { uniqueId: ongoing.uniqueId, nickname: ongoing.nickname, claimedAt: ongoing.claimedAt, claimedBy: userId };
+    }
+
+    // 按猜测国家梯队排序：第一梯队优先，无国家排最后
+    const tier1 = new Set(['PL', 'NL', 'BE']);
+    const tier2 = new Set(['DE', 'FR', 'IT', 'IE', 'ES']);
+    function locationTier(u) {
+      const loc = (u.guessedLocation || '').toUpperCase();
+      if (tier1.has(loc)) return 0;
+      if (tier2.has(loc)) return 1;
+      return 2;
+    }
+
+    function pickFirst(sorted) {
+      return sorted.length > 0 ? sorted[0] : null;
+    }
+
+    let next = data.find(u => u.status === 'pending' && u.pinned);
+
+    if (!next) {
+      const expired = data.find(u =>
+        u.status === 'processing' && u.claimedAt && (now - u.claimedAt) > expireMs
+      );
+      if (expired) {
+        expired.status = 'pending';
+        delete expired.claimedAt;
+        next = expired;
+      }
+    }
+
+    if (!next) {
+      const seed = data.filter(u => u.status === 'pending' && u.sources && u.sources.includes('seed'));
+      seed.sort((a, b) => locationTier(a) - locationTier(b));
+      next = pickFirst(seed);
+    }
+
+    if (!next) {
+      const follow = data.filter(u => u.status === 'pending' && u.sources && (u.sources.includes('following') || u.sources.includes('follower')));
+      follow.sort((a, b) => locationTier(a) - locationTier(b));
+      next = pickFirst(follow);
+    }
+
+    if (!next) {
+      const all = data.filter(u => u.status === 'pending');
+      all.sort((a, b) => locationTier(a) - locationTier(b));
+      next = pickFirst(all);
+    }
+
+    if (next) {
+      next.status = 'processing';
+      next.claimedAt = now;
+      next.claimedBy = userId;
+      return { uniqueId: next.uniqueId, nickname: next.nickname, claimedAt: next.claimedAt, claimedBy: userId };
+    }
+    return null;
+  }
+
+  function processDiscoveredUsers(result) {
+    const guessedLocation = result.guessedLocation || null;
+    const discovered = [
+      ...(result.discoveredVideoAuthors || []).map(v => ({
+        uniqueId: typeof v === 'string' ? v.replace(/^@/, '') : v.uniqueId?.replace(/^@/, '') || '',
+        nickname: typeof v === 'string' ? null : v.nickname || null,
+        locationCreated: typeof v === 'string' ? null : v.locationCreated || null,
+        guessedLocation: typeof v === 'string' ? guessedLocation : (v.guessedLocation || guessedLocation),
+        source: 'video',
+      })),
+      ...(result.discoveredCommentAuthors || []).map(c => {
+        if (typeof c === 'string') return { uniqueId: c.replace(/^@/, ''), source: 'comment', guessedLocation };
+        return { uniqueId: (c.author || c.uniqueId || '').replace(/^@/, ''), nickname: c.nickname || null, source: 'comment', guessedLocation: c.guessedLocation || guessedLocation };
+      }),
+      ...(result.discoveredGuessAuthors || []).map(g => {
+        if (typeof g === 'string') return { uniqueId: g.replace(/^@/, ''), source: 'guess', guessedLocation };
+        return { uniqueId: (g.author || g.uniqueId || '').replace(/^@/, ''), nickname: g.nickname || null, source: 'guess', guessedLocation: g.guessedLocation || guessedLocation };
+      }),
+      ...(result.discoveredFollowing || []).map(f => {
+        const handle = Array.isArray(f) ? f[0] : (f.handle || '');
+        const name = Array.isArray(f) ? f[1] : (f.displayName || null);
+        return { uniqueId: handle.replace(/^@/, ''), nickname: name, source: 'following', guessedLocation: (typeof f === 'object' && f.guessedLocation) || guessedLocation };
+      }),
+      ...(result.discoveredFollowers || []).map(f => {
+        const handle = Array.isArray(f) ? f[0] : (f.handle || '');
+        const name = Array.isArray(f) ? f[1] : (f.displayName || null);
+        return { uniqueId: handle.replace(/^@/, ''), nickname: name, source: 'follower', guessedLocation: (typeof f === 'object' && f.guessedLocation) || guessedLocation };
+      }),
+    ].filter(u => u.uniqueId);
+
+    const newUsers = [];
+    for (const d of discovered) {
+      const existing = getUser(d.uniqueId);
+      if (!existing) {
+        addUser(d, true);
+        newUsers.push(d.uniqueId);
+      }
+    }
+    return newUsers;
+  }
+
+  function updateUserFromResult(user, result) {
+    if (result.restricted) {
+      user.status = 'restricted';
+      if (result.userInfo) {
+        const info = result.userInfo;
+        for (const key of Object.keys(info)) {
+          if (key === 'uniqueId' || key === 'sources') continue;
+          if (info[key] !== undefined && info[key] !== null && info[key] !== '') {
+            user[key] = info[key];
+          }
+        }
+      }
+      user.processed = true;
+      user.processedAt = Date.now();
+      user.sources = [...new Set([...(user.sources || []), 'restricted'])];
+    } else if (result.error) {
+      user.status = 'error';
+      user.error = result.error;
+      user.sources = [...new Set([...(user.sources || []), 'error'])];
+    } else {
+      user.status = 'done';
+      user.processed = true;
+      user.processedAt = Date.now();
+      user.noVideo = result.noVideo || false;
+      user.keepFollow = result.keepFollow || false;
+      user.hasFollowData = result.hasFollowData || false;
+
+      if (result.userInfo) {
+        const info = result.userInfo;
+        for (const key of Object.keys(info)) {
+          if (key === 'uniqueId' || key === 'sources') continue;
+          if (info[key] !== undefined && info[key] !== null && info[key] !== '') {
+            user[key] = info[key];
+          }
+        }
+      }
+
+      user.followerCount = result.userInfo?.followerCount ?? user.followerCount;
+      user.videoCount = result.userInfo?.videoCount ?? user.videoCount;
+      user.nickname = result.userInfo?.nickname || user.nickname;
+      user.locationCreated = result.userInfo?.locationCreated || user.locationCreated;
+      user.ttSeller = result.userInfo?.ttSeller ?? user.ttSeller;
+      user.verified = result.userInfo?.verified ?? user.verified;
+      user.region = result.userInfo?.region || user.region;
+      user.signature = result.userInfo?.signature ?? user.signature;
+      user.followingCount = result.userInfo?.followingCount ?? user.followingCount;
+      user.heartCount = result.userInfo?.heartCount ?? user.heartCount;
+      if (result.userInfo?.secUid) user.secUid = result.userInfo.secUid;
+      const extraFields = ['restricted', 'error', 'userInfo', 'discoveredVideoAuthors',
+        'discoveredCommentAuthors', 'discoveredGuessAuthors', 'discoveredFollowing',
+        'discoveredFollowers', 'uniqueId', 'sources'];
+      for (const key of Object.keys(result)) {
+        if (extraFields.includes(key)) continue;
+        if (result[key] !== undefined && result[key] !== null && result[key] !== '') {
+          user[key] = result[key];
+        }
+      }
+    }
+  }
+
+  function commitJob(uniqueId, result) {
+    const user = getUser(uniqueId);
+    if (!user) return { saved: false, error: 'user not found' };
+
+    updateUserFromResult(user, result);
+    delete user.claimedAt;
+    const newUsers = processDiscoveredUsers(result);
+
+    save();
+    return { saved: true, status: user.status, newUsers };
+  }
+
+  function commitNewExplore(uniqueId, result) {
+    const existing = getUser(uniqueId);
+    if (existing) {
+      updateUserFromResult(existing, result);
+      const newUsers = processDiscoveredUsers(result);
+      save();
+      return { saved: true, created: false, status: existing.status, newUsers };
+    }
+
+    const userObj = {
+      uniqueId,
+      ...(result.userInfo || {}),
+      sources: ['refresh-explore'],
+    };
+    updateUserFromResult(userObj, result);
+    addUser(userObj, true);
+    const newUsers = processDiscoveredUsers(result);
+
+    save();
+    return { saved: true, created: true, status: userObj.status, newUsers };
+  }
+
+  function resetJob(uniqueId) {
+    const user = getUser(uniqueId);
+    if (!user) return { saved: false, error: 'user not found' };
+    user.status = 'pending';
+    delete user.claimedAt;
+    delete user.processedAt;
+    delete user.processed;
+    delete user.error;
+    delete user.restricted;
+    delete user.noVideo;
+    save();
+    return { saved: true };
+  }
+
+  function togglePin(uniqueId) {
+    const user = getUser(uniqueId);
+    if (!user) return { saved: false, error: 'user not found' };
+    user.pinned = !user.pinned;
+    save();
+    return { saved: true, pinned: user.pinned };
+  }
+
+  function getNextRedoJob(userId) {
+    const now = Date.now();
+    const defaultTime = new Date('2016-01-01T00:00:00Z').getTime();
+
+    // 筛选目标国家用户，按 refreshTime 升序取最远的（没有则默认 2016-01-01）
+    const targetLocations = ['ES', 'PL', 'NL', 'BE', 'DE', 'FR', 'IT', 'IE'];
+    const targetUsers = data.filter(u => u.ttSeller && u.verified === false && targetLocations.includes(u.locationCreated));
+    if (targetUsers.length === 0) return null;
+
+    targetUsers.sort((a, b) => {
+      const ta = a.refreshTime || defaultTime;
+      const tb = b.refreshTime || defaultTime;
+      return ta - tb;
+    });
+
+    const next = targetUsers[0];
+    next.refreshTime = now;
+    return { uniqueId: next.uniqueId, nickname: next.nickname, refreshTime: next.refreshTime };
+  }
+
+  function commitRedoJob(uniqueId, result) {
+    const user = getUser(uniqueId);
+    if (!user) return { saved: false, error: 'user not found' };
+
+    user.refreshTime = Date.now();
+
+    if (result.userInfo) {
+      const info = result.userInfo;
+      for (const key of Object.keys(info)) {
+        if (key === 'uniqueId' || key === 'sources') continue;
+        if (info[key] !== undefined && info[key] !== null && info[key] !== '') {
+          user[key] = info[key];
+        }
+      }
+    }
+
+    return { saved: true };
+  }
+
+  function reportClientError(userId, errorType, errorMessage, username, stage, errorStack) {
+    const existing = clientErrors.get(userId);
+    if (existing) {
+      existing.timestamp = Date.now();
+      if (errorType === 'captcha') {
+        existing.captchaCount = (existing.captchaCount || 0) + 1;
+        if (!existing.captchaStage) existing.captchaStage = stage || '';
+        if (!existing.captchaMessage) existing.captchaMessage = errorMessage || '';
+        if (!existing.captchaStack) existing.captchaStack = errorStack || '';
+      } else {
+        existing.errorType = errorType;
+        existing.errorMessage = errorMessage || '';
+        existing.errorStack = errorStack || '';
+        existing.stage = stage || '';
+        existing.reportCount = (existing.reportCount || 1) + 1;
+      }
+      if (username) existing.username = username;
+    } else {
+      clientErrors.set(userId, {
+        userId,
+        errorType,
+        errorMessage: errorMessage || '',
+        errorStack: errorStack || '',
+        username,
+        stage: stage || '',
+        timestamp: Date.now(),
+        reportCount: 1,
+        captchaCount: errorType === 'captcha' ? 1 : 0,
+        captchaStage: errorType === 'captcha' ? (stage || '') : '',
+        captchaMessage: errorType === 'captcha' ? (errorMessage || '') : '',
+        captchaStack: errorType === 'captcha' ? (errorStack || '') : '',
+      });
+    }
+  }
+
+  function deleteClientError(userId) {
+    clientErrors.delete(userId);
+  }
+
+  function getClientErrors() {
+    return Array.from(clientErrors.values());
+  }
+
+  return {
+    save, getUser, hasUser, userExists, addUser,
+    getPendingUsers, getProcessedUsers, getAllUsers,
+    claimNextJob, commitJob, commitNewExplore, resetJob, togglePin,
+    getNextRedoJob, commitRedoJob,
+    reportClientError, deleteClientError, getClientErrors,
+    stopBackup,
+    data,
+  };
+}