simplejsble 0.0.9 → 0.0.15

package/android/build.gradle

@@ -113,6 +113,9 @@ android {
 
   sourceSets {
     main {
+      // Include simpledroidbridge Java sources (BluetoothGattCallback, ScanCallback)
+      java.srcDirs += ["../simpledroidbridge/src/main/java"]
+
       if (isNewArchitectureEnabled()) {
         java.srcDirs += [
           // React Codegen files

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +1,11 @@
 #include <jni.h>
 #include "NitroSimplejsbleOnLoad.hpp"
+#include <simpleble/Advanced.h>
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+  SimpleBLE::Advanced::Android::set_jvm(vm);
+
   return margelo::nitro::simplejsble::initialize(vm);
 }
+
+

package/dependencies/internal/include/simplejni/VM.hpp

@@ -21,10 +21,16 @@ class VM {
             }
             instance._jvm = jvm_override;
         } else if (instance._jvm == nullptr) {
+#ifdef __ANDROID__
+            // On Android (React Native/Expo), JNI_GetCreatedJavaVMs is not available at runtime.
+            // The JVM must be set explicitly via set_jvm() in JNI_OnLoad.
+            throw std::runtime_error("JavaVM not set. Call set_jvm() in JNI_OnLoad first.");
+#else
             jsize count;
             if (JNI_GetCreatedJavaVMs(&instance._jvm, 1, &count) != JNI_OK || count == 0) {
                 throw std::runtime_error("Failed to retrieve the Java Virtual Machine");
             }
+#endif
         }
         return instance._jvm;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplejsble",
-  "version": "0.0.9",
+  "version": "0.0.15",
   "description": "React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules",
   "main": "lib/index",
   "module": "lib/index",
@@ -15,6 +15,7 @@
     "ios/",
     "cpp/",
     "simpleble/",
+    "simpledroidbridge/",
     "cmake/",
     "dependencies/",
     "VERSION",

package/simpledroidbridge/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    id("com.android.library") version "8.7.1"
+}
+
+version = "v${file("../VERSION").readText().trim()}"
+
+android {
+    namespace = "org.simpleble.android.bridge"
+    compileSdk = 31
+
+    defaultConfig {
+        minSdk = 31
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_9
+        targetCompatibility = JavaVersion.VERSION_1_9
+    }
+    buildTypes {
+        getByName("debug") {
+            isJniDebuggable = true
+        }
+    }
+}

package/simpledroidbridge/settings.gradle.kts

@@ -0,0 +1,22 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "simpledroidbridge"

package/simpledroidbridge/src/main/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+>
+        <uses-permission android:name="android.permission.BLUETOOTH"/>
+        <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+        <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
+        <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
+</manifest>

package/simpledroidbridge/src/main/java/org/simpleble/android/bridge/BluetoothGattCallback.java

@@ -0,0 +1,141 @@
+package org.simpleble.android.bridge;
+
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.util.Log;
+
+public class BluetoothGattCallback extends android.bluetooth.BluetoothGattCallback {
+
+    public BluetoothGattCallback() {}
+
+    @Override
+    public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+        // NOTE: This method has been deprecated on API 33, but we're still using API 31, so we need to support this.
+        super.onCharacteristicChanged(gatt, characteristic);
+        onCharacteristicChangedCallback(gatt, characteristic, characteristic.getValue());
+    }
+
+    // @Override
+    // public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, byte[] value) {
+    //     // NOTE: This method is only available from API 33 onwards.
+    //     super.onCharacteristicChanged(gatt, characteristic, value);
+    //     onCharacteristicChangedCallback(gatt, characteristic, value);
+    // }
+
+    @Override
+    public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        // NOTE: This method has been deprecated on API 33, but we're still using API 31, so we need to support this.
+        super.onCharacteristicRead(gatt, characteristic, status);
+        onCharacteristicReadCallback(gatt, characteristic, characteristic.getValue(), status);
+    }
+
+    // @Override
+    // public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, byte[] value, int status) {
+    //     // NOTE: This method is only available from API 33 onwards.
+    //     super.onCharacteristicRead(gatt, characteristic, value, status);
+    //     onCharacteristicReadCallback(gatt, characteristic, value, status);
+    // }
+
+    @Override
+    public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        super.onCharacteristicWrite(gatt, characteristic, status);
+        onCharacteristicWriteCallback(gatt, characteristic, status);
+    }
+
+    @Override
+    public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
+        super.onConnectionStateChange(gatt, status, newState);
+        onConnectionStateChangeCallback(gatt, status, newState);
+    }
+
+    // NOTE: This method is only available from API 33 onwards
+    @Override
+    public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        // NOTE: This method has been deprecated on API 33, but we're still using API 31, so we need to support this.
+        super.onDescriptorRead(gatt, descriptor, status);
+        onDescriptorReadCallback(gatt, descriptor, descriptor.getValue(), status);
+    }
+
+    // @Override
+    // public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status, byte[] value) {
+    //     // NOTE: This method is only available from API 33 onwards.
+    //     super.onDescriptorRead(gatt, descriptor, status, value);
+    //     onDescriptorReadCallback(gatt, descriptor, value, status);
+    // }
+
+    @Override
+    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        super.onDescriptorWrite(gatt, descriptor, status);
+        onDescriptorWriteCallback(gatt, descriptor, status);
+    }
+
+    @Override
+    public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+        super.onMtuChanged(gatt, mtu, status);
+        onMtuChangedCallback(gatt, mtu, status);
+    }
+
+    @Override
+    public void onPhyRead(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {
+        super.onPhyRead(gatt, txPhy, rxPhy, status);
+        onPhyReadCallback(gatt, txPhy, rxPhy, status);
+    }
+
+    @Override
+    public void onPhyUpdate(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {
+        super.onPhyUpdate(gatt, txPhy, rxPhy, status);
+        onPhyUpdateCallback(gatt, txPhy, rxPhy, status);
+    }
+
+    @Override
+    public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
+        super.onReadRemoteRssi(gatt, rssi, status);
+        onReadRemoteRssiCallback(gatt, rssi, status);
+    }
+
+    @Override
+    public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {
+        super.onReliableWriteCompleted(gatt, status);
+        onReliableWriteCompletedCallback(gatt, status);
+    }
+
+    @Override
+    public void onServiceChanged(BluetoothGatt gatt) {
+        super.onServiceChanged(gatt);
+        onServiceChangedCallback(gatt);
+    }
+
+    @Override
+    public void onServicesDiscovered(BluetoothGatt gatt, int status) {
+        super.onServicesDiscovered(gatt, status);
+        onServicesDiscoveredCallback(gatt, status);
+    }
+
+    private native void onCharacteristicChangedCallback(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, byte[] value);
+
+    private native void onCharacteristicReadCallback(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, byte[] value, int status);
+
+    private native void onCharacteristicWriteCallback(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status);
+
+    private native void onConnectionStateChangeCallback(BluetoothGatt gatt, int status, int newState);
+
+    private native void onDescriptorReadCallback(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, byte[] value, int status);
+
+    private native void onDescriptorWriteCallback(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status);
+
+    private native void onMtuChangedCallback(BluetoothGatt gatt, int mtu, int status);
+
+    private native void onPhyReadCallback(BluetoothGatt gatt, int txPhy, int rxPhy, int status);
+
+    private native void onPhyUpdateCallback(BluetoothGatt gatt, int txPhy, int rxPhy, int status);
+
+    private native void onReadRemoteRssiCallback(BluetoothGatt gatt, int rssi, int status);
+
+    private native void onReliableWriteCompletedCallback(BluetoothGatt gatt, int status);
+
+    private native void onServiceChangedCallback(BluetoothGatt gatt);
+
+    private native void onServicesDiscoveredCallback(BluetoothGatt gatt, int status);
+}
+

package/simpledroidbridge/src/main/java/org/simpleble/android/bridge/ScanCallback.java

@@ -0,0 +1,36 @@
+package org.simpleble.android.bridge;
+
+import android.bluetooth.le.ScanResult;
+
+import java.util.List;
+import android.util.Log;
+
+public class ScanCallback extends android.bluetooth.le.ScanCallback {
+
+    public ScanCallback() {}
+
+    @Override
+    public void onScanResult(int callbackType, ScanResult result) {
+        super.onScanResult(callbackType, result);
+        onScanResultCallback(callbackType, result);
+    }
+
+    @Override
+    public void onBatchScanResults(List<ScanResult> results) {
+        super.onBatchScanResults(results);
+        onBatchScanResultsCallback(results);
+    }
+
+    @Override
+    public void onScanFailed(int errorCode) {
+        super.onScanFailed(errorCode);
+        onScanFailedCallback(errorCode);
+    }
+
+    private native void onScanResultCallback(int callbackType, android.bluetooth.le.ScanResult result);
+
+    private native void onScanFailedCallback(int errorCode);
+
+    private native void onBatchScanResultsCallback(List<android.bluetooth.le.ScanResult> results);
+
+}

package/lib/index.d.ts

@@ -1,2 +0,0 @@
-import type { Adapter } from "./specs/Adapter.nitro";
-export declare const HybridAdapter: Adapter;

package/lib/index.js

@@ -1,2 +0,0 @@
-import { NitroModules } from "react-native-nitro-modules";
-export const HybridAdapter = NitroModules.createHybridObject("Adapter");

package/lib/specs/Adapter.nitro.d.ts

@@ -1,9 +0,0 @@
-import { type HybridObject } from 'react-native-nitro-modules';
-export interface Adapter extends HybridObject<{
-    ios: 'c++';
-    android: 'c++';
-}> {
-    greet(name: string): string;
-    get_adapters(): Adapter[];
-    bluetooth_enabled(): boolean;
-}

package/lib/specs/Adapter.nitro.js

@@ -1 +0,0 @@
-import {} from 'react-native-nitro-modules';