Merge pull request #54 from Luligu/dev

Release 1.3.1
Luligu · Jun 20, 2024 · 1f277fc · 1f277fc
2 parents a2b0e85 + a45e065
commit 1f277fc
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 94 deletions.
diff --git a/.github/workflows/docker-buildx-main.yml b/.github/workflows/docker-buildx-main.yml
@@ -39,7 +39,7 @@ jobs:
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
           -f docker/Dockerfile.main \
           -t luligu/matterbridge:latest \
-          -t luligu/matterbridge:1.3.0 \
+          -t luligu/matterbridge:1.3.1 \
           --push .
         docker manifest inspect luligu/matterbridge:latest
       timeout-minutes: 60  
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.3.1] - 2024-06-20
+
+### Changed
+- [matterbridge]: Updated dependencies
+- [matterbridge]: Refactor the loading of schemas, now they load from the plugin directory.
+- [matterbridge]: Moved getPluginVersion to the start also for disabled plugins.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.3.0] - 2024-06-16
 
 This release is all about Matter 1.3

diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -21,6 +21,7 @@ RUN npm -g install matterbridge-example-accessory-platform
 RUN npm -g install matterbridge-example-dynamic-platform
 RUN npm -g install matterbridge-zigbee2mqtt
 RUN npm -g install matterbridge-somfy-tahoma
+RUN npm -g install matterbridge-shelly
 RUN npm -g install matterbridge-eve-door
 RUN npm -g install matterbridge-eve-motion
 RUN npm -g install matterbridge-eve-energy

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
@@ -39,6 +39,11 @@ RUN GIT_SSL_NO_VERIFY=true git clone https://github.com/Luligu/matterbridge-eve-
 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 .
+COPY docker/link-matterbridge-docker-script.js ./link-matterbridge-script.js
+RUN npm install && npm run build && 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
@@ -71,6 +76,7 @@ COPY --from=builder /matterbridge-example-accessory-platform/*.tgz .
 COPY --from=builder /matterbridge-example-dynamic-platform/*.tgz .
 COPY --from=builder /matterbridge-zigbee2mqtt/*.tgz .
 COPY --from=builder /matterbridge-somfy-tahoma/*.tgz .
+COPY --from=builder /matterbridge-shelly/*.tgz .
 COPY --from=builder /matterbridge-eve-door/*.tgz .
 COPY --from=builder /matterbridge-eve-motion/*.tgz .
 COPY --from=builder /matterbridge-eve-energy/*.tgz .

diff --git a/docker/Dockerfile.main b/docker/Dockerfile.main
@@ -25,6 +25,7 @@ RUN npm -g install matterbridge-example-accessory-platform
 RUN npm -g install matterbridge-example-dynamic-platform
 RUN npm -g install matterbridge-zigbee2mqtt
 RUN npm -g install matterbridge-somfy-tahoma
+RUN npm -g install matterbridge-shelly
 RUN npm -g install matterbridge-eve-door
 RUN npm -g install matterbridge-eve-motion
 RUN npm -g install matterbridge-eve-energy

diff --git a/frontend/src/components/Home.js b/frontend/src/components/Home.js
@@ -525,8 +525,8 @@ function DialogConfigPlugin( { config, schema, handleCloseConfig }) {
   });
   const handleSaveChanges = ({ formData }, event) => {
     console.log('handleSaveChanges:', formData);
-    const schema = JSON.stringify(formData, null, 2)
-    sendCommandToMatterbridge('saveconfig', formData.name, schema);
+    const config = JSON.stringify(formData, null, 2)
+    sendCommandToMatterbridge('saveconfig', formData.name, config);
     // Close the dialog
     handleCloseConfig();
     window.location.reload();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -81,10 +81,10 @@
   "devDependencies": {
     "@tsconfig/node-lts": "^20.1.3",
     "@types/express": "^4.17.21",
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.5",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.3.2",

diff --git a/src/defaultConfigSchema.ts b/src/defaultConfigSchema.ts
@@ -45,7 +45,7 @@ export const zigbee2mqtt_schema: PlatformSchema = {
   title: 'Matterbridge zigbee2mqtt plugin',
   description: 'matterbridge-zigbee2mqtt v. 2.0.13 by https://github.com/Luligu',
   type: 'object',
-  required: ['username', 'password', 'host', 'port', 'topic'],
+  required: ['host', 'port', 'topic'],
   properties: {
     name: {
       description: 'Plugin name',
@@ -129,6 +129,10 @@ export const zigbee2mqtt_schema: PlatformSchema = {
         },
       },
     },
+    debug: {
+      description: 'Enable the debug for the plugin (development only)',
+      type: 'boolean',
+    },
     unregisterOnShutdown: {
       description: 'Unregister all devices on shutdown (development only)',
       type: 'boolean',
@@ -214,6 +218,10 @@ export const somfytahoma_schema: PlatformSchema = {
         type: 'integer',
       },
     },
+    debug: {
+      description: 'Enable the debug for the plugin (development only)',
+      type: 'boolean',
+    },
     unregisterOnShutdown: {
       description: 'Unregister all devices on shutdown (development only)',
       type: 'boolean',