Merge branch 'latest' into beta-4.50.7

.github/workflows/beta-release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build_and_test:
-    uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main
+    uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest
     with:
       enable_coverage: true
       install_cmd: npm ci && cd ui && npm ci
@@ -16,7 +16,7 @@ jobs:
 
   lint:
     needs: build_and_test
-    uses: homebridge/.github/.github/workflows/eslint.yml@main
+    uses: homebridge/.github/.github/workflows/eslint.yml@latest
     with:
       install_cmd: npm ci && cd ui && npm ci
 
@@ -25,7 +25,7 @@ jobs:
 
     if: ${{ github.repository == 'homebridge/homebridge-config-ui-x' }}
 
-    uses: homebridge/.github/.github/workflows/npm-publish.yml@main
+    uses: homebridge/.github/.github/workflows/npm-publish.yml@latest
     with:
       tag: 'test'
       dynamically_adjust_version: true

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-2019]
 
-    uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main
+    uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest
     with:
       enable_coverage: false
       ## Code Coverage can only be used in a single run, not in a parallel run - Error: Bad response: 422 {"message":"Can't add a job to a build that is already closed. Build 6224987022 is closed. See docs.coveralls.io/parallel-builds","error":true}
@@ -86,6 +86,6 @@ jobs:
 
   lint:
     needs: build_and_test
-    uses: homebridge/.github/.github/workflows/eslint.yml@main
+    uses: homebridge/.github/.github/workflows/eslint.yml@latest
     with:
       install_cmd: npm ci && cd ui && npm ci

.github/workflows/codeql-analysis.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   analyze:
-    uses: homebridge/.github/.github/workflows/codeql-analysis.yml@main
+    uses: homebridge/.github/.github/workflows/codeql-analysis.yml@latest

.github/workflows/pr-labeler.yml

@@ -7,6 +7,6 @@ on:
 
 jobs:
   stale:
-    uses: homebridge/.github/.github/workflows/pr-labeler.yml@main
+    uses: homebridge/.github/.github/workflows/pr-labeler.yml@latest
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-drafter.yml

@@ -9,6 +9,6 @@ on:
 
 jobs:
   stale:
-    uses: homebridge/.github/.github/workflows/release-drafter.yml@main
+    uses: homebridge/.github/.github/workflows/release-drafter.yml@latest
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build_and_test:
-    uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main
+    uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest
     with:
       enable_coverage: true
       install_cmd: npm ci && cd ui && npm ci
@@ -22,7 +22,7 @@ jobs:
 
     if: ${{ github.repository == 'homebridge/homebridge-config-ui-x' }}
 
-    uses: homebridge/.github/.github/workflows/npm-publish.yml@main
+    uses: homebridge/.github/.github/workflows/npm-publish.yml@latest
     with:
       install_cmd: npm ci && cd ui && npm ci
     secrets:

.github/workflows/stale.yml

@@ -7,6 +7,6 @@ on:
 
 jobs:
   stale:
-    uses: homebridge/.github/.github/workflows/stale.yml@main
+    uses: homebridge/.github/.github/workflows/stale.yml@latest
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -56,6 +56,7 @@
     "@fastify/multipart": "8.0.0",
     "@fastify/static": "6.11.2",
     "@fastify/swagger": "8.10.1",
+    "@homebridge/node-pty-prebuilt-multiarch": "0.10.1-pre.6",
     "@nestjs/axios": "3.0.0",
     "@nestjs/common": "10.2.6",
     "@nestjs/core": "10.2.6",
@@ -74,7 +75,6 @@
     "fastify": "4.23.2",
     "fs-extra": "10.1.0",
     "node-cache": "5.1.2",
-    "node-pty-prebuilt-multiarch": "0.10.1-pre.5",
     "node-schedule": "2.1.1",
     "ora": "5.4.1",
     "p-limit": "3.1.0",

src/core/node-pty/node-pty.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import * as pty from 'node-pty-prebuilt-multiarch';
+import * as pty from '@homebridge/node-pty-prebuilt-multiarch';
 
 @Injectable()
 export class NodePtyService {

src/self-check.ts

@@ -19,7 +19,7 @@ const logger = new Logger();
 function main() {
   // check if node-pty is built correctly
   try {
-    require('node-pty-prebuilt-multiarch');
+    require('@homebridge/node-pty-prebuilt-multiarch');
   } catch (e) {
     logger.error(e);
     logger.error(`[node-pty] Node.js ${process.version}`);
@@ -68,13 +68,13 @@ function main() {
 
 function tryRebuildNodePtyModule() {
   // using eval('require') here so it does not break with webpack
-  const modulePath = path.dirname(path.dirname(eval('require').resolve('node-pty-prebuilt-multiarch')));
+  const modulePath = path.dirname(path.dirname(eval('require').resolve('@homebridge/node-pty-prebuilt-multiarch')));
 
   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) {
-      child_process.execSync('pnpm rebuild node-pty-prebuilt-multiarch', {
+      child_process.execSync('pnpm rebuild @homebridge/node-pty-prebuilt-multiarch', {
         cwd: process.env.UIX_CUSTOM_PLUGIN_PATH,
         stdio: 'ignore',
       });

test/e2e/platform-tools-terminal.e2e-spec.ts

@@ -3,7 +3,7 @@ import * as fs from 'fs-extra';
 import { EventEmitter } from 'events';
 import { Test, TestingModule } from '@nestjs/testing';
 import { FastifyAdapter, NestFastifyApplication } from '@nestjs/platform-fastify';
-import type { IPty } from 'node-pty-prebuilt-multiarch';
+import type { IPty } from '@homebridge/node-pty-prebuilt-multiarch';
 
 import { ConfigService } from '../../src/core/config/config.service';
 import { TerminalModule } from '../../src/modules/platform-tools/terminal/terminal.module';

upgrade-install.sh

@@ -74,7 +74,7 @@ echo ""
 
 echo "Running post-install scripts..."
 cd "$TARGET_PATH/lib/node_modules/homebridge-config-ui-x"
-npm rebuild --foreground-scripts --unsafe-perm node-pty-prebuilt-multiarch
+npm rebuild --foreground-scripts --unsafe-perm @homebridge/node-pty-prebuilt-multiarch
 if [ "$?" != "0" ]; then
   echo "Failed to rebuild."
   mv "$TARGET_PATH/lib/node_modules/.homebridge-config-ui-x.bak" "$TARGET_PATH/lib/node_modules/homebridge-config-ui-x"