@bilibili-notify/live 0.0.1-alpha.3 → 0.1.0-alpha.4

package/lib/index.cjs

@@ -499,37 +499,41 @@ var RoomContext = class extends RoomContextBase {
 * - `customSpecialDanmakuUsers.msgTemplate`
 * - `customSpecialUsersEnterTheRoom.msgTemplate`
 *
-* The variable syntax follows the existing `-name` / `-time` / `-watched` style
-* (NOT the `{key}` syntax used by `@bilibili-notify/internal`'s `interpolate`),
-* because that's what users have in their existing Koishi configs and we keep
-* 1:1 backward compatibility.
+* 占位符统一 `{name}` / `{time}` / `{watched}` 语法(与 `@bilibili-notify/internal`
+* 的 `interpolate` 同源)。`applyTemplate` 同时接受 koishi 旧存档里的 legacy
+* `-name` / `-time` 写法 —— 老用户已保存的 `-key` 模板继续生效,新默认与文档
+* 一律走 `{key}`,二者不冲突(单遍正则,longest-first)。
 */
 /** Defaults applied when neither sub-level nor global config provides a template. */
 const DEFAULT_LIVE_TEMPLATES = {
-	liveStart: "-name 开播啦，当前粉丝数：-follower\n-link",
-	liveOngoing: "-name 正在直播，已播 -time，累计观看：-watched\n-link",
-	liveEnd: "-name 下播啦，本次直播了 -time，粉丝变化 -follower_change",
+	liveStart: "{name} 开播啦，当前粉丝数：{follower}\n{link}",
+	liveOngoing: "{name} 正在直播，已播 {time}，累计观看：{watched}\n{link}",
+	liveEnd: "{name} 下播啦，本次直播了 {time}，粉丝变化 {follower_change}",
 	liveSummaryFallback: "弹幕总结"
 };
 function escapeRegExp(s) {
 	return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 /**
-* 单遍替换所有变量 token,再把 `\n` 转义展开为真换行。
+* 单遍替换所有变量 token,再把 `\n` 转义展开为真换行。`vars` 以**裸键**(`name`/
+* `follower_change`)给出,每个键同时匹配 `{name}`(主)与 legacy `-name`(兼容)。
 *
 * P2:此前 `for…replaceAll` 顺序替换有两个缺陷 ——
-*  1. **token 注入**:用户可控值(uname / 弹幕内容)含 `-link`/`-time` 时
+*  1. **token 注入**:用户可控值(uname / 弹幕内容)含 `{link}`/`-link` 时
 *     会被后续轮次再次替换;
-*  2. **前缀吞噬**:`-follower` 先于 `-follower_change` 替换,把后者的
+*  2. **前缀吞噬**:legacy `-follower` 先于 `-follower_change` 替换,把后者的
 *     `-follower` 段吃掉只剩 `_change`。
-* 改为基于原始模板的**单遍正则**:token 按长度降序进 alternation(最长优先
-* 匹配),每个 token 恰好替换一次且替换值不再被回扫 → 杜绝注入与吞噬。
+* 改为基于原始模板的**单遍正则**:键按长度降序进 alternation(最长优先匹配),
+* 每个 token 恰好替换一次且替换值不再被回扫 → 杜绝注入与吞噬。
 */
 function applyTemplate(template, vars) {
 	const keys = Object.keys(vars).sort((a, b) => b.length - a.length);
 	if (keys.length === 0) return template.replaceAll("\\n", "\n");
-	const re = new RegExp(keys.map(escapeRegExp).join("|"), "g");
-	return template.replace(re, (m) => vars[m] ?? m).replaceAll("\\n", "\n");
+	const alts = keys.flatMap((k) => [`\\{${escapeRegExp(k)}\\}`, `-${escapeRegExp(k)}`]);
+	const re = new RegExp(alts.join("|"), "g");
+	return template.replace(re, (m) => {
+		return vars[m.charCodeAt(0) === 123 ? m.slice(1, -1) : m.slice(1)] ?? m;
+	}).replaceAll("\\n", "\n");
 }
 /**
 * Format follower-change as a signed magnitude string with a 1万 (10K) cutoff,
@@ -559,27 +563,27 @@ var LiveTemplateRenderer = class {
 	/** Compose the "开播" notification text for a sub. */
 	renderLiveStart(params) {
 		return applyTemplate(resolveCustomLive(params.sub.customLiveMsg, params.globalCustom, "customLiveStart", DEFAULT_LIVE_TEMPLATES.liveStart), {
-			"-name": params.master.username,
-			"-time": params.diffTime,
-			"-follower": params.followerNum,
-			"-link": params.roomLink
+			name: params.master.username,
+			time: params.diffTime,
+			follower: params.followerNum,
+			link: params.roomLink
 		});
 	}
 	/** Compose the periodic "正在直播" notification text. */
 	renderLiveOngoing(params) {
 		return applyTemplate(resolveCustomLive(params.sub.customLiveMsg, params.globalCustom, "customLive", DEFAULT_LIVE_TEMPLATES.liveOngoing), {
-			"-name": params.master.username,
-			"-time": params.diffTime,
-			"-watched": params.watched,
-			"-link": params.roomLink
+			name: params.master.username,
+			time: params.diffTime,
+			watched: params.watched,
+			link: params.roomLink
 		});
 	}
 	/** Compose the "下播" notification text. */
 	renderLiveEnd(params) {
 		return applyTemplate(resolveCustomLive(params.sub.customLiveMsg, params.globalCustom, "customLiveEnd", DEFAULT_LIVE_TEMPLATES.liveEnd), {
-			"-name": params.master.username,
-			"-time": params.diffTime,
-			"-follower_change": formatFollowerChange(params.followerChange)
+			name: params.master.username,
+			time: params.diffTime,
+			follower_change: formatFollowerChange(params.followerChange)
 		});
 	}
 	/**
@@ -588,24 +592,24 @@ var LiveTemplateRenderer = class {
 	*/
 	renderGuardBuy(params) {
 		return applyTemplate(params.guardBuyConfig.guardBuyMsg ?? "", {
-			"-uname": params.uname,
-			"-mname": params.master?.username ?? "",
-			"-guard": params.giftName
+			uname: params.uname,
+			mname: params.master?.username ?? "",
+			guard: params.giftName
 		});
 	}
 	/** Compose the "特别关注弹幕" notification text. */
 	renderSpecialDanmaku(params) {
 		return applyTemplate(params.template, {
-			"-mastername": params.master?.username ?? "",
-			"-uname": params.uname,
-			"-msg": params.content
+			mastername: params.master?.username ?? "",
+			uname: params.uname,
+			msg: params.content
 		});
 	}
 	/** Compose the "特别关注进入直播间" notification text. */
 	renderSpecialUserEnter(params) {
 		return applyTemplate(params.template, {
-			"-mastername": params.master?.username ?? "",
-			"-uname": params.uname
+			mastername: params.master?.username ?? "",
+			uname: params.uname
 		});
 	}
 	/**
@@ -618,19 +622,19 @@ var LiveTemplateRenderer = class {
 		const top = params.topSenders;
 		const at = (i) => top[i] ?? ["", 0];
 		return applyTemplate(params.template, {
-			"-dmc": `${params.senderCount}`,
-			"-mdn": params.master?.medalName ?? "",
-			"-dca": `${params.danmakuCount}`,
-			"-un1": at(0)[0],
-			"-dc1": `${at(0)[1]}`,
-			"-un2": at(1)[0],
-			"-dc2": `${at(1)[1]}`,
-			"-un3": at(2)[0],
-			"-dc3": `${at(2)[1]}`,
-			"-un4": at(3)[0],
-			"-dc4": `${at(3)[1]}`,
-			"-un5": at(4)[0],
-			"-dc5": `${at(4)[1]}`
+			dmc: `${params.senderCount}`,
+			mdn: params.master?.medalName ?? "",
+			dca: `${params.danmakuCount}`,
+			un1: at(0)[0],
+			dc1: `${at(0)[1]}`,
+			un2: at(1)[0],
+			dc2: `${at(1)[1]}`,
+			un3: at(2)[0],
+			dc3: `${at(2)[1]}`,
+			un4: at(3)[0],
+			dc4: `${at(3)[1]}`,
+			un5: at(4)[0],
+			dc5: `${at(4)[1]}`
 		});
 	}
 };

package/lib/index.d.cts

@@ -274,16 +274,16 @@ type LivePushTimerManager = Map<string, () => void>;
  * - `customSpecialDanmakuUsers.msgTemplate`
  * - `customSpecialUsersEnterTheRoom.msgTemplate`
  *
- * The variable syntax follows the existing `-name` / `-time` / `-watched` style
- * (NOT the `{key}` syntax used by `@bilibili-notify/internal`'s `interpolate`),
- * because that's what users have in their existing Koishi configs and we keep
- * 1:1 backward compatibility.
+ * 占位符统一 `{name}` / `{time}` / `{watched}` 语法(与 `@bilibili-notify/internal`
+ * 的 `interpolate` 同源)。`applyTemplate` 同时接受 koishi 旧存档里的 legacy
+ * `-name` / `-time` 写法 —— 老用户已保存的 `-key` 模板继续生效,新默认与文档
+ * 一律走 `{key}`,二者不冲突(单遍正则,longest-first)。
  */
 /** Defaults applied when neither sub-level nor global config provides a template. */
 declare const DEFAULT_LIVE_TEMPLATES: {
-  readonly liveStart: "-name 开播啦，当前粉丝数：-follower\n-link";
-  readonly liveOngoing: "-name 正在直播，已播 -time，累计观看：-watched\n-link";
-  readonly liveEnd: "-name 下播啦，本次直播了 -time，粉丝变化 -follower_change";
+  readonly liveStart: "{name} 开播啦，当前粉丝数：{follower}\n{link}";
+  readonly liveOngoing: "{name} 正在直播，已播 {time}，累计观看：{watched}\n{link}";
+  readonly liveEnd: "{name} 下播啦，本次直播了 {time}，粉丝变化 {follower_change}";
   readonly liveSummaryFallback: "弹幕总结";
 };
 /**

package/lib/index.d.mts

@@ -274,16 +274,16 @@ type LivePushTimerManager = Map<string, () => void>;
  * - `customSpecialDanmakuUsers.msgTemplate`
  * - `customSpecialUsersEnterTheRoom.msgTemplate`
  *
- * The variable syntax follows the existing `-name` / `-time` / `-watched` style
- * (NOT the `{key}` syntax used by `@bilibili-notify/internal`'s `interpolate`),
- * because that's what users have in their existing Koishi configs and we keep
- * 1:1 backward compatibility.
+ * 占位符统一 `{name}` / `{time}` / `{watched}` 语法(与 `@bilibili-notify/internal`
+ * 的 `interpolate` 同源)。`applyTemplate` 同时接受 koishi 旧存档里的 legacy
+ * `-name` / `-time` 写法 —— 老用户已保存的 `-key` 模板继续生效,新默认与文档
+ * 一律走 `{key}`,二者不冲突(单遍正则,longest-first)。
  */
 /** Defaults applied when neither sub-level nor global config provides a template. */
 declare const DEFAULT_LIVE_TEMPLATES: {
-  readonly liveStart: "-name 开播啦，当前粉丝数：-follower\n-link";
-  readonly liveOngoing: "-name 正在直播，已播 -time，累计观看：-watched\n-link";
-  readonly liveEnd: "-name 下播啦，本次直播了 -time，粉丝变化 -follower_change";
+  readonly liveStart: "{name} 开播啦，当前粉丝数：{follower}\n{link}";
+  readonly liveOngoing: "{name} 正在直播，已播 {time}，累计观看：{watched}\n{link}";
+  readonly liveEnd: "{name} 下播啦，本次直播了 {time}，粉丝变化 {follower_change}";
   readonly liveSummaryFallback: "弹幕总结";
 };
 /**

package/lib/index.mjs

@@ -475,37 +475,41 @@ var RoomContext = class extends RoomContextBase {
 * - `customSpecialDanmakuUsers.msgTemplate`
 * - `customSpecialUsersEnterTheRoom.msgTemplate`
 *
-* The variable syntax follows the existing `-name` / `-time` / `-watched` style
-* (NOT the `{key}` syntax used by `@bilibili-notify/internal`'s `interpolate`),
-* because that's what users have in their existing Koishi configs and we keep
-* 1:1 backward compatibility.
+* 占位符统一 `{name}` / `{time}` / `{watched}` 语法(与 `@bilibili-notify/internal`
+* 的 `interpolate` 同源)。`applyTemplate` 同时接受 koishi 旧存档里的 legacy
+* `-name` / `-time` 写法 —— 老用户已保存的 `-key` 模板继续生效,新默认与文档
+* 一律走 `{key}`,二者不冲突(单遍正则,longest-first)。
 */
 /** Defaults applied when neither sub-level nor global config provides a template. */
 const DEFAULT_LIVE_TEMPLATES = {
-	liveStart: "-name 开播啦，当前粉丝数：-follower\n-link",
-	liveOngoing: "-name 正在直播，已播 -time，累计观看：-watched\n-link",
-	liveEnd: "-name 下播啦，本次直播了 -time，粉丝变化 -follower_change",
+	liveStart: "{name} 开播啦，当前粉丝数：{follower}\n{link}",
+	liveOngoing: "{name} 正在直播，已播 {time}，累计观看：{watched}\n{link}",
+	liveEnd: "{name} 下播啦，本次直播了 {time}，粉丝变化 {follower_change}",
 	liveSummaryFallback: "弹幕总结"
 };
 function escapeRegExp(s) {
 	return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 /**
-* 单遍替换所有变量 token,再把 `\n` 转义展开为真换行。
+* 单遍替换所有变量 token,再把 `\n` 转义展开为真换行。`vars` 以**裸键**(`name`/
+* `follower_change`)给出,每个键同时匹配 `{name}`(主)与 legacy `-name`(兼容)。
 *
 * P2:此前 `for…replaceAll` 顺序替换有两个缺陷 ——
-*  1. **token 注入**:用户可控值(uname / 弹幕内容)含 `-link`/`-time` 时
+*  1. **token 注入**:用户可控值(uname / 弹幕内容)含 `{link}`/`-link` 时
 *     会被后续轮次再次替换;
-*  2. **前缀吞噬**:`-follower` 先于 `-follower_change` 替换,把后者的
+*  2. **前缀吞噬**:legacy `-follower` 先于 `-follower_change` 替换,把后者的
 *     `-follower` 段吃掉只剩 `_change`。
-* 改为基于原始模板的**单遍正则**:token 按长度降序进 alternation(最长优先
-* 匹配),每个 token 恰好替换一次且替换值不再被回扫 → 杜绝注入与吞噬。
+* 改为基于原始模板的**单遍正则**:键按长度降序进 alternation(最长优先匹配),
+* 每个 token 恰好替换一次且替换值不再被回扫 → 杜绝注入与吞噬。
 */
 function applyTemplate(template, vars) {
 	const keys = Object.keys(vars).sort((a, b) => b.length - a.length);
 	if (keys.length === 0) return template.replaceAll("\\n", "\n");
-	const re = new RegExp(keys.map(escapeRegExp).join("|"), "g");
-	return template.replace(re, (m) => vars[m] ?? m).replaceAll("\\n", "\n");
+	const alts = keys.flatMap((k) => [`\\{${escapeRegExp(k)}\\}`, `-${escapeRegExp(k)}`]);
+	const re = new RegExp(alts.join("|"), "g");
+	return template.replace(re, (m) => {
+		return vars[m.charCodeAt(0) === 123 ? m.slice(1, -1) : m.slice(1)] ?? m;
+	}).replaceAll("\\n", "\n");
 }
 /**
 * Format follower-change as a signed magnitude string with a 1万 (10K) cutoff,
@@ -535,27 +539,27 @@ var LiveTemplateRenderer = class {
 	/** Compose the "开播" notification text for a sub. */
 	renderLiveStart(params) {
 		return applyTemplate(resolveCustomLive(params.sub.customLiveMsg, params.globalCustom, "customLiveStart", DEFAULT_LIVE_TEMPLATES.liveStart), {
-			"-name": params.master.username,
-			"-time": params.diffTime,
-			"-follower": params.followerNum,
-			"-link": params.roomLink
+			name: params.master.username,
+			time: params.diffTime,
+			follower: params.followerNum,
+			link: params.roomLink
 		});
 	}
 	/** Compose the periodic "正在直播" notification text. */
 	renderLiveOngoing(params) {
 		return applyTemplate(resolveCustomLive(params.sub.customLiveMsg, params.globalCustom, "customLive", DEFAULT_LIVE_TEMPLATES.liveOngoing), {
-			"-name": params.master.username,
-			"-time": params.diffTime,
-			"-watched": params.watched,
-			"-link": params.roomLink
+			name: params.master.username,
+			time: params.diffTime,
+			watched: params.watched,
+			link: params.roomLink
 		});
 	}
 	/** Compose the "下播" notification text. */
 	renderLiveEnd(params) {
 		return applyTemplate(resolveCustomLive(params.sub.customLiveMsg, params.globalCustom, "customLiveEnd", DEFAULT_LIVE_TEMPLATES.liveEnd), {
-			"-name": params.master.username,
-			"-time": params.diffTime,
-			"-follower_change": formatFollowerChange(params.followerChange)
+			name: params.master.username,
+			time: params.diffTime,
+			follower_change: formatFollowerChange(params.followerChange)
 		});
 	}
 	/**
@@ -564,24 +568,24 @@ var LiveTemplateRenderer = class {
 	*/
 	renderGuardBuy(params) {
 		return applyTemplate(params.guardBuyConfig.guardBuyMsg ?? "", {
-			"-uname": params.uname,
-			"-mname": params.master?.username ?? "",
-			"-guard": params.giftName
+			uname: params.uname,
+			mname: params.master?.username ?? "",
+			guard: params.giftName
 		});
 	}
 	/** Compose the "特别关注弹幕" notification text. */
 	renderSpecialDanmaku(params) {
 		return applyTemplate(params.template, {
-			"-mastername": params.master?.username ?? "",
-			"-uname": params.uname,
-			"-msg": params.content
+			mastername: params.master?.username ?? "",
+			uname: params.uname,
+			msg: params.content
 		});
 	}
 	/** Compose the "特别关注进入直播间" notification text. */
 	renderSpecialUserEnter(params) {
 		return applyTemplate(params.template, {
-			"-mastername": params.master?.username ?? "",
-			"-uname": params.uname
+			mastername: params.master?.username ?? "",
+			uname: params.uname
 		});
 	}
 	/**
@@ -594,19 +598,19 @@ var LiveTemplateRenderer = class {
 		const top = params.topSenders;
 		const at = (i) => top[i] ?? ["", 0];
 		return applyTemplate(params.template, {
-			"-dmc": `${params.senderCount}`,
-			"-mdn": params.master?.medalName ?? "",
-			"-dca": `${params.danmakuCount}`,
-			"-un1": at(0)[0],
-			"-dc1": `${at(0)[1]}`,
-			"-un2": at(1)[0],
-			"-dc2": `${at(1)[1]}`,
-			"-un3": at(2)[0],
-			"-dc3": `${at(2)[1]}`,
-			"-un4": at(3)[0],
-			"-dc4": `${at(3)[1]}`,
-			"-un5": at(4)[0],
-			"-dc5": `${at(4)[1]}`
+			dmc: `${params.senderCount}`,
+			mdn: params.master?.medalName ?? "",
+			dca: `${params.danmakuCount}`,
+			un1: at(0)[0],
+			dc1: `${at(0)[1]}`,
+			un2: at(1)[0],
+			dc2: `${at(1)[1]}`,
+			un3: at(2)[0],
+			dc3: `${at(2)[1]}`,
+			un4: at(3)[0],
+			dc4: `${at(3)[1]}`,
+			un5: at(4)[0],
+			dc5: `${at(4)[1]}`
 		});
 	}
 };

package/package.json

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