Merge branch 'beta-4.52.3' into patch-2

package.json

@@ -103,8 +103,8 @@
     "@types/tar": "^6.1.9",
     "@types/tcp-port-used": "^1.0.4",
     "@types/unzipper": "^0.10.9",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
+    "@typescript-eslint/eslint-plugin": "^6.11.0",
+    "@typescript-eslint/parser": "^6.11.0",
     "babel-jest": "^29.7.0",
     "bash-color": "^0.0.4",
     "buffer-shims": "^1.0.0",

src/core/auth/auth.service.ts

@@ -310,7 +310,7 @@ export class AuthService {
    */
   private async saveUserFile(users: UserDto[]) {
     // update the auth.json
-    return fs.writeJson(this.configService.authPath, users, { spaces: 4 });
+    return fs.writeJsonSync(this.configService.authPath, users, { spaces: 4 });
   }
 
   /**

src/modules/backup/backup.service.ts

@@ -175,7 +175,7 @@ export class BackupService {
       }
     } else {
       // when not using a custom backup path, just ensure it exists
-      return fs.ensureDir(this.configService.instanceBackupPath);
+      return fs.ensureDirSync(this.configService.instanceBackupPath);
     }
   }
 
@@ -337,7 +337,7 @@ export class BackupService {
    */
   async removeRestoreDirectory() {
     if (this.restoreDirectory) {
-      return fs.remove(this.restoreDirectory);
+      return fs.removeSync(this.restoreDirectory);
     }
   }
 

src/modules/config-editor/config-editor.service.ts

@@ -333,7 +333,7 @@ export class ConfigEditorService {
     }
 
     // read source backup
-    return fs.readFile(requestedBackupPath);
+    return fs.readFileSync(requestedBackupPath);
   }
 
   /**

src/modules/custom-plugins/plugins-settings-ui/plugins-settings-ui.service.ts

@@ -117,7 +117,7 @@ export class PluginsSettingsUiService {
       // dev server is only enabled for private plugins
       return (await this.httpService.get(pluginUi.devServer, { responseType: 'text' }).toPromise()).data;
     } else {
-      return fs.readFile(path.join(pluginUi.publicPath, 'index.html'), 'utf8');
+      return fs.readFileSync(path.join(pluginUi.publicPath, 'index.html'), 'utf8');
     }
   }
 

src/modules/plugins/plugins.service.ts

@@ -724,7 +724,7 @@ export class PluginsService {
     const schemaPath = path.resolve(plugin.installPath, pluginName, 'config.schema.json');
 
     if (this.miscSchemas[pluginName] && !await fs.pathExists(schemaPath)) {
-      return fs.readJson(this.miscSchemas[pluginName]);
+      return fs.readJsonSync(this.miscSchemas[pluginName]);
     }
 
     let configSchema = await fs.readJson(schemaPath);

ui/package.json

@@ -7,7 +7,7 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --configuration production --output-path=../public --source-map=false --aot=true",
-    "lint": "ng lint --fix"
+    "lint": "ng lint"
   },
   "private": true,
   "dependencies": {

ui/src/app/modules/plugins/plugin-card/plugin-card.component.html

@@ -51,36 +51,41 @@ <h4 class="card-title mb-0">
     </a>
 
     <div class="ml-auto">
+      <a href="javascript:void(0)" class="card-link ml-3"
+         *ngIf="plugin.updateAvailable || plugin.betaUpdateAvailable" (click)="$plugin.updatePlugin(plugin, plugin.betaUpdateAvailable ? 'beta' : 'latest')"
+         placement="top" ngbTooltip="{{'plugins.status_update_available' | translate:plugin }}" container="body" [openDelay]="150">
+        <i class="fas fa-fw fa-arrow-alt-circle-up primary-text"></i>
+      </a>
+      <a href="javascript:void(0);" class="card-link ml-3" *ngIf="!hasChildBridges && recommendChildBridge"
+         ngbTooltip="{{'child_bridge.label_bridge_setup_child_bridges' | translate}}" placement="top" container="body"
+         [openDelay]="150" (click)="$plugin.bridgeSettings(plugin)">
+        <i class="fa-fw icon-button fas fa-fw fa-circle-exclamation primary-text"></i>
+      </a>
       <ng-container *ngIf="hasChildBridges">
         <a href="javascript:void(0);" class="card-link grey-text ml-3" rel="noopener noreferrer"
           aria-label="Connect to HomeKit"
           *ngIf="!childBridgeRestartInProgress && hasUnpairedChildBridges && childBridgeStatus === 'ok'"
           ngbTooltip="{{'child_bridge.label_bridge_connect_to_homekit' | translate}}" placement="top" container="body"
           openDelay="150" (click)="$plugin.bridgeSettings(plugin)">
-          <i class="fa-fw icon-button fas fa-fw fa-qrcode"></i>
+          <i class="fa-fw icon-button fas fa-fw fa-circle-exclamation primary-text"></i>
         </a>
 
         <i class="fas fa-fw fa-circle ml-3" [ngClass]="{
           'green-text': childBridgeStatus === 'ok',
           'text-warning': childBridgeStatus === 'pending',
           'red-text': childBridgeStatus === 'down'
         }"></i>
-
-        <a href="javascript:void(0);" class="card-link grey-text ml-3" aria-label="Restart Child Bridge(s)"
-          *ngIf="!childBridgeRestartInProgress && !plugin.disabled"
-          ngbTooltip="{{'child_bridge.label_bridge_restart_child_bridges' | translate}}" placement="top"
-          container="body" openDelay="150" (click)="doChildBridgeAction('restart')">
-          <i class="fa-fw icon-button fas fa-fw fa-power-off"></i>
-        </a>
-        <i *ngIf="childBridgeRestartInProgress" class="ml-3 grey-text fas fa-fw fa-fw fa-spinner fa-pulse"></i>
       </ng-container>
 
       <span ngbDropdown placement="bottom-right top-right" class="d-inline-block ml-3">
         <a class="card-link" href="javascript:void(0)" aria-label="Plugin actions drop down menu" ngbDropdownToggle>
-            <i class="fas fa-fw fa-ellipsis-v" [ngClass]="{'grey-text': !plugin.updateAvailable && !plugin.betaUpdateAvailable, 'primary-text': plugin.updateAvailable || plugin.betaUpdateAvailable }"></i>
+          <i class="fas fa-fw fa-ellipsis-v"></i>
         </a>
         <div ngbDropdownMenu aria-labelledby="Plugin actions drop down menu">
           <ng-container *ngIf="hasChildBridges && !plugin.disabled">
+            <button ngbDropdownItem *ngIf="!childBridgeRestartInProgress && !plugin.disabled" (click)="doChildBridgeAction('restart')">
+              <i class="fa-fw icon-button fas fa-fw fa-power-off"></i> {{ 'child_bridge.label_bridge_restart_child_bridges' | translate }}
+            </button>
             <button ngbDropdownItem *ngIf="!allChildBridgesStopped" (click)="doChildBridgeAction('stop')">
               <i class="fas fa-fw fa-stop"></i> {{ 'child_bridge.label_child_stop' | translate }}
             </button>
@@ -89,11 +94,6 @@ <h4 class="card-title mb-0">
             </button>
             <div class="dropdown-divider"></div>
           </ng-container>
-          <button ngbDropdownItem *ngIf="plugin.updateAvailable || plugin.betaUpdateAvailable"
-            (click)="$plugin.updatePlugin(plugin, plugin.betaUpdateAvailable ? 'beta' : 'latest')">
-            <i class="fas fa-fw fa-arrow-alt-circle-up primary-text"></i>
-            {{ 'plugins.button_update' | translate }} (v{{ plugin.latestVersion }})
-          </button>
           <button ngbDropdownItem *ngIf="plugin.publicPackage" (click)="$plugin.installPreviousVersion(plugin)">
             <i class="fas fa-fw fa-fw fa-history"></i>
             {{ 'plugins.manage.message_install_alternate_version' | translate }}

ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts

@@ -9,6 +9,7 @@ import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.s
 import { PluginLogModalComponent } from '@/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component';
 import { MobileDetectService } from '@/app/core/mobile-detect.service';
 import { NotificationService } from '@/app/core/notification.service';
+import { SettingsService } from '@/app/core/settings.service';
 import { WsService } from '@/app/core/ws.service';
 import { DonateModalComponent } from '@/app/modules/plugins/donate-modal/donate-modal.component';
 
@@ -30,6 +31,7 @@ export class PluginCardComponent implements OnInit {
   public allChildBridgesStopped = false;
   public childBridgeStatus = 'pending';
   public childBridgeRestartInProgress = false;
+  public recommendChildBridge = false;
 
   constructor(
     public $plugin: ManagePluginsService,
@@ -40,9 +42,26 @@ export class PluginCardComponent implements OnInit {
     private $modal: NgbModal,
     private $toastr: ToastrService,
     private $md: MobileDetectService,
-  ) { }
-
-  ngOnInit(): void {}
+    private $settings: SettingsService,
+  ) {}
+
+  ngOnInit(): void {
+    if (
+      !this.$settings.env.recommendChildBridges
+      || !this.$settings.env.serviceMode
+      || ['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name)
+    ) {
+      this.recommendChildBridge = false;
+      return;
+    }
+    this.$api.get(`/plugins/config-schema/${encodeURIComponent(this.plugin.name)}`, {}).toPromise()
+      .then((schema) => {
+        this.recommendChildBridge = schema.pluginType === 'platform';
+      })
+      .catch(() => {
+        this.recommendChildBridge = false;
+      });
+  }
 
   @Input() set childBridges(childBridges: any[]) {
     this.hasChildBridges = childBridges.length > 0;