integration with updated homebridge version

Author: bwp91

CHANGELOG.md

@@ -14,6 +14,7 @@ All notable changes to `homebridge-config-ui-x` will be documented in this file.
 - change session timeout from seconds to days, hours, minutes
 - improve widget state around first data load
 - add self-signed certificate generation feature
+- integration with updated homebridge version
 
 ### Other Changes
 

package-lock.json

@@ -92,7 +92,7 @@
     "@nestjs/platform-socket.io": "11.1.8",
     "@nestjs/swagger": "11.2.1",
     "@nestjs/websockets": "11.1.8",
-    "axios": "1.12.2",
+    "axios": "1.13.1",
     "bash-color": "0.0.4",
     "bonjour-service": "1.3.0",
     "class-transformer": "0.5.1",
@@ -126,7 +126,7 @@
     "@prettier/plugin-xml": "^3.4.2",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.9.1",
+    "@types/node": "^24.9.2",
     "@types/node-forge": "^1.3.11",
     "@types/node-schedule": "^2.1.8",
     "@types/passport-jwt": "^4.0.1",
@@ -149,7 +149,7 @@
   },
   "overrides": {
     "@homebridge/hap-client": {
-      "axios": "1.12.2"
+      "axios": "1.13.1"
     }
   },
   "maintainers": [

package.json

@@ -6,6 +6,7 @@
 
 const process = require('node:process')
 const EventEmitter = require('node:events').EventEmitter
+const { readFileSync } = require('node:fs')
 const path = require('node:path')
 
 let pluginAlias
@@ -36,6 +37,26 @@ const HomebridgeApiMock = {
   serverVersion: '1.2.3',
   on: () => { /** mock */ },
   emit: () => { /** mock */ },
+  // Mock Matter API
+  isMatterAvailable() {
+    return true
+  },
+  isMatterEnabled() {
+    return true
+  },
+  matterDeviceTypes: new Proxy({}, {
+    get() {
+      return {} // Return empty object for any device type
+    },
+  }),
+  matterClusters: new Proxy({}, {
+    get() {
+      return {} // Return empty object for any cluster
+    },
+  }),
+  registerMatterAccessory: () => { /** mock */ },
+  unregisterMatterAccessory: () => { /** mock */ },
+  updateMatterAccessoryState: () => { /** mock */ },
   hap: {
     Characteristic: new class Characteristic extends EventEmitter {
       constructor() {
@@ -99,11 +120,41 @@ const HomebridgeApiMock = {
   },
 }
 
-function main() {
+async function main() {
   try {
     let pluginInitializer
     const pluginPath = process.env.UIX_EXTRACT_PLUGIN_PATH
-    const pluginModules = require(pluginPath)
+
+    // Read package.json to get the proper entry point
+    let actualEntryPoint = pluginPath
+    try {
+      const packageJsonPath = path.join(pluginPath, 'package.json')
+      const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
+
+      if (packageJson.main) {
+        actualEntryPoint = path.join(pluginPath, packageJson.main)
+      }
+    } catch (err) {
+      console.error('[extract-plugin-alias] Could not read package.json, using directory path')
+    }
+
+    let pluginModules
+
+    // Try to load as CommonJS first
+    try {
+      pluginModules = require(actualEntryPoint)
+    } catch (requireError) {
+      // If require fails, try dynamic import for ESM modules
+      try {
+        // For ESM, we need to use file:// URL on some platforms
+        const importPath = actualEntryPoint.startsWith('/') || actualEntryPoint.startsWith('file://')
+          ? actualEntryPoint
+          : path.resolve(actualEntryPoint)
+        pluginModules = await import(importPath)
+      } catch (importError) {
+        throw requireError // Throw the original error
+      }
+    }
 
     if (typeof pluginModules === 'function') {
       pluginInitializer = pluginModules

scripts/extract-plugin-alias.js

@@ -25,6 +25,9 @@ interface PluginChildBridge {
     DEBUG?: string
     NODE_OPTIONS?: string
   }
+  matter?: {
+    port?: number
+  }
 }
 
 export interface PlatformConfig {
@@ -52,6 +55,9 @@ export interface HomebridgeConfig {
     manufacturer?: string
     model?: string
     firmwareRevision?: string
+    matter?: {
+      port?: number
+    }
   }
   mdns?: {
     interface?: string | string[]
@@ -67,6 +73,13 @@ export interface HomebridgeConfig {
   disabledPlugins?: string[]
 }
 
+/**
+ * Matter configuration interface
+ */
+export interface MatterConfig {
+  port?: number
+}
+
 export interface HomebridgeUiConfig {
   name: string
   port: number
@@ -102,6 +115,7 @@ export interface HomebridgeUiConfig {
   }
   plugins?: {
     hideUpdatesFor?: string[]
+    hidePairingAlerts?: string[]
     alwaysShowBetas?: boolean
   }
   temp?: string

src/core/config/config.interfaces.ts

@@ -223,6 +223,7 @@ export class ConfigService {
         },
         plugins: {
           hideUpdatesFor: this.ui.plugins?.hideUpdatesFor || [],
+          hidePairingAlerts: this.ui.plugins?.hidePairingAlerts || [],
           alwaysShowBetas: Boolean(this.ui.plugins?.alwaysShowBetas),
         },
         linux: {

src/core/config/config.service.ts

@@ -27,6 +27,11 @@ export const FEATURE_FLAGS: FeatureFlagDefinition[] = [
   {
     key: 'childBridgeDebugMode',
     description: 'Enables debug mode configuration for child bridges',
-    range: '>=2.0.0-beta.0',
+    range: '>=2.0.0-alpha.0',
+  },
+  {
+    key: 'matterSupport',
+    description: 'Enables support for Matter bridges',
+    range: '>=2.0.0-alpha.0 <2.0.0-beta.0 || >=2.0.0-beta.31',
   },
 ]

src/core/feature-flags/feature-flags.registry.ts

@@ -3,12 +3,17 @@
  *
  * These types define the interfaces for child bridge communication
  * between the UI and homebridge core.
+ *
+ * Child bridges can have both HAP and optional Matter functionality.
  */
 
 export type BridgeStatus = 'pending' | 'ok' | 'down'
 
 /**
- * Child bridge metadata
+ * Child bridge metadata (unified HAP + optional Matter)
+ *
+ * This represents a child bridge that always runs HAP, and optionally
+ * can also expose devices via Matter when matterConfig is present.
  */
 export interface ChildBridgeMetadata {
   /** Operational status */
@@ -43,4 +48,27 @@ export interface ChildBridgeMetadata {
 
   /** Manually stopped flag */
   manuallyStopped: boolean
+
+  /** Matter configuration */
+  matterConfig?: {
+    port?: number
+  }
+
+  /** Matter identifier (filesystem storage key) */
+  matterIdentifier?: string
+
+  /** Matter setup URI (QR code payload) */
+  matterSetupUri?: string
+
+  /** Matter manual pairing code */
+  matterPin?: string
+
+  /** Matter serial number */
+  matterSerialNumber?: string
+
+  /** Whether Matter is commissioned */
+  matterCommissioned?: boolean
+
+  /** Number of Matter devices */
+  matterDeviceCount?: number
 }