fix: compatibility with Koenkk/zigbee2mqtt#29750 (#340)

* fix: compatibility with Koenkk/zigbee2mqtt#29750

* fix: update z2m, more fixes

Author: Nerivec

mocks/ws.ts

@@ -138,10 +138,10 @@ export function startServer() {
 
                                 (response.payload.data.value as Zigbee2MQTTNetworkMap).links[0].routes.push(
                                     ...[
-                                        { destinationAddress: 0x1234, nextHop: 14567, status: "ACTIVE" },
-                                        { destinationAddress: 0x5678, nextHop: 14567, status: "DISCOVERY_UNDERWAY" },
-                                        { destinationAddress: 0x2345, nextHop: 14567, status: "DISCOVERY_FAILED" },
-                                        { destinationAddress: 0x7890, nextHop: 14567, status: "INACTIVE" },
+                                        { destinationAddress: 0x1234, nextHopAddress: 14567, status: "ACTIVE" },
+                                        { destinationAddress: 0x5678, nextHopAddress: 14567, status: "DISCOVERY_UNDERWAY" },
+                                        { destinationAddress: 0x2345, nextHopAddress: 14567, status: "DISCOVERY_FAILED" },
+                                        { destinationAddress: 0x7890, nextHopAddress: 14567, status: "INACTIVE" },
                                     ],
                                 );
                             }

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "zigbee2mqtt-windfront",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "license": "GPL-3.0-or-later",
     "type": "module",
     "main": "./index.js",

package.json

@@ -124,7 +124,7 @@ export default function Reporting({ sourceIdx, device }: ReportingProps): JSX.El
         async (rule: ReportingRule): Promise<void> => {
             const { cluster, endpoint, attribute, minimum_report_interval, maximum_report_interval, reportable_change } = rule;
 
-            await sendMessage(sourceIdx, "bridge/request/device/configure_reporting", {
+            await sendMessage(sourceIdx, "bridge/request/device/reporting/configure", {
                 id: device.ieee_address,
                 endpoint,
                 cluster,

src/components/device-page/tabs/Reporting.tsx

@@ -176,8 +176,8 @@ const RawNetworkMap = memo(({ sourceIdx, map }: RawNetworkMapProps) => {
                     !bestSibling ||
                     // XXX: add exception when depth===255 (non-value)?
                     link.depth < bestSibling.depth ||
-                    link.linkquality > bestSibling.linkquality ||
-                    (bestSibling.linkquality === link.linkquality && link.depth < bestSibling.depth)
+                    link.lqi > bestSibling.lqi ||
+                    (bestSibling.lqi === link.lqi && link.depth < bestSibling.depth)
                 ) {
                     bestSiblings.set(link.source.ieeeAddr, link);
                 }
@@ -223,7 +223,7 @@ const RawNetworkMap = memo(({ sourceIdx, map }: RawNetworkMapProps) => {
             computedEdges.push({
                 id: `${link.source.ieeeAddr}-${link.target.ieeeAddr}-${link.relationship}`,
                 data: link,
-                label: oppositeLink ? `${link.linkquality} / ${oppositeLink.linkquality ?? "?"}` : `${link.linkquality}`,
+                label: oppositeLink ? `${link.lqi} / ${oppositeLink.lqi ?? "?"}` : `${link.lqi}`,
                 size: link.relationship === ZigbeeRelationship.NoneOfTheAbove ? 0.5 : 1,
                 labelVisible: true,
                 source: link.source.ieeeAddr,

src/components/network-page/RawNetworkMap.tsx

@@ -42,7 +42,7 @@ const RawRelation = memo(({ sourceIdx, relation, device, highlight, setHighlight
                     </div>
                     <div className="grow">{device.friendly_name}</div>
                     <span className="badge badge-ghost">
-                        <Lqi value={relation.linkquality} />
+                        <Lqi value={relation.lqi} />
                     </span>
                     <span className="badge badge-ghost" title={t(($) => $.depth)}>
                         <FontAwesomeIcon icon={faRoute} />
@@ -67,10 +67,9 @@ const RawRelation = memo(({ sourceIdx, relation, device, highlight, setHighlight
                             </li>
                             <ul>
                                 {relation.routes.map((route) => (
-                                    <li key={`${relation.source.ieeeAddr}-${route.destinationAddress}-${route.nextHop}-${route.status}`}>
+                                    <li key={`${relation.source.ieeeAddr}-${route.destinationAddress}-${route.nextHopAddress}-${route.status}`}>
                                         <span>
                                             ➥ {toHex(route.destinationAddress)} : {route.status}
-                                            {/** XXX: Z2M currently removes non-ACTIVE status */}
                                         </span>
                                     </li>
                                 ))}

src/components/network-page/raw-data/RawRelation.tsx

@@ -85,7 +85,7 @@ export default function ReportingPage(): JSX.Element {
                     const { sourceIdx, device, rule } = row.original;
 
                     promises.push(
-                        sendMessage(sourceIdx, "bridge/request/device/configure_reporting", {
+                        sendMessage(sourceIdx, "bridge/request/device/reporting/configure", {
                             id: device.ieee_address,
                             endpoint: rule.endpoint,
                             cluster: rule.cluster,
@@ -119,7 +119,7 @@ export default function ReportingPage(): JSX.Element {
     const availableEndpoints = useMemo(() => getEndpoints(newRuleDevice), [newRuleDevice]);
 
     const applyRule = useCallback(async (sourceIdx: number, device: Device, rule: ReportingRule): Promise<void> => {
-        await sendMessage(sourceIdx, "bridge/request/device/configure_reporting", {
+        await sendMessage(sourceIdx, "bridge/request/device/reporting/configure", {
             id: device.ieee_address,
             ...rule,
             option: {},