docnest 0.1.12 → 0.1.14

package/README.md

@@ -78,6 +78,8 @@ export default defineConfig({
   auth: {
     enabled: true,
     passphrase: '请替换为项目自己的长口令',
+    // 服务通过反向代理挂载在子路径时填写，例如 /documents；默认跳转到 /。
+    redirectPrefix: '',
     stateFile: '.docnest/auth.json',
     localStorageKey: 'my-project:auth-passphrase',
     sessionTtlMinutes: 24 * 60,
@@ -91,6 +93,8 @@ export default defineConfig({
 `localStorageKey` 可选，用于为不同宿主项目隔离浏览器存储键。内置授权不提供“修改口令”或“退出”按钮；需要更换口令时，停止服务、删除 `stateFile`，修改配置中的 `passphrase` 后重新启动。
 建议把 `.docnest/` 加入宿主项目的 `.gitignore`，并为口令状态文件设置仅当前用户可读写的权限。
 
+如果 DocNest 由反向代理挂载在 `/documents/` 等子路径下，将 `auth.redirectPrefix` 配置为 `/documents`。登录页会把原始文档目标写成带此前缀的路径，口令登录后的服务端跳转也会使用同一前缀；不配置时保持跳转到 `/` 的默认行为。
+
 授权开启但既没有状态文件，也没有初始 `passphrase` 时，DocNest 会拒绝启动，避免意外以空口令开放文档。
 
 如需显式指定端口、文档目录或监听地址：
@@ -136,3 +140,16 @@ npm run pack:check
 ```
 
 最低支持 Node.js 20，验证 Node.js 20 和 22。
+
+## 发布规范
+
+DocNest 的 GitHub Release 和 npm 发布统一由 GitHub Actions 完成，不在本地直接执行 `npm publish`。
+
+发布新版本时：
+
+1. 更新 `package.json` 和 `package-lock.json` 的版本号，并运行 `npm test` 与 `npm run pack:check`。
+2. 将版本提交推送到 `main`。
+3. 在 `main` 上创建与包版本一致的标签，例如 `v0.1.13`。
+4. 推送该标签：`git push origin v0.1.13`。
+
+标签推送后，`.github/workflows/publish.yml` 会校验标签与包版本一致，使用 npm OIDC 发布公开包，并自动创建名为 `DocNest v0.1.13` 的 GitHub Release。远程仓库只保留 `main` 分支，发布标签不需要推送临时开发分支。

package/dist/config.d.ts

@@ -28,6 +28,11 @@ export type DocNestConfig = {
     auth?: {
         enabled?: boolean;
         passphrase?: string;
+        /**
+         * Prefix to add to authentication return targets when the service is
+         * mounted below a reverse-proxy path, for example `/documents`.
+         */
+        redirectPrefix?: string;
         stateFile?: string;
         localStorageKey?: string;
         sessionTtlMinutes?: number;
@@ -49,6 +54,7 @@ export type ResolvedDocNestConfig = Required<DocNestConfig> & {
     auth: {
         enabled: boolean;
         passphrase: string;
+        redirectPrefix: string;
         stateFile: string;
         localStorageKey: string;
         sessionTtlMinutes: number;

package/dist/config.js

@@ -45,6 +45,20 @@ function normalizePositiveNumber(value, fallback) {
     const normalized = Number(value);
     return Number.isFinite(normalized) && normalized > 0 ? normalized : fallback;
 }
+function normalizeRedirectPrefix(value) {
+    if (typeof value !== 'string')
+        return '';
+    const normalized = value.trim();
+    if (!normalized ||
+        normalized === '/' ||
+        !normalized.startsWith('/') ||
+        normalized.startsWith('//') ||
+        normalized.includes('//') ||
+        normalized.includes('\\') ||
+        /[\r\n?#]/.test(normalized))
+        return '';
+    return normalized.replace(/\/+$/, '') || '';
+}
 function normalizeThemeName(value) {
     if (value === 'current-docs')
         return 'slate-modern';
@@ -113,6 +127,7 @@ async function loadConfig(projectRoot = process.cwd()) {
         auth: {
             enabled: auth.enabled ?? false,
             passphrase: typeof auth.passphrase === 'string' ? auth.passphrase : '',
+            redirectPrefix: normalizeRedirectPrefix(auth.redirectPrefix),
             stateFile: node_path_1.default.resolve(projectRoot, auth.stateFile?.trim() || '.docnest/auth.json'),
             localStorageKey: authLocalStorageKey,
             sessionTtlMinutes: normalizePositiveNumber(auth.sessionTtlMinutes, 24 * 60),

package/dist/server.js

@@ -280,6 +280,17 @@ function safeNextPath(value) {
         return '/';
     return value;
 }
+function authRedirectTarget(value) {
+    const nextPath = safeNextPath(value);
+    const prefix = typeof AUTH_CONFIG.redirectPrefix === 'string' ? AUTH_CONFIG.redirectPrefix : '';
+    if (!prefix ||
+        nextPath === prefix ||
+        nextPath.startsWith(`${prefix}/`) ||
+        nextPath.startsWith(`${prefix}?`) ||
+        nextPath.startsWith(`${prefix}#`))
+        return nextPath;
+    return nextPath === '/' ? `${prefix}/` : `${prefix}${nextPath}`;
+}
 function setAuthCookie(res, token) {
     const maxAge = AUTH_MANAGER.sessionMaxAgeSeconds;
     res.setHeader('Set-Cookie', `${AUTH_MANAGER.sessionCookieName}=${encodeURIComponent(token)}; Max-Age=${maxAge}; Path=/; HttpOnly; SameSite=Lax`);
@@ -292,7 +303,7 @@ function wantsJson(req) {
 }
 function renderLoginPage(res, nextPath, error, status = 200) {
     return res.status(status).render('login', {
-        nextPath: safeNextPath(nextPath),
+        nextPath: authRedirectTarget(nextPath),
         error: error || '',
         assetVersion: ASSET_VERSION,
     });
@@ -316,7 +327,7 @@ app.post('/auth/verify', (req, res) => {
 app.post('/auth/login', (req, res) => {
     if (!BUILT_IN_AUTH_ENABLED)
         return res.redirect('/');
-    const nextPath = safeNextPath(req.body?.next);
+    const nextPath = authRedirectTarget(req.body?.next);
     const token = AUTH_MANAGER.createSession(String(req.body?.passphrase || ''));
     if (!token)
         return renderLoginPage(res, nextPath, '口令不正确，请重试。', 401);

package/docnest.config.example.mjs

@@ -36,6 +36,8 @@ export default defineConfig({
     enabled: false,
     // 仅首次启动且授权状态文件不存在时使用；更换口令需手动删除状态文件后重启。
     passphrase: '',
+    // 通过反向代理挂载在子路径时，为登录成功后的目标补此前缀；默认空值跳转到根路径。
+    redirectPrefix: '',
     stateFile: '.docnest/auth.json',
     // 前端 localStorage 的键；口令会永久保存在浏览器本地，直到手动清除或口令失效。
     localStorageKey: 'my-project:auth-passphrase',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docnest",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "可复用的本地 Markdown 文档中心",
   "repository": {
     "type": "git",

package/server/static/css/styles.css

@@ -522,6 +522,7 @@ body[data-theme="dark"] .dir-toggle.active {
 /* 主内容区 - 白底、留白 */
 .main-content {
   flex: 1;
+  min-width: 0;
   overflow-y: auto;
   overflow-x: hidden;
   padding: 2rem 2.5rem;
@@ -535,6 +536,7 @@ body[data-theme="dark"] .dir-toggle.active {
   align-items: flex-start;
   gap: 24px;
   width: min(1400px, 100%);
+  min-width: 0;
   margin: 0 auto;
 }
 
@@ -1032,7 +1034,8 @@ body[data-theme="dark"] .dir-toggle.active {
 /* Markdown 内容 - 限宽、舒适行距；普通显示器上更宽，超宽屏用 92% 避免单行过长 */
 .markdown-body {
   flex: 1;
-  width: min(1024px, 100%);
+  min-width: 0;
+  width: min(var(--doc-reading-width, 1024px), 100%);
   max-width: 100%;
   margin: 0;
   box-sizing: border-box;
@@ -1050,7 +1053,7 @@ body[data-theme="dark"] .dir-toggle.active {
   }
 
   .doc-layout {
-    width: min(1024px, 100%);
+    width: min(var(--doc-reading-width, 1024px), 100%);
   }
 }
 
@@ -1254,6 +1257,9 @@ body[data-theme="dark"] .not-found-path {
   text-align: center;
   background: var(--linear-bg-subtle);
   padding: 16px;
+  min-width: 0;
+  max-width: 100%;
+  box-sizing: border-box;
   border-radius: var(--linear-radius);
   border: 1px solid var(--linear-border);
   overflow-x: auto;
@@ -1301,9 +1307,12 @@ body[data-theme="dark"] .markdown-body .mermaid::after {
 
 /* 确保 Mermaid SVG 正确显示 */
 .markdown-body .mermaid svg {
-  max-width: 100%;
-  height: auto;
+  width: 100% !important;
+  max-width: 100% !important;
+  min-width: 0 !important;
+  height: auto !important;
   display: block;
+  margin: 0 auto;
 }
 
 /* Mermaid 下载按钮 */
@@ -2079,7 +2088,7 @@ body[data-theme="dark"] .tree-nav::-webkit-scrollbar-thumb:hover {
   .markdown-body .mermaid svg {
     max-width: 100% !important;
     max-height: 75vh !important; /* 高流程图缩放到单页内 */
-    width: auto !important;
+    width: 100% !important;
     height: auto !important;
     display: block !important;
     margin: 0 auto !important;

package/server/static/css/themes.css

@@ -2,8 +2,9 @@
  * DocNest theme profiles
  *
  * One semantic DOM, five visual systems. The original DocNest rules remain
- * the Slate Modern baseline; this file owns theme tokens and deliberate layout
- * variations without forking templates or client behavior.
+ * the Slate Modern baseline for page geometry (main-content padding,
+ * doc-layout max-width/gap, markdown reading width). This file owns theme
+ * tokens and visual character without forking templates or client behavior.
  */
 
 :root {
@@ -19,6 +20,7 @@
   --doc-code-bg: #f6f7f8;
   --doc-code-text: #24262b;
   --doc-header-height: auto;
+  /* Shared with Slate Modern; theme profiles must not override page geometry. */
   --doc-reading-width: 1024px;
 }
 
@@ -405,7 +407,6 @@ body[data-doc-theme="editorial-atlas"] {
     "Microsoft YaHei", sans-serif;
   --doc-font-reading: "Songti SC", SimSun, "Noto Serif CJK SC", serif;
   --doc-font-display: "Songti SC", SimSun, "Noto Serif CJK SC", serif;
-  --doc-reading-width: 860px;
 }
 
 body[data-doc-theme="editorial-atlas"][data-theme="dark"] {
@@ -452,18 +453,7 @@ body[data-doc-theme="editorial-atlas"] .sidebar {
   border-right-color: var(--doc-rule-strong);
 }
 
-body[data-doc-theme="editorial-atlas"] .main-content {
-  padding: clamp(2rem, 4vw, 4.75rem) clamp(1.5rem, 5vw, 5.5rem);
-  background: var(--linear-bg);
-}
-
-body[data-doc-theme="editorial-atlas"] .doc-layout {
-  width: min(1240px, 100%);
-  gap: 42px;
-}
-
 body[data-doc-theme="editorial-atlas"] .markdown-body {
-  width: min(var(--doc-reading-width), 100%);
   background: transparent;
   font-size: 1rem;
   line-height: 1.9;
@@ -520,7 +510,6 @@ body[data-doc-theme="precision-index"] {
     "Microsoft YaHei", sans-serif;
   --doc-font-reading: var(--doc-font-ui);
   --doc-font-display: var(--doc-font-ui);
-  --doc-reading-width: 980px;
 }
 
 body[data-doc-theme="precision-index"][data-theme="dark"] {
@@ -597,28 +586,17 @@ body[data-doc-theme="precision-index"] .file-link.active {
   background: var(--doc-surface-raised);
 }
 
-body[data-doc-theme="precision-index"] .main-content {
-  padding: 0;
-  background: var(--linear-bg);
-}
-
 body[data-doc-theme="precision-index"] .breadcrumbs {
-  margin: 0;
-  padding: 0.75rem 1.5rem;
   border-bottom: 1px solid var(--doc-rule-strong);
   background: var(--linear-bg-subtle);
   font-size: 0.6875rem;
 }
 
 body[data-doc-theme="precision-index"] .doc-layout {
-  width: 100%;
-  gap: 0;
   background: var(--doc-surface-raised);
 }
 
 body[data-doc-theme="precision-index"] .markdown-body {
-  width: min(var(--doc-reading-width), 100%);
-  padding: clamp(2.5rem, 5vw, 5rem);
   border-right: 1px solid var(--doc-rule-strong);
   font-size: 0.9rem;
   line-height: 1.75;
@@ -651,11 +629,6 @@ body[data-doc-theme="precision-index"] .markdown-body h2 {
 }
 
 body[data-doc-theme="precision-index"] .doc-toc {
-  top: 0;
-  width: 216px;
-  flex-basis: 216px;
-  max-height: calc(100vh - 54px);
-  padding: 1.25rem;
   border: 0;
   border-radius: 0;
   background: var(--linear-bg-subtle);
@@ -666,12 +639,6 @@ body[data-doc-theme="precision-index"] .doc-toc-title {
   text-transform: uppercase;
 }
 
-body[data-doc-theme="precision-index"] .dir-listing-page,
-body[data-doc-theme="precision-index"] .welcome {
-  margin: 0;
-  padding: clamp(2rem, 5vw, 5rem);
-}
-
 /* Theme 04: Archive Room */
 body[data-doc-theme="archive-room"] {
   --linear-bg: #f3efe4;
@@ -693,7 +660,6 @@ body[data-doc-theme="archive-room"] {
     "Microsoft YaHei", sans-serif;
   --doc-font-reading: "Songti SC", SimSun, "Noto Serif CJK SC", serif;
   --doc-font-display: "Songti SC", SimSun, "Noto Serif CJK SC", serif;
-  --doc-reading-width: 900px;
 }
 
 body[data-doc-theme="archive-room"][data-theme="dark"] {
@@ -761,7 +727,6 @@ body[data-doc-theme="archive-room"][data-theme="dark"] .file-link.active {
 }
 
 body[data-doc-theme="archive-room"] .main-content {
-  padding: clamp(2rem, 4vw, 4.5rem);
   background-color: var(--linear-bg);
   background-image:
     linear-gradient(rgba(93, 96, 85, 0.045) 1px, transparent 1px),
@@ -769,14 +734,8 @@ body[data-doc-theme="archive-room"] .main-content {
   background-size: 24px 24px;
 }
 
-body[data-doc-theme="archive-room"] .doc-layout {
-  width: min(1280px, 100%);
-  gap: 34px;
-}
-
 body[data-doc-theme="archive-room"] .markdown-body {
-  width: min(var(--doc-reading-width), 100%);
-  padding: clamp(1.5rem, 3vw, 3rem);
+  padding: 1.5rem 1.5rem 3rem;
   border: 1px solid var(--doc-rule-strong);
   background: var(--doc-surface-raised);
   box-shadow: 7px 7px 0 var(--linear-border);
@@ -836,7 +795,6 @@ body[data-doc-theme="swiss-manual"] {
     "Microsoft YaHei", sans-serif;
   --doc-font-reading: var(--doc-font-ui);
   --doc-font-display: var(--doc-font-ui);
-  --doc-reading-width: 960px;
 }
 
 body[data-doc-theme="swiss-manual"][data-theme="dark"] {
@@ -939,27 +897,13 @@ body[data-doc-theme="swiss-manual"] .file-link.active {
   font-weight: 800;
 }
 
-body[data-doc-theme="swiss-manual"] .main-content {
-  padding: 0;
-  background: var(--doc-surface-raised);
-}
-
 body[data-doc-theme="swiss-manual"] .breadcrumbs {
-  margin: 0;
-  padding: 0.85rem 1.5rem;
   border-bottom: 1px solid var(--doc-rule-strong);
   background: var(--linear-bg-subtle);
   font-size: 0.65rem;
 }
 
-body[data-doc-theme="swiss-manual"] .doc-layout {
-  width: 100%;
-  gap: 0;
-}
-
 body[data-doc-theme="swiss-manual"] .markdown-body {
-  width: min(var(--doc-reading-width), 100%);
-  padding: clamp(2.5rem, 6vw, 6rem);
   border-right: 1px solid var(--doc-rule-strong);
   font-size: 0.95rem;
   line-height: 1.72;
@@ -1000,22 +944,11 @@ body[data-doc-theme="swiss-manual"] .markdown-body blockquote {
 }
 
 body[data-doc-theme="swiss-manual"] .doc-toc {
-  top: 0;
-  width: 220px;
-  flex-basis: 220px;
-  max-height: calc(100vh - 72px);
-  padding: 1.25rem;
   border: 0;
   border-radius: 0;
   background: var(--linear-bg-subtle);
 }
 
-body[data-doc-theme="swiss-manual"] .dir-listing-page,
-body[data-doc-theme="swiss-manual"] .welcome {
-  margin: 0;
-  padding: clamp(2rem, 6vw, 6rem);
-}
-
 /* Shared component refinements for the four independent profiles. */
 body:not([data-doc-theme="slate-modern"]) .markdown-body code:not(pre code) {
   border: 1px solid var(--linear-border);
@@ -1206,26 +1139,11 @@ body[data-doc-theme="swiss-manual"].not-found-page .deep-space-404__code {
     overflow-y: auto;
   }
 
-  body[data-doc-theme="editorial-atlas"] .main-content,
-  body[data-doc-theme="archive-room"] .main-content {
-    padding: 1.25rem;
-  }
-
   body[data-doc-theme="archive-room"] .markdown-body {
     padding: 1.25rem;
     box-shadow: 4px 4px 0 var(--linear-border);
   }
 
-  body[data-doc-theme="precision-index"] .main-content,
-  body[data-doc-theme="swiss-manual"] .main-content {
-    padding: 0;
-  }
-
-  body[data-doc-theme="precision-index"] .markdown-body,
-  body[data-doc-theme="swiss-manual"] .markdown-body {
-    padding: 1.25rem;
-  }
-
   body[data-doc-theme="precision-index"] .markdown-body h1,
   body[data-doc-theme="swiss-manual"] .markdown-body h1 {
     font-size: clamp(2rem, 12vw, 3.25rem);

package/server/static/js/diagram/diagram-viewer.js

@@ -8,6 +8,41 @@ function isDocNestRestrictedMode() {
   return !!(window.DOCNEST_CONFIG && window.DOCNEST_CONFIG.restrictedMode === true);
 }
 
+function parseSvgAbsoluteDimension(value) {
+  if (typeof value !== 'string' || !/^\s*\d*\.?\d+(?:e[+-]?\d+)?(?:px)?\s*$/i.test(value)) {
+    return null;
+  }
+
+  const dimension = Number.parseFloat(value);
+  return Number.isFinite(dimension) && dimension > 0 ? dimension : null;
+}
+
+function getDiagramIntrinsicDimensions(svgElement) {
+  const viewBox = svgElement.getAttribute('viewBox');
+  if (viewBox) {
+    const parts = viewBox.trim().split(/[\s,]+/).map(Number);
+    const viewBoxWidth = parts[2];
+    const viewBoxHeight = parts[3];
+    if (
+      parts.length === 4 &&
+      parts.every(Number.isFinite) &&
+      viewBoxWidth > 0 &&
+      viewBoxHeight > 0
+    ) {
+      // viewBox 是图表的实际坐标范围，优先于 Mermaid 的 width="100%"。
+      return { width: viewBoxWidth, height: viewBoxHeight };
+    }
+  }
+
+  const width = parseSvgAbsoluteDimension(svgElement.getAttribute('width'));
+  const height = parseSvgAbsoluteDimension(svgElement.getAttribute('height'));
+  if (width && height) return { width, height };
+  if (width) return { width, height: width * 0.75 };
+  if (height) return { width: height * (4 / 3), height };
+
+  return { width: 800, height: 600 };
+}
+
 function setupDiagramViewer() {
   if (isDocNestRestrictedMode()) return;
   const diagrams = document.querySelectorAll('.markdown-body .mermaid');
@@ -49,39 +84,16 @@ function openDiagramViewer(svgElement) {
   
   if (!viewer || !container) return;
   
-  // 获取原始 SVG 的尺寸
-  let originalWidth = parseFloat(svgElement.getAttribute('width'));
-  let originalHeight = parseFloat(svgElement.getAttribute('height'));
-  
-  // 如果没有 width/height，尝试从 viewBox 获取
-  if (!originalWidth || !originalHeight || isNaN(originalWidth) || isNaN(originalHeight)) {
-    const viewBox = svgElement.getAttribute('viewBox');
-    if (viewBox) {
-      const parts = viewBox.split(/\s+/);
-      if (parts.length >= 4) {
-        originalWidth = parseFloat(parts[2]) || 800;
-        originalHeight = parseFloat(parts[3]) || 600;
-      }
-    }
-  }
-  
-  // 如果还是没有，使用默认值
-  if (!originalWidth || !originalHeight || isNaN(originalWidth) || isNaN(originalHeight)) {
-    originalWidth = 800;
-    originalHeight = 600;
-  }
+  // viewBox 才是图表的实际尺寸；不能把 Mermaid 的 width="100%" 解析成 100。
+  const { width: originalWidth, height: originalHeight } = getDiagramIntrinsicDimensions(svgElement);
   
   // 设置 SVG 样式，确保充分利用空间
   svgElement.setAttribute('class', 'diagram-viewer-svg');
   // 清除之前的样式，但保留必要的属性
   svgElement.removeAttribute('style');
-  // 确保 SVG 有正确的属性
-  if (!svgElement.getAttribute('width')) {
-    svgElement.setAttribute('width', originalWidth);
-  }
-  if (!svgElement.getAttribute('height')) {
-    svgElement.setAttribute('height', originalHeight);
-  }
+  // 查看器需要固定的像素基准；内嵌图仍然保持响应式，不会被这个克隆影响。
+  svgElement.setAttribute('width', originalWidth);
+  svgElement.setAttribute('height', originalHeight);
   
   // 包装元素本身还包含边界 padding，因此适配比例必须把容器 padding 和图表边界一并算入。
   const padding = 40;
@@ -205,9 +217,8 @@ function resetDiagramZoom() {
   const wrapper = container.querySelector('.diagram-viewer-svg-wrapper');
   if (!wrapper) return;
   
-  // 获取原始尺寸
-  const originalWidth = parseFloat(currentSvg.style.width) || parseFloat(currentSvg.getAttribute('width')) || 800;
-  const originalHeight = parseFloat(currentSvg.style.height) || parseFloat(currentSvg.getAttribute('height')) || 600;
+  // 始终从统一的尺寸解析逻辑获取原始尺寸，避免缩放/重置再次误读百分比宽度。
+  const { width: originalWidth, height: originalHeight } = getDiagramIntrinsicDimensions(currentSvg);
   
   const padding = 40; // 边界 padding 大小（像素）
   currentZoom = defaultZoom;

package/server/static/js/diagram/diagram-zoom.js

@@ -8,9 +8,8 @@ function zoomDiagram(direction) {
   const wrapper = container.querySelector('.diagram-viewer-svg-wrapper');
   if (!wrapper) return;
   
-  // 获取原始尺寸
-  const originalWidth = parseFloat(currentSvg.style.width) || parseFloat(currentSvg.getAttribute('width')) || 800;
-  const originalHeight = parseFloat(currentSvg.style.height) || parseFloat(currentSvg.getAttribute('height')) || 600;
+  // 与查看器使用同一套尺寸解析逻辑，不能把 width="100%" 解析成 100。
+  const { width: originalWidth, height: originalHeight } = getDiagramIntrinsicDimensions(currentSvg);
   
   // 边界 padding 大小（与 diagram-viewer.js 中保持一致）
   const padding = 40;