Release 1.1.11

Luligu · Mar 20, 2024 · bf82df2 · bf82df2
1 parent b8d7840
commit bf82df2
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 13 deletions.
diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.70102d98.css",
-    "main.js": "/static/js/main.f3664a62.js",
+    "main.js": "/static/js/main.5d39b100.js",
     "static/js/453.d855a71b.chunk.js": "/static/js/453.d855a71b.chunk.js",
     "index.html": "/index.html",
     "main.70102d98.css.map": "/static/css/main.70102d98.css.map",
-    "main.f3664a62.js.map": "/static/js/main.f3664a62.js.map",
+    "main.5d39b100.js.map": "/static/js/main.5d39b100.js.map",
     "453.d855a71b.chunk.js.map": "/static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.70102d98.css",
-    "static/js/main.f3664a62.js"
+    "static/js/main.5d39b100.js"
   ]
 }
diff --git a/frontend/build/index.html b/frontend/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.f3664a62.js"></script><link href="/static/css/main.70102d98.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.5d39b100.js"></script><link href="/static/css/main.70102d98.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/frontend/build/static/js/main.5d39b100.js b/frontend/build/static/js/main.5d39b100.js
diff --git a/...ld/static/js/main.f3664a62.js.LICENSE.txt → ...ld/static/js/main.5d39b100.js.LICENSE.txt b/...ld/static/js/main.f3664a62.js.LICENSE.txt → ...ld/static/js/main.5d39b100.js.LICENSE.txt
diff --git a/frontend/build/static/js/main.5d39b100.js.map b/frontend/build/static/js/main.5d39b100.js.map
diff --git a/frontend/build/static/js/main.f3664a62.js b/frontend/build/static/js/main.f3664a62.js
diff --git a/frontend/build/static/js/main.f3664a62.js.map b/frontend/build/static/js/main.f3664a62.js.map
diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js
@@ -88,7 +88,6 @@ function Header() {
         <Link to="/settings" className="nav-link">Settings</Link>
       </nav>
       <div className="header" style={{ flex: 1, display: 'flex', flexDirection: 'row', justifyContent: 'flex-end' }}>
-        <Tooltip title="Add plugin"><Button disabled theme={theme} color="primary" variant="contained" size="small" endIcon={<DriveFolderUploadIcon />} style={{ color: '#ffffff' }} onClick={handleAddPluginClick}>Add plugin</Button></Tooltip>        
         <Tooltip title="Update matterbridge"><Button disabled theme={theme} color="primary" variant="contained" size="small" endIcon={<SystemUpdateAltIcon />} style={{ color: '#ffffff' }} onClick={handleUpdateClick}>Update</Button></Tooltip>        
         <Tooltip title="Restart matterbridge"><Button theme={theme} color="primary" variant="contained" size="small" endIcon={<RestartAltIcon />} style={{ color: '#ffffff' }} onClick={handleRestartClick}>Restart</Button></Tooltip>        
         <Backdrop sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }} open={open} onClick={handleClose}>

diff --git a/package.json b/package.json
@@ -32,6 +32,7 @@
     "start:test": "node ./dist/cli.js -test",
     "start:bridge": "matterbridge -bridge",
     "start:childbridge": "matterbridge -childbridge",
+    "start:controller": "matterbridge -controller",
     "start:help": "matterbridge -help",
     "test": "jest",
     "test:verbose": "jest --verbose",

diff --git a/src/matterbridge.ts b/src/matterbridge.ts
@@ -382,6 +382,7 @@ export class Matterbridge extends EventEmitter {
       this.bridgeMode = 'controller';
       this.log.info('Creating mattercontrollerContext: mattercontrollerContext');
       this.mattercontrollerContext = this.storageManager?.createContext('mattercontrollerContext');
+      await this.startMatterBridge();
     }
 
     if (hasParameter('bridge')) {
@@ -1053,13 +1054,37 @@ export class Matterbridge extends EventEmitter {
       return;
     }
 
+    if (this.bridgeMode === 'controller') {
+      this.log.info('Creating matter commissioning controller');
+      this.commissioningController = new CommissioningController({
+        autoConnect: false,
+      });
+      this.log.info('Adding matter commissioning controller to matter server');
+      await this.matterServer.addCommissioningController(this.commissioningController);
+
+      this.log.info('Starting matter server');
+      await this.matterServer.start();
+      this.log.info('Matter server started');
+
+      if (hasParameter('discover')) {
+        const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
+        console.log(discover);
+      }
+
+      this.log.info(`Commissioning controller is already commisioned: ${this.commissioningController.isCommissioned()}`);
+      const nodes = this.commissioningController.getCommissionedNodes();
+      nodes.forEach(async (nodeId) => {
+        this.log.warn(`Connecting to commissioned node: ${nodeId}`);
+      });
+    }
+
     if (this.bridgeMode === 'bridge') {
       // Plugins are loaded by loadPlugin on startup and plugin.loaded is set to true
       // Plugins are started and configured by callback when Matterbridge is commissioned
       this.log.debug(`Creating commissioning server context for ${plg}Matterbridge${db}`);
       this.matterbridgeContext = this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
       if (!this.matterbridgeContext) {
-        this.log.error(`Error creating storage context${er}`);
+        this.log.error(`Error creating storage context for ${plg}Matterbridge${er}`);
         return;
       }
       this.log.debug(`Creating commissioning server for ${plg}Matterbridge${db}`);
@@ -1167,7 +1192,6 @@ export class Matterbridge extends EventEmitter {
         Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
         clearInterval(startMatterInterval);
       }, 1000);
-      return;
     }
   }
 
@@ -1264,9 +1288,9 @@ export class Matterbridge extends EventEmitter {
     storageContext.set('serialNumber', storageContext.get('serialNumber', random));
     storageContext.set('uniqueId', storageContext.get('uniqueId', random));
     storageContext.set('softwareVersion', softwareVersion ?? 1);
-    storageContext.set('softwareVersionString', softwareVersionString ?? '1.0.0');
+    storageContext.set('softwareVersionString', softwareVersionString ?? '1.0');
     storageContext.set('hardwareVersion', hardwareVersion ?? 1);
-    storageContext.set('hardwareVersionString', hardwareVersionString ?? '1.0.0');
+    storageContext.set('hardwareVersionString', hardwareVersionString ?? '1.0');
     return storageContext;
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.f3664a62.js"></script><link href="/static/css/main.70102d98.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.5d39b100.js"></script><link href="/static/css/main.70102d98.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>