@a83/orbiter-admin 0.3.11 → 0.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a83/orbiter-admin",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Standalone admin server for Orbiter CMS",
   "type": "module",
   "main": "./src/server.js",
@@ -28,6 +28,7 @@
   "dependencies": {
     "@a83/orbiter-core": "^0.3.2",
     "@hono/node-server": "^1.14.4",
-    "hono": "^4.7.11"
+    "hono": "^4.7.11",
+    "sharp": "^0.34.5"
   }
 }

package/public/editor.html

@@ -116,6 +116,10 @@
     .btn-schedule:hover { background:var(--accent-bg); }
     .schedule-picker { display:none; gap:4px; margin-bottom:5px; }
     .schedule-picker.open { display:flex; }
+    .expiry-picker { display:none; gap:4px; margin-bottom:5px; }
+    .expiry-picker.open { display:flex; }
+    .btn-expiry { display:block; width:100%; padding:8px; background:transparent; border:1px solid var(--line); color:var(--muted); font-family:var(--mono); font-size:10px; cursor:pointer; transition:all .12s; border-radius:var(--radius); margin-bottom:5px; }
+    .btn-expiry:hover { border-color:var(--mid); color:var(--text); }
 
     /* Schema fields in sidebar */
     .field-input,.field-select { width:100%; background:var(--bg0); border:1px solid var(--line); padding:6px 8px; color:var(--heading); font-family:var(--mono); font-size:11px; outline:none; appearance:none; transition:border-color .15s; border-radius:var(--radius); box-sizing:border-box; }
@@ -133,6 +137,21 @@
     .media-drop-zone img { position:absolute; inset:0; width:100%; height:100%; object-fit:cover; }
     .media-drop-label { font-size:9px; color:var(--muted); letter-spacing:.08em; position:relative; z-index:1; }
     .media-drop-zone.has-image .media-drop-label { display:none; }
+    /* Comments */
+    .comment-item { padding:8px 0; border-bottom:1px solid var(--line2); }
+    .comment-item:last-child { border-bottom:none; }
+    .comment-item.resolved { opacity:.45; }
+    .comment-meta { display:flex; align-items:center; gap:6px; margin-bottom:4px; }
+    .comment-user { font-size:10px; font-family:var(--mono); color:var(--accent); }
+    .comment-date { font-size:10px; color:var(--muted); margin-left:auto; }
+    .comment-body { font-size:12px; color:var(--text); line-height:1.5; word-break:break-word; }
+    .comment-actions { display:flex; gap:6px; margin-top:4px; }
+    .comment-actions button { font-size:9px; font-family:var(--mono); background:none; border:none; color:var(--muted); cursor:pointer; padding:0; }
+    .comment-actions button:hover { color:var(--text); }
+    .comment-input { width:100%; background:var(--bg0); border:1px solid var(--line); padding:6px 8px; color:var(--heading); font-family:var(--mono); font-size:11px; outline:none; resize:vertical; transition:border-color .15s; border-radius:var(--radius); box-sizing:border-box; min-height:56px; }
+    .comment-input:focus { border-color:var(--accent); }
+    .comment-submit { margin-top:4px; width:100%; padding:6px; background:var(--accent-bg); border:1px solid var(--accent); color:var(--accent); font-family:var(--mono); font-size:10px; cursor:pointer; border-radius:var(--radius); transition:background .12s; }
+    .comment-submit:hover { background:var(--accent); color:var(--bg0); }
     .weekday-grid { display:flex; gap:4px; flex-wrap:wrap; margin-top:4px; }
     .wd-btn { height:26px; min-width:32px; padding:0 4px; background:var(--bg0); border:1px solid var(--line); color:var(--muted); font-family:var(--mono); font-size:9px; cursor:pointer; transition:all .1s; border-radius:2px; }
     .wd-btn.active { background:var(--accent-bg); border-color:var(--accent); color:var(--accent); }
@@ -384,6 +403,7 @@
           <button type="button" class="view-btn"        id="vbtn-preview" onclick="setViewMode('preview')">Preview</button>
         </div>
         <a id="btn-preview-link" href="#" target="_blank" rel="noopener" title="Open preview" style="display:none;font-size:11px;color:var(--muted);text-decoration:none;padding:4px 8px;border:1px solid var(--line);border-radius:var(--radius);">↗ Preview</a>
+        <button class="search-trigger" id="search-btn" title="Search (⌘K)" style="background:none;border:none;color:var(--muted);cursor:pointer;padding:4px 8px;font-size:13px;">⌘K</button>
         <button class="scheme-toggle" id="scheme-toggle" title="Toggle scheme">◐</button>
         <span class="user" id="topbar-user"></span>
         <span class="logout" id="logout-btn">Sign out</span>
@@ -486,12 +506,13 @@
     document.getElementById('collection-id-display').textContent = COLLECTION;
 
     // Load collection schema + entry
-    const [colData, entryData, versionsData, activityData, mediaData] = await Promise.all([
+    const [colData, entryData, versionsData, activityData, mediaData, commentsData] = await Promise.all([
       fetch(`/api/collections/${COLLECTION}`,{credentials:'include'}).then(r=>r.ok?r.json():null),
       IS_NEW ? null : fetch(`/api/collections/${COLLECTION}/entries/${SLUG}`,{credentials:'include'}).then(r=>r.ok?r.json():null),
       IS_NEW ? [] : fetch(`/api/collections/${COLLECTION}/entries/${SLUG}/versions`,{credentials:'include'}).then(r=>r.ok?r.json():[]).catch(()=>[]),
       IS_NEW ? [] : fetch(`/api/collections/${COLLECTION}/entries/${SLUG}/activity`,{credentials:'include'}).then(r=>r.ok?r.json():[]).catch(()=>[]),
       fetch('/api/media',{credentials:'include'}).then(r=>r.json()).catch(()=>[]),
+      IS_NEW ? [] : fetch(`/api/collections/${COLLECTION}/entries/${SLUG}/comments`,{credentials:'include'}).then(r=>r.ok?r.json():[]).catch(()=>[]),
     ]);
 
     if (!colData) { location.replace('/collections.html'); }
@@ -547,8 +568,10 @@
       const panel = document.getElementById('meta-panel');
       const status    = IS_NEW ? 'draft' : (entryData?.status ?? 'draft');
       const updatedAt = entryData?.updated_at;
-      const publishAt = entryData?.publish_at ?? null;
-      const publishAtInput = publishAt ? publishAt.replace(' ', 'T').slice(0, 16) : '';
+      const publishAt    = entryData?.publish_at   ?? null;
+      const unpublishAt  = entryData?.unpublish_at ?? null;
+      const publishAtInput   = publishAt   ? publishAt.replace(' ', 'T').slice(0, 16)   : '';
+      const unpublishAtInput = unpublishAt ? unpublishAt.replace(' ', 'T').slice(0, 16) : '';
 
       let fieldsHtml = '';
       const seoFields = {};
@@ -672,6 +695,13 @@
             <button type="button" id="btn-schedule-confirm" style="padding:5px 10px;background:var(--accent);border:none;color:var(--bg0);font-family:var(--mono);font-size:10px;cursor:pointer;border-radius:var(--radius);white-space:nowrap;">Set</button>
           </div>
           <button type="button" class="btn-schedule" id="btn-schedule">${status==='scheduled'?'Reschedule':'Schedule'}</button>
+          ${status==='published'?`
+          <div class="expiry-picker${unpublishAt?' open':''}" id="expiry-picker">
+            <input type="datetime-local" class="field-input" id="unpublish-at-input" value="${unpublishAtInput}" style="flex:1;font-size:10px;padding:5px 8px;" />
+            <button type="button" id="btn-expiry-confirm" style="padding:5px 10px;background:var(--bg3);border:1px solid var(--line);color:var(--text);font-family:var(--mono);font-size:10px;cursor:pointer;border-radius:var(--radius);white-space:nowrap;">Set</button>
+          </div>
+          <button type="button" class="btn-expiry" id="btn-expiry">${unpublishAt?'Change expiry':'Set expiry'}</button>
+          `:''}
         </div>
         <div class="meta-section">
           <div class="meta-label">Details</div>
@@ -691,6 +721,24 @@
         </div>
         ${versionsData.length ? `<div class="meta-section"><div class="meta-label">History</div>${versHtml}</div>` : ''}
         ${activityData.length ? `<div class="meta-section"><div class="meta-label">Activity</div>${actHtml}</div>` : ''}
+        ${IS_NEW ? '' : `<div class="meta-section" id="comments-section">
+          <div class="meta-label">Comments <span id="comment-count" style="color:var(--muted)">${commentsData.length ? '(' + commentsData.length + ')' : ''}</span></div>
+          <div id="comments-list">${commentsData.map(cm=>`
+            <div class="comment-item${cm.resolved?` resolved`:''}" data-cid="${cm.id}">
+              <div class="comment-meta">
+                <span class="comment-user">${escHtml(cm.username)}</span>
+                <span class="comment-date">${new Date(cm.created_at).toLocaleDateString()}</span>
+              </div>
+              <div class="comment-body">${escHtml(cm.body)}</div>
+              <div class="comment-actions">
+                <button class="cm-resolve-btn" data-cid="${cm.id}" data-resolved="${cm.resolved}">${cm.resolved?'Unresolve':'Resolve'}</button>
+                <button class="cm-delete-btn" data-cid="${cm.id}">Delete</button>
+              </div>
+            </div>
+          `).join('')}</div>
+          <textarea class="comment-input" id="comment-input" placeholder="Add a comment…" rows="2"></textarea>
+          <button class="comment-submit" id="comment-submit">Post comment</button>
+        </div>`}
       `;
 
       // Wire up weekday toggles
@@ -756,6 +804,12 @@
         if (!val) { alert('Please select a date and time.'); return; }
         saveEntry('scheduled');
       });
+      document.getElementById('btn-expiry')?.addEventListener('click', () => {
+        document.getElementById('expiry-picker').classList.toggle('open');
+      });
+      document.getElementById('btn-expiry-confirm')?.addEventListener('click', () => {
+        saveEntry('published');
+      });
 
       // Version restore buttons
       panel.querySelectorAll('.v-restore-btn').forEach(btn => {
@@ -770,6 +824,47 @@
         });
       });
 
+      // Comments
+      if (!IS_NEW) {
+        const targetSlug = currentSlug || SLUG;
+
+        document.getElementById('comment-submit')?.addEventListener('click', async () => {
+          const inp  = document.getElementById('comment-input');
+          const body = inp.value.trim();
+          if (!body) return;
+          const res = await fetch(`/api/collections/${COLLECTION}/entries/${targetSlug}/comments`, {
+            method: 'POST', credentials: 'include',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ body }),
+          });
+          if (res.ok) { inp.value = ''; location.reload(); }
+        });
+
+        panel.querySelectorAll('.cm-resolve-btn').forEach(btn => {
+          btn.addEventListener('click', async () => {
+            const resolved = btn.dataset.resolved === '0' || btn.dataset.resolved === 'false' ? true : false;
+            await fetch(`/api/comments/${btn.dataset.cid}/resolve`, {
+              method: 'PATCH', credentials: 'include',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ resolved }),
+            });
+            const item = btn.closest('.comment-item');
+            if (item) {
+              item.classList.toggle('resolved', resolved);
+              btn.textContent = resolved ? 'Unresolve' : 'Resolve';
+              btn.dataset.resolved = resolved ? '1' : '0';
+            }
+          });
+        });
+
+        panel.querySelectorAll('.cm-delete-btn').forEach(btn => {
+          btn.addEventListener('click', async () => {
+            await fetch(`/api/comments/${btn.dataset.cid}`, { method: 'DELETE', credentials: 'include' });
+            btn.closest('.comment-item')?.remove();
+          });
+        });
+      }
+
       // Slug input → slug preview
       document.getElementById('slug-input').addEventListener('input', e=>{
         e.target.dataset.manual='1';
@@ -931,6 +1026,12 @@
         if (!raw) { if (!isAutosave) alert('Please select a date and time.'); return; }
         publish_at = raw.replace('T', ' ') + ':00';
       }
+      // Resolve unpublish_at for published entries with expiry
+      let unpublish_at = null;
+      if (status === 'published') {
+        const raw = document.getElementById('unpublish-at-input')?.value;
+        unpublish_at = raw ? raw.replace('T', ' ') + ':00' : null;
+      }
 
       const title = document.getElementById('title-input').value;
       syncToHidden();
@@ -954,6 +1055,22 @@
         }
       }
 
+      // Required field validation (skip on autosave)
+      if (!isAutosave) {
+        const missing = extraFields
+          .filter(([key, field]) => {
+            if (!field.required) return false;
+            const val = data[key];
+            if (Array.isArray(val)) return val.length === 0;
+            return val === '' || val === null || val === undefined;
+          })
+          .map(([key, field]) => field.label || key);
+        if (missing.length) {
+          alert(`Required field${missing.length > 1 ? 's' : ''} missing: ${missing.join(', ')}`);
+          return;
+        }
+      }
+
       if (IS_NEW && !currentSlug) {
         // Create new entry
         const res = await fetch(`/api/collections/${COLLECTION}/entries`,{
@@ -978,7 +1095,7 @@
         const res = await fetch(`/api/collections/${COLLECTION}/entries/${targetSlug}`,{
           method:'PUT', credentials:'include',
           headers:{'Content-Type':'application/json'},
-          body: JSON.stringify({ slug, data, status, publish_at }),
+          body: JSON.stringify({ slug, data, status, publish_at, unpublish_at }),
         });
         if (res.ok) {
           const json = await res.json();
@@ -1866,6 +1983,7 @@
   <input type="file" id="img-file-inp" accept="image/*" style="display:none">
 
   <script src="/sidebar.js"></script>
+  <script src="/search.js"></script>
   <script src="/router.js"></script>
 </body>
 </html>

package/public/settings.html

@@ -437,6 +437,18 @@
           </div>
         </div>
 
+        <div class="settings-group">
+          <div class="group-header">Image optimization</div>
+          <div class="setting-row">
+            <div><div class="setting-label">Max width</div><div class="setting-desc">Images wider than this are resized on upload (px). Leave blank to disable.</div></div>
+            <input class="input" name="media.img_max_width" type="number" min="400" max="8000" step="100" value="${get('media.img_max_width')||'2400'}" placeholder="2400" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Quality</div><div class="setting-desc">JPEG / WebP / AVIF compression quality (1–100)</div></div>
+            <input class="input" name="media.img_quality" type="number" min="1" max="100" value="${get('media.img_quality')||'85'}" placeholder="85" />
+          </div>
+        </div>
+
         <div class="save-row">
           <button type="submit" class="btn-save">Save settings</button>
         </div>

package/src/routes/comments.js

@@ -0,0 +1,48 @@
+import { Hono } from 'hono';
+import { openPod } from '@a83/orbiter-core';
+
+export const commentRoutes = new Hono();
+
+// GET /api/collections/:id/entries/:slug/comments
+commentRoutes.get('/:collectionId/entries/:slug/comments', (c) => {
+  const { collectionId, slug } = c.req.param();
+  const db    = openPod(c.get('podPath'));
+  const entry = db.db.prepare('SELECT id FROM _entries WHERE collection_id = ? AND slug = ?').get(collectionId, slug);
+  if (!entry) { db.close(); return c.json({ error: 'Not found' }, 404); }
+  const comments = db.getComments(entry.id);
+  db.close();
+  return c.json(comments);
+});
+
+// POST /api/collections/:id/entries/:slug/comments
+commentRoutes.post('/:collectionId/entries/:slug/comments', async (c) => {
+  const { collectionId, slug } = c.req.param();
+  const { body } = await c.req.json();
+  if (!body?.trim()) return c.json({ error: 'body required' }, 400);
+  const db    = openPod(c.get('podPath'));
+  const entry = db.db.prepare('SELECT id FROM _entries WHERE collection_id = ? AND slug = ?').get(collectionId, slug);
+  if (!entry) { db.close(); return c.json({ error: 'Not found' }, 404); }
+  const username = c.get('user')?.username ?? 'unknown';
+  const id = db.createComment(entry.id, username, body.trim());
+  db.close();
+  return c.json({ ok: true, id }, 201);
+});
+
+// PATCH /api/comments/:id/resolve
+commentRoutes.patch('/comments/:id/resolve', async (c) => {
+  const { id } = c.req.param();
+  const { resolved } = await c.req.json();
+  const db = openPod(c.get('podPath'));
+  db.resolveComment(id, resolved !== false);
+  db.close();
+  return c.json({ ok: true });
+});
+
+// DELETE /api/comments/:id
+commentRoutes.delete('/comments/:id', (c) => {
+  const { id } = c.req.param();
+  const db = openPod(c.get('podPath'));
+  db.deleteComment(id);
+  db.close();
+  return c.json({ ok: true });
+});

package/src/routes/entries.js

@@ -274,14 +274,15 @@ entryRoutes.post('/:collectionId/entries/:slug/duplicate', (c) => {
 // PATCH /api/collections/:id/entries/:slug/status
 entryRoutes.patch('/:collectionId/entries/:slug/status', async (c) => {
   const { collectionId, slug } = c.req.param();
-  const { status, publish_at } = await c.req.json();
+  const { status, publish_at, unpublish_at } = await c.req.json();
   if (!['draft', 'published', 'scheduled'].includes(status)) return c.json({ error: 'Invalid status' }, 400);
   if (status === 'scheduled' && !publish_at) return c.json({ error: 'publish_at required for scheduled status' }, 400);
   const db    = openPod(c.get('podPath'));
   const entry = db.getEntry(collectionId, slug);
   if (!entry) { db.close(); return c.json({ error: 'Not found' }, 404); }
-  const pa = status === 'scheduled' ? publish_at : null;
-  db.updateEntry(collectionId, slug, { slug, data: entry.data, status, publish_at: pa });
+  const pa  = status === 'scheduled' ? publish_at : null;
+  const ua  = status === 'published' ? (unpublish_at ?? null) : null;
+  db.updateEntry(collectionId, slug, { slug, data: entry.data, status, publish_at: pa, unpublish_at: ua });
   const username = c.get('user')?.username ?? 'unknown';
   if (status === 'scheduled') db.logAudit(entry.id, username, 'schedule');
   db.close();

package/src/routes/media.js

@@ -1,6 +1,27 @@
 import { Hono } from 'hono';
 import { openPod, getMediaBackend } from '@a83/orbiter-core';
 import { randomUUID } from 'node:crypto';
+import sharp from 'sharp';
+
+const IMAGE_TYPES = new Set(['image/jpeg', 'image/png', 'image/webp', 'image/avif', 'image/tiff']);
+
+async function optimizeImage(buffer, mimeType, db) {
+  if (!IMAGE_TYPES.has(mimeType)) return buffer;
+  const maxWidth = parseInt(db.getMeta('media.img_max_width') ?? '2400', 10);
+  const quality  = parseInt(db.getMeta('media.img_quality')   ?? '85',   10);
+  try {
+    const img  = sharp(buffer);
+    const meta = await img.metadata();
+    if (meta.width && meta.width > maxWidth) img.resize({ width: maxWidth, withoutEnlargement: true });
+    if (mimeType === 'image/jpeg') return await img.jpeg({ quality, mozjpeg: true }).toBuffer();
+    if (mimeType === 'image/png')  return await img.png({ quality }).toBuffer();
+    if (mimeType === 'image/webp') return await img.webp({ quality }).toBuffer();
+    if (mimeType === 'image/avif') return await img.avif({ quality }).toBuffer();
+    return await img.toBuffer();
+  } catch {
+    return buffer;
+  }
+}
 
 export const mediaRoutes = new Hono();
 
@@ -58,11 +79,12 @@ mediaRoutes.post('/', async (c) => {
 
   if (!file || typeof file === 'string') return c.json({ error: 'No file provided' }, 400);
 
-  const buffer  = Buffer.from(await file.arrayBuffer());
-  const id      = randomUUID();
-  const db      = openPod(c.get('podPath'));
+  const rawBuffer = Buffer.from(await file.arrayBuffer());
+  const id        = randomUUID();
+  const db        = openPod(c.get('podPath'));
 
   try {
+    const buffer  = await optimizeImage(rawBuffer, file.type, db);
     const backend = getMediaBackend(db);
     await backend.upload(id, file.name, file.type, buffer.byteLength, buffer, alt, folder);
     const item    = db.getMediaItem(id);
@@ -99,13 +121,14 @@ mediaRoutes.post('/import-url', async (c) => {
   }
   if (!resp.ok) return c.json({ error: `Remote returned ${resp.status}` }, 400);
 
-  const mime     = (resp.headers.get('content-type') || 'application/octet-stream').split(';')[0].trim();
-  const buffer   = Buffer.from(await resp.arrayBuffer());
-  const filename = url.split('/').pop()?.split('?')[0] || 'imported';
-  const id       = randomUUID();
-  const db       = openPod(c.get('podPath'));
+  const mime      = (resp.headers.get('content-type') || 'application/octet-stream').split(';')[0].trim();
+  const rawBuffer = Buffer.from(await resp.arrayBuffer());
+  const filename  = url.split('/').pop()?.split('?')[0] || 'imported';
+  const id        = randomUUID();
+  const db        = openPod(c.get('podPath'));
 
   try {
+    const buffer  = await optimizeImage(rawBuffer, mime, db);
     const backend = getMediaBackend(db);
     await backend.upload(id, filename, mime, buffer.byteLength, buffer, alt ?? null, folder ?? '');
     const item    = db.getMediaItem(id);

package/src/routes/meta.js

@@ -10,6 +10,7 @@ const ALLOWED_KEYS = [
   'media.backend', 'media.local_path',
   'media.github_token', 'media.github_repo', 'media.github_branch', 'media.github_dir',
   'media.s3_bucket', 'media.s3_region', 'media.s3_endpoint', 'media.s3_access_key', 'media.s3_secret_key', 'media.s3_public_url',
+  'media.img_max_width', 'media.img_quality',
   'api.enabled', 'api.token', 'preview.token',
   'dashboard.notes', 'dashboard.todos',
   'ui.theme',

package/src/server.js

@@ -22,6 +22,7 @@ import { searchRoutes }     from './routes/search.js';
 import { githubRoutes }     from './routes/github.js';
 import { infoRoutes }       from './routes/info.js';
 import { importRoutes }     from './routes/import.js';
+import { commentRoutes }    from './routes/comments.js';
 import { requireAuth }      from './middleware/auth.js';
 
 const { version: adminVersion } = JSON.parse(
@@ -71,6 +72,8 @@ export function createApp(podPath) {
   api.route('/github',       githubRoutes);
   api.route('/info',         infoRoutes);
   api.route('/import',       importRoutes);
+  api.route('/collections',  commentRoutes);
+  api.route('/',             commentRoutes);
 
   app.route('/api', api);
 
@@ -98,17 +101,23 @@ serve({ fetch: createApp(POD_PATH).fetch, port: PORT }, () => {
 setInterval(() => {
   try {
     const db  = openPod(POD_PATH);
-    const due = db.getScheduledDue();
-    if (!due.length) { db.close(); return; }
+    const due     = db.getScheduledDue();
+    const expired = db.getExpiredDue();
+    if (!due.length && !expired.length) { db.close(); return; }
     const now = new Date().toISOString().replace('T', ' ').replace(/\.\d{3}Z$/, '');
     for (const entry of due) {
       db.db.prepare("UPDATE _entries SET status = 'published', publish_at = NULL, updated_at = ? WHERE id = ?").run(now, entry.id);
       db.logAudit(entry.id, 'scheduler', 'publish');
     }
+    for (const entry of expired) {
+      db.db.prepare("UPDATE _entries SET status = 'draft', unpublish_at = NULL, updated_at = ? WHERE id = ?").run(now, entry.id);
+      db.logAudit(entry.id, 'scheduler', 'unpublish');
+    }
     const webhookUrl = db.getMeta('build.webhook_url') ?? '';
     if (webhookUrl) db.setMeta('build.last_triggered', new Date().toISOString());
     db.close();
-    console.log(`[scheduler] Published ${due.length} scheduled entr${due.length === 1 ? 'y' : 'ies'}`);
+    if (due.length)     console.log(`[scheduler] Published ${due.length} scheduled entr${due.length === 1 ? 'y' : 'ies'}`);
+    if (expired.length) console.log(`[scheduler] Unpublished ${expired.length} expired entr${expired.length === 1 ? 'y' : 'ies'}`);
     if (webhookUrl) fetch(webhookUrl, { method: 'POST' }).catch(() => {});
   } catch (e) {
     console.warn('[scheduler]', e.message);