openhands
7b249a7222
- P1: new src/lib/admin/rank-guard.ts with tryGuardRank/guardRank + RankGuardTarget/Result; extracted from users.ts; applied to admin-bans (create/lift + rank redirect) and admin-badges (caps + rank guard + error surfacing); import-url-safety.ts SSRF guard wired into clone save+icon fetch; logAudit await in help-tickets; antiddos mutations SETTINGS_EDIT; markAllAlertsRead NOTIFICATIONS_EDIT; rankError/saveError in all 25 message files; tests rew/new for bans/badges/rank-guard/import-url-safety - P2: ticket-inbox merged pagination reworked to single UNION ALL SQL with LIMIT/OFFSET (avoids O(offset) materialization); getCachedAdminCount with cacheFiltered option applied to devops/errors/photos/items/guilds/help-tickets/moderation pages; admin-theme catches→?error=1+banner+25 locales; logger in silent catches (rare-values/writeable-boxes); catalog-items-loader CAST→plain equality; count caching helper extended with opt-in cacheFiltered - P3: removed dead modules is-staff/notice/recent-furni-resync/log-filters plus load-user-sanctions/user-sanction-timeline; removed orphaned CATALOG_PAGE_COLUMNS re-export; removed getFurniIconUrl from studio-furni-icons Build: lint 0, typecheck 0, 3480 tests pass, i18n:check exit 0, colors exit 0. Circular chunk warning (9452/10535/66463) is webpack code-splitting artifact; build succeeds.
31 lines
1.0 KiB
TypeScript
31 lines
1.0 KiB
TypeScript
import { count, type SQL } from "drizzle-orm";
|
|
import type { MySqlTable } from "drizzle-orm/mysql-core";
|
|
import { db } from "@/lib/db";
|
|
import { redisCache } from "@/lib/redis-cache";
|
|
|
|
/**
|
|
* Caches admin list totals, preventing heavy COUNT(*) table scans on every
|
|
* request for large tables.
|
|
*
|
|
* By default only the unfiltered (global) count is cached; filtered queries
|
|
* hit the DB so search result counts stay exact. Callers that read a stable,
|
|
* fixed-filter total (e.g. "open tickets") can opt into caching it too with
|
|
* `{ cacheFiltered: true }` and a cacheKey unique to that filter.
|
|
*/
|
|
export async function getCachedAdminCount(
|
|
table: MySqlTable,
|
|
cacheKey: string,
|
|
where?: SQL | undefined,
|
|
options?: { cacheFiltered?: boolean },
|
|
): Promise<number> {
|
|
const run = async (): Promise<number> => {
|
|
const [row] = await db.select({ total: count() }).from(table).where(where);
|
|
return Number(row?.total ?? 0);
|
|
};
|
|
|
|
if (!where || options?.cacheFiltered) {
|
|
return await redisCache(`admin:count:${cacheKey}`, 60, run);
|
|
}
|
|
return await run();
|
|
}
|