diff --git a/services/camera.js b/services/camera.js index 52568dc..3783470 100644 --- a/services/camera.js +++ b/services/camera.js @@ -72,7 +72,7 @@ class CameraService extends service { } try { const { ptzControl } = await import('../utils/cameraPtz.js'); - const r = await ptzControl(data.rtspUrl, data.action, data.speed, { channel: data.channel, port: data.port }); + const r = await ptzControl(data.rtspUrl, data.action, data.speed, { channel: data.channel, port: data.port, ip: data.ip, username: data.username, password: data.password }); if (!r.ok) console.error('[CameraPTZ] control 失败:', r.message); } catch (e) { console.error('[CameraPTZ] control 异常:', e.message); @@ -90,7 +90,7 @@ class CameraService extends service { } try { const { ptzStop } = await import('../utils/cameraPtz.js'); - const r = await ptzStop(data.rtspUrl, data.action, { channel: data.channel, port: data.port }); + const r = await ptzStop(data.rtspUrl, data.action, { channel: data.channel, port: data.port, ip: data.ip, username: data.username, password: data.password }); if (!r.ok) console.error('[CameraPTZ] stop 失败:', r.message); } catch (e) { console.error('[CameraPTZ] stop 异常:', e.message); @@ -108,7 +108,7 @@ class CameraService extends service { } try { const { ptzPresetGoto } = await import('../utils/cameraPtz.js'); - const r = await ptzPresetGoto(data.rtspUrl, data.presetId, { channel: data.channel, port: data.port }); + const r = await ptzPresetGoto(data.rtspUrl, data.presetId, { channel: data.channel, port: data.port, ip: data.ip, username: data.username, password: data.password }); if (!r.ok) console.error('[CameraPTZ] presetGoto 失败:', r.message); } catch (e) { console.error('[CameraPTZ] presetGoto 异常:', e.message); @@ -126,7 +126,7 @@ class CameraService extends service { } try { const { ptzPresetSet } = await import('../utils/cameraPtz.js'); - const r = await ptzPresetSet(data.rtspUrl, data.presetId, data.presetName, { channel: data.channel, port: data.port }); + const r = await ptzPresetSet(data.rtspUrl, data.presetId, data.presetName, { channel: data.channel, port: data.port, ip: data.ip, username: data.username, password: data.password }); if (!r.ok) console.error('[CameraPTZ] presetSet 失败:', r.message); } catch (e) { console.error('[CameraPTZ] presetSet 异常:', e.message); @@ -144,7 +144,7 @@ class CameraService extends service { } try { const { ptzAuto } = await import('../utils/cameraPtz.js'); - const r = await ptzAuto(data.rtspUrl, data.on, { channel: data.channel, port: data.port }); + const r = await ptzAuto(data.rtspUrl, data.on, { channel: data.channel, port: data.port, ip: data.ip, username: data.username, password: data.password }); if (!r.ok) console.error('[CameraPTZ] auto 失败:', r.message); } catch (e) { console.error('[CameraPTZ] auto 异常:', e.message); diff --git a/utils/cameraPtz.js b/utils/cameraPtz.js index db352a5..2b8b621 100644 --- a/utils/cameraPtz.js +++ b/utils/cameraPtz.js @@ -152,20 +152,37 @@ function _speedValue(speed) { return s < 7 ? 15 * Math.round(s) : 100; } -/** 解析 RTSP URL → { host, username, password, channel, port } */ -function _parseTarget(rtspUrl, channelOverride, portOverride) { - const info = extractRTSPInfo(rtspUrl); +/** + * 解析目标设备 → { host, username, password, channel, port } + * 优先用服务端显式下发的 ip / username / password / channel(推荐,不依赖 rtspUrl 解析), + * 缺哪项才回落到 rtspUrl。 + */ +function _parseTarget(rtspUrl, opts = {}) { + let info = { host: '', username: '', password: '', channel: 1 }; + if (rtspUrl) { + try { + info = extractRTSPInfo(rtspUrl); + } catch (e) { + // rtspUrl 不合法/缺账号时,靠显式字段补齐 + _log('rtspUrl 解析失败,改用显式字段: %s', e.message); + } + } + let channel = Number(info.channel) || 1; // 兼容 /Streaming/Channels/1201 这种通道号 ≥10 的写法(取末两位为码流号) - const m = String(rtspUrl).match(/\/Streaming\/Channels\/(\d+)/i); + const m = String(rtspUrl || '').match(/\/Streaming\/Channels\/(\d+)/i); if (m && m[1].length > 2) channel = Number(m[1].slice(0, -2)); - const override = Number(channelOverride); + const override = Number(opts.channel); if (Number.isInteger(override) && override > 0) channel = override; - const p = Number(portOverride); + + const host = opts.ip || info.host; + if (!host) throw new Error('缺少设备地址(需 rtspUrl 或 ip)'); + + const p = Number(opts.port); return { - host: info.host, - username: info.username, - password: info.password, + host, + username: opts.username || info.username, + password: opts.password || info.password, channel, port: Number.isInteger(p) && p > 0 ? p : 80, }; @@ -274,9 +291,9 @@ export async function ptzAction(rtspUrl, action, speed = 4, stop = false, opts = const def = ACTIONS[key]; let target; try { - target = _parseTarget(rtspUrl, opts.channel, opts.port); + target = _parseTarget(rtspUrl, opts); } catch (e) { - return { ok: false, message: `RTSP 地址无效: ${e.message}` }; + return { ok: false, message: `设备信息无效: ${e.message}` }; } const body = _buildBody(key, speed, stop); @@ -312,9 +329,9 @@ export async function ptzPresetGoto(rtspUrl, presetId, opts = {}) { if (!Number.isInteger(id) || id <= 0) return { ok: false, message: `预置点编号无效: ${presetId}` }; let target; try { - target = _parseTarget(rtspUrl, opts.channel, opts.port); + target = _parseTarget(rtspUrl, opts); } catch (e) { - return { ok: false, message: `RTSP 地址无效: ${e.message}` }; + return { ok: false, message: `设备信息无效: ${e.message}` }; } _log('调用预置点 %d ch=%d host=%s', id, target.channel, target.host); try { @@ -337,9 +354,9 @@ export async function ptzPresetSet(rtspUrl, presetId, presetName, opts = {}) { if (!Number.isInteger(id) || id <= 0) return { ok: false, message: `预置点编号无效: ${presetId}` }; let target; try { - target = _parseTarget(rtspUrl, opts.channel, opts.port); + target = _parseTarget(rtspUrl, opts); } catch (e) { - return { ok: false, message: `RTSP 地址无效: ${e.message}` }; + return { ok: false, message: `设备信息无效: ${e.message}` }; } const body = _XML_HEAD + '' + id + '' + '' + _xmlEscape(presetName || `Preset${id}`) + ''; @@ -361,9 +378,9 @@ export async function ptzPresetSet(rtspUrl, presetId, presetName, opts = {}) { export async function ptzAuto(rtspUrl, on, opts = {}) { let target; try { - target = _parseTarget(rtspUrl, opts.channel, opts.port); + target = _parseTarget(rtspUrl, opts); } catch (e) { - return { ok: false, message: `RTSP 地址无效: ${e.message}` }; + return { ok: false, message: `设备信息无效: ${e.message}` }; } const enabled = on === true || on === 1 || String(on).toLowerCase() === 'true' || String(on) === '1'; const body = _XML_HEAD + '' + (enabled ? 100 : 0) + '';