v1.1.3

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# v1.1.3 - 2022-01-23
+
+## Other Changes
+- Refactored recordings/notifications filter
+- Refactored config generator
+
+## Bugfixes
+- Fixed an issue where camera names were displayed incorrectly in recordings
+- Fixed an issue where the recordings/notifications could not be filtered properly
+- Fixed an issue where config.json was not created in standalone mode
+- Fixed an issue where deleting the camera via the interface caused errors
+- Minor bugfixes
+
 # v1.1.2 - 2022-01-22
 
 ## Bugfixes

bin/camera.ui.js

@@ -57,8 +57,9 @@ process.env.CUI_STORAGE_DATABASE_PATH = path.resolve(storagePath, 'database');
 process.env.CUI_STORAGE_DATABASE_USER_PATH = path.resolve(storagePath, 'database', 'user');
 process.env.CUI_STORAGE_DATABASE_FILE = path.resolve(storagePath, 'database', 'database.json');
 process.env.CUI_STORAGE_LOG_PATH = path.resolve(storagePath, 'logs');
-process.env.CUI_STORAGE_LOG_FILE = path.resolve(storagePath, 'logs', 'camera.ui.log.txt');
+process.env.CUI_STORAGE_LOG_FILE = path.resolve(storagePath, 'logs', 'camera.ui.log');
 process.env.CUI_STORAGE_RECORDINGS_PATH = path.resolve(storagePath, 'recordings');
+process.env.CUI_STORAGE_REPORTS_PATH = path.resolve(storagePath, 'reports');
 
 process.env.CUI_MODULE_NAME = moduleName;
 process.env.CUI_MODULE_VERSION = packageJson.version;
@@ -68,7 +69,9 @@ process.env.CUI_MODULE_SUDO = sudoEnabled;
 process.env.CUI_VERSION = packageJson.version;
 
 const logger = new LoggerService();
-const config = new ConfigService();
+
+const configJson = fs.readJSONSync(process.env.CUI_STORAGE_CONFIG_FILE, { throws: false });
+const config = new ConfigService(configJson);
 
 if (cluster.isPrimary) {
   const { log } = LoggerService;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "camera.ui",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "NVR like user interface for RTSP capable cameras.",
   "author": "SeydX (https://github.com/SeydX/camera.ui)",
   "scripts": {
@@ -31,7 +31,7 @@
     "fs-extra": "10.0.0",
     "ftp-srv": "^4.5.0",
     "got": "^12.0.1",
-    "helmet": "^5.0.1",
+    "helmet": "^5.0.2",
     "ip": "^1.1.5",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
@@ -58,7 +58,7 @@
     "web-push": "^3.4.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.10",
+    "@babel/core": "^7.16.12",
     "@babel/eslint-parser": "^7.16.5",
     "@babel/eslint-plugin": "^7.16.5",
     "concurrently": "6.5.1",

src/api/components/cameras/cameras.controller.js

@@ -76,7 +76,7 @@ export const getByName = async (req, res) => {
 
 export const patchByName = async (req, res) => {
   try {
-    if (Object.keys(req.body).length === 0) {
+    if (req.body === undefined) {
       return res.status(400).send({
         statusCode: 400,
         message: 'Bad request',

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

@@ -18,7 +18,7 @@ export const show = async (req, res) => {
 
 export const patchConfig = async (req, res) => {
   try {
-    if (Object.keys(req.body).length === 0) {
+    if (req.body === undefined) {
       return res.status(400).send({
         statusCode: 400,
         message: 'Bad request',

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

@@ -29,17 +29,16 @@ export const list = async (query) => {
 
   if (moment(query.from, 'YYYY-MM-DD').isValid()) {
     notifications = notifications.filter((notification) => {
-      let date = notification.time.split(',')[0].split('.');
+      const date = moment.unix(notification.timestamp).format('YYYY-MM-DD');
+      const dateMoment = moment(date).set({ hour: 0, minute: 0, second: 1 });
 
-      let year = date[2];
-      let month = date[1];
-      let day = date[0];
+      const fromDate = query.from;
+      const toDate = moment(query.to, 'YYYY-MM-DD').isValid() ? query.to : moment();
 
-      date = year + '-' + month + '-' + day;
+      const fromDateMoment = moment(fromDate).set({ hour: 0, minute: 0, second: 0 });
+      const toDateMoment = moment(toDate).set({ hour: 23, minute: 59, second: 59 });
 
-      let to = moment(query.to, 'YYYY-MM-DD').isValid() ? query.to : moment();
-
-      let isBetween = moment(date).isBetween(query.from, to);
+      const isBetween = dateMoment.isBetween(fromDateMoment, toDateMoment);
 
       return isBetween;
     });

src/api/components/recordings/recordings.model.js

@@ -43,17 +43,16 @@ export const list = (query) => {
 
   if (moment(query.from, 'YYYY-MM-DD').isValid()) {
     recordings = recordings.filter((recording) => {
-      let date = recording.time.split(',')[0].split('.');
+      const date = moment.unix(recording.timestamp).format('YYYY-MM-DD');
+      const dateMoment = moment(date).set({ hour: 0, minute: 0, second: 1 });
 
-      let year = date[2];
-      let month = date[1];
-      let day = date[0];
+      const fromDate = query.from;
+      const toDate = moment(query.to, 'YYYY-MM-DD').isValid() ? query.to : moment();
 
-      date = year + '-' + month + '-' + day;
+      const fromDateMoment = moment(fromDate).set({ hour: 0, minute: 0, second: 0 });
+      const toDateMoment = moment(toDate).set({ hour: 23, minute: 59, second: 59 });
 
-      let to = moment(query.to, 'YYYY-MM-DD').isValid() ? query.to : moment();
-
-      let isBetween = moment(date).isBetween(query.from, to);
+      const isBetween = dateMoment.isBetween(fromDateMoment, toDateMoment);
 
       return isBetween;
     });

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

@@ -52,7 +52,7 @@ export const getTarget = async (req, res) => {
 
 export const patchTarget = async (req, res) => {
   try {
-    if (Object.keys(req.body).length === 0) {
+    if (req.body === undefined) {
       return res.status(400).send({
         statusCode: 400,
         message: 'Bad request',

src/api/components/users/users.controller.js

@@ -124,7 +124,7 @@ export const patchByName = async (req, res) => {
         req.body.photo = req.file.filename;
       }
 
-      if (Object.keys(req.body).length === 0) {
+      if (req.body === undefined) {
         return res.status(400).send({
           statusCode: 400,
           message: 'Bad request',

src/api/database.js

@@ -162,6 +162,7 @@ export default class Database {
   static databasePath = ConfigService.databasePath;
   static databaseUserPath = ConfigService.databaseUserPath;
   static recordingsPath = ConfigService.recordingsPath;
+  static reportsPath = ConfigService.reportsPath;
   static databaseFilePath = ConfigService.databaseFilePath;
 
   static controller;
@@ -175,6 +176,7 @@ export default class Database {
   async prepareDatabase() {
     await fs.ensureDir(Database.recordingsPath);
     await fs.ensureDir(Database.databaseUserPath);
+    await fs.ensureDir(Database.reportsPath);
 
     Database.interfaceDB = new Low(new JSONFile(Database.databaseFilePath));
     Database.tokensDB = new Low(new MemorySync());
@@ -324,7 +326,7 @@ export default class Database {
 
         return {
           id: id,
-          camera: cameraName,
+          camera: cameraName.replace(/_/g, ' '),
           fileName: `${fileName}.${extension}`,
           name: fileName,
           extension: extension,

src/api/index.js

@@ -4,23 +4,25 @@
 import http from 'http';
 import https from 'https';
 
+import ConfigService from '../services/config/config.service.js';
+import LoggerService from '../services/logger/logger.service.js';
+
+const { log } = LoggerService;
+
 import App from './app.js';
 
 export default class Server {
   constructor(controller) {
-    const log = controller.log;
-    const config = controller.config;
-
     const app = new App({
       debug: process.env.CUI_LOG_DEBUG === '1',
-      version: config.version,
+      version: ConfigService.ui.version,
     });
 
-    const server = config.ssl
+    const server = ConfigService.ui.ssl
       ? https.createServer(
           {
-            key: config.ssl.key,
-            cert: config.ssl.cert,
+            key: ConfigService.ui.ssl.key,
+            cert: ConfigService.ui.ssl.cert,
           },
           app
         )
@@ -30,7 +32,9 @@ export default class Server {
       let addr = server.address();
       let bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port;
 
-      log.info(`camera.ui v${config.version} is listening on ${bind} (${config.ssl ? 'https' : 'http'})`);
+      log.info(
+        `camera.ui v${ConfigService.ui.version} is listening on ${bind} (${ConfigService.ui.ssl ? 'https' : 'http'})`
+      );
 
       controller.emit('finishLaunching');
     });
@@ -42,7 +46,7 @@ export default class Server {
         log.error(error, 'Interface', 'server');
       }
 
-      let bind = typeof port === 'string' ? 'Pipe ' + config.port : 'Port ' + config.port;
+      let bind = typeof port === 'string' ? 'Pipe ' + ConfigService.ui.port : 'Port ' + ConfigService.ui.port;
 
       switch (error.code) {
         case 'EACCES':

src/common/ping.js

@@ -6,10 +6,10 @@ import { URL } from 'url';
 
 import LoggerService from '../services/logger/logger.service.js';
 
-const { log } = LoggerService;
-
 export default class Ping {
   static async status(camera, timeout = 1) {
+    const { log } = LoggerService;
+
     let cameraSource = camera.videoConfig.source.split('-i ')[1];
 
     if (!cameraSource) {