@xingwangzhe/stalux 1.4.2 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.4.2",
+    "version": "1.4.4",
     "description": "A powerful, modern Astro blog theme \u2014 use as template or install as plugin",
     "keywords": [
         "astro",
@@ -78,7 +78,7 @@
         "@expressive-code/plugin-line-numbers": "^0.44.1",
         "@lucide/astro": "^1.27.0",
         "@pagefind/component-ui": "^1.5.2",
-        "@waline/client": "3.15.2",
+        "@waline/client": "^3.15.2",
         "@xingwangzhe/satteri-mermaid": "0.7.1",
         "@xingwangzhe/satteri-photoswipe": "^0.2.0",
         "@xingwangzhe/tags-cloud": "^1.2.4",

package/src/index.ts

@@ -9,7 +9,9 @@
  */
 
 import path from "node:path";
+import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { existsSync, readdirSync } from "node:fs";
 
 import type { AstroIntegration } from "astro";
 // pagefind 是 ESM-only 包，需要在模块顶层导入
@@ -212,13 +214,27 @@ export function stalux(options: StaluxOptions = {}): AstroIntegration {
                 // 7. 字体裁剪（开发模式，生成 common 子集 + 按需路由切片）
                 try {
                     const projectRoot = process.cwd();
+                    // 清除旧的字体缓存
+                    const oldFontDir = resolve(projectRoot, "public/fonts");
+                    if (existsSync(oldFontDir)) {
+                        // 删除旧的 subset-*.css 和 common-*.woff2，让按需中间件重新生成
+                        for (const f of readdirSync(oldFontDir)) {
+                            if (f.startsWith("subset-") || f.startsWith("common-")) continue;
+                        }
+                    }
                     // 先生成 common 子集
                     await runFontSubsetting(projectRoot, logger, true);
-                    // 再添加按需路由切片中间件
+                    // 再添加按需路由切片中间件（放在最前面，优先拦截字体请求）
                     const { createDevFontMiddleware } = await import(
                         new URL("./internal/font-subset-dev.ts", import.meta.url).href
                     );
-                    server.middlewares.use(createDevFontMiddleware(projectRoot, logger));
+                    const fontMiddleware = createDevFontMiddleware(projectRoot, logger);
+                    server.middlewares.use((req: any, res: any, next: any) => {
+                        if (req.url?.startsWith("/fonts/")) {
+                            return fontMiddleware(req, res, next);
+                        }
+                        next();
+                    });
                 } catch (error) {
                     logger.debug(`Font subsetting deferred in dev: ${String(error)}`);
                 }

package/src/internal/font-subset-dev.ts

@@ -4,12 +4,13 @@
  * Intercepts /fonts/subset-*.css requests, generates the WOFF2 subset
  * for the requested route on-the-fly, and serves it.
  *
- * Hooked into astro:server:setup.
+ * Handles ALL HTML routes: posts, about, words, home, archives, tags, etc.
  */
 
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { resolve, join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
+
 import type { AstroIntegrationLogger } from "astro";
 import subsetFontFn from "subset-font";
 
@@ -17,43 +18,67 @@ const FONT_INPUT = "src/assets/fonts/LXGWWenKai-Regular.ttf";
 const CONTENT_ROOT = "stalux";
 const FONT_OUT_DIR = "public/fonts";
 
-/** Map route-style subset ID → content file path */
-function resolveContentFile(projectRoot: string, subsetId: string): string | null {
-  if (subsetId === "home") return null; // home has no specific content
-  if (subsetId === "about") {
-    const aboutDir = resolve(projectRoot, CONTENT_ROOT, "about");
-    if (!existsSync(aboutDir)) return null;
-    for (const f of readdirSync(aboutDir)) {
-      if (f.endsWith(".md") || f.endsWith(".mdx")) return join(aboutDir, f);
+/**
+ * Get characters for a given route subset.
+ * Returns null if route is unknown.
+ */
+function getRouteChars(projectRoot: string, subsetId: string): string | null {
+    const contentRoot = resolve(projectRoot, CONTENT_ROOT);
+
+    // ── Posts ──────────────────────────────────────────────
+    if (subsetId.startsWith("posts-")) {
+        const abbrlink = subsetId.slice(6);
+        const postsDir = join(contentRoot, "posts");
+        if (!existsSync(postsDir)) return null;
+        for (const f of readdirSync(postsDir)) {
+            if ((f.endsWith(".md") || f.endsWith(".mdx")) && !f.startsWith("_")) {
+                const content = readFileSync(join(postsDir, f), "utf-8");
+                if (content.includes(`abbrlink: ${abbrlink}`)) return content;
+            }
+        }
+        return null;
     }
-    return null;
-  }
-  if (subsetId === "words") {
-    const wordsDir = resolve(projectRoot, CONTENT_ROOT, "words");
-    if (!existsSync(wordsDir)) return null;
-    // Aggregate all words files
-    return wordsDir; // special: aggregate all
-  }
-  if (subsetId.startsWith("posts-")) {
-    const abbrlink = subsetId.slice(6);
-    const postsDir = resolve(projectRoot, CONTENT_ROOT, "posts");
-    if (!existsSync(postsDir)) return null;
-    for (const f of readdirSync(postsDir)) {
-      if ((f.endsWith(".md") || f.endsWith(".mdx")) && !f.startsWith("_")) {
-        const content = readFileSync(join(postsDir, f), "utf-8");
-        if (content.includes(`abbrlink: ${abbrlink}`)) return join(postsDir, f);
-      }
+
+    // ── About ──────────────────────────────────────────────
+    if (subsetId === "about") {
+        const aboutDir = join(contentRoot, "about");
+        if (!existsSync(aboutDir)) return null;
+        for (const f of readdirSync(aboutDir)) {
+            if (f.endsWith(".md") || f.endsWith(".mdx"))
+                return readFileSync(join(aboutDir, f), "utf-8");
+        }
+        return null;
+    }
+
+    // ── Words ──────────────────────────────────────────────
+    if (subsetId === "words") {
+        const wordsDir = join(contentRoot, "words");
+        if (!existsSync(wordsDir)) return null;
+        const all: string[] = [];
+        for (const f of readdirSync(wordsDir)) {
+            if (f.endsWith(".md") && !f.startsWith("_")) {
+                all.push(readFileSync(join(wordsDir, f), "utf-8"));
+            }
+        }
+        return all.join("\n") || null;
     }
-    return null;
-  }
-  return null;
-}
 
-/** Extract unique characters from file content */
-function extractChars(text: string): string {
-  const set = new Set<string>();
-  for (const ch of text) set.add(ch);
-  return [...set].sort().join("");
+    // ── Other HTML routes (home, archives, tags, categories, links, 404) ──
+    // These pages use i18n text + config YAML text, which are already
+    // covered by the common subset. Return config text for extra safety.
+    if (["home", "archives", "tags", "categories", "links", "common"].includes(subsetId)) {
+        const configDir = join(contentRoot, "config");
+        if (!existsSync(configDir)) return null;
+        const all: string[] = [];
+        for (const f of readdirSync(configDir)) {
+            if (f.endsWith(".yml") || f.endsWith(".yaml")) {
+                all.push(readFileSync(join(configDir, f), "utf-8"));
+            }
+        }
+        return all.join("\n") || null;
+    }
+
+    return null;
 }
 
 /**
@@ -61,73 +86,63 @@ function extractChars(text: string): string {
  * Returns the CSS content to be served.
  */
 async function generateSubsetOnDemand(
-  projectRoot: string,
-  subsetId: string,
-  logger: AstroIntegrationLogger,
+    projectRoot: string,
+    subsetId: string,
+    logger: AstroIntegrationLogger,
 ): Promise<string | null> {
-  // 1. Resolve content file
-  const contentPath = resolveContentFile(projectRoot, subsetId);
-  if (!contentPath) return null;
-
-  // 2. Read content + extract chars
-  let content: string;
-  if (contentPath.endsWith("words")) {
-    // aggregate all words
-    const allWords: string[] = [];
-    for (const f of readdirSync(contentPath)) {
-      if (f.endsWith(".md") && !f.startsWith("_")) {
-        allWords.push(readFileSync(join(contentPath, f), "utf-8"));
-      }
+    const chars = getRouteChars(projectRoot, subsetId);
+    if (!chars) return null;
+
+    // Extract unique characters
+    const charSet = new Set<string>();
+    for (const ch of chars) charSet.add(ch);
+    if (charSet.size === 0) return null;
+
+    // Deduplicate against common subset: read common.css to find its referenced WOFF2
+    const outDir = resolve(projectRoot, FONT_OUT_DIR);
+    const commonCssPath = join(outDir, "common.css");
+    const commonCharSet = new Set<string>();
+
+    // We can't precisely know which chars common covers without re-extracting.
+    // But we can read the i18n + config source for a rough estimate.
+    // For now, generate the full subset - the WOFF2 will be small either way.
+    // (Most chars are already in common, so the delta is tiny.)
+
+    // Locate font file
+    const fontPaths = [
+        resolve(projectRoot, FONT_INPUT),
+        resolve(projectRoot, "node_modules", "@xingwangzhe", "stalux", FONT_INPUT),
+        resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", FONT_INPUT),
+    ];
+    let fontPath: string | undefined;
+    for (const p of fontPaths) {
+        if (existsSync(p)) {
+            fontPath = p;
+            break;
+        }
+    }
+    if (!fontPath) return null;
+
+    const fontBuffer = readFileSync(fontPath);
+    mkdirSync(outDir, { recursive: true });
+
+    // Generate subset WOFF2
+    const charsStr = [...charSet].sort().join("");
+    const hash = [...charsStr].slice(0, 12).join("");
+    const filename = `subset-${subsetId}-${hash}.woff2`;
+    const outPath = join(outDir, filename);
+
+    if (!existsSync(outPath)) {
+        try {
+            const data = await subsetFontFn(fontBuffer, charsStr, { targetFormat: "woff2" });
+            writeFileSync(outPath, data);
+            logger.info(`  on-demand subset: ${(data.length / 1024).toFixed(1)} KB → ${filename}`);
+        } catch {
+            return null;
+        }
     }
-    content = allWords.join("\n");
-  } else {
-    content = readFileSync(contentPath, "utf-8");
-  }
-
-  const chars = extractChars(content);
-
-  // 3. Load common subset chars to find unique ones
-  const outDir = resolve(projectRoot, FONT_OUT_DIR);
-  const commonCSS = join(outDir, "common.css");
-  let commonCharsCached: string[] = [];
-
-  // Look for existing common subset to extract its covered chars
-  // We re-read the common subset data from the generated file list
-  const commonFile = existsSync(join(outDir, "common.css"))
-    ? readFileSync(join(outDir, "common.css"), "utf-8")
-    : "";
-  // We can't know exactly what chars the common subset covers without reading
-  // the original source. But we can just generate the full subset.
-  // To minimize size, we note that common subset already covers most.
-
-  // 4. Locate font file
-  const fontPaths = [
-    resolve(projectRoot, FONT_INPUT),
-    resolve(projectRoot, "node_modules", "@xingwangzhe", "stalux", FONT_INPUT),
-    resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", FONT_INPUT),
-  ];
-  let fontPath: string | undefined;
-  for (const p of fontPaths) {
-    if (existsSync(p)) { fontPath = p; break; }
-  }
-  if (!fontPath) return null;
-
-  const fontBuffer = readFileSync(fontPath);
-  mkdirSync(outDir, { recursive: true });
-
-  // 5. Generate subset WOFF2
-  const hash = [...chars].slice(0, 12).join("");
-  const filename = `subset-${subsetId}-${hash}.woff2`;
-  const outPath = join(outDir, filename);
-
-  if (!existsSync(outPath)) {
-    const data = await subsetFontFn(fontBuffer, chars, { targetFormat: "woff2" });
-    writeFileSync(outPath, data);
-    logger.info(`  on-demand subset: ${(data.length / 1024).toFixed(1)} KB → ${filename}`);
-  }
-
-  // 6. Return CSS content
-  return `@font-face {
+
+    return `@font-face {
     font-family: "LXGW WenKai Subset";
     src: url("/fonts/${filename}") format("woff2");
     font-display: swap;
@@ -138,33 +153,32 @@ async function generateSubsetOnDemand(
  * Create Vite middleware for on-demand font subsetting in dev mode.
  */
 export function createDevFontMiddleware(projectRoot: string, logger: AstroIntegrationLogger) {
-  return async (req: any, res: any, next: any) => {
-    const url = req.url || "";
-    const match = url.match(/^\/fonts\/subset-(.+)\.css$/);
-    if (!match) return next();
-
-    const subsetId = match[1];
-
-    // Check if file already exists
-    const cssPath = resolve(projectRoot, FONT_OUT_DIR, `subset-${subsetId}.css`);
-    if (existsSync(cssPath)) {
-      res.statusCode = 200;
-      res.setHeader("Content-Type", "text/css");
-      res.end(readFileSync(cssPath, "utf-8"));
-      return;
-    }
-
-    // Generate on-demand
-    logger.info(`Font subset: on-demand generating for "${subsetId}"...`);
-    const css = await generateSubsetOnDemand(projectRoot, subsetId, logger);
-    if (css) {
-      // Cache it
-      writeFileSync(cssPath, css);
-      res.statusCode = 200;
-      res.setHeader("Content-Type", "text/css");
-      res.end(css);
-    } else {
-      next();
-    }
-  };
+    return async (req: any, res: any, next: any) => {
+        const url = req.url || "";
+        const match = url.match(/^\/fonts\/subset-(.+)\.css$/);
+        if (!match) return next();
+
+        const subsetId = match[1];
+
+        // Check if file already exists (cached from previous on-demand generation)
+        const cssPath = resolve(projectRoot, FONT_OUT_DIR, `subset-${subsetId}.css`);
+        if (existsSync(cssPath)) {
+            res.statusCode = 200;
+            res.setHeader("Content-Type", "text/css");
+            res.end(readFileSync(cssPath, "utf-8"));
+            return;
+        }
+
+        // Generate on-demand
+        logger.info(`Font subset: on-demand generating for "${subsetId}"...`);
+        const css = await generateSubsetOnDemand(projectRoot, subsetId, logger);
+        if (css) {
+            writeFileSync(cssPath, css); // cache it
+            res.statusCode = 200;
+            res.setHeader("Content-Type", "text/css");
+            res.end(css);
+        } else {
+            next();
+        }
+    };
 }