kempo 4.2.19 → 4.2.20

package/server/utils/hooks/triggerHook.js

@@ -1,28 +1,21 @@
 import db from '../../db/index.js';
 import { hook } from '../../db/schema.js';
 import { eq } from 'drizzle-orm';
-import { createRequire } from 'module';
-import { dirname, join } from 'path';
+import { join } from 'path';
+import { pathToFileURL } from 'url';
 
 const handlerCache = new Map();
 
 export const clearHandlerCache = () => handlerCache.clear();
 
-const requireFromProject = createRequire(join(process.cwd(), 'package.json'));
-
 const resolveHandler = (owner, callback) => {
   if(callback.startsWith('./') || callback.startsWith('../')){
-    try {
-      const pkgPath = requireFromProject.resolve(`${owner}/package.json`);
-      return join(dirname(pkgPath), callback);
-    } catch {
-      return null;
-    }
+    return join(process.cwd(), 'node_modules', owner, callback);
   }
   return callback;
 };
 
-export default async (event, data = {}) => {
+export default async (event, data = {}, { bail = false } = {}) => {
   if(!event){
     return [{ code: 400, msg: 'Event is required' }, null];
   }
@@ -38,7 +31,7 @@ export default async (event, data = {}) => {
       let handler = handlerCache.get(handlerPath);
       if(!handler){
         try {
-          const mod = await import(handlerPath);
+          const mod = await import(pathToFileURL(handlerPath).href);
           handler = mod.default || mod;
           handlerCache.set(handlerPath, handler);
         } catch {
@@ -50,12 +43,14 @@ export default async (event, data = {}) => {
         const result = await handler(data);
         results.push({ hookId: h.id, owner: h.owner, result });
       } catch(err) {
+        if(bail) throw err;
         results.push({ hookId: h.id, owner: h.owner, error: err.message });
       }
     }
 
     return [null, { results }];
   } catch(error) {
+    if(bail) throw error;
     return [{ code: 500, msg: 'Failed to trigger hooks' }, null];
   }
 };

package/server/utils/pages/listPages.js

@@ -2,14 +2,17 @@ import { readFile } from 'fs/promises';
 import { relative } from 'path';
 import scanDir from '../fs/scanDir.js';
 import parseFrontmatter from '../fs/parseFrontmatter.js';
+import getSetting from '../settings/getSetting.js';
 
-const RESERVED_KEYS = new Set(['owner', 'name', 'author', 'created', 'updated', 'locked', 'title', 'description']);
+const RESERVED_KEYS = new Set(['owner', 'name', 'author', 'created', 'updated', 'locked', 'hidden', 'title', 'description']);
 
-export default async ({ rootDir, owner }) => {
-  if(!rootDir){
-    return [{ code: 400, msg: 'Root directory is required' }, null];
-  }
+/*
+  In-memory cache keyed by rootDir.
+  TTL is read from the 'system:pages:cacheTtl' setting (milliseconds, default 60000).
+*/
+const cache = new Map();
 
+const scan = async (rootDir) => {
   const pages = await scanDir(rootDir, rootDir, async (fullPath, entry, root) => {
     const isDisabled = entry.name.endsWith('.page-disabled.html');
     if(entry.isDirectory() || (!entry.name.endsWith('.page.html') && !isDisabled)) return null;
@@ -32,6 +35,7 @@ export default async ({ rootDir, owner }) => {
       title: meta.title || '',
       owner: meta.owner || 'custom',
       locked: meta.locked === 'true',
+      hidden: meta.hidden === 'true',
       disabled: isDisabled,
       author: meta.author || '',
       description: meta.description || '',
@@ -41,8 +45,54 @@ export default async ({ rootDir, owner }) => {
     };
   });
 
-  const filtered = owner ? pages.filter(page => page.owner === owner) : pages;
+  const scannedAt = Date.now();
+  cache.set(rootDir, { pages, scannedAt });
+  return scannedAt;
+};
+
+export default async ({ rootDir, owner, forceRescan = false, showHidden = true, offset = 0, limit = 0 }) => {
+  if(!rootDir){
+    return [{ code: 400, msg: 'Root directory is required' }, null];
+  }
+
+  const [, cacheTtl] = await getSetting('system', 'pages:cacheTtl', 60000);
+  const cached = cache.get(rootDir);
+
+  if(!forceRescan && cached && (Date.now() - cached.scannedAt < cacheTtl)){
+    return [null, buildResult(cached.pages, cached.scannedAt, { owner, showHidden, offset, limit })];
+  }
+
+  const scannedAt = await scan(rootDir);
+  const { pages } = cache.get(rootDir);
+  return [null, buildResult(pages, scannedAt, { owner, showHidden, offset, limit })];
+};
+
+const buildResult = (allPages, scannedAt, { owner, showHidden, offset, limit }) => {
+  let filtered = showHidden ? allPages : allPages.filter(p => !p.hidden);
+
+  if(owner === 'extension'){
+    filtered = filtered.filter(p => p.owner !== 'custom' && p.owner !== 'system');
+  } else if(owner){
+    filtered = filtered.filter(p => p.owner === owner);
+  }
+
+  filtered = filtered.slice().sort((a, b) => {
+    const aPath = a.file.replace(/\.page(-disabled)?\.html$/, '');
+    const bPath = b.file.replace(/\.page(-disabled)?\.html$/, '');
+    const aDir = aPath.includes('/') ? aPath.split('/').slice(0, -1).join('/') : '';
+    const bDir = bPath.includes('/') ? bPath.split('/').slice(0, -1).join('/') : '';
+    if(aPath === 'index' || aPath === '') return -1;
+    if(bPath === 'index' || bPath === '') return 1;
+    if(aDir !== bDir){
+      if(!aDir) return -1;
+      if(!bDir) return 1;
+      return aDir.localeCompare(bDir);
+    }
+    return aPath.localeCompare(bPath);
+  });
 
-  return [null, { pages: filtered, total: filtered.length }];
+  const total = filtered.length;
+  const pages = limit > 0 ? filtered.slice(offset, offset + limit) : filtered.slice(offset);
+  return { pages, total, scannedAt };
 };
 

package/app-public/new-page.page.html

@@ -1,17 +0,0 @@
-<!--
-  owner: custom
-  name: new page
-  author: 
-  created: 2026-04-16T06:21:26.074Z
-  updated: 2026-04-19T20:54:05.204Z
-  title: new page
-  description: 
--->
-<page template="split" title="new page">
-<content>
-<h1>New Page</h1>
-</content>
-<content location="left">
-<p>Left</p>
-</content>
-</page>

package/app-public/test.page.html

@@ -1,21 +0,0 @@
-<!--
-  owner: custom
-  name: test
-  author: Dustin
-  created: 2026-04-11T06:13:14.666Z
-  updated: 2026-04-16T21:13:12.153Z
-  title: test
-  description: 
-  locked: true
--->
-<page template="split" title="test">
-<content location="left">
-<p>Left Side MEnu</p>
-</content>
-<content>
-<h1>Test</h1>
-</content>
-<content location="scripts">
-<p><br></p>
-</content>
-</page>