hd-garden 0.14.12 → 0.14.13

package/editors/dist/typora/manifest.json

@@ -5,7 +5,7 @@
   "author": "hedon",
   "authorUrl": "https://github.com/hedon954",
   "repo": "hedon954/garden",
-  "version": "0.14.12",
+  "version": "0.14.13",
   "minAppVersion": "1.5.0",
   "minCoreVersion": "2.10.52",
   "platforms": [

package/editors/dist/typora/style.css

@@ -2135,16 +2135,51 @@
 .g-compose-grid-item[data-span="4"] { grid-column: span 4; }
 
 .g-compose-icon {
+  --gc-icon-size: 15px;
   display: inline-block;
   flex: 0 0 auto;
-  width: 15px;
-  height: 15px;
+  width: var(--gc-icon-size);
+  height: var(--gc-icon-size);
   color: var(--ink);
   vertical-align: -2px;
 }
-.g-compose-icon[data-size="sm"] { width: 13px; height: 13px; }
-.g-compose-icon[data-size="lg"] { width: 18px; height: 18px; }
-.g-compose-icon[data-size="xl"] { width: 22px; height: 22px; }
+.g-compose-icon[data-size="sm"] { --gc-icon-size: 13px; }
+.g-compose-icon[data-size="lg"] { --gc-icon-size: 18px; }
+.g-compose-icon[data-size="xl"] { --gc-icon-size: 22px; }
+/* Align row-leading icons with the first line of adjacent text/headings rather than the top of half-leading. */
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-text:not([data-size="sm"]):not([data-size="lg"]):not([data-size="xl"])),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-text:first-child:not([data-size="sm"]):not([data-size="lg"]):not([data-size="xl"])),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-content:first-child) {
+  margin-top: max(0px, calc((1lh - var(--gc-icon-size)) / 2));
+}
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-text[data-size="sm"]),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-text[data-size="sm"]:first-child) {
+  margin-top: max(0px, calc((1.3125em - var(--gc-icon-size)) / 2));
+}
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-text[data-size="lg"]),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-text[data-size="lg"]:first-child) {
+  margin-top: max(0px, calc((1.125 * 1lh - var(--gc-icon-size)) / 2));
+}
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-text[data-size="xl"]),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-text[data-size="xl"]:first-child) {
+  margin-top: max(0px, calc((1.25 * 1lh - var(--gc-icon-size)) / 2));
+}
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:not([data-size="xl"]):has(+ .g-compose-h:not([data-size="sm"]):not([data-size="lg"]):not([data-size="xl"])),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:not([data-size="xl"]):has(+ .g-compose-group > .g-compose-h:first-child:not([data-size="sm"]):not([data-size="lg"]):not([data-size="xl"])) {
+  margin-top: max(0px, calc((1.4em - var(--gc-icon-size)) / 2));
+}
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-h[data-size="sm"]),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-h[data-size="sm"]:first-child) {
+  margin-top: max(0px, calc((1.1375em - var(--gc-icon-size)) / 2));
+}
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-h[data-size="lg"]),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-h[data-size="lg"]:first-child) {
+  margin-top: max(0px, calc((1.575em - var(--gc-icon-size)) / 2));
+}
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-h[data-size="xl"]),
+.g-compose-row:not([data-align="center"]):not([data-align="end"]) > .g-compose-icon:has(+ .g-compose-group > .g-compose-h[data-size="xl"]:first-child) {
+  margin-top: max(0px, calc((1.75em - var(--gc-icon-size)) / 2));
+}
 .g-compose-card[data-size="sm"] > .g-compose-icon {
   width: 14px;
   height: 14px;
@@ -2531,6 +2566,9 @@
     width: 100%;
     min-width: 0;
   }
+  .g-compose-row:not([data-wrap="nowrap"]) > .g-compose-icon {
+    margin-top: 0;
+  }
 
   /* Columnized centered rows stretch labels to 100% width, so align-items
      can center arrows but not text. Center direct labels only; explicit
@@ -5537,6 +5575,6 @@ html[data-theme="dark"] {
 .garden-suggest-label { font-size: 13px; line-height: 1.3; }
 .garden-suggest-hint { opacity: 0.65; font-size: 12px; }
 .garden-suggest-copy { display: flex; flex-direction: column; min-width: 12em; gap: 1px; }
-.auto-suggest-container.garden-picker-open { overflow-x: hidden; overflow-y: auto; box-sizing: border-box; }
+#ty-auto-suggest.garden-picker-open, .auto-suggest-container.garden-picker-open { overflow-x: hidden; overflow-y: auto; overscroll-behavior: contain; box-sizing: border-box; }
 .garden-picker-open .garden-suggest-thumb { width: 72px; height: 48px; min-width: 72px; flex: none; }
 .garden-picker-open .garden-suggest-label, .garden-picker-open .garden-suggest-hint { overflow-wrap: anywhere; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hd-garden",
-  "version": "0.14.12",
+  "version": "0.14.13",
   "private": false,
   "description": "用 Markdown 写作、用 GitHub Pages 发布的个人博客引擎。",
   "license": "MIT",

package/scripts/build-content.mjs

@@ -71,7 +71,10 @@ const siteConfig = parseYaml(fs.readFileSync(siteConfigPath, "utf8"));
 const generatedMediaRoot = path.join(root, "public", "media");
 const gardenDir = path.join(root, ".garden");
 const output = path.join(gardenDir, "generated-content.ts");
+const postBodiesOutput = path.join(gardenDir, "generated-post-bodies.ts");
+const handbookBodiesOutput = path.join(gardenDir, "generated-handbook-bodies.ts");
 const siteConfigOutput = path.join(gardenDir, "site-config.ts");
+const omitContent = ({ content, ...rest }) => rest;
 const includeDrafts = process.env.CONTENT_INCLUDE_DRAFTS === "1";
 // Local preview shows broken ui blocks as error cards; public builds fail on them.
 const uiMode = includeDrafts || process.env.GARDEN_CONTENT_MODE === "preview" ? "preview" : "publish";
@@ -726,7 +729,7 @@ export type ContentEntry = {
   readingTime?: string;
   kind: "post" | "column";
   sourcePath: string;
-  content: string;
+  content?: string;
   column?: string;
   columnTitle?: string;
   columnDescription?: string;
@@ -747,19 +750,19 @@ export type GardenDocEntry = {
   order: number;
   badge?: string;
   references?: { title: string; url?: string; domain?: string }[];
-  content: string;
+  content?: string;
 };
 
 export type LinkCardMeta = { title: string; description?: string; siteName?: string; author?: string; publishedTime?: string; image?: string };
 export type LinkAssets = { favicons: Record<string, string>; cards: Record<string, LinkCardMeta> };
 
 export const contentHash = "${contentHash}";
-export const posts = ${JSON.stringify(posts, null, 2)} as ContentEntry[];
-export const columns = ${JSON.stringify(columns, null, 2)} as ContentEntry[];
-export const gardenDocs = ${JSON.stringify(gardenDocs, null, 2)} as GardenDocEntry[];
-export const gardenIndexDoc = ${JSON.stringify(gardenIndexDoc, null, 2)} as GardenDocEntry | null;
-export const gardenDocsEn = ${JSON.stringify(gardenDocsEn, null, 2)} as GardenDocEntry[];
-export const gardenIndexDocEn = ${JSON.stringify(gardenIndexDocEn, null, 2)} as GardenDocEntry | null;
+export const posts = ${JSON.stringify(posts.map(omitContent), null, 2)} as ContentEntry[];
+export const columns = ${JSON.stringify(columns.map(omitContent), null, 2)} as ContentEntry[];
+export const gardenDocs = ${JSON.stringify(gardenDocs.map(omitContent), null, 2)} as GardenDocEntry[];
+export const gardenIndexDoc = ${JSON.stringify(gardenIndexDoc ? omitContent(gardenIndexDoc) : null, null, 2)} as GardenDocEntry | null;
+export const gardenDocsEn = ${JSON.stringify(gardenDocsEn.map(omitContent), null, 2)} as GardenDocEntry[];
+export const gardenIndexDocEn = ${JSON.stringify(gardenIndexDocEn ? omitContent(gardenIndexDocEn) : null, null, 2)} as GardenDocEntry | null;
 export const a2WordCounts = ${JSON.stringify(a2WordCounts, null, 2)} as Record<string, number>;
 export const linkAssets = ${JSON.stringify(linkAssetsForRender(root, basePath), null, 2)} as LinkAssets;
 export const imageSizes: Record<string, { width: number; height: number }> = ${JSON.stringify(imageSizes)};
@@ -767,6 +770,18 @@ export const imageSizes: Record<string, { width: number; height: number }> = ${J
 
 fs.mkdirSync(path.dirname(output), { recursive: true });
 writeChanged(output, source);
+writeChanged(
+  postBodiesOutput,
+  `// Generated by garden sync. Edit files in content/ instead.
+export const postBodies = ${JSON.stringify(Object.fromEntries(posts.map((post) => [post.path, post.content])), null, 2)} as Record<string, string>;
+`,
+);
+writeChanged(
+  handbookBodiesOutput,
+  `// Generated by garden sync. Edit files in docs/handbook/ instead.
+export const handbookBodies = ${JSON.stringify(Object.fromEntries(allHandbookDocs.map((doc) => [`${doc.lang}:${doc.path}`, doc.content])), null, 2)} as Record<string, string>;
+`,
+);
 const fullIndex = buildFullIndex({ posts, columns });
 writeChanged(
   siteConfigOutput,

package/scripts/dev-server.mjs

@@ -13,6 +13,34 @@ const read = (file) => {
   catch (error) { if (error.code === "ENOENT") return null; throw error; }
 };
 const ps = (pid, field) => execFileSync("ps", ["-p", String(pid), "-o", `${field}=`], { encoding: "utf8", env: { ...process.env, LC_ALL: "C" } }).trim();
+function childPids(pid) {
+  try {
+    const out = execFileSync("pgrep", ["-P", String(pid)], {
+      encoding: "utf8",
+      env: { ...process.env, LC_ALL: "C" },
+    }).trim();
+    return out ? out.split("\n").map(Number).filter((child) => Number.isInteger(child) && child > 1) : [];
+  } catch {
+    return [];
+  }
+}
+
+function descendants(pid) {
+  return childPids(pid).flatMap((child) => [child, ...descendants(child)]);
+}
+
+function stopProven(pid) {
+  const tree = descendants(pid);
+  process.kill(pid, "SIGTERM");
+  for (const child of tree) {
+    try {
+      if (alive(child)) process.kill(child, "SIGTERM");
+    } catch (error) {
+      if (error.code !== "ESRCH") throw error;
+    }
+  }
+}
+
 function identity(pid, executable) {
   if (process.platform !== "linux" && process.platform !== "darwin") throw new Error("Automatic dev replacement requires Linux or macOS process inspection.");
   if (Number(ps(pid, "uid")) !== process.getuid()) throw new Error("Dev process belongs to another user; nothing was stopped.");
@@ -78,8 +106,8 @@ export async function startDev({ cwd, executable, args = [], env = process.env,
       // Recheck identity immediately before signalling to reduce PID-reuse races.
       const current = identity(lock.pid, executable);
       if (current.start !== previous.start || current.cwd !== cwd || read(lockPath)?.startedAt !== lock.startedAt) throw new Error("Dev owner changed during replacement; nothing was stopped.");
-      process.kill(lock.pid, "SIGTERM");
-      while (alive(lock.pid) || !(await portFree(lock))) {
+      stopProven(lock.pid);
+      while (alive(lock.pid) || descendants(lock.pid).some(alive) || !(await portFree(lock))) {
         if (Date.now() >= deadline) throw new Error("Previous dev server did not release its process/port in time; no force-kill attempted.");
         await delay(100);
       }

package/scripts/fetch-embed.mjs

@@ -1,5 +1,6 @@
 import { lookup } from "node:dns/promises";
 import { isIP } from "node:net";
+import { authorPasteUrl, resolvePlayer } from "../ui/garden/player.mjs";
 
 const timeoutMs = 8000;
 const maxBytes = 1_000_000;
@@ -98,10 +99,6 @@ function pageTitle(html) {
   return match ? decodeEntities(match.replaceAll(/\s+/gu, " ")) : undefined;
 }
 
-function yamlScalar(value) {
-  return JSON.stringify(value);
-}
-
 async function readLimited(response) {
   const type = response.headers.get("content-type") ?? "";
   if (!/text\/html|application\/xhtml\+xml/iu.test(type) && type !== "") {
@@ -143,7 +140,7 @@ async function fetchPublic(url, redirectsLeft) {
       return fetchPublic(next, redirectsLeft - 1);
     }
     if (!response.ok) fail(`抓取失败：HTTP ${response.status}。`);
-    return readLimited(response);
+    return { url, html: await readLimited(response) };
   } catch (error) {
     if (error?.name === "AbortError") fail("抓取超时。");
     throw error;
@@ -154,33 +151,48 @@ async function fetchPublic(url, redirectsLeft) {
 
 async function main() {
   const raw = option("URL") || process.argv[2] || "";
-  if (!raw) fail('用法：make embed URL="https://example.com/article"');
-
-  const url = await assertPublicHttpUrl(raw);
-  const html = await fetchPublic(url, maxRedirects);
-  const title = metaContent(html, ["og:title", "twitter:title"]) ?? pageTitle(html);
-  const description = metaContent(html, ["og:description", "twitter:description", "description"]);
-  const image = metaContent(html, ["og:image", "twitter:image", "twitter:image:src"]);
-
+  if (!raw) fail('用法：make embed URL="https://www.youtube.com/watch?v=..." 或一篇网页地址。YouTube / Bilibili 会打印可直接粘贴的一行链接。');
+
+  const starting = await assertPublicHttpUrl(raw);
+  const alreadyPlayable = resolvePlayer(starting);
+  let finalUrl = starting;
+  let title;
+  let description;
+  let image;
+  try {
+    const snapshot = await fetchPublic(starting, maxRedirects);
+    finalUrl = snapshot.url;
+    title = metaContent(snapshot.html, ["og:title", "twitter:title"]) ?? pageTitle(snapshot.html);
+    description = metaContent(snapshot.html, ["og:description", "twitter:description", "description"]);
+    image = metaContent(snapshot.html, ["og:image", "twitter:image", "twitter:image:src"]);
+  } catch (error) {
+    if (!alreadyPlayable.ok) throw error;
+  }
+  const player = resolvePlayer(finalUrl);
+  const paste = (player.ok ? player.pageUrl : authorPasteUrl(finalUrl)) || finalUrl.toString();
+
+  process.stdout.write(`${paste}\n`);
+  const hints = [];
+  if (player.ok) {
+    hints.push(`已规范化为可粘贴的 ${player.label} 地址：单独一行写入文章即可在站内播放。`);
+  } else if (alreadyPlayable.reason === "short-link") {
+    hints.push("这是需要跳转的短链。文章渲染不会在构建时解析短链；请把跳转后的完整视频链接单独一行贴进文章。");
+  } else if (player.reason === "unsupported-youtube-url" || player.reason === "unsupported-bilibili-url") {
+    hints.push("这不是可嵌入的单个视频地址，单独一行时会显示为链接卡片，而不是站内播放器。");
+  } else {
+    hints.push("这不是 YouTube / Bilibili 视频。单独一行会显示链接卡片；若要在句中链接后显示卡片，在链接后紧跟 {card}。");
+  }
+  if (title) hints.push(`title: ${title}`);
+  if (description) hints.push(`description: ${description}`);
   if (image) {
     try {
-      const imageUrl = new URL(image, url);
-      if (!["http:", "https:"].includes(imageUrl.protocol)) fail("封面地址不是 http(s)。");
+      const imageUrl = new URL(image, finalUrl);
+      if (["http:", "https:"].includes(imageUrl.protocol)) hints.push(`image: ${imageUrl.toString()}`);
     } catch {
-      fail("封面地址无效。");
+      // Hint-only; ignore a malformed image URL.
     }
   }
-
-  const lines = ["```embed", `url: ${url.toString()}`];
-  if (title) lines.push(`title: ${yamlScalar(title)}`);
-  if (description) lines.push(`description: ${yamlScalar(description)}`);
-  if (image) lines.push(`image: ${yamlScalar(new URL(image, url).toString())}`);
-  lines.push("```");
-
-  process.stdout.write(`${lines.join("\n")}\n`);
-  if (!title && !description) {
-    process.stderr.write("已生成围栏，但页面没有标题或摘要，请手工补全。\n");
-  }
+  if (hints.length) process.stderr.write(`${hints.join("\n")}\n`);
 }
 
 main().catch((error) => {