@bilibili-notify/dynamic 0.1.0-alpha.4 → 0.1.0-alpha.5

package/lib/index.cjs

@@ -126,6 +126,68 @@ function renderDynamicText(template, name, url) {
 		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;
@@ -413,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);

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;
     };

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;
     };

package/lib/index.mjs

@@ -125,6 +125,68 @@ function renderDynamicText(template, name, url) {
 		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;
@@ -412,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);

package/package.json

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