Merge pull request #170 from Luligu/dev

Release 1.6.2
Luligu · Nov 25, 2024 · 777f6a3 · 777f6a3
2 parents b88fb90 + a9ff9f0
commit 777f6a3
Show file tree

Hide file tree

Showing 117 changed files with 7,422 additions and 1,374 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,10 +39,6 @@ replay_pid*
 # local
 migrationV8.txt
 migrationV8-answered.txt
-matterbridgeEdge.ts
-matterbridgeEdge.test.ts
-matterbridgeEndpoint.ts
-matterbridgeEndpoint.test.ts
 matterstorage
 
 coverage

diff --git a/.npmignore b/.npmignore
@@ -201,10 +201,6 @@ test
 
 migrationV8.txt
 migrationV8-answered.txt
-matterbridgeEdge.ts
-matterbridgeEdge.test.ts
-matterbridgeEndpoint.ts
-matterbridgeEndpoint.test.ts
 matterstorage
 
 TODO.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,40 @@ Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord
 
 Feel free to join (the link is now permanent)!
 
+## [1.6.2] - 2024-11-25
+
+### Added
+
+- [matter.js]: Almost completed the phase 2 of migration to edge (matter.js new API).
+- [nginx]: Added the route /matterbridge/ to be used with nginx proxy server https://github.com/Luligu/matterbridge/blob/dev/README-NGINX.md.
+- [config]: Config and schema are loaded before loading the plugin to allow to configure the plugin even when it throws error on load.
+- [config]: Added version to the config.
+- [frontend]: Added badge "edge" when running in edge mode.
+- [matterbridge]: Added addTagList method.
+
+### Changed
+
+- [matter.js]: Update to matter.js 0.11.2.
+- [matter.js]: Update to matter.js 0.11.3.
+- [matter.js]: Update to matter.js 0.11.4.
+- [matter.js]: Update to matter.js 0.11.5.
+- [matter.js]: Update to the new matter.js packages @matter/main and @mater/nodejs.
+- [PluginManager]: On first load the plugin type is AnyPlatform.
+- [package]: Update dependencies.
+- [frontend]: Update package dependencies.
+- [frontend]: Update QRCode package and QRCode level to M.
+- [frontend]: Added font roboto.
+- [matterbridge]: Removed BasicInformationCluster from Aggregator.
+- [matterbridge]: Added minLevel, maxLevel and onLevel to LevelControlCluster utility methods.
+
+### Fixed
+
+- [energySensor]: Fixed wrong types on ElectricalEnergyMeasurementCluster ElectricalPowerMeasurementCluster.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.6.1] - 2024-11-02
 
 ### Added
@@ -32,7 +66,7 @@ Feel free to join (the link is now permanent)!
 
 - [loggers]: Logging on file keeps the logger level of the logger (matterbridge and matter logs).
 - [matterbridge]: Added more api to WebSocket for the Matterbridge cockpit dashboard (Shelly gateway).
-- [package]: Update dependencies. 
+- [package]: Update dependencies.
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="./yellow-button.png" alt="Buy me a coffee" width="120">

diff --git a/README-DEV.md b/README-DEV.md
@@ -31,10 +31,6 @@ Matterbridge exports from:
 
 - All general utils and colorUtils functions.
 
-"matterbridge/history"
-
-- MatterHistory class.
-
 "matterbridge/logger"
 
 - NodeAnsiLogger class.

diff --git a/README-NGINX.md b/README-NGINX.md
@@ -0,0 +1,63 @@
+# <img src="https://github.com/Luligu/matterbridge/blob/main/frontend/public/matterbridge%2064x64.png" alt="Matterbridge Logo" width="64px" height="64px">&nbsp;&nbsp;&nbsp;Matterbridge
+
+[![npm version](https://img.shields.io/npm/v/matterbridge.svg)](https://www.npmjs.com/package/matterbridge)
+[![npm downloads](https://img.shields.io/npm/dt/matterbridge.svg)](https://www.npmjs.com/package/matterbridge)
+[![Docker Version](https://img.shields.io/docker/v/luligu/matterbridge?label=docker%20version&sort=semver)](https://hub.docker.com/r/luligu/matterbridge)
+[![Docker Pulls](https://img.shields.io/docker/pulls/luligu/matterbridge.svg)](https://hub.docker.com/r/luligu/matterbridge)
+![Node.js CI](https://github.com/Luligu/matterbridge/actions/workflows/build.yml/badge.svg)
+
+[![power by](https://img.shields.io/badge/powered%20by-matter--history-blue)](https://www.npmjs.com/package/matter-history)
+[![power by](https://img.shields.io/badge/powered%20by-node--ansi--logger-blue)](https://www.npmjs.com/package/node-ansi-logger)
+[![power by](https://img.shields.io/badge/powered%20by-node--persist--manager-blue)](https://www.npmjs.com/package/node-persist-manager)
+
+---
+
+# Advanced configuration to use NGINX
+
+## Run matterbridge with nginx
+
+### Create the nginx configuration file
+
+```
+sudo nano /etc/nginx/sites-available/matterbridge
+```
+
+paste this configuration and change the port to listen and the server_name using yours:
+
+```
+server {
+    listen 8099;
+    server_name ubuntu.local;
+
+    location /matterbridge/ {
+        # Redirect to Matterbridge frontend
+        proxy_pass http://localhost:8283/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        # WebSocket support
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}
+```
+
+add matterbridge to enabled sites
+
+```
+sudo ln -s /etc/nginx/sites-available/matterbridge /etc/nginx/sites-enabled/
+```
+
+### Restart nginx and test the configuration
+
+```
+sudo systemctl restart nginx
+sudo nginx -t
+```
+
+### Use matterbridge with nginx
+
+http://ubuntu.local:8099/matterbridge/
diff --git a/README.md b/README.md
@@ -138,6 +138,10 @@ Config editor:
 
 [Podman configurations](https://github.com/Luligu/matterbridge/blob/main/README-PODMAN.md)
 
+### Run matterbridge with nginx
+
+[Nginx configurations](https://github.com/Luligu/matterbridge/blob/main/README-NGINX.md)
+
 ### Run matterbridge as an home assistant add-on with the official add-on
 
 [Home assistant add-on configurations](https://github.com/Luligu/matterbridge-home-assistant-addon)

diff --git a/TODO.md b/TODO.md
diff --git a/__mocks__/@project-chip/matter-node.js/util.js b/__mocks__/@project-chip/matter-node.js/util.js
diff --git a/eslint.config.js b/eslint.config.js
@@ -20,13 +20,6 @@ export default [
     languageOptions: {
       ecmaVersion: 'latest',
       sourceType: 'module',
-      /*
-      parser: tseslint.parser,
-      parserOptions: {
-        project: './tsconfig.eslint.json',
-        tsconfigRootDir: import.meta.dirname,
-      },
-      */
     },
     linterOptions: {
       reportUnusedDisableDirectives: 'warn',
@@ -40,7 +33,7 @@ export default [
   {
     name: 'javascript',
     files: ['**/*.js'],
-    // ...tseslint.configs.disableTypeChecked,
+    ...tseslint.configs.disableTypeChecked,
   },
   {
     name: 'typescript',
@@ -62,13 +55,11 @@ export default [
   {
     name: 'jest',
     files: ['**/__test__/*', '**/*.test.ts', '**/*.spec.ts'],
-    // ...tseslint.configs.disableTypeChecked,
     plugins: {
       '@typescript-eslint': tseslint.plugin,
       jest: jesteslint,
     },
-    rules: {
-      ...jesteslint.configs['flat/recommended'].rules,
-    },
+    ...tseslint.configs.disableTypeChecked,
+    ...jesteslint.configs['flat/recommended'],
   },
 ];
diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json
@@ -1,15 +1,71 @@
 {
   "files": {
-    "main.css": "./static/css/main.1cf003ae.css",
-    "main.js": "./static/js/main.045d08f7.js",
+    "main.css": "./static/css/main.823e08b6.css",
+    "main.js": "./static/js/main.a14c87e7.js",
     "static/js/453.abd36b29.chunk.js": "./static/js/453.abd36b29.chunk.js",
+    "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.4535474e1cf8598695ad.woff2",
+    "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.7077203b1982951ecf76.woff2",
+    "static/media/roboto-latin-400-normal.woff2": "./static/media/roboto-latin-400-normal.297d48e1b5a10c0831a9.woff2",
+    "static/media/roboto-latin-300-normal.woff2": "./static/media/roboto-latin-300-normal.b850f1ff581ea232fac9.woff2",
+    "static/media/roboto-latin-300-normal.woff": "./static/media/roboto-latin-300-normal.c4bc0593c9954d79cb3a.woff",
+    "static/media/roboto-latin-700-normal.woff": "./static/media/roboto-latin-700-normal.9f6a16a7770c87b2042b.woff",
+    "static/media/roboto-latin-500-normal.woff": "./static/media/roboto-latin-500-normal.68d40d6d01c6f85d24ba.woff",
+    "static/media/roboto-latin-400-normal.woff": "./static/media/roboto-latin-400-normal.047a7839f69b209db815.woff",
+    "static/media/roboto-cyrillic-ext-400-normal.woff2": "./static/media/roboto-cyrillic-ext-400-normal.5cec61a21cc20180fbe1.woff2",
+    "static/media/roboto-cyrillic-ext-300-normal.woff2": "./static/media/roboto-cyrillic-ext-300-normal.80947a31d23c70204b47.woff2",
+    "static/media/roboto-cyrillic-ext-500-normal.woff2": "./static/media/roboto-cyrillic-ext-500-normal.6de16332fda843a3dc3d.woff2",
+    "static/media/roboto-cyrillic-ext-700-normal.woff2": "./static/media/roboto-cyrillic-ext-700-normal.4750292c47fa2bc6ac1a.woff2",
+    "static/media/roboto-cyrillic-ext-300-normal.woff": "./static/media/roboto-cyrillic-ext-300-normal.795dbc8140e3fef82983.woff",
+    "static/media/roboto-cyrillic-ext-400-normal.woff": "./static/media/roboto-cyrillic-ext-400-normal.135d076fa32aa0b4d105.woff",
+    "static/media/roboto-cyrillic-ext-500-normal.woff": "./static/media/roboto-cyrillic-ext-500-normal.c0a0638f90b31d6454ba.woff",
+    "static/media/roboto-cyrillic-ext-700-normal.woff": "./static/media/roboto-cyrillic-ext-700-normal.ca247189fc12d00de361.woff",
+    "static/media/roboto-latin-ext-400-normal.woff2": "./static/media/roboto-latin-ext-400-normal.2eeae187764baf05867d.woff2",
+    "static/media/roboto-latin-ext-300-normal.woff2": "./static/media/roboto-latin-ext-300-normal.97cbc447d4a8d41a9543.woff2",
+    "static/media/roboto-latin-ext-700-normal.woff2": "./static/media/roboto-latin-ext-700-normal.18841836e391d39e83a8.woff2",
+    "static/media/roboto-latin-ext-500-normal.woff2": "./static/media/roboto-latin-ext-500-normal.9a18d7bb9ff7a6af7b32.woff2",
+    "static/media/roboto-latin-ext-300-normal.woff": "./static/media/roboto-latin-ext-300-normal.14982a9e4857a93b6dce.woff",
+    "static/media/roboto-latin-ext-400-normal.woff": "./static/media/roboto-latin-ext-400-normal.27da5b36b6d3a16f53f4.woff",
+    "static/media/roboto-latin-ext-500-normal.woff": "./static/media/roboto-latin-ext-500-normal.06c30711d588145a4541.woff",
+    "static/media/roboto-latin-ext-700-normal.woff": "./static/media/roboto-latin-ext-700-normal.3c5bcdd0e69c4c3ffafe.woff",
+    "static/media/roboto-cyrillic-500-normal.woff2": "./static/media/roboto-cyrillic-500-normal.0ae2428323939af5e1ad.woff2",
+    "static/media/roboto-cyrillic-400-normal.woff2": "./static/media/roboto-cyrillic-400-normal.a9e19870cf6c4b973427.woff2",
+    "static/media/roboto-cyrillic-700-normal.woff2": "./static/media/roboto-cyrillic-700-normal.4fdfc29a10e7d4b7c527.woff2",
+    "static/media/roboto-cyrillic-300-normal.woff2": "./static/media/roboto-cyrillic-300-normal.1b79538ccd585c259996.woff2",
+    "static/media/roboto-cyrillic-500-normal.woff": "./static/media/roboto-cyrillic-500-normal.dd7bc8a52c6c70c5a3f5.woff",
+    "static/media/roboto-cyrillic-700-normal.woff": "./static/media/roboto-cyrillic-700-normal.3f6e1548bd5175a8c342.woff",
+    "static/media/roboto-cyrillic-300-normal.woff": "./static/media/roboto-cyrillic-300-normal.5f077fd7b977d1715acf.woff",
+    "static/media/roboto-cyrillic-400-normal.woff": "./static/media/roboto-cyrillic-400-normal.5d2930082227d172f62c.woff",
+    "static/media/roboto-greek-300-normal.woff2": "./static/media/roboto-greek-300-normal.285f3e6261d8eb20417d.woff2",
+    "static/media/roboto-greek-400-normal.woff2": "./static/media/roboto-greek-400-normal.2c32b1315be61477013a.woff2",
+    "static/media/roboto-greek-500-normal.woff2": "./static/media/roboto-greek-500-normal.f95e757c5483310f9c11.woff2",
+    "static/media/roboto-greek-700-normal.woff2": "./static/media/roboto-greek-700-normal.77dd370f2001e184ba0d.woff2",
+    "static/media/roboto-greek-300-normal.woff": "./static/media/roboto-greek-300-normal.889beddda1c9bd9f97df.woff",
+    "static/media/roboto-greek-400-normal.woff": "./static/media/roboto-greek-400-normal.160a791a8e4f46bca3cc.woff",
+    "static/media/roboto-greek-500-normal.woff": "./static/media/roboto-greek-500-normal.60810e07c7b0273013aa.woff",
+    "static/media/roboto-greek-700-normal.woff": "./static/media/roboto-greek-700-normal.df87b053fae3d7ad5f7a.woff",
+    "static/media/roboto-vietnamese-500-normal.woff2": "./static/media/roboto-vietnamese-500-normal.090fabef926bdc0e9b9f.woff2",
+    "static/media/roboto-vietnamese-400-normal.woff2": "./static/media/roboto-vietnamese-400-normal.d3f8e26d6c27de8102b6.woff2",
+    "static/media/roboto-vietnamese-700-normal.woff2": "./static/media/roboto-vietnamese-700-normal.0a79a9fabfc32e33f360.woff2",
+    "static/media/roboto-vietnamese-300-normal.woff2": "./static/media/roboto-vietnamese-300-normal.c96b16e5c05c7b7c3e89.woff2",
+    "static/media/roboto-vietnamese-300-normal.woff": "./static/media/roboto-vietnamese-300-normal.f5e7cea32756dfe7af40.woff",
+    "static/media/roboto-vietnamese-400-normal.woff": "./static/media/roboto-vietnamese-400-normal.0dc97c66f9b542d6fa17.woff",
+    "static/media/roboto-vietnamese-500-normal.woff": "./static/media/roboto-vietnamese-500-normal.23b7b8a2524d2d4b637b.woff",
+    "static/media/roboto-vietnamese-700-normal.woff": "./static/media/roboto-vietnamese-700-normal.35ed0597568ff6f19c16.woff",
+    "static/media/roboto-greek-ext-500-normal.woff2": "./static/media/roboto-greek-ext-500-normal.4a96ba31abcce0f5d52b.woff2",
+    "static/media/roboto-greek-ext-300-normal.woff2": "./static/media/roboto-greek-ext-300-normal.d6049cb54aa6fbe14c42.woff2",
+    "static/media/roboto-greek-ext-400-normal.woff2": "./static/media/roboto-greek-ext-400-normal.1df4abad55796d11a0c8.woff2",
+    "static/media/roboto-greek-ext-700-normal.woff2": "./static/media/roboto-greek-ext-700-normal.2dd6febad11502dec6a6.woff2",
+    "static/media/roboto-greek-ext-500-normal.woff": "./static/media/roboto-greek-ext-500-normal.fd28d9c008bf3af1bed7.woff",
+    "static/media/roboto-greek-ext-700-normal.woff": "./static/media/roboto-greek-ext-700-normal.4abdc9fff4507f17d726.woff",
+    "static/media/roboto-greek-ext-300-normal.woff": "./static/media/roboto-greek-ext-300-normal.b590dbe5c639944366d1.woff",
+    "static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
     "index.html": "./index.html",
-    "main.1cf003ae.css.map": "./static/css/main.1cf003ae.css.map",
-    "main.045d08f7.js.map": "./static/js/main.045d08f7.js.map",
+    "main.823e08b6.css.map": "./static/css/main.823e08b6.css.map",
+    "main.a14c87e7.js.map": "./static/js/main.a14c87e7.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.1cf003ae.css",
-    "static/js/main.045d08f7.js"
+    "static/css/main.823e08b6.css",
+    "static/js/main.a14c87e7.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"/><base href="./"><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.045d08f7.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"/><base href="./"><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.a14c87e7.js"></script><link href="./static/css/main.823e08b6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><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.045d08f7.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"/><base href="./"><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.a14c87e7.js"></script><link href="./static/css/main.823e08b6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>