Merge pull request #152 from Luligu/dev

Release 1.6.0

.github/workflows/docker-buildx-dev.yml

@@ -43,26 +43,6 @@ jobs:
       run: |
         echo "Extracted version is: $VERSION ${{ env.VERSION }}"
  
-    - name: Run Docker Buildx on shelly
-      run: |
-        docker buildx build \
-          --platform linux/arm64 \
-          -f docker/Dockerfile.shelly \
-          -t luligu/matterbridge:shelly \
-          --push .
-        docker manifest inspect luligu/matterbridge:shelly
-      timeout-minutes: 60 
-
-    - name: Run Docker Buildx on dev_shelly
-      run: |
-        docker buildx build \
-          --platform linux/arm64 \
-          -f docker/Dockerfile.dev_shelly.bookworm \
-          -t luligu/matterbridge:dev_shelly \
-          --push .
-        docker manifest inspect luligu/matterbridge:dev_shelly
-      timeout-minutes: 60 
-
     - name: Run Docker Buildx on dev
       run: |
         docker buildx build \

.gitignore

@@ -39,6 +39,11 @@ replay_pid*
 # local
 migrationV8.txt
 migrationV8-answered.txt
+matterbridgeEdge.ts
+matterbridgeEdge.test.ts
+matterbridgeEndpoint.ts
+matterbridgeEndpoint.test.ts
+matterstorage
 
 coverage
 TODO.md

.npmignore

@@ -201,5 +201,11 @@ test
 
 migrationV8.txt
 migrationV8-answered.txt
+matterbridgeEdge.ts
+matterbridgeEdge.test.ts
+matterbridgeEndpoint.ts
+matterbridgeEndpoint.test.ts
+matterstorage
+
 TODO.md
 CODEOWNERS

CHANGELOG.md

@@ -8,17 +8,37 @@ If you like this project and find it useful, please consider giving it a star on
 
 The Home Assistant Community Add-ons and plugins are not verified to work with Matterbridge. I strongly advise against using them. If you do use them and encounter an issue (which is likely because some do not meet the Matterbridge guidelines), please do not open an issue in the Matterbridge repository.
 
-If you want to run Matterbridge in Home Assistant please use the official add-on https://github.com/Luligu/matterbridge-home-assistant-addon.
+If you want to run Matterbridge in Home Assistant please use the official add-on https://github.com/Luligu/matterbridge-home-assistant-addon that also has Ingress and side panel.
 
 ### New Apple firmware v. 18.0
 
 Please read this: https://github.com/Luligu/matterbridge/discussions/135
 
 ### Discord
 
-Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord group: https://discord.gg/raWywpD4.
+Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord group: https://discord.gg/QX58CDe6hd.
 
-Feel free to join!
+Feel free to join (the link is now permanent)!
+
+## [1.6.0] - 2024-10-28
+
+### Added
+
+- [matterbridge]: Added WebSocket for the Matetrbridge cockpit dashboard (Shelly gateway).
+
+### Changed
+
+- [discord]: Discord group link: https://discord.gg/QX58CDe6hd.
+- [matterbridge]: Completed phase 1 of transition to edge (matter.js new API).
+- [matterbridgeDevice]: Refactor Thermostat cluster method to accept minHeatSetpointLimit, maxHeatSetpointLimit, minCoolSetpointLimit and maxCoolSetpointLimit.
+- [config]: The plugins config is rewritten only after onStart and no more after onConfigure (after the plugin starts is possible to change the plugins config and it will not be rewritten after the plugin configuration).
+- [matterbridgeDevice]: Removed deprecated methods of ColorControl cluster.
+- [package]: Removed EveHistory (it will be used only by single plugins).
+- [package]: Update dependencies.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
 
 ## [1.5.10] - 2024-10-01
 

README-SERVICE.md

@@ -100,7 +100,7 @@ sudo systemctl disable matterbridge.service
 ### View the log of Matterbridge in real time (this will show the log with colors)
 
 ```
-sudo journalctl -u matterbridge.service -f --output cat
+sudo journalctl -u matterbridge.service -n 1000 -f --output cat
 ```
 
 ### Delete the logs older then 3 days (all of them not only the ones of Matterbridge!)

README.md

@@ -51,13 +51,13 @@ To run Matterbridge, you need either a [Node.js](https://nodejs.org/en/download/
 Follow these steps to install Matterbridge:
 
 ```
-npm install -g matterbridge
+npm install -g matterbridge --omit=dev
 ```
 
 on Linux you may need the necessary permissions:
 
 ```
-sudo npm install -g matterbridge
+sudo npm install -g matterbridge --omit=dev
 ```
 
 Test the installation with:
@@ -68,7 +68,7 @@ matterbridge
 
 Now it is possible to open the frontend at the link provided in the log (e.g. http://MATTERBIDGE-IPV4-ADDRESS:8283).
 
-You can then change the bridge mode from the frontend.
+You can then change the bridge mode and other parameters from the frontend.
 
 ## Usage
 
@@ -128,19 +128,19 @@ Config editor:
 
 ### Run matterbridge as a daemon with systemctl (Linux only)
 
-[Advanced configurations](https://github.com/Luligu/matterbridge/blob/main/README-SERVICE.md)
+[Service configurations](https://github.com/Luligu/matterbridge/blob/main/README-SERVICE.md)
 
 ### Run matterbridge with docker and docker compose
 
-[Advanced configurations](https://github.com/Luligu/matterbridge/blob/main/README-DOCKER.md)
+[Docker configurations](https://github.com/Luligu/matterbridge/blob/main/README-DOCKER.md)
 
 ### Run matterbridge with podman
 
-[Advanced configurations](https://github.com/Luligu/matterbridge/blob/main/README-PODMAN.md)
+[Podman configurations](https://github.com/Luligu/matterbridge/blob/main/README-PODMAN.md)
 
 ### Run matterbridge as an home assistant add-on with the official add-on
 
-[Advanced configurations](https://github.com/Luligu/matterbridge-home-assistant-addon)
+[Home assistant add-on configurations](https://github.com/Luligu/matterbridge-home-assistant-addon)
 
 ### Other Home Assistant Community Add-ons
 

TODO.md

@@ -2,7 +2,6 @@
 
 - OTA for matterbridge
 - Add test for triggerSwitchEvent configureColorControlCluster  configureColorControlMode
-- bug on sessions
+- fix sessions with new Apple firmware
 - 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/
+- add restart message from plugins to matterbridge frontend

docker/Dockerfile.dev

@@ -15,57 +15,47 @@ WORKDIR /app
 COPY ./package.json ./package-lock.json ./tsconfig.json ./.npmignore ./
 COPY ./src ./src
 COPY ./frontend/build ./frontend/build
-RUN npm ci && npm run build && npm link && npm shrinkwrap && npm pack 
+RUN npm ci && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm link && npm shrinkwrap && npm pack 
 
 WORKDIR /matterbridge-zigbee2mqtt
 RUN GIT_SSL_NO_VERIFY=true git clone -b dev https://github.com/Luligu/matterbridge-zigbee2mqtt.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-somfy-tahoma
 RUN GIT_SSL_NO_VERIFY=true git clone -b dev https://github.com/Luligu/matterbridge-somfy-tahoma.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-shelly
 RUN GIT_SSL_NO_VERIFY=true git clone -b dev https://github.com/Luligu/matterbridge-shelly.git .
-# COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm link matterbridge && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-example-accessory-platform
 RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-example-accessory-platform.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-example-dynamic-platform
 RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-example-dynamic-platform.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-eve-door
 RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-eve-door.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-eve-motion
 RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-eve-motion.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-eve-energy
 RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-eve-energy.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-eve-room
 RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-eve-room.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 WORKDIR /matterbridge-eve-weather
 RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-eve-weather.git .
-COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
-RUN npm ci && npm run build && npm shrinkwrap && npm pack
+RUN npm ci && npm link matterbridge && npm run build && npm pkg delete devDependencies && npm pkg delete scripts && npm install --omit=dev && npm shrinkwrap && npm pack
 
 
 
@@ -85,6 +75,6 @@ COPY --from=builder /matterbridge-eve-motion/*.tgz .
 COPY --from=builder /matterbridge-eve-energy/*.tgz .
 COPY --from=builder /matterbridge-eve-room/*.tgz .
 COPY --from=builder /matterbridge-eve-weather/*.tgz .
-RUN npm install -g --omit=dev *.tgz && rm *.tgz && node -v && npm -v && npm list -g
+RUN npm install -g --omit=dev *.tgz && rm *.tgz && node -v && npm -v && npm list -g && npm cache clean --force && rm -rf /tmp/* /var/tmp/* /root/.npm /root/.cache && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 CMD ["matterbridge", "-docker"]

frontend/build/asset-manifest.json

@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "./static/css/main.1cf003ae.css",
-    "main.js": "./static/js/main.96d6324b.js",
+    "main.js": "./static/js/main.045d08f7.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.96d6324b.js.map": "./static/js/main.96d6324b.js.map",
+    "main.045d08f7.js.map": "./static/js/main.045d08f7.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.1cf003ae.css",
-    "static/js/main.96d6324b.js"
+    "static/js/main.045d08f7.js"
   ]
 }

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.96d6324b.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.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>