Merge pull request #78 from Luligu/dev

Release 1.3.10

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build and Lint
+name: Install, Lint, Test and Build
 
 on: [push, pull_request]
 
@@ -27,6 +27,9 @@ jobs:
       - name: Lint the project
         run: npm run lint
 
+      - name: Test the project
+        run: npm run test
+
       - name: Build the project
         run: npm run build
 

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

@@ -1,4 +1,4 @@
-name: Build and Push Docker image to Docker Hub with buildx
+name: Build dev and Push Docker image dev and dev_alpine to Docker Hub with buildx
 
 on:
   push:
@@ -33,18 +33,22 @@ jobs:
       with:
         version: latest
 
-    - name: Run Docker Buildx 
+    - name: Run Docker Buildx on dev
       run: |
-        docker buildx build \
-          --platform linux/amd64,linux/arm64,linux/arm/v7 \
-          -f docker/Dockerfile.alpine \
-          -t luligu/matterbridge:dev_alpine \
-          --push .
-        docker manifest inspect luligu/matterbridge:dev_alpine
         docker buildx build \
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
           -f docker/Dockerfile.dev \
           -t luligu/matterbridge:dev \
           --push .
         docker manifest inspect luligu/matterbridge:dev
       timeout-minutes: 60 
+
+    - name: Run Docker Buildx on dev_alpine
+      run: |
+        docker buildx build \
+          --platform linux/amd64,linux/arm64,linux/arm/v7 \
+          -f docker/Dockerfile.alpine \
+          -t luligu/matterbridge:dev_alpine \
+          --push .
+        docker manifest inspect luligu/matterbridge:dev_alpine
+      timeout-minutes: 60 

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

@@ -33,13 +33,13 @@ jobs:
       with:
         version: latest
 
-    - name: Run Docker Buildx
+    - name: Run Docker Buildx on latest 
       run: |
         docker buildx build \
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
           -f docker/Dockerfile.main \
           -t luligu/matterbridge:latest \
-          -t luligu/matterbridge:1.3.9 \
+          -t luligu/matterbridge:1.3.10 \
           --push .
         docker manifest inspect luligu/matterbridge:latest
       timeout-minutes: 60  

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.3.10] - 2024-07-05
+
+### Added
+
+- [fabrics]: Added fabricInfo to matterbridge in bridge mode and to the plugins in childbridge mode.
+- [sessions]: Added sessionInfo to matterbridge in bridge mode and to the plugins in childbridge mode.
+- [frontend]: Added fabricInfo in bridge mode and in childbridge mode instead of QRCode if already paired.
+- [frontend]: Added sessionInfo in bridge mode and in childbridge mode instead of QRCode if already paired.
+- [matterbridge]: Added parsePlugin to load the updated data from the plugin even when is disabled.
+- [matterbridge]: Added an automatic plugin reinstall from npm when the plugin is not found. (e.g. when the docker image is updated and the plugin is not an official plugin)
+
+### Changed
+
+- [dependencies]: Update dependencies.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.3.9] - 2024-07-02
 
 ### Fixed

__mocks__/@project-chip/matter-node.js/util.js

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2022-2024 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ValidationError } from '@project-chip/matter.js/common';
+import { execSync } from 'child_process';
+function getParameter(name) {
+  const commandArguments = process.argv.slice(2);
+  let markerIndex = commandArguments.indexOf(`-${name}`);
+  if (markerIndex === -1) markerIndex = commandArguments.indexOf(`--${name}`);
+  if (markerIndex === -1 || markerIndex + 1 === commandArguments.length) return void 0;
+  return commandArguments[markerIndex + 1];
+}
+function hasParameter(name) {
+  const commandArguments = process.argv.slice(2);
+  let markerIncluded = commandArguments.includes(`-${name}`);
+  if (!markerIncluded) markerIncluded = commandArguments.includes(`--${name}`);
+  return markerIncluded;
+}
+function getIntParameter(name) {
+  const value = getParameter(name);
+  if (value === void 0) return void 0;
+  const intValue = parseInt(value, 10);
+  if (isNaN(intValue)) throw new ValidationError(`Invalid value for parameter ${name}: ${value} is not a number`);
+  return intValue;
+}
+function commandExecutor(scriptParamName) {
+  const script = getParameter(scriptParamName);
+  if (script === void 0) return void 0;
+  // eslint-disable-next-line no-console
+  return () => console.log(`${scriptParamName}: ${execSync(script).toString().slice(0, -1)}`);
+}
+function requireMinNodeVersion(minVersion) {
+  const version = process.versions.node;
+  const versionMajor = parseInt(version.split('.')[0]);
+  if (versionMajor < minVersion) throw new MatterError(`Node version ${versionMajor} is not supported. Please upgrade to ${minVersion} or above.`);
+}
+export { commandExecutor, getIntParameter, getParameter, hasParameter, requireMinNodeVersion };
+export * from '@project-chip/matter.js/util';
+// # sourceMappingURL=CommandLine.js.map

docker/Dockerfile.dev

@@ -34,13 +34,13 @@ RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-somf
 COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
 RUN npm install && npm run build && npm pack
 
-WORKDIR /matterbridge-eve-door
-RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-eve-door.git .
+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 install && npm run build && npm pack
 
-WORKDIR /matterbridge-shelly
-RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-shelly.git .
+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 install && npm run build && npm pack
 

frontend/build/asset-manifest.json

@@ -1,15 +1,15 @@
 {
   "files": {
-    "main.css": "/static/css/main.abff2627.css",
-    "main.js": "/static/js/main.942a74a2.js",
+    "main.css": "/static/css/main.8e9f022b.css",
+    "main.js": "/static/js/main.cf22e7af.js",
     "static/js/453.d855a71b.chunk.js": "/static/js/453.d855a71b.chunk.js",
     "index.html": "/index.html",
-    "main.abff2627.css.map": "/static/css/main.abff2627.css.map",
-    "main.942a74a2.js.map": "/static/js/main.942a74a2.js.map",
+    "main.8e9f022b.css.map": "/static/css/main.8e9f022b.css.map",
+    "main.cf22e7af.js.map": "/static/js/main.cf22e7af.js.map",
     "453.d855a71b.chunk.js.map": "/static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.abff2627.css",
-    "static/js/main.942a74a2.js"
+    "static/css/main.8e9f022b.css",
+    "static/js/main.cf22e7af.js"
   ]
 }

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.942a74a2.js"></script><link href="/static/css/main.abff2627.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.cf22e7af.js"></script><link href="/static/css/main.8e9f022b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>