agim-cli 1.1.6 → 1.1.8

package/dist/core/viewer-config.js

@@ -4,6 +4,7 @@
 // base URL + an enable flag), and the defaults handle everything else. No
 // JSON-config schema dance, no on-disk state — change env, restart, done.
 import { DEFAULT_THRESHOLDS } from './render-router.js';
+import { getCurrentTunnelUrl } from './tunnel.js';
 function parsePositiveInt(raw, fallback) {
     if (!raw)
         return fallback;
@@ -14,9 +15,12 @@ export function getViewerConfig() {
     const enabledRaw = (process.env.IMHUB_VIEWER_ENABLED || '').toLowerCase();
     const enabled = enabledRaw === '1' || enabledRaw === 'true' || enabledRaw === 'yes';
     const publicBaseUrl = (process.env.IMHUB_VIEWER_PUBLIC_BASE_URL || '').replace(/\/$/, '');
+    const tunnelModeRaw = (process.env.IMHUB_VIEWER_TUNNEL_MODE || 'off').toLowerCase();
+    const tunnelMode = tunnelModeRaw === 'quick' ? 'quick' : 'off';
     return {
         enabled,
         publicBaseUrl,
+        tunnelMode,
         thresholds: {
             chars: parsePositiveInt(process.env.IMHUB_VIEWER_CHARS, DEFAULT_THRESHOLDS.chars),
             lines: parsePositiveInt(process.env.IMHUB_VIEWER_LINES, DEFAULT_THRESHOLDS.lines),
@@ -24,14 +28,32 @@ export function getViewerConfig() {
         },
     };
 }
+/**
+ * Resolve the effective public base URL. Order of preference:
+ *   1. Explicit IMHUB_VIEWER_PUBLIC_BASE_URL (operator-managed reverse proxy)
+ *   2. Auto-tunnel URL if tunnel_mode=quick and cloudflared has acquired a URL
+ *   3. Caller-supplied fallback
+ *
+ * Returns empty string when nothing usable is available.
+ */
+export function getEffectivePublicBaseUrl(fallback) {
+    const cfg = getViewerConfig();
+    if (cfg.publicBaseUrl)
+        return cfg.publicBaseUrl;
+    if (cfg.tunnelMode === 'quick') {
+        const tu = getCurrentTunnelUrl();
+        if (tu)
+            return tu;
+    }
+    return (fallback || '').replace(/\/$/, '');
+}
 /**
  * Build the URL placed in the IM reply for a saved paste. Returns null if
  * no public base URL is configured AND no fallback was provided. Caller
  * should treat null as "viewer can't produce a usable link — degrade".
  */
 export function buildPasteUrl(id, fallbackBaseUrl) {
-    const cfg = getViewerConfig();
-    const base = cfg.publicBaseUrl || fallbackBaseUrl || '';
+    const base = getEffectivePublicBaseUrl(fallbackBaseUrl);
     if (!base)
         return null;
     return `${base.replace(/\/$/, '')}/v/${id}`;

package/dist/core/viewer-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewer-config.js","sourceRoot":"","sources":["../../src/core/viewer-config.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,EAAE;AACF,4EAA4E;AAC5E,0EAA0E;AAC1E,0EAA0E;AAE1E,OAAO,EAAE,kBAAkB,EAAyB,MAAM,oBAAoB,CAAA;AAgB9E,SAAS,gBAAgB,CAAC,GAAuB,EAAE,QAAgB;IACjE,IAAI,CAAC,GAAG;QAAE,OAAO,QAAQ,CAAA;IACzB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IACzE,MAAM,OAAO,GAAG,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,KAAK,CAAA;IACnF,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACzF,OAAO;QACL,OAAO;QACP,aAAa;QACb,UAAU,EAAE;YACV,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC;YACjF,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC;YACjF,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,kBAAkB,CAAC,SAAS,CAAC;SAC/F;KACF,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,EAAU,EAAE,eAAwB;IAChE,MAAM,GAAG,GAAG,eAAe,EAAE,CAAA;IAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,IAAI,eAAe,IAAI,EAAE,CAAA;IACvD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAA;AAC7C,CAAC"}
+{"version":3,"file":"viewer-config.js","sourceRoot":"","sources":["../../src/core/viewer-config.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,EAAE;AACF,4EAA4E;AAC5E,0EAA0E;AAC1E,0EAA0E;AAE1E,OAAO,EAAE,kBAAkB,EAAyB,MAAM,oBAAoB,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAyBjD,SAAS,gBAAgB,CAAC,GAAuB,EAAE,QAAgB;IACjE,IAAI,CAAC,GAAG;QAAE,OAAO,QAAQ,CAAA;IACzB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IACzE,MAAM,OAAO,GAAG,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,KAAK,CAAA;IACnF,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACzF,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;IACnF,MAAM,UAAU,GAAqB,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;IAChF,OAAO;QACL,OAAO;QACP,aAAa;QACb,UAAU;QACV,UAAU,EAAE;YACV,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC;YACjF,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC;YACjF,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,kBAAkB,CAAC,SAAS,CAAC;SAC/F;KACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAAiB;IACzD,MAAM,GAAG,GAAG,eAAe,EAAE,CAAA;IAC7B,IAAI,GAAG,CAAC,aAAa;QAAE,OAAO,GAAG,CAAC,aAAa,CAAA;IAC/C,IAAI,GAAG,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;QAC/B,MAAM,EAAE,GAAG,mBAAmB,EAAE,CAAA;QAChC,IAAI,EAAE;YAAE,OAAO,EAAE,CAAA;IACnB,CAAC;IACD,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC5C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,EAAU,EAAE,eAAwB;IAChE,MAAM,IAAI,GAAG,yBAAyB,CAAC,eAAe,CAAC,CAAA;IACvD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAA;AAC7C,CAAC"}

package/dist/web/public/settings.html

@@ -168,6 +168,16 @@
         viewerSaved: 'Saved — change takes effect on the next reply.',
         viewerSaveFailed: 'Failed to save viewer settings',
         viewerMissingUrl: '⚠️ Public URL is empty — Agim will fall back to inline text for long replies (no link can be built).',
+        viewerTunnelMode: 'Auto-tunnel (cloudflared)',
+        viewerTunnelHint: 'For users without a public domain. Agim launches a cloudflared quick tunnel on startup and auto-detects a temporary `*.trycloudflare.com` URL. Requires the `cloudflared` binary to be installed (`brew install cloudflared` / `apt install cloudflared`). URL changes per restart — old paste links die. Leave off when you have a static reverse proxy.',
+        viewerTunnelOff: 'Off (use Public URL above)',
+        viewerTunnelQuick: 'Quick tunnel (temporary URL, no domain needed)',
+        viewerTunnelStatus: 'Tunnel status',
+        viewerTunnelRunning: 'Running',
+        viewerTunnelNotRunning: 'Not running',
+        viewerTunnelBinaryMissing: 'cloudflared not installed',
+        viewerTunnelCurrentUrl: 'Current URL',
+        viewerTunnelRefresh: 'Refresh',
       },
       zh: {
         title: 'Agim — 设置',
@@ -322,6 +332,16 @@
         viewerSaved: '已保存 — 下一条回复生效。',
         viewerSaveFailed: '保存 Viewer 配置失败',
         viewerMissingUrl: '⚠️ 公网域名为空 — 长回复将退回到内联文本（无法构造跳转链接）。',
+        viewerTunnelMode: '自动 tunnel（cloudflared）',
+        viewerTunnelHint: '给没有公网域名的用户。Agim 启动时自动拉起 cloudflared quick tunnel，拿一个临时 `*.trycloudflare.com` URL。需要先装 `cloudflared`（`brew install cloudflared` / `apt install cloudflared`）。**重启后 URL 会变，旧 paste 链接打不开**。有反代域名的话保持关闭即可。',
+        viewerTunnelOff: '关闭（用上面的公网域名）',
+        viewerTunnelQuick: 'Quick tunnel（临时 URL，无需域名）',
+        viewerTunnelStatus: 'Tunnel 状态',
+        viewerTunnelRunning: '运行中',
+        viewerTunnelNotRunning: '未运行',
+        viewerTunnelBinaryMissing: '未安装 cloudflared',
+        viewerTunnelCurrentUrl: '当前 URL',
+        viewerTunnelRefresh: '刷新',
       },
     };
     function t(key) { return T[window.__lang][key] || T.en[key] || key; }
@@ -1419,6 +1439,18 @@
           <input type="text" id="viewerPublicUrl" placeholder="https://agim.example.com" style="max-width:480px" />
           <p class="muted" style="margin-top:4px;font-size:12px">${t('viewerPublicUrlHint')}</p>
 
+          <label style="margin-top:12px;display:block">${t('viewerTunnelMode')}</label>
+          <select id="viewerTunnelMode" style="max-width:480px">
+            <option value="off">${t('viewerTunnelOff')}</option>
+            <option value="quick">${t('viewerTunnelQuick')}</option>
+          </select>
+          <p class="muted" style="margin-top:4px;font-size:12px">${t('viewerTunnelHint')}</p>
+          <div id="viewerTunnelStatusBox" style="margin-top:6px;padding:8px 10px;border:1px solid var(--border, #d0d7de);border-radius:6px;font-size:12px;display:none">
+            <div><strong>${t('viewerTunnelStatus')}:</strong> <span id="viewerTunnelState">—</span></div>
+            <div style="margin-top:4px"><strong>${t('viewerTunnelCurrentUrl')}:</strong> <code id="viewerTunnelCurrentUrl" style="word-break:break-all">—</code></div>
+            <button type="button" class="btn" id="viewerTunnelRefreshBtn" style="margin-top:6px;padding:4px 10px;font-size:12px">${t('viewerTunnelRefresh')}</button>
+          </div>
+
           <div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(160px,1fr));gap:12px;margin-top:12px;max-width:720px">
             <div>
               <label>${t('viewerChars')}</label>
@@ -1462,6 +1494,32 @@
       `;
     }
 
+    async function refreshViewerTunnelStatus() {
+      const stateEl = document.getElementById('viewerTunnelState');
+      const urlEl = document.getElementById('viewerTunnelCurrentUrl');
+      if (!stateEl || !urlEl) return;
+      stateEl.textContent = '…';
+      urlEl.textContent = '—';
+      try {
+        const data = await authFetch('/api/viewer/tunnel').then(r => r.json());
+        const tun = data && data.tunnel ? data.tunnel : {};
+        if (!tun.binaryFound) {
+          stateEl.textContent = t('viewerTunnelBinaryMissing');
+          stateEl.style.color = '#c0392b';
+        } else if (tun.running) {
+          stateEl.textContent = '✓ ' + t('viewerTunnelRunning');
+          stateEl.style.color = '#16a34a';
+        } else {
+          stateEl.textContent = t('viewerTunnelNotRunning');
+          stateEl.style.color = '';
+        }
+        urlEl.textContent = tun.url || (data && data.effectivePublicUrl) || '—';
+      } catch (err) {
+        stateEl.textContent = 'error';
+        urlEl.textContent = (err && err.message) || String(err);
+      }
+    }
+
     async function loadEnvSection(reveal) {
       try {
         const url = reveal ? '/api/env?reveal=1' : '/api/env';
@@ -1490,6 +1548,16 @@
         set('viewerLines', 'IMHUB_VIEWER_LINES');
         set('viewerCodeLines', 'IMHUB_VIEWER_CODE_LINES');
         set('viewerMaxPastes', 'IMHUB_VIEWER_MAX_PASTES');
+        const vTunnelMode = document.getElementById('viewerTunnelMode');
+        if (vTunnelMode) {
+          vTunnelMode.value = (env['IMHUB_VIEWER_TUNNEL_MODE'] || 'off').toLowerCase() === 'quick' ? 'quick' : 'off';
+        }
+        // Show tunnel status panel only when tunnel mode = quick.
+        const tunnelBox = document.getElementById('viewerTunnelStatusBox');
+        if (tunnelBox) {
+          tunnelBox.style.display = (vTunnelMode && vTunnelMode.value === 'quick') ? 'block' : 'none';
+          if (vTunnelMode && vTunnelMode.value === 'quick') void refreshViewerTunnelStatus();
+        }
         const viewerStatus = document.getElementById('viewerStatus');
         if (viewerStatus) {
           if (!env['IMHUB_VIEWER_PUBLIC_BASE_URL']) {
@@ -1801,6 +1869,13 @@
       });
       document.getElementById('revealBaidu')?.addEventListener('click', () => loadEnvSection(true));
 
+      // Tunnel mode dropdown — show/hide status panel on change.
+      document.getElementById('viewerTunnelMode')?.addEventListener('change', (e) => {
+        const box = document.getElementById('viewerTunnelStatusBox');
+        if (box) box.style.display = e.target.value === 'quick' ? 'block' : 'none';
+      });
+      document.getElementById('viewerTunnelRefreshBtn')?.addEventListener('click', () => refreshViewerTunnelStatus());
+
       // Viewer card — save toggle + URL + thresholds in one round-trip.
       document.getElementById('saveViewer')?.addEventListener('click', async () => {
         const enabled = document.getElementById('viewerEnabled')?.checked ? '1' : '0';
@@ -1809,6 +1884,7 @@
         const lines = (document.getElementById('viewerLines')?.value || '').trim();
         const codeLines = (document.getElementById('viewerCodeLines')?.value || '').trim();
         const maxPastes = (document.getElementById('viewerMaxPastes')?.value || '').trim();
+        const tunnelMode = document.getElementById('viewerTunnelMode')?.value || 'off';
         const status = document.getElementById('viewerStatus');
         try {
           await authFetch('/api/env', {
@@ -1822,6 +1898,7 @@
                 IMHUB_VIEWER_LINES: lines || null,
                 IMHUB_VIEWER_CODE_LINES: codeLines || null,
                 IMHUB_VIEWER_MAX_PASTES: maxPastes || null,
+                IMHUB_VIEWER_TUNNEL_MODE: tunnelMode || 'off',
               },
             }),
           });

package/dist/web/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/web/server.ts"],"names":[],"mappings":"AAsDA,wBAAgB,iBAAiB,IAAI,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAOrE;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CA+rB/C"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/web/server.ts"],"names":[],"mappings":"AAsDA,wBAAgB,iBAAiB,IAAI,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAOrE;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAksB/C"}

package/dist/web/server.js

@@ -412,6 +412,9 @@ export async function startWebServer(options) {
         if (url.pathname === '/api/viewer' && req.method === 'GET') {
             return handleViewerList(req, res, url);
         }
+        if (url.pathname === '/api/viewer/tunnel' && req.method === 'GET') {
+            return handleViewerTunnelStatus(req, res);
+        }
         const viewerIdMatch = url.pathname.match(/^\/api\/viewer\/([0-9a-f-]{8,})$/i);
         if (viewerIdMatch && req.method === 'GET') {
             return handleViewerGet(req, res, viewerIdMatch[1]);
@@ -1640,6 +1643,7 @@ const ENV_EDITABLE_KEYS = [
     'IMHUB_VIEWER_LINES',
     'IMHUB_VIEWER_CODE_LINES',
     'IMHUB_VIEWER_MAX_PASTES',
+    'IMHUB_VIEWER_TUNNEL_MODE',
 ];
 const SECRET_KEYS = new Set(['IMHUB_SMTP_PASS', 'IMHUB_BAIDU_MAP_AK']);
 function maskSecret(v) {
@@ -2786,6 +2790,19 @@ async function handleViewerDelete(_req, res, id) {
     }
     sendJson(res, 200, { ok: true });
 }
+async function handleViewerTunnelStatus(_req, res) {
+    const { getTunnelStatus } = await import('../core/tunnel.js');
+    const { getViewerConfig, getEffectivePublicBaseUrl } = await import('../core/viewer-config.js');
+    const cfg = getViewerConfig();
+    const tunnel = getTunnelStatus();
+    sendJson(res, 200, {
+        enabled: cfg.enabled,
+        tunnelMode: cfg.tunnelMode,
+        staticPublicUrl: cfg.publicBaseUrl,
+        effectivePublicUrl: getEffectivePublicBaseUrl(),
+        tunnel,
+    });
+}
 // ============================================
 // WebSocket chat handlers
 // ============================================