@xingwangzhe/stalux 1.41.1 → 1.41.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.41.1",
+    "version": "1.41.2",
     "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
     "keywords": [
         "astro",

package/src/components/stalux/archives/archivesList.astro

@@ -3,7 +3,7 @@ import "../../../styles/generated-archives.css";
 import { type CollectionEntry, getCollection } from "astro:content";
 
 import { getSiteData } from "@utils/config-utils";
-import { format, parseDate, toTimestamp } from "@utils/dayjs";
+import { formatInTimeZone, parseDate, toTimestamp, zonedCalendarParts } from "@utils/dayjs";
 import { createTranslator } from "@utils/i18n";
 
 interface Props {
@@ -16,13 +16,15 @@ const posts = props.posts ?? (await getCollection("posts", ({ data }) => !data.d
 const configEntries = await getCollection("config");
 const siteConfig = getSiteData(configEntries);
 const { t } = createTranslator(siteConfig.lang || "zh-CN");
+// 归档按“站点时区的日历”分组：无时区的 date 串按站点时区解析，
+// 分组也按站点时区取年月，构建机器时区（UTC CI）不再影响归档归属。
+const timezone = siteConfig.timezone || "Asia/Shanghai";
 const archivesByYearMonth = new Map<number, Map<number, CollectionEntry<"posts">[]>>();
 
 posts.forEach((post) => {
     if (!post.data.date) return;
-    const date = parseDate(post.data.date);
-    const year = date.getUTCFullYear();
-    const month = date.getUTCMonth() + 1;
+    const date = parseDate(post.data.date, timezone);
+    const { year, month } = zonedCalendarParts(date, timezone);
     const months = archivesByYearMonth.get(year) ?? new Map();
     const monthPosts = months.get(month) ?? [];
     monthPosts.push(post);
@@ -32,7 +34,7 @@ posts.forEach((post) => {
 
 // 每个 post 只解析一次时间，供排序比较器复用，避免比较器里反复 new Date()
 const tsCache = new Map<CollectionEntry<"posts">, number>(
-    posts.map((p) => [p, toTimestamp(p.data.date || 0)]),
+    posts.map((p) => [p, toTimestamp(p.data.date || 0, timezone)]),
 );
 
 // 对每个月内的文章按 date 字段降序排序（用缓存时间戳做纯数字比较）
@@ -81,8 +83,9 @@ const archiveYears = [...archivesByYearMonth.entries()]
                                                     class="stalux-archive-post-date"
                                                     datetime={post.data.date}
                                                 >
-                                                    {format(
-                                                        parseDate(post.data.date),
+                                                    {formatInTimeZone(
+                                                        parseDate(post.data.date, timezone),
+                                                        timezone,
                                                         "yyyy-MM-dd",
                                                     )}
                                                 </time>

package/src/components/stalux/layout/head.astro

@@ -16,6 +16,7 @@ import {
     getPromoteData,
     getSiteData,
 } from "@utils/config-utils";
+import { toMachineDateTime } from "@utils/semantic-time";
 import { buildSeoDocument, type SeoPageInput } from "@utils/seo-document";
 import { SEO } from "astro-seo";
 import packageJson from "../../../../package.json";
@@ -27,11 +28,22 @@ const headConfig = getHeadData(configEntries);
 const promoteConfig = getPromoteData(configEntries);
 const mediaLinksConfig = getMediaLinksData(configEntries);
 
+// og:article:published_time 与 JSON-LD datePublished 必须带站点时区偏移。
+// 裸的 frontmatter 串（"2026-10-24 12:55:00"）会被消费方按自己的时区解释，
+// 统一在这里转换为带偏移的机器时间，与 RSS pubDate、页面 <time> 保持一致。
+const seoTimezone = siteConfig.timezone || "Asia/Shanghai";
+const rawPage = Astro.props as SeoPageInput;
 const seo = buildSeoDocument({
     site: siteConfig,
     author: authorConfig,
     mediaLinks: mediaLinksConfig?.items.map((item) => item.link) ?? [],
-    page: Astro.props as SeoPageInput,
+    page: {
+        ...rawPage,
+        date: rawPage.date ? toMachineDateTime(rawPage.date, seoTimezone) : rawPage.date,
+        updated: rawPage.updated
+            ? toMachineDateTime(rawPage.updated, seoTimezone)
+            : rawPage.updated,
+    },
     pathname: Astro.url.pathname,
     protocol: Astro.url.protocol,
     exportMarkdown: Boolean(promoteConfig?.export_md),

package/src/components/stalux/words/wordList.astro

@@ -13,8 +13,8 @@ interface Props {
 const { entries, timezone } = Astro.props;
 
 const sorted = [...entries].sort((a, b) => {
-    const ta = toTimestamp(a.data.date || a.id);
-    const tb = toTimestamp(b.data.date || b.id);
+    const ta = toTimestamp(a.data.date || a.id, timezone);
+    const tb = toTimestamp(b.data.date || b.id, timezone);
     return tb - ta;
 });
 ---

package/src/pages/api/posts.json.ts

@@ -1,4 +1,7 @@
+import { getCollection } from "astro:content";
+import { getSiteData } from "@utils/config-utils";
 import { getPostContentIndex } from "@utils/content-index";
+import { toMachineDateTime } from "@utils/semantic-time";
 import { sitePath } from "@utils/site-path";
 import { getPostDescriptions } from "@utils/word-count-utils";
 import type { APIRoute } from "astro";
@@ -15,11 +18,13 @@ export const GET: APIRoute = async ({ logger }) => {
     const { posts } = await getPostContentIndex();
 
     const descriptions = await getPostDescriptions(logger);
+    // 面向机器的端点必须输出带时区偏移的 ISO 时间；裸 frontmatter 串会被消费方按本地时区解释
+    const timezone = getSiteData(await getCollection("config")).timezone || "Asia/Shanghai";
     const payload = posts.map((post) => ({
         title: post.data.title,
         abbrlink: String(post.data.abbrlink),
-        date: post.data.date ?? undefined,
-        updated: post.data.updated ?? undefined,
+        date: post.data.date ? toMachineDateTime(post.data.date, timezone) : undefined,
+        updated: post.data.updated ? toMachineDateTime(post.data.updated, timezone) : undefined,
         tags: post.data.tags ?? [],
         categories: post.data.categories ?? [],
         desc: post.data.desc ?? "",

package/src/utils/config-utils.ts

@@ -44,6 +44,8 @@ export function getSiteData(entries: CollectionEntry<"config">[]): SiteData {
     return {
         ...site,
         accentColor: site.accentColor ?? "#EAB308",
+        // 时间解析全部依赖站点时区（feed/semantic-time/archives），缺省值必须与 schema 默认一致
+        timezone: site.timezone ?? "Asia/Shanghai",
         weather: { enabled: site.weather?.enabled ?? false },
     };
 }

package/src/utils/dayjs.ts

@@ -3,9 +3,18 @@
  * 保留旧 dayjs 封装导出名，方便现有调用方继续使用。
  */
 
-/** 解析日期字符串，返回 Date 对象 */
-export const parseDate = (v: unknown): Date => {
+/**
+ * 解析日期字符串，返回 Date 对象。
+ * @param v 原始值（Date/时间戳/时间串）
+ * @param timeZone 站点 IANA 时区。传入时，不带时区的日期串按该时区挂钟时间解析，
+ *   保证任意构建机器（UTC 的 CI、东八区的本机）产出完全一致的时间戳。
+ */
+export const parseDate = (v: unknown, timeZone?: string): Date => {
     if (v == null || v === 0 || v === "") return new Date(0);
+    if (typeof v === "string") {
+        const trimmed = v.trim();
+        if (timeZone && NAIVE_DATE_PATTERN.test(trimmed)) return parseDateInZone(trimmed, timeZone);
+    }
     const d = new Date(v as string | number | Date);
     return Number.isNaN(d.getTime()) ? new Date(0) : d;
 };
@@ -14,7 +23,65 @@ export const parseDate = (v: unknown): Date => {
 export const isValid = (d: Date): boolean => !Number.isNaN(d.getTime());
 
 /** 获取时间戳（用于排序比较） */
-export const toTimestamp = (v: unknown): number => parseDate(v).getTime();
+export const toTimestamp = (v: unknown, timeZone?: string): number =>
+    parseDate(v, timeZone).getTime();
+
+/**
+ * 不含时区信息的日期串（frontmatter 里的 "2026-10-24 12:55:00"）。
+ * 这类串必须按站点时区解析，绝不能交给 new Date()——它会按
+ * **构建机器的本地时区** 解释，EdgeOne/CI 这类 UTC 构建机会让
+ * RSS pubDate、页面 datetime 全体平移 8 小时（2026-10-24 事故）。
+ */
+const NAIVE_DATE_PATTERN =
+    /^(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{1,3}))?)?)?$/;
+
+/** 用共享的 formatter 计算目标时区在给定时刻的 UTC 偏移（毫秒，东八区为 +28800000） */
+function zoneOffsetMs(date: Date, timeZone: string): number {
+    const parts = getTimezoneFormatter(timeZone).formatToParts(date);
+    const get = (type: Intl.DateTimeFormatPartTypes): number =>
+        Number(parts.find((part) => part.type === type)?.value ?? "0");
+    const asUtc = Date.UTC(
+        get("year"),
+        get("month") - 1,
+        get("day"),
+        get("hour"),
+        get("minute"),
+        get("second"),
+    );
+    return asUtc - date.getTime();
+}
+
+/**
+ * 把不含时区的日期串按指定 IANA 时区的挂钟时间解析为 Date。
+ * 做法是先按 UTC 解释，再用目标时区偏移折算；迭代两次以收敛 DST 边界
+ * （南半球夏令时附近的“不存在时间”取近似值，与主流库行为一致）。
+ */
+export function parseDateInZone(naive: string, timeZone: string): Date {
+    const match = naive.trim().match(NAIVE_DATE_PATTERN);
+    if (!match) return new Date(0);
+    const [year, month, day] = [Number(match[1]), Number(match[2]), Number(match[3])];
+    const hour = Number(match[4] ?? 0);
+    const minute = Number(match[5] ?? 0);
+    const second = Number(match[6] ?? 0);
+    const millisecond = Number((match[7] ?? "0").padEnd(3, "0"));
+    const wallClockAsUtc = Date.UTC(year, month - 1, day, hour, minute, second, millisecond);
+    let timestamp = wallClockAsUtc;
+    for (let iteration = 0; iteration < 2; iteration++) {
+        timestamp = wallClockAsUtc - zoneOffsetMs(new Date(timestamp), timeZone);
+    }
+    return new Date(timestamp);
+}
+
+/** 读取目标时区下的日历字段（归档按月分组等场景需要“站点时区的日历”，而非 UTC 日历） */
+export function zonedCalendarParts(
+    date: Date,
+    timeZone: string,
+): { year: number; month: number; day: number } {
+    const parts = getTimezoneFormatter(timeZone).formatToParts(date);
+    const get = (type: Intl.DateTimeFormatPartTypes): number =>
+        Number(parts.find((part) => part.type === type)?.value ?? "0");
+    return { year: get("year"), month: get("month"), day: get("day") };
+}
 
 const pad2 = (n: number): string => String(n).padStart(2, "0");
 

package/src/utils/feed.ts

@@ -33,7 +33,10 @@ export async function buildFeedItems(
     logger?: AstroRuntimeLogger,
 ): Promise<FeedItem[]> {
     const timestamps = new Map(
-        posts.map((post) => [post, toTimestamp(post.data.updated || post.data.date)]),
+        posts.map((post) => [
+            post,
+            toTimestamp(post.data.updated || post.data.date, stalux.timezone),
+        ]),
     );
     const sortedPosts = posts.toSorted((a, b) => {
         // Newest first: compare post dates, use the greater of updated/date
@@ -49,7 +52,7 @@ export async function buildFeedItems(
 
         let customData = "";
         if (post.data.updated) {
-            const parsed = parseDate(post.data.updated);
+            const parsed = parseDate(post.data.updated, stalux.timezone);
             if (isValid(parsed)) {
                 const updatedIso = formatInTimeZone(
                     parsed,

package/src/utils/semantic-time.ts

@@ -7,5 +7,6 @@ import { formatInTimeZone, parseDate } from "@utils/dayjs";
  * @returns 带时区的 ISO 8601 格式字符串
  */
 export function toMachineDateTime(dateStr: string, timezone: string): string {
-    return formatInTimeZone(parseDate(dateStr), timezone, "yyyy-MM-dd'T'HH:mm:ssXXX");
+    // 关键：无时区的原始串必须按站点时区解析，不能按构建机器本地时区
+    return formatInTimeZone(parseDate(dateStr, timezone), timezone, "yyyy-MM-dd'T'HH:mm:ssXXX");
 }