@bilibili-notify/dynamic 0.0.1-alpha.3 → 0.1.0-alpha.5

package/lib/index.cjs

@@ -105,6 +105,89 @@ const LOG_TAG = "bilibili-notify-dynamic";
 * 后即自愈,无需人工重启进程。
 */
 const DETECTOR_RESTART_BACKOFF_MS = 5 * 6e4;
+/**
+* 动态推送文本模板的内建兜底,仅在 adapter 未填 config.dynamicTemplate /
+* videoTemplate 时使用(真实 adapter 都会从 globals.defaults.templates 填充)。
+* 与 `@bilibili-notify/internal` 的 `DEFAULT_TEMPLATES.dynamic/.dynamicVideo`
+* 保持一致。变量 `{name}`(UP 名) / `{url}`(链接,未启用 URL 时为空)。
+*/
+const DEFAULT_DYNAMIC_TEXT = {
+	dynamic: "{name}发布了一条动态：{url}",
+	video: "{name}发布了新视频：{url}"
+};
+/**
+* 渲染动态推送文本:`{name}` / `{url}` 插值 + `\n` 展开。`url` 为空(未启用 URL)
+* 时连同 `{url}` 的前导分隔符一起去掉,避免行尾残留孤立的「：」。两个推送分支
+* (有图 / 无图)都走此函数 → 文字内容一致。
+*/
+function renderDynamicText(template, name, url) {
+	return (0, _bilibili_notify_internal.interpolate)(url ? template : template.replace(/\s*[：:]?\s*\{url\}/g, ""), {
+		name,
+		url
+	}).replaceAll("\\n", "\n");
+}
+function parseUid(raw) {
+	if (typeof raw === "number" && Number.isFinite(raw)) return String(Math.trunc(raw));
+	if (typeof raw !== "string") return void 0;
+	const trimmed = raw.trim();
+	return /^\d+$/.test(trimmed) ? trimmed : void 0;
+}
+function normalizeUnixSeconds(raw) {
+	if (typeof raw !== "number" && typeof raw !== "string") return void 0;
+	if (typeof raw === "string" && !/^\d+(?:\.\d+)?$/.test(raw.trim())) return void 0;
+	const n = Number(raw);
+	if (!Number.isFinite(n) || n <= 0) return void 0;
+	if (n > 1e10) {
+		const seconds = Math.floor(n / 1e3);
+		return seconds <= 1e10 ? seconds : void 0;
+	}
+	return Math.floor(n);
+}
+function parsePubTimeFallback(raw, now = luxon.DateTime.now()) {
+	if (typeof raw !== "string") return void 0;
+	const text = raw.trim();
+	if (!text) return void 0;
+	if (text === "刚刚") return Math.floor(now.toSeconds());
+	const relative = text.match(/^(\d+)(秒|分钟|小时)前$/);
+	if (relative) {
+		const amount = Number(relative[1]);
+		if (!Number.isFinite(amount)) return void 0;
+		const unit = relative[2] === "秒" ? "seconds" : relative[2] === "分钟" ? "minutes" : "hours";
+		return Math.floor(now.minus({ [unit]: amount }).toSeconds());
+	}
+	const normalized = text.replace(/[年月]/g, "-").replace(/日/g, "").replace(/\//g, "-").replace(/\s+/g, " ");
+	for (const fmt of [
+		"yyyy-M-d H:mm:ss",
+		"yyyy-M-d H:mm",
+		"yyyy-M-d",
+		"M-d H:mm:ss",
+		"M-d H:mm"
+	]) {
+		let dt = luxon.DateTime.fromFormat(normalized, fmt);
+		if (!dt.isValid) continue;
+		if (!fmt.startsWith("yyyy")) {
+			dt = dt.set({ year: now.year });
+			if (dt > now.plus({ days: 1 })) dt = dt.minus({ years: 1 });
+		}
+		return Math.floor(dt.toSeconds());
+	}
+	const yesterday = normalized.match(/^昨天\s*(\d{1,2}):(\d{2})(?::(\d{2}))?$/);
+	if (yesterday) {
+		const hour = Number(yesterday[1]);
+		const minute = Number(yesterday[2]);
+		const second = Number(yesterday[3] ?? 0);
+		const dt = now.minus({ days: 1 }).set({
+			hour,
+			minute,
+			second,
+			millisecond: 0
+		});
+		return dt.isValid ? Math.floor(dt.toSeconds()) : void 0;
+	}
+}
+function getDynamicPostTime(author) {
+	return normalizeUnixSeconds(author.pub_ts) ?? parsePubTimeFallback(author.pub_time);
+}
 /** 从动态数据中提取图片 URL，用于多模态 AI 点评（最多 4 张） */
 function extractDynamicImages(item) {
 	const mod = item.modules.module_dynamic;
@@ -392,15 +475,21 @@ var DynamicEngine = class {
 		};
 		for (const item of content.data.items) {
 			if (!item) continue;
-			const postTime = item.modules.module_author.pub_ts;
-			if (typeof postTime !== "number" || !Number.isFinite(postTime)) {
-				this.logger.warn(`[detector] 跳过无效动态：pub_ts 缺失或非数字，ID=${item.id_str ?? "unknown"}`);
+			const author = item.modules?.module_author;
+			const uid = parseUid(author?.mid);
+			if (!uid) {
+				this.logger.debug(`[detector] 跳过无作者 UID 的动态，ID=${item.id_str ?? "unknown"}`);
 				continue;
 			}
-			const uid = item.modules.module_author.mid.toString();
-			const name = item.modules.module_author.name;
 			const timeline = this.dynamicTimelineManager.get(uid);
 			if (timeline === void 0) continue;
+			const postTime = getDynamicPostTime(author);
+			if (postTime === void 0) {
+				const rawPubTs = author.pub_ts;
+				this.logger.warn(`[detector] 跳过无效动态：无法解析发布时间，UID=${uid} ID=${item.id_str ?? "unknown"} type=${item.type ?? "unknown"} pub_ts_type=${typeof rawPubTs} pub_ts=${JSON.stringify(rawPubTs)} pub_time=${JSON.stringify(author.pub_time)}`);
+				continue;
+			}
+			const name = author.name;
 			this.logger.debug(`[detector] 检查动态 UP=${name} UID=${uid} 发布时间=${luxon.DateTime.fromSeconds(postTime).toFormat("yyyy-MM-dd HH:mm:ss")}`);
 			if (timeline >= postTime) continue;
 			const subAtCapture = this.dynamicSubManager.get(uid);
@@ -456,14 +545,15 @@ var DynamicEngine = class {
 					this.imageFailureStreak = 0;
 					this.imageFailureNotified = false;
 				}
-				let dUrl = "";
-				if (this.config.dynamicUrl) if (item.type === "DYNAMIC_TYPE_AV") {
+				const isVideo = item.type === "DYNAMIC_TYPE_AV";
+				let url = "";
+				if (this.config.dynamicUrl) if (isVideo) {
 					const jumpUrl = item.modules.module_dynamic.major?.archive?.jump_url ?? "";
 					if (this.config.dynamicVideoUrlToBV) {
 						const bvMatch = jumpUrl.match(/BV[0-9A-Za-z]+/);
-						dUrl = bvMatch ? bvMatch[0] : "";
-					} else dUrl = `${name}发布了新视频：https:${jumpUrl}`;
-				} else dUrl = `${name}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
+						url = bvMatch ? bvMatch[0] : "";
+					} else url = `https:${jumpUrl}`;
+				} else url = `https://t.bilibili.com/${item.id_str}`;
 				let aiComment;
 				if (this.ai && this.config.aiEnabled !== false) {
 					const dynamicText = extractDynamicText(item);
@@ -483,17 +573,18 @@ var DynamicEngine = class {
 					this.logger.debug(`[detector] UID=${uid} 在本轮处理中已退订/被替换，跳过推送`);
 					continue;
 				}
-				const textPart = aiComment ?? (dUrl || void 0);
+				const tmpl = isVideo ? sub?.customVideoTemplate ?? this.config.videoTemplate ?? DEFAULT_DYNAMIC_TEXT.video : sub?.customDynamicTemplate ?? this.config.dynamicTemplate ?? DEFAULT_DYNAMIC_TEXT.dynamic;
+				const text = aiComment ?? renderDynamicText(tmpl, name, url);
 				const segments = buffer ? [{
 					type: "image",
 					buffer,
 					mime: "image/jpeg"
-				}, ...textPart ? [{
+				}, ...text ? [{
 					type: "text",
-					text: textPart
+					text
 				}] : []] : [{
 					type: "text",
-					text: aiComment ?? `${name}发布了一条动态${dUrl ? `：${dUrl}` : ""}`
+					text
 				}];
 				await this.push.broadcastDynamic(uid, segments, "dynamic");
 				const subForImgs = this.dynamicSubManager.get(uid);

package/lib/index.d.cts

@@ -34,7 +34,7 @@ type Dynamic = {
       name: string;
       pub_action: string;
       pub_time: string;
-      pub_ts: number;
+      pub_ts?: number | string;
       type: string;
       [key: string]: any;
     };
@@ -180,6 +180,16 @@ interface SubItemView {
    * 单图永远不走合并转发(在 engine 内已守卫)。
    */
   imageGroupForward?: boolean;
+  /**
+   * Per-UP 非视频动态文本模板;undefined 继承 engine config `dynamicTemplate`。
+   * Adapter 折叠 `Subscription.overrides.templates.dynamic` 后填入。
+   */
+  customDynamicTemplate?: string;
+  /**
+   * Per-UP 视频投稿文本模板;undefined 继承 engine config `videoTemplate`。
+   * Adapter 折叠 `Subscription.overrides.templates.dynamicVideo` 后填入。
+   */
+  customVideoTemplate?: string;
 }
 type SubscriptionsView = Record<string, SubItemView>;
 type SubManagerView = Map<string, SubItemView>;
@@ -218,6 +228,17 @@ interface DynamicEngineConfig {
   dynamicCron: string;
   /** 视频动态时是否将 URL 替换为 BV 号。 */
   dynamicVideoUrlToBV: boolean;
+  /**
+   * 非视频动态的推送文本模板。变量 `{name}`(UP 名) / `{url}`(动态链接)。
+   * `{url}` 在 `dynamicUrl=false` 时为空,引擎会顺带去掉相邻分隔符。
+   * 缺省时回退到内建文案。Adapter 通常用 `globals.defaults.templates.dynamic` 填充。
+   */
+  dynamicTemplate?: string;
+  /**
+   * 视频投稿的推送文本模板。变量 `{name}` / `{url}`(视频链接或 BV)。
+   * 缺省时回退到内建文案。Adapter 通常用 `globals.defaults.templates.dynamicVideo` 填充。
+   */
+  videoTemplate?: string;
   /**
    * DYNAMIC_TYPE_DRAW 图集图片推送行为。enable=false 时跳过图集广播,
    * 只发文本/卡片。forward=true 时走合并转发(聊天记录卡片,走 OneBot

package/lib/index.d.mts

@@ -34,7 +34,7 @@ type Dynamic = {
       name: string;
       pub_action: string;
       pub_time: string;
-      pub_ts: number;
+      pub_ts?: number | string;
       type: string;
       [key: string]: any;
     };
@@ -180,6 +180,16 @@ interface SubItemView {
    * 单图永远不走合并转发(在 engine 内已守卫)。
    */
   imageGroupForward?: boolean;
+  /**
+   * Per-UP 非视频动态文本模板;undefined 继承 engine config `dynamicTemplate`。
+   * Adapter 折叠 `Subscription.overrides.templates.dynamic` 后填入。
+   */
+  customDynamicTemplate?: string;
+  /**
+   * Per-UP 视频投稿文本模板;undefined 继承 engine config `videoTemplate`。
+   * Adapter 折叠 `Subscription.overrides.templates.dynamicVideo` 后填入。
+   */
+  customVideoTemplate?: string;
 }
 type SubscriptionsView = Record<string, SubItemView>;
 type SubManagerView = Map<string, SubItemView>;
@@ -218,6 +228,17 @@ interface DynamicEngineConfig {
   dynamicCron: string;
   /** 视频动态时是否将 URL 替换为 BV 号。 */
   dynamicVideoUrlToBV: boolean;
+  /**
+   * 非视频动态的推送文本模板。变量 `{name}`(UP 名) / `{url}`(动态链接)。
+   * `{url}` 在 `dynamicUrl=false` 时为空,引擎会顺带去掉相邻分隔符。
+   * 缺省时回退到内建文案。Adapter 通常用 `globals.defaults.templates.dynamic` 填充。
+   */
+  dynamicTemplate?: string;
+  /**
+   * 视频投稿的推送文本模板。变量 `{name}` / `{url}`(视频链接或 BV)。
+   * 缺省时回退到内建文案。Adapter 通常用 `globals.defaults.templates.dynamicVideo` 填充。
+   */
+  videoTemplate?: string;
   /**
    * DYNAMIC_TYPE_DRAW 图集图片推送行为。enable=false 时跳过图集广播,
    * 只发文本/卡片。forward=true 时走合并转发(聊天记录卡片,走 OneBot

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { checkUserRegex, withLock } from "@bilibili-notify/internal";
+import { checkUserRegex, interpolate, withLock } from "@bilibili-notify/internal";
 import { CronJob } from "cron";
 import { DateTime } from "luxon";
 //#region src/types.ts
@@ -104,6 +104,89 @@ const LOG_TAG = "bilibili-notify-dynamic";
 * 后即自愈,无需人工重启进程。
 */
 const DETECTOR_RESTART_BACKOFF_MS = 5 * 6e4;
+/**
+* 动态推送文本模板的内建兜底,仅在 adapter 未填 config.dynamicTemplate /
+* videoTemplate 时使用(真实 adapter 都会从 globals.defaults.templates 填充)。
+* 与 `@bilibili-notify/internal` 的 `DEFAULT_TEMPLATES.dynamic/.dynamicVideo`
+* 保持一致。变量 `{name}`(UP 名) / `{url}`(链接,未启用 URL 时为空)。
+*/
+const DEFAULT_DYNAMIC_TEXT = {
+	dynamic: "{name}发布了一条动态：{url}",
+	video: "{name}发布了新视频：{url}"
+};
+/**
+* 渲染动态推送文本:`{name}` / `{url}` 插值 + `\n` 展开。`url` 为空(未启用 URL)
+* 时连同 `{url}` 的前导分隔符一起去掉,避免行尾残留孤立的「：」。两个推送分支
+* (有图 / 无图)都走此函数 → 文字内容一致。
+*/
+function renderDynamicText(template, name, url) {
+	return interpolate(url ? template : template.replace(/\s*[：:]?\s*\{url\}/g, ""), {
+		name,
+		url
+	}).replaceAll("\\n", "\n");
+}
+function parseUid(raw) {
+	if (typeof raw === "number" && Number.isFinite(raw)) return String(Math.trunc(raw));
+	if (typeof raw !== "string") return void 0;
+	const trimmed = raw.trim();
+	return /^\d+$/.test(trimmed) ? trimmed : void 0;
+}
+function normalizeUnixSeconds(raw) {
+	if (typeof raw !== "number" && typeof raw !== "string") return void 0;
+	if (typeof raw === "string" && !/^\d+(?:\.\d+)?$/.test(raw.trim())) return void 0;
+	const n = Number(raw);
+	if (!Number.isFinite(n) || n <= 0) return void 0;
+	if (n > 1e10) {
+		const seconds = Math.floor(n / 1e3);
+		return seconds <= 1e10 ? seconds : void 0;
+	}
+	return Math.floor(n);
+}
+function parsePubTimeFallback(raw, now = DateTime.now()) {
+	if (typeof raw !== "string") return void 0;
+	const text = raw.trim();
+	if (!text) return void 0;
+	if (text === "刚刚") return Math.floor(now.toSeconds());
+	const relative = text.match(/^(\d+)(秒|分钟|小时)前$/);
+	if (relative) {
+		const amount = Number(relative[1]);
+		if (!Number.isFinite(amount)) return void 0;
+		const unit = relative[2] === "秒" ? "seconds" : relative[2] === "分钟" ? "minutes" : "hours";
+		return Math.floor(now.minus({ [unit]: amount }).toSeconds());
+	}
+	const normalized = text.replace(/[年月]/g, "-").replace(/日/g, "").replace(/\//g, "-").replace(/\s+/g, " ");
+	for (const fmt of [
+		"yyyy-M-d H:mm:ss",
+		"yyyy-M-d H:mm",
+		"yyyy-M-d",
+		"M-d H:mm:ss",
+		"M-d H:mm"
+	]) {
+		let dt = DateTime.fromFormat(normalized, fmt);
+		if (!dt.isValid) continue;
+		if (!fmt.startsWith("yyyy")) {
+			dt = dt.set({ year: now.year });
+			if (dt > now.plus({ days: 1 })) dt = dt.minus({ years: 1 });
+		}
+		return Math.floor(dt.toSeconds());
+	}
+	const yesterday = normalized.match(/^昨天\s*(\d{1,2}):(\d{2})(?::(\d{2}))?$/);
+	if (yesterday) {
+		const hour = Number(yesterday[1]);
+		const minute = Number(yesterday[2]);
+		const second = Number(yesterday[3] ?? 0);
+		const dt = now.minus({ days: 1 }).set({
+			hour,
+			minute,
+			second,
+			millisecond: 0
+		});
+		return dt.isValid ? Math.floor(dt.toSeconds()) : void 0;
+	}
+}
+function getDynamicPostTime(author) {
+	return normalizeUnixSeconds(author.pub_ts) ?? parsePubTimeFallback(author.pub_time);
+}
 /** 从动态数据中提取图片 URL，用于多模态 AI 点评（最多 4 张） */
 function extractDynamicImages(item) {
 	const mod = item.modules.module_dynamic;
@@ -391,15 +474,21 @@ var DynamicEngine = class {
 		};
 		for (const item of content.data.items) {
 			if (!item) continue;
-			const postTime = item.modules.module_author.pub_ts;
-			if (typeof postTime !== "number" || !Number.isFinite(postTime)) {
-				this.logger.warn(`[detector] 跳过无效动态：pub_ts 缺失或非数字，ID=${item.id_str ?? "unknown"}`);
+			const author = item.modules?.module_author;
+			const uid = parseUid(author?.mid);
+			if (!uid) {
+				this.logger.debug(`[detector] 跳过无作者 UID 的动态，ID=${item.id_str ?? "unknown"}`);
 				continue;
 			}
-			const uid = item.modules.module_author.mid.toString();
-			const name = item.modules.module_author.name;
 			const timeline = this.dynamicTimelineManager.get(uid);
 			if (timeline === void 0) continue;
+			const postTime = getDynamicPostTime(author);
+			if (postTime === void 0) {
+				const rawPubTs = author.pub_ts;
+				this.logger.warn(`[detector] 跳过无效动态：无法解析发布时间，UID=${uid} ID=${item.id_str ?? "unknown"} type=${item.type ?? "unknown"} pub_ts_type=${typeof rawPubTs} pub_ts=${JSON.stringify(rawPubTs)} pub_time=${JSON.stringify(author.pub_time)}`);
+				continue;
+			}
+			const name = author.name;
 			this.logger.debug(`[detector] 检查动态 UP=${name} UID=${uid} 发布时间=${DateTime.fromSeconds(postTime).toFormat("yyyy-MM-dd HH:mm:ss")}`);
 			if (timeline >= postTime) continue;
 			const subAtCapture = this.dynamicSubManager.get(uid);
@@ -455,14 +544,15 @@ var DynamicEngine = class {
 					this.imageFailureStreak = 0;
 					this.imageFailureNotified = false;
 				}
-				let dUrl = "";
-				if (this.config.dynamicUrl) if (item.type === "DYNAMIC_TYPE_AV") {
+				const isVideo = item.type === "DYNAMIC_TYPE_AV";
+				let url = "";
+				if (this.config.dynamicUrl) if (isVideo) {
 					const jumpUrl = item.modules.module_dynamic.major?.archive?.jump_url ?? "";
 					if (this.config.dynamicVideoUrlToBV) {
 						const bvMatch = jumpUrl.match(/BV[0-9A-Za-z]+/);
-						dUrl = bvMatch ? bvMatch[0] : "";
-					} else dUrl = `${name}发布了新视频：https:${jumpUrl}`;
-				} else dUrl = `${name}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
+						url = bvMatch ? bvMatch[0] : "";
+					} else url = `https:${jumpUrl}`;
+				} else url = `https://t.bilibili.com/${item.id_str}`;
 				let aiComment;
 				if (this.ai && this.config.aiEnabled !== false) {
 					const dynamicText = extractDynamicText(item);
@@ -482,17 +572,18 @@ var DynamicEngine = class {
 					this.logger.debug(`[detector] UID=${uid} 在本轮处理中已退订/被替换，跳过推送`);
 					continue;
 				}
-				const textPart = aiComment ?? (dUrl || void 0);
+				const tmpl = isVideo ? sub?.customVideoTemplate ?? this.config.videoTemplate ?? DEFAULT_DYNAMIC_TEXT.video : sub?.customDynamicTemplate ?? this.config.dynamicTemplate ?? DEFAULT_DYNAMIC_TEXT.dynamic;
+				const text = aiComment ?? renderDynamicText(tmpl, name, url);
 				const segments = buffer ? [{
 					type: "image",
 					buffer,
 					mime: "image/jpeg"
-				}, ...textPart ? [{
+				}, ...text ? [{
 					type: "text",
-					text: textPart
+					text
 				}] : []] : [{
 					type: "text",
-					text: aiComment ?? `${name}发布了一条动态${dUrl ? `：${dUrl}` : ""}`
+					text
 				}];
 				await this.push.broadcastDynamic(uid, segments, "dynamic");
 				const subForImgs = this.dynamicSubManager.get(uid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bilibili-notify/dynamic",
-  "version": "0.0.1-alpha.3",
+  "version": "0.1.0-alpha.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/Akokk0/bilibili-notify"
@@ -30,8 +30,8 @@
     "luxon": "^3.5.0",
     "@bilibili-notify/ai": "^0.0.1-alpha.1",
     "@bilibili-notify/image": "^0.0.1-alpha.2",
-    "@bilibili-notify/api": "^0.2.0-alpha.2",
-    "@bilibili-notify/internal": "^0.1.0-alpha.2"
+    "@bilibili-notify/internal": "^0.1.0-alpha.4",
+    "@bilibili-notify/api": "^0.2.0-alpha.2"
   },
   "devDependencies": {
     "@types/luxon": "^3.4.2"