camera.ui3 0.0.34-alpha.2 → 0.0.34-alpha.4

package/dist/server/src/api/services/users.service.js

@@ -6,7 +6,7 @@ export class UsersService {
         this.dbs = container.resolve('dbs');
     }
     async createUser(userData) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         if ('passwordConfig' in userData) {
             delete userData.passwordConfig;
         }
@@ -15,18 +15,18 @@ export class UsersService {
         return userData;
     }
     findById(id) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         return users?.find((userObj) => userObj._id === id);
     }
     findByName(username) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         return users?.find((userObj) => userObj.username === username);
     }
     list() {
-        return this.dbs.usersDB.get('users') || [];
+        return this.dbs.usersDB.get('users') ?? [];
     }
     async patchUser(username, userData = {}) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             mergeWith(user, userData, (source, target) => {
@@ -39,18 +39,18 @@ export class UsersService {
         return user;
     }
     async removeByName(username) {
-        let users = this.dbs.usersDB.get('users') || [];
+        let users = this.dbs.usersDB.get('users') ?? [];
         users = users.filter((userObj) => userObj.username !== username);
         await this.dbs.usersDB.put('users', users);
     }
     async removeAll() {
-        let users = this.dbs.usersDB.get('users') || [];
+        let users = this.dbs.usersDB.get('users') ?? [];
         const adminId = await this.dbs.getRootAdminId();
         users = users.filter((userObj) => userObj._id !== adminId);
         await this.dbs.usersDB.put('users', users);
     }
     async createShortcut(username, cameraId, shortcutData) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             if (!user.preferences.cameras[cameraId]) {
@@ -62,7 +62,7 @@ export class UsersService {
         }
     }
     async patchShortcutById(username, cameraId, shortcutId, shortcutData = {}) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             if (!user.preferences.cameras[cameraId]) {
@@ -81,7 +81,7 @@ export class UsersService {
         }
     }
     async removeShortcutById(username, cameraId, shortcutId) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             if (!user.preferences.cameras[cameraId]) {
@@ -93,7 +93,7 @@ export class UsersService {
         }
     }
     async removeAllShortcuts(username, cameraId) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             if (!user.preferences.cameras[cameraId]) {
@@ -105,7 +105,7 @@ export class UsersService {
         }
     }
     async createView(username, viewData) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             user.preferences.camview.views.push(viewData);
@@ -114,7 +114,7 @@ export class UsersService {
         return viewData;
     }
     async patchViewById(username, viewid, viewData = {}) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         const view = user?.preferences.camview.views.find((viewObj) => viewObj._id === viewid);
         if (user && view) {
@@ -128,7 +128,7 @@ export class UsersService {
         return view;
     }
     async removeViewById(username, viewid) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             user.preferences.camview.views = user.preferences.camview.views.filter((view) => view._id !== viewid);
@@ -137,7 +137,7 @@ export class UsersService {
         return user?.preferences.camview.views;
     }
     async removeAllViews(username) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             user.preferences.camview.views = [];
@@ -146,7 +146,7 @@ export class UsersService {
         return user?.preferences.camview.views;
     }
     async resetPreferences(username) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         const user = users.find((userObj) => userObj.username === username);
         if (user) {
             user.preferences = {
@@ -159,7 +159,7 @@ export class UsersService {
         }
     }
     async resetAllPreferences() {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         for (const user of users) {
             user.preferences = {
                 camview: {
@@ -175,7 +175,7 @@ export class UsersService {
         await this.removeCameraFromAllViews(cameraId);
     }
     async removeCameraFromAllShortcuts(cameraId) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         for (const user of users) {
             for (const cameraPreference of Object.values(user.preferences.cameras)) {
                 if (cameraPreference) {
@@ -186,7 +186,7 @@ export class UsersService {
         await this.dbs.usersDB.put('users', users);
     }
     async removeCameraFromAllViews(cameraId) {
-        const users = this.dbs.usersDB.get('users') || [];
+        const users = this.dbs.usersDB.get('users') ?? [];
         for (const user of users) {
             for (const view of user.preferences.camview.views) {
                 view.cameras = view.cameras.filter((camera) => camera.cameraId !== cameraId);

package/dist/server/src/api/types/index.d.ts

@@ -1,4 +1,5 @@
-import type { AuthConfig, PLUGIN_STATUS, PluginContract } from '@camera.ui/plugineer';
+import type { AuthConfig } from '@camera.ui/common';
+import type { PLUGIN_STATUS, PluginContract } from '@camera.ui/plugineer';
 import type { CameraExtension, CameraZone, RootSchema } from '@camera.ui/types';
 import type { Readable } from 'node:stream';
 import type { LoggingLevel } from '../../services/config/types.js';
@@ -180,213 +181,213 @@ export interface PaginationQuery {
     page?: number;
     pageSize?: number;
 }
-export type PaginationRequest = {
+export interface PaginationRequest {
     Querystring: PaginationQuery;
-};
-export type AuthParamsRequest = {
+}
+export interface AuthParamsRequest {
     Params: {
         id: string;
         username?: string;
     };
-};
-export type AuthLoginRequest = {
+}
+export interface AuthLoginRequest {
     Querystring: {
         username?: string;
         password?: string;
         token?: string;
     };
-};
-export type AuthNewLoginRequest = {
+}
+export interface AuthNewLoginRequest {
     Body: LoginUserInput;
-};
-export type AuthRefreshRequest = {
+}
+export interface AuthRefreshRequest {
     Body: {
         refresh_token: string;
     };
-};
-export type AuthTokensRequest = {
+}
+export interface AuthTokensRequest {
     Querystring: {
         clientData?: boolean;
     };
-};
-export type CamerasParamsRequest = {
+}
+export interface CamerasParamsRequest {
     Params: {
         cameraname: string;
     };
-};
-export type CameraSnapshotQueryRequest = {
+}
+export interface CameraSnapshotQueryRequest {
     Querystring: {
         forceNew?: boolean;
     };
-};
-export type CameraSourceParamsRequest = {
+}
+export interface CameraSourceParamsRequest {
     Params: {
         sourcename: string;
     };
-};
-export type CamerasParamsIdRequest = {
+}
+export interface CamerasParamsIdRequest {
     Params: {
         cameraid: string;
     };
-};
-export type CameraZonesParamsRequest = {
+}
+export interface CameraZonesParamsRequest {
     Params: {
         zonename: string;
     };
-};
-export type CamerasExtensionsParamsRequest = {
+}
+export interface CamerasExtensionsParamsRequest {
     Params: {
         cameraname: string;
         pluginname: string;
         scope?: string;
     };
-};
-export type CamerasExtensionsRequest = {
+}
+export interface CamerasExtensionsRequest {
     Querystring: {
         type: CameraExtension;
     };
-};
-export type CameraZoneInsertPatchRequest = {
+}
+export interface CameraZoneInsertPatchRequest {
     Body: CameraZone;
-};
-export type CamerasInsertRequest = {
+}
+export interface CamerasInsertRequest {
     Body: CreateCameraInput;
-};
-export type CamerasPreviewRequest = {
+}
+export interface CamerasPreviewRequest {
     Body: PreviewCameraInput;
-};
-export type CamerasPatchRequest = {
+}
+export interface CamerasPatchRequest {
     Body: PatchCameraInput;
-};
-export type ExtensionsPatchRequest = {
+}
+export interface ExtensionsPatchRequest {
     Body: Record<string, any>;
-};
-export type ExtensionsSubmitRequest = {
+}
+export interface ExtensionsSubmitRequest {
     Body: {
         configPath: string;
     };
-};
-export type ConfigRequest = {
+}
+export interface ConfigRequest {
     Querystring: {
         json?: boolean;
     };
-};
-export type ConfigPatchRequest = {
+}
+export interface ConfigPatchRequest {
     Body: PatchConfigInput;
-};
-export type Go2RtcConfigPatchRequest = {
+}
+export interface Go2RtcConfigPatchRequest {
     Body: PatchGo2RtcConfigInput;
-};
-export type FilesParamsRequest = {
+}
+export interface FilesParamsRequest {
     Params: {
         file: string;
     };
-};
-export type PluginsParamsIdRequest = {
+}
+export interface PluginsParamsIdRequest {
     Params: {
         pluginid: string;
     };
-};
-export type PluginsParamsNameRequest = {
+}
+export interface PluginsParamsNameRequest {
     Params: {
         scope?: string;
         pluginname: string;
     };
-};
-export type FrameWorkerParamsNameRequest = {
+}
+export interface FrameWorkerParamsNameRequest {
     Params: {
         frameworkername: string;
     };
-};
-export type PluginsParamsRemoveRequest = {
+}
+export interface PluginsParamsRemoveRequest {
     Querystring: {
         removeStorage?: boolean;
     };
-};
+}
 export interface PluginsQuery {
     pluginname?: string;
     pluginversion?: string;
 }
-export type PluginsQueryRequest = {
+export interface PluginsQueryRequest {
     Querystring: PluginsQuery;
-};
-export type PluginsInsertRequest = {
+}
+export interface PluginsInsertRequest {
     Body: {
         pluginname: string;
         pluginversion?: string;
     };
-};
-export type PluginsConfigPatchRequest = {
+}
+export interface PluginsConfigPatchRequest {
     Body: Record<string, any>;
-};
-export type PluginsActionRequest = {
+}
+export interface PluginsActionRequest {
     Body: {
         actionId: string;
         payload: any;
     };
-};
-export type PluginsDetectMotionRequest = {
+}
+export interface PluginsDetectMotionRequest {
     Body: DetectMotionInput;
-};
-export type PluginsDetectObjectRequest = {
+}
+export interface PluginsDetectObjectRequest {
     Body: DetectObjectInput;
-};
-export type PluginsDetectAudioRequest = {
+}
+export interface PluginsDetectAudioRequest {
     Body: DetectAudioInput;
-};
+}
 export interface PluginsInterfaceQueryType {
     type: 'objectDetection' | 'motionDetection' | 'audioDetection';
 }
-export type PluginsInterfaceQuery = {
+export interface PluginsInterfaceQuery {
     Querystring: {
         type: PluginsInterfaceQueryType;
     };
-};
-export type UsersParamsRequest = {
+}
+export interface UsersParamsRequest {
     Params: {
         username: string;
     };
-};
-export type UsersInsertRequest = {
+}
+export interface UsersInsertRequest {
     Body: CreateUserInput & {
         avatar: string;
     };
-};
-export type UsersPatchRequest = {
+}
+export interface UsersPatchRequest {
     Body: PatchUserInput & {
         avatar: string;
     };
-};
-export type SystemPatchRequest = {
+}
+export interface SystemPatchRequest {
     Body: PatchSystemInput;
-};
-export type ViewsParamsRequest = {
+}
+export interface ViewsParamsRequest {
     Params: {
         viewid: string;
     };
-};
-export type ViewsInsertRequest = {
+}
+export interface ViewsInsertRequest {
     Body: CreateViewInput;
-};
-export type ViewsPatchRequest = {
+}
+export interface ViewsPatchRequest {
     Body: PatchViewInput;
-};
-export type ShortcutParamsRequest = {
+}
+export interface ShortcutParamsRequest {
     Params: {
         shortcutid: string;
     };
-};
-export type ShortcutInsertRequest = {
+}
+export interface ShortcutInsertRequest {
     Body: CreateShortcutInput;
-};
-export type ShortcutPatchRequest = {
+}
+export interface ShortcutPatchRequest {
     Body: PatchShortcutInput;
-};
-export type BackupCreateRequest = {
+}
+export interface BackupCreateRequest {
     Body: {
         localStorage: Partial<UiLocalStorage>;
     };
-};
+}
 export interface BackupInfo {
     backupDirectory: string;
     backupFile: string;
@@ -429,9 +430,9 @@ export interface UiLocalStorage {
     theme: ThemeLocalStorage;
     locale: SupportedLanguageAbbreviatons;
 }
-export type BackupRestoreRequest = {
+export interface BackupRestoreRequest {
     Body: RestoreBackupInput;
-};
+}
 export interface INpmPluginState {
     updateAvailable: boolean;
     betaUpdateAvailable: boolean;
@@ -462,32 +463,18 @@ export interface IPackageJson {
     contributors?: string[] | INpmPerson[];
     files?: string[];
     main?: string;
-    bin?: string | {
-        [key: string]: string;
-    };
+    bin?: string | Record<string, string>;
     repository?: string | {
         type: string;
         url: string;
     };
-    scripts?: {
-        [key: string]: string;
-    };
-    dependencies?: {
-        [key: string]: string;
-    };
-    devDependencies?: {
-        [key: string]: string;
-    };
-    peerDependencies?: {
-        [key: string]: string;
-    };
-    optionalDependencies?: {
-        [key: string]: string;
-    };
+    scripts?: Record<string, string>;
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+    peerDependencies?: Record<string, string>;
+    optionalDependencies?: Record<string, string>;
     bundledDependencies?: string[];
-    engines?: {
-        [key: string]: string;
-    };
+    engines?: Record<string, string>;
     os?: string[];
     cpu?: string[];
     preferGlobal?: boolean;
@@ -495,9 +482,7 @@ export interface IPackageJson {
     publishConfig?: {
         registry?: string;
     };
-    exports?: {
-        [key: string]: any;
-    };
+    exports?: Record<string, any>;
     type?: 'module';
     'camera.ui'?: PluginContract;
 }
@@ -509,9 +494,7 @@ export interface INpmRegistryModule {
         latest: string;
         [key: string]: string;
     };
-    versions: {
-        [key: string]: IPackageJson;
-    };
+    versions: Record<string, IPackageJson>;
     time: {
         created: string;
         modified: string;

package/dist/server/src/api/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/types/index.ts"],"names":[],"mappings":"AAmEA,MAAM,CAAN,IAAkB,aAEjB;AAFD,WAAkB,aAAa;IAC7B,kCAAiB,CAAA;AACnB,CAAC,EAFiB,aAAa,KAAb,aAAa,QAE9B;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAoB;IAClD,IAAI,EAAE,CAAC;IACP,QAAQ,EAAE,CAAC;CACZ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/types/index.ts"],"names":[],"mappings":"AAoEA,MAAM,CAAN,IAAkB,aAEjB;AAFD,WAAkB,aAAa;IAC7B,kCAAiB,CAAA;AACnB,CAAC,EAFiB,aAAa,KAAb,aAAa,QAE9B;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAoB;IAClD,IAAI,EAAE,CAAC;IACP,QAAQ,EAAE,CAAC;CACZ,CAAC"}

package/dist/server/src/api/utils/cert.js

@@ -177,8 +177,8 @@ export class CertificateGeneration {
         const isLegacy = certExists && isLegacyCertificate(certFile);
         if (!certExists || !certIsValid || isLegacy || forceNew) {
             logger.debug(`Generating new certificate/key for server... (Reason: ${!certExists ? 'No cert' : !certIsValid ? 'Invalid cert' : isLegacy ? 'Legacy cert' : 'Force new'})`);
-            const CA = CertificateGeneration.createRootCA(config.ssl?.addresses || []);
-            const hostCert = CertificateGeneration.createHostCert(config.ssl?.addresses || [], CA);
+            const CA = CertificateGeneration.createRootCA(config.ssl?.addresses ?? []);
+            const hostCert = CertificateGeneration.createHostCert(config.ssl?.addresses ?? [], CA);
             return hostCert;
         }
         else if (certExists && !forceNew) {

package/dist/server/src/api/websocket/index.js

@@ -56,7 +56,7 @@ export class SocketService {
             if (!valid) {
                 throw new Error('Unauthenticated');
             }
-            const device = this.authService.clientDataByToken(socket.encodedToken)?.device || 'unknown';
+            const device = this.authService.clientDataByToken(socket.encodedToken)?.device ?? 'unknown';
             this.logger.trace(`${username} | ${address} | ${device} | authenticated and connected to ${nsp}`);
             const onEnd = (reason = 'transport close') => {
                 this.logger.trace(`${username} | ${address} | ${device} | disconnected from ${nsp} (${reason})`);