@camera.ui/server 0.0.70 → 0.0.71

package/dist/server/src/rpc/utils.js

@@ -9,4 +9,12 @@ export function generateCredentials() {
     const password = passwordBytes.toString('base64').replace(/[+/=@:]/g, '');
     return { user, password };
 }
+export async function safeAsync(promise) {
+    try {
+        return await promise;
+    }
+    catch {
+        return null;
+    }
+}
 //# sourceMappingURL=utils.js.map

package/dist/server/src/rpc/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/rpc/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,UAAU,mBAAmB;IACjC,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,SAAS;SACnB,QAAQ,CAAC,QAAQ,CAAC;SAClB,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACf,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE1E,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/rpc/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,UAAU,mBAAmB;IACjC,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,SAAS;SACnB,QAAQ,CAAC,QAAQ,CAAC;SAClB,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACf,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE1E,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAI,OAAmB;IACpD,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/server/src/services/config/constants.d.ts

@@ -1,7 +1,13 @@
-import type { IceServer } from '@camera.ui/types';
+import type { IceServer } from '@camera.ui/sdk/internal';
 import type { Go2RtcConfig, IConfig } from './types.js';
 export declare const ELECTRON_ASAR_UNPACKED = "app";
 export declare const PROCESS_IDENTIFIER = "--id=camera.ui";
 export declare const DEFAULT_ICE_SERVERS: IceServer[];
 export declare const DEFAULT_CONFIG: IConfig;
 export declare const DEFAULT_GO2RTC_CONFIG: Go2RtcConfig;
+export declare const AUTH_SERVICE_URL: string;
+export declare const BILLING_SERVICE_URL: string;
+export declare const CLOUD_SERVICE_URL: string;
+export declare const PROXY_SERVICE_URL: string;
+export declare const PROXY_TUNNEL_ENDPOINT: string;
+export declare const SHARE_SERVICE_URL: string;

package/dist/server/src/services/config/constants.js

@@ -1,4 +1,4 @@
-import { ffmpegPath, isFFmpegAvailable } from '@camera.ui/ffmpeg';
+import { ffmpegPath, isFfmpegAvailable } from 'node-av/ffmpeg';
 import { platform } from 'node:os';
 import { DEFAULT_CONFIG_LOGGER, DEFAULT_CONFIG_PLUGINS, DEFAULT_CONFIG_PORT, DEFAULT_CONFIG_SSL, DEFAULT_GO2RTC_CONFIG_API, DEFAULT_GO2RTC_CONFIG_FFMPEG, DEFAULT_GO2RTC_CONFIG_LOGGER, DEFAULT_GO2RTC_CONFIG_RTMP, DEFAULT_GO2RTC_CONFIG_RTSP, DEFAULT_GO2RTC_CONFIG_SRTP, DEFAULT_GO2RTC_CONFIG_WEBRTC, } from './defaults.js';
 // asar = true => app.asar.unpacked
@@ -15,6 +15,15 @@ export const DEFAULT_CONFIG = {
     ssl: DEFAULT_CONFIG_SSL,
     logger: DEFAULT_CONFIG_LOGGER,
     plugins: DEFAULT_CONFIG_PLUGINS,
+    workers: {
+        enabled: false,
+        address: '',
+        port: 7422,
+        master: '',
+        token: '',
+        name: '',
+        capabilities: [],
+    },
 };
 export const DEFAULT_GO2RTC_CONFIG = {
     log: DEFAULT_GO2RTC_CONFIG_LOGGER,
@@ -25,7 +34,13 @@ export const DEFAULT_GO2RTC_CONFIG = {
     webrtc: DEFAULT_GO2RTC_CONFIG_WEBRTC,
     ffmpeg: {
         ...DEFAULT_GO2RTC_CONFIG_FFMPEG,
-        bin: !isFFmpegAvailable() ? (platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg') : ffmpegPath().replace('app.asar', ELECTRON_ASAR_UNPACKED),
+        bin: !isFfmpegAvailable() ? (platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg') : ffmpegPath().replace('app.asar', ELECTRON_ASAR_UNPACKED),
     },
 };
+export const AUTH_SERVICE_URL = process.env.AUTH_SERVICE_URL ?? 'https://auth.cameraui.com';
+export const BILLING_SERVICE_URL = process.env.BILLING_SERVICE_URL ?? 'https://billing.cameraui.com';
+export const CLOUD_SERVICE_URL = process.env.CLOUD_SERVICE_URL ?? 'https://cloud.cameraui.com';
+export const PROXY_SERVICE_URL = process.env.PROXY_SERVICE_URL ?? 'https://proxy.cameraui.com';
+export const PROXY_TUNNEL_ENDPOINT = process.env.PROXY_TUNNEL_ENDPOINT ?? 'tunnel.cameraui.com:9092';
+export const SHARE_SERVICE_URL = process.env.SHARE_SERVICE_URL ?? 'https://share.cameraui.com';
 //# sourceMappingURL=constants.js.map

package/dist/server/src/services/config/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/services/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,4BAA4B,EAC5B,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,eAAe,CAAC;AAKvB,mCAAmC;AACnC,sBAAsB;AACtB,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAE5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,mBAAmB,GAAgB;IAC9C;QACE,IAAI,EAAE,CAAC,8BAA8B,CAAC;KACvC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAY;IACrC,IAAI,EAAE,mBAAmB;IACzB,GAAG,EAAE,kBAAkB;IACvB,MAAM,EAAE,qBAAqB;IAC7B,OAAO,EAAE,sBAAsB;CAChC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAiB;IACjD,GAAG,EAAE,4BAA4B;IACjC,GAAG,EAAE,yBAAyB;IAC9B,IAAI,EAAE,0BAA0B;IAChC,IAAI,EAAE,0BAA0B;IAChC,IAAI,EAAE,0BAA0B;IAChC,MAAM,EAAE,4BAA4B;IACpC,MAAM,EAAE;QACN,GAAG,4BAA4B;QAC/B,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,sBAAsB,CAAC;KAC1I;CACF,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/services/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,4BAA4B,EAC5B,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,eAAe,CAAC;AAKvB,mCAAmC;AACnC,sBAAsB;AACtB,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAE5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,mBAAmB,GAAgB;IAC9C;QACE,IAAI,EAAE,CAAC,8BAA8B,CAAC;KACvC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAY;IACrC,IAAI,EAAE,mBAAmB;IACzB,GAAG,EAAE,kBAAkB;IACvB,MAAM,EAAE,qBAAqB;IAC7B,OAAO,EAAE,sBAAsB;IAC/B,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,EAAE;KACjB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAiB;IACjD,GAAG,EAAE,4BAA4B;IACjC,GAAG,EAAE,yBAAyB;IAC9B,IAAI,EAAE,0BAA0B;IAChC,IAAI,EAAE,0BAA0B;IAChC,IAAI,EAAE,0BAA0B;IAChC,MAAM,EAAE,4BAA4B;IACpC,MAAM,EAAE;QACN,GAAG,4BAA4B;QAC/B,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,sBAAsB,CAAC;KAC1I;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,2BAA2B,CAAC;AAC5F,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,8BAA8B,CAAC;AACrG,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,4BAA4B,CAAC;AAC/F,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,4BAA4B,CAAC;AAC/F,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,0BAA0B,CAAC;AACrG,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,4BAA4B,CAAC"}

package/dist/server/src/services/config/defaults.js

@@ -27,16 +27,16 @@ export const DEFAULT_GO2RTC_CONFIG_API = {
     tls_ca: '',
 };
 export const DEFAULT_GO2RTC_CONFIG_RTSP = {
-    listen: ':2001',
+    listen: '0.0.0.0:2001',
     default_query: 'video=all&audio=all',
     username: 'admin',
     password: 'admin',
 };
 export const DEFAULT_GO2RTC_CONFIG_SRTP = {
-    listen: '127.0.0.1:2002',
+    listen: '0.0.0.0:2002',
 };
 export const DEFAULT_GO2RTC_CONFIG_RTMP = {
-    listen: '127.0.0.1:2003',
+    listen: '0.0.0.0:2003',
 };
 export const DEFAULT_GO2RTC_CONFIG_WEBRTC = {
     listen: ':2004/tcp',

package/dist/server/src/services/config/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../../src/services/config/defaults.ts"],"names":[],"mappings":"AAEA,SAAS;AACT,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAe;IAC5C,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,CAAC,WAAW,CAAC;CACzB,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAW;IAC3C,KAAK,EAAE,OAAO;CACf,CAAC;AACF,MAAM,CAAC,MAAM,sBAAsB,GAAoB;IACrD,eAAe,EAAE,EAAE;CACpB,CAAC;AAEF,SAAS;AACT,MAAM,CAAC,MAAM,4BAA4B,GAAiB;IACxD,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,MAAM;CACb,CAAC;AACF,MAAM,CAAC,MAAM,yBAAyB,GAAQ;IAC5C,MAAM,EAAE,GAAG;IACX,MAAM,EAAE,EAAE;IACV,UAAU,EAAE,gBAAgB;IAC5B,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,EAAE;CACX,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAS;IAC9C,MAAM,EAAE,OAAO;IACf,aAAa,EAAE,qBAAqB;IACpC,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;CAClB,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAS;IAC9C,MAAM,EAAE,gBAAgB;CACzB,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAS;IAC9C,MAAM,EAAE,gBAAgB;CACzB,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAW;IAClD,MAAM,EAAE,WAAW;IACnB,UAAU,EAAE,CAAC,WAAW,CAAC;CAC1B,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAW;IAClD,GAAG,EAAE,QAAQ;IACb,MAAM,EAAE,cAAc;IACtB,IAAI,EAAE,gCAAgC;IACtC,IAAI,EAAE,qHAAqH;IAC3H,8CAA8C;IAC9C,IAAI,EAAE,mKAAmK;IACzK,MAAM,EAAE,gEAAgE;CACzE,CAAC"}
+{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../../src/services/config/defaults.ts"],"names":[],"mappings":"AAEA,SAAS;AACT,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAe;IAC5C,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,CAAC,WAAW,CAAC;CACzB,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAW;IAC3C,KAAK,EAAE,OAAO;CACf,CAAC;AACF,MAAM,CAAC,MAAM,sBAAsB,GAAoB;IACrD,eAAe,EAAE,EAAE;CACpB,CAAC;AAEF,SAAS;AACT,MAAM,CAAC,MAAM,4BAA4B,GAAiB;IACxD,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,MAAM;CACb,CAAC;AACF,MAAM,CAAC,MAAM,yBAAyB,GAAQ;IAC5C,MAAM,EAAE,GAAG;IACX,MAAM,EAAE,EAAE;IACV,UAAU,EAAE,gBAAgB;IAC5B,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,EAAE;CACX,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAS;IAC9C,MAAM,EAAE,cAAc;IACtB,aAAa,EAAE,qBAAqB;IACpC,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;CAClB,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAS;IAC9C,MAAM,EAAE,cAAc;CACvB,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAS;IAC9C,MAAM,EAAE,cAAc;CACvB,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAW;IAClD,MAAM,EAAE,WAAW;IACnB,UAAU,EAAE,CAAC,WAAW,CAAC;CAC1B,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAW;IAClD,GAAG,EAAE,QAAQ;IACb,MAAM,EAAE,cAAc;IACtB,IAAI,EAAE,gCAAgC;IACtC,IAAI,EAAE,qHAAqH;IAC3H,8CAA8C;IAC9C,IAAI,EAAE,mKAAmK;IACzK,MAAM,EAAE,gEAAgE;CACzE,CAAC"}

package/dist/server/src/services/config/index.d.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import type { LoggerOptions } from '@camera.ui/common/logger';
 import type { ProcInfo } from '../../api/database/checks.js';
 import type { DeepPartial } from '../../types.js';
@@ -10,10 +9,6 @@ export declare class ConfigService {
     static readonly MIN_NODE_VERSION: string;
     static readonly SERVER_PATH: string;
     static readonly INTERFACE_PATH: string;
-    private logger;
-    private _config;
-    private _go2rtcConfig;
-    private _ssl;
     readonly SECRETS: Secrets;
     readonly HOME_PATH: string;
     readonly STORAGE_PATH: string;
@@ -30,11 +25,15 @@ export declare class ConfigService {
     readonly CONFIG_FILE: string;
     readonly SECRETS_FILE: string;
     readonly GO2RTC_BINARY: string;
+    readonly TUNNEL_BINARY: string;
     readonly GO2RTC_CONFIG_FILE: string;
     readonly NATS_BINARY: string;
     readonly BACKUP_INFO_FILE: string;
     readonly UI_PORT: number;
-    readonly WS_PORT: number;
+    private logger;
+    private _config;
+    private _go2rtcConfig;
+    private _ssl;
     get ssl(): SSLConfig;
     get config(): IConfig;
     set config(newConfig: IConfig);
@@ -46,61 +45,26 @@ export declare class ConfigService {
     get go2rtcLoggerOptions(): LoggerOptions;
     constructor(homePath?: string);
     static extractVersion(str: string): string | null;
-    /**
-     * Updates the main configuration and writes it to disk
-     * @param newConfig Partial config to merge with existing
-     */
     writeConfig(newConfig?: DeepPartial<IConfig>): void;
-    /**
-     * Common implementation for both file and API-based go2rtc config updates
-     * @param newConfig Partial config to merge with existing
-     * @param writeMethod Method to use for writing the config (file or API)
-     */
     private updateGo2RtcConfigCommon;
-    /**
-     * Write Go2RTC config to file
-     */
     writeGo2RtcConfigFile(newConfig?: DeepPartial<Go2RtcConfig>): Promise<void>;
-    /**
-     * Write Go2RTC config using the API
-     */
     writeGo2RtcConfigApi(newConfig?: DeepPartial<Go2RtcConfig>): Promise<void>;
-    /**
-     * Merge Go2RTC config from file and update database
-     */
     mergeGo2RtcConfig(): Promise<void>;
-    /**
-     * Update WebRTC filter settings
-     */
     updateGo2RtcWebRtcFilter(serverAddresses?: string[], oldAddresses?: string[], api?: boolean): Promise<void>;
-    /**
-     * Reset camera.ui
-     */
     reset(): Promise<void>;
-    /**
-     * Clean up empty WebRTC filter arrays
-     */
     private cleanupWebRtcFilters;
     addProcess(proc: ProcInfo): ProcInfo;
     removeProcessByPID(pid?: number): void;
     go2rtcAddress(mod?: 'api' | 'rtsp' | 'onvif' | 'srtp' | 'rtmp' | 'webrtc' | 'ws'): string;
     cameraURLExists(cameraUrl: string): boolean;
-    /**
-     * Validate and set the main config, handling Zod validation
-     */
     private validateAndSetConfig;
-    /**
-     * Validate and set the Go2RTC config, handling Zod validation
-     */
     private validateAndSetGo2RtcConfig;
-    /**
-     * Merge a partial config with the existing config and validate it
-     */
     private mergeAndValidate;
     private read;
     private defaultConfig;
     private defaultGo2RtcConfig;
     private readConfig;
+    private applyEnvOverrides;
     private readGo2RtcConfig;
     private cleanupConfig;
     private updateConfig;
@@ -111,6 +75,5 @@ export declare class ConfigService {
     private safetyEnsureDir;
     private safetyEmptyDir;
     private safetyEnsureFile;
-    private injectElectronMetaTag;
     private logStart;
 }

package/dist/server/src/services/config/index.js

@@ -1,11 +1,12 @@
-import 'reflect-metadata';
-import { getUserHomeDir, IS_DEV, IS_DOCKER, IS_ELECTRON, IS_HA, isEqual, isFfmpegInstalled, mergeWith, structuredClone } from '@camera.ui/common';
-import { ffmpegPath, isFFmpegAvailable } from '@camera.ui/ffmpeg';
+import { isFfmpegInstalled } from '@camera.ui/common/camera';
+import { getUserHomeDir } from '@camera.ui/common/node';
+import { IS_DEV, IS_DOCKER, IS_ELECTRON, IS_HA, isEqual, mergeWith, structuredClone } from '@camera.ui/common/utils';
 import { go2rtcPath } from '@camera.ui/go2rtc';
 import { natsServerPath } from '@camera.ui/nats';
-import { config } from 'dotenv';
+import { tunnelPath } from '@camera.ui/tunnel';
 import { emptyDirSync, ensureDirSync, ensureFileSync, pathExistsSync, readJsonSync, removeSync, writeJsonSync } from 'fs-extra/esm';
 import { dump, load } from 'js-yaml';
+import { ffmpegPath, isFfmpegAvailable } from 'node-av';
 import { randomBytes } from 'node:crypto';
 import { readFileSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
@@ -23,7 +24,6 @@ const __require = createRequire(import.meta.url);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const packageJson = __require('../../../package.json');
-config({ path: resolve(join(__dirname, '../../../../.env')) });
 export class ConfigService {
     static get VERSION() {
         const pjson = readJsonSync(resolve(join(__dirname, '../../../package.json')));
@@ -39,16 +39,9 @@ export class ConfigService {
     }
     static NODE_VERSION = process.version;
     static MIN_NODE_VERSION = ConfigService.extractVersion(packageJson.engines.node);
-    // paths
     static SERVER_PATH = resolve(join(__dirname, '../../../'));
     static INTERFACE_PATH = IS_DEV && !IS_ELECTRON ? join(ConfigService.SERVER_PATH, 'dist', 'interface') : join(ConfigService.SERVER_PATH, '..', 'interface');
-    logger;
-    _config;
-    _go2rtcConfig;
-    _ssl;
-    // database
     SECRETS;
-    // dirs
     HOME_PATH;
     STORAGE_PATH;
     LOGS_PATH;
@@ -59,30 +52,29 @@ export class ConfigService {
     TMP_PATH;
     PLUGINS_STORAGE_PATH;
     PLUGINS_INSTALL_PATH;
-    // files
     REPORTS_FILE;
     LOG_FILE;
     CONFIG_FILE;
     SECRETS_FILE;
     GO2RTC_BINARY;
+    TUNNEL_BINARY;
     GO2RTC_CONFIG_FILE;
     NATS_BINARY;
     BACKUP_INFO_FILE;
-    // server
     UI_PORT = parseInt(process.env.CAMERA_UI_DEV_UI_PORT); // dotenv
-    WS_PORT = parseInt(process.env.CAMERA_UI_DEV_WS_PORT); // dotenv
-    // certs
+    logger;
+    _config;
+    _go2rtcConfig;
+    _ssl;
     get ssl() {
         return this._ssl;
     }
-    // Proxy for main config to track nested changes
     get config() {
         return this._config;
     }
     set config(newConfig) {
         this.validateAndSetConfig(newConfig);
     }
-    // Proxy for go2rtc config to track nested changes
     get go2rtcConfig() {
         return this._go2rtcConfig;
     }
@@ -144,13 +136,11 @@ export class ConfigService {
         this.PLUGINS_STORAGE_PATH = join(this.STORAGE_PATH, 'plugins', 'storage');
         this.PLUGINS_INSTALL_PATH = join(this.HOME_PATH, 'plugins');
         this.GO2RTC_BINARY = go2rtcPath().replace('app.asar', ELECTRON_ASAR_UNPACKED);
+        this.TUNNEL_BINARY = tunnelPath().replace('app.asar', ELECTRON_ASAR_UNPACKED);
         this.NATS_BINARY = natsServerPath().replace('app.asar', ELECTRON_ASAR_UNPACKED);
         this.SECRETS_FILE = join(this.STORAGE_PATH, '.camera.ui.secrets');
         this.LOG_FILE = join(this.STORAGE_PATH, 'camera.ui.log');
         this.SECRETS = this.updateSecrets();
-        if (IS_ELECTRON) {
-            this.injectElectronMetaTag();
-        }
         this.createDirs();
         this.read();
         this.logStart();
@@ -165,10 +155,6 @@ export class ConfigService {
             return null;
         }
     }
-    /**
-     * Updates the main configuration and writes it to disk
-     * @param newConfig Partial config to merge with existing
-     */
     writeConfig(newConfig) {
         const oldSSL = structuredClone(this._config.ssl);
         if (newConfig) {
@@ -185,71 +171,47 @@ export class ConfigService {
         }
         writeFileSync(this.CONFIG_FILE, dump(this._config, { lineWidth: -1, noRefs: true }));
     }
-    /**
-     * Common implementation for both file and API-based go2rtc config updates
-     * @param newConfig Partial config to merge with existing
-     * @param writeMethod Method to use for writing the config (file or API)
-     */
     async updateGo2RtcConfigCommon(newConfig, writeMethod = 'file') {
         if (newConfig) {
             this.mergeAndValidate(this._go2rtcConfig, newConfig);
         }
-        // Handle empty streams object
         if (this._go2rtcConfig.streams && Object.keys(this._go2rtcConfig.streams).length === 0) {
             delete this._go2rtcConfig.streams;
         }
-        // Handle empty preload object
         if (this._go2rtcConfig.preload && Object.keys(this._go2rtcConfig.preload).length === 0) {
             delete this._go2rtcConfig.preload;
         }
-        // Use the appropriate write method
         if (writeMethod === 'api') {
             const go2rtcApi = container.resolve('go2rtcApi');
-            await go2rtcApi.configApi.rewriteConfig(this._go2rtcConfig);
+            await go2rtcApi.configRoute.rewriteConfig(this._go2rtcConfig);
         }
         else {
             writeFileSync(this.GO2RTC_CONFIG_FILE, dump(this._go2rtcConfig, { lineWidth: -1, noRefs: true }));
         }
     }
-    /**
-     * Write Go2RTC config to file
-     */
     async writeGo2RtcConfigFile(newConfig) {
         await this.updateGo2RtcConfigCommon(newConfig, 'file');
     }
-    /**
-     * Write Go2RTC config using the API
-     */
     async writeGo2RtcConfigApi(newConfig) {
         await this.updateGo2RtcConfigCommon(newConfig, 'api');
     }
-    /**
-     * Merge Go2RTC config from file and update database
-     */
     async mergeGo2RtcConfig() {
-        // refresh stored go2rtc config and also update database
         const fileConfig = load(readFileSync(this.GO2RTC_CONFIG_FILE, 'utf-8'));
         this.validateAndSetGo2RtcConfig(fileConfig);
         const db = container.resolve('dbs');
+        // Sync stream URL changes from go2rtc to DB, then push DB camera settings (ffmpeg URLs, preload, etc.) back to go2rtc
         await db?.updateCameras();
+        db?.syncCamerasToGo2RtcConfig();
     }
-    /**
-     * Update WebRTC filter settings
-     */
     async updateGo2RtcWebRtcFilter(serverAddresses = [], oldAddresses = [], api) {
         const webRtcConfig = this._go2rtcConfig.webrtc;
-        // Initialize filters object if it doesn't exist
         webRtcConfig.filters ??= {};
-        // Initialize candidates array if it doesn't exist
         webRtcConfig.filters.candidates ??= [];
-        // Initialize IPs array if it doesn't exist
         webRtcConfig.filters.ips ??= [];
-        // Remove old addresses from filters
         if (oldAddresses.length) {
             webRtcConfig.filters.candidates = webRtcConfig.filters.candidates.filter((address) => !oldAddresses.includes(address));
             webRtcConfig.filters.ips = webRtcConfig.filters.ips.filter((address) => !oldAddresses.includes(address));
         }
-        // Add new server addresses to filters
         if (serverAddresses.length) {
             for (const address of serverAddresses) {
                 if (!webRtcConfig.filters.candidates.includes(address)) {
@@ -261,13 +223,10 @@ export class ConfigService {
             }
         }
         else {
-            // Clear filters if no addresses are provided
             webRtcConfig.filters.candidates = [];
             webRtcConfig.filters.ips = [];
         }
-        // Clean up empty filter arrays
         this.cleanupWebRtcFilters(webRtcConfig);
-        // Write the updated config
         if (api) {
             await this.writeGo2RtcConfigApi({ webrtc: webRtcConfig });
         }
@@ -275,27 +234,17 @@ export class ConfigService {
             await this.writeGo2RtcConfigFile({ webrtc: webRtcConfig });
         }
     }
-    /**
-     * Reset camera.ui
-     */
     async reset() {
         this.logger.attention('Resetting camera.ui...');
-        // Cleanup
-        this.safetyEmptyDir(this.STORAGE_PATH); // .camera.ui/volume
-        // this.safetyEmptyDir(resolve(this.HOME_PATH, 'python')); // .camera.ui/python
-        this.safetyEmptyDir(this.PLUGINS_INSTALL_PATH); // .camera.ui/plugins
-    }
-    /**
-     * Clean up empty WebRTC filter arrays
-     */
+        this.safetyEmptyDir(this.STORAGE_PATH);
+        this.safetyEmptyDir(this.PLUGINS_INSTALL_PATH);
+    }
     cleanupWebRtcFilters(webRtcConfig) {
-        // Remove empty filter arrays
         for (const key of ['candidates', 'ips', 'networks', 'interfaces', 'udp_ports']) {
             if (!webRtcConfig.filters[key]?.length) {
                 delete webRtcConfig.filters[key];
             }
         }
-        // Remove empty filters object
         if (Object.keys(webRtcConfig.filters).length === 0) {
             delete webRtcConfig.filters;
         }
@@ -373,9 +322,6 @@ export class ConfigService {
             return u.host === host && u.port === port;
         });
     }
-    /**
-     * Validate and set the main config, handling Zod validation
-     */
     validateAndSetConfig(newConfig) {
         try {
             const config = patchConfigSchema.parse(newConfig);
@@ -390,22 +336,15 @@ export class ConfigService {
             throw error;
         }
     }
-    /**
-     * Validate and set the Go2RTC config, handling Zod validation
-     */
     validateAndSetGo2RtcConfig(newConfig) {
-        // Handle null streams
         if (!newConfig.streams || newConfig.streams === null) {
             delete newConfig.streams;
         }
-        // Handle null preload
         if (!newConfig.preload || newConfig.preload === null) {
             delete newConfig.preload;
         }
         try {
-            // Validate using Zod schema
             const config = patchGo2RtcSchema.parse(newConfig);
-            // Apply restrictions and ensure correct configuration
             this._go2rtcConfig = this.updateGo2RtcConfig(config);
         }
         catch (error) {
@@ -417,9 +356,6 @@ export class ConfigService {
             throw error;
         }
     }
-    /**
-     * Merge a partial config with the existing config and validate it
-     */
     mergeAndValidate(target, source) {
         mergeWith(target, source, (sourceVal, targetVal) => {
             if (Array.isArray(sourceVal)) {
@@ -456,7 +392,6 @@ export class ConfigService {
                     return target;
                 }
             });
-            // Update legacy cert paths
             if (config.ssl.certFile === join(this.STORAGE_PATH, OLD_ROOT_CERT_FILENAME)) {
                 config.ssl.certFile = join(this.STORAGE_PATH, HOST_CERT_FILENAME);
             }
@@ -464,6 +399,28 @@ export class ConfigService {
                 config.ssl.keyFile = join(this.STORAGE_PATH, HOST_KEY_FILENAME);
             }
         }
+        config = this.applyEnvOverrides(config);
+        return config;
+    }
+    applyEnvOverrides(config) {
+        config.workers ??= {};
+        if (process.env.CAMERA_UI_WORKERS_ENABLED !== undefined)
+            config.workers.enabled = process.env.CAMERA_UI_WORKERS_ENABLED === 'true';
+        if (process.env.CAMERA_UI_WORKERS_ADDRESS)
+            config.workers.address = process.env.CAMERA_UI_WORKERS_ADDRESS;
+        if (process.env.CAMERA_UI_WORKERS_PORT)
+            config.workers.port = parseInt(process.env.CAMERA_UI_WORKERS_PORT, 10);
+        if (process.env.CAMERA_UI_WORKERS_MASTER)
+            config.workers.master = process.env.CAMERA_UI_WORKERS_MASTER;
+        if (process.env.CAMERA_UI_WORKERS_TOKEN)
+            config.workers.token = process.env.CAMERA_UI_WORKERS_TOKEN;
+        if (process.env.CAMERA_UI_WORKERS_NAME)
+            config.workers.name = process.env.CAMERA_UI_WORKERS_NAME;
+        if (process.env.CAMERA_UI_WORKERS_CAPABILITIES) {
+            config.workers.capabilities = process.env.CAMERA_UI_WORKERS_CAPABILITIES.split(',')
+                .map((c) => c.trim())
+                .filter(Boolean);
+        }
         return config;
     }
     readGo2RtcConfig() {
@@ -495,30 +452,23 @@ export class ConfigService {
         return newConfig;
     }
     updateConfig() {
-        // validate and setup configs
         this.validateAndSetConfig(this.readConfig());
         this.validateAndSetGo2RtcConfig(this.readGo2RtcConfig());
         this._ssl = this.readSSL();
-        // setup logger
         this.logger.debugEnabled = this._config.logger?.level === 'debug' || this._config.logger?.level === 'trace';
         this.logger.traceEnabled = this._config.logger?.level === 'trace';
     }
     updateGo2RtcConfig(go2rtcConfig) {
         const config = structuredClone(go2rtcConfig);
-        // Validate api
         config.api.listen = '';
         config.api.origin = '*';
         config.api.tls_cert = this.config.ssl.certFile;
         config.api.tls_key = this.config.ssl.keyFile;
         config.api.tls_ca = this.config.ssl.caFile;
-        // Validate ffmpeg
         if (!isFfmpegInstalled(config.ffmpeg.bin)) {
-            config.ffmpeg.bin = !isFFmpegAvailable() ? (platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg') : ffmpegPath().replace('app.asar', ELECTRON_ASAR_UNPACKED);
+            config.ffmpeg.bin = !isFfmpegAvailable() ? (platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg') : ffmpegPath().replace('app.asar', ELECTRON_ASAR_UNPACKED);
         }
-        // Validate webrtc
-        // Initialize filters if needed
         config.webrtc.filters ??= {};
-        // Clean up configuration
         if (!config.streams) {
             delete config.streams;
         }
@@ -544,6 +494,8 @@ export class ConfigService {
             const secrets = {
                 jwtAccessKey: randomBytes(32).toString('hex'),
                 jwtRefreshKey: randomBytes(32).toString('hex'),
+                jwt2faKey: randomBytes(32).toString('hex'),
+                twoFactorKey: randomBytes(32).toString('hex'),
             };
             writeJsonSync(this.SECRETS_FILE, secrets, { spaces: 2 });
             return secrets;
@@ -554,9 +506,20 @@ export class ConfigService {
                 if (!secrets.jwtAccessKey || !secrets.jwtRefreshKey) {
                     return createSecrets();
                 }
-                else {
-                    return secrets;
+                // Add missing 2FA secrets for existing installations
+                let needsUpdate = false;
+                if (!secrets.jwt2faKey) {
+                    secrets.jwt2faKey = randomBytes(32).toString('hex');
+                    needsUpdate = true;
+                }
+                if (!secrets.twoFactorKey) {
+                    secrets.twoFactorKey = randomBytes(32).toString('hex');
+                    needsUpdate = true;
                 }
+                if (needsUpdate) {
+                    writeJsonSync(this.SECRETS_FILE, secrets, { spaces: 2 });
+                }
+                return secrets;
             }
             catch {
                 return createSecrets();
@@ -622,22 +585,6 @@ export class ConfigService {
             throw error;
         }
     }
-    injectElectronMetaTag() {
-        try {
-            const indexHtmlPath = join(ConfigService.INTERFACE_PATH, 'index.html');
-            if (pathExistsSync(indexHtmlPath)) {
-                let indexHtml = readFileSync(indexHtmlPath, 'utf8');
-                if (!indexHtml.includes('<meta name="electron-server"')) {
-                    const metaTag = '<meta name="electron-server" content="true">';
-                    indexHtml = indexHtml.replace('</head>', `${metaTag}</head>`);
-                    writeFileSync(indexHtmlPath, indexHtml);
-                }
-            }
-        }
-        catch {
-            //
-        }
-    }
     logStart() {
         this.logger.log('---');
         this.logger.log(`Initializing camera.ui with PID: ${process.pid}`);
@@ -647,6 +594,7 @@ export class ConfigService {
         this.logger.log(`camera.ui Config Path: ${this.CONFIG_FILE}`);
         this.logger.log(`Go2RTC Binary Path: ${this.GO2RTC_BINARY}`);
         this.logger.log(`Go2RTC Config Path ${this.GO2RTC_CONFIG_FILE}`);
+        this.logger.log(`Tunnel Client Binary Path: ${this.TUNNEL_BINARY}`);
         this.logger.log(`Nats Binary Path: ${this.NATS_BINARY}`);
         this.logger.log(`Plugins Storage Path: ${this.PLUGINS_STORAGE_PATH}`);
         this.logger.log(`Plugins Install Path: ${this.PLUGINS_INSTALL_PATH}`);