@a83/orbiter-admin 0.3.49 → 0.3.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a83/orbiter-admin",
-  "version": "0.3.49",
+  "version": "0.3.50",
   "description": "Standalone admin server for Orbiter CMS",
   "type": "module",
   "main": "./src/server.js",
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "@a83/orbiter-core": "^0.3.2",
+    "basic-ftp": "^5.0.5",
     "@hono/node-server": "^1.14.4",
     "hono": "^4.7.11",
     "nodemailer": "^8.0.10",

package/public/build.html

@@ -10,20 +10,25 @@
   <link rel="stylesheet" href="/style.css" />
   <script src="/theme.js"></script>
   <style>
-    .build-card { background:var(--bg2); border:1px solid var(--line); border-radius:var(--radius); padding:28px 32px; max-width:520px; }
-    .build-status { display:flex; align-items:center; gap:10px; margin-bottom:20px; }
+    .build-cards { display:flex; flex-direction:column; gap:16px; max-width:560px; }
+    .build-card { background:var(--bg2); border:1px solid var(--line); border-radius:var(--radius); padding:24px 28px; }
+    .build-card-header { font-size:10px; letter-spacing:.16em; text-transform:uppercase; color:var(--muted); margin-bottom:16px; display:flex; align-items:center; gap:7px; }
+    .build-card-header::before { content:"◆"; color:var(--gold); font-size:5px; }
+    .build-status { display:flex; align-items:center; gap:10px; margin-bottom:14px; }
     .build-dot { width:8px; height:8px; border-radius:50%; background:var(--line); flex-shrink:0; }
-    .build-dot.configured { background:var(--jade); }
-    .build-dot.unconfigured { background:var(--muted); }
+    .build-dot.ok  { background:var(--jade); }
+    .build-dot.err { background:var(--red); }
+    .build-dot.off { background:var(--muted); }
     .build-label { font-size:12px; color:var(--text); }
-    .build-meta { font-size:10px; color:var(--muted); margin-bottom:24px; }
-    .build-last { font-size:10px; color:var(--muted); margin-top:12px; }
-    .banner { padding:8px 16px; font-size:10px; display:flex; align-items:center; gap:6px; border-radius:var(--radius); margin-bottom:14px; max-width:520px; }
+    .build-meta { font-size:10px; color:var(--muted); margin-bottom:20px; }
+    .build-last { font-size:10px; color:var(--muted); margin-top:10px; }
+    .build-err  { font-size:10px; color:var(--red); margin-top:6px; font-family:var(--mono); white-space:pre-wrap; word-break:break-all; }
+    .banner { padding:8px 16px; font-size:10px; display:flex; align-items:center; gap:6px; border-radius:var(--radius); margin-bottom:14px; max-width:560px; }
     .banner-ok  { background:var(--jade-bg); color:var(--jade); border:1px solid rgba(45,139,106,.2); }
     .banner-ok::before { content:"✓"; }
     .banner-err { background:rgba(139,38,53,.07); color:var(--red); border:1px solid rgba(139,38,53,.15); }
     .banner-err::before { content:"✕"; }
-    .config-hint { font-size:11px; color:var(--muted); margin-top:12px; line-height:1.7; }
+    .config-hint { font-size:11px; color:var(--muted); margin-top:10px; line-height:1.7; }
     .config-hint a { color:var(--accent); text-decoration:none; }
     .config-hint a:hover { text-decoration:underline; }
   </style>
@@ -86,40 +91,76 @@
       setTimeout(()=>el.style.display='none', 4000);
     }
 
-    const status = await fetch('/api/build/status',{credentials:'include'}).then(r=>r.json()).catch(()=>({configured:false,lastTriggered:null}));
+    const [status, ftp] = await Promise.all([
+      fetch('/api/build/status',       {credentials:'include'}).then(r=>r.json()).catch(()=>({configured:false,lastTriggered:null})),
+      fetch('/api/deploy/ftp/status',  {credentials:'include'}).then(r=>r.json()).catch(()=>({configured:false})),
+    ]);
+
     const lastEl = document.getElementById('last-triggered');
-    lastEl.textContent = status.lastTriggered ? `Last: ${new Date(status.lastTriggered).toLocaleString()}` : 'Never triggered';
+    lastEl.textContent = status.lastTriggered ? `Last build: ${new Date(status.lastTriggered).toLocaleString()}` : '';
 
     const wrap = document.getElementById('content');
     wrap.innerHTML = `
-      <div class="build-card">
-        <div class="build-status">
-          <div class="build-dot ${status.configured?'configured':'unconfigured'}"></div>
-          <div class="build-label">${status.configured ? 'Webhook configured' : 'No webhook configured'}</div>
+      <div class="build-cards">
+
+        <!-- Build webhook card -->
+        <div class="build-card">
+          <div class="build-card-header">Build webhook</div>
+          <div class="build-status">
+            <div class="build-dot ${status.configured?'ok':'off'}"></div>
+            <div class="build-label">${status.configured ? 'Webhook configured' : 'No webhook configured'}</div>
+          </div>
+          ${status.configured
+            ? `<div class="build-meta">POSTs to the webhook URL to trigger a build on Netlify, Vercel, or GitHub Actions.</div>
+               <button class="btn btn-primary" id="trigger-btn" style="min-width:160px;">▲ Trigger build</button>
+               ${status.lastTriggered ? `<div class="build-last">Last triggered: ${new Date(status.lastTriggered).toLocaleString()}</div>` : ''}`
+            : `<div class="config-hint">No webhook URL configured. Add one in <a href="/settings.html">Settings → Build</a>.</div>`
+          }
+        </div>
+
+        <!-- FTP deploy card -->
+        <div class="build-card">
+          <div class="build-card-header">FTP / FTPS Deploy</div>
+          <div class="build-status">
+            <div class="build-dot ${ftp.configured ? (ftp.lastStatus==='error'?'err':'ok') : 'off'}"></div>
+            <div class="build-label">${ftp.configured
+              ? (ftp.lastStatus==='error' ? 'Last deploy failed' : ftp.lastDeploy ? 'Configured' : 'Configured — never deployed')
+              : 'Not configured'}</div>
+          </div>
+          ${ftp.configured
+            ? `<div class="build-meta">Uploads your Astro <code style="font-family:var(--mono);font-size:10px;background:var(--bg3);padding:1px 5px;border-radius:3px">dist/</code> folder directly to your FTP server (World4You, Strato, etc.).</div>
+               <div style="display:flex;gap:10px;align-items:center;flex-wrap:wrap">
+                 <button class="btn btn-primary" id="ftp-deploy-btn" style="min-width:160px;">↑ Deploy via FTP</button>
+                 ${ftp.autoDeploy ? '<span style="font-size:10px;color:var(--muted)">Auto-deploy after build: on</span>' : ''}
+               </div>
+               ${ftp.lastDeploy ? `<div class="build-last">Last deploy: ${new Date(ftp.lastDeploy).toLocaleString()}</div>` : ''}
+               ${ftp.lastStatus==='error' && ftp.lastError ? `<div class="build-err">${ftp.lastError}</div>` : ''}`
+            : `<div class="config-hint">Configure FTP credentials in <a href="/settings.html">Settings → FTP / FTPS Deploy</a> to upload directly to shared hosting.</div>`
+          }
         </div>
-        ${status.configured
-          ? `<div class="build-meta">Triggering a build will POST to the configured webhook URL.</div>
-             <button class="btn btn-primary" id="trigger-btn" style="min-width:160px;">▲ Trigger build</button>
-             ${status.lastTriggered ? `<div class="build-last">Last triggered: ${new Date(status.lastTriggered).toLocaleString()}</div>` : ''}`
-          : `<div class="config-hint">
-               No webhook URL is configured. To enable build triggers, add a webhook URL in
-               <a href="/settings.html">Settings → Build</a>.
-             </div>`
-        }
+
       </div>
     `;
 
-    document.getElementById('trigger-btn')?.addEventListener('click', async btn=>{
-      btn = document.getElementById('trigger-btn');
-      btn.disabled = true;
-      btn.textContent = 'Triggering…';
-      const res = await fetch('/api/build/trigger',{method:'POST',credentials:'include'});
+    document.getElementById('trigger-btn')?.addEventListener('click', async () => {
+      const btn = document.getElementById('trigger-btn');
+      btn.disabled = true; btn.textContent = 'Triggering…';
+      const res  = await fetch('/api/build/trigger', {method:'POST', credentials:'include'});
       const json = await res.json();
-      btn.disabled = false;
-      btn.textContent = '▲ Trigger build';
-      if (res.ok) showBanner('banner-ok','Build triggered');
+      btn.disabled = false; btn.textContent = '▲ Trigger build';
+      if (res.ok) showBanner('banner-ok', 'Build triggered');
       else showBanner('banner-err', json.error ?? 'Webhook error');
     });
+
+    document.getElementById('ftp-deploy-btn')?.addEventListener('click', async () => {
+      const btn = document.getElementById('ftp-deploy-btn');
+      btn.disabled = true; btn.textContent = '↑ Uploading…';
+      const res  = await fetch('/api/deploy/ftp', {method:'POST', credentials:'include'});
+      const json = await res.json();
+      btn.disabled = false; btn.textContent = '↑ Deploy via FTP';
+      if (res.ok) showBanner('banner-ok', 'FTP deploy complete');
+      else showBanner('banner-err', json.error ?? 'FTP error');
+    });
   </script>
 </main>
   </div>

package/public/settings.html

@@ -502,6 +502,46 @@
           </div>
         </div>
 
+        <div class="settings-group" style="grid-column:1/-1">
+          <div class="group-header">FTP / FTPS Deploy</div>
+          <div class="setting-row">
+            <div><div class="setting-label">FTP host</div><div class="setting-desc">e.g. ftp.world4you.com or ftp.strato.de</div></div>
+            <input class="input" name="ftp.host" value="${get('ftp.host')||''}" placeholder="ftp.example.com" autocomplete="off" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Port</div><div class="setting-desc">21 for FTP (default), 990 for implicit FTPS</div></div>
+            <input class="input" name="ftp.port" type="number" value="${get('ftp.port')||'21'}" placeholder="21" style="max-width:100px" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Username</div></div>
+            <input class="input" name="ftp.user" value="${get('ftp.user')||''}" placeholder="u12345678" autocomplete="off" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Password</div></div>
+            <input class="input" type="password" name="ftp.password" value="${get('ftp.password')||''}" autocomplete="off" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Use FTPS</div><div class="setting-desc">Secure FTP over TLS (explicit mode)</div></div>
+            <input type="checkbox" name="ftp.secure" value="1" ${get('ftp.secure')==='1'?'checked':''} style="accent-color:var(--accent);width:14px;height:14px;" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Remote path</div><div class="setting-desc">Target folder on the server</div></div>
+            <input class="input" name="ftp.remote_path" value="${get('ftp.remote_path')||''}" placeholder="/public_html" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Local dist path</div><div class="setting-desc">Absolute path to your Astro <code style="font-family:var(--mono);font-size:10px;background:var(--bg3);padding:1px 5px;border-radius:3px">dist/</code> folder on this machine</div></div>
+            <input class="input" name="ftp.local_path" value="${get('ftp.local_path')||''}" placeholder="/Users/me/my-site/dist" />
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-label">Auto-deploy after build</div><div class="setting-desc">Upload via FTP automatically after a successful build webhook</div></div>
+            <input type="checkbox" name="ftp.auto_deploy" value="1" ${get('ftp.auto_deploy')==='1'?'checked':''} style="accent-color:var(--accent);width:14px;height:14px;" />
+          </div>
+          <div class="save-row" style="justify-content:flex-start;gap:14px">
+            <button type="button" class="btn btn-ghost" id="ftp-test-btn">Test connection</button>
+            <span id="ftp-test-result" style="font-size:11px;color:var(--muted)"></span>
+          </div>
+        </div>
+
         </div><!-- /settings-grid -->
       </form>
 
@@ -759,6 +799,14 @@
         ['email.notify_to',          fd.get('email.notify_to')],
         ['email.notify_publish',     fd.get('email.notify_publish') ? '1' : '0'],
         ['email.notify_comment',     fd.get('email.notify_comment') ? '1' : '0'],
+        ['ftp.host',        fd.get('ftp.host')],
+        ['ftp.port',        fd.get('ftp.port')],
+        ['ftp.user',        fd.get('ftp.user')],
+        ['ftp.password',    fd.get('ftp.password')],
+        ['ftp.secure',      fd.get('ftp.secure') ? '1' : '0'],
+        ['ftp.remote_path', fd.get('ftp.remote_path')],
+        ['ftp.local_path',  fd.get('ftp.local_path')],
+        ['ftp.auto_deploy', fd.get('ftp.auto_deploy') ? '1' : '0'],
       ]);
       showBanner('site-banner','banner-ok','Settings saved');
     });
@@ -831,6 +879,18 @@
       });
     });
 
+    // FTP test connection
+    document.getElementById('ftp-test-btn')?.addEventListener('click', async () => {
+      const btn = document.getElementById('ftp-test-btn');
+      const res = document.getElementById('ftp-test-result');
+      btn.disabled = true; btn.textContent = 'Testing…'; res.textContent = '';
+      const r = await fetch('/api/deploy/ftp/test', { method: 'POST', credentials: 'include' });
+      const j = await r.json();
+      btn.disabled = false; btn.textContent = 'Test connection';
+      if (r.ok) { res.style.color = 'var(--jade)'; res.textContent = `✓ Connected — ${j.files} files in ${j.path}`; }
+      else       { res.style.color = 'var(--red)';  res.textContent = `✕ ${j.error}`; }
+    });
+
     // Password form (with confirm validation)
     document.getElementById('pw-form').addEventListener('submit', async e => {
       e.preventDefault();

package/src/routes/build.js

@@ -1,5 +1,6 @@
 import { Hono } from 'hono';
 import { openPod } from '@a83/orbiter-core';
+import { runFtpDeploy } from './deploy.js';
 
 export const buildRoutes = new Hono();
 
@@ -12,6 +13,12 @@ buildRoutes.post('/trigger', async (c) => {
 
   const res = await fetch(url, { method: 'POST' }).catch(e => ({ ok: false, status: 0, err: e.message }));
   if (!res.ok) return c.json({ error: `Webhook returned ${res.status}` }, 502);
+
+  const db2 = openPod(c.get('podPath'));
+  const autoDeploy = db2.getMeta('ftp.auto_deploy') === '1';
+  db2.close();
+  if (autoDeploy) runFtpDeploy(c.get('podPath')).catch(e => console.warn('[ftp-auto-deploy]', e.message));
+
   return c.json({ ok: true });
 });
 

package/src/routes/deploy.js

@@ -0,0 +1,94 @@
+import { Hono } from 'hono';
+import { Client } from 'basic-ftp';
+import { existsSync } from 'node:fs';
+import { openPod } from '@a83/orbiter-core';
+
+export const deployRoutes = new Hono();
+
+async function getFtpCfg(podPath) {
+  const db = openPod(podPath);
+  const cfg = {
+    host:       db.getMeta('ftp.host')        ?? '',
+    port:       parseInt(db.getMeta('ftp.port') ?? '21', 10),
+    user:       db.getMeta('ftp.user')        ?? '',
+    password:   db.getMeta('ftp.password')    ?? '',
+    remotePath: db.getMeta('ftp.remote_path') ?? '/',
+    localPath:  db.getMeta('ftp.local_path')  ?? '',
+    secure:     db.getMeta('ftp.secure')      === '1',
+  };
+  db.close();
+  return cfg;
+}
+
+export async function runFtpDeploy(podPath) {
+  const cfg = await getFtpCfg(podPath);
+  if (!cfg.host || !cfg.user || !cfg.password || !cfg.localPath) {
+    throw new Error('FTP not fully configured');
+  }
+  if (!existsSync(cfg.localPath)) {
+    throw new Error(`Local path not found: ${cfg.localPath}`);
+  }
+
+  const client = new Client();
+  client.ftp.verbose = false;
+  try {
+    await client.access({ host: cfg.host, port: cfg.port, user: cfg.user, password: cfg.password, secure: cfg.secure });
+    await client.uploadFromDir(cfg.localPath, cfg.remotePath || '/');
+
+    const db = openPod(podPath);
+    db.setMeta('ftp.last_deploy', new Date().toISOString());
+    db.setMeta('ftp.last_status', 'ok');
+    db.setMeta('ftp.last_error',  '');
+    db.close();
+  } finally {
+    client.close();
+  }
+}
+
+// GET /api/deploy/ftp/status
+deployRoutes.get('/ftp/status', (c) => {
+  const db = openPod(c.get('podPath'));
+  const out = {
+    configured: !!(db.getMeta('ftp.host') && db.getMeta('ftp.user') && db.getMeta('ftp.password') && db.getMeta('ftp.local_path')),
+    lastDeploy: db.getMeta('ftp.last_deploy') ?? null,
+    lastStatus: db.getMeta('ftp.last_status') ?? null,
+    lastError:  db.getMeta('ftp.last_error')  ?? null,
+    autoDeploy: db.getMeta('ftp.auto_deploy') === '1',
+  };
+  db.close();
+  return c.json(out);
+});
+
+// POST /api/deploy/ftp — run full deploy
+deployRoutes.post('/ftp', async (c) => {
+  try {
+    await runFtpDeploy(c.get('podPath'));
+    return c.json({ ok: true });
+  } catch (err) {
+    const db = openPod(c.get('podPath'));
+    db.setMeta('ftp.last_status', 'error');
+    db.setMeta('ftp.last_error',  err.message);
+    db.close();
+    return c.json({ error: err.message }, 502);
+  }
+});
+
+// POST /api/deploy/ftp/test — test connection only, no upload
+deployRoutes.post('/ftp/test', async (c) => {
+  const cfg = await getFtpCfg(c.get('podPath'));
+  if (!cfg.host || !cfg.user || !cfg.password) {
+    return c.json({ error: 'FTP credentials not configured — save settings first' }, 400);
+  }
+
+  const client = new Client();
+  client.ftp.verbose = false;
+  try {
+    await client.access({ host: cfg.host, port: cfg.port, user: cfg.user, password: cfg.password, secure: cfg.secure });
+    const list = await client.list(cfg.remotePath || '/');
+    return c.json({ ok: true, files: list.length, path: cfg.remotePath || '/' });
+  } catch (err) {
+    return c.json({ error: err.message }, 502);
+  } finally {
+    client.close();
+  }
+});

package/src/routes/meta.js

@@ -17,6 +17,8 @@ const ALLOWED_KEYS = [
   'format_version',
   'email.smtp_host', 'email.smtp_port', 'email.smtp_user', 'email.smtp_pass',
   'email.smtp_from', 'email.notify_publish', 'email.notify_comment', 'email.notify_to',
+  'ftp.host', 'ftp.port', 'ftp.user', 'ftp.password',
+  'ftp.remote_path', 'ftp.local_path', 'ftp.secure', 'ftp.auto_deploy',
 ];
 
 const PREVIEW_URL_RE = /^preview_url\.[a-z0-9_-]+$/;

package/src/server.js

@@ -25,6 +25,7 @@ import { importRoutes }     from './routes/import.js';
 import { commentRoutes }    from './routes/comments.js';
 import { lockRoutes }       from './routes/locks.js';
 import { terminalRoutes }   from './routes/terminal.js';
+import { deployRoutes }     from './routes/deploy.js';
 import { requireAuth }      from './middleware/auth.js';
 import { csrfMiddleware }  from './middleware/csrf.js';
 
@@ -80,6 +81,7 @@ export function createApp(podPath) {
   api.route('/',             commentRoutes);
   api.route('/locks',        lockRoutes);
   api.route('/terminal',     terminalRoutes);
+  api.route('/deploy',       deployRoutes);
 
   app.route('/api', api);