@coffer-org/server 2.5.0 → 2.5.2

package/dist/index.js

@@ -24,7 +24,7 @@ import { baseUrl } from "./public-url.js";
 import { discoverPluginAssets, discoverRuntime } from "./plugin-discovery.js";
 import { checkLatestVersion, resolveUpdateTarget, resolveAllUpdateTargets, resolveBaseTargets, resolveRuntimeTarget, runNpmInstall, } from "./plugin-updates.js";
 import { buildClientSchema } from "./schema-api.js";
-import { recordList, recordListPage, isPagedRequest, recordGet, recordCreate, recordUpdate, recordDelete, recordRestore, recordPurge, recordTrashList, UnknownShelfError, } from "./records-api.js";
+import { recordList, recordListPage, isPagedRequest, recordGet, recordCreate, recordUpdate, recordDelete, recordRestore, recordPurge, recordTrashList, MAX_PAGE, UnknownShelfError, } from "./records-api.js";
 import { maskTree, preserveTree } from "./field-masking.js";
 import { writePluginSettings } from "./settings-write.js";
 import { rootLogger, getLogger } from "./log.js";
@@ -35,6 +35,7 @@ import { setPluginState } from "./plugin-state.js";
 import { SEARCH_STATE_PLUGIN, SEARCH_CURSOR_KEY } from "./search-indexer.js";
 import { globalSearch } from "./global-search.js";
 import { applySmartRanking, getRecordActivity, markRecordViewed, setRecordFavorite } from "./record-activity.js";
+import { tracksRecordActivity } from "./record-activity-policy.js";
 const ENV_FILE = join(process.cwd(), '.env');
 if (existsSync(ENV_FILE))
     process.loadEnvFile(ENV_FILE);
@@ -364,11 +365,6 @@ function maskRecordRow(library, shelf, row) {
     }
     return out;
 }
-function tracksRecordActivity(req) {
-    const marker = req.headers['x-coffer-automated'];
-    const value = Array.isArray(marker) ? marker[0] : marker;
-    return value?.toLowerCase().trim() !== 'true';
-}
 app.get('/api/trash', async (_req, reply) => {
     const rows = await recordTrashList();
     return rows.map((entry) => ({ ...entry, record: maskRecordRow(entry.library, entry.shelf, entry.record) }));
@@ -417,17 +413,23 @@ app.get('/api/:library/:shelf', async (req, reply) => {
     try {
         if (!paged) {
             let rows = await recordList(library, shelf, query, opts);
-            if (req.user && tracksRecordActivity(req))
+            if (req.user && tracksRecordActivity(req.headers))
                 rows = await applySmartRanking(req.user.id, library, shelf, rows);
             return rows.map((r) => maskRecordRow(library, shelf, r));
         }
-        let page = await recordListPage(library, shelf, query, {
+        const pageOpts = {
             ...opts,
             limit: limit === undefined ? undefined : Number(limit),
             offset: offset === undefined ? undefined : Number(offset),
-        });
-        if (req.user && tracksRecordActivity(req)) {
-            page = { ...page, rows: await applySmartRanking(req.user.id, library, shelf, page.rows) };
+        };
+        let page = await recordListPage(library, shelf, query, pageOpts);
+        if (req.user && tracksRecordActivity(req.headers)) {
+            const allRows = await recordList(library, shelf, query, { ...opts, limit: undefined, offset: undefined });
+            const ranked = await applySmartRanking(req.user.id, library, shelf, allRows);
+            const rawLimit = Number.isFinite(pageOpts.limit) ? Math.trunc(pageOpts.limit) : MAX_PAGE;
+            const pageLimit = Math.min(Math.max(1, rawLimit), MAX_PAGE);
+            const pageOffset = Math.max(0, Number.isFinite(pageOpts.offset) ? Math.trunc(pageOpts.offset) : 0);
+            page = { rows: ranked.slice(pageOffset, pageOffset + pageLimit), total: ranked.length };
         }
         return { rows: page.rows.map((r) => maskRecordRow(library, shelf, r)), total: page.total };
     }
@@ -484,7 +486,7 @@ app.get('/api/:library/:shelf/:id', async (req, reply) => {
         if (!row)
             return reply.code(404).send({ error: 'not_found' });
         const masked = maskRecordRow(library, shelf, row);
-        if (req.user && tracksRecordActivity(req)) {
+        if (req.user && tracksRecordActivity(req.headers)) {
             return { ...masked, _activity: await markRecordViewed(req.user.id, library, shelf, rid) };
         }
         return masked;

package/dist/record-activity-policy.d.ts

@@ -0,0 +1,3 @@
+export declare const AUTOMATED_ACTIVITY_HEADER = "x-coffer-automated";
+export type RequestHeaders = Record<string, string | string[] | undefined>;
+export declare function tracksRecordActivity(headers: RequestHeaders): boolean;

package/dist/record-activity-policy.js

@@ -0,0 +1,7 @@
+export const AUTOMATED_ACTIVITY_HEADER = 'x-coffer-automated';
+export function tracksRecordActivity(headers) {
+    const entry = Object.entries(headers).find(([key]) => key.toLowerCase() === AUTOMATED_ACTIVITY_HEADER);
+    const marker = entry?.[1];
+    const value = Array.isArray(marker) ? marker[0] : marker;
+    return value?.toLowerCase().trim() !== 'true';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffer-org/server",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -24,8 +24,8 @@
     "postpack": "node ../../scripts/swap-exports.mjs src"
   },
   "dependencies": {
-    "@coffer-org/core": "^2.1.2",
-    "@coffer-org/sdk": "^2.1.1",
+    "@coffer-org/core": "^2.1.4",
+    "@coffer-org/sdk": "^2.1.3",
     "@extractus/oembed-extractor": "^4.1.0",
     "@fastify/cors": "^11.2.0",
     "@fastify/multipart": "^10.0.0",