@bilibili-notify/live 0.0.1-alpha.0 → 0.0.1-alpha.2

package/lib/index.cjs

@@ -725,7 +725,7 @@ var RoomSessionBase = class {
 				watched,
 				roomLink
 			});
-			if (this.sub.restartPush ?? this.ctx.config.restartPush) await this.ctx.sendLiveNotifyCard({
+			if (this.sub.restartPush) await this.ctx.sendLiveNotifyCard({
 				liveType: 2,
 				liveData: this.liveData,
 				liveRoomInfo: this.liveRoomInfo,
@@ -771,9 +771,9 @@ var RoomSessionBase = class {
 		this.armPeriodicTimer();
 	}
 	armPeriodicTimer() {
-		const effPushTime = this.sub.pushTime ?? this.ctx.config.pushTime;
-		if (effPushTime === 0 || this.pushAtTimeTimer) return;
-		this.pushAtTimeTimer = this.ctx.serviceCtx.setInterval(() => this.tickPushAtTime(), effPushTime * 1e3 * 60 * 60);
+		const pushTime = this.sub.pushTime;
+		if (pushTime === 0 || this.pushAtTimeTimer) return;
+		this.pushAtTimeTimer = this.ctx.serviceCtx.setInterval(() => this.tickPushAtTime(), pushTime * 1e3 * 60 * 60);
 		this.ctx.livePushTimerManager.set(this.sub.roomId, () => this.pushAtTimeTimer?.dispose());
 		this.ctx.logSideEffectState(`timer:created room=${this.sub.roomId}`);
 	}
@@ -1060,8 +1060,7 @@ var RoomSession = class extends RoomSessionBase {
 		if (!collectsDanmaku && !pushesSC) return;
 		if (collectsDanmaku) this.ctx.danmakuCollector.recordDanmaku(this.sub.roomId, body.content, body.user.uname);
 		if (!pushesSC) return;
-		const effMinScPrice = this.sub.minScPrice ?? this.ctx.config.minScPrice;
-		if (body.price < effMinScPrice) return;
+		if (body.price < this.sub.minScPrice) return;
 		const data = await this.ctx.api.getUserInfoInLive(body.user.uid.toString(), this.sub.uid);
 		if (data.code !== 0) {
 			const text = `【${this.masterInfo?.username ?? ""}的直播间】${body.user.uname}的SC:${body.content}（${body.price}元）`;
@@ -1091,8 +1090,7 @@ var RoomSession = class extends RoomSessionBase {
 	}
 	async onGuardBuy(body) {
 		if (!this.ctx.isSubscribed(this.sub, "liveGuardBuy")) return;
-		const effMinGuardLevel = this.sub.minGuardLevel ?? this.ctx.config.minGuardLevel;
-		if (body.guard_level > effMinGuardLevel) return;
+		if (body.guard_level > this.sub.minGuardLevel) return;
 		const guardImg = GUARD_LEVEL_IMG[body.guard_level];
 		const effectiveGuardBuy = this.sub.customGuardBuy.enable ? this.sub.customGuardBuy : this.ctx.config.customGuardBuy;
 		if (effectiveGuardBuy.enable) {
@@ -1714,7 +1712,7 @@ var LiveEngine = class {
 					let nextPushTime = prevPushTime;
 					for (const change of liveChanges) {
 						const { scope: _scope, ...fields } = change;
-						if ("pushTime" in fields) nextPushTime = fields.pushTime;
+						if (fields.pushTime !== void 0) nextPushTime = fields.pushTime;
 						Object.assign(existing, fields);
 					}
 					for (const change of targetChanges) existing.target = change.target;
@@ -1768,10 +1766,6 @@ var LiveEngine = class {
 };
 function toListenerConfig(c) {
 	return {
-		pushTime: c.pushTime,
-		restartPush: c.restartPush,
-		minScPrice: c.minScPrice,
-		minGuardLevel: c.minGuardLevel,
 		customGuardBuy: c.customGuardBuy,
 		customLiveMsg: c.customLiveMsg,
 		liveSummaryDefault: c.liveSummaryDefault,

package/lib/index.d.cts

@@ -181,18 +181,16 @@ interface SubItemView {
   customSpecialDanmakuUsers: CustomSpecialDanmakuUsersLike;
   customSpecialUsersEnterTheRoom: CustomSpecialUsersEnterTheRoomLike;
   /**
-   * Per-UP 覆盖项。adapter 已通过 `resolve(sub, defaults)` 折叠 globals + overrides,
-   * 这里只保留实际跟全局可能不同的字段;undefined 表示「按全局走」。room-session /
-   * room-session-base / live-summary-requester 在用值前一律 `?? ctx.config.X` 回退。
-   *
-   * 这些字段也会随 LiveScopedChange 增量推送给 LiveEngine.applyOps,Object.assign
-   * 合进活跃 sub 后,SC / 上舰 / restartPush / liveSummary 调用点会读到新值;pushTime
-   * 因 setInterval 句柄 ms 不可变,engine 在 update 时检测变化后会单独 rearm。
-   */
-  minScPrice?: number;
-  minGuardLevel?: 1 | 2 | 3;
-  pushTime?: number;
-  restartPush?: boolean;
+   * Per-UP 阈值 / 调度。adapter build SubItemView 时已一次性折算好
+   * (`sub.overrides.X ?? 全局 config.X`),引擎 / 监听层直接消费,无二次回退。
+   * 随 LiveScopedChange 增量推送给 LiveEngine.applyOps;pushTime 变更时
+   * engine 额外 rearm 定时器(setInterval 句柄 ms 不可变)。
+   */
+  minScPrice: number;
+  minGuardLevel: 1 | 2 | 3;
+  pushTime: number;
+  restartPush: boolean;
+  /** undefined = 该 UP 无 per-UP AI 覆盖,直播总结走 AI 引擎自身配置。 */
   aiOverride?: CommentaryCallOverride;
 }
 type SubscriptionsView = Record<string, SubItemView>;
@@ -461,15 +459,12 @@ declare class WordcloudGenerator {
 //#endregion
 //#region src/room-context.d.ts
 /**
- * Configuration that listener-manager + room-session both consume.
- * Mirrors the koishi `BilibiliNotifyLiveConfig` minus the `logLevel` /
- * `wordcloudStopWords` fields (those are owned at the LiveEngine level).
+ * 模板 / 渲染层全局配置,listener-manager + room-session 共用。
+ *
+ * 不含 `pushTime` / `restartPush` / `minScPrice` / `minGuardLevel` —— 那些是
+ * per-UP 字段,adapter build SubItemView 时已折算好,引擎直接读 `SubItemView.X`。
  */
 interface ListenerManagerConfig {
-  pushTime: number;
-  restartPush: boolean;
-  minScPrice: number;
-  minGuardLevel: 1 | 2 | 3;
   customGuardBuy: {
     enable: boolean;
     guardBuyMsg?: string;
@@ -884,17 +879,12 @@ interface LiveEngineConfig {
    * Chinese-stop-word list before tokenisation.
    */
   wordcloudStopWords?: string;
-  /** Hours between periodic "正在直播" pushes; `0` disables. */
-  pushTime: number;
-  /** Whether to push a "正在直播" card immediately on engine start when a sub is live. */
-  restartPush: boolean;
-  /** SC minimum-price gate (yuan); SC under this value is dropped. */
-  minScPrice: number;
   /**
-   * Lowest allowed guard tier to push (1 = governor, 2 = supervisor,
-   * 3 = captain — preserves Bilibili semantics).
+   * 引擎级全局 `pushTime`(小时;`0` 关闭)。仅用于 `updateConfig` 检测全局
+   * pushTime 变更后重排所有定时器;每个 UP 的实际复推间隔在
+   * `SubItemView.pushTime` 上(adapter 已折算 `per-UP ?? 全局`)。
    */
-  minGuardLevel: 1 | 2 | 3;
+  pushTime: number;
   /** Default global "弹幕总结" template (single string; adapter joins lines if needed). */
   liveSummaryDefault: string;
   customGuardBuy: ListenerManagerConfig["customGuardBuy"];

package/lib/index.d.mts

@@ -181,18 +181,16 @@ interface SubItemView {
   customSpecialDanmakuUsers: CustomSpecialDanmakuUsersLike;
   customSpecialUsersEnterTheRoom: CustomSpecialUsersEnterTheRoomLike;
   /**
-   * Per-UP 覆盖项。adapter 已通过 `resolve(sub, defaults)` 折叠 globals + overrides,
-   * 这里只保留实际跟全局可能不同的字段;undefined 表示「按全局走」。room-session /
-   * room-session-base / live-summary-requester 在用值前一律 `?? ctx.config.X` 回退。
-   *
-   * 这些字段也会随 LiveScopedChange 增量推送给 LiveEngine.applyOps,Object.assign
-   * 合进活跃 sub 后,SC / 上舰 / restartPush / liveSummary 调用点会读到新值;pushTime
-   * 因 setInterval 句柄 ms 不可变,engine 在 update 时检测变化后会单独 rearm。
-   */
-  minScPrice?: number;
-  minGuardLevel?: 1 | 2 | 3;
-  pushTime?: number;
-  restartPush?: boolean;
+   * Per-UP 阈值 / 调度。adapter build SubItemView 时已一次性折算好
+   * (`sub.overrides.X ?? 全局 config.X`),引擎 / 监听层直接消费,无二次回退。
+   * 随 LiveScopedChange 增量推送给 LiveEngine.applyOps;pushTime 变更时
+   * engine 额外 rearm 定时器(setInterval 句柄 ms 不可变)。
+   */
+  minScPrice: number;
+  minGuardLevel: 1 | 2 | 3;
+  pushTime: number;
+  restartPush: boolean;
+  /** undefined = 该 UP 无 per-UP AI 覆盖,直播总结走 AI 引擎自身配置。 */
   aiOverride?: CommentaryCallOverride;
 }
 type SubscriptionsView = Record<string, SubItemView>;
@@ -461,15 +459,12 @@ declare class WordcloudGenerator {
 //#endregion
 //#region src/room-context.d.ts
 /**
- * Configuration that listener-manager + room-session both consume.
- * Mirrors the koishi `BilibiliNotifyLiveConfig` minus the `logLevel` /
- * `wordcloudStopWords` fields (those are owned at the LiveEngine level).
+ * 模板 / 渲染层全局配置,listener-manager + room-session 共用。
+ *
+ * 不含 `pushTime` / `restartPush` / `minScPrice` / `minGuardLevel` —— 那些是
+ * per-UP 字段,adapter build SubItemView 时已折算好,引擎直接读 `SubItemView.X`。
  */
 interface ListenerManagerConfig {
-  pushTime: number;
-  restartPush: boolean;
-  minScPrice: number;
-  minGuardLevel: 1 | 2 | 3;
   customGuardBuy: {
     enable: boolean;
     guardBuyMsg?: string;
@@ -884,17 +879,12 @@ interface LiveEngineConfig {
    * Chinese-stop-word list before tokenisation.
    */
   wordcloudStopWords?: string;
-  /** Hours between periodic "正在直播" pushes; `0` disables. */
-  pushTime: number;
-  /** Whether to push a "正在直播" card immediately on engine start when a sub is live. */
-  restartPush: boolean;
-  /** SC minimum-price gate (yuan); SC under this value is dropped. */
-  minScPrice: number;
   /**
-   * Lowest allowed guard tier to push (1 = governor, 2 = supervisor,
-   * 3 = captain — preserves Bilibili semantics).
+   * 引擎级全局 `pushTime`(小时;`0` 关闭)。仅用于 `updateConfig` 检测全局
+   * pushTime 变更后重排所有定时器;每个 UP 的实际复推间隔在
+   * `SubItemView.pushTime` 上(adapter 已折算 `per-UP ?? 全局`)。
    */
-  minGuardLevel: 1 | 2 | 3;
+  pushTime: number;
   /** Default global "弹幕总结" template (single string; adapter joins lines if needed). */
   liveSummaryDefault: string;
   customGuardBuy: ListenerManagerConfig["customGuardBuy"];

package/lib/index.mjs

@@ -701,7 +701,7 @@ var RoomSessionBase = class {
 				watched,
 				roomLink
 			});
-			if (this.sub.restartPush ?? this.ctx.config.restartPush) await this.ctx.sendLiveNotifyCard({
+			if (this.sub.restartPush) await this.ctx.sendLiveNotifyCard({
 				liveType: 2,
 				liveData: this.liveData,
 				liveRoomInfo: this.liveRoomInfo,
@@ -747,9 +747,9 @@ var RoomSessionBase = class {
 		this.armPeriodicTimer();
 	}
 	armPeriodicTimer() {
-		const effPushTime = this.sub.pushTime ?? this.ctx.config.pushTime;
-		if (effPushTime === 0 || this.pushAtTimeTimer) return;
-		this.pushAtTimeTimer = this.ctx.serviceCtx.setInterval(() => this.tickPushAtTime(), effPushTime * 1e3 * 60 * 60);
+		const pushTime = this.sub.pushTime;
+		if (pushTime === 0 || this.pushAtTimeTimer) return;
+		this.pushAtTimeTimer = this.ctx.serviceCtx.setInterval(() => this.tickPushAtTime(), pushTime * 1e3 * 60 * 60);
 		this.ctx.livePushTimerManager.set(this.sub.roomId, () => this.pushAtTimeTimer?.dispose());
 		this.ctx.logSideEffectState(`timer:created room=${this.sub.roomId}`);
 	}
@@ -1036,8 +1036,7 @@ var RoomSession = class extends RoomSessionBase {
 		if (!collectsDanmaku && !pushesSC) return;
 		if (collectsDanmaku) this.ctx.danmakuCollector.recordDanmaku(this.sub.roomId, body.content, body.user.uname);
 		if (!pushesSC) return;
-		const effMinScPrice = this.sub.minScPrice ?? this.ctx.config.minScPrice;
-		if (body.price < effMinScPrice) return;
+		if (body.price < this.sub.minScPrice) return;
 		const data = await this.ctx.api.getUserInfoInLive(body.user.uid.toString(), this.sub.uid);
 		if (data.code !== 0) {
 			const text = `【${this.masterInfo?.username ?? ""}的直播间】${body.user.uname}的SC:${body.content}（${body.price}元）`;
@@ -1067,8 +1066,7 @@ var RoomSession = class extends RoomSessionBase {
 	}
 	async onGuardBuy(body) {
 		if (!this.ctx.isSubscribed(this.sub, "liveGuardBuy")) return;
-		const effMinGuardLevel = this.sub.minGuardLevel ?? this.ctx.config.minGuardLevel;
-		if (body.guard_level > effMinGuardLevel) return;
+		if (body.guard_level > this.sub.minGuardLevel) return;
 		const guardImg = GUARD_LEVEL_IMG[body.guard_level];
 		const effectiveGuardBuy = this.sub.customGuardBuy.enable ? this.sub.customGuardBuy : this.ctx.config.customGuardBuy;
 		if (effectiveGuardBuy.enable) {
@@ -1690,7 +1688,7 @@ var LiveEngine = class {
 					let nextPushTime = prevPushTime;
 					for (const change of liveChanges) {
 						const { scope: _scope, ...fields } = change;
-						if ("pushTime" in fields) nextPushTime = fields.pushTime;
+						if (fields.pushTime !== void 0) nextPushTime = fields.pushTime;
 						Object.assign(existing, fields);
 					}
 					for (const change of targetChanges) existing.target = change.target;
@@ -1744,10 +1742,6 @@ var LiveEngine = class {
 };
 function toListenerConfig(c) {
 	return {
-		pushTime: c.pushTime,
-		restartPush: c.restartPush,
-		minScPrice: c.minScPrice,
-		minGuardLevel: c.minGuardLevel,
 		customGuardBuy: c.customGuardBuy,
 		customLiveMsg: c.customLiveMsg,
 		liveSummaryDefault: c.liveSummaryDefault,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bilibili-notify/live",
-  "version": "0.0.1-alpha.0",
+  "version": "0.0.1-alpha.2",
   "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/ai": "^0.0.1-alpha.0",
-    "@bilibili-notify/api": "^0.2.0-alpha.0",
-    "@bilibili-notify/internal": "^0.1.0-alpha.0",
-    "@bilibili-notify/image": "^0.0.1-alpha.0"
+    "@bilibili-notify/api": "^0.2.0-alpha.2",
+    "@bilibili-notify/ai": "^0.0.1-alpha.1",
+    "@bilibili-notify/image": "^0.0.1-alpha.2",
+    "@bilibili-notify/internal": "^0.1.0-alpha.2"
   },
   "devDependencies": {
     "@types/luxon": "^3.4.2",