camera.ui3 0.0.34-alpha.5 → 0.0.35-test.1

package/dist/installer/base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/installer/base.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,YAAY;IACJ;IAAnB,YAAmB,GAAgB;QAAhB,QAAG,GAAH,GAAG,CAAa;IAAG,CAAC;IAEhC,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yDAAyD,EAAE,MAAM,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,SAAS;QACpB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yDAAyD,EAAE,MAAM,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,SAAS;QACpB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yDAAyD,EAAE,MAAM,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yDAAyD,EAAE,MAAM,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yDAAyD,EAAE,MAAM,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yDAAyD,EAAE,MAAM,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yDAAyD,EAAE,MAAM,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,OAAO;YACL,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,CAAC;SACP,CAAC;IACJ,CAAC;IAED,6DAA6D;IACtD,YAAY,CAAC,IAAY;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/{server/bin/installer → installer}/darwin.d.ts

@@ -46,14 +46,6 @@ export declare class DarwinInstaller extends BasePlatform {
      * Check the command is being run as root and we can detect the user
      */
     private checkForRoot;
-    /**
-     * Checks if the user has write access to the global npm directory
-     */
-    private checkGlobalNpmAccess;
-    /**
-     * Set permissions on global npm path
-     */
-    private setNpmPermissions;
     /**
      * Create the system launch agent
      */

package/dist/{server/bin/installer → installer}/darwin.js

@@ -1,4 +1,4 @@
-import { getNpmPath } from '@camera.ui/common/node';
+import { sleep } from '@camera.ui/common/utils';
 import { execSync } from 'node:child_process';
 import { existsSync, unlinkSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
@@ -19,7 +19,6 @@ export class DarwinInstaller extends BasePlatform {
     async install() {
         this.checkForRoot();
         await this.cli.portCheck();
-        await this.checkGlobalNpmAccess();
         await this.cli.homePathCheck();
         try {
             const la = await this.createLaunchAgent();
@@ -57,7 +56,9 @@ export class DarwinInstaller extends BasePlatform {
      * Reinstalls the launchctl service
      */
     async reinstall() {
+        this.checkForRoot();
         await this.uninstall();
+        await sleep(2000);
         await this.install();
     }
     /**
@@ -65,7 +66,6 @@ export class DarwinInstaller extends BasePlatform {
      */
     async start(restart) {
         this.checkForRoot();
-        await this.checkGlobalNpmAccess();
         try {
             execSync(`launchctl load -w ${this.plistPath}`);
             this.cli.logger(`${this.cli.serviceName} ${restart ? 'restarted' : 'started'}`, 'succeed');
@@ -94,7 +94,7 @@ export class DarwinInstaller extends BasePlatform {
     async restart() {
         this.checkForRoot();
         await this.stop();
-        await new Promise((resolve) => setTimeout(resolve, 2000));
+        await sleep(2000);
         await this.start(true);
     }
     /**
@@ -155,50 +155,6 @@ export class DarwinInstaller extends BasePlatform {
         }
         this.user = this.cli.asUser ?? process.env.SUDO_USER;
     }
-    /**
-     * Checks if the user has write access to the global npm directory
-     */
-    async checkGlobalNpmAccess() {
-        const npmPath = getNpmPath().join(' ');
-        const npmBinPath = `$(dirname $(which ${npmPath}))`;
-        const modulePath = this.cli.getInstallDir();
-        const { uid, gid } = await this.getId();
-        try {
-            execSync(`test -w "${modulePath}"`, {
-                uid,
-                gid,
-            });
-        }
-        catch {
-            await this.setNpmPermissions(modulePath);
-        }
-        try {
-            execSync(`test -w "${npmBinPath}"`, {
-                uid,
-                gid,
-            });
-        }
-        catch {
-            await this.setNpmPermissions(npmBinPath);
-        }
-    }
-    /**
-     * Set permissions on global npm path
-     */
-    async setNpmPermissions(targetPath) {
-        try {
-            execSync(`chown -R ${this.user}:admin "${targetPath}"`);
-        }
-        catch {
-            this.cli.logger(`ERROR: User "${this.user}" does not have write access to: ${targetPath}`, 'fail');
-            this.cli.logger('You can fix this issue by running the following commands:', 'fail');
-            console.log('');
-            console.log(`sudo chown -R ${this.user}:admin "${targetPath}"`);
-            console.log('');
-            this.cli.logger('Once you have done this run the cameraui install command again to complete your installation.', 'fail');
-            process.exit(1);
-        }
-    }
     /**
      * Create the system launch agent
      */
@@ -233,9 +189,13 @@ export class DarwinInstaller extends BasePlatform {
             '    <key>EnvironmentVariables</key>',
             '        <dict>',
             '            <key>PATH</key>',
-            `                <string>${process.env.PATH}</string>`,
+            `                <string>${this.cli.processPath}</string>`,
             '            <key>HOME</key>',
             `                <string>${this.cli.getUserHomeDir()}</string>`,
+            '            <key>CAMERA_UI_HOME_PATH</key>',
+            `                <string>${this.cli.homePath}</string>`,
+            '            <key>CAMERA_UI_STORAGE_PATH</key>',
+            `                <string>${this.cli.storagePath}</string>`,
             '        </dict>',
             '</dict>',
             '</plist>',

package/dist/installer/darwin.js.map

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

package/dist/{server/bin/installer → installer}/freebsd.js

@@ -1,3 +1,4 @@
+import { sleep } from '@camera.ui/common/utils';
 import { outputFile } from 'fs-extra/esm';
 import { execSync } from 'node:child_process';
 import { existsSync, unlinkSync } from 'node:fs';
@@ -56,7 +57,9 @@ export class FreeBSDInstaller extends BasePlatform {
      * Reinstalls the rc service
      */
     async reinstall() {
+        this.checkForRoot();
         await this.uninstall();
+        await sleep(2000);
         await this.install();
     }
     /**
@@ -222,7 +225,6 @@ export class FreeBSDInstaller extends BasePlatform {
             ': ${' + this.rcServiceName + '_priority:="debug"}',
             ': ${' + this.rcServiceName + '_home_path:="' + this.cli.homePath + '"}',
             ': ${' + this.rcServiceName + '_storage_path:="' + this.cli.storagePath + '"}',
-            ': ${' + this.rcServiceName + '_install_path:="' + this.cli.getInstallDir() + '"}',
             '',
             'export HOME="$(eval echo ~${' + this.rcServiceName + '_user})"',
             'export PATH=/usr/local/bin:${PATH}',
@@ -240,7 +242,6 @@ export class FreeBSDInstaller extends BasePlatform {
             '   sleep 10',
             '   chown -R ${' + this.rcServiceName + '_user}: ${' + this.rcServiceName + '_home_path}',
             '   chown -R ${' + this.rcServiceName + '_user}: ${' + this.rcServiceName + '_storage_path}',
-            '   chown -R ${' + this.rcServiceName + '_user}: ${' + this.rcServiceName + '_install_path}',
             '   install -o ${' + this.rcServiceName + '_user} /dev/null ${pidfile}',
             '   # Set sysctl values for better network performance',
             `   ${sysctlPath} net.inet.udp.recvspace=5242880`,

package/dist/installer/freebsd.js.map

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

package/dist/{server/bin/installer → installer}/linux.d.ts

@@ -94,7 +94,7 @@ export declare class LinuxInstaller extends BasePlatform {
      */
     private createRunPartsPath;
     /**
-     * Allows the camera.ui user to run sysctl and npm without a password
+     * Allows the camera.ui user to run sysctl commands without a password
      * This is required for the camera.ui user to be able to set the sysctl values
      */
     private setupSudo;

package/dist/{server/bin/installer → installer}/linux.js

@@ -1,4 +1,5 @@
-import { getNpmGlobalModulesDirectory, getNpmPath } from '@camera.ui/common/node';
+import { APP_CLI_NAME, sleep } from '@camera.ui/common';
+import { getNpmGlobalModulesDirectory } from '@camera.ui/common/node';
 import { mkdirp, pathExists } from 'fs-extra/esm';
 import { execSync } from 'node:child_process';
 import { existsSync, readFileSync, rmSync } from 'node:fs';
@@ -78,6 +79,7 @@ export class LinuxInstaller extends BasePlatform {
      */
     async reinstall() {
         await this.uninstall();
+        await sleep(2000);
         await this.install();
     }
     /**
@@ -130,20 +132,18 @@ export class LinuxInstaller extends BasePlatform {
      * Find failed npm install temporary directories and attempt to remove them
      */
     async beforeStart() {
-        const moduleName = 'camera.ui3'; // TODO
-        const tempModuleName = '.' + (moduleName.split('/').length > 1 ? moduleName.split('/')[1] : moduleName);
-        const backPath = moduleName
-            .split('/')
+        const tempModuleName = '.' + APP_CLI_NAME;
+        const backPath = APP_CLI_NAME.split('/')
             .map(() => '..')
             .join('/');
         const baseDir = resolve(__dirname, '..', '..', backPath);
-        if (['/usr/local/lib/node_modules', '/usr/lib/node_modules', getNpmGlobalModulesDirectory()].includes(dirname(baseDir))) {
+        if ([getNpmGlobalModulesDirectory()].includes(dirname(baseDir))) {
             // systemd has a 90-second default timeout in the pre-start jobs
             // terminate this task after 60 seconds to be safe
             setTimeout(() => {
                 process.exit(0);
             }, 60000);
-            const modulesPath = join(dirname(baseDir), moduleName.split('/')[0]);
+            const modulesPath = join(dirname(baseDir), APP_CLI_NAME.split('/')[0]);
             const temporaryDirectoriesToClean = (await readdir(modulesPath)).filter((x) => x.startsWith(tempModuleName));
             for (const directory of temporaryDirectoriesToClean) {
                 const pathToRemove = join(modulesPath, directory);
@@ -297,18 +297,12 @@ export class LinuxInstaller extends BasePlatform {
                 const storagePath = execSync(`cat "${this.systemdEnvPath}" | grep "CAMERA_UI_STORAGE_PATH" | awk -F'=' '{print $2}' | sed -e 's/^"//' -e 's/"$//'`)
                     .toString('utf8')
                     .trim();
-                const installPath = execSync(`cat "${this.systemdEnvPath}" | grep "CAMERA_UI_INSTALL_PATH" | awk -F'=' '{print $2}' | sed -e 's/^"//' -e 's/"$//'`)
-                    .toString('utf8')
-                    .trim();
                 if (existsSync(homePath)) {
                     execSync(`chown -R ${serviceUser}: "${homePath}"`);
                 }
                 if (existsSync(storagePath)) {
                     execSync(`chown -R ${serviceUser}: "${storagePath}"`);
                 }
-                if (existsSync(installPath)) {
-                    execSync(`chown -R ${serviceUser}: "${installPath}"`);
-                }
                 execSync(`chmod a+x ${this.cli.selfPath}`);
             }
             catch {
@@ -421,11 +415,6 @@ export class LinuxInstaller extends BasePlatform {
             '    ensure_permissions "$CAMERA_UI_STORAGE_PATH" "$USER" || exit 1',
             'fi',
             '',
-            '# Ensure the install path permissions are correct',
-            'if [ -n "$CAMERA_UI_INSTALL_PATH" ] && [ -n "$USER" ]; then',
-            '    ensure_permissions "$CAMERA_UI_INSTALL_PATH" "$USER" || exit 1',
-            'fi',
-            '',
             '# Set sysctl values for camera.ui',
             `${execSync('which sysctl').toString('utf8').trim()} -w net.core.rmem_default=5242880`,
             `${execSync('which sysctl').toString('utf8').trim()} -w net.core.rmem_max=5242880`,
@@ -436,16 +425,13 @@ export class LinuxInstaller extends BasePlatform {
         await chmod(permissionScriptPath, '755');
     }
     /**
-     * Allows the camera.ui user to run sysctl and npm without a password
+     * Allows the camera.ui user to run sysctl commands without a password
      * This is required for the camera.ui user to be able to set the sysctl values
      */
     setupSudo() {
         try {
-            const npmPath = new Set(getNpmPath());
-            npmPath.add('/usr/bin/npm');
-            npmPath.add('/usr/local/bin/npm');
             const sysctlPath = execSync('which sysctl').toString('utf8').trim();
-            const sudoersEntry = `${this.cli.asUser}    ALL=(ALL) NOPASSWD:SETENV: ${sysctlPath}, ${Array.from(npmPath).join(', ')}, ${this.cli.getInstallDir()}`;
+            const sudoersEntry = `${this.cli.asUser}    ALL=(ALL) NOPASSWD:SETENV: ${sysctlPath}}}`;
             // check if the sudoers file already contains the entry
             const sudoers = readFileSync('/etc/sudoers', 'utf-8');
             if (sudoers.includes(sudoersEntry)) {
@@ -466,7 +452,6 @@ export class LinuxInstaller extends BasePlatform {
             `CAMERA_UI_OPTS=-H "${this.cli.homePath}"`,
             `CAMERA_UI_HOME_PATH="${this.cli.homePath}"`,
             `CAMERA_UI_STORAGE_PATH="${this.cli.storagePath}"`,
-            `CAMERA_UI_INSTALL_PATH="${this.cli.getInstallDir()}"`,
             '',
             'DISABLE_OPENCOLLECTIVE=true',
             'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/homebridge/bin',

package/dist/installer/linux.js.map

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

package/dist/{server/bin/installer → installer}/win32.js

@@ -1,3 +1,4 @@
+import { sleep } from '@camera.ui/common/utils';
 import { pathExists, remove } from 'fs-extra/esm';
 import { execSync } from 'node:child_process';
 import { createWriteStream } from 'node:fs';
@@ -22,7 +23,6 @@ export class Win32Installer extends BasePlatform {
             const installCmd = `"${nssmPath}" install ${this.cli.serviceName} ` + `"${process.execPath}" "\""${this.cli.selfPath}"\"" run -H "\""${this.cli.homePath}"\""`;
             const setUserDirCmd = `"${nssmPath}" set ${this.cli.serviceName} AppEnvironmentExtra ` +
                 `":CAMERA_UI_HOME_PATH=${this.cli.homePath}` +
-                `:CAMERA_UI_INSTALL_PATH=${this.cli.getInstallDir()}` +
                 `:CAMERA_UI_STORAGE_PATH=${this.cli.storagePath}"`;
             execSync(installCmd);
             execSync(setUserDirCmd);
@@ -54,7 +54,9 @@ export class Win32Installer extends BasePlatform {
      * Reinstalls the systemd service
      */
     async reinstall() {
+        this.checkIsAdmin();
         await this.uninstall();
+        await sleep(2000);
         await this.install();
     }
     /**
@@ -90,7 +92,7 @@ export class Win32Installer extends BasePlatform {
     async restart() {
         this.checkIsAdmin();
         await this.stop();
-        await new Promise((resolve) => setTimeout(resolve, 2000));
+        await sleep(2000);
         await this.start(true);
     }
     /**

package/dist/installer/win32.js.map

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

package/dist/{server/bin/logger.js → logger.js}

@@ -1,9 +1,9 @@
+import { Logger } from '@camera.ui/common';
 import { pathExists } from 'fs-extra/esm';
 import { createWriteStream, ftruncate, read, WriteStream } from 'node:fs';
 import { open, stat } from 'node:fs/promises';
 import { promisify } from 'node:util';
 import ora from 'ora';
-import { LoggerService } from '../src/services/logger/index.js';
 const truncatePromise = promisify(ftruncate);
 const readPromise = promisify(read);
 export class CLILogger {
@@ -14,7 +14,7 @@ export class CLILogger {
     logStream = null;
     truncateInterval;
     truncateIntervalMs = 1000 * 60 * 60 * 2;
-    logger = new LoggerService({ prefix: 'camera.ui', suffix: 'CLI', debugEnabled: true, traceEnabled: true });
+    logger = new Logger({ prefix: 'camera.ui', suffix: 'CLI', debugEnabled: true, traceEnabled: true });
     constructor(logPath, action = '', stdout, debug) {
         this.logPath = logPath;
         this.action = action;

package/dist/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,eAAe,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAC7C,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC,MAAM,OAAO,SAAS;IAQV;IACA;IACA;IACA;IAVF,SAAS,GAA4C,IAAI,CAAC;IAC1D,gBAAgB,CAAkB;IAClC,kBAAkB,GAAW,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAEhD,MAAM,GAAW,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpH,YACU,OAAe,EACf,SAAS,EAAE,EACX,MAAe,EACf,KAAc;QAHd,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAK;QACX,WAAM,GAAN,MAAM,CAAS;QACf,UAAK,GAAL,KAAK,CAAS;IACrB,CAAC;IAEG,KAAK,CAAC,IAAI;QACf,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;gBACjE,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;gBAEjE,aAAa;gBACb,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1F,CAAC;YAED,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACvF,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,gCAAgC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAEM,GAAG,CAAC,GAAW,EAAE,QAAwD,MAAM;QACpF,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAEjD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;YACpD,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAErC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,SAAS,YAAY,WAAW,EAAE,CAAC;oBAC1C,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;oBACzE,MAAM,WAAW,EAAE,CAAC;gBACtB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,+BAA+B,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;YACnE,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,GAAG,IAAW;QAC1B,aAAa;QACb,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAEO,mBAAmB;QACzB,MAAM,eAAe,GAAG,CAAC,MAA6B,EAAgB,EAAE;YACtE,6DAA6D;YAC7D,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC;YAE9B,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAE,QAAoC,EAAE,QAAiE,EAAW,EAAE;gBAChJ,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7B,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC1D,CAAC,CAAC;YAEF,aAAa;YACb,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;YAExB,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;YAC1B,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,GAAS,EAAE;YACxB,YAAY,EAAE,CAAC;YACf,YAAY,EAAE,CAAC;QACjB,CAAC,CAAC;QAEF,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,GAAG,CAAC,sEAAsE,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;YACvG,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,QAAQ;QACjC,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,UAAU;QAEvC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE1C,IAAI,QAAQ,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,8BAA8B,OAAO,2BAA2B,EAAE,OAAO,CAAC,CAAC;gBACpF,OAAO;YACT,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,0BAA0B,YAAY,WAAW,EAAE,OAAO,CAAC,CAAC;YAErE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC;YACtD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC7C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAElD,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,gBAAgB,CAAC,CAAC;gBAC/E,MAAM,eAAe,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;gBACxC,MAAM,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;oBAAS,CAAC;gBACT,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,KAAqD;QAC3E,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,MAAM,CAAC;YACZ,KAAK,SAAS;gBACZ,OAAO,KAAK,CAAC;YACf,KAAK,MAAM;gBACT,OAAO,OAAO,CAAC;YACjB,KAAK,MAAM;gBACT,OAAO,MAAM,CAAC;YAChB,KAAK,OAAO,CAAC;YACb;gBACE,OAAO,KAAK,CAAC;QACjB,CAAC;IACH,CAAC;CACF"}

package/dist/manager.d.ts

@@ -0,0 +1,26 @@
+import type { CameraUiCLI } from './cameraui.js';
+export interface ServerManagerOptions {
+    onClose: (code: number | null, signal: NodeJS.Signals | null) => void;
+}
+export declare class ServerManager {
+    serverCrashed: boolean;
+    private readonly SERVER_DIR;
+    private readonly serverBinName;
+    private readonly cliDirectory;
+    private onClose;
+    private cli;
+    private forkedProcess?;
+    constructor(cli: CameraUiCLI, options: ServerManagerOptions);
+    get isRunning(): boolean;
+    private get serverPath();
+    private get serverModulesPath();
+    private get serverBinPath();
+    private get serverPackageJsonPath();
+    ensureInstalled(): Promise<void>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    private handleServerMessage;
+    private update;
+    private npmInstall;
+    private send;
+}

package/dist/manager.js

@@ -0,0 +1,203 @@
+import { APP_SERVER_NAME, getNpmPath, IS_DEV } from '@camera.ui/common';
+import { mkdirp } from 'fs-extra';
+import { fork, spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+export class ServerManager {
+    serverCrashed = false;
+    SERVER_DIR = 'server';
+    serverBinName = 'cameraui-server';
+    cliDirectory;
+    onClose;
+    cli;
+    forkedProcess;
+    constructor(cli, options) {
+        this.cli = cli;
+        this.cliDirectory = dirname(this.cli.selfPath);
+        this.onClose = options.onClose;
+    }
+    get isRunning() {
+        return !!this.forkedProcess && !this.forkedProcess.killed;
+    }
+    get serverPath() {
+        return join(this.cliDirectory, this.SERVER_DIR);
+    }
+    get serverModulesPath() {
+        if (IS_DEV) {
+            return join(this.cliDirectory, '..', '..', 'server');
+        }
+        return join(this.cliDirectory, 'node_modules');
+    }
+    get serverBinPath() {
+        if (IS_DEV) {
+            return join(this.serverModulesPath, 'bin', 'cameraui-server.ts');
+        }
+        return join(this.serverModulesPath, '.bin', this.serverBinName);
+    }
+    get serverPackageJsonPath() {
+        if (IS_DEV) {
+            return join(this.serverModulesPath, 'package.json');
+        }
+        return join(this.serverModulesPath, APP_SERVER_NAME, 'package.json');
+    }
+    async ensureInstalled() {
+        if (IS_DEV) {
+            if (!existsSync(this.serverBinPath)) {
+                throw new Error(`Server source not found at: ${this.serverBinPath}`);
+            }
+            return;
+        }
+        try {
+            await mkdirp(this.serverPath);
+            await this.cli.chownPath(this.serverPath);
+            const serverPath = join(this.serverModulesPath, APP_SERVER_NAME);
+            if (!existsSync(serverPath)) {
+                this.cli.logger('Installing camera.ui server...', 'info');
+                await this.npmInstall('latest');
+            }
+        }
+        catch (error) {
+            this.cli.logger(`Failed to manage server: ${error.message}`, 'fail');
+            throw error;
+        }
+    }
+    async start() {
+        if (this.isRunning) {
+            return;
+        }
+        if (!existsSync(this.serverBinPath)) {
+            throw new Error(`Server binary not found at: ${this.serverBinPath}`);
+        }
+        const env = {
+            FORCE_COLOR: '1',
+            ...process.env,
+        };
+        const childProcessOpts = {
+            env,
+            silent: true,
+            uid: this.cli.allowRunRoot && this.cli.uid ? this.cli.uid : undefined,
+            gid: this.cli.allowRunRoot && this.cli.gid ? this.cli.gid : undefined,
+        };
+        this.forkedProcess = fork(this.serverBinPath, [this.cli.homePath], childProcessOpts);
+        this.forkedProcess.stdout?.pipe(process.stdout);
+        this.forkedProcess.stderr?.pipe(process.stderr);
+        this.forkedProcess.on('message', this.handleServerMessage.bind(this));
+        this.forkedProcess.on('close', (code, signal) => this.onClose?.(code, signal));
+    }
+    async stop() {
+        if (!this.isRunning) {
+            return;
+        }
+        this.forkedProcess.stdout?.unpipe(process.stdout);
+        this.forkedProcess.stderr?.unpipe(process.stderr);
+        this.forkedProcess.stdout?.destroy();
+        this.forkedProcess.stderr?.destroy();
+        return new Promise((resolve) => {
+            this.forkedProcess.once('close', (code) => {
+                this.cli.logger(`Server process exited with code ${code}`, code === 0 ? 'info' : 'warn');
+                resolve();
+            });
+            this.forkedProcess.kill('SIGTERM');
+        });
+    }
+    async handleServerMessage(message) {
+        try {
+            switch (message.type) {
+                case 'UPDATE_SERVER': {
+                    if (IS_DEV) {
+                        this.cli.logger('Server updates are disabled in development mode', 'warn');
+                        this.send({
+                            type: 'UPDATE_FAILED',
+                            error: 'Updates are disabled in development mode',
+                        });
+                        return;
+                    }
+                    this.cli.logger('Received update request from server', 'info');
+                    const version = message.version ?? 'latest';
+                    await this.update(version);
+                    this.send({ type: 'RESTART_REQUIRED' });
+                    break;
+                }
+                case 'ERROR': {
+                    this.serverCrashed = true;
+                    break;
+                }
+            }
+        }
+        catch (error) {
+            this.send({ type: 'UPDATE_FAILED', error: error.message });
+        }
+    }
+    async update(version) {
+        if (IS_DEV) {
+            throw new Error('Updates are disabled in development mode');
+        }
+        this.cli.logger(`Updating server to version ${version}...`, 'info');
+        this.send({
+            type: 'UPDATE_STARTED',
+            version: version,
+        });
+        try {
+            await this.npmInstall(version);
+            this.send({
+                type: 'UPDATE_COMPLETE',
+                version: version,
+            });
+            this.cli.logger('Server update completed', 'succeed');
+        }
+        catch (error) {
+            this.send({
+                type: 'UPDATE_FAILED',
+                error: error.message,
+            });
+            this.cli.logger(`Server update failed: ${error.message}`, 'fail');
+            throw error;
+        }
+    }
+    async npmInstall(version) {
+        if (IS_DEV) {
+            throw new Error('npm install is disabled in development mode');
+        }
+        return new Promise((resolve, reject) => {
+            const npmPath = getNpmPath().join(' ');
+            const npm = spawn(npmPath, ['install', `${APP_SERVER_NAME}@${version}`, '--prefix', this.serverPath, '--omit=dev'], {
+                uid: this.cli.allowRunRoot && this.cli.uid ? this.cli.uid : undefined,
+                gid: this.cli.allowRunRoot && this.cli.gid ? this.cli.gid : undefined,
+                env: {
+                    ...process.env,
+                },
+                stdio: ['ignore', 'pipe', 'pipe'],
+            });
+            npm.stdout.on('data', (data) => {
+                this.send({
+                    type: 'UPDATE_OUTPUT',
+                    data: data.toString(),
+                });
+            });
+            npm.stderr.on('data', (data) => {
+                this.send({
+                    type: 'UPDATE_ERROR',
+                    data: data.toString(),
+                });
+            });
+            npm.on('close', async (code) => {
+                if (code === 0) {
+                    try {
+                        resolve();
+                    }
+                    catch (error) {
+                        reject(new Error(`Failed to set permissions after install: ${error.message}`));
+                    }
+                }
+                else {
+                    reject(new Error(`npm install failed with code ${code}`));
+                }
+            });
+            npm.on('error', reject);
+        });
+    }
+    send(message) {
+        this.forkedProcess?.send?.(message);
+    }
+}
+//# sourceMappingURL=manager.js.map