@ruhiverse/thermal-printer-plugin 1.0.8 → 1.0.9

package/android/src/main/java/com/ruhiverse/thermalprinter/ThermalPrinterPlugin.java

@@ -4,6 +4,8 @@ import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.PendingIntent;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -11,6 +13,8 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -35,6 +39,8 @@ import com.ruhiverse.thermalprinter.AsyncBluetoothEscPosPrint;
 import com.ruhiverse.thermalprinter.AsyncEscPosPrint;
 import com.ruhiverse.thermalprinter.AsyncEscPosPrinter;
 import com.ruhiverse.thermalprinter.AsyncUsbEscPosPrint;
+import java.util.HashSet;
+import java.util.Set;
 
 @CapacitorPlugin(
     name = "ThermalPrinter",
@@ -60,6 +66,12 @@ public class ThermalPrinterPlugin extends Plugin {
     public static final int PERMISSION_BLUETOOTH_CONNECT = 3;
     public static final int PERMISSION_BLUETOOTH_SCAN = 4;
     private static final String ACTION_USB_PERMISSION = "com.ruhiverse.thermalprinter.USB_PERMISSION";
+    
+    // Bluetooth discovery
+    private Set<BluetoothDevice> discoveredDevices = new HashSet<>();
+    private PluginCall discoveryCall;
+    private BroadcastReceiver discoveryReceiver;
+    private Handler discoveryHandler = new Handler(Looper.getMainLooper());
 
     private final BroadcastReceiver usbReceiver = new BroadcastReceiver() {
         public void onReceive(Context context, Intent intent) {
@@ -263,8 +275,13 @@ public class ThermalPrinterPlugin extends Plugin {
         this.checkBluetoothPermissions(
             () -> {
                 try {
-                    BluetoothConnection[] bluetoothPrinters = (new BluetoothPrintersConnections()).getList();
                     JSArray printers = new JSArray();
+                    discoveredDevices.clear();
+                    discoveryCall = call;
+                    
+                    // First, get paired printers
+                    BluetoothConnection[] bluetoothPrinters = (new BluetoothPrintersConnections()).getList();
+                    Set<String> pairedAddresses = new HashSet<>();
                     
                     if (bluetoothPrinters != null && bluetoothPrinters.length > 0) {
                         for (BluetoothConnection printer : bluetoothPrinters) {
@@ -281,19 +298,19 @@ public class ThermalPrinterPlugin extends Plugin {
                                 printerObj.put("name", name);
                                 printerObj.put("address", address != null ? address : "");
                                 printers.put(printerObj);
+                                pairedAddresses.add(address);
                                 
-                                Log.d(TAG, "Found Bluetooth printer: " + name + " (" + address + ")");
+                                Log.d(TAG, "Found paired Bluetooth printer: " + name + " (" + address + ")");
                             } catch (Exception e) {
                                 Log.e(TAG, "Error processing printer: " + e.getMessage());
                             }
                         }
                     } else {
-                        Log.d(TAG, "No paired Bluetooth printers found. Make sure printers are paired in Android Settings.");
+                        Log.d(TAG, "No paired Bluetooth printers found. Starting discovery...");
                     }
                     
-                    JSObject ret = new JSObject();
-                    ret.put("printers", printers);
-                    call.resolve(ret);
+                    // Start Bluetooth discovery for unpaired devices
+                    startBluetoothDiscovery(printers, pairedAddresses);
                 } catch (Exception e) {
                     Log.e(TAG, "Error listing Bluetooth printers: " + e.getMessage(), e);
                     call.reject("Error listing Bluetooth printers: " + e.getMessage());
@@ -301,6 +318,123 @@ public class ThermalPrinterPlugin extends Plugin {
             }
         );
     }
+    
+    private void startBluetoothDiscovery(JSArray printers, java.util.Set<String> pairedAddresses) {
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        
+        if (bluetoothAdapter == null) {
+            Log.d(TAG, "Bluetooth not supported on this device");
+            JSObject ret = new JSObject();
+            ret.put("printers", printers);
+            if (discoveryCall != null) {
+                discoveryCall.resolve(ret);
+                discoveryCall = null;
+            }
+            return;
+        }
+        
+        if (!bluetoothAdapter.isEnabled()) {
+            Log.d(TAG, "Bluetooth is not enabled");
+            JSObject ret = new JSObject();
+            ret.put("printers", printers);
+            if (discoveryCall != null) {
+                discoveryCall.resolve(ret);
+                discoveryCall = null;
+            }
+            return;
+        }
+        
+        // Register receiver for discovered devices
+        discoveryReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                String action = intent.getAction();
+                if (BluetoothDevice.ACTION_FOUND.equals(action)) {
+                    BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                    if (device != null && !pairedAddresses.contains(device.getAddress())) {
+                        discoveredDevices.add(device);
+                        String name = device.getName();
+                        if (name == null || name.isEmpty()) {
+                            name = "Unknown Device";
+                        }
+                        Log.d(TAG, "Discovered Bluetooth device: " + name + " (" + device.getAddress() + ")");
+                    }
+                } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
+                    // Discovery finished, add discovered devices to results
+                    JSArray finalPrinters = printers;
+                    for (BluetoothDevice device : discoveredDevices) {
+                        try {
+                            JSObject printerObj = new JSObject();
+                            String name = device.getName();
+                            if (name == null || name.isEmpty()) {
+                                name = "Unknown Device";
+                            }
+                            printerObj.put("name", name);
+                            printerObj.put("address", device.getAddress());
+                            finalPrinters.put(printerObj);
+                            Log.d(TAG, "Added discovered device: " + name + " (" + device.getAddress() + ")");
+                        } catch (Exception e) {
+                            Log.e(TAG, "Error adding discovered device: " + e.getMessage());
+                        }
+                    }
+                    
+                    // Unregister receiver
+                    try {
+                        getContext().unregisterReceiver(discoveryReceiver);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Error unregistering receiver: " + e.getMessage());
+                    }
+                    
+                    // Return results
+                    JSObject ret = new JSObject();
+                    ret.put("printers", finalPrinters);
+                    if (discoveryCall != null) {
+                        discoveryCall.resolve(ret);
+                        discoveryCall = null;
+                    }
+                    discoveryReceiver = null;
+                }
+            }
+        };
+        
+        // Register receiver
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothDevice.ACTION_FOUND);
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+        getContext().registerReceiver(discoveryReceiver, filter);
+        
+        // Start discovery
+        if (bluetoothAdapter.isDiscovering()) {
+            bluetoothAdapter.cancelDiscovery();
+        }
+        
+        Log.d(TAG, "Starting Bluetooth discovery...");
+        boolean started = bluetoothAdapter.startDiscovery();
+        
+        if (!started) {
+            Log.d(TAG, "Failed to start Bluetooth discovery");
+            try {
+                getContext().unregisterReceiver(discoveryReceiver);
+            } catch (Exception e) {
+                Log.e(TAG, "Error unregistering receiver: " + e.getMessage());
+            }
+            JSObject ret = new JSObject();
+            ret.put("printers", printers);
+            if (discoveryCall != null) {
+                discoveryCall.resolve(ret);
+                discoveryCall = null;
+            }
+            discoveryReceiver = null;
+        } else {
+            // Stop discovery after 8 seconds
+            discoveryHandler.postDelayed(() -> {
+                if (bluetoothAdapter.isDiscovering()) {
+                    bluetoothAdapter.cancelDiscovery();
+                    Log.d(TAG, "Discovery timeout, stopping scan");
+                }
+            }, 8000);
+        }
+    }
 
     @PluginMethod
     public void listUsbPrinters(PluginCall call) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruhiverse/thermal-printer-plugin",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Capacitor plugin for thermal printing via USB and Bluetooth",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",