@bililive-tools/douyu-recorder 1.12.0 → 1.16.0

package/lib/index.js

@@ -3,7 +3,6 @@ import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils,
 import { live } from "douyu-api";
 import { getInfo, getStream } from "./stream.js";
 import { getRoomInfo } from "./dy_api.js";
-import { ensureFolderExist } from "./utils.js";
 import { createDYClient } from "./dy_client/index.js";
 import { giftMap, colorTab } from "./danma.js";
 function createRecorder(opts) {
@@ -138,6 +137,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             startTime: opts.startTime,
             liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
@@ -147,20 +147,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         const info = await getInfo(this.channelId);
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -372,7 +358,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };

package/lib/requester.d.ts

@@ -1,2 +1 @@
-import axios from "axios";
-export declare const requester: axios.AxiosInstance;
+export declare const requester: import("axios").AxiosInstance;

package/lib/stream.d.ts

@@ -8,6 +8,7 @@ export declare function getInfo(channelId: string): Promise<{
     cover: string;
     liveId: string;
     recordStartTime: Date;
+    area: string;
 }>;
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality"> & {
     rejectCache?: boolean;

package/lib/stream.js

@@ -36,6 +36,7 @@ export async function getInfo(channelId) {
         liveStartTime: startTime,
         liveId: utils.md5(`${channelId}-${startTime?.getTime() ?? Date.now()}`),
         recordStartTime: recordStartTime,
+        area: data.room.second_lvl_name,
         // gifts: data.gift.map((g) => ({
         //   id: g.id,
         //   name: g.name,

package/lib/utils.d.ts

@@ -18,4 +18,3 @@ export declare function getValuesFromArrayLikeFlexSpaceBetween<T>(array: T[], co
 export declare function ensureFolderExist(fileOrFolderPath: string): void;
 export declare function assert(assertion: unknown, msg?: string): asserts assertion;
 export declare const uuid: () => `${string}-${string}-${string}-${string}-${string}`;
-export declare function createInvalidStreamChecker(): (ffmpegLogLine: string) => boolean;

package/lib/utils.js

@@ -54,28 +54,3 @@ export function assert(assertion, msg) {
 export const uuid = () => {
     return crypto.randomUUID();
 };
-export function createInvalidStreamChecker() {
-    let prevFrame = 0;
-    let frameUnchangedCount = 0;
-    return (ffmpegLogLine) => {
-        const streamInfo = ffmpegLogLine.match(/frame=\s*(\d+) fps=.*? q=.*? size=.*? time=.*? bitrate=.*? speed=.*?/);
-        if (streamInfo != null) {
-            const [, frameText] = streamInfo;
-            const frame = Number(frameText);
-            if (frame === prevFrame) {
-                if (++frameUnchangedCount >= 15) {
-                    return true;
-                }
-            }
-            else {
-                prevFrame = frame;
-                frameUnchangedCount = 0;
-            }
-            return false;
-        }
-        if (ffmpegLogLine.includes("HTTP error 404 Not Found")) {
-            return true;
-        }
-        return false;
-    };
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.12.0",
+  "version": "1.16.0",
   "description": "bililive-tools douyu recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -39,9 +39,9 @@
     "safe-eval": "^0.4.1",
     "ws": "^8.18.0",
     "lodash-es": "^4.17.21",
-    "axios": "^1.7.8",
+    "axios": "^1.15.0",
     "douyu-api": "^0.2.1",
-    "@bililive-tools/manager": "^1.12.0"
+    "@bililive-tools/manager": "^1.16.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"