npm - @camera.ui/server - Versions diffs - 0.0.22-alpha.1 → 0.0.22-alpha.2 - Mend

@camera.ui/server 0.0.22-alpha.1 → 0.0.22-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (569) hide show

package/dist/server/src/api/database/selfcheck.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"selfcheck.js","sourceRoot":"","sources":["../../../../../src/api/database/selfcheck.ts"],"names":[],"mappings":"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"}

package/dist/server/src/api/database/types.d.ts CHANGED Viewed

@@ -1,13 +1,13 @@
+import type { UsableNetworkAddress } from '@camera.ui/common/network';
+import type { BaseCamera, CameraInputSettings, CameraRoles, ZoneCoord } from '@camera.ui/types';
 import type { Database as DB } from 'lmdb';
-import type { DetectionZone, ObjectClass } from '../../camera/types.js';
-import type { UsableNetworkAddress } from '../../utils/network.js';
 import type { CamviewSettingsLayoutMode, ClientData, JwtTokenEncoded } from '../types/index.js';
-import type { Database } from './index.js';
+import type { CAMERAS_ID, PLUGINS_ID, SETTINGS_ID, USERS_ID } from './constants.js';
 export interface CameraUiDatabase {
-    [Database.CAMERAS_ID]: DB<DBCamera[], 'cameras'>;
-    [Database.PLUGINS_ID]: DB<DBPlugin[], 'plugins'>;
-    [Database.SETTINGS_ID]: DB<DBSettings, 'settings'>;
-    [Database.USERS_ID]: DB<DBUser[], 'users'>;
+    [CAMERAS_ID]: DB<DBCamera[], 'cameras'>;
+    [PLUGINS_ID]: DB<DBPlugin[], 'plugins'>;
+    [SETTINGS_ID]: DB<DBSettings, 'settings'>;
+    [USERS_ID]: DB<DBUser[], 'users'>;
 }
 export interface DBAuth {
     tokens: JwtTokenEncoded[];
@@ -48,11 +48,9 @@ export interface DBCameraShortcut {
     cameraId: string;
     coords: ZoneCoord;
 }
-export interface DBUserCameraPreferences {
-    [key: string]: {
-        shortcuts: DBCameraShortcut[];
-    } | undefined;
-}
+export type DBUserCameraPreferences = Record<string, {
+    shortcuts: DBCameraShortcut[];
+} | undefined>;
 export interface DBUserPreferences {
     camview: {
         views: DBCamviewLayout[];
@@ -71,85 +69,10 @@ export interface DBCamviewLayoutCamera {
     index: number;
     cameraId: string;
 }
-export interface DBPluginStorage {
-    [key: string]: {
-        config: DBPluginStorageValue;
-    };
-}
-export interface DBPluginStorageValue {
-    [key: string]: any;
-}
-export interface BaseCamera {
-    readonly _id: string;
-    nativeId?: string;
-    pluginId: string;
-    name: string;
-    disabled: boolean;
-    isCloud: boolean;
-    hasLight: boolean;
-    hasSiren: boolean;
-    hasBinarySensor: boolean;
-    hasBattery: boolean;
-    info: CameraInformation;
-    type: CameraType;
-    activityZones: CameraZone[];
-    activitySettings: CameraActivitySettings;
-    frameWorkerSettings: CameraFrameWorkerSettings;
-}
-export interface Camera extends Omit<BaseCamera, 'activityZones'> {
-    hasAudioDetector: boolean;
-    hasMotionDetector: boolean;
-    hasObjectDetector: boolean;
-    hasPtz: boolean;
-    hasPrebuffer: boolean;
-    sources: CameraInput[];
-    activityZones: DetectionZone[];
-}
-export interface CameraActivitySettings {
-    motion: MotionDetectionSettings;
-    object: ObjectDetectionSettings;
-}
-export interface MotionDetectionSettings {
-    timeout: number;
-}
-export interface ObjectDetectionSettings {
-    confidence: number;
-}
-export type Point = [number, number];
-export type ZoneType = 'intersect' | 'contain';
-export type ZoneFilter = 'include' | 'exclude';
-export interface CameraZone {
-    name: string;
-    regions: ZoneRegion[];
-}
-export interface ZoneRegion {
-    _id: string;
-    coords: ZoneCoord[];
-    type: ZoneType;
-    filter: ZoneFilter;
-    classes: ObjectClass[];
-    isPrivacyMask: boolean;
-}
-export interface ZoneCoord {
-    _id: string;
-    points: Point;
-}
-export type CameraType = 'camera' | 'doorbell';
-export type CameraFrameWorkerDecoder = 'pillow' | 'wasm';
-export type CameraFrameWorkerResolution = 640 | 480 | 320;
-export interface CameraFrameWorkerSettings {
-    decoder: CameraFrameWorkerDecoder;
-    fps: number;
-    resolution: CameraFrameWorkerResolution;
-}
-export interface CameraInformation {
-    model?: string;
-    manufacturer?: string;
-    hardware?: string;
-    serialNumber?: string;
-    firmwareVersion?: string;
-    supportUrl?: string;
-}
+export type DBPluginStorage = Record<string, {
+    config: DBPluginStorageValue;
+}>;
+export type DBPluginStorageValue = Record<string, any>;
 export interface CameraExtensions {
     hub?: string[];
     prebuffer?: string;
@@ -162,58 +85,9 @@ export interface CameraExtensions {
 export interface CameraRecordingSettings {
     enabled: boolean;
 }
-export interface CameraInputSettings {
-    readonly _id: string;
-    name: string;
-    roles: CameraRoles[];
-    urls: string[];
-}
-export interface Go2RtcRTSPSource {
-    readonly single: string;
-    readonly default: string;
-    readonly mp4: string;
-}
-export interface Go2RtcEndpoint {
-    readonly webrtc: string;
-    readonly mse: string;
-    readonly lmp4: string;
-    readonly mmp4: string;
-    readonly mp4: string;
-    readonly mp4Snapshot: string;
-    readonly jpegSnapshot: string;
-    readonly lHlsTs: string;
-    readonly lHlsFmp4: string;
-    readonly mHlsFmp4: string;
-    readonly mjpeg: string;
-    readonly mjpegHtml: string;
-}
-export interface Go2RtcSource {
-    name: string;
-    src: string;
-    ws: string;
-}
-export interface Go2RtcFFMPEGSource {
-    readonly aac: Go2RtcSource;
-    readonly opus: Go2RtcSource;
-}
-export interface Go2RtcWSSource {
-    readonly webrtc: string;
-}
-export interface StreamUrls {
-    ws: Go2RtcWSSource;
-    rtsp: Go2RtcRTSPSource;
-    transcoded: Go2RtcFFMPEGSource;
-    www: Go2RtcEndpoint;
-}
-export interface CameraInput {
-    readonly _id: string;
-    name: string;
-    roles: CameraRoles[];
-    urls: StreamUrls;
-}
-export type CameraRoles = 'high-resolution' | 'mid-resolution' | 'low-resolution' | 'snapshot';
 export interface CameraUiSettings {
     streamingMode: VideoStreamingMode;
+    streamingSource: Exclude<CameraRoles, 'snapshot'>;
 }
 export type VideoStreamingMode = 'webrtc' | 'mse' | 'webrtc/tcp' | 'mjpeg' | 'hls' | 'mp4';
 export interface SystemInfo extends DBSystem {

package/dist/server/src/api/go2rtc/api/application.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { sleep } from '../../../utils/utils.js';
+import { sleep } from '@camera.ui/common/utils';
 import { fetchInstance } from './index.js';
 export class ApplicationApi {
     requestQueue;
@@ -23,7 +23,8 @@ export class ApplicationApi {
         if (!response.ok) {
             throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
         }
-        return response.json();
+        const json = await response.json();
+        return json;
     }
     async restart() {
         try {

package/dist/server/src/api/go2rtc/api/application.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../src/api/go2rtc/api/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;~~AAChD~~,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAK3C,MAAM,OAAO,cAAc;IACjB,YAAY,CAAe;IAEnC,YAAY,YAA0B;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAc;QAC/B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAW,CAAC,CAAC;YAChD,MAAM,aAAa,EAAE,CAAC,SAAS,MAAM,EAAE,EAAE;gBACvC,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,aAAa;QACf,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,QAAQ,GAAG,MAAM,aAAa,EAAE,CAAC,EAAE,EAAE;YACzC,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,CAAC;QAED,~~OAAO~~,QAAQ,CAAC,IAAI,EAAE,CAAC;~~IACzB~~,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC;YACH,MAAM,aAAa,EAAE,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACtD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,aAAa;QACf,CAAC;IACH,CAAC;CACF"}
1	+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../src/api/go2rtc/api/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAK3C,MAAM,OAAO,cAAc;IACjB,YAAY,CAAe;IAEnC,YAAY,YAA0B;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAc;QAC/B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAW,CAAC,CAAC;YAChD,MAAM,aAAa,EAAE,CAAC,SAAS,MAAM,EAAE,EAAE;gBACvC,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,aAAa;QACf,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,QAAQ,GAAG,MAAM,aAAa,EAAE,CAAC,EAAE,EAAE;YACzC,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,IAAI,GAAwB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAExD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC;YACH,MAAM,aAAa,EAAE,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACtD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,aAAa;QACf,CAAC;IACH,CAAC;CACF"}

package/dist/server/src/api/go2rtc/api/index.js CHANGED Viewed

@@ -1,7 +1,8 @@
 import { container } from 'tsyringe';
 export const fetchInstance = () => {
     const configService = container.resolve('configService');
-    const GO2RTC_URL = `http://${configService.go2rtcConfig.api.listen}`;
+    const GO2RTC_PORT = parseInt(configService.go2rtcConfig.api.listen.split(':')[1], 10);
+    const GO2RTC_URL = `http://127.0.0.1:${GO2RTC_PORT}`;
     const GO2RTC_USERNAME = configService.go2rtcConfig.api.username;
     const GO2RTC_PASSWORD = configService.go2rtcConfig.api.password;
     const baseURL = `${GO2RTC_URL}/api`;
@@ -13,7 +14,7 @@ export const fetchInstance = () => {
             controller.abort();
         }, 15000);
         try {
-            return await fetch(`${baseURL}${target}`, {
+            return await fetch(`${baseURL}${String(target)}`, {
                 ...options,
                 headers,
                 signal: controller.signal,

package/dist/server/src/api/go2rtc/api/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/api/go2rtc/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAqE,EAAE;IAClG,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAgB,eAAe,CAAC,CAAC;IAExE,MAAM,~~UAAU~~,GAAG,~~UAAU~~,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;~~IACrE~~,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;IAChE,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;IAEhE,MAAM,OAAO,GAAG,GAAG,UAAU,MAAM,CAAC;IAEpC,MAAM,aAAa,GAAG,KAAK,EAAE,MAAmB,EAAE,OAAqB,EAAE,EAAE;QACzE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEjH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC,EAAE,KAAK,CAAC,CAAC;QAEV,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,MAAM,EAAE,EAAE;~~gBACxC~~,GAAG,OAAO;gBACV,OAAO;gBACP,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/api/go2rtc/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAqE,EAAE;IAClG,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAgB,eAAe,CAAC,CAAC;IAExE,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACtF,MAAM,UAAU,GAAG,oBAAoB,WAAW,EAAE,CAAC;IACrD,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;IAChE,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;IAEhE,MAAM,OAAO,GAAG,GAAG,UAAU,MAAM,CAAC;IAEpC,MAAM,aAAa,GAAG,KAAK,EAAE,MAAmB,EAAE,OAAqB,EAAE,EAAE;QACzE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEjH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC,EAAE,KAAK,CAAC,CAAC;QAEV,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;gBAChD,GAAG,OAAO;gBACV,OAAO;gBACP,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}

package/dist/server/src/api/go2rtc/api/streams.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ export declare class StreamsApi {
     constructor(requestQueue: RequestQueue);
     createStream(data: CreateStreamData): Promise<void>;
     deleteStream(data: SourceData): Promise<void>;
-    getStreamInfo(data: SourceData): Promise<any>;
+    getStreamInfo(data: SourceData): Promise<Go2RTCProbe>;
     updateStreamSource(data: UpdateStreamData): Promise<void>;
     probeStreamSource(data: SourceData): Promise<Go2RTCProbe>;
 }

package/dist/server/src/api/go2rtc/api/streams.js CHANGED Viewed

@@ -30,7 +30,8 @@ export class StreamsApi {
         if (!response.ok) {
             throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
         }
-        return response.json();
+        const json = await response.json();
+        return json;
     }
     async updateStreamSource(data) {
         const params = new URLSearchParams(data);
@@ -51,7 +52,8 @@ export class StreamsApi {
         if (!response.ok) {
             throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
         }
-        return response.json();
+        const json = await response.json();
+        return json;
     }
 }
 //# sourceMappingURL=streams.js.map

package/dist/server/src/api/go2rtc/api/streams.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../../../../src/api/go2rtc/api/streams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAK3C,MAAM,OAAO,UAAU;IACb,YAAY,CAAe;IAEnC,YAAY,YAA0B;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAsB;QAC9C,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAW,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CACpD,aAAa,EAAE,CAAC,YAAY,MAAM,EAAE,EAAE;YACpC,MAAM,EAAE,KAAK;SACd,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAgB;QACxC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAW,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CACpD,aAAa,EAAE,CAAC,YAAY,MAAM,EAAE,EAAE;YACpC,MAAM,EAAE,QAAQ;SACjB,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAAgB;QACzC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAW,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,MAAM,aAAa,EAAE,CAAC,YAAY,MAAM,EAAE,EAAE;YAC3D,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,CAAC;QAED,~~OAAO~~,QAAQ,CAAC,IAAI,EAAE,CAAC;~~IACzB~~,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,IAAsB;QACpD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAW,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CACpD,aAAa,EAAE,CAAC,YAAY,MAAM,EAAE,EAAE;YACpC,MAAM,EAAE,OAAO;SAChB,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,IAAgB;QAC7C,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAW,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE3B,MAAM,QAAQ,GAAG,MAAM,aAAa,EAAE,CAAC,YAAY,MAAM,aAAa,EAAE;YACtE,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,CAAC;QAED,~~OAAO~~,QAAQ,CAAC,IAAI,EAAE,CAAC;~~IACzB~~,CAAC;CACF"}
1	+ {"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../../../../src/api/go2rtc/api/streams.ts"],"names":[],"mappings":"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"}

package/dist/server/src/api/go2rtc/index.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import { ConfigApi } from './api/config.js';
 import { SnapshotApi } from './api/snapshot.js';
 import { StreamsApi } from './api/streams.js';
 export declare class Go2RtcApi {
+    private api;
     private requestQueue;
     applicationApi: ApplicationApi;
     configApi: ConfigApi;

package/dist/server/src/api/go2rtc/index.js CHANGED Viewed

@@ -1,10 +1,12 @@
+import { container } from 'tsyringe';
+import { API_EVENT } from '../../api.js';
 import { ApplicationApi } from './api/application.js';
 import { ConfigApi } from './api/config.js';
 import { SnapshotApi } from './api/snapshot.js';
 import { StreamsApi } from './api/streams.js';
-import { container } from 'tsyringe';
 import { RequestQueue } from './queue.js';
 export class Go2RtcApi {
+    api;
     requestQueue;
     applicationApi;
     configApi;
@@ -12,11 +14,14 @@ export class Go2RtcApi {
     streamsApi;
     constructor() {
         container.registerInstance('go2rtcApi', this);
+        this.api = container.resolve('api');
         this.requestQueue = new RequestQueue();
         this.applicationApi = new ApplicationApi(this.requestQueue);
         this.configApi = new ConfigApi(this.requestQueue);
         this.snapshotApi = new SnapshotApi(this.requestQueue);
         this.streamsApi = new StreamsApi(this.requestQueue);
+        this.api.setMaxListeners(this.api.getMaxListeners() + 1);
+        this.api.once(API_EVENT.SHUTDOWN, this.clear.bind(this));
     }
     clear() {
         this.requestQueue.clear();

package/dist/server/src/api/go2rtc/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/go2rtc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,~~cAAc~~,EAAE,MAAM,~~sBAAsB~~,CAAC;~~AACtD~~,OAAO,EAAE,SAAS,EAAE,MAAM,~~iBAAiB~~,CAAC;~~AAC5C~~,OAAO,EAAE,~~WAAW~~,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAChD~~,OAAO,EAAE,~~UAAU~~,EAAE,MAAM,~~kBAAkB~~,CAAC;~~AAE9C~~,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,UAAU,CAAC;~~AAErC~~,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;~~AAE1C~~,MAAM,OAAO,SAAS;IACZ,YAAY,CAAe;IAE5B,cAAc,CAAiB;IAC/B,SAAS,CAAY;IACrB,WAAW,CAAc;IACzB,UAAU,CAAa;IAE9B;QACE,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;QAEvC,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;~~IACtD~~,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/go2rtc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI1C,MAAM,OAAO,SAAS;IACZ,GAAG,CAAc;IAEjB,YAAY,CAAe;IAE5B,cAAc,CAAiB;IAC/B,SAAS,CAAY;IACrB,WAAW,CAAc;IACzB,UAAU,CAAa;IAE9B;QACE,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAc,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;QAEvC,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEpD,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF"}

package/dist/server/src/api/go2rtc/types.d.ts CHANGED Viewed

@@ -1,30 +1,14 @@
 export interface ApplicationResponse {
     config_path: string;
     host: string;
-    rtsp: RTSP;
+    rtsp: RTSPInfo;
     version: string;
 }
-export interface RTSP {
+export interface RTSPInfo {
     listen: string;
     default_query: string;
     PacketSize: number;
 }
-export interface StreamInfoResponse {
-    producers: Consumer[];
-    consumers: Consumer[];
-}
-export interface Consumer {
-    type: string;
-    url: string;
-    remote_addr: string;
-    user_agent: string;
-    sdp: string;
-    medias: string[];
-    senders?: string[];
-    send?: number;
-    receivers?: string[];
-    recv?: number;
-}
 export interface HomeKitResponse {
     sources: HomeKitSource[];
 }

package/dist/server/src/api/index.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export declare class Server {
+    isRunning: boolean;
     private app?;
     private api;
     private logger;

package/dist/server/src/api/index.js CHANGED Viewed

@@ -1,9 +1,8 @@
-/* eslint-disable quotes */
-import FastifyCors, {} from '@fastify/cors';
+import FastifyCors from '@fastify/cors';
 import FastifyFormbody from '@fastify/formbody';
-import FastifyHelmet, {} from '@fastify/helmet';
-import FastifyMultipart, {} from '@fastify/multipart';
-import FastifyStatic, {} from '@fastify/static';
+import FastifyHelmet from '@fastify/helmet';
+import FastifyMultipart from '@fastify/multipart';
+import FastifyStatic from '@fastify/static';
 import { green } from 'ansicolor';
 import Fastify from 'fastify';
 import { serializerCompiler, validatorCompiler } from 'fastify-type-provider-zod';
@@ -12,16 +11,15 @@ import { container } from 'tsyringe';
 import { API_EVENT } from '../api.js';
 import { ConfigService } from '../services/config/index.js';
 import { RUNTIME_STATUS } from '../services/config/types.js';
-import { PluginManagerPlugin } from './plugins/cameraui.plugin.js';
-import { DatabasePlugin } from './plugins/database.plugin.js';
-import { Go2RtcPlugin } from './plugins/go2rtc.plugin.js';
+import { HeaderPlugin } from './plugins/header.plugin.js';
 // import { LoggerPlugin } from './plugins/logger.plugin.js';
 import { SocketIoPlugin } from './plugins/socket.plugin.js';
 import { SystemPlugin } from './plugins/system.plugin.js';
 import { UserAgentPlugin } from './plugins/useragent.plugin.js';
 import { FastifyRoutes } from './routes/index.js';
-import { getCert } from './utils/cert.js';
+import { CertificateGeneration } from './utils/cert.js';
 export class Server {
+    isRunning = false;
     app;
     api;
     logger;
@@ -51,6 +49,7 @@ export class Server {
             host: '0.0.0.0',
             port: this.configService.config.port,
         });
+        this.isRunning = true;
     }
     async close() {
         try {
@@ -66,7 +65,7 @@ export class Server {
             this.app.addHook('onListen', async () => {
                 this.logger.log(green(`camera.ui v${ConfigService.VERSION} is listening on https://127.0.0.1:${this.configService.config.port}`));
                 const runtimeInfo = {
-                    server: { name: 'server', status: RUNTIME_STATUS.STARTED },
+                    'camera.ui': { name: 'camera.ui', status: RUNTIME_STATUS.STARTED },
                 };
                 this.app.io.of('/status').emit('process-status', runtimeInfo);
                 this.api.emit(API_EVENT.FINISH_LAUNCHING);
@@ -74,7 +73,7 @@ export class Server {
             this.app.addHook('preClose', async () => {
                 this.logger.debug('camera.ui is shutting down');
                 const runtimeInfo = {
-                    server: { name: 'server', status: RUNTIME_STATUS.STOPPED },
+                    'camera.ui': { name: 'camera.ui', status: RUNTIME_STATUS.STOPPED },
                 };
                 this.app.io.of('/status').emit('process-status', runtimeInfo);
                 this.api.emit(API_EVENT.SHUTDOWN);
@@ -85,12 +84,10 @@ export class Server {
         }
     }
     async registerPlugins() {
-        await this.app?.register(DatabasePlugin);
-        await this.app?.register(Go2RtcPlugin);
         await this.app?.register(SocketIoPlugin, this.socketOptions);
-        await this.app?.register(PluginManagerPlugin);
         await this.app?.register(SystemPlugin);
         // await this.app?.register(LoggerPlugin);
+        await this.app?.register(HeaderPlugin);
         await this.app?.register(FastifyHelmet, this.helmetOptions);
         await this.app?.register(FastifyCors, this.corsOptions);
         await this.app?.register(FastifyFormbody);
@@ -105,12 +102,9 @@ export class Server {
         }
     }
     get corsOptions() {
+        const go2rtcPort = parseInt(this.configService.go2rtcConfig.api.listen.split(':')[1]);
         return {
-            origin: [
-                `http://${this.configService.go2rtcConfig.api.listen}`,
-                `https://127.0.0.1:${this.configService.config.port}`,
-                `http://127.0.0.1:${this.configService.UI_PORT}`,
-            ],
+            origin: [`http://127.0.0.1:${go2rtcPort}`, `https://127.0.0.1:${this.configService.config.port}`, `http://127.0.0.1:${this.configService.UI_PORT}`],
         };
     }
     get helmetOptions() {
@@ -166,7 +160,7 @@ export class Server {
     //   };
     // }
     get serverOptions() {
-        const { cert, key } = getCert();
+        const { cert, key } = CertificateGeneration.generateCert();
         return {
             bodyLimit: 1e8,
             disableRequestLogging: true,
@@ -179,7 +173,7 @@ export class Server {
                 key: key,
                 cert: cert,
             },
-            querystringParser: this.qsParser,
+            querystringParser: this.qsParser.bind(this),
         };
     }
     qsParser(str) {
@@ -203,14 +197,12 @@ export class Server {
     }
     get socketOptions() {
         return {
-            // cors: {
-            //   origin: [
-            //     `https://127.0.0.1:${this.configService.config.port}`,
-            //     `http://127.0.0.1:${this.configService.UI_PORT}`,
-            //   ],
-            // },
-            // maxHttpBufferSize: 1e8,
-            transports: ['websocket'],
+            cors: {
+                origin: '*',
+            },
+            pingTimeout: 60000,
+            pingInterval: 25000,
+            transports: ['websocket', 'polling'],
         };
     }
     get staticOptions() {

package/dist/server/src/api/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/index.ts"],"names":[],"mappings":"AAAA,~~2BAA2B;AAC3B,~~OAAO,WAAW,~~EAAE,EAA2B,~~MAAM,eAAe,CAAC;~~AACrE~~,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,aAAa,~~EAAE,EAA6B,~~MAAM,iBAAiB,CAAC;~~AAC3E~~,OAAO,gBAAgB,~~EAAE,EAAkD,~~MAAM,oBAAoB,CAAC;~~AACtG~~,OAAO,aAAa,~~EAAE,EAA6B,~~MAAM,iBAAiB,CAAC;~~AAC3E~~,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,~~mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,~~YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,6DAA6D;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,~~OAAO~~,EAAE,MAAM,iBAAiB,CAAC;~~AAS1C~~,MAAM,OAAO,MAAM;~~IACT~~,GAAG,CAAsC;~~IAEzC~~,GAAG,CAAc;IACjB,MAAM,~~CAAS~~;~~IACf~~,aAAa,CAAgB;IAErC;QACE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,OAAO,~~CAAS~~,QAAQ,CAAC,CAAC;~~QAClD~~,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAgB,eAAe,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAc,KAAK,CAAC,CAAC;IACnD,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEvC,qCAAqC;QACrC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QAEnD,kBAAkB;QAClB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,mBAAmB;QACnB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,kBAAkB;QAClB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI;SACrC,CAAC,CAAC;~~IACL~~,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QAED,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;IACvB,CAAC;IAEO,cAAc;QACpB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;gBACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,aAAa,CAAC,OAAO,sCAAsC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAElI,MAAM,WAAW,GAAkB;oBACjC,~~MAAM~~,EAAE,EAAE,IAAI,EAAE,~~QAAQ~~,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE;~~iBAC3D~~,CAAC;gBAEF,IAAI,CAAC,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;gBAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;gBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAEhD,MAAM,WAAW,GAAkB;oBACjC,~~MAAM~~,EAAE,EAAE,IAAI,EAAE,~~QAAQ~~,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE;~~iBAC3D~~,CAAC;gBAEF,IAAI,CAAC,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;gBAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;gBACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,cAAc,~~CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,GAAG,~~EAAE,~~QAAQ,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,~~IAAI,CAAC,~~GAAG,EAAE,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,~~aAAa,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,~~mBAAmB~~,CAAC,CAAC;~~QAC9C~~,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;QACvC,~~0CAA0C;QAC1C,~~MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3C,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,IAAY,WAAW;QACrB,~~OAAO;YACL,~~MAAM,~~EAAE;gBACN,~~UAAU,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,~~EAAE~~;~~gBACtD~~,qBAAqB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE~~;gBACrD~~,oBAAoB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;~~aACjD;SACF~~,CAAC;IACJ,CAAC;IAED,IAAY,aAAa;QACvB,OAAO;YACL,IAAI,EAAE,KAAK;YACX,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE;gBACd,MAAM,EAAE,aAAa;aACtB;YACD,yBAAyB,EAAE,KAAK;YAChC,uBAAuB,EAAE,KAAK;YAC9B,yBAAyB,EAAE,KAAK;YAChC,qBAAqB,EAAE;gBACrB,UAAU,EAAE;oBACV,UAAU,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,CAAC;oBAC1D,YAAY,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,CAAC;oBAC5D,SAAS,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC;oBAC3E,QAAQ,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC;oBAC3E,oEAAoE;oBACpE,QAAQ,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,CAAC;oBACxD,UAAU,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,CAAC;oBAC7I,MAAM,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC;oBACxE,QAAQ,EAAE,CAAC,eAAe,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;oBAC7F,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE,IAAI;oBACb,SAAS,EAAE,IAAI;oBACf,cAAc,EAAE,IAAI;oBACpB,UAAU,EAAE,IAAI;oBAChB,OAAO,EAAE,IAAI;oBACb,uBAAuB,EAAE,IAAI;oBAC7B,oBAAoB,EAAE,IAAI;iBAC3B;aACF;SACF,CAAC;IACJ,CAAC;IAED,IAAY,gBAAgB;QAC1B,OAAO;YACL,kBAAkB,EAAE,IAAI;YACxB,YAAY;YACZ,mCAAmC;YACnC,KAAK;YACL,iCAAiC;YACjC,wCAAwC;YACxC,uBAAuB;YACvB,KAAK;SACN,CAAC;IACJ,CAAC;IAED,2DAA2D;IAC3D,aAAa;IACb,gBAAgB;IAChB,6BAA6B;IAC7B,0BAA0B;IAC1B,OAAO;IACP,IAAI;IAEJ,IAAY,aAAa;QACvB,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,~~OAAO~~,EAAE,CAAC;~~QAEhC~~,OAAO;YACL,SAAS,EAAE,GAAG;YACd,qBAAqB,EAAE,IAAI;YAC3B,qBAAqB,EAAE,IAAI;YAC3B,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,IAAI;YACX,KAAK,EAAE;gBACL,kBAAkB,EAAE,KAAK;gBACzB,UAAU,EAAE,IAAI;gBAChB,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,IAAI;aACX;YACD,iBAAiB,EAAE,IAAI,CAAC,QAAQ;~~SACjC~~,CAAC;IACJ,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC1B,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YACnB,OAAO,CAAC,GAAW,EAAE,cAAiC,EAAE,OAAe,EAAE,IAAqB;gBAC5F,IAAI,IAAI,KAAK,OAAO,IAAI,+FAA+F,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBAClI,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;gBAED,MAAM,QAAQ,GAAQ;oBACpB,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI;oBACV,SAAS,EAAE,SAAS;iBACrB,CAAC;gBACF,IAAI,IAAI,KAAK,OAAO,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;oBACxC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACvB,CAAC;gBAED,OAAO,cAAc,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;YACtD,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAY,aAAa;QACvB,OAAO;YACL,~~UAAU;YACV~~,~~cAAc~~;~~YACd~~,~~6DAA6D;YAC7D~~,~~wDAAwD;YACxD~~,~~OAAO~~;~~YACP~~,KAAK;~~YACL~~,~~0BAA0B~~;~~YAC1B~~,UAAU,EAAE,CAAC,WAAW,CAAC;~~SAC1B~~,CAAC;IACJ,CAAC;IAED,IAAY,aAAa;QACvB,OAAO;YACL,IAAI,EAAE,aAAa,CAAC,cAAc;YAClC,MAAM,EAAE,GAAG;SACZ,CAAC;IACJ,CAAC;CACF"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/index.ts"],"names":[],"mappings":"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"}

package/dist/server/src/api/middlewares/authPermission.middleware.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { AuthLoginRequest, AuthParamsRequest } from '../types/index.js';
-export declare const onlyAdminCanDoThisAction: (req: FastifyRequest<AuthLoginRequest>, reply: FastifyReply) => Promise<FastifyReply | any>;
-export declare const onlySameUserOrAdminCanDoThisAction: (req: FastifyRequest<AuthLoginRequest & AuthParamsRequest>, reply: FastifyReply) => Promise<FastifyReply | any>;
-export declare const sameUserCantDoThisAction: (req: FastifyRequest<AuthLoginRequest & AuthParamsRequest>, reply: FastifyReply) => Promise<FastifyReply | any>;
+export declare const onlyAdminCanDoThisAction: (req: FastifyRequest<AuthLoginRequest>, reply: FastifyReply) => Promise<FastifyReply>;
+export declare const onlySameUserOrAdminCanDoThisAction: (req: FastifyRequest<AuthLoginRequest & AuthParamsRequest>, reply: FastifyReply) => Promise<FastifyReply>;
+export declare const sameUserCantDoThisAction: (req: FastifyRequest<AuthLoginRequest & AuthParamsRequest>, reply: FastifyReply) => Promise<FastifyReply>;

package/dist/server/src/api/middlewares/authPermission.middleware.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"authPermission.middleware.js","sourceRoot":"","sources":["../../../../../src/api/middlewares/authPermission.middleware.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAqC,EAAE,KAAmB,~~EAA+B~~,EAAE;~~IACxI~~,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,~~EAAE~~,CAAC;~~AACZ~~,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,~~EAA+B~~,EAAE;~~IACtK~~,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5F,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,~~EAAE~~,CAAC;~~AACZ~~,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,~~EAA+B~~,EAAE;~~IAC5J~~,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,~~EAAE~~,CAAC;~~AACZ~~,CAAC,CAAC"}
1	+ {"version":3,"file":"authPermission.middleware.js","sourceRoot":"","sources":["../../../../../src/api/middlewares/authPermission.middleware.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAqC,EAAE,KAAmB,EAAyB,EAAE;IAClI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,EAAyB,EAAE;IAChK,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5F,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,EAAyB,EAAE;IACtJ,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC"}

package/dist/server/src/api/middlewares/authValidation.middleware.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { AuthLoginRequest, AuthNewLoginRequest } from '../types/index.js';
-export declare const isPasswordAndUserMatch: (req: FastifyRequest<AuthNewLoginRequest>, reply: FastifyReply) => Promise<FastifyReply | any>;
-export declare const validJWTNeeded: (req: FastifyRequest<AuthLoginRequest>, reply: FastifyReply) => Promise<FastifyReply | any>;
+export declare const isPasswordAndUserMatch: (req: FastifyRequest<AuthNewLoginRequest>, reply: FastifyReply) => Promise<FastifyReply>;
+export declare const validJWTNeeded: (req: FastifyRequest<AuthLoginRequest>, reply: FastifyReply) => Promise<FastifyReply>;

package/dist/server/src/api/middlewares/authValidation.middleware.js CHANGED Viewed

@@ -80,7 +80,7 @@ export const validJWTNeeded = async (req, reply) => {
     }
     if (req.headers.authorization || req.query.token) {
         try {
-            const authHeader = req.headers.authorization || `Bearer ${req.query.token}`;
+            const authHeader = req.headers.authorization ?? `Bearer ${req.query.token}`;
             const authorization = authHeader.split(/\s+/);
             if (authorization[0] !== 'Bearer') {
                 return reply.code(401).send({
@@ -89,8 +89,8 @@ export const validJWTNeeded = async (req, reply) => {
                 });
             }
             else {
-                //check if token exists in database and is still valid
-                const token = tokenEncoded || authService.findByToken(authorization[1]);
+                // check if token exists in database and is still valid
+                const token = tokenEncoded ?? authService.findByToken(authorization[1]);
                 const tokenExpired = token ? new Date(token.expires_at).getTime() < new Date().getTime() : null;
                 if (!token || tokenExpired) {
                     return reply.code(401).send({