Merge pull request #68 from Luligu/dev

Release 1.3.6

.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.5 \
+          -t luligu/matterbridge:1.3.6 \
           --push .
         docker manifest inspect luligu/matterbridge:latest
       timeout-minutes: 60  

CHANGELOG.md

@@ -4,6 +4,23 @@ 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.6] - 2024-06-28
+
+### Changed
+
+- [matterbridge]: Unified the http server port for the frontend and the WebSockerServer.
+- [matterbridge]: Unified the https server port for the frontend and the WebSockerServer.
+- [certificates]: The certificates for https connections are imported from the directory ~/.matterbridge/certs with these names: cert.pem, key.pem and ca.pem (optional). Use the -ssl command line parameter to activate https for both frontend and WebSocketServer.
+
+### Fixed
+
+- [matterbridge]: Fixed exports
+- [matterbridgeDevice]: Fixed ElectricalEnergyMeasurement and ElectricalPowerMeasurement
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.3.5] - 2024-06-26
 
 ### Added

README.md

@@ -566,7 +566,9 @@ HA also support electrical measurements from EveHistoryCluster (used in Matterbr
 
 ## Google Home
 
-No issues reported so far.
+If you face a problem pairing to Google Home from Ios app the solution is there https://github.com/Luligu/matterbridge/issues/61.
+
+No other issues reported so far.
 
 ## Alexa
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -39,13 +39,35 @@
   ],
   "type": "module",
   "main": "dist/index.js",
-  "types": "dist/index.d.js",
+  "types": "dist/index.d.ts",
   "bin": {
     "matterbridge": "dist/cli.js"
   },
   "engines": {
     "node": ">=18.0.0"
   },
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./utils/*": {
+      "import": "./dist/utils/*.js",
+      "types": "./dist/utils/*.d.ts"
+    },
+    "./cluster/*": {
+      "import": "./dist/cluster/*.js",
+      "types": "./dist/cluster/*.d.ts"
+    },
+    "./logger": {
+      "import": "./dist/logger/export.js",
+      "types": "./dist/logger/export.d.ts"
+    },
+    "./storage": {
+      "import": "./dist/storage/export.js",
+      "types": "./dist/storage/export.d.ts"
+    }
+  },
   "scripts": {
     "build": "tsc",
     "watch": "tsc --watch",

src/cluster/ElectricalEnergyMeasurementCluster.ts

@@ -38,7 +38,7 @@ export namespace ElectricalEnergyMeasurement {
      *
      * @see {@link MatterSpecification.v13.Cluster} § 2.12.5.1.1
      */
-    energy: TlvField(0, TlvInt64.bound({ min: 0, max: 262 })),
+    energy: TlvField(0, TlvInt64.bound({ min: 0, max: 2 ** 62 })),
 
     /**
      * This field shall indicate the timestamp in UTC of the beginning of the period during which the value of the

src/cluster/ElectricalPowerMeasurementCluster.ts

@@ -42,7 +42,7 @@ export namespace ElectricalPowerMeasurement {
      *
      * @see {@link MatterSpecification.v13.Cluster} § 2.13.5.3.2
      */
-    measurement: TlvField(1, TlvNullable(TlvInt64.bound({ min: -262, max: 262 }))),
+    measurement: TlvField(1, TlvNullable(TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 }))),
   });
 
   /**
@@ -95,15 +95,15 @@ export namespace ElectricalPowerMeasurement {
      *
      * @see {@link MatterSpecification.v13.Cluster} § 2.13.5.2.2
      */
-    min: TlvField(1, TlvInt64.bound({ min: -262, max: 262 })),
+    min: TlvField(1, TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })),
 
     /**
      * This field shall be the largest measured value for the associated measurement over the period between either
      * StartTimestamp and EndTimestamp or the period between StartSystime and EndSystime, or both.
      *
      * @see {@link MatterSpecification.v13.Cluster} § 2.13.5.2.3
      */
-    max: TlvField(2, TlvInt64.bound({ min: -262, max: 262 })),
+    max: TlvField(2, TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })),
 
     /**
      * This field shall be the timestamp in UTC of the beginning of the measurement period.
@@ -246,7 +246,7 @@ export namespace ElectricalPowerMeasurement {
        *
        * @see {@link MatterSpecification.v13.Cluster} § 2.13.6.7
        */
-      reactiveCurrent: OptionalAttribute(0x6, TlvNullable(TlvInt64.bound({ min: -262, max: 262 })), { default: null }),
+      reactiveCurrent: OptionalAttribute(0x6, TlvNullable(TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })), { default: null }),
 
       /**
        * This shall indicate the most recent ApparentCurrent (square root sum of the squares of active and
@@ -265,7 +265,7 @@ export namespace ElectricalPowerMeasurement {
        *
        * @see {@link MatterSpecification.v13.Cluster} § 2.13.6.8
        */
-      apparentCurrent: OptionalAttribute(0x7, TlvNullable(TlvInt64.bound({ min: 0, max: 262 })), { default: null }),
+      apparentCurrent: OptionalAttribute(0x7, TlvNullable(TlvInt64.bound({ min: 0, max: 2 ** 62 })), { default: null }),
 
       /**
        * This shall indicate the most recent ReactivePower reading in millivolt-amps reactive (mVAR). A positive
@@ -287,7 +287,7 @@ export namespace ElectricalPowerMeasurement {
        *
        * @see {@link MatterSpecification.v13.Cluster} § 2.13.6.10
        */
-      reactivePower: OptionalAttribute(0x9, TlvNullable(TlvInt64.bound({ min: -262, max: 262 })), { default: null }),
+      reactivePower: OptionalAttribute(0x9, TlvNullable(TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })), { default: null }),
 
       /**
        * This shall indicate the most recent ApparentPower reading in millivolt-amps (mVA).
@@ -307,7 +307,7 @@ export namespace ElectricalPowerMeasurement {
        *
        * @see {@link MatterSpecification.v13.Cluster} § 2.13.6.11
        */
-      apparentPower: OptionalAttribute(0xa, TlvNullable(TlvInt64.bound({ min: -262, max: 262 })), { default: null }),
+      apparentPower: OptionalAttribute(0xa, TlvNullable(TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })), { default: null }),
 
       /**
        * This shall indicate the most recent RMSVoltage reading in millivolts (mV).
@@ -325,7 +325,7 @@ export namespace ElectricalPowerMeasurement {
        *
        * @see {@link MatterSpecification.v13.Cluster} § 2.13.6.12
        */
-      rmsVoltage: OptionalAttribute(0xb, TlvNullable(TlvInt64.bound({ min: -262, max: 262 })), { default: null }),
+      rmsVoltage: OptionalAttribute(0xb, TlvNullable(TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })), { default: null }),
 
       /**
        * This shall indicate the most recent RMSCurrent reading in milliamps (mA).
@@ -346,7 +346,7 @@ export namespace ElectricalPowerMeasurement {
        *
        * @see {@link MatterSpecification.v13.Cluster} § 2.13.6.13
        */
-      rmsCurrent: OptionalAttribute(0xc, TlvNullable(TlvInt64.bound({ min: -262, max: 262 })), { default: null }),
+      rmsCurrent: OptionalAttribute(0xc, TlvNullable(TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })), { default: null }),
 
       /**
        * This shall indicate the most recent RMSPower reading in milliwatts (mW).
@@ -366,7 +366,7 @@ export namespace ElectricalPowerMeasurement {
        *
        * @see {@link MatterSpecification.v13.Cluster} § 2.13.6.14
        */
-      rmsPower: OptionalAttribute(0xd, TlvNullable(TlvInt64.bound({ min: -262, max: 262 })), { default: null }),
+      rmsPower: OptionalAttribute(0xd, TlvNullable(TlvInt64.bound({ min: -(2 ** 62), max: 2 ** 62 })), { default: null }),
 
       /**
        * This shall indicate the most recent Frequency reading in millihertz (mHz).