tt-help-cli-ycl 1.3.35 → 1.3.36

package/src/watch/public/index.html

@@ -103,6 +103,12 @@
       color: #a78bfa;
     }
 
+    .stat-card .value-sub {
+      font-size: 12px;
+      font-weight: 400;
+      margin-top: 2px;
+    }
+
     .stat-card.clickable {
       cursor: pointer;
     }
@@ -161,10 +167,21 @@
       padding-left: 6px;
       font-size: 11px;
       color: #fff;
+      white-space: nowrap;
+    }
+
+    .bar-row .target-badge {
+      width: 60px;
+      text-align: center;
+      color: #4ade80;
+      font-weight: 600;
+      font-size: 12px;
+      flex-shrink: 0;
+      margin: 0 6px;
     }
 
     .bar-row .count {
-      width: 80px;
+      width: 55px;
       text-align: right;
       color: #888;
       flex-shrink: 0;
@@ -814,7 +831,7 @@
   </div>
   <div class="stats">
     <div class="stat-card">
-      <div class="label">总任务</div>
+      <div class="label">总用户</div>
       <div class="value total" id="statTotal">0</div>
     </div>
     <div class="stat-card">
@@ -838,11 +855,11 @@
       <div class="value error" id="statRestricted">0</div>
     </div>
     <div class="stat-card">
-      <div class="label">预处理任务</div>
+      <div class="label">待补资料</div>
       <div class="value target" id="statUserUpdateTasks">0</div>
     </div>
     <div class="stat-card clickable" id="statTargetCard">
-      <div class="label">目标用户(EU商家)</div>
+      <div class="label">目标商家</div>
       <div class="value target" id="statTarget">0</div>
     </div>
   </div>
@@ -889,10 +906,10 @@
       <button data-filter="all" class="active" onclick="setFilter('all')">全部</button>
       <button data-filter="processing" onclick="setFilter('processing')">处理中</button>
       <button data-filter="pending" onclick="setFilter('pending')">待处理</button>
-      <button data-filter="done" onclick="setFilter('done')">已处理</button>
+      <button data-filter="done" onclick="setFilter('done')">已完成</button>
       <button data-filter="error" onclick="setFilter('error')">错误</button>
       <button data-filter="restricted" onclick="setFilter('restricted')">受限</button>
-      <button data-filter="target" onclick="setFilter('target')" style="background:#7c3aed;color:#fff">目标用户(EU)</button>
+      <button data-filter="target" onclick="setFilter('target')" style="background:#7c3aed;color:#fff">目标商家</button>
       <select id="targetLocationFilter" onchange="onTargetLocationChange()"
         style="padding:6px 10px;border:1px solid #7c3aed;border-radius:6px;background:#2a2a3a;color:#ccc;font-size:12px;cursor:pointer;outline:none;display:none">
         <option value="">全部目标国家</option>
@@ -917,9 +934,9 @@
             <th>猜测国家</th>
             <th>来源</th>
             <th>状态</th>
-            <th>接收人</th>
+            <th>处理端</th>
             <th>领取时间</th>
-            <th>提交时间</th>
+            <th>完成时间</th>
           </tr>
         </thead>
         <tbody id="userTable"></tbody>
@@ -1018,11 +1035,19 @@
       } catch (e) { }
     }
 
+    function formatStatNum(value) {
+      const num = Number(value) || 0;
+      if (Math.abs(num) < 1000) return String(num);
+      if (Math.abs(num) < 10000) return num.toLocaleString('zh-CN');
+      const wan = num / 10000;
+      return wan.toFixed(1).replace(/\.0+$/, '') + '万';
+    }
+
     function flashEl(id, value) {
       const el = document.getElementById(id);
       if (!el) return;
       const prev = prevStatValues[id];
-      el.textContent = value;
+      el.textContent = formatStatNum(value);
       if (prev !== undefined && prev !== value) {
         el.classList.remove('flash-change');
         void el.offsetWidth;
@@ -1043,7 +1068,12 @@
       flashEl('statTarget', d.targetUsers);
       flashEl('statUserUpdateTasks', d.userUpdateTasks || 0);
       document.getElementById('lastUpdate').textContent = '\u66f4\u65b0\u4e8e ' + new Date().toLocaleTimeString();
-      document.getElementById('fileMeta').textContent = (d.processingUsers || 0) + ' \u5904\u7406\u4e2d, ' + d.totalUsers + ' \u4e2a\u7528\u6237';
+      document.getElementById('fileMeta').textContent =
+        formatStatNum(d.processingUsers || 0) +
+        ' \u5904\u7406\u4e2d, ' +
+        formatStatNum(d.totalUsers) +
+        ' \u4e2a\u7528\u6237, \u5f85\u5904\u7406 ' +
+        formatStatNum(d.pendingUsers || 0);
 
       renderCountryChart(d.countryStats);
       renderSourceChart(d.sourceStats);
@@ -1064,13 +1094,19 @@
       if (!filtered.length) { el.innerHTML = '<span style="color:#666;font-size:12px">\u6682\u65e0\u6570\u636e</span>'; return; }
       const max = filtered[0].count;
       const top = filtered.slice(0, 15);
-      el.innerHTML = top.map((c, i) => `
+      el.innerHTML = top.map((c, i) => {
+        const targetBadge = c.targetCount > 0
+          ? `<span class="target-badge">🎯 ${c.targetCount}</span>`
+          : `<span class="target-badge" style="visibility:hidden"> </span>`;
+        return `
     <div class="bar-row">
       <span class="name">${c.country}</span>
       <div class="bar-bg"><div class="bar-fill" style="width:${(c.count / max * 100)}%;background:${COLORS[i % COLORS.length]}">${c.count}</div></div>
+      ${targetBadge}
       <span class="count">${(currentStats ? (c.count / currentStats.totalUsers * 100).toFixed(1) : 0)}%</span>
     </div>
-  `).join('');
+  `;
+      }).join('');
     }
 
     function renderSourceChart(sources) {
@@ -1098,7 +1134,7 @@
         const statusTags = {
           restricted: '<span class="tag error">\u53d7\u9650(\u8df3\u8fc7)</span>',
           error: '<span class="tag error">\u9519\u8bef(\u5f85\u91cd\u8bd5)</span>',
-          done: '<span class="tag processed">\u5df2\u5904\u7406</span>',
+          done: '<span class="tag processed">\u5df2\u5b8c\u6210</span>',
           processing: '<span class="tag processing">\u5904\u7406\u4e2d</span>',
           pending: '<span class="tag pending">\u5f85\u5904\u7406</span>',
         };
@@ -1128,9 +1164,9 @@
       <td data-label="猜测国家">${guessedLoc}</td>
       <td data-label="来源">${sources || '-'}</td>
       <td data-label="状态">${statusTag} ${extraTags.join(' ')}</td>
-      <td data-label="接收人" style="font-size:11px;color:#888">${claimer}</td>
+      <td data-label="处理端" style="font-size:11px;color:#888">${claimer}</td>
       <td data-label="领取时间" style="font-size:11px;color:#888">${claimTime}</td>
-      <td data-label="提交时间" style="font-size:11px;color:#888">${procTime}</td>
+      <td data-label="完成时间" style="font-size:11px;color:#888">${procTime}</td>
     </tr>`;
       }).join('');
 

package/src/watch/server.js

@@ -7,7 +7,7 @@ import { fileURLToPath } from "url";
 import { spawn } from "child_process";
 import { createStore } from "./data-store.js";
 
-const TARGET_LOCATIONS = ["ES", "PL", "NL", "BE", "DE", "FR", "IT", "IE"];
+const TARGET_LOCATIONS = ["ES", "PL", "NL", "BE", "DE", "FR", "IT", "IE", "AT"];
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -25,202 +25,8 @@ function getLocalIP() {
 const __dirname = dirname(__filename);
 const publicDir = join(__dirname, "public");
 
-function parseQuery(url) {
-  const idx = url.indexOf("?");
-  if (idx === -1) return { path: url, params: {} };
-  const params = {};
-  for (const kv of url.slice(idx + 1).split("&")) {
-    const [k, v] = kv.split("=");
-    params[decodeURIComponent(k)] = decodeURIComponent(v || "");
-  }
-  return { path: url.slice(0, idx), params };
-}
-
-function computeStats(users) {
-  const total = users.length;
-  const statusCounts = {
-    pending: 0,
-    processing: 0,
-    done: 0,
-    error: 0,
-    restricted: 0,
-  };
-  for (const u of users) {
-    statusCounts[u.status] = (statusCounts[u.status] || 0) + 1;
-  }
-
-  const targetUsers = users.filter(
-    (u) =>
-      u.ttSeller &&
-      u.verified === false &&
-      TARGET_LOCATIONS.includes(u.locationCreated),
-  ).length;
-
-  const countryMap = {};
-  for (const u of users) {
-    if (u.status !== "done") continue;
-    const loc = u.locationCreated || "\u672a\u77e5";
-    countryMap[loc] = (countryMap[loc] || 0) + 1;
-  }
-  const countryStats = Object.entries(countryMap)
-    .map(([country, count]) => ({ country, count }))
-    .sort((a, b) => b.count - a.count);
-
-  const sourceCounts = {
-    seed: 0,
-    video: 0,
-    comment: 0,
-    guess: 0,
-    following: 0,
-    follower: 0,
-    processed: 0,
-    restricted: 0,
-    error: 0,
-    noVideo: 0,
-  };
-  for (const u of users) {
-    if (u.status === "restricted") {
-      sourceCounts.restricted++;
-      continue;
-    }
-    if (u.status === "error") {
-      sourceCounts.error++;
-      continue;
-    }
-    if (u.noVideo) sourceCounts.noVideo++;
-    const sources = u.sources || [];
-    if (u.status === "done") sourceCounts.processed++;
-    if (sources.includes("video") && u.status !== "done") sourceCounts.video++;
-    if (sources.includes("comment") && u.status !== "done")
-      sourceCounts.comment++;
-    if (sources.includes("guess") && u.status !== "done") sourceCounts.guess++;
-    if (sources.includes("following") && u.status !== "done")
-      sourceCounts.following++;
-    if (sources.includes("follower") && u.status !== "done")
-      sourceCounts.follower++;
-    if (
-      !sources.includes("video") &&
-      !sources.includes("comment") &&
-      !sources.includes("guess") &&
-      !sources.includes("following") &&
-      !sources.includes("follower") &&
-      u.status !== "done"
-    )
-      sourceCounts.seed++;
-  }
-
-  return {
-    totalUsers: total,
-    processedUsers: statusCounts.done,
-    pendingUsers: statusCounts.pending,
-    processingUsers: statusCounts.processing,
-    restrictedUsers: statusCounts.restricted,
-    errorUsers: statusCounts.error,
-    targetUsers,
-    countryStats,
-    sourceStats: sourceCounts,
-  };
-}
-
 function computeStatsIncremental(st) {
-  const quick = st.getStats();
-  const all = st.getAllUsers();
-  const total = all.length;
-  const statusCounts = quick.statusCounts;
-
-  const countryMap = {};
-  const sourceCounts = {
-    seed: 0,
-    video: 0,
-    comment: 0,
-    guess: 0,
-    following: 0,
-    follower: 0,
-    processed: 0,
-    restricted: 0,
-    error: 0,
-    noVideo: 0,
-  };
-  let targetUsers = 0;
-  let userUpdateTasks = 0;
-  const targetCountryMap = {};
-
-  for (const u of all) {
-    // 国家统计
-    if (u.status === "done") {
-      const loc = u.locationCreated || "未知";
-      countryMap[loc] = (countryMap[loc] || 0) + 1;
-    }
-    // 预处理任务统计（与 /api/user-update-tasks 条件一致，不做 continue 跳过）
-    const ttSellerEmpty =
-      u.ttSeller === null || u.ttSeller === undefined || u.ttSeller === "";
-    const updateCountNotSet =
-      u.userUpdateCount === null ||
-      u.userUpdateCount === undefined ||
-      u.userUpdateCount <= 0;
-    if (ttSellerEmpty && updateCountNotSet) userUpdateTasks++;
-
-    // 目标用户统计（按国家分组）
-    if (
-      u.ttSeller &&
-      u.verified === false &&
-      TARGET_LOCATIONS.includes(u.locationCreated)
-    ) {
-      targetUsers++;
-      const loc = u.locationCreated;
-      targetCountryMap[loc] = (targetCountryMap[loc] || 0) + 1;
-    }
-
-    // 来源统计（restricted/error 跳过后续统计）
-    if (u.status === "restricted") {
-      sourceCounts.restricted++;
-      continue;
-    }
-    if (u.status === "error") {
-      sourceCounts.error++;
-      continue;
-    }
-    if (u.noVideo) sourceCounts.noVideo++;
-    const sources = u.sources || [];
-    if (u.status === "done") sourceCounts.processed++;
-    if (sources.includes("video") && u.status !== "done") sourceCounts.video++;
-    if (sources.includes("comment") && u.status !== "done")
-      sourceCounts.comment++;
-    if (sources.includes("guess") && u.status !== "done") sourceCounts.guess++;
-    if (sources.includes("following") && u.status !== "done")
-      sourceCounts.following++;
-    if (sources.includes("follower") && u.status !== "done")
-      sourceCounts.follower++;
-    if (
-      !sources.includes("video") &&
-      !sources.includes("comment") &&
-      !sources.includes("guess") &&
-      !sources.includes("following") &&
-      !sources.includes("follower") &&
-      u.status !== "done"
-    )
-      sourceCounts.seed++;
-  }
-  const countryStats = Object.entries(countryMap)
-    .map(([country, count]) => ({ country, count }))
-    .sort((a, b) => b.count - a.count);
-  const targetCountryStats = Object.entries(targetCountryMap)
-    .map(([country, count]) => ({ country, count }))
-    .sort((a, b) => b.count - a.count);
-
-  return {
-    totalUsers: total,
-    processedUsers: statusCounts.done,
-    pendingUsers: statusCounts.pending,
-    processingUsers: statusCounts.processing,
-    restrictedUsers: statusCounts.restricted,
-    errorUsers: statusCounts.error,
-    targetUsers,
-    userUpdateTasks,
-    targetCountryStats,
-    countryStats,
-    sourceStats: sourceCounts,
-  };
+  return st.getDashboardStats(TARGET_LOCATIONS);
 }
 
 function readBody(req) {
@@ -238,6 +44,14 @@ function readBody(req) {
   });
 }
 
+function parseQuery(urlString = "/") {
+  const url = new URL(urlString, "http://127.0.0.1");
+  return {
+    path: url.pathname,
+    params: Object.fromEntries(url.searchParams.entries()),
+  };
+}
+
 function sendJSON(res, code, data) {
   res.writeHead(code, { "Content-Type": "application/json; charset=utf-8" });
   res.end(JSON.stringify(data));
@@ -260,9 +74,9 @@ function sendCSV(res, columns, rows) {
   res.end(body);
 }
 
-export function startWatchServer(outputFile, port = 3000, existingStore) {
+export function startWatchServer(dataAnchor, port = 3000, existingStore) {
   return new Promise((_resolve, reject) => {
-    const store = existingStore || createStore(outputFile);
+    const store = existingStore || createStore(dataAnchor);
 
     function logJob(action, detail) {
       const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
@@ -288,12 +102,9 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
             return;
           }
           const userSources = sources || ["seed"];
-          const existingIds = new Set(
-            store.getAllUsers().map((u) => u.uniqueId),
-          );
           const newUsers = usernames
             .map((u) => u.replace(/^@/, "").trim())
-            .filter((u) => u && !existingIds.has(u));
+            .filter((u) => u && !store.userExists(u));
           for (const nu of newUsers) {
             store.addUser({
               uniqueId: nu,
@@ -302,7 +113,6 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
               guessedLocation: guessedLocation || null,
             });
           }
-          store.save();
           sendJSON(res, 200, {
             added: newUsers.length,
             skipped: usernames.length - newUsers.length,
@@ -330,7 +140,6 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
             return;
           }
           store.addUser(userData);
-          store.save();
           sendJSON(res, 200, { added: true, uniqueId: userData.uniqueId });
         } catch (e) {
           sendJSON(res, 400, { error: e.message });
@@ -355,7 +164,6 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
           loggedIn,
         );
         if (job) {
-          store.save();
           logJob("CLAIM", {
             user: job.uniqueId,
             clientId: userId,
@@ -442,6 +250,42 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
         return;
       }
 
+      if (req.method === "GET" && routePath === "/api/videos") {
+        const result = store.getVideosPage
+          ? store.getVideosPage(params.limit, params.offset)
+          : {
+              total: store.getVideoCount ? store.getVideoCount() : 0,
+              limit: Math.max(1, Math.min(200, parseInt(params.limit) || 50)),
+              offset: Math.max(0, parseInt(params.offset) || 0),
+              videos: store.getVideos
+                ? store
+                    .getVideos()
+                    .slice(
+                      Math.max(0, parseInt(params.offset) || 0),
+                      Math.max(0, parseInt(params.offset) || 0) +
+                        Math.max(
+                          1,
+                          Math.min(200, parseInt(params.limit) || 50),
+                        ),
+                    )
+                : [],
+            };
+        sendJSON(res, 200, result);
+        return;
+      }
+
+      const videoMatch = routePath.match(/^\/api\/videos\/([^/]+)$/);
+      if (req.method === "GET" && videoMatch) {
+        const videoId = videoMatch[1];
+        const video = store.getVideo ? store.getVideo(videoId) : null;
+        if (!video) {
+          sendJSON(res, 404, { error: "video not found" });
+          return;
+        }
+        sendJSON(res, 200, { video });
+        return;
+      }
+
       // 视频登记
       if (req.method === "POST" && routePath === "/api/videos") {
         const body = await readBody(req);
@@ -478,7 +322,6 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
         const userId = params.userId || "";
         const job = store.getNextRedoJob(userId);
         if (job) {
-          store.save();
           logJob("REDO-CLAIM", { user: job.uniqueId, clientId: userId });
           sendJSON(res, 200, { hasJob: true, user: job });
         } else {
@@ -601,13 +444,8 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
       }
 
       if (req.method === "GET" && routePath === "/api/target-users") {
-        const all = store.getAllUsers();
-        const targets = all.filter(
-          (u) =>
-            u.ttSeller &&
-            u.verified === false &&
-            TARGET_LOCATIONS.includes(u.locationCreated),
-        );
+        const targetResult = store.getTargetUsers(TARGET_LOCATIONS);
+        const targets = targetResult.users;
         if (req.headers["accept"]?.includes("text/csv")) {
           const columns = [
             "uniqueId",
@@ -679,168 +517,19 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
       }
 
       if (req.method === "GET" && routePath === "/api/users") {
-        const all = store.getAllUsers();
-        const limit = parseInt(params.limit) || 50;
-        const offset = parseInt(params.offset) || 0;
-
-        // 简单筛选：直接用预分组索引（已排序，免全量遍历）
-        if (
-          !params.search &&
-          !params.target &&
-          !params.location &&
-          !params.targetLocation
-        ) {
-          const groups = store.getStatusGroups();
-          if (params.status && params.status !== "all") {
-            // 单状态快路径：直接取已排序的组
-            const group = groups[params.status] || [];
-            const paged = group.slice(offset, offset + limit);
-            sendJSON(res, 200, { total: group.length, users: paged });
-            return;
-          }
-          // status=all 快路径：按分组顺序 early-exit（各组已排序）
-          const sOrder = {
-            processing: 0,
-            pending: 1,
-            done: 2,
-            error: 3,
-            restricted: 4,
-          };
-          const sortedKeys = Object.keys(groups).sort(
-            (a, b) => (sOrder[a] ?? 9) - (sOrder[b] ?? 9),
-          );
-          let totalCount = 0;
-          for (const key of sortedKeys) totalCount += groups[key].length;
-          const result = [];
-          outer: for (const key of sortedKeys) {
-            for (const u of groups[key]) {
-              result.push(u);
-              if (result.length >= offset + limit) break outer;
-            }
-          }
-          const paged = result.slice(offset, offset + limit);
-          sendJSON(res, 200, { total: totalCount, users: paged });
-          return;
-        }
-
-        let filtered = all;
-        if (params.status && params.status !== "all") {
-          filtered = filtered.filter((u) => u.status === params.status);
-        }
-        if (params.target === "1") {
-          filtered = filtered.filter(
-            (u) =>
-              u.ttSeller &&
-              u.verified === false &&
-              TARGET_LOCATIONS.includes(u.locationCreated),
-          );
-        }
-        if (params.search) {
-          const s = params.search.toLowerCase();
-          filtered = filtered.filter(
-            (u) =>
-              u.uniqueId.toLowerCase().includes(s) ||
-              (u.nickname || "").toLowerCase().includes(s),
-          );
-        }
-        if (params.location) {
-          filtered = filtered.filter(
-            (u) => u.locationCreated === params.location,
-          );
-        }
-        if (params.targetLocation) {
-          filtered = filtered.filter(
-            (u) =>
-              u.ttSeller &&
-              u.verified === false &&
-              u.locationCreated === params.targetLocation,
-          );
-        }
-
-        const needCount = offset + limit;
-        const statusOrder = {
-          processing: 0,
-          pending: 1,
-          done: 2,
-          error: 3,
-          restricted: 4,
-        };
-        const tier1Loc = new Set(["PL", "NL", "BE", "AT"]);
-        const tier2Loc = new Set(["DE", "FR", "IT", "IE", "ES"]);
-        function locationTier(u) {
-          const loc = (u.guessedLocation || "").toUpperCase();
-          if (tier1Loc.has(loc)) return 0;
-          if (tier2Loc.has(loc)) return 1;
-          return 2;
-        }
-
-        let sorted;
-        if (filtered.length > needCount * 3) {
-          const groups = {};
-          for (const u of filtered) {
-            const key = u.status || "pending";
-            if (!groups[key]) groups[key] = [];
-            groups[key].push(u);
-          }
-          const sortedKeys = Object.keys(groups).sort(
-            (a, b) => (statusOrder[a] ?? 9) - (statusOrder[b] ?? 9),
-          );
-          for (const key of sortedKeys) {
-            const g = groups[key];
-            if (key === "done")
-              g.sort((a, b) => (b.processedAt || 0) - (a.processedAt || 0));
-            else if (key === "pending")
-              g.sort((a, b) => {
-                const aSeller =
-                  a.ttSeller === true && a.verified === false ? 0 : 1;
-                const bSeller =
-                  b.ttSeller === true && b.verified === false ? 0 : 1;
-                if (aSeller !== bSeller) return aSeller - bSeller;
-                const la = locationTier(a),
-                  lb = locationTier(b);
-                if (la !== lb) return la - lb;
-                return (b.followerCount || 0) - (a.followerCount || 0);
-              });
-            else
-              g.sort((a, b) => (b.followerCount || 0) - (a.followerCount || 0));
-            const pinned = g.filter((u) => u.pinned);
-            const unpinned = g.filter((u) => !u.pinned);
-            groups[key] = pinned.concat(unpinned);
-          }
-          sorted = [];
-          outer: for (const key of sortedKeys) {
-            for (const u of groups[key]) {
-              sorted.push(u);
-              if (sorted.length >= needCount) break outer;
-            }
-          }
-        } else {
-          sorted = filtered.slice().sort((a, b) => {
-            if (a.pinned && !b.pinned) return -1;
-            if (!a.pinned && b.pinned) return 1;
-            const sa = statusOrder[a.status] ?? 9;
-            const sb = statusOrder[b.status] ?? 9;
-            if (sa !== sb) return sa - sb;
-            if (a.status === "done" && b.status === "done")
-              return (b.processedAt || 0) - (a.processedAt || 0);
-            if (a.status === "pending" && b.status === "pending") {
-              const aSeller =
-                a.ttSeller === true && a.verified === false ? 0 : 1;
-              const bSeller =
-                b.ttSeller === true && b.verified === false ? 0 : 1;
-              if (aSeller !== bSeller) return aSeller - bSeller;
-              const la = locationTier(a),
-                lb = locationTier(b);
-              if (la !== lb) return la - lb;
-            }
-            return (b.followerCount || 0) - (a.followerCount || 0);
-          });
-        }
-
-        let paged = sorted.slice(offset, offset + limit);
+        const result = store.getUsersPage({
+          status: params.status,
+          search: params.search,
+          location: params.location,
+          target: params.target,
+          targetLocation: params.targetLocation,
+          limit: params.limit,
+          offset: params.offset,
+          targetLocations: TARGET_LOCATIONS,
+        });
 
         if (params.view === "light") {
-          paged = paged.map((u) => ({
+          result.users = result.users.map((u) => ({
             uniqueId: u.uniqueId,
             nickname: u.nickname,
             status: u.status,
@@ -855,7 +544,7 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
           }));
         }
 
-        sendJSON(res, 200, { total: filtered.length, users: paged });
+        sendJSON(res, 200, result);
         return;
       }