@bililive-tools/manager 1.4.0 → 1.5.0

package/lib/manager.d.ts

@@ -13,6 +13,7 @@ export interface RecorderProvider<E extends AnyObject> {
         title: string;
         owner: string;
         uid?: number;
+        avatar?: string;
     } | null>;
     createRecorder: (this: RecorderProvider<E>, opts: Omit<RecorderCreateOpts<E>, "providerId">) => Recorder<E>;
     fromJSON: <T extends SerializedRecorder<E>>(this: RecorderProvider<E>, json: T) => Recorder<E>;

package/lib/manager.js

@@ -4,7 +4,7 @@ import ejs from "ejs";
 import { omit, range } from "lodash-es";
 import { parseArgsStringToArgv } from "string-argv";
 import { getBiliStatusInfoByRoomIds } from "./api.js";
-import { formatDate, removeSystemReservedChars, formatTemplate, replaceExtName, downloadImage, } from "./utils.js";
+import { formatDate, removeSystemReservedChars, formatTemplate, replaceExtName, downloadImage, isBetweenTimeRange, } from "./utils.js";
 import { StreamManager } from "./streamManager.js";
 const configurableProps = [
     "savePathRule",
@@ -39,7 +39,9 @@ export function createRecorderManager(opts) {
         const maxThreadCount = 3;
         // 这里暂时不打算用 state == recording 来过滤，provider 必须内部自己处理录制过程中的 check，
         // 这样可以防止一些意外调用 checkLiveStatusAndRecord 时出现重复录制。
-        let needCheckRecorders = recorders.filter((r) => !r.disableAutoCheck);
+        let needCheckRecorders = recorders
+            .filter((r) => !r.disableAutoCheck)
+            .filter((r) => isBetweenTimeRange(r.handleTime));
         let threads = [];
         if (manager.biliBatchQuery) {
             const biliNeedCheckRecorders = needCheckRecorders

package/lib/recorder.d.ts

@@ -47,6 +47,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     formatriorities?: Array<"flv" | "hls">;
     /** 只录制音频 */
     onlyAudio?: boolean;
+    /** 监控时间段 */
+    handleTime?: [string | null, string | null];
     /** 控制弹幕是否使用服务端时间戳 */
     useServerTimestamp?: boolean;
     extra?: Partial<E>;

package/lib/utils.d.ts

@@ -61,6 +61,7 @@ export declare function sortByKeyOrder<T, K extends keyof T>(objects: T[], order
  * @returns Promise
  */
 export declare function retry<T>(fn: () => Promise<T>, retries?: number, delay?: number): Promise<T>;
+export declare const isBetweenTimeRange: (range: undefined | [] | [string | null, string | null]) => boolean;
 declare const _default: {
     replaceExtName: typeof replaceExtName;
     singleton: typeof singleton;
@@ -79,5 +80,6 @@ declare const _default: {
     uuid: () => `${string}-${string}-${string}-${string}-${string}`;
     sortByKeyOrder: typeof sortByKeyOrder;
     retry: typeof retry;
+    isBetweenTimeRange: (range: undefined | [] | [string | null, string | null]) => boolean;
 };
 export default _default;

package/lib/utils.js

@@ -127,7 +127,8 @@ export function isFfmpegStartSegment(line) {
     return line.includes("Opening ") && line.includes("for writing");
 }
 export function isFfmpegStart(line) {
-    return line.includes("frame=") && line.includes("fps=");
+    return ((line.includes("frame=") && line.includes("fps=")) ||
+        (line.includes("speed=") && line.includes("time=")));
 }
 export const formatTemplate = function template(string, ...args) {
     const nargs = /\{([0-9a-zA-Z_]+)\}/g;
@@ -159,6 +160,10 @@ export function createInvalidStreamChecker(count = 15) {
     let prevFrame = 0;
     let frameUnchangedCount = 0;
     return (ffmpegLogLine) => {
+        // B站某些cdn在直播结束后仍会返回一些数据 https://github.com/renmu123/biliLive-tools/issues/123
+        if (ffmpegLogLine.includes("New subtitle stream with index")) {
+            return true;
+        }
         const streamInfo = ffmpegLogLine.match(/frame=\s*(\d+) fps=.*? q=.*? size=.*? time=.*? bitrate=.*? speed=.*?/);
         if (streamInfo != null) {
             const [, frameText] = streamInfo;
@@ -257,6 +262,49 @@ export async function retry(fn, retries = 3, delay = 1000) {
         return retry(fn, retries - 1, delay);
     }
 }
+export const isBetweenTimeRange = (range) => {
+    if (!range)
+        return true;
+    if (range.length !== 2)
+        return true;
+    if (range[0] === null || range[1] === null)
+        return true;
+    try {
+        const status = isBetweenTime(new Date(), range);
+        return status;
+    }
+    catch (error) {
+        return true;
+    }
+};
+/**
+ * 当前时间是否在两个时间'HH:mm:ss'之间，如果是["22:00:00","05:00:00"]，当前时间是凌晨3点，返回true
+ * @param {string} currentTime 当前时间
+ * @param {string[]} timeRange 时间范围
+ */
+function isBetweenTime(currentTime, timeRange) {
+    const [startTime, endTime] = timeRange;
+    if (!startTime || !endTime)
+        return true;
+    const [startHour, startMinute, startSecond] = startTime.split(":").map(Number);
+    const [endHour, endMinute, endSecond] = endTime.split(":").map(Number);
+    const [currentHour, currentMinute, currentSecond] = [
+        currentTime.getHours(),
+        currentTime.getMinutes(),
+        currentTime.getSeconds(),
+    ];
+    const start = startHour * 3600 + startMinute * 60 + startSecond;
+    let end = endHour * 3600 + endMinute * 60 + endSecond;
+    let current = currentHour * 3600 + currentMinute * 60 + currentSecond;
+    // 如果结束时间小于开始时间，说明跨越了午夜
+    if (end < start) {
+        end += 24 * 3600; // 将结束时间加上24小时
+        if (current < start) {
+            current += 24 * 3600; // 如果当前时间小于开始时间，也加上24小时
+        }
+    }
+    return start <= current && current <= end;
+}
 export default {
     replaceExtName,
     singleton,
@@ -275,4 +323,5 @@ export default {
     uuid,
     sortByKeyOrder,
     retry,
+    isBetweenTimeRange,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/manager",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",