[alpha]

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to `homebridge-config-ui-x` will be documented in this file. This project tries to adhere to [Semantic Versioning](http://semver.org/).
 
+## ALPHA
+
+### UI Changes
+
+- change menu to a sidebar
+- add theme and language to main settings page
+
+### Other Changes
+
+- retire old use of `pnpm` and code references
+- update `@homebridge/hap-client` to v2
+
+### Homebridge Dependencies
+
+- `@homebridge/hap-client` @ `v2.0.2`
+- `@homebridge/node-pty-prebuilt-multiarch` @ `v0.11.14`
+- `@homebridge/plugin-ui-utils` @ `v1.0.3`
+
 ## BETA
 
 ### UI Changes

package.json

@@ -82,7 +82,7 @@
     "@fastify/helmet": "11.1.1",
     "@fastify/multipart": "8.3.0",
     "@fastify/static": "7.0.4",
-    "@homebridge/hap-client": "1.10.2",
+    "@homebridge/hap-client": "2.0.2",
     "@homebridge/node-pty-prebuilt-multiarch": "0.11.14",
     "@nestjs/axios": "3.0.3",
     "@nestjs/common": "10.4.3",
@@ -147,11 +147,6 @@
     "unplugin-swc": "^1.5.1",
     "vitest": "^2.1.1"
   },
-  "overrides": {
-    "@homebridge/hap-client": {
-      "axios": "1.7.7"
-    }
-  },
   "maintainers": [
     {
       "email": "bwp91@icloud.com",

src/bin/hb-service.ts

@@ -1329,7 +1329,7 @@ export class HomebridgeServiceHelper {
   }
 
   /**
-   * Install / Remove a plugin using pnpm (supported platforms only)
+   * Install / Remove a plugin (supported platforms only)
    */
   private async npmPluginManagement(args: any[]) {
     if (!this.enableHbServicePluginManagement) {
@@ -1361,13 +1361,7 @@ export class HomebridgeServiceHelper {
       this.logger(`Path does not exist: "${cwd}"`, 'fail')
     }
 
-    let cmd: string
-
-    if (process.env.UIX_USE_PNPM === '1') {
-      cmd = `pnpm -C "${cwd}" ${action} ${target.name}`
-    } else {
-      cmd = `npm --prefix "${cwd}" ${action} ${target.name}`
-    }
+    let cmd: string = `npm --prefix "${cwd}" ${action} ${target.name}`
 
     if (action === 'add') {
       cmd += `@${target.version}`

src/bin/platforms/darwin.ts

@@ -112,50 +112,33 @@ export class DarwinInstaller extends BasePlatform {
 
       const targetNodeVersion = execSync('node -v').toString('utf8').trim()
 
-      if (this.isPackage() && process.env.UIX_USE_PNPM === '1' && process.env.UIX_CUSTOM_PLUGIN_PATH) {
-        // pnpm+package mode
-        const cwd = dirname(process.env.UIX_CUSTOM_PLUGIN_PATH)
-
-        if (!await pathExists(cwd)) {
-          this.hbService.logger(`Path does not exist: "${cwd}"`, 'fail')
-          process.exit(1)
-        }
-
-        execSync(`pnpm -C "${cwd}" rebuild`, {
-          cwd,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt plugins in ${process.env.UIX_CUSTOM_PLUGIN_PATH} for Node.js ${targetNodeVersion}.`, 'succeed')
-      } else {
-        // normal global npm setups
-        const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
-          env: Object.assign({
-            npm_config_loglevel: 'silent',
-            npm_update_notifier: 'false',
-          }, process.env),
-        }).toString('utf8')
-
-        execSync('npm rebuild --unsafe-perm', {
-          cwd: process.env.UIX_BASE_PATH,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
-
-        if (all === true) {
-          // rebuild all modules
-          try {
-            execSync('npm rebuild --unsafe-perm', {
-              cwd: npmGlobalPath,
-              stdio: 'inherit',
-            })
-            this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
-          } catch (e) {
-            this.hbService.logger('Could not rebuild all modules - check Homebridge logs.', 'warn')
-          }
+      const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
+        env: Object.assign({
+          npm_config_loglevel: 'silent',
+          npm_update_notifier: 'false',
+        }, process.env),
+      }).toString('utf8')
+
+      execSync('npm rebuild --unsafe-perm', {
+        cwd: process.env.UIX_BASE_PATH,
+        stdio: 'inherit',
+      })
+      this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
+
+      if (all === true) {
+        // rebuild all modules
+        try {
+          execSync('npm rebuild --unsafe-perm', {
+            cwd: npmGlobalPath,
+            stdio: 'inherit',
+          })
+          this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
+        } catch (e) {
+          this.hbService.logger('Could not rebuild all modules - check Homebridge logs.', 'warn')
         }
-
-        await this.setNpmPermissions(npmGlobalPath)
       }
+
+      await this.setNpmPermissions(npmGlobalPath)
     } catch (e) {
       console.error(e.toString())
       this.hbService.logger('ERROR: Failed Operation', 'fail')

src/bin/platforms/linux.ts

@@ -199,46 +199,29 @@ export class LinuxInstaller extends BasePlatform {
 
       const targetNodeVersion = execSync('node -v').toString('utf8').trim()
 
-      if (this.isPackage() && process.env.UIX_USE_PNPM === '1' && process.env.UIX_CUSTOM_PLUGIN_PATH) {
-        // pnpm+package mode
-        const cwd = dirname(process.env.UIX_CUSTOM_PLUGIN_PATH)
-
-        if (!await pathExists(cwd)) {
-          this.hbService.logger(`Path does not exist: "${cwd}"`, 'fail')
-          process.exit(1)
-        }
+      const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
+        env: Object.assign({
+          npm_config_loglevel: 'silent',
+          npm_update_notifier: 'false',
+        }, process.env),
+      }).toString('utf8')
+
+      execSync('npm rebuild --unsafe-perm', {
+        cwd: process.env.UIX_BASE_PATH,
+        stdio: 'inherit',
+      })
+      this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
 
-        execSync(`pnpm -C "${cwd}" rebuild`, {
-          cwd,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt plugins in ${process.env.UIX_CUSTOM_PLUGIN_PATH} for Node.js ${targetNodeVersion}.`, 'succeed')
-      } else {
-        // normal global npm setups
-        const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
-          env: Object.assign({
-            npm_config_loglevel: 'silent',
-            npm_update_notifier: 'false',
-          }, process.env),
-        }).toString('utf8')
-
-        execSync('npm rebuild --unsafe-perm', {
-          cwd: process.env.UIX_BASE_PATH,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
-
-        if (all === true) {
-          // rebuild all global node_modules
-          try {
-            execSync('npm rebuild --unsafe-perm', {
-              cwd: npmGlobalPath,
-              stdio: 'inherit',
-            })
-            this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
-          } catch (e) {
-            this.hbService.logger('Could not rebuild all plugins - check logs.', 'warn')
-          }
+      if (all === true) {
+        // rebuild all global node_modules
+        try {
+          execSync('npm rebuild --unsafe-perm', {
+            cwd: npmGlobalPath,
+            stdio: 'inherit',
+          })
+          this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
+        } catch (e) {
+          this.hbService.logger('Could not rebuild all plugins - check logs.', 'warn')
         }
       }
     } catch (e) {

src/core/config/config.service.ts

@@ -48,7 +48,6 @@ export class ConfigService {
   public enableTerminalAccess = this.runningInDocker || this.runningInSynologyPackage || this.runningInPackageMode || Boolean(process.env.HOMEBRIDGE_CONFIG_UI_TERMINAL === '1')
 
   // plugin management
-  public usePnpm = (process.env.UIX_USE_PNPM === '1')
   public usePluginBundles = (process.env.UIX_USE_PLUGIN_BUNDLES === '1')
 
   // recommend child bridges on platforms with > 2GB ram

src/modules/plugins/plugins.service.ts

@@ -451,11 +451,7 @@ export class PluginsService {
     const installOptions: Array<string> = []
 
     // check to see if custom plugin path is using a package.json file
-    if (
-      installPath === this.configService.customPluginPath
-      && !(action === 'uninstall' && this.configService.usePnpm)
-      && await pathExists(resolve(installPath, '../package.json'))
-    ) {
+    if (installPath === this.configService.customPluginPath && await pathExists(resolve(installPath, '../package.json'))) {
       installOptions.push('--save')
     }
 
@@ -1176,8 +1172,8 @@ export class PluginsService {
         this.logger.error('ERROR: You might be able to fix this problem by running: npm install -g npm')
       }
     }
-    // Linux and macOS don't require the full path to npm / pnpm
-    return this.configService.usePnpm ? ['pnpm'] : ['npm']
+    // Linux and macOS don't require the full path to npm
+    return ['npm']
   }
 
   /**
@@ -1401,14 +1397,9 @@ export class PluginsService {
       npm_config_update_notifier: 'false',
       npm_config_prefer_online: 'true',
       npm_config_foreground_scripts: 'true',
+      npm_config_loglevel: 'error',
     })
 
-    if (!this.configService.usePnpm) {
-      Object.assign(env, {
-        npm_config_loglevel: 'error',
-      })
-    }
-
     // set global prefix for unix based systems
     if (command.includes('-g') && basename(cwd) === 'lib') {
       cwd = dirname(cwd)

src/self-check.ts

@@ -13,17 +13,10 @@ function tryRebuildNodePtyModule() {
   logger.warn('[node-pty] Trying to rebuild automatically...')
   logger.warn(`[node-pty] Path: ${modulePath}`)
   try {
-    if (process.env.UIX_USE_PNPM === '1' && process.env.UIX_CUSTOM_PLUGIN_PATH) {
-      execSync('pnpm rebuild @homebridge/node-pty-prebuilt-multiarch', {
-        cwd: process.env.UIX_CUSTOM_PLUGIN_PATH,
-        stdio: 'ignore',
-      })
-    } else {
-      execSync('npm run install --unsafe-perm', {
-        cwd: modulePath,
-        stdio: 'ignore',
-      })
-    }
+    execSync('npm run install --unsafe-perm', {
+      cwd: modulePath,
+      stdio: 'ignore',
+    })
   } catch (e) {
     if (platform() !== 'win32') {
       execSync('sudo -E -n run install --unsafe-perm', {

test/e2e/status.e2e-spec.ts

@@ -197,21 +197,17 @@ describe('StatusController (e2e)', () => {
   it('GET /status/nodejs', async () => {
     const data = [
       {
-        version: 'v21.6.1',
+        version: 'v22.2.0',
         lts: false,
       },
       {
-        version: 'v20.12.2',
+        version: 'v20.13.1',
         lts: 'Iron',
       },
       {
-        version: 'v18.19.0',
+        version: 'v18.20.3',
         lts: 'Hydrogen',
       },
-      {
-        version: 'v16.20.2',
-        lts: 'Gallium',
-      },
     ]
 
     const response: AxiosResponse<any> = {
@@ -234,7 +230,7 @@ describe('StatusController (e2e)', () => {
 
     expect(res.statusCode).toBe(200)
     expect(res.json().currentVersion).toEqual(process.version)
-    // expect(res.json().latestVersion).toBe('v20.14.0' || 'v22.3.0');
+    // expect(res.json().latestVersion).toBe('v20.13.1');
   })
 
   afterAll(async () => {