Merge pull request #121 from Luligu/dev

Release 1.5.3
Luligu · Sep 4, 2024 · d3cf97f · d3cf97f
2 parents f088173 + d6fa555
commit d3cf97f
Show file tree

Hide file tree

Showing 23 changed files with 1,654 additions and 2,072 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
 
 If you like this project and find it useful, please consider giving it a star on GitHub at https://github.com/Luligu/matterbridge and sponsoring it.
 
+## [1.5.3] - 2024-09-04
+
+### Added
+
+- [frontend]: Added mattermdnsinterface, matteripv4address and matteripv6address to the matter settings. If no parameters are added, Matterbridge will use the settings from the frontend that are saved. The default is all interfaces. If you are facing issues with pairing, I suggest to try first to put the interfaceName (e.g eth0, WiFi) in the MdnsInterface field. When nothing is selected, NodeJs will choose the interface but sometimes the choice is not correct at all.
+
+### Changed
+
+- [package]: Update dependencies.
+- [package]: Update matter-node.js to 0.10.0 and removed the Scene cluster to follow matter.js.
+- [package]: Update matter-history to 1.1.8.
+- [package]: Removed long deprecated exports.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
+## [1.5.2] - 2024-08-30
+
 ### Breaking Changes
 
 - [-bridge -childbridge]: You don't need anymore to add the parmeter -bridge or -childbridge on the command line or systemctl configuration or docker command: the default is bridge mode and if no parameter is added, Matterbridge uses the settings from the frontend that are saved.
@@ -16,8 +35,6 @@ If you like this project and find it useful, please consider giving it a star on
 
 - please read this [Development guide lines](https://github.com/Luligu/matterbridge/blob/main/README-DEV.md)
 
-## [1.5.2] - 2024-08-30
-
 ### Added
 
 - [frontend]: Added a confirmation message for removing and disabling plugins.

diff --git a/TODO.md b/TODO.md
@@ -3,5 +3,6 @@
 - OTA for matterbridge
 - Add test for triggerSwitchEvent configureColorControlCluster  configureColorControlMode
 - bug on sessions
+- when change mode update QR immediately
 
 The following actions use a deprecated Node.js version and will be forced to run on node20: docker/login-action@v2. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
diff --git a/docker/Dockerfile.shelly.alpine b/docker/Dockerfile.shelly.alpine
@@ -1,9 +1,9 @@
-FROM alpine:latest AS base
+FROM node:20-alpine AS base
 # FROM alpine:latest as base not working for linux/arm/v7
 # FROM node:20-alpine as base not working for linux/arm/v7
 
 WORKDIR /app
-RUN apk add --no-cache nodejs npm icu-data-full
+# RUN apk add --no-cache nodejs npm icu-data-full
 
 COPY ./package.json ./package-lock.json ./tsconfig.json ./
 COPY ./src ./src
@@ -20,6 +20,4 @@ COPY ./docker/shellyEntrypoint.sh ./
 RUN chmod +x ./shellyEntrypoint.sh
 ENTRYPOINT ["./shellyEntrypoint.sh"]
 
-# Node modules: /usr/local/lib/node_modules/matterbridge/dist/cli.js
-# Bin: /usr/local/bin/matterbridge
 CMD ["matterbridge", "-docker"]
diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.1cf003ae.css",
-    "main.js": "/static/js/main.cfcfbb06.js",
+    "main.js": "/static/js/main.6725e5ab.js",
     "static/js/453.abd36b29.chunk.js": "/static/js/453.abd36b29.chunk.js",
     "index.html": "/index.html",
     "main.1cf003ae.css.map": "/static/css/main.1cf003ae.css.map",
-    "main.cfcfbb06.js.map": "/static/js/main.cfcfbb06.js.map",
+    "main.6725e5ab.js.map": "/static/js/main.6725e5ab.js.map",
     "453.abd36b29.chunk.js.map": "/static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.1cf003ae.css",
-    "static/js/main.cfcfbb06.js"
+    "static/js/main.6725e5ab.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.cfcfbb06.js"></script><link href="/static/css/main.1cf003ae.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.6725e5ab.js"></script><link href="/static/css/main.1cf003ae.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.cfcfbb06.js → frontend/build/static/js/main.6725e5ab.js b/frontend/build/static/js/main.cfcfbb06.js → frontend/build/static/js/main.6725e5ab.js
diff --git a/...ld/static/js/main.cfcfbb06.js.LICENSE.txt → ...ld/static/js/main.6725e5ab.js.LICENSE.txt b/...ld/static/js/main.cfcfbb06.js.LICENSE.txt → ...ld/static/js/main.6725e5ab.js.LICENSE.txt
diff --git a/frontend/build/static/js/main.6725e5ab.js.map b/frontend/build/static/js/main.6725e5ab.js.map
diff --git a/frontend/build/static/js/main.cfcfbb06.js.map b/frontend/build/static/js/main.cfcfbb06.js.map
diff --git a/frontend/src/components/MatterbridgeInfoTable.js b/frontend/src/components/MatterbridgeInfoTable.js
@@ -2,7 +2,9 @@ import { TruncatedText } from './TruncatedText';
 
 // This function takes systemInfo as a parameter and returns a table element with the systemInfo
 export function MatterbridgeInfoTable({ matterbridgeInfo }) {
-  const excludeKeys = ['matterbridgeVersion', 'matterbridgeLatestVersion', 'matterFileLogger', 'fileLogger', 'matterLoggerLevel', 'debugEnabled', 'loggerLevel', 'bridgeMode', 'restartMode', 'matterbridgeFabricInformations', 'matterbridgeSessionInformations', 'restartRequired', 'refreshRequired'];
+  const excludeKeys = ['matterbridgeVersion', 'matterbridgeLatestVersion', 'matterFileLogger', 'fileLogger', 'matterLoggerLevel', 'loggerLevel', 
+    'bridgeMode', 'restartMode', 'matterbridgeFabricInformations', 'matterbridgeSessionInformations', 'restartRequired', 'refreshRequired',
+    'mattermdnsinterface', 'matteripv4address', 'matteripv6address'];
   if(matterbridgeInfo.bridgeMode === 'childbridge') excludeKeys.push('matterbridgePaired', 'matterbridgeConnected');
   return (
     <div className="MbfWindowDiv" style={{ minWidth: '302px' }}>

diff --git a/frontend/src/components/Settings.js b/frontend/src/components/Settings.js
@@ -144,7 +144,7 @@ function MatterbridgeSettings({ matterbridgeInfo, showSnackbarMessage }) {
         <div style={{ display: 'flex', alignItems: 'center', gap: '15px' }}>
           <FormLabel color='readonly' style={{padding: '0px', margin: '0px'}} id="mb-password">Frontend password:</FormLabel>
           <TextField value={password} onChange={handleChangePassword} size="small" id="matterbridgePassword" type="password" autoComplete="current-password" variant="outlined" 
-            style={{ height: '30px', marginTop: '5px' }} InputProps={{
+            style={{ height: '30px', flexGrow: 1 }} InputProps={{
               style: {
                 height: '30px',
                 padding: '0',
@@ -165,10 +165,11 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
 
   useEffect(() => {
     if (matterbridgeInfo.bridgeMode === undefined) return;
-
     setSelectedMjLoggerLevel(['Debug', 'Info', 'Notice', 'Warn', 'Error', 'Fatal'][matterbridgeInfo.matterLoggerLevel]);
-
     setLogOnFileMj(matterbridgeInfo.matterFileLogger);
+    setmdnsInterface(matterbridgeInfo.mattermdnsinterface);
+    setIpv4Address(matterbridgeInfo.matteripv4address);
+    setIpv6Address(matterbridgeInfo.matteripv6address);
   }, [matterbridgeInfo]);
 
   // Define a function to handle change debug level
@@ -227,8 +228,8 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
         </div>
         <div style={{ display: 'flex', alignItems: 'center', gap: '15px' }}>
           <FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Mdns interface:</FormLabel>
-          <TextField disabled value={mdnsInterface} onChange={handleChangeMdnsInterface} size="small" variant="outlined" 
-            style={{ height: '30px', marginTop: '5px' }} InputProps={{
+          <TextField value={mdnsInterface} onChange={handleChangeMdnsInterface} size="small" variant="outlined" 
+            style={{ height: '30px', flexGrow: 1 }} InputProps={{
               style: {
                 height: '30px',
                 padding: '0',
@@ -237,8 +238,8 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
         </div>
         <div style={{ display: 'flex', alignItems: 'center', gap: '15px' }}>
           <FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Ipv4 address:</FormLabel>
-          <TextField disabled value={ipv4Address} onChange={handleChangeIpv4Address} size="small" variant="outlined" 
-            style={{ height: '30px', marginTop: '5px' }} InputProps={{
+          <TextField value={ipv4Address} onChange={handleChangeIpv4Address} size="small" variant="outlined" 
+            style={{ height: '30px', flexGrow: 1  }} InputProps={{
               style: {
                 height: '30px',
                 padding: '0',
@@ -247,8 +248,8 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
         </div>
         <div style={{ display: 'flex', alignItems: 'center', gap: '15px' }}>
           <FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Ipv6 address:</FormLabel>
-          <TextField disabled value={ipv6Address} onChange={handleChangeIpv6Address} size="small" variant="outlined" 
-            style={{ height: '30px', marginTop: '5px' }} InputProps={{
+          <TextField value={ipv6Address} onChange={handleChangeIpv6Address} size="small" variant="outlined"
+            style={{ height: '30px', flexGrow: 1 }} InputProps={{
               style: {
                 height: '30px',
                 padding: '0',
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.cfcfbb06.js"></script><link href="/static/css/main.1cf003ae.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.6725e5ab.js"></script><link href="/static/css/main.1cf003ae.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>