diff --git a/utils/cameraPtz.js b/utils/cameraPtz.js index fe008b7..32cea22 100644 --- a/utils/cameraPtz.js +++ b/utils/cameraPtz.js @@ -384,6 +384,28 @@ function _dropOnvif(host) { _onvifCache.delete(host); } +/** + * 偶发传输层错误(设备偶尔返回非 HTTP 响应、连接被重置…):实测 TP-Link 在 + * control/stop 连得很快时会偶发 "Parse Error: Expected HTTP/, RTSP/ or ICE/"。 + * 这类错误断开重连一次基本就好;而【丢掉 stop】= 云台一直转,代价远大于重试。 + */ +function _isOnvifTransient(e) { + return /Parse Error|ECONNRESET|socket hang up|EPIPE|ETIMEDOUT|timeout|ECONNREFUSED|not connected/i + .test(String(e && e.message ? e.message : e)); +} + +/** 偶发错误就断开重连重试一次;重试仍是幂等的(stop / 同一速度的运动 / 预置点) */ +async function _withOnvifRetry(target, label, fn) { + try { + return await fn(); + } catch (e) { + if (!_isOnvifTransient(e)) throw e; + _log('ONVIF %s 偶发传输错误(%s)→ 断开重连后重试一次', label, e.message); + _dropOnvif(target.host); + return await fn(); + } +} + /** 速度档位 1~7 → ONVIF 速度 0.15~1(默认 4 档 → 0.57) */ function _speedNormalized(speed) { const s = Number(speed); @@ -597,7 +619,7 @@ export async function ptzAction(rtspUrl, action, speed = 4, stop = false, opts = const proto = await _protocol(target); if (proto === 'onvif') { try { - return await _onvifAction(target, key, speed, stop); + return await _withOnvifRetry(target, key, () => _onvifAction(target, key, speed, stop)); } catch (e) { _dropOnvif(target.host); _err('ONVIF %s 异常: %s', key, e.message); @@ -649,7 +671,7 @@ export async function ptzPresetGoto(rtspUrl, presetId, opts = {}) { const proto = await _protocol(target); if (proto === 'onvif') { try { - return await _onvifPresetGoto(target, id); + return await _withOnvifRetry(target, `presetGoto(${id})`, () => _onvifPresetGoto(target, id)); } catch (e) { _dropOnvif(target.host); _err('ONVIF 预置点调用异常: %s', e.message); @@ -689,7 +711,7 @@ export async function ptzPresetSet(rtspUrl, presetId, presetName, opts = {}) { const proto = await _protocol(target); if (proto === 'onvif') { try { - return await _onvifPresetSet(target, id, presetName); + return await _withOnvifRetry(target, `presetSet(${id})`, () => _onvifPresetSet(target, id, presetName)); } catch (e) { _dropOnvif(target.host); _err('ONVIF 预置点设置异常: %s', e.message);