kempo 4.9.5 → 4.9.7

package/dist/admin/content/fragments/index.page.html

@@ -13,7 +13,7 @@
 		<script type="module" src="/kempo-ui/components/controls/TcDeleteRecord.js"></script>
 		<script type="module" src="/kempo-ui/components/controls/TcDeleteSelected.js"></script>
 		<script type="module" src="/kempo-ui/components/Icon.js"></script>
-		<script type="module" src="/admin/components/TableRowLink.js"></script>
+		<script type="module" src="/kempo-ui/components/controls/TcOpen.js"></script>
 		<script type="module" src="/kempo/components/Permission.js"></script>
 
 		<div class="d-f mb" style="align-items: center; gap: var(--spacer);">
@@ -24,8 +24,8 @@
 		</div>
 
 		<h2>Custom Fragments</h2>
-		<k-table id="customTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No custom fragments have been created yet.">
-			<admin-table-row-link slot="before" url-pattern="/admin/content/fragments/edit?fragment={editPath}" field-name="editPath"></admin-table-row-link>
+		<k-table open-on-click id="customTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No custom fragments have been created yet.">
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div slot="top" class="d-f full" style="align-items: center;">
 				<div>
 					<k-permission has="system:fragments:delete">
@@ -48,8 +48,8 @@
 		</k-table>
 
 		<h2>Extension Fragments</h2>
-		<k-table id="extensionTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No extension fragments installed.">
-			<admin-table-row-link slot="before" url-pattern="/admin/content/fragments/edit?fragment={editPath}" field-name="editPath"></admin-table-row-link>
+		<k-table open-on-click id="extensionTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No extension fragments installed.">
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -65,8 +65,8 @@
 		</k-table>
 
 		<h2>System Fragments</h2>
-		<k-table id="systemTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No system fragments found.">
-			<admin-table-row-link slot="before" url-pattern="/admin/content/fragments/edit?fragment={editPath}" field-name="editPath"></admin-table-row-link>
+		<k-table open-on-click id="systemTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No system fragments found.">
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -94,7 +94,7 @@
 
 			const fields = [
 				{ name: 'locked', label: '', size: 40, calculator: r => r.locked ? html`<k-icon name="lock"></k-icon>` : html`` },
-				{ name: 'name', label: 'Name', size: 200 },
+				{ name: 'name', label: 'Name' },
 				{ name: 'file', label: 'File', size: 300 },
 				{ name: 'author', label: 'Author', size: 150 },
 				{ name: 'updatedAt', label: 'Updated', size: 190, formatter: v => v ? new Date(v).toLocaleString() : '' },
@@ -116,10 +116,10 @@
 					Toast.error(error.msg || 'Failed to load fragments');
 					return;
 				}
-				const toEditPath = f => ({ ...f, editPath: f.file.replace(/\.fragment\.html$/, '') });
-				const custom = data.fragments.filter(f => f.owner === 'custom').map(toEditPath);
-				const extension = data.fragments.filter(f => f.owner !== 'custom' && f.owner !== 'system').map(toEditPath);
-				const system = data.fragments.filter(f => f.owner === 'system').map(toEditPath);
+				const withEditUrl = f => ({ ...f, _url: `/admin/content/fragments/edit?fragment=${encodeURIComponent(f.file.replace(/\.fragment\.html$/, ''))}` });
+				const custom = data.fragments.filter(f => f.owner === 'custom').map(withEditUrl);
+				const extension = data.fragments.filter(f => f.owner !== 'custom' && f.owner !== 'system').map(withEditUrl);
+				const system = data.fragments.filter(f => f.owner === 'system').map(withEditUrl);
 				$customTable.setData({ records: custom, fields });
 				$extensionTable.setData({ records: extension, fields: extensionFields });
 				$systemTable.setData({ records: system, fields });

package/dist/admin/content/globals/index.page.html

@@ -14,7 +14,7 @@
 		<script type="module" src="/kempo-ui/components/controls/TcDeleteSelected.js"></script>
 		<script type="module" src="/kempo-ui/components/Icon.js"></script>
 		<script type="module" src="/kempo-ui/components/Combobox.js"></script>
-		<script type="module" src="/admin/components/TableRowLink.js"></script>
+		<script type="module" src="/kempo-ui/components/controls/TcOpen.js"></script>
 		<script type="module" src="/kempo/components/Permission.js"></script>
 
 		<div class="d-f mb" style="align-items: center; gap: var(--spacer);">
@@ -25,8 +25,8 @@
 		</div>
 
 		<h2>Custom</h2>
-		<k-table id="customTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No custom global content has been created yet.">
-			<admin-table-row-link slot="before" url-pattern="/admin/content/globals/edit?id={id}" field-name="id"></admin-table-row-link>
+		<k-table open-on-click id="customTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No custom global content has been created yet.">
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div slot="top" class="d-f full" style="align-items: center;">
 				<div>
 					<k-permission has="system:globals:delete">
@@ -49,8 +49,8 @@
 		</k-table>
 
 		<h2>Extensions</h2>
-		<k-table id="extensionTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No extension global content installed.">
-			<admin-table-row-link slot="before" url-pattern="/admin/content/globals/edit?id={id}" field-name="id"></admin-table-row-link>
+		<k-table open-on-click id="extensionTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No extension global content installed.">
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -66,8 +66,8 @@
 		</k-table>
 
 		<h2>System</h2>
-		<k-table id="systemTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No system global content found.">
-			<admin-table-row-link slot="before" url-pattern="/admin/content/globals/edit?id={id}" field-name="id"></admin-table-row-link>
+		<k-table open-on-click id="systemTable" enable-pages page-size="25" page-size-options="[10,25,50,100]" placeholder="No system global content found.">
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -95,7 +95,7 @@
 
 			const fields = [
 				{ name: 'locked', label: '', size: 40, calculator: r => r.locked ? html`<k-icon name="lock"></k-icon>` : html`` },
-				{ name: 'name', label: 'Name', size: 200 },
+				{ name: 'name', label: 'Name' },
 				{ name: 'location', label: 'Location', size: 150 },
 				{ name: 'priority', label: 'Priority', size: 80 },
 				{ name: 'author', label: 'Author', size: 150 },
@@ -118,9 +118,10 @@
 					Toast.error(error.msg || 'Failed to load global content');
 					return;
 				}
-				const custom = data.entries.filter(e => e.owner === 'custom');
-				const extension = data.entries.filter(e => e.owner !== 'custom' && e.owner !== 'system');
-				const system = data.entries.filter(e => e.owner === 'system');
+				const withEditUrl = e => ({ ...e, _url: `/admin/content/globals/edit?id=${encodeURIComponent(e.id)}` });
+				const custom = data.entries.filter(e => e.owner === 'custom').map(withEditUrl);
+				const extension = data.entries.filter(e => e.owner !== 'custom' && e.owner !== 'system').map(withEditUrl);
+				const system = data.entries.filter(e => e.owner === 'system').map(withEditUrl);
 				$customTable.setData({ records: custom, fields });
 				$extensionTable.setData({ records: extension, fields: extensionFields });
 				$systemTable.setData({ records: system, fields });

package/dist/admin/content/pages/index.page.html

@@ -45,7 +45,7 @@
 		></script>
 		<script
 			type="module"
-			src="/admin/components/TableRowLink.js"
+			src="/kempo-ui/components/controls/TcOpen.js"
 		></script>
 		<script
 			type="module"
@@ -67,18 +67,14 @@
 		</div>
 
 		<h2>Custom Pages</h2>
-		<k-table
+		<k-table open-on-click
 			id="customTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No custom pages have been created yet."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/pages/edit?path={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div
 				slot="top"
 				class="d-f full"
@@ -108,18 +104,14 @@
 		</k-table>
 
 		<h2>Extension Pages</h2>
-		<k-table
+		<k-table open-on-click
 			id="extensionTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No extension pages installed."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/pages/edit?path={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div
 				class="d-f full"
 				style="align-items: center;"
@@ -138,18 +130,14 @@
 		</k-table>
 
 		<h2>System Pages</h2>
-		<k-table
+		<k-table open-on-click
 			id="systemTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No system pages found."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/pages/edit?path={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div
 				class="d-f full"
 				style="align-items: center;"
@@ -183,7 +171,7 @@
 				{ name: 'name', label: 'Name', size: 200 },
 				{ name: 'url', label: 'URL', size: 250 },
 				{ name: 'author', label: 'Author', size: 150 },
-				{ name: 'description', label: 'Description', size: 300 },
+				{ name: 'description', label: 'Description' },
 				{ name: 'updatedAt', label: 'Updated', size: 190, formatter: v => v ? new Date(v).toLocaleString() : '' },
 				{ name: 'createdAt', label: 'Created', size: 190, formatter: v => v ? new Date(v).toLocaleString() : '' }
 			];
@@ -214,7 +202,7 @@
 
 			setInterval(updateScanInfo, 1000);
 
-			const toEditPath = p => ({ ...p, editPath: p.file.replace(/\.page\.html$/, '') });
+			const withEditUrl = p => ({ ...p, _url: `/admin/content/pages/edit?path=${encodeURIComponent(p.file.replace(/\.page\.html$/, ''))}` });
 
 			const initTable = async ($table, tableFields, owner) => {
 				const [error, data] = await listPages({ owner, showHidden: false, offset: 0, limit: 25 });
@@ -222,11 +210,11 @@
 					Toast.error(error.msg || 'Failed to load pages');
 					return null;
 				}
-				$table.setData({ records: data.pages.map(toEditPath), fields: tableFields });
+				$table.setData({ records: data.pages.map(withEditUrl), fields: tableFields });
 				if(data.total > data.pages.length){
 					$table.setupFetchRecords(data.total, async (start, count) => {
 						const [, d] = await listPages({ owner, showHidden: false, offset: start, limit: count });
-						return (d?.pages || []).map(toEditPath);
+						return (d?.pages || []).map(withEditUrl);
 					});
 				}
 				return data.scannedAt;

package/dist/admin/content/templates/index.page.html

@@ -13,7 +13,7 @@
 		<script type="module" src="/kempo-ui/components/controls/TcDeleteRecord.js"></script>
 		<script type="module" src="/kempo-ui/components/controls/TcDeleteSelected.js"></script>
 		<script type="module" src="/kempo-ui/components/Icon.js"></script>
-		<script type="module" src="/admin/components/TableRowLink.js"></script>
+		<script type="module" src="/kempo-ui/components/controls/TcOpen.js"></script>
 		<script type="module" src="/kempo/components/Permission.js"></script>
 
 		<div class="d-f mb" style="align-items: center; gap: var(--spacer);">
@@ -24,18 +24,14 @@
 		</div>
 
 		<h2>Custom Templates</h2>
-		<k-table
+		<k-table open-on-click
 			id="customTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No custom templates have been created yet."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/templates/edit?template={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div slot="top" class="d-f full" style="align-items: center;">
 				<div>
 					<k-permission has="system:pages:delete">
@@ -58,18 +54,14 @@
 		</k-table>
 
 		<h2>Extension Templates</h2>
-		<k-table
+		<k-table open-on-click
 			id="extensionTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No extension templates installed."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/templates/edit?template={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -85,18 +77,14 @@
 		</k-table>
 
 		<h2>System Templates</h2>
-		<k-table
+		<k-table open-on-click
 			id="systemTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No system templates found."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/templates/edit?template={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -124,7 +112,7 @@
 
 			const fields = [
 				{ name: 'locked', label: '', size: 40, calculator: r => r.locked ? html`<k-icon name="lock"></k-icon>` : html`` },
-				{ name: 'name', label: 'Name', size: 150 },
+				{ name: 'name', label: 'Name' },
 				{ name: 'directory', label: 'Directory', size: 200 },
 				{ name: 'author', label: 'Author', size: 150 },
 				{ name: 'updatedAt', label: 'Updated', size: 190, formatter: v => v ? new Date(v).toLocaleString() : '' },
@@ -146,14 +134,14 @@
 					Toast.error(error.msg || 'Failed to load templates');
 					return;
 				}
-				const toEditPath = t => ({
+				const withEditUrl = t => ({
 					...t,
 					directory: t.directory === '.' ? '/' : t.directory,
-					editPath: (t.directory === '.' ? t.name : `${t.directory}/${t.name}`)
+					_url: `/admin/content/templates/edit?template=${encodeURIComponent(t.directory === '.' ? t.name : `${t.directory}/${t.name}`)}`
 				});
-				const custom = data.templates.filter(t => t.owner === 'custom').map(toEditPath);
-				const extension = data.templates.filter(t => t.owner !== 'custom' && t.owner !== 'system').map(toEditPath);
-				const system = data.templates.filter(t => t.owner === 'system').map(toEditPath);
+				const custom = data.templates.filter(t => t.owner === 'custom').map(withEditUrl);
+				const extension = data.templates.filter(t => t.owner !== 'custom' && t.owner !== 'system').map(withEditUrl);
+				const system = data.templates.filter(t => t.owner === 'system').map(withEditUrl);
 				$customTable.setData({ records: custom, fields });
 				$extensionTable.setData({ records: extension, fields: extensionFields });
 				$systemTable.setData({ records: system, fields });

package/dist/admin/emails/index.page.html

@@ -10,7 +10,7 @@
 		<h1>Emails</h1>
 		<p class="tc-muted mb">Kempo does not send email itself: an email extension (such as kempo-resend or kempo-smtp) does. How long the log is kept, and how many times a failed email is tried again, are on the System tab of <a href="/admin/settings">Settings</a>.</p>
 
-		<k-tabs persistent-id="admin-emails">
+		<k-tabs persistent-id="admin-emails" hash-routing>
 			<k-tab for="log">Log</k-tab>
 			<k-tab for="templates">Templates</k-tab>
 			<k-tab-content name="log">

package/dist/admin/extensions/index.page.html

@@ -11,7 +11,7 @@
 <script type="module" src="/kempo-ui/components/controls/TcPageSelect.js"></script>
 <script type="module" src="/kempo-ui/components/controls/TcPageSize.js"></script>
 <script type="module" src="/admin/components/tableControls/InstallExtension.js"></script>
-<script type="module" src="/admin/components/tableControls/ExtensionDetails.js"></script>
+<script type="module" src="/kempo-ui/components/controls/TcOpen.js"></script>
 <script type="module" src="/admin/components/tableControls/ToggleExtension.js"></script>
 <script type="module" src="/admin/components/tableControls/UninstallExtension.js"></script>
 <script type="module" src="/kempo/components/Permission.js"></script>
@@ -22,8 +22,8 @@
 	</div>
 
 	<h2>Installed Extensions</h2>
-	<k-table id="installedTable" enable-pages page-size="25" placeholder="No extensions are currently installed.">
-		<admin-extension-details slot="after"></admin-extension-details>
+	<k-table open-on-click id="installedTable" enable-pages page-size="25" placeholder="No extensions are currently installed.">
+		<kc-tc-open slot="after" title="View in Store"><k-icon name="storefront"></k-icon></kc-tc-open>
 		<admin-toggle-extension slot="after"></admin-toggle-extension>
 		<admin-uninstall-extension slot="after"></admin-uninstall-extension>
 		<div class="d-f full" style="align-items: center;">
@@ -42,9 +42,9 @@
 
 	<h2>Downloaded, Not Installed</h2>
 	<p class="tc-muted">Extension packages already in this site. To find and download more, <a href="/admin/extensions/browse/">browse the marketplace</a>.</p>
-	<k-table id="availableTable" enable-pages page-size="25" placeholder="Every downloaded extension is installed.">
+	<k-table open-on-click id="availableTable" enable-pages page-size="25" placeholder="Every downloaded extension is installed.">
 		<admin-install-extension slot="after"></admin-install-extension>
-		<admin-extension-details slot="after"></admin-extension-details>
+		<kc-tc-open slot="after" title="View in Store"><k-icon name="storefront"></k-icon></kc-tc-open>
 		<div class="d-f full" style="align-items: center;">
 			<div>
 				<kc-tc-first-page></kc-tc-first-page>
@@ -66,11 +66,12 @@
 
 	const installedTable = document.getElementById('installedTable');
 	const availableTable = document.getElementById('availableTable');
+	const withDetailsUrl = e => ({ ...e, _url: `/admin/extensions/details/?name=${encodeURIComponent(e.name)}` });
 
 	const [installedErr, installedData] = await listExtensions();
 	if(!installedErr){
 		installedTable.setData({
-			records: installedData.items,
+			records: installedData.items.map(withDetailsUrl),
 			fields: [
 				{ name: 'name', label: 'Name' },
 				{ name: 'version', label: 'Version' },
@@ -85,7 +86,7 @@
 		const installedNames = new Set((installedData?.items || []).map(e => e.name));
 		const notInstalled = availableData.items.filter(e => !installedNames.has(e.name));
 		availableTable.setData({
-			records: notInstalled,
+			records: notInstalled.map(withDetailsUrl),
 			fields: [
 				{ name: 'name', label: 'Name' },
 				{ name: 'version', label: 'Version' },
@@ -97,7 +98,7 @@
 	const refreshInstalledTable = async () => {
 		const [err, data] = await listExtensions();
 		if(!err) installedTable.setData({
-			records: data.items,
+			records: data.items.map(withDetailsUrl),
 			fields: [
 				{ name: 'name', label: 'Name' },
 				{ name: 'version', label: 'Version' },
@@ -113,7 +114,7 @@
 		if(!instErr && !availErr){
 			const installedNames = new Set((instData?.items || []).map(e => e.name));
 			availableTable.setData({
-				records: availData.items.filter(e => !installedNames.has(e.name)),
+				records: availData.items.filter(e => !installedNames.has(e.name)).map(withDetailsUrl),
 				fields: [
 					{ name: 'name', label: 'Name' },
 					{ name: 'version', label: 'Version' },

package/dist/admin/settings/index.page.html

@@ -3,13 +3,23 @@
 -->
 <page title="Settings - Admin">
 <content>
-<script type="module" src="/admin/components/settings/AdminSettings.js"></script>
+<script type="module" src="/kempo-ui/components/Tabs.js"></script>
+<script type="module" src="/admin/components/settings/SettingsPanel.js"></script>
 
 		<h1>Settings</h1>
 
-		<k-admin-settings>
+		<k-tabs active="custom" hash-routing>
+			<k-tab for="custom">Custom</k-tab>
+			<k-tab for="system">System</k-tab>
 			<location name="admin-settings-tabs" />
-		</k-admin-settings>
+
+			<k-tab-content name="custom" class="pt">
+				<k-settings-panel owner="custom"></k-settings-panel>
+			</k-tab-content>
+			<k-tab-content name="system" class="pt">
+				<k-settings-panel owner="system"></k-settings-panel>
+			</k-tab-content>
+		</k-tabs>
 		<location name="admin-settings-scripts" />
 
 </content>

package/middleware/kempo.js

@@ -257,6 +257,7 @@ export default config => {
         ['schema notice', notifySchemaAttention],
         ['jobs', () => registerJobs({ owner: 'kempo', jobs: [
           { name: 'email-maintenance', every: '1m', callback: './server/utils/email/maintainEmails.js' },
+          { name: 'session-cleanup', every: '1h', callback: './server/utils/sessions/pruneExpiredSessions.js' },
           { name: 'update-check', every: '12h', callback: './server/utils/updates/runUpdateCheck.js' },
         ] })],
       ]){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kempo",
-  "version": "4.9.5",
+  "version": "4.9.7",
   "type": "module",
   "description": "A fullstack CMS framework for creating websites with user authentication",
   "scripts": {
@@ -61,7 +61,7 @@
   "peerDependencies": {
     "kempo-css": ">=2.2.5",
     "kempo-server": ">=3.4.0",
-    "kempo-ui": ">=0.6.0"
+    "kempo-ui": ">=0.7.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.5.9",

package/server/utils/sessions/pruneExpiredSessions.js

@@ -0,0 +1,32 @@
+import { lt } from 'drizzle-orm';
+import db from '../../db/index.js';
+import { session } from '../../db/schema.js';
+import getSetting from '../settings/getSetting.js';
+
+/*
+  Deletes every session that expired more than `system:session_cleanup_hours` ago (default 24), for every user.
+  Run hourly by the scheduler (middleware/kempo.js registers it). 0 keeps expired sessions forever, and the
+  per-user "clear expired" button still works either way.
+*/
+export default async ({ now = new Date(), hours } = {}) => {
+  try {
+    let cutoffHours = hours;
+
+    if(cutoffHours === undefined){
+      const [, stored] = await getSetting('system', 'session_cleanup_hours', 24);
+      cutoffHours = Number(stored);
+      if(!Number.isFinite(cutoffHours) || cutoffHours < 0) cutoffHours = 24;
+    }
+
+    if(cutoffHours === 0) return [null, { deleted: 0 }];
+
+    const removed = await db
+      .delete(session)
+      .where(lt(session.expiresAt, new Date(now.getTime() - cutoffHours * 3600000)))
+      .returning({ token: session.token });
+
+    return [null, { deleted: removed.length }];
+  } catch(error) {
+    return [{ code: 500, msg: 'Failed to delete expired sessions' }, null];
+  }
+};

package/server/utils/settings/settingRules.js

@@ -12,6 +12,7 @@ const RULES = {
   'system:email_retention_by_type': value => (value && typeof value === 'object' && !Array.isArray(value) && Object.values(value).every(days => whole(days, 0, 3650))
     ? null
     : { code: 400, msg: 'Give each kind of email a whole number of days from 0 to 3650, like { "verify-email": 7 }' }),
+  'system:session_cleanup_hours': value => (whole(value, 0, 8760) ? null : { code: 400, msg: 'Hours must be a whole number from 0 to 8760 (one year)' }),
   'system:email_from': value => (value === '' || isValidSender(value) ? null : { code: 400, msg: 'The sender must look like name@example.com or Shop Name <name@example.com>' }),
 };
 

package/server/utils/settings/systemSettings.js

@@ -14,6 +14,7 @@ export const SYSTEM_SETTINGS = [
   { owner: 'system', name: 'allow_registration', value: true, type: 'boolean', isPublic: true, description: 'Allow new users to register' },
   { owner: 'system', name: 'require_email_verification', value: false, type: 'boolean', isPublic: false, description: 'Require email verification before account access' },
   { owner: 'system', name: 'verification_url', value: 'http://localhost:3000/verify-email/{{token}}', type: 'string', isPublic: false, description: 'Email verification URL template' },
+  { owner: 'system', name: 'session_cleanup_hours', value: 24, type: 'number', isPublic: false, description: 'Hours after a session expires before it is deleted automatically (0 keeps expired sessions)' },
   { owner: 'system', name: 'notification_retention_days', value: 90, type: 'number', isPublic: false, description: 'Days to keep notifications before they are deleted (0 keeps them forever)' },
   { owner: 'system', name: 'password_reset_url', value: 'http://localhost:3000/reset-password/{{token}}', type: 'string', isPublic: false, description: 'Password reset URL template' },
   { owner: 'system', name: 'email_max_retries', value: 1, type: 'number', isPublic: false, description: 'How many times kempo tries again to send an email that could not be sent, after the first try (0 never retries)' },

package/dist/admin/components/settings/AdminSettings.js

@@ -1,7 +0,0 @@
-import t from"/kempo-ui/components/ShadowComponent.js";import{html as e}from"/kempo-ui/lit-all.min.js";import"/kempo-ui/components/Tabs.js";import"./SettingsPanel.js";import s from"./humanize.js";export default class n extends t{static properties={extensionTabs:{state:!0}};constructor(){super(),this.extensionTabs=[]}connectedCallback(){super.connectedCallback(),this.extensionTabs=[...this.querySelectorAll(":scope > k-settings-tab")].map((t,e)=>{const n=t.getAttribute("name")||t.getAttribute("label")||`tab-${e}`;return t.slot=`tab-${n}`,t.style.display="block",{id:n,slotName:`tab-${n}`,label:t.getAttribute("label")||s(n),position:Number(t.getAttribute("position"))||500,extension:!0}})}render(){const t=[{id:"custom",label:"Custom",position:100,content:()=>e`<k-settings-panel owner="custom"></k-settings-panel>`},{id:"system",label:"System",position:200,content:()=>e`<k-settings-panel owner="system"></k-settings-panel>`},...this.extensionTabs].sort((t,e)=>t.position-e.position);return e`
-      <k-tabs>
-        ${t.map(t=>e`<k-tab for=${t.id}>${t.label}</k-tab>`)}
-        ${t.map(t=>e`<k-tab-content name=${t.id} class="pt">${t.extension?e`<slot name=${t.slotName}></slot>`:t.content()}</k-tab-content>`)}
-      </k-tabs>
-    `}}customElements.define("k-admin-settings",n);
-//# sourceMappingURL=C:\Users\dusti\dev\kempo\dist\admin\components\settings\AdminSettings.js.map

package/dist/admin/components/settings/AdminSettings.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"src\\admin\\components\\settings\\AdminSettings.js","names":["ShadowComponent","html","humanize","AdminSettings","static","extensionTabs","state","constructor","super","this","connectedCallback","querySelectorAll","map","$tab","index","name","getAttribute","slot","style","display","id","slotName","label","position","Number","extension","render","tabs","content","sort","a","b","tab","customElements","define"],"sources":["0"],"sourcesContent":["import ShadowComponent from '/kempo-ui/components/ShadowComponent.js';\nimport { html } from '/kempo-ui/lit-all.min.js';\nimport '/kempo-ui/components/Tabs.js';\nimport './SettingsPanel.js';\nimport humanize from './humanize.js';\n\n/*\n  The admin Settings page, served at /admin/components/settings/AdminSettings.js. Tabs: **Custom** (the site's own settings) and **System**\n  (kempo's), then a tab for each extension that chooses to add one. An extension that does not add a tab has nothing here: it manages\n  its own settings wherever it likes.\n\n  **An extension adds a tab** by filling the `admin-settings-tabs` location of the page with a `k-settings-tab` (and loads what the tab\n  uses from the `admin-settings-scripts` location). `position` orders the tabs (Custom is 100, System 200, a tab with none 500):\n\n    <k-settings-tab name=\"shipping\" label=\"Shipping\" position=\"500\">\n      <k-settings-panel owner=\"kempo-shipping\"></k-settings-panel>\n    </k-settings-tab>\n\n  The tab holds anything: the generic panel above, a few of the extension's settings with their editors, or a screen of its own.\n*/\nconst DEFAULT_TAB_POSITION = 500;\n\nexport default class AdminSettings extends ShadowComponent {\n  static properties = {\n    extensionTabs: { state: true },\n  };\n\n  constructor(){\n    super();\n    this.extensionTabs = [];\n  }\n\n  /*\n    Lifecycle\n  */\n  connectedCallback(){\n    super.connectedCallback();\n    this.extensionTabs = [...this.querySelectorAll(':scope > k-settings-tab')].map(($tab, index) => {\n      const name = $tab.getAttribute('name') || $tab.getAttribute('label') || `tab-${index}`;\n      $tab.slot = `tab-${name}`;\n      $tab.style.display = 'block';\n      return {\n        id: name,\n        slotName: `tab-${name}`,\n        label: $tab.getAttribute('label') || humanize(name),\n        position: Number($tab.getAttribute('position')) || DEFAULT_TAB_POSITION,\n        extension: true,\n      };\n    });\n  }\n\n  /*\n    Rendering\n  */\n  render(){\n    const tabs = [\n      { id: 'custom', label: 'Custom', position: 100, content: () => html`<k-settings-panel owner=\"custom\"></k-settings-panel>` },\n      { id: 'system', label: 'System', position: 200, content: () => html`<k-settings-panel owner=\"system\"></k-settings-panel>` },\n      ...this.extensionTabs,\n    ].sort((a, b) => a.position - b.position);\n\n    return html`\n      <k-tabs>\n        ${tabs.map(tab => html`<k-tab for=${tab.id}>${tab.label}</k-tab>`)}\n        ${tabs.map(tab => html`<k-tab-content name=${tab.id} class=\"pt\">${tab.extension ? html`<slot name=${tab.slotName}></slot>` : tab.content()}</k-tab-content>`)}\n      </k-tabs>\n    `;\n  }\n}\n\ncustomElements.define('k-admin-settings', AdminSettings);\n"],"mappings":"OAAOA,MAAqB,yDACnBC,MAAY,iCACd,qCACA,4BACAC,MAAc,+BAkBN,MAAMC,UAAsBH,EACzCI,kBAAoB,CAClBC,cAAe,CAAEC,OAAO,IAG1B,WAAAC,GACEC,QACAC,KAAKJ,cAAgB,EACvB,CAKA,iBAAAK,GACEF,MAAME,oBACND,KAAKJ,cAAgB,IAAII,KAAKE,iBAAiB,4BAA4BC,IAAI,CAACC,EAAMC,KACpF,MAAMC,EAAOF,EAAKG,aAAa,SAAWH,EAAKG,aAAa,UAAY,OAAOF,IAG/E,OAFAD,EAAKI,KAAO,OAAOF,IACnBF,EAAKK,MAAMC,QAAU,QACd,CACLC,GAAIL,EACJM,SAAU,OAAON,IACjBO,MAAOT,EAAKG,aAAa,UAAYd,EAASa,GAC9CQ,SAAUC,OAAOX,EAAKG,aAAa,cAzBd,IA0BrBS,WAAW,IAGjB,CAKA,MAAAC,GACE,MAAMC,EAAO,CACX,CAAEP,GAAI,SAAUE,MAAO,SAAUC,SAAU,IAAKK,QAAS,IAAM3B,CAAI,wDACnE,CAAEmB,GAAI,SAAUE,MAAO,SAAUC,SAAU,IAAKK,QAAS,IAAM3B,CAAI,2DAChEQ,KAAKJ,eACRwB,KAAK,CAACC,EAAGC,IAAMD,EAAEP,SAAWQ,EAAER,UAEhC,OAAOtB,CAAI;;UAEL0B,EAAKf,IAAIoB,GAAO/B,CAAI,cAAc+B,EAAIZ,MAAMY,EAAIV;UAChDK,EAAKf,IAAIoB,GAAO/B,CAAI,uBAAuB+B,EAAIZ,iBAAiBY,EAAIP,UAAYxB,CAAI,cAAc+B,EAAIX,mBAAqBW,EAAIJ;;KAGvI,EAGFK,eAAeC,OAAO,mBAAoB/B","ignoreList":[]}

package/dist/admin/components/tableControls/ExtensionDetails.js

@@ -1,2 +0,0 @@
-import e from"../AdminTableControl.js";import{html as n}from"/kempo-ui/lit-all.min.js";import"/kempo-ui/components/Icon.js";export default class t extends e{connectedCallback(){super.connectedCallback(),this.hasAttribute("title")||(this.title="View in Store")}handleAction(){this.record&&(window.location.href=`/admin/extensions/details/?name=${encodeURIComponent(this.record.name)}`)}render(){return n`<k-icon name="storefront"></k-icon>`}}customElements.define("admin-extension-details",t);
-//# sourceMappingURL=C:\Users\dusti\dev\kempo\dist\admin\components\tableControls\ExtensionDetails.js.map

package/dist/admin/components/tableControls/ExtensionDetails.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"src\\admin\\components\\tableControls\\ExtensionDetails.js","names":["AdminTableControl","html","ExtensionDetails","connectedCallback","super","this","hasAttribute","title","handleAction","record","window","location","href","encodeURIComponent","name","render","customElements","define"],"sources":["0"],"sourcesContent":["import AdminTableControl from '../AdminTableControl.js';\nimport { html } from '/kempo-ui/lit-all.min.js';\nimport '/kempo-ui/components/Icon.js';\n\n/*\n  Opens the marketplace page for a row's extension: its README, what it requires and adds, its rating (which\n  can be changed from there once it is installed). The page shows whatever the marketplace knows; for an\n  extension it does not list it says so.\n*/\nexport default class ExtensionDetails extends AdminTableControl {\n  connectedCallback(){\n    super.connectedCallback();\n    if(!this.hasAttribute('title')) this.title = 'View in Store';\n  }\n\n  handleAction(){\n    if(!this.record) return;\n    window.location.href = `/admin/extensions/details/?name=${encodeURIComponent(this.record.name)}`;\n  }\n\n  render(){ return html`<k-icon name=\"storefront\"></k-icon>`; }\n}\n\ncustomElements.define('admin-extension-details', ExtensionDetails);\n"],"mappings":"OAAOA,MAAuB,yCACrBC,MAAY,iCACd,8CAOQ,MAAMC,UAAyBF,EAC5C,iBAAAG,GACEC,MAAMD,oBACFE,KAAKC,aAAa,WAAUD,KAAKE,MAAQ,gBAC/C,CAEA,YAAAC,GACMH,KAAKI,SACTC,OAAOC,SAASC,KAAO,mCAAmCC,mBAAmBR,KAAKI,OAAOK,QAC3F,CAEA,MAAAC,GAAU,OAAOd,CAAI,qCAAuC,EAG9De,eAAeC,OAAO,0BAA2Bf","ignoreList":[]}