@autorunify/capacitor-nrfmesh 0.0.15 → 0.0.16

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

@@ -110,7 +110,7 @@ class BleManager {
                     if (service == null || service.size < 18) return
 
 
-                    ble.mesh.delNodeByService(service)
+                    ble.mesh.delNodeByName(device.address.replace(":",""))
                     device.uuid = ble.mesh.uuidFromService(service).toString()
                     device.provisioned = false
 
@@ -134,7 +134,10 @@ class BleManager {
 
                 synchronized(ble.devices) {
                     val service = getService(result, MeshManagerApi.MESH_PROXY_UUID) ?: return
-                    if (!ble.mesh.isProvisionedByService(service)) return
+                    if (!ble.mesh.isProvisionedByService(service)) {
+                        ble.mesh.delNodeByName(device.address.replace("",""))
+                        return
+                    }
 
                     device.provisioned = true
 

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

@@ -171,7 +171,7 @@ class MeshManager {
                     address
                 )
 
-                is SensorStatus-> mesh.async.emit(
+                is SensorStatus -> mesh.async.emit(
                     mesh.formatter.toJSON(msg),
                     msg.opCode,
                     address
@@ -237,10 +237,10 @@ class MeshManager {
                     }
                 }
 
-                meshNode!!.nodeName=meshNode
+                meshNode!!.nodeName = meshNode
                     .uuid
-                    .replace("-","")
-                    .substring(8,20)
+                    .replace("-", "")
+                    .substring(8, 20)
 
                 mesh.async.emit(JSObject().apply {
                     put("completed", true)
@@ -448,16 +448,15 @@ class MeshManager {
         return api.getDeviceUuid(service)
     }
 
-    fun delNodeByService(service: ByteArray) {
-        api.meshNetwork?.nodes?.forEach { node ->
-            val uuid = uuidFromService(service)
-            if (node.uuid == uuid.toString()) {
-                api.meshNetwork?.deleteNode(node)
-                notify.notifyListeners("node", JSObject().apply {
-                    put("action", "del")
-                    put("unicastAddress", node.unicastAddress)
-                })
-            }
+    fun delNodeByName(name: String) {
+        api.meshNetwork?.nodes?.filter { node ->
+            node.nodeName.equals(name, true)
+        }?.forEach { node ->
+            api.meshNetwork?.deleteNode(node)
+            notify.notifyListeners("node", JSObject().apply {
+                put("action", "del")
+                put("unicastAddress", node.unicastAddress)
+            })
         }
     }
 

package/package.json

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