karin-plugin-kkk 2.45.0-beta.1 → 2.45.0-beta.4

package/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 # Changelog
 
+## [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.json 文件 ([499ef1d](https://github.com/ikenxuan/karin-plugin-kkk/commit/499ef1d824a4b34b09101accd6988929569d0354))
+
+## [2.45.0-beta.2](https://github.com/ikenxuan/karin-plugin-kkk/compare/v2.45.0-beta.1...v2.45.0-beta.2) (2026-10-06)
+
+
+### 🐛 错误修复
+
+* 添加 @clack/prompts 依赖并更新发版脚本以使用交互式版本选择 ([dd18fc2](https://github.com/ikenxuan/karin-plugin-kkk/commit/dd18fc23993d6b9ca6185cb4a75190a16f9c3dab))
+* 移除不必要的 bumpp 依赖，并优化本地发版脚本 ([4123512](https://github.com/ikenxuan/karin-plugin-kkk/commit/4123512b404009daa34512cc57a375c3de0c8462))
+* ci ([5767211](https://github.com/ikenxuan/karin-plugin-kkk/commit/57672119b6502ba9717eaf3a45dcf0b65ec9d36f))
+* 规范化短哈希长度为 7 位，以避免构建指纹误判 ([de02dcc](https://github.com/ikenxuan/karin-plugin-kkk/commit/de02dcc39bf4d75178e21f2c947d827f43b11e14))
+* ci ([d38ef28](https://github.com/ikenxuan/karin-plugin-kkk/commit/d38ef28a1c17717ea42341b10a6bcbf2b60849ae))
+* ci ([c7ddce5](https://github.com/ikenxuan/karin-plugin-kkk/commit/c7ddce59ae8b60fc4c120b79cd3d191f96a69e1b))
+* 回退版本号至 2.44.1，并修复 dry 模式下版本号验证逻辑 ([eabd9aa](https://github.com/ikenxuan/karin-plugin-kkk/commit/eabd9aa457d5ad098d7967304990ad8648073956))
+* 优化版本比较逻辑，支持金丝雀用户的构建时间线判定 ([d811024](https://github.com/ikenxuan/karin-plugin-kkk/commit/d811024eeff8dfa28b70be7ecb0443011b2176e0))
+* release 发布前剥离 devDeps，修复 GPR 报告步骤路径 ([2f02b22](https://github.com/ikenxuan/karin-plugin-kkk/commit/2f02b2294ade62b7b336363462e3cc8785d75217))
+* 金丝雀用户的面板比较改为构建时间线判定 ([7aa712d](https://github.com/ikenxuan/karin-plugin-kkk/commit/7aa712dcf22113c58602629cec13115c62eefb9d))
+
 ## [2.45.0-beta.1](https://github.com/ikenxuan/karin-plugin-kkk/compare/v2.44.0...v2.45.0-beta.1) (2026-10-06)
 
 

package/lib/build-metadata.json

@@ -1,10 +1,10 @@
 {
-  "version": "2.45.0-beta.1",
-  "buildTime": "2026-10-06T02:14:05.625Z",
-  "buildTimestamp": 1791252845626,
+  "version": "2.45.0-beta.4",
+  "buildTime": "2026-10-06T07:34:14.563Z",
+  "buildTimestamp": 1791272054563,
   "name": "karin-plugin-kkk",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "homepage": "https://github.com/ikenxuan/karin-plugin-kkk",
-  "commitHash": "292844e1ea45d460c6a677436ae4aa49655419c9",
-  "shortCommitHash": "292844e1"
+  "commitHash": "e6ff6df77f6305256a35f531a2f0c26f95fa3341",
+  "shortCommitHash": "e6ff6df7"
 }

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, {
@@ -24551,12 +24560,25 @@ var updateHelp_default = defineTemplate({
 				text: "获取失败",
 				active: false
 			};
-			if (channel.status === "canary") return {
+			if (channel.status === "canary") return channel.hasUpdate ? {
+				dot: palette.success,
+				text: "有新构建可升级",
+				active: true
+			} : {
 				dot: palette.accentText,
 				text: "main 分支构建",
 				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: "有更新可升级",
@@ -40317,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
@@ -40389,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"
 		});
@@ -40399,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"
 			});
@@ -40424,36 +40465,55 @@ 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";
 /**
 * 定时更新检测处理器
-* 按订阅渠道检查远程版本（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 remotes = await Promise.all(tags.map(async (tag) => {
+	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 tagVersions = /* @__PURE__ */ new Map();
+	await Promise.all([...new Set(channels.map(tagOf))].map(async (tag) => {
 		try {
-			return await getRemotePkgVersion(Root.pluginName, tag) || null;
+			tagVersions.set(tag, await getRemotePkgVersion(Root.pluginName, tag) || null);
 		} catch {
-			return null;
+			tagVersions.set(tag, null);
 		}
 	}));
-	const remote = [...new Set(remotes.filter((v) => !!v))].filter((v) => isSemverGreater(v, 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;
+	const canaryInfo = installedIsCanary ? await fetchCanaryInfo() : null;
+	const isNewVersion = (version) => {
+		if (installedIsCanary && installedBuildTime !== void 0) {
+			const releaseNode = canaryInfo?.nodes.find((n) => n.message.includes(version));
+			if (releaseNode) return releaseNode.time > installedBuildTime;
 		}
-	} catch {}
-	try {
-		await db.set(UPDATE_LOCK_KEY, remote);
-	} catch {}
+		return isSemverGreater(version, Root.pluginVersion);
+	};
+	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 masters = config.master().filter((id) => id !== "console");
 	if (masters.length === 0) return true;
 	const botItems = karin.getAllBotList().filter((b) => b.bot.account.name !== "console");
@@ -40473,12 +40533,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) {
@@ -40503,7 +40567,7 @@ 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);
+				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 ?? "更新执行失败"}`);
@@ -40573,29 +40637,36 @@ 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);
+		for (const ch of UPDATE_CHANNELS) await db.del(updateLockKey(ch));
 	} catch {}
 	await restart(e.selfId, e.contact, msgResult.messageId);
 };
 /** pkg.pr.new 仓库（金丝雀数据源，只跟踪 main 分支构建） */
 var PKG_PR_NEW_REPO = "ikenxuan/karin-plugin-kkk";
-/** 拉取 pkg.pr.new 上 main 分支的最新金丝雀构建（失败返回 null，由调用方降级展示） */
-var fetchLatestCanary = async () => {
+/** 拉取 pkg.pr.new 的发布历史与 main 分支最新构建（失败返回 null，由调用方降级展示） */
+var fetchCanaryInfo = async () => {
 	try {
 		const [owner, repo] = PKG_PR_NEW_REPO.split("/");
 		const nodes = (await axios.get(`https://pkg.pr.new/api/repo/commits?owner=${owner}&repo=${repo}`, { timeout: 1e4 })).data?.target?.history?.nodes;
 		if (!Array.isArray(nodes)) return null;
-		const node = nodes.find((n) => n.branch === "main" && n.statusCheckRollup?.contexts?.nodes?.some((c) => c.packages?.some((pkg) => pkg.installUrl)));
-		const pkg = node?.statusCheckRollup?.contexts?.nodes?.flatMap((c) => c.packages ?? []).find((p) => p.installUrl);
-		if (!node?.abbreviatedOid || !pkg?.installUrl) return null;
+		const history = nodes.map((n) => ({
+			sha: (n.abbreviatedOid ?? "").slice(0, 7),
+			time: n.authoredDate ? new Date(n.authoredDate).getTime() : 0,
+			message: n.message ?? ""
+		}));
+		const mainNode = nodes.find((n) => n.branch === "main" && n.statusCheckRollup?.contexts?.nodes?.some((c) => c.packages?.some((pkg) => pkg.installUrl)));
+		const pkg = mainNode?.statusCheckRollup?.contexts?.nodes?.flatMap((c) => c.packages ?? []).find((p) => p.installUrl);
+		if (!mainNode?.abbreviatedOid || !pkg?.installUrl) return null;
 		return {
-			label: "金丝雀",
-			tag: "pkg.pr.new · main",
-			status: "canary",
-			version: node.abbreviatedOid.slice(0, 7),
-			installCommand: `pnpm add ${pkg.installUrl} -w`,
-			publishedAt: node.authoredDate,
-			commitMessage: node.message?.slice(0, 40)
+			channel: {
+				label: "金丝雀",
+				tag: "pkg.pr.new · main",
+				status: "canary",
+				version: mainNode.abbreviatedOid.slice(0, 7),
+				installCommand: `pnpm add ${pkg.installUrl} -w`,
+				publishedAt: mainNode.authoredDate
+			},
+			nodes: history
 		};
 	} catch {
 		return null;
@@ -40608,6 +40679,10 @@ var getUpdateHelpImage = async (e) => {
 	if (status) try {
 		distTags = JSON.parse(stdout.toString());
 	} catch {}
+	const canaryInfo = await fetchCanaryInfo();
+	const installedIsCanary = parseReleaseChannel(Root.pluginVersion) === "Canary";
+	const build = getBuildMetadata();
+	const installedBuildTime = build?.buildTimestamp;
 	const channels = [
 		{
 			label: "正式版",
@@ -40634,6 +40709,15 @@ var getUpdateHelpImage = async (e) => {
 			...def,
 			status: "missing"
 		};
+		if (installedIsCanary && installedBuildTime !== void 0) {
+			const releaseNode = canaryInfo?.nodes.find((n) => n.message.includes(version));
+			if (releaseNode) return {
+				...def,
+				status: "ok",
+				version,
+				hasUpdate: releaseNode.time > installedBuildTime
+			};
+		}
 		return {
 			...def,
 			status: "ok",
@@ -40641,11 +40725,14 @@ var getUpdateHelpImage = async (e) => {
 			hasUpdate: isSemverGreater(version, Root.pluginVersion)
 		};
 	});
-	channels.push(await fetchLatestCanary() ?? {
+	const canaryChannel = canaryInfo?.channel ?? {
 		label: "金丝雀",
 		tag: "pkg.pr.new · main",
 		status: "error"
-	});
+	};
+	const installedSha = (build?.shortCommitHash ?? "").slice(0, 7);
+	if (installedIsCanary && canaryChannel.status === "canary" && installedSha) canaryChannel.hasUpdate = installedSha !== canaryChannel.version;
+	channels.push(canaryChannel);
 	return await Render(e, "other/updateHelp", {
 		currentVersion: Root.pluginVersion,
 		currentChannel: RELEASE_CHANNEL_LABEL[parseReleaseChannel(Root.pluginVersion)],
@@ -40707,7 +40794,7 @@ 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);
+	for (const ch of UPDATE_CHANNELS) await db.del(updateLockKey(ch));
 	await Handler();
 	next();
 }, { name: "kkk-更新检测-测试" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "2.45.0-beta.1",
+  "version": "2.45.0-beta.4",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "keywords": [
     "karin",
@@ -57,47 +57,6 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "dependencies": {
-    "@ikenxuan/qrcode": "1.5.0",
-    "@lobehub/webfont-geist-mono": "^1.0.0",
-    "@lobehub/webfont-harmony-sans-sc": "^1.0.0",
-    "emoji-datasource-apple": "16.0.0"
-  },
-  "devDependencies": {
-    "@heroui/react": "3.2.5",
-    "@icons-pack/react-simple-icons": "^13.15.1",
-    "@ikenxuan/amagi": "7.0.0-beta.7",
-    "@karinjs/adapter-qqbot": "3.3.0",
-    "@karinjs/plugin-adapter-milky": "^1.3.3",
-    "@karinjs/plugin-basic": "1.4.13",
-    "@karinjs/plugin-ffmpeg": "^0.1.3",
-    "@karinjs/plugin-shotium": "^0.3.2",
-    "@karinjs/template-react": "^0.2.0",
-    "@kkk/richtext": "0.1.0",
-    "@outpacelabs/avatars": "^0.6.0",
-    "@phosphor-icons/react": "^2.1.10",
-    "@thesvg/icons": "^3.3.7",
-    "@types/heic-decode": "^2.0.0",
-    "@types/react": "19.3.0",
-    "@types/react-dom": "19.3.0",
-    "clsx": "^2.1.1",
-    "date-fns": "^4.4.0",
-    "echarts": "^6.1.0",
-    "heic-decode": "^2.1.0",
-    "highlight.js": "^11.12.0",
-    "jpeg-js": "^0.4.4",
-    "lucide-react": "^1.46.0",
-    "react": "^19.3.0",
-    "react-dom": "^19.3.0",
-    "react-icons": "^5.7.0",
-    "react-markdown": "^10.1.0",
-    "rehype-highlight": "^7.0.2",
-    "tailwind-merge": "3.7.0",
-    "vitest": "^5.0.1"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
   "karin": {
     "engines": ">=1.14.0",
     "main": "src/index.ts",
@@ -118,17 +77,14 @@
     "web": "./lib/web.config.js",
     "ts-web": "./src/web.config.ts"
   },
-  "timestamp": "2026-10-06T01:55:55.084Z",
-  "scripts": {
-    "build": "cross-env NODE_ENV=production vite build",
-    "build:check": "ktr sync && tsc --noEmit && pnpm build",
-    "dev": "ktr sync && cross-env EBV_FILE=\"development.env\" node --import tsx src/app.ts --trace-deprecation",
-    "template": "ktr sync && ktr dev",
-    "typecheck": "ktr sync && tsc --noEmit",
-    "gen:emoji": "node scripts/gen-emoji-assets.mjs",
-    "pub": "npm publish --access public",
-    "sort": "sort-package-json",
-    "sync": "curl -X PUT \"https://registry-direct.npmmirror.com/-/package/karin-plugin-kkk/syncs\"",
-    "watch": "ktr sync && cross-env EBV_FILE=\"development.env\" tsx watch --include \"src/**/*.ts\" --include \"ktr/**/*.ts\" --include \"ktr/**/*.tsx\" src/app.ts --trace-deprecation"
+  "dependencies": {
+    "@ikenxuan/qrcode": "1.5.0",
+    "@lobehub/webfont-geist-mono": "^1.0.0",
+    "@lobehub/webfont-harmony-sans-sc": "^1.0.0",
+    "emoji-datasource-apple": "16.0.0"
+  },
+  "timestamp": "2026-10-06T07:32:55.907Z",
+  "engines": {
+    "node": ">=18.0.0"
   }
 }