@camera.ui/server 0.0.49 → 0.0.50-internal.1

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

@@ -1,5 +1,5 @@
 import type { UsableNetworkAddress } from '@camera.ui/common/network';
-import type { BaseCamera, CameraInputSettings, CameraRoles, ZoneCoord } from '@camera.ui/types';
+import type { BaseCamera, CameraInputSettings, Point } from '@camera.ui/types';
 import type { CamviewSettingsLayoutMode, ClientData, JwtTokenEncoded } from '../types/index.js';
 export interface DBAuth {
     tokens: JwtTokenEncoded[];
@@ -7,9 +7,6 @@ export interface DBAuth {
 }
 export interface DBCamera extends BaseCamera {
     sources: CameraInputSettings[];
-    extensions: CameraExtensions;
-    interface: CameraUiSettings;
-    recording: CameraRecordingSettings;
 }
 export interface DBPlugin {
     readonly _id: string;
@@ -26,18 +23,30 @@ export interface DBUser {
     sessionTimer: number;
     role: DBRoles;
     rememberMe: boolean;
-    oneLogin: boolean;
+    singleSession: boolean;
     firstLogin: boolean;
     preferences: DBUserPreferences;
 }
+export type RemoteAccessMode = 'disabled' | 'upnp' | 'port-forward' | 'router-forward' | 'cloudflare' | 'custom-domain';
+export interface CloudflareConfig {
+    customDomain?: string;
+}
+export interface CustomDomainConfig {
+    url?: string;
+}
 export interface DBSystem {
-    serverAddresses: string[];
+    serverAddresses?: string[];
+    remoteAccess: {
+        mode: RemoteAccessMode;
+        cloudflare?: CloudflareConfig;
+        customDomain?: CustomDomainConfig;
+    };
 }
-export type DBRoles = 'admin' | 'user';
+export type DBRoles = 'master' | 'admin' | 'user';
 export interface DBCameraShortcut {
     readonly _id: string;
     cameraId: string;
-    coords: ZoneCoord;
+    points: Point;
 }
 export type DBUserCameraPreferences = Record<string, {
     shortcuts: DBCameraShortcut[];
@@ -61,23 +70,6 @@ export interface DBCamviewLayoutCamera {
     cameraId: string;
 }
 export type DBPluginStorageValue = Record<string, any>;
-export interface CameraExtensions {
-    hub?: string[];
-    cameraController?: string;
-    motionDetection?: string;
-    audioDetection?: string;
-    objectDetection?: string;
-    ptz?: string;
-    plugins: string[];
-}
-export interface CameraRecordingSettings {
-    enabled: boolean;
-}
-export interface CameraUiSettings {
-    streamingMode: VideoStreamingMode;
-    streamingSource: Exclude<CameraRoles, 'snapshot'>;
-}
-export type VideoStreamingMode = 'auto' | 'webrtc' | 'mse' | 'webrtc/tcp' | 'mjpeg' | 'hls' | 'mp4';
 export interface SystemInfo extends DBSystem {
     networkAddresses: UsableNetworkAddress[];
 }

package/dist/server/src/api/go2rtc/api/discover.d.ts

@@ -0,0 +1,30 @@
+import type { RequestQueue } from '../queue.js';
+import type { DeviceSource, DVRipSource, FFmpegSource, GoProSource, HassSource, HomeKitSource, OnvifSource, SourceData, WebtorrentSource } from '../types.js';
+export declare class DiscoverApi {
+    private requestQueue;
+    constructor(requestQueue: RequestQueue);
+    discoverHomekit(): Promise<{
+        sources: HomeKitSource[];
+    }>;
+    discoverOnvif(data?: SourceData): Promise<{
+        sources: OnvifSource[];
+    }>;
+    discoverDvrip(): Promise<{
+        sources: DVRipSource[];
+    }>;
+    discoverHass(): Promise<{
+        sources: HassSource[];
+    }>;
+    discoverGopro(): Promise<{
+        sources: GoProSource[];
+    }>;
+    discoverWebtorrent(): Promise<{
+        sources: WebtorrentSource[];
+    }>;
+    discoverFFmpeg(): Promise<{
+        sources: FFmpegSource[];
+    }>;
+    discoverSources(): Promise<{
+        sources: DeviceSource[];
+    }>;
+}

package/dist/server/src/api/go2rtc/api/discover.js

@@ -0,0 +1,162 @@
+import { fetchInstance } from './index.js';
+export class DiscoverApi {
+    requestQueue;
+    constructor(requestQueue) {
+        this.requestQueue = requestQueue;
+    }
+    async discoverHomekit() {
+        const response = await fetchInstance()('/homekit', {
+            method: 'GET',
+        });
+        if (!response.ok) {
+            // throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+            return { sources: [] };
+        }
+        const { sources } = (await response.json());
+        return {
+            sources: sources
+                .filter((s) => {
+                // homekit://192.168.178.133:48873?device_id=ef:65:8f:29:bf:46&feature=0&status=1
+                // status=1 means it can be paired
+                // status=0 and location !== ' ' means it's already paired and can be unpaired
+                const url = new URL(s.url);
+                // return url.searchParams.get('status') === '1' || (s.location && s.location !== ' ');
+                return url.searchParams.get('status') === '1';
+            })
+                .map((s) => {
+                return {
+                    ...s,
+                    type: 'HomeKit',
+                };
+            }),
+        };
+    }
+    async discoverOnvif(data) {
+        let target = '/onvif';
+        if (data) {
+            const params = new URLSearchParams(data);
+            target = `/onvif?${params}`;
+        }
+        const response = await fetchInstance()(target, {
+            method: 'GET',
+        });
+        if (!response.ok) {
+            // throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+            return { sources: [] };
+        }
+        const { sources } = (await response.json());
+        return {
+            sources: sources.map((s) => {
+                return {
+                    ...s,
+                    type: 'Onvif',
+                };
+            }),
+        };
+    }
+    async discoverDvrip() {
+        const response = await fetchInstance()('/dvrip', {
+            method: 'GET',
+        });
+        if (!response.ok) {
+            // throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+            return { sources: [] };
+        }
+        const { sources } = (await response.json());
+        return {
+            sources: sources.map((s) => {
+                return {
+                    ...s,
+                    type: 'DVRip',
+                };
+            }),
+        };
+    }
+    async discoverHass() {
+        const response = await fetchInstance()('/hass', {
+            method: 'GET',
+        });
+        if (!response.ok) {
+            // throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+            return { sources: [] };
+        }
+        const { sources } = (await response.json());
+        return {
+            sources: sources.map((s) => {
+                return {
+                    ...s,
+                    type: 'Hass',
+                };
+            }),
+        };
+    }
+    async discoverGopro() {
+        const response = await fetchInstance()('/gopro', {
+            method: 'GET',
+        });
+        if (!response.ok) {
+            // throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+            return { sources: [] };
+        }
+        const { sources } = (await response.json());
+        return {
+            sources: sources.map((s) => {
+                return {
+                    ...s,
+                    type: 'GoPro',
+                };
+            }),
+        };
+    }
+    async discoverWebtorrent() {
+        const response = await fetchInstance()('/webtorrent', {
+            method: 'GET',
+        });
+        if (!response.ok) {
+            // throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+            return { sources: [] };
+        }
+        const { sources } = (await response.json());
+        return {
+            sources: sources.map((s) => {
+                return {
+                    ...s,
+                    type: 'Webtorrent',
+                };
+            }),
+        };
+    }
+    async discoverFFmpeg() {
+        const response = await fetchInstance()('/ffmpeg/devices', {
+            method: 'GET',
+        });
+        if (!response.ok) {
+            // throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+            return { sources: [] };
+        }
+        const { sources } = (await response.json());
+        return {
+            sources: sources.map((s) => {
+                return {
+                    ...s,
+                    type: 'FFmpeg',
+                };
+            }),
+        };
+    }
+    async discoverSources() {
+        const sources = await Promise.all([
+            this.discoverHomekit(),
+            this.discoverOnvif(),
+            this.discoverDvrip(),
+            this.discoverHass(),
+            this.discoverGopro(),
+            // this.discoverWebtorrent(),
+            this.discoverFFmpeg(),
+        ]);
+        return {
+            sources: sources.reduce((acc, { sources }) => [...acc, ...sources], []),
+        };
+    }
+}
+//# sourceMappingURL=discover.js.map

package/dist/server/src/api/go2rtc/api/discover.js.map

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

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

@@ -1 +1 @@
-export declare const fetchInstance: () => ((url: RequestInfo, options?: RequestInit) => Promise<Response>);
+export declare const fetchInstance: (isApi?: boolean) => ((url: RequestInfo, options?: RequestInit) => Promise<Response>);

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

@@ -1,11 +1,14 @@
 import { container } from 'tsyringe';
-export const fetchInstance = () => {
+import { Agent } from 'undici';
+export const fetchInstance = (isApi = true) => {
     const configService = container.resolve('configService');
-    const GO2RTC_PORT = parseInt(configService.go2rtcConfig.api.listen.split(':')[1], 10);
-    const GO2RTC_URL = `http://127.0.0.1:${GO2RTC_PORT}`;
+    const GO2RTC_URL = configService.go2rtcAddress('api');
     const GO2RTC_USERNAME = configService.go2rtcConfig.api.username;
     const GO2RTC_PASSWORD = configService.go2rtcConfig.api.password;
-    const baseURL = `${GO2RTC_URL}/api`;
+    let baseURL = GO2RTC_URL;
+    if (isApi) {
+        baseURL += '/api';
+    }
     const fetchWithAuth = async (target, options) => {
         const headers = new Headers(options?.headers);
         headers.set('Authorization', `Basic ${Buffer.from(`${GO2RTC_USERNAME}:${GO2RTC_PASSWORD}`).toString('base64')}`);
@@ -19,6 +22,14 @@ export const fetchInstance = () => {
                 ...options,
                 headers,
                 signal: controller.signal,
+                // @ts-ignore
+                dispatcher: new Agent({
+                    connect: {
+                        cert: configService.ssl.cert,
+                        key: configService.ssl.key,
+                        ca: configService.ssl.ca,
+                    },
+                }),
             });
         }
         finally {

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

@@ -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,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,MAAM,SAAS,GAAG,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YAE/G,OAAO,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,SAAS,EAAE,EAAE;gBAC3C,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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/api/go2rtc/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAI/B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAK,GAAG,IAAI,EAAoE,EAAE;IAC9G,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAgB,eAAe,CAAC,CAAC;IAExE,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;IAChE,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;IAEhE,IAAI,OAAO,GAAG,UAAU,CAAC;IAEzB,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,IAAI,MAAM,CAAC;IACpB,CAAC;IAED,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,MAAM,SAAS,GAAG,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YAC/G,OAAO,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,SAAS,EAAE,EAAE;gBAC3C,GAAG,OAAO;gBACV,OAAO;gBACP,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,aAAa;gBACb,UAAU,EAAE,IAAI,KAAK,CAAC;oBACpB,OAAO,EAAE;wBACP,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI;wBAC5B,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG;wBAC1B,EAAE,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE;qBACzB;iBACF,CAAC;aACH,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

@@ -1,10 +1,12 @@
 import type { ProbeConfig } from '@camera.ui/types';
 import type { RequestQueue } from '../queue.js';
-import type { CreateStreamData, Go2RTCProbe, SourceData, UpdateStreamData } from '../types.js';
+import type { CreateStreamData, Go2RTCProbe, HomeKitPairData, HomeKitPairResponse, SourceData, UnpairData, UpdateStreamData } from '../types.js';
 export declare class StreamsApi {
     private requestQueue;
     constructor(requestQueue: RequestQueue);
     createStream(data: CreateStreamData): Promise<void>;
+    pairHomekit(data: HomeKitPairData): Promise<HomeKitPairResponse>;
+    unpairHomekit(data: UnpairData): Promise<void>;
     deleteStream(data: SourceData): Promise<void>;
     getStreamInfo(data: SourceData): Promise<Go2RTCProbe>;
     updateStreamSource(data: UpdateStreamData): Promise<void>;

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

@@ -6,10 +6,18 @@ export class StreamsApi {
     }
     async createStream(data) {
         const params = new URLSearchParams();
-        if (data.name) {
-            params.set('name', data.name);
-        }
-        data.src.forEach((src) => params.append('src', src));
+        params.set('name', data.name);
+        data.src.forEach((src) => {
+            if (src.startsWith('exec:')) {
+                const commandPart = src.substring(5);
+                const base64Command = btoa(commandPart);
+                const encodedSrc = `exec:base64:${base64Command}`;
+                params.append('src', encodedSrc);
+            }
+            else {
+                params.append('src', src);
+            }
+        });
         const response = await this.requestQueue.enqueue(() => fetchInstance()(`/streams?${params}`, {
             method: 'PUT',
         }));
@@ -17,6 +25,33 @@ export class StreamsApi {
             throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
         }
     }
+    async pairHomekit(data) {
+        const { id, url, pin } = data;
+        const newUrl = new URL(url);
+        newUrl.searchParams.set('pin', pin);
+        const formData = new FormData();
+        formData.append('id', id);
+        formData.append('url', newUrl.toString());
+        const response = await this.requestQueue.enqueue(() => fetchInstance()('/homekit', {
+            method: 'POST',
+            body: formData,
+        }));
+        if (!response.ok) {
+            throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+        }
+        const json = await response.json();
+        return json;
+    }
+    async unpairHomekit(data) {
+        const params = new URLSearchParams();
+        params.set('id', data.id);
+        const response = await this.requestQueue.enqueue(() => fetchInstance()(`/homekit?${params}`, {
+            method: 'DELETE',
+        }));
+        if (!response.ok) {
+            throw new Error(`HTTP error! Message: ${response.statusText} (${response.status})`);
+        }
+    }
     async deleteStream(data) {
         const params = new URLSearchParams(data);
         const response = await this.requestQueue.enqueue(() => fetchInstance()(`/streams?${params}`, {
@@ -48,11 +83,33 @@ export class StreamsApi {
     }
     async probeStreamSource(data, probeData) {
         const params = new URLSearchParams(data);
-        const { video, audio, microphone } = probeData ?? {};
-        params.append('video', video ?? 'all');
-        params.append('audio', audio ?? 'all');
-        params.append('microphone', microphone ?? 'all');
-        const response = await fetchInstance()(`/streams?${params}`, {
+        const queryParts = [];
+        const audioCodecs = [];
+        if (probeData?.video) {
+            queryParts.push('video');
+        }
+        if (Array.isArray(probeData?.audio)) {
+            probeData.audio.forEach((audio) => {
+                audioCodecs.push(audio);
+            });
+        }
+        else if (typeof probeData?.audio === 'string') {
+            audioCodecs.push(probeData?.audio);
+        }
+        else if (probeData?.audio) {
+            queryParts.push('audio');
+        }
+        if (audioCodecs.length) {
+            queryParts.push(`audio=${audioCodecs.join(',')}`);
+        }
+        if (probeData?.microphone) {
+            queryParts.push('microphone');
+        }
+        if (!queryParts.length) {
+            queryParts.push('video', 'audio');
+        }
+        const queryString = `${params}&${queryParts.join('&')}`;
+        const response = await fetchInstance()(`/streams?${queryString}`, {
             method: 'GET',
         });
         if (!response.ok) {

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

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

@@ -1,5 +1,6 @@
 import { ApplicationApi } from './api/application.js';
 import { ConfigApi } from './api/config.js';
+import { DiscoverApi } from './api/discover.js';
 import { SnapshotApi } from './api/snapshot.js';
 import { StreamsApi } from './api/streams.js';
 export declare class Go2RtcApi {
@@ -9,6 +10,7 @@ export declare class Go2RtcApi {
     configApi: ConfigApi;
     snapshotApi: SnapshotApi;
     streamsApi: StreamsApi;
+    discoverApi: DiscoverApi;
     constructor();
     clear(): void;
 }

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

@@ -2,6 +2,7 @@ import { container } from 'tsyringe';
 import { API_EVENT } from '../../api.js';
 import { ApplicationApi } from './api/application.js';
 import { ConfigApi } from './api/config.js';
+import { DiscoverApi } from './api/discover.js';
 import { SnapshotApi } from './api/snapshot.js';
 import { StreamsApi } from './api/streams.js';
 import { RequestQueue } from './queue.js';
@@ -12,6 +13,7 @@ export class Go2RtcApi {
     configApi;
     snapshotApi;
     streamsApi;
+    discoverApi;
     constructor() {
         container.registerInstance('go2rtcApi', this);
         this.api = container.resolve('api');
@@ -20,6 +22,7 @@ export class Go2RtcApi {
         this.configApi = new ConfigApi(this.requestQueue);
         this.snapshotApi = new SnapshotApi(this.requestQueue);
         this.streamsApi = new StreamsApi(this.requestQueue);
+        this.discoverApi = new DiscoverApi(this.requestQueue);
         this.api.setMaxListeners(this.api.getMaxListeners() + 1);
         this.api.once(API_EVENT.SHUTDOWN, this.clear.bind(this));
     }

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

@@ -1 +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"}
+{"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,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;IACvB,WAAW,CAAc;IAEhC;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;QACpD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtD,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/queue.js

@@ -3,11 +3,11 @@ export class RequestQueue {
     isProcessing = false;
     constructor() { }
     enqueue(requestFunc) {
-        return new Promise((_resolve, _reject) => {
+        return new Promise((resolve, reject) => {
             const queueItem = {
                 requestFunc,
-                resolve: _resolve,
-                reject: _reject,
+                resolve,
+                reject,
             };
             this.queue.push(queueItem);
             this.processQueue();

package/dist/server/src/api/go2rtc/queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../../src/api/go2rtc/queue.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,YAAY;IACf,KAAK,GAAgB,EAAE,CAAC;IACxB,YAAY,GAAG,KAAK,CAAC;IAE7B,gBAAe,CAAC;IAET,OAAO,CAAC,WAA4B;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;YACvC,MAAM,SAAS,GAAc;gBAC3B,WAAW;gBACX,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,OAAO;aAChB,CAAC;YAEF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG,CAAC;QAExC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,CAAC;YACjD,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../../src/api/go2rtc/queue.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,YAAY;IACf,KAAK,GAAgB,EAAE,CAAC;IACxB,YAAY,GAAG,KAAK,CAAC;IAE7B,gBAAe,CAAC;IAET,OAAO,CAAC,WAA4B;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,SAAS,GAAc;gBAC3B,WAAW;gBACX,OAAO;gBACP,MAAM;aACP,CAAC;YAEF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG,CAAC;QAExC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,CAAC;YACjD,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;CACF"}