bililive-cli 3.10.1 → 3.10.2

package/lib/{index-DOo0dewT.cjs → index-Ba_4umAo.cjs}

@@ -4,7 +4,7 @@ var path$7 = require('node:path');
 var require$$2$1 = require('node:http');
 var require$$1$2 = require('node:url');
 var a = require('node:https');
-var index = require('./index-CuJEbURl.cjs');
+var index = require('./index-CRFwDTYd.cjs');
 var require$$0$4 = require('tty');
 var require$$1$3 = require('util');
 var require$$0$b = require('assert');
@@ -80740,9 +80740,9 @@ class WebhookHandler {
         });
         return this.handleUploadTask(task, pathArray);
     };
-    addEditMediaTask = async (uid, aid, pathArray, limitedUploadTime, afterUploadDeletAction) => {
+    addEditMediaTask = async (uid, aid, pathArray, uploadPreset, limitedUploadTime, afterUploadDeletAction) => {
         const checkCallback = this.setupDeleteAfterCheckLock(pathArray);
-        const task = await index.biliApi.editMedia(aid, pathArray, {}, uid, {
+        const task = await index.biliApi.editMedia(aid, pathArray, uploadPreset, uid, {
             limitedUploadTime,
             afterUploadDeletAction: "none",
             forceCheck: afterUploadDeletAction === "deleteAfterCheck",
@@ -80866,13 +80866,13 @@ class WebhookHandler {
      * 执行续传操作
      * @private
      */
-    async performContinueUpload(live, aid, filePaths, type, config, limitedUploadTime) {
+    async performContinueUpload(live, aid, filePaths, type, config, uploadPreset, limitedUploadTime) {
         index.logObj.info("续传", filePaths);
         live.batchUpdateUploadStatus(filePaths.map((item) => item.part), "uploading", type);
         await this.addEditMediaTask(config.uid, aid, filePaths.map((item) => ({
             path: item.path,
             title: item.title,
-        })), limitedUploadTime, config.afterUploadDeletAction);
+        })), uploadPreset, limitedUploadTime, config.afterUploadDeletAction);
         live.batchUpdateUploadStatus(filePaths.map((item) => item.part), "uploaded", type);
     }
     /**
@@ -80922,7 +80922,7 @@ class WebhookHandler {
         try {
             // 8. 执行上传（续传或新上传）
             if (live[aidField]) {
-                await this.performContinueUpload(live, live[aidField], filePaths, type, config, limitedUploadTime);
+                await this.performContinueUpload(live, live[aidField], filePaths, type, config, uploadPreset, limitedUploadTime);
             }
             else {
                 await this.performNewUpload(live, filePaths, type, config, uploadPreset, limitedUploadTime);
@@ -80993,7 +80993,7 @@ exports.handler = void 0;
 exports.appConfig = void 0;
 exports.container = void 0;
 const fileCache = createFileCache();
-path$7.dirname(require$$1$2.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DOo0dewT.cjs', document.baseURI).href))));
+path$7.dirname(require$$1$2.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Ba_4umAo.cjs', document.baseURI).href))));
 const authMiddleware = (passKey) => {
     return async (ctx, next) => {
         const authHeader = ctx.headers["authorization"] || ctx.request.query.auth;

package/lib/{index-CuJEbURl.cjs → index-CRFwDTYd.cjs}

@@ -11646,7 +11646,7 @@ const APP_DEFAULT_CONFIG = {
         line: undefined,
         checkInterval: 60,
         maxThreadCount: 3,
-        waitTime: 0,
+        waitTime: 500,
         disableProvideCommentsWhenRecording: false,
         segment: "90",
         saveGiftDanma: false,
@@ -44555,7 +44555,7 @@ async function trash(paths, options) {
 	} else if (process$2.platform === 'win32') {
 		module = await Promise.resolve().then(function () { return require('./windows-OmnJ7a39.cjs'); });
 	} else {
-		module = await Promise.resolve().then(function () { return require('./linux-CINV_k6s.cjs'); });
+		module = await Promise.resolve().then(function () { return require('./linux-Cv3TbjgK.cjs'); });
 	}
 
 	return module.default(paths);
@@ -214068,6 +214068,22 @@ async function getRoomInfoByWeb(webRoomId, opts = {}) {
             "User-Agent": ua,
         },
     });
+    if (res.data.status_code === 30003) {
+        // 直播已结束
+        return {
+            living: false,
+            nickname: "",
+            sec_uid: "",
+            avatar: "",
+            api: "web",
+            room: {
+                title: "",
+                cover: "",
+                id_str: "",
+                stream_url: null,
+            },
+        };
+    }
     assert$i(res.data.status_code === 0, `Unexpected resp, code ${res.data.status_code}, msg ${JSON.stringify(res.data.data)}, id ${webRoomId}, cookies: ${cookies}`);
     const data = res.data.data;
     const room = data?.data?.[0];
@@ -246387,9 +246403,14 @@ const checkLiveStatusAndRecord$1 = async function ({ getSavePath, banLiveId, isM
         const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)
             return;
+        let timestamp = Date.now();
+        if (this.useServerTimestamp && msg.eventTime) {
+            // 某些消息可能没有 eventTime 字段
+            timestamp = Number(msg.eventTime) * 1000;
+        }
         const comment = {
             type: "comment",
-            timestamp: this.useServerTimestamp ? Number(msg.eventTime) * 1000 : Date.now(),
+            timestamp: timestamp,
             text: msg.content,
             color: "#ffffff",
             sender: {
@@ -246401,6 +246422,7 @@ const checkLiveStatusAndRecord$1 = async function ({ getSavePath, banLiveId, isM
                 // },
             },
         };
+        console.log("Message", JSON.stringify(msg), null, 2);
         this.emit("Message", comment);
         extraDataController.addMessage(comment);
     });

package/lib/index.cjs

@@ -3715,7 +3715,7 @@ const {
   Help,
 } = commander;
 
-var version = "3.10.1";
+var version = "3.10.2";
 
 process.on("uncaughtException", function (error) {
     console.error(`${new Date().toISOString()} uncaughtException`, error);
@@ -3741,8 +3741,8 @@ program
         throw new Error(`${c.configFolder}参数不存在，请先重新运行 config gen 命令`);
     }
     // 下面两行顺序不能换（
-    const { init } = await Promise.resolve().then(function () { return require('./index-CuJEbURl.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-DOo0dewT.cjs'); });
+    const { init } = await Promise.resolve().then(function () { return require('./index-CRFwDTYd.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-Ba_4umAo.cjs'); });
     const globalConfig = {
         ffmpegPresetPath: path$1.join(c.configFolder, "ffmpeg_presets.json"),
         videoPresetPath: path$1.join(c.configFolder, "presets.json"),

package/lib/{linux-CINV_k6s.cjs → linux-Cv3TbjgK.cjs}

@@ -4,7 +4,7 @@ var os$3 = require('node:os');
 var path$5 = require('node:path');
 var fs$3 = require('node:fs');
 var crypto = require('node:crypto');
-var index = require('./index-CuJEbURl.cjs');
+var index = require('./index-CRFwDTYd.cjs');
 var require$$0$1 = require('fs');
 var require$$0 = require('path');
 var require$$0$2 = require('child_process');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bililive-cli",
-  "version": "3.10.1",
+  "version": "3.10.2",
   "type": "module",
   "description": "biliLive-tools的cli程序",
   "main": "./lib/index.js",
@@ -39,9 +39,9 @@
     "commander": "^12.1.0",
     "rimraf": "^6.0.1",
     "tsx": "^4.19.2",
-    "@biliLive-tools/http": "3.10.1",
-    "@biliLive-tools/shared": "3.10.1",
-    "@biliLive-tools/types": "3.10.1"
+    "@biliLive-tools/http": "3.10.2",
+    "@biliLive-tools/shared": "3.10.2",
+    "@biliLive-tools/types": "3.10.2"
   },
   "scripts": {
     "start": "tsx src/index.ts",