v1.0.5

CHANGELOG.md

@@ -4,10 +4,19 @@ All notable changes to this project will be documented in this file.
 # Next
 
 ## Other Changes
+- Reduced default videoanalysis sensitivity to 25
+- Removed session control
+- Videoanalysis improvements
+- Refactored web stream
+- Improved camera pinging
+- Moved ENOENT messages to debug (eg. if recording not found)
 - Minor UI improvements
 
 ## Bugfixes
+- Fixed an issue where resetting motion via MQTT didnt work
 - Fixed an issue where the video analysis sensitivity does not work as desired
+- Fixed an issue where mapping video/audio stream didnt work (ffmpeg)
+- Minor Bugfixes
 
 # [1.0.4] - 2022-01-11
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "camera.ui",
-  "version": "1.0.5-beta.0",
+  "version": "1.0.5",
   "description": "User Interface for RTSP capable cameras.",
   "author": "SeydX (https://github.com/SeydX/camera.ui)",
   "scripts": {
@@ -39,7 +39,8 @@
     "morgan": "^1.10.0",
     "mqtt": "^4.3.4",
     "multer": "^1.4.4",
-    "nanoid": "^3.1.31",
+    "nanoid": "^3.1.32",
+    "nodejs-tcp-ping": "^1.0.3",
     "os": "^0.1.2",
     "pam-diff": "^1.1.0",
     "piexifjs": "^1.0.6",

src/api/components/files/files.controller.js

@@ -3,11 +3,14 @@
 
 const path = require('path');
 
+const SettingsModel = require('../settings/settings.model');
+
 const { ConfigService } = require('../../../services/config/config.service');
+const { LoggerService } = require('../../../services/logger/logger.service');
 
-const SettingsModel = require('../settings/settings.model');
+const { log } = LoggerService;
 
-exports.serve = async (req, res) => {
+exports.serve = async (req, res, next) => {
   try {
     const recordingSettings = await SettingsModel.getByTarget(false, 'recordings');
 
@@ -23,7 +26,15 @@ exports.serve = async (req, res) => {
       root: path.join(recPath),
     };
 
-    res.sendFile(file, options);
+    res.sendFile(file, options, (err) => {
+      if (err) {
+        if (err?.status === 404 || err?.statusCode === 404) {
+          log.debug(err.message);
+        }
+
+        next();
+      }
+    });
   } catch (error) {
     res.status(500).send({
       statusCode: 500,

src/api/components/settings/settings.controller.js

@@ -80,39 +80,10 @@ exports.patchTarget = async (req, res) => {
     await SettingsModel.patchByTarget(req.query.all, req.params.target, req.body);
 
     if (req.params.target === 'cameras') {
-      /*if (req.query.stopStream === 'true') {
-        for (const controller of cameras.values()) {
-          controller.stream?.stop();
-        }
-      }*/
-
-      //log.debug('Camera settings changed. The changes take effect when the camera stream is restarted.');
-
       const cameraSettings = req.body;
 
       for (const camera of cameraSettings) {
         const controller = cameras.get(camera.name);
-
-        let setting = {
-          '-s': camera.resolution,
-        };
-
-        if (camera.audio) {
-          controller?.stream?.delStreamOptions(['-an']);
-
-          setting = {
-            ...setting,
-            '-codec:a': 'mp2',
-            '-ar': '44100',
-            '-ac': '1',
-            '-b:a': '128k',
-          };
-        } else {
-          controller?.stream?.delStreamOptions(['-codec:a', '-ar', '-ac', '-b:a']);
-          setting['-an'] = '';
-        }
-
-        controller?.stream.setStreamOptions(setting);
         controller?.videoanalysis.changeZone(camera.videoanalysis.regions, camera.videoanalysis.sensitivity);
       }
     }

src/api/components/system/system.controller.js

@@ -83,13 +83,21 @@ exports.clearLog = async (req, res) => {
   }
 };
 
-exports.downloadDb = async (req, res) => {
+exports.downloadDb = async (req, res, next) => {
   try {
     const dbPath = ConfigService.databaseFilePath;
     //const dbJson = JSON.stringify((await fs.readJSON(dbPath, { throws: false })) || {});
 
     res.header('Content-Type', 'application/json');
-    res.sendFile(dbPath);
+    res.sendFile(dbPath, (err) => {
+      if (err) {
+        if (err?.status === 404 || err?.statusCode === 404) {
+          log.debug(err.message);
+        }
+
+        next();
+      }
+    });
   } catch (error) {
     res.status(500).send({
       statusCode: 500,

src/api/database.js

@@ -138,7 +138,7 @@ const defaultCameraSettingsEntry = {
     labels: [],
   },
   videoanalysis: {
-    sensitivity: 50,
+    sensitivity: 25,
     regions: [],
   },
 };

src/common/ping.js

@@ -1,5 +1,6 @@
 'use-strict';
 
+const nodejsTcpPing = require('nodejs-tcp-ping');
 const ping = require('ping');
 const { URL } = require('url');
 
@@ -26,16 +27,33 @@ class Ping {
 
     const url = new URL(cameraSource);
 
-    log.debug(`Pinging ${url.hostname}`, camera.name);
+    log.debug(`Pinging ${url.hostname}:${url.port || 80}`, camera.name);
 
-    const response = await ping.promise.probe(url.hostname, {
-      timeout: timeout || 1,
-      extra: ['-i', '2'],
-    });
+    let available = false;
 
-    let available = response && response.alive;
+    try {
+      const response = await nodejsTcpPing.tcpPing({
+        attempts: 5,
+        host: url.hostname,
+        port: Number.parseInt(url.port) || 80,
+        timeout: (timeout || 1) * 1000,
+      });
 
-    log.debug(`Pinging ${url.hostname} - ${available ? 'successful' : 'failed'}`, camera.name);
+      available = response.filter((result) => result.ping).length > 2;
+    } catch {
+      //ignore
+    }
+
+    if (!available) {
+      const response = await ping.promise.probe(url.hostname, {
+        timeout: timeout || 1,
+        extra: ['-i', '2'],
+      });
+
+      available = response && response.alive;
+    }
+
+    log.debug(`Pinging ${url.hostname}:${url.port || 80} - ${available ? 'successful' : 'failed'}`, camera.name);
 
     return available;
   }