v1.1.7

.gitignore

@@ -159,4 +159,5 @@ parseFFmpeg.js
 parseUrl.js
 systeminformation.js
 parseRegions.js
-src2
+src2
+lang.js

.npmignore

@@ -78,3 +78,4 @@ parseUrl.js
 systeminformation.js
 parseRegions.js
 src2
+lang.js

CHANGELOG.md

@@ -1,14 +1,26 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-# NEXT
+# v1.1.7 - 2022-04-15
 
 ## Other Changes
 - i18n: Thai (th) language added by [@tomzt](https://github.com/tomzt)
 - i18n: French (fr) language added by [@NebzHB](https://github.com/NebzHB)
 - i18n: Spanish (es) language added by [@mastefordev](https://github.com/masterfordev)
+- Added a new config.json tab to `Interface > Settings > System`
+- Improved videoanalysis
+- Minor UI improvements
 - Bump dependencies
 
+## Bugfixes
+- Fixed an issue where pinging camera sources with `non-break spaces` failed
+- Fixed an issue where Doorbell Topic and Message were not displayed in the interface
+- Fixed an issue where changing `recordOnMovement` in the ui settings was resetted after restart
+- Fixed an issue where notifications were saved to the database even if the notifications were disabled in the settings
+- Fixed an issue where Telegram sometimes could not send videos
+- Fixed tests
+- Minor bugfixes
+
 # v1.1.6 - 2022-01-25
 
 ## Bugfixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "camera.ui",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "NVR like user interface for RTSP capable cameras.",
   "author": "SeydX (https://github.com/SeydX/camera.ui)",
   "scripts": {

src/api/components/config/config.controller.js

@@ -1,8 +1,51 @@
 /* eslint-disable unicorn/prevent-abbreviations */
 'use-strict';
 
+import fs from 'fs-extra';
+
 import * as ConfigModel from './config.model.js';
 
+import LoggerService from '../../../services/logger/logger.service.js';
+import ConfigService from '../../../services/config/config.service.js';
+
+const { log } = LoggerService;
+
+export const downloadConfig = async (req, res, next) => {
+  try {
+    const configPath = ConfigService.configPath;
+
+    res.header('Content-Type', 'application/json');
+    res.sendFile(configPath, (err) => {
+      if (err) {
+        if (err?.status === 404 || err?.statusCode === 404) {
+          log.debug(err.message);
+        }
+
+        next();
+      }
+    });
+  } catch (error) {
+    res.status(500).send({
+      statusCode: 500,
+      message: error.message,
+    });
+  }
+};
+
+export const lastModifiedConfig = async (req, res) => {
+  try {
+    const configPath = ConfigService.configPath;
+    const configFileInfo = await fs.stat(configPath);
+
+    res.status(200).send(configFileInfo);
+  } catch (error) {
+    res.status(500).send({
+      statusCode: 500,
+      message: error.message,
+    });
+  }
+};
+
 export const show = async (req, res) => {
   try {
     const result = await ConfigModel.show(req.jwt, req.query.target);

src/api/components/config/config.routes.js

@@ -36,6 +36,51 @@ export const routesConfig = (app) => {
    */
 
   app.get('/api/config', [ValidationMiddleware.validJWTOptional, ConfigController.show]);
+
+  /**
+   * @swagger
+   * /api/system/config/download:
+   *   get:
+   *     tags: [System]
+   *     security:
+   *       - bearerAuth: []
+   *     summary: Get config.json
+   *     responses:
+   *       200:
+   *         description: Successfull
+   *       401:
+   *         description: Unauthorized
+   *       500:
+   *         description: Internal server error
+   */
+  app.get('/api/config/download', [
+    ValidationMiddleware.validJWTNeeded,
+    PermissionMiddleware.onlyMasterCanDoThisAction,
+    ConfigController.downloadConfig,
+  ]);
+
+  /**
+   * @swagger
+   * /api/config/stat:
+   *   get:
+   *     tags: [Config]
+   *     security:
+   *       - bearerAuth: []
+   *     summary: Get Config file info
+   *     responses:
+   *       200:
+   *         description: Successfull
+   *       401:
+   *         description: Unauthorized
+   *       500:
+   *         description: Internal server error
+   */
+  app.get('/api/config/stat', [
+    ValidationMiddleware.validJWTNeeded,
+    PermissionMiddleware.onlyMasterCanDoThisAction,
+    ConfigController.lastModifiedConfig,
+  ]);
+
   /**
    * @swagger
    * /api/config/{target}:

src/api/components/notifications/notifications.model.js

@@ -102,20 +102,6 @@ export const createNotification = async (data) => {
     throw new Error('Can not assign notification to camera!');
   }
 
-  //Check notification size, if we exceed more than {100} notifications, remove the latest
-  const notificationList = await Database.interfaceDB.chain.get('notifications').cloneDeep().value();
-
-  if (notificationList.length > notificationsLimit) {
-    const diff = notificationList.length - notificationsLimit;
-    const diffNotifiations = notificationList.slice(-diff);
-
-    for (const notification of diffNotifiations) {
-      Cleartimer.removeNotificationTimer(notification.id);
-    }
-
-    await Database.interfaceDB.chain.get('notifications').dropRight(notificationList, diff).value();
-  }
-
   const cameraSetting = camerasSettings.find((cameraSetting) => cameraSetting && cameraSetting.name === camera.name);
 
   const id = data.id || (await nanoid());
@@ -152,10 +138,6 @@ export const createNotification = async (data) => {
     label: label,
   };
 
-  await Database.interfaceDB.chain.get('notifications').push(notification).value();
-
-  Cleartimer.setNotification(id, timestamp);
-
   const notify = {
     ...notification,
     title: cameraName,
@@ -171,6 +153,32 @@ export const createNotification = async (data) => {
     isNotification: true,
   };
 
+  const notificationSettings = await Database.interfaceDB.chain
+    .get('settings')
+    .get('notifications')
+    .cloneDeep()
+    .value();
+
+  if (notificationSettings.active) {
+    //Check notification size, if we exceed more than {100} notifications, remove the latest
+    const notificationList = await Database.interfaceDB.chain.get('notifications').cloneDeep().value();
+
+    if (notificationList.length > notificationsLimit) {
+      const diff = notificationList.length - notificationsLimit;
+      const diffNotifiations = notificationList.slice(-diff);
+
+      for (const notification of diffNotifiations) {
+        Cleartimer.removeNotificationTimer(notification.id);
+      }
+
+      await Database.interfaceDB.chain.get('notifications').dropRight(notificationList, diff).value();
+    }
+
+    await Database.interfaceDB.chain.get('notifications').push(notification).value();
+
+    Cleartimer.setNotification(id, timestamp);
+  }
+
   return {
     notification: notification,
     notify: notify,

src/api/components/system/system.routes.js

@@ -36,7 +36,7 @@ export const routesConfig = (app) => {
 
   /**
    * @swagger
-   * /api/system/log/download:
+   * /api/system/db/download:
    *   get:
    *     tags: [System]
    *     security:

src/common/cleartimer.js

@@ -271,16 +271,20 @@ export default class Cleartimer {
     if (timeValue) {
       const endTime = moment.unix(timestamp).add(timeValue, timeTyp);
 
-      //log.debug(`SET cleartimer for ${isRecording ? 'Recording' : 'Notification'} (${id}) - Endtime: ${endTime}`);
+      /*log.debug(
+        `SET cleartimer for ${
+          isRecording ? 'Recording' : 'Notification'
+        } (${id}) - Removing after ${timeValue} ${timeTyp} - Endtime: ${endTime}`
+      );*/
 
-      const interval = isRecording ? 24 * 60 * 60 * 1000 : 60 * 60 * 1000;
+      const interval = isRecording ? 6 * 60 * 60 * 1000 : 30 * 60 * 1000;
 
       const timer = setInterval(async () => {
         const now = moment();
 
         if (now > endTime) {
-          clearInterval(timer);
           await (isRecording ? Cleartimer.#clearRecording(id) : Cleartimer.#clearNotification(id));
+          clearInterval(timer);
         }
       }, interval);
 

src/common/ping.js

@@ -10,7 +10,8 @@ export default class Ping {
   static async status(camera, timeout = 1) {
     const { log } = LoggerService;
 
-    let cameraSource = camera.videoConfig.source.split('-i ')[1];
+    //fix for non-break-spaces
+    let cameraSource = camera.videoConfig.source.replace(/\u00A0/g, ' ').split('-i ')[1];
 
     if (!cameraSource) {
       log.warn(`Can not ping camera source, no source found (${camera.videoConfig.source})`, camera.name);

src/common/telegram.js

@@ -71,7 +71,8 @@ export default class Telegram {
       if (content.video) {
         try {
           log.debug('Telegram: Sending Video');
-          await Telegram.bot.sendVideo(chatID, content.video, {}, { filename: content.fileName });
+          const stream = fs.createReadStream(content.video);
+          await Telegram.bot.sendVideo(chatID, stream, {}, { filename: content.fileName });
         } catch (error) {
           log.info('An error occured during sending video!', 'Telegram', 'notifications');
           log.error(error?.message || error, 'Telegram', 'notifications');

src/controller/camera/services/media.service.js

@@ -41,11 +41,6 @@ export default class MediaService {
   async probe() {
     // eslint-disable-next-line no-unused-vars
     return new Promise((resolve, reject) => {
-      log.debug(
-        `Probe stream: ${ConfigService.ui.options.videoProcessor} ${this.#camera.videoConfig.subSource}`,
-        this.cameraName
-      );
-
       const arguments_ = [
         '-hide_banner',
         '-loglevel',
@@ -57,6 +52,8 @@ export default class MediaService {
         ...this.#camera.videoConfig.source.split(/\s+/),
       ];
 
+      log.debug(`Probe stream: ${ConfigService.ui.options.videoProcessor} ${arguments_.join(' ')}`, this.cameraName);
+
       let cp = spawn(ConfigService.ui.options.videoProcessor, arguments_, {
         env: process.env,
       });

src/controller/camera/services/prebuffer.service.js

@@ -363,7 +363,7 @@ export default class PrebufferService {
             };
 
             this.events.on(eventName, safeWriteData);
-            this.prebufferSession.events.once('killed', cleanup);
+            this.prebufferSession?.events.once('killed', cleanup);
 
             const parser = this.parsers[container];
             const availablePrebuffers = parser.findSyncFrame(