diff --git a/core/main.js b/core/main.js index b0a0273..4ca778c 100644 --- a/core/main.js +++ b/core/main.js @@ -739,7 +739,8 @@ class Main extends EventEmitter { _onError: (err) => { if (task._aborted) return; // 已被强制终止,跳过所有后续处理 task.status = 'error'; task.error = err.message; - // 录像机无此时间视频 → 永久失败,不再重试 + // 「录像机无此时间视频」现在只由 HTTP 回放路径抛出(它先做 ISAPI 搜索确认无片段), + // 属真实无录像 → 永久失败不再重试;WS 拉流 10 秒无数据已改为可重试的「取流超时」 const permanent = err.message === '录像机无此时间视频'; self.db.run( permanent diff --git a/services/hikvision.js b/services/hikvision.js index e905deb..bd3fb7f 100644 --- a/services/hikvision.js +++ b/services/hikvision.js @@ -492,19 +492,33 @@ class HikvisionService extends BaseService { const loginResult = await this.login(ip, httpPort, user, pass); const { token, cookieJar, sessionTag, httpBase } = loginResult; - // [5] WS 下载(7681 连接失败时自动降级 RTSP 回放下载,兼容无 ISAPI WebSocket 的老固件) + // [5] WS 下载(7681 连接失败时自动降级 HTTP 回放下载,兼容无 ISAPI WebSocket 的老固件) + // 拉流 10 秒无数据 → 判「取流超时」:立即断开连接并原地重连重试,不直接判死刑 task.status = 'downloading'; + const WS_STALL_RETRY = 2; // 原地重连次数(合计最多 3 次尝试) + const STALL_RE = /录像机取流超时/; let result; - try { - result = await this._wsDownload({ ip, port, channel, start, end, speed, output, token, task }); - } catch (e) { - const msg = (e && (e.message || e.code)) || ''; - const connErr = /ECONNREFUSED|ETIMEDOUT|EHOSTUNREACH|ENETUNREACH|ECONNRESET/.test(msg); - if (!connErr) throw e; - console.log('[Hikvision] 7681 连接失败(%s),降级 HTTP 回放下载 %s ch=%d', msg.split('\n')[0], ip, channel); - // 原下载超时按 4x 速计算,HTTP 回放下载耗时不定,需清除改用降级自身超时 - if (task._downloadTimer) { clearTimeout(task._downloadTimer); task._downloadTimer = null; } - result = await this._httpPlaybackDownload({ ip, httpPort, user, pass, channel, start: origStart, end: origEnd, speed, output, task, session: loginResult }); + for (let attempt = 1; ; attempt++) { + try { + result = await this._wsDownload({ ip, port, channel, start, end, speed, output, token, task }); + break; + } catch (e) { + const msg = (e && (e.message || e.code)) || ''; + // ① 取流超时:立即断开重连(无需重新登录,token/session 仍有效) + if (STALL_RE.test(msg) && attempt <= WS_STALL_RETRY) { + console.log('[Hikvision] 取流超时,立即断开重连重试(%d/%d)%s ch=%d', attempt, WS_STALL_RETRY, ip, channel); + await new Promise((r) => setTimeout(r, 2000)); + continue; + } + // ② 7681 连接层失败:降级 HTTP 回放下载 + const connErr = /ECONNREFUSED|ETIMEDOUT|EHOSTUNREACH|ENETUNREACH|ECONNRESET/.test(msg); + if (!connErr) throw e; + console.log('[Hikvision] 7681 连接失败(%s),降级 HTTP 回放下载 %s ch=%d', msg.split('\n')[0], ip, channel); + // 原下载超时按 4x 速计算,HTTP 回放下载耗时不定,需清除改用降级自身超时 + if (task._downloadTimer) { clearTimeout(task._downloadTimer); task._downloadTimer = null; } + result = await this._httpPlaybackDownload({ ip, httpPort, user, pass, channel, start: origStart, end: origEnd, speed, output, task, session: loginResult }); + break; + } } // [6] 转码(HTTP 回放降级已直接输出 mp4,跳过转码) @@ -846,9 +860,10 @@ class HikvisionService extends BaseService { console.log('[Hikvision][DEBUG] 发送playback: %s', JSON.stringify(cmd)); wsSend(JSON.stringify(cmd), 0x01); - // NVR 接受了 WS 但不发视频数据 → 录像机在该时间段无录像,直接标记失败不再重试 + // 10 秒内没有任何视频数据帧:多半是 NVR 起流慢 / 上一个回放会话未释放(≠ 真没录像) + // → 立即断开连接,抛出「可重试」错误,由上游 _doDownload 立刻重连重试 let dataTimeout = setTimeout(() => { - const errMsg = '录像机无此时间视频'; + const errMsg = '录像机取流超时(10秒无数据)'; console.log('[Hikvision] %s,主动断开 task=%s ch=%d', errMsg, task?.unique_code || task?.id, channel); try { socket.destroy(); } catch {} reject(new Error(errMsg));