legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-17 01:50:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

service live configslop

Browse Source
This commit is contained in:
legop3
2026-09-14 17:56:53 -04:00
parent 881583ee0a
commit 91e0cc3886
69 changed files with 1188 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/services/ptzCameraService/index.js
+42 -5
View File
@@ -9,7 +9,7 @@ const { Cam } = require('onvif');
const io = require('../../globals/io');
const logger = require('../../globals/logger').child('ptzCamera');
const { loadConfig } = require('../../configuration');
const { loadConfig, registerConfigurationHandler } = require('../../configuration');
const { resolveRoverSnapshotDir } = require('../../helpers/dataPaths');
const {
shouldUseSnapshotsForNonTurnVideo,
@@ -51,9 +51,8 @@ const PUBLISHER_STDERR_SYNC_MS = 10000;
const PUBLISHER_RTSP_TIMEOUT_US = 10000000;
const events = new EventEmitter();
const config = loadConfig();
const cameraConfig = config.ptzCamera || {};
const enabled = Boolean(cameraConfig.enabled);
let cameraConfig = loadConfig().ptzCamera || {};
let enabled = Boolean(cameraConfig.enabled);
const state = {
initialized: false,
@@ -114,7 +113,7 @@ let lastSnapshotState = null;
const snapshotSubscribers = new Map();
const socketSnapshotSubscriptions = new Map();
const snapshotLastSentBySocket = new Map();
const audioPlayback = createPtzAudioPlayback({
let audioPlayback = createPtzAudioPlayback({
logger,
cameraConfig,
enabled,
@@ -1831,6 +1830,44 @@ if (enabled) {
initialize();
}
function stopCameraRuntime() {
// Disable restart-producing callbacks before terminating the publisher. The
// old ffmpeg exit event can then observe `enabled === false` and will not
// resurrect a process built from the previous camera configuration.
enabled = false;
revokeOperator('configuration-change');
state.queue = [];
stopPublisher();
audioPlayback.stopActivePlayback('configuration-change');
if (snapshotTimer) {
clearInterval(snapshotTimer);
snapshotTimer = null;
}
if (spotlightVerifyTimer) {
clearTimeout(spotlightVerifyTimer);
spotlightVerifyTimer = null;
}
clearMotionWatchdog();
clearPanTiltRenewal();
clearZoomRepeat();
onvifCam = null;
state.initialized = false;
state.initializing = false;
state.rtspUri = null;
state.profileToken = DEFAULT_PROFILE_TOKEN;
}
registerConfigurationHandler('ptzCamera', (nextCameraConfig = {}) => {
stopCameraRuntime();
cameraConfig = nextCameraConfig;
enabled = Boolean(cameraConfig.enabled);
state.profileToken = String(cameraConfig.profileToken || DEFAULT_PROFILE_TOKEN);
state.error = null;
audioPlayback = createPtzAudioPlayback({ logger, cameraConfig, enabled, getSocketLabel });
emitChange('configuration-change');
if (enabled) initialize();
});
module.exports = {
PTZ_CAMERA_ID,
PTZ_STREAM_PATH,