Release 0.3.0

Luligu · Jun 19, 2024 · 557c4b1 · 557c4b1
1 parent 91c4ab0
commit 557c4b1
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 93 deletions.
diff --git a/matterbridge-shelly.schema.json b/matterbridge-shelly.schema.json
@@ -24,21 +24,13 @@
     "exposeSwitch": {
       "description": "Choose how to expose the shelly switches: as a switch, light or outlet",
       "type": "string",
-      "enum": [
-        "switch",
-        "light",
-        "outlet"
-      ],
+      "enum": ["switch", "light", "outlet"],
       "default": "switch"
     },
     "exposeInput": {
       "description": "Choose how to expose the shelly inputs: disabled, contact or momentary switch",
       "type": "string",
-      "enum": [
-        "disabled",
-        "contact",
-        "momentary"
-      ],
+      "enum": ["disabled", "contact", "momentary"],
       "default": "disabled"
     },
     "blackList": {
@@ -99,4 +91,4 @@
       "default": false
     }
   }
-}
+}
diff --git a/package.json b/package.json
@@ -118,4 +118,4 @@
   "overrides": {
     "eslint": "latest"
   }
-}
+}
diff --git a/src/mock/shelly1minig3-543204547478.json b/src/mock/shelly1minig3-543204547478.json
@@ -137,9 +137,7 @@
   "status": {
     "ble": {},
     "bthome": {
-      "errors": [
-        "bluetooth_disabled"
-      ]
+      "errors": ["bluetooth_disabled"]
     },
     "cloud": {
       "connected": true
@@ -187,4 +185,4 @@
       "connected": false
     }
   }
-}
+}
diff --git a/src/mock/shelly1pmminig3-543204519264.json b/src/mock/shelly1pmminig3-543204519264.json
@@ -158,20 +158,12 @@
       "current": 0,
       "aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718609331
       },
       "ret_aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718609331
       },
       "temperature": {
@@ -210,4 +202,4 @@
       "connected": false
     }
   }
-}
+}
diff --git a/src/mock/shellydimmer2-98CDAC0D01BB.json b/src/mock/shellydimmer2-98CDAC0D01BB.json
@@ -205,11 +205,7 @@
         "overpower": 0,
         "is_valid": true,
         "timestamp": 1718616373,
-        "counters": [
-          0,
-          0,
-          0
-        ],
+        "counters": [0, 0, 0],
         "total": 0
       }
     ],
@@ -253,4 +249,4 @@
     "fs_free": 119476,
     "uptime": 122095
   }
-}
+}
diff --git a/src/mock/shellyplus1pm-441793d69718.json b/src/mock/shellyplus1pm-441793d69718.json
@@ -159,11 +159,7 @@
       "current": 0,
       "aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718609280
       },
       "temperature": {
@@ -198,4 +194,4 @@
       "connected": false
     }
   }
-}
+}
diff --git a/src/mock/shellyplus2pm-5443b23d81f8.roller.json b/src/mock/shellyplus2pm-5443b23d81f8.roller.json
@@ -181,11 +181,7 @@
       "freq": 50,
       "aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718609280
       },
       "temperature": {
@@ -237,4 +233,4 @@
       "connected": false
     }
   }
-}
+}
diff --git a/src/mock/shellyplus2pm-5443b23d81f8.switch.json b/src/mock/shellyplus2pm-5443b23d81f8.switch.json
@@ -191,20 +191,12 @@
       "pf": 0,
       "aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718643780
       },
       "ret_aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718643780
       },
       "temperature": {
@@ -223,20 +215,12 @@
       "pf": 0,
       "aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718643780
       },
       "ret_aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718643780
       },
       "temperature": {
@@ -275,4 +259,4 @@
       "connected": false
     }
   }
-}
+}
diff --git a/src/mock/shellyplusi4-cc7b5c8aea2c.json b/src/mock/shellyplusi4-cc7b5c8aea2c.json
@@ -199,4 +199,4 @@
       "connected": false
     }
   }
-}
+}
diff --git a/src/mock/shellypmminig3-84fce63957f4.json b/src/mock/shellypmminig3-84fce63957f4.json
@@ -123,9 +123,7 @@
   "status": {
     "ble": {},
     "bthome": {
-      "errors": [
-        "bluetooth_disabled"
-      ]
+      "errors": ["bluetooth_disabled"]
     },
     "cloud": {
       "connected": true
@@ -141,20 +139,12 @@
       "freq": 50,
       "aenergy": {
         "total": 509.289,
-        "by_minute": [
-          0,
-          0,
-          213.298
-        ],
+        "by_minute": [0, 0, 213.298],
         "minute_ts": 1718609280
       },
       "ret_aenergy": {
         "total": 0,
-        "by_minute": [
-          0,
-          0,
-          0
-        ],
+        "by_minute": [0, 0, 0],
         "minute_ts": 1718609280
       }
     },
@@ -185,4 +175,4 @@
       "connected": false
     }
   }
-}
+}
diff --git a/src/mock/shellyswitch25-3494546BBF7E.json b/src/mock/shellyswitch25-3494546BBF7E.json
@@ -253,23 +253,15 @@
         "overpower": 0,
         "is_valid": true,
         "timestamp": 1718616379,
-        "counters": [
-          0,
-          0,
-          0
-        ],
+        "counters": [0, 0, 0],
         "total": 0
       },
       {
         "power": 0,
         "overpower": 0,
         "is_valid": true,
         "timestamp": 1718616379,
-        "counters": [
-          0,
-          0,
-          0
-        ],
+        "counters": [0, 0, 0],
         "total": 0
       }
     ],
@@ -307,4 +299,4 @@
     "voltage": 240.36,
     "uptime": 122102
   }
-}
+}
diff --git a/src/utils.spec.ts b/src/utils.spec.ts
@@ -1,5 +1,4 @@
 import { deepEqual, deepCopy, getIpv4InterfaceAddress, getIpv6InterfaceAddress } from 'matterbridge';
-import { ShellyData } from './shellyTypes';
 import { promises as fs } from 'fs';
 import path from 'path';