karin-plugin-kkk 2.45.0-beta.3 → 2.45.0-beta.5

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 # Changelog
 
+## [2.45.0-beta.5](https://github.com/ikenxuan/karin-plugin-kkk/compare/v2.45.0-beta.4...v2.45.0-beta.5) (2026-10-06)
+
+
+### 🐛 错误修复
+
+* 更新 node-karin 依赖版本至 1.18.0 ([42ef2e2](https://github.com/ikenxuan/karin-plugin-kkk/commit/42ef2e2729556b7a4c75c68f7ee1714b6581ced2))
+
+## [2.45.0-beta.4](https://github.com/ikenxuan/karin-plugin-kkk/compare/v2.45.0-beta.3...v2.45.0-beta.4) (2026-10-06)
+
+
+### 🐛 错误修复
+
+* 优化更新检测逻辑，支持逐渠道版本锁定与提醒 ([ddfd011](https://github.com/ikenxuan/karin-plugin-kkk/commit/ddfd011ac3bcd49789870a2e154003973c52cea9))
+* 优化更新逻辑以支持金丝雀用户的版本解锁和范围起点解析 ([4a28ce5](https://github.com/ikenxuan/karin-plugin-kkk/commit/4a28ce55b82115683713ad6985d456751f151c23))
+
 ## [2.45.0-beta.3](https://github.com/ikenxuan/karin-plugin-kkk/compare/v2.45.0-beta.2...v2.45.0-beta.3) (2026-10-06)
 
 

package/lib/build-metadata.json

@@ -1,10 +1,10 @@
 {
-  "version": "2.45.0-beta.3",
-  "buildTime": "2026-10-06T06:00:56.704Z",
-  "buildTimestamp": 1791266456705,
+  "version": "2.45.0-beta.5",
+  "buildTime": "2026-10-06T08:25:30.584Z",
+  "buildTimestamp": 1791275130584,
   "name": "karin-plugin-kkk",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "homepage": "https://github.com/ikenxuan/karin-plugin-kkk",
-  "commitHash": "030579c9a3c0615a5bb50526953874b9109ba9ad",
-  "shortCommitHash": "030579c9"
+  "commitHash": "29a1c8b38919021e5788a3ab88067b20104e9d96",
+  "shortCommitHash": "29a1c8b3"
 }

package/lib/core_chunk/main.js

@@ -7841,8 +7841,17 @@ var Render = async (event, path, data) => {
 	const templateType = path.split("/")[0];
 	let hasUpdate = false;
 	try {
-		const lockedVersion = await db.get("kkk:update:lock");
-		if (typeof lockedVersion === "string" && lockedVersion.length > 0) hasUpdate = isSemverGreater(lockedVersion, Root.pluginVersion);
+		for (const channel of [
+			"stable",
+			"beta",
+			"rc"
+		]) {
+			const lockedVersion = await db.get(`kkk:update:lock:${channel}`);
+			if (typeof lockedVersion === "string" && lockedVersion.length > 0 && isSemverGreater(lockedVersion, Root.pluginVersion)) {
+				hasUpdate = true;
+				break;
+			}
+		}
 	} catch {}
 	const useDarkTheme = await resolveUseDarkTheme(path, data);
 	const result = await renderTemplate(path, data, {
@@ -24561,6 +24570,15 @@ var updateHelp_default = defineTemplate({
 				active: true
 			};
 			const order = semverCompare(channel.version ?? "0.0.0", data.currentVersion);
+			if (channel.hasUpdate !== void 0) return channel.hasUpdate ? {
+				dot: palette.success,
+				text: "有更新可升级",
+				active: true
+			} : {
+				dot: palette.faint,
+				text: order < 0 ? "低于当前版本" : "已是最新",
+				active: false
+			};
 			if (order > 0) return {
 				dot: palette.success,
 				text: "有更新可升级",
@@ -40321,6 +40339,23 @@ var getLagVersionCount = (changelog, localVersion, remoteVersion) => {
 	}).length;
 };
 /**
+* 金丝雀用户的 range 起点解析：semver 的 ASCII 序（beta < canary）无法表达
+* 「发布晚于本机构建」——改按 pkg.pr.new 发布历史的时间线，取本机构建时间
+* 之前的最后一个发布版本作为 range 起点。失败返回 undefined（回退 semver）。
+*/
+var resolveCanaryRangeStart = async (buildTimestamp) => {
+	if (!buildTimestamp) return void 0;
+	try {
+		const nodes = (await axios.get("https://pkg.pr.new/api/repo/commits?owner=ikenxuan&repo=karin-plugin-kkk", { timeout: 1e4 })).data?.target?.history?.nodes;
+		if (!Array.isArray(nodes)) return void 0;
+		for (const n of nodes) {
+			const t = n.authoredDate ? new Date(n.authoredDate).getTime() : 0;
+			const v = /v?(\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?)/.exec(n.message ?? "")?.[1];
+			if (t > 0 && t <= buildTimestamp && v) return v;
+		}
+	} catch {}
+};
+/**
 * 获取远程构建元数据
 * @param version 远程版本号
 * @returns 构建元数据对象，如果获取失败则返回 null
@@ -40393,9 +40428,10 @@ var getChangelogImage = async (ctx, props) => {
 		lagVersionCount = getLagVersionCount(changelog, props.localVersion, props.remoteVersion);
 		const remoteMeta = await getRemoteBuildMetadata(props.remoteVersion);
 		if (remoteMeta?.buildTime) buildTime = formatBuildTime(remoteMeta.buildTime);
+		const rangeStart = parseReleaseChannel(props.localVersion) === "Canary" ? await resolveCanaryRangeStart(getBuildMetadata()?.buildTimestamp) ?? props.localVersion : props.localVersion;
 		changelog = range({
 			data: changelog,
-			startVersion: props.localVersion,
+			startVersion: rangeStart,
 			endVersion: versionCore(props.remoteVersion),
 			compare: "semver"
 		});
@@ -40403,9 +40439,10 @@ var getChangelogImage = async (ctx, props) => {
 		try {
 			changelog = fs.readFileSync(Root.pluginPath + "/CHANGELOG.md", "utf8");
 			lagVersionCount = getLagVersionCount(changelog, props.localVersion, props.remoteVersion);
+			const rangeStart = parseReleaseChannel(props.localVersion) === "Canary" ? await resolveCanaryRangeStart(getBuildMetadata()?.buildTimestamp) ?? props.localVersion : props.localVersion;
 			changelog = range({
 				data: changelog,
-				startVersion: props.localVersion,
+				startVersion: rangeStart,
 				endVersion: versionCore(props.remoteVersion),
 				compare: "semver"
 			});
@@ -40428,45 +40465,64 @@ var getChangelogImage = async (ctx, props) => {
 };
 //#endregion
 //#region src/apps/update.ts
-var UPDATE_LOCK_KEY = "kkk:update:lock";
+/** 更新提醒的订阅渠道（与面板 UpdateNotifyChannels 可选项一致） */
+var UPDATE_CHANNELS = [
+	"stable",
+	"beta",
+	"rc"
+];
+/** 各渠道更新提醒锁：记录该渠道上次已推送的版本，检测到新版本推送一次后上锁 */
+var updateLockKey = (channel) => `kkk:update:lock:${channel}`;
 var UPDATE_MSGID_KEY = "kkk:update:msgid";
+/** 推送图对应的安装目标版本（引用回复推送图「更新」时安装它） */
+var UPDATE_PUSHED_KEY = "kkk:update:pushed";
 /**
 * 定时更新检测处理器
-* 按订阅渠道检查远程版本（latest 恒参与 —— 装 prerelease 的用户也要收到转正提醒），
-* 候选取 semver 最大且大于本地者，渲染变更日志并私聊通知所有主人。
+* 逐渠道检查远程 dist-tag 版本：检测到该渠道有新版本就推送一次然后上锁，
+* 各渠道锁相互独立、互不挤占；金丝雀安装按构建时间线判定新版本。
 *
 * @returns 是否继续后续任务
 */
 var Handler = async () => {
-	const tags = ["latest", ...(Config.app.UpdateNotifyChannels?.length ? Config.app.UpdateNotifyChannels : ["stable"]).filter((c) => c !== "stable")];
+	const channels = Config.app.UpdateNotifyChannels?.length ? Config.app.UpdateNotifyChannels : ["stable"];
+	const tagOf = (c) => c === "stable" ? "latest" : c;
 	const installedIsCanary = parseReleaseChannel(Root.pluginVersion) === "Canary";
 	const installedBuildTime = getBuildMetadata()?.buildTimestamp;
-	const remotes = await Promise.all(tags.map(async (tag) => {
+	const tagVersions = /* @__PURE__ */ new Map();
+	await Promise.all([...new Set(channels.map(tagOf))].map(async (tag) => {
 		try {
-			return await getRemotePkgVersion(Root.pluginName, tag) || null;
+			if (!installedIsCanary) {
+				const upd = await checkPkgUpdate(Root.pluginName, {
+					tag,
+					compare: "semver"
+				});
+				tagVersions.set(tag, upd.status === "yes" ? upd.remote : null);
+			} else tagVersions.set(tag, await getRemotePkgVersion(Root.pluginName, tag) || null);
 		} catch {
-			return null;
+			tagVersions.set(tag, null);
 		}
 	}));
 	const canaryInfo = installedIsCanary ? await fetchCanaryInfo() : null;
-	const remote = [...new Set(remotes.filter((v) => !!v))].filter((version) => {
+	const isNewVersion = (version) => {
 		if (installedIsCanary && installedBuildTime !== void 0) {
 			const releaseNode = canaryInfo?.nodes.find((n) => n.message.includes(version));
 			if (releaseNode) return releaseNode.time > installedBuildTime;
 		}
 		return isSemverGreater(version, Root.pluginVersion);
-	}).sort((a, b) => isSemverGreater(b, a) ? 1 : -1)[0];
-	if (!remote) return true;
-	try {
-		const lockedVersion = await db.get(UPDATE_LOCK_KEY);
-		if (typeof lockedVersion === "string" && lockedVersion.length > 0) {
-			if (!isSemverGreater(lockedVersion, Root.pluginVersion)) await db.del(UPDATE_LOCK_KEY);
-			else if (!isSemverGreater(remote, lockedVersion)) return true;
-		}
-	} catch {}
-	try {
-		await db.set(UPDATE_LOCK_KEY, remote);
-	} catch {}
+	};
+	const pending = /* @__PURE__ */ new Set();
+	for (const channel of channels) {
+		const version = tagVersions.get(tagOf(channel)) ?? null;
+		if (!version || !isNewVersion(version)) continue;
+		try {
+			const locked = await db.get(updateLockKey(channel));
+			if (typeof locked === "string" && locked === version) continue;
+			await db.set(updateLockKey(channel), version);
+		} catch {}
+		pending.add(version);
+	}
+	if (pending.size === 0) return true;
+	const installTarget = [...pending].sort((a, b) => isSemverGreater(b, a) ? 1 : -1)[0];
 	const masters = config.master().filter((id) => id !== "console");
 	if (masters.length === 0) return true;
 	const botItems = karin.getAllBotList().filter((b) => b.bot.account.name !== "console");
@@ -40486,12 +40542,16 @@ var Handler = async () => {
 	const botToImage = /* @__PURE__ */ new Map();
 	for (const item of botItems) {
 		if (!Array.from(masterToBot.entries()).some(([, b]) => b.account.selfId === item.bot.account.selfId)) continue;
-		const img = await getChangelogImage({ bot: item.bot }, {
-			localVersion: Root.pluginVersion,
-			remoteVersion: remote,
-			Tip: true
-		});
-		if (img && img.length > 0) botToImage.set(item.bot.account.selfId, [segment.text("karin-plugin-kkk 有新的更新！"), ...img]);
+		const elements = [segment.text("karin-plugin-kkk 有新的更新！")];
+		for (const version of pending) {
+			const img = await getChangelogImage({ bot: item.bot }, {
+				localVersion: Root.pluginVersion,
+				remoteVersion: version,
+				Tip: true
+			});
+			if (img && img.length > 0) elements.push(...img);
+		}
+		if (elements.length > 1) botToImage.set(item.bot.account.selfId, elements);
 	}
 	let storedMsgId;
 	for (const owner of masters) {
@@ -40504,10 +40564,16 @@ var Handler = async () => {
 	}
 	if (storedMsgId) try {
 		await db.set(UPDATE_MSGID_KEY, storedMsgId);
+		await db.set(UPDATE_PUSHED_KEY, installTarget);
 	} catch {}
 	return true;
 };
 var handleUpdateHook = wrapWithErrorHandler(async (e) => {
+	const pushedVersion = await db.get(UPDATE_PUSHED_KEY);
+	if (typeof pushedVersion === "string" && pushedVersion) {
+		await installAndRestart(e, pushedVersion);
+		return;
+	}
 	e.reply("开始更新 karin-plugin-kkk ...", { reply: true });
 	const upd = await checkPkgUpdate(Root.pluginName, { compare: "semver" });
 	if (upd.status === "yes") {
@@ -40516,7 +40582,8 @@ var handleUpdateHook = wrapWithErrorHandler(async (e) => {
 			const msgResult = await e.reply(`${Root.pluginName} 更新成功！\n${result.local} -> ${result.remote}\n开始执行重启......`);
 			if (msgResult.messageId) try {
 				await db.del(UPDATE_MSGID_KEY);
-				await db.del(UPDATE_LOCK_KEY);
+				await db.del(UPDATE_PUSHED_KEY);
+				for (const ch of UPDATE_CHANNELS) await db.del(updateLockKey(ch));
 			} catch {}
 			await restart(e.selfId, e.contact, msgResult.messageId);
 		} else e.reply(`${Root.pluginName} 更新失败: ${result.data ?? "更新执行失败"}`);
@@ -40586,7 +40653,8 @@ var installAndRestart = async (e, version) => {
 	const msgResult = await e.reply(`${Root.pluginName} 更新成功！→ ${version}\n开始执行重启......`);
 	if (msgResult.messageId) try {
 		await db.del(UPDATE_MSGID_KEY);
-		await db.del(UPDATE_LOCK_KEY);
+		await db.del(UPDATE_PUSHED_KEY);
+		for (const ch of UPDATE_CHANNELS) await db.del(updateLockKey(ch));
 	} catch {}
 	await restart(e.selfId, e.contact, msgResult.messageId);
 };
@@ -40743,7 +40811,8 @@ var kkkUpdateCommand = karin.command(/^#?kkk更新(?:\s*(\S+))?$/, handleKkkUpda
 });
 var kkkUpdateTest = process.env.NODE_ENV === "development" && karin.command("test", async (_e, next) => {
 	await db.del(UPDATE_MSGID_KEY);
-	await db.del(UPDATE_LOCK_KEY);
+	await db.del(UPDATE_PUSHED_KEY);
+	for (const ch of UPDATE_CHANNELS) await db.del(updateLockKey(ch));
 	await Handler();
 	next();
 }, { name: "kkk-更新检测-测试" });
@@ -41716,7 +41785,7 @@ app$1.use(ASSETS_PREFIX, staticRouter);
 app.use(KKK_PREFIX, app$1);
 //#endregion
 //#region src/setup.ts
-var requireVersion = "1.16.3";
+var requireVersion = "1.18.0";
 if (process.env.NODE_ENV !== "development" && isSemverGreater(requireVersion, Root.karinVersion)) {
 	const msg = `插件构建时的 karin 版本 (${requireVersion}) 高于当前运行版本 (${Root.karinVersion})，可能会出现兼容性问题！`;
 	logger$1.warn(msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "2.45.0-beta.3",
+  "version": "2.45.0-beta.5",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "keywords": [
     "karin",
@@ -83,7 +83,7 @@
     "@lobehub/webfont-harmony-sans-sc": "^1.0.0",
     "emoji-datasource-apple": "16.0.0"
   },
-  "timestamp": "2026-10-06T05:59:30.186Z",
+  "timestamp": "2026-10-06T08:24:09.485Z",
   "engines": {
     "node": ">=18.0.0"
   }