Merge branch 'beta-4.50.6' into master

.github/workflows/attach-artifact.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       # Sanity check to ensure that release tags don't start with a 'v' version prefix but adhere to the X.Y.Z format
       - name: Check for Tag name Format

.github/workflows/build.yml

@@ -15,7 +15,9 @@ jobs:
 
     uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main
     with:
-      enable_coverage: true
+      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}
+      ## Coveralls only expects to create a report once per build
       runs_on: ${{ matrix.os }}
       install_cmd: npm ci && cd ui && npm ci
     secrets:
@@ -27,18 +29,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node-version: [16.x, 17.x, 18.x]
+        node-version: [18.x]
         include:
-          - os: macos-latest
-            node-version: 16.x
           - os: macos-latest
             node-version: 18.x
-          - os: windows-2019
-            node-version: 16.x
           - os: windows-2019
             node-version: 18.x
-          - os: windows-latest
-            node-version: 16.x
           - os: windows-latest
             node-version: 18.x
 

.github/workflows/test.yml

@@ -7,25 +7,19 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [16.x, 17.x, 18.x]
+        node-version: [18.x]
         include:
-          - os: macos-latest
-            node-version: 16.x
           - os: macos-latest
             node-version: 18.x
-          - os: windows-2019
-            node-version: 16.x
           - os: windows-2019
             node-version: 18.x
-          - os: windows-latest
-            node-version: 16.x
           - os: windows-latest
             node-version: 18.x
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}

package.json

@@ -32,6 +32,7 @@
     "homebridge": ">=1.6.0"
   },
   "scripts": {
+    "check": "npm install && npm outdated",
     "watch": "concurrently \"npm run watch:ui\" \"npm run watch:server\"",
     "watch:server": "nodemon",
     "watch:ui": "npm run start --prefix ui",

src/bin/platforms/win32.ts

@@ -146,7 +146,7 @@ export class Win32Installer extends BasePlatform {
    * This is used to create the Windows Services
    */
   private async downloadNssm(): Promise<string> {
-    const downloadUrl = `https://github.com/homebridge/nssm/releases/download/2.24-101-g897c7ad/nssm_${os.arch()}.exe`;
+    const downloadUrl = `https://github.com/oznu/nssm/releases/download/2.24-101-g897c7ad/nssm_${os.arch()}.exe`;
     const nssmPath = path.resolve(this.hbService.storagePath, 'nssm.exe');
 
     if (await fs.pathExists(nssmPath)) {

ui/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {
+    "check": "npm install && npm outdated",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --configuration production --output-path=../public --source-map=false --aot=true",
@@ -20,7 +21,7 @@
     "@angular/platform-browser-dynamic": "^14.1.1",
     "@angular/router": "^14.1.1",
     "@auth0/angular-jwt": "^5.0.2",
-    "@homebridge/plugin-ui-utils": "0.1.0",
+    "@homebridge/plugin-ui-utils": "0.0.19",
     "@ng-bootstrap/ng-bootstrap": "^11.0.1",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",

ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts

@@ -131,14 +131,14 @@ export class CustomPluginsComponent implements OnInit, OnDestroy {
         case 'loaded':
           this.injectDefaultStyles(e);
           this.confirmReady(e);
-          this.uiLoaded = true;
           break;
         case 'request': {
           this.handleRequest(e);
           break;
         }
         case 'scrollHeight':
           this.setiFrameHeight(e);
+          this.uiLoaded = true;
           break;
         case 'config.get': {
           this.requestResponse(e, this.getConfigBlocks());

ui/src/i18n/en.json

@@ -113,7 +113,7 @@
     "form.button_delete": "Delete",
     "form.button_edit": "Edit",
     "form.button_save": "Save",
-    "login.button_login": "Login",
+    "login.button_login": "Log in",
     "login.label_2fa_code": "Two Factor Authentication Code",
     "login.label_password": "Password",
     "login.label_username": "Username",
@@ -138,7 +138,7 @@
     "menu.linux.label_restart_server": "Restart Server",
     "menu.linux.label_shutdown_server": "Shutdown Server",
     "menu.linux.label_terminal": "Terminal",
-    "menu.tooltip_logout": "Logout",
+    "menu.tooltip_logout": "Log out",
     "menu.tooltip_restart": "Restart",
     "menu.tooltip_user_accounts": "User Accounts",
     "menu.tooltip_view_logs": "View Logs",