From f36d6c9e18aff384cfc3a87b4a612c8da25ab490 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Fri, 24 Nov 2023 19:25:57 +0100
Subject: [PATCH] Added bluetooth to the controller

---
 src-admin/src/Tabs/Controller.js | 14 ++++++++++++++
 src/matter/ControllerNode.ts     | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src-admin/src/Tabs/Controller.js b/src-admin/src/Tabs/Controller.js
index 0d9f7627..c1f6ee52 100644
--- a/src-admin/src/Tabs/Controller.js
+++ b/src-admin/src/Tabs/Controller.js
@@ -493,6 +493,20 @@ class Controller extends React.Component {
                     label={I18n.t('Bluetooth')}
                 />
             </div> : null}
+            {this.props.matter.controller.enabled && this.props.matter.controller.ble ? <div>
+                <TextField
+                    fullWidth
+                    style={{ maxWidth: 600 }}
+                    type="number"
+                    label={I18n.t('Bluetooth HCI ID')}
+                    value={this.props.matter.controller.hciId || ''}
+                    onChange={e => {
+                        const matter = JSON.parse(JSON.stringify(this.props.matter));
+                        matter.controller.hciId = e.target.value;
+                        this.props.updateConfig(matter);
+                    }}
+                />
+            </div> : null}
             {this.props.matter.controller.enabled && this.props.matter.controller.ble ? <div>
                 <TextField
                     fullWidth
diff --git a/src/matter/ControllerNode.ts b/src/matter/ControllerNode.ts
index 46568d82..723b1181 100644
--- a/src/matter/ControllerNode.ts
+++ b/src/matter/ControllerNode.ts
@@ -9,7 +9,7 @@ import {
     Endpoint, CommissioningControllerNodeOptions,
     PairedNode,
 } from '@project-chip/matter-node.js/device';
-import { toHexString } from '@project-chip/matter-node.js/util';
+import { toHexString, singleton } from '@project-chip/matter-node.js/util';
 import {
     asClusterServerInternal,
     ClusterServerObj,
@@ -28,6 +28,9 @@ import {
     GeneralCommissioning,
 } from '@project-chip/matter-node.js/cluster';
 
+import { BleNode } from '@project-chip/matter-node-ble.js/ble';
+import { Ble } from '@project-chip/matter-node.js/ble';
+
 import { MatterAdapter } from '../main';
 import Factories from './clusters/factories';
 import Base from './clusters/Base';
@@ -45,6 +48,7 @@ export interface ControllerOptions {
     wifiPasword?: string;
     threadNetworkname?: string;
     threadOperationalDataSet?: string;
+    hciId?: number;
 }
 
 interface AddDeviceResult {
@@ -87,6 +91,7 @@ interface Device {
     connectionStatusId?: string;
 }
 
+
 class Controller {
     private matterServer: MatterServer | undefined;
     private parameters: ControllerOptions;
@@ -121,6 +126,10 @@ class Controller {
         });
 
         this.matterServer?.addCommissioningController(this.commissioningController, { uniqueStorageKey: this.parameters.uuid });
+
+        if (this.parameters.ble) {
+            Ble.get = singleton(() => new BleNode({ hciId: this.parameters.hciId }));
+        }
     }
 
     initEventHandlers(originalNodeId: NodeId | null, options?: any): any {