@autorunify/capacitor-nrfmesh 0.0.17 → 0.0.19

package/Android-nRF-Mesh-Library/mesh/src/main/java/no/nordicsemi/android/mesh/MeshNetwork.java

@@ -1,25 +1,26 @@
 
 package no.nordicsemi.android.mesh;
 
+import static no.nordicsemi.android.mesh.AddressRange.isAddressInAnyRanges;
+
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.room.Entity;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-import androidx.room.Entity;
 import no.nordicsemi.android.mesh.transport.Element;
 import no.nordicsemi.android.mesh.transport.MeshModel;
 import no.nordicsemi.android.mesh.transport.ProvisionedMeshNode;
 import no.nordicsemi.android.mesh.utils.MeshAddress;
 
-import static no.nordicsemi.android.mesh.AddressRange.isAddressInAnyRanges;
-
 @SuppressWarnings({"WeakerAccess", "UnusedReturnValue"})
 @Entity(tableName = "mesh_network")
 public final class MeshNetwork extends BaseMeshNetwork {
@@ -156,43 +157,54 @@ public final class MeshNetwork extends BaseMeshNetwork {
         }
         // Excluded addresses with the current IvIndex and current IvIndex - 1 must be considered as addresses in use.
         final List<Integer> addressesWithCurrentIvIndex = networkExclusions.get(ivIndex.getIvIndex());
-        if (addressesWithCurrentIvIndex != null)
-            usedAddresses.addAll(addressesWithCurrentIvIndex);
+//        if (addressesWithCurrentIvIndex != null)
+//            usedAddresses.addAll(addressesWithCurrentIvIndex);
         final List<Integer> addressesWithCurrentIvIndexMinusOne = networkExclusions.get(ivIndex.getIvIndex() - 1);
-        if (addressesWithCurrentIvIndexMinusOne != null)
-            usedAddresses.addAll(addressesWithCurrentIvIndexMinusOne);
+//        if (addressesWithCurrentIvIndexMinusOne != null)
+//            usedAddresses.addAll(addressesWithCurrentIvIndexMinusOne);
 
         Collections.sort(usedAddresses);
         // Iterate through all nodes just once, while iterating over ranges.
-        int index = 0;
+        boolean findAddress = false;
         for (AllocatedUnicastRange range : provisioner.getAllocatedUnicastRanges()) {
             // Start from the beginning of the current range.
-            int address = range.getLowAddress();
+            int lowAddress = range.getLowAddress();
+            findAddress = false;
 
             // Iterate through nodes that weren't checked yet in essence the used addresses which include the excluded adresses
             for (int usedAddress : usedAddresses) {
 
                 // Skip nodes with addresses below the range.
-                if (address > usedAddress) {
+                if (lowAddress > usedAddress) {
                     continue;
                 }
 
                 // If we found a space before the current node, return the address.
-                if (usedAddress > (address + (elementCount - 1))) {
-                    return address;
+                if (usedAddress > (lowAddress + (elementCount - 1))) {
+                    findAddress = true;
+                    break;
                 }
 
                 // Else, move the address to the next available address.
-                address = usedAddress + 1;
+                lowAddress = usedAddress + 1;
 
                 // If the new address is outside of the range, go to the next one.
-                if (range.highAddress < address + (elementCount - 1)) {
+                if (range.highAddress < lowAddress + (elementCount - 1)) {
                     break;
                 }
             }
 
-            if (range.getHighAddress() >= address + (elementCount - 1)) {
-                return address;
+            if (findAddress || usedAddresses.size() == 1) {
+                for (int i = 0; i < elementCount; i++) {
+                    if (addressesWithCurrentIvIndex != null)
+                        addressesWithCurrentIvIndex.remove((Object) (lowAddress + i));
+                    if (addressesWithCurrentIvIndexMinusOne != null)
+                        addressesWithCurrentIvIndexMinusOne.remove((Object) (lowAddress + i));
+                }
+            }
+
+            if (range.getHighAddress() >= lowAddress + (elementCount - 1)) {
+                return lowAddress;
             }
         }
 

package/android/src/main/java/com/autorunify/capacitor/nrfmesh/FormatManager.kt

@@ -311,8 +311,8 @@ class FormatManager {
         val pub = msg.heartbeatPublication
         return JSObject().apply {
             put("address", pub.dst)
-            put("count", Utils.decodeHeartbeatCount(pub.countLog.toInt()))
-            put("period", Utils.decodeHeartbeatPeriod(pub.periodLog.toInt()))
+            put("count", Utils.Pwr2(pub.countLog.toInt()))
+            put("period", Utils.Pwr2(pub.periodLog.toInt()))
             put("ttl", pub.ttl)
             put("netkeyIndex", pub.netKeyIndex)
             put("features", JSObject().apply {
@@ -329,8 +329,8 @@ class FormatManager {
         return JSObject().apply {
             put("srcAddress", sub.src)
             put("dstAddress", sub.dst)
-            put("period", Utils.decodeHeartbeatPeriod(sub.periodLog.toInt()))
-            put("count", Utils.decodeHeartbeatCount(sub.countLog.toInt()))
+            put("period", Utils.Pwr2(sub.periodLog.toInt()))
+            put("count", Utils.Pwr2(sub.countLog.toInt()))
             put("minHops", sub.minHops)
             put("maxHops", sub.maxHops)
         }

package/android/src/main/java/com/autorunify/capacitor/nrfmesh/NrfMeshPlugin.kt

@@ -739,8 +739,8 @@ class NrfMeshPlugin : Plugin {
 
                             val message = ConfigHeartbeatPublicationSet(
                                 address,
-                                Utils.encodeHeartbeatCount(count).toByte(),
-                                Utils.encodeHeartbeatPeriod(period).toByte(),
+                                Utils.Log2(count.toLong()).toByte(),
+                                Utils.Log2(period.toLong()).toByte(),
                                 ttl,
                                 features,
                                 netkeyIndex
@@ -765,7 +765,7 @@ class NrfMeshPlugin : Plugin {
                             val message = ConfigHeartbeatSubscriptionSet(
                                 srcAddress,
                                 dstAddress,
-                                Utils.encodeHeartbeatPeriod(period).toByte()
+                                Utils.Log2(period.toLong()).toByte()
                             )
 
                             pairs.add(MessagePair(CONFIG_HEARTBEAT_SUBSCRIPTION_SET, message))

package/android/src/main/java/com/autorunify/capacitor/nrfmesh/Utils.kt

@@ -5,31 +5,26 @@ import kotlin.math.pow
 
 class Utils {
     companion object {
-        fun decodeHeartbeatPeriod(periodLog: Int): Int {
-            if (periodLog == 0x00) return 0x0000
-            if (periodLog == 0x11 || periodLog == -1) return 0xFFFF
-
-            return (2.0).pow(periodLog.toDouble() - 1).toInt()
-        }
-
-        fun encodeHeartbeatPeriod(period: Int): Int {
-            if (period == 0x0000) return 0x00
-            if (period == 0xFFFF) return 0x11
-
-            return ((ln(period.toDouble()) / ln(2.0)) + 1).toInt()
-        }
-
-        fun decodeHeartbeatCount(countLog: Int): Int {
-            if (countLog == 0x00) return 0x0000
-            if (countLog == -1 || countLog == 0x11) return 0xFFFF
-            return ((2.0).pow(countLog.toDouble() - 1)).toInt()
+        fun Pwr2(value: Int): Int {
+            val maskedVal =
+                value and 0xFF // Ensure we are only treating it as an 8-bit unsigned value
+            return when (maskedVal) {
+                0x00 -> 0x0000
+                0xFF -> 0xFFFF
+                else -> 1 shl (maskedVal - 1)
+            }
         }
 
-        fun encodeHeartbeatCount(count: Int): Int {
-            if (count == 0x0000) return 0x00
-            if (count == 0xFFFF) return 0x11
+        fun Log2(value: Long): Int {
+            val maskedVal = value and 0xFFFFFFFFL // Ensure we treat it as a 32-bit unsigned value
+            if (maskedVal == 0L) {
+                return 0x00
+            }
 
-            return ((ln(count.toDouble()) / ln(2.0)) + 1).toInt()
+            // Integer.numberOfLeadingZeros expects a 32-bit Int.
+            // We convert our masked value to Int to get the accurate leading zero count.
+            val leadingZeros = java.lang.Integer.numberOfLeadingZeros(maskedVal.toInt())
+            return 32 - leadingZeros
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorunify/capacitor-nrfmesh",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "nrf mesh plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",