@ruhiverse/thermal-printer-plugin 1.0.5 → 1.0.7

package/ios/Plugin/ThermalPrinterPlugin.swift

@@ -26,13 +26,11 @@ public class ThermalPrinterPlugin: CAPPlugin, CBCentralManagerDelegate, CBPeriph
     private var printCompletion: ((Bool, String?) -> Void)?
     private var printData: Data?
     private var targetPrintAddress: String?
+    private var listPrintersCall: CAPPluginCall?
     
     // Common BLE service UUIDs for thermal printers (Serial Port Profile)
+    // Note: We scan with nil services to find all peripherals, then filter by name
     private let serialPortServiceUUID = CBUUID(string: "00001101-0000-1000-8000-00805F9B34FB") // SPP
-    private let commonPrinterServiceUUIDs = [
-        CBUUID(string: "00001101-0000-1000-8000-00805F9B34FB"), // SPP
-        CBUUID(string: "E7810A71-73AE-499D-8C15-DAA9080B0E"),   // Some thermal printers
-    ]
     
     /// Find a connected External Accessory that matches the given (optional) name
     /// and supports one of the known printer protocols.
@@ -304,9 +302,11 @@ public class ThermalPrinterPlugin: CAPPlugin, CBCentralManagerDelegate, CBPeriph
         
         // Then scan for BLE printers
         discoveredPeripherals.removeAll()
+        listPrintersCall = call
         
+        // Initialize central manager if needed
         if centralManager == nil {
-            centralManager = CBCentralManager(delegate: self, queue: nil)
+            centralManager = CBCentralManager(delegate: self, queue: DispatchQueue.main)
         }
         
         guard let centralManager = centralManager else {
@@ -314,51 +314,98 @@ public class ThermalPrinterPlugin: CAPPlugin, CBCentralManagerDelegate, CBPeriph
             return
         }
         
-        // Wait a bit for central manager to be ready, then scan
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-            if centralManager.state == .poweredOn {
-                // Scan for all peripherals (we'll filter by name/characteristics)
-                centralManager.scanForPeripherals(withServices: nil, options: [CBCentralManagerScanOptionAllowDuplicatesKey: false])
-                
-                // Stop scanning after 5 seconds
-                DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
-                    centralManager.stopScan()
-                    
-                    // Add discovered BLE printers
-                    let blePrinters: [[String: String]] = self.discoveredPeripherals.compactMap { peripheral in
-                        guard let name = peripheral.name, !name.isEmpty else {
-                            return nil
-                        }
-                        // Filter for common printer names or accept all if we found them
-                        let printerKeywords = ["printer", "print", "thermal", "pos", "epson", "star", "receipt"]
-                        let isLikelyPrinter = printerKeywords.contains { keyword in
-                            name.lowercased().contains(keyword)
-                        }
-                        
-                        // Include if it's a likely printer or if we have no other printers found
-                        if isLikelyPrinter || printers.isEmpty {
-                            return [
-                                "name": name,
-                                "address": peripheral.identifier.uuidString,
-                            ]
-                        }
-                        return nil
-                    }
-                    
-                    printers.append(contentsOf: blePrinters)
-                    call.resolve(["printers": printers])
+        // Check Bluetooth state
+        switch centralManager.state {
+        case .poweredOn:
+            // Start scanning immediately
+            startBLEScan(for: call, existingPrinters: printers)
+        case .poweredOff:
+            call.resolve(["printers": printers])
+        case .unauthorized:
+            call.reject("Bluetooth access denied. Please enable Bluetooth permissions in Settings.")
+        case .unsupported:
+            call.reject("Bluetooth is not supported on this device.")
+        case .resetting, .unknown:
+            // Wait for state update
+            // The state will be updated via centralManagerDidUpdateState
+            break
+        @unknown default:
+            call.resolve(["printers": printers])
+        }
+    }
+    
+    private func startBLEScan(for call: CAPPluginCall, existingPrinters: [[String: String]]) {
+        guard let centralManager = centralManager else {
+            call.resolve(["printers": existingPrinters])
+            return
+        }
+        
+        guard centralManager.state == .poweredOn else {
+            call.resolve(["printers": existingPrinters])
+            return
+        }
+        
+        // Scan for all peripherals
+        centralManager.scanForPeripherals(withServices: nil, options: [CBCentralManagerScanOptionAllowDuplicatesKey: false])
+        
+        // Stop scanning after 5 seconds
+        DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
+            centralManager.stopScan()
+            
+            var printers = existingPrinters
+            
+            // Add discovered BLE printers - return all devices with names
+            let blePrinters: [[String: String]] = self.discoveredPeripherals.compactMap { peripheral in
+                // Return all peripherals with names, not just those matching keywords
+                // This allows users to see all Bluetooth devices and select their printer
+                guard let name = peripheral.name, !name.isEmpty else {
+                    return nil
                 }
-            } else {
-                // Bluetooth not available, return what we have
-                call.resolve(["printers": printers])
+                return [
+                    "name": name,
+                    "address": peripheral.identifier.uuidString,
+                ]
             }
+            
+            printers.append(contentsOf: blePrinters)
+            call.resolve(["printers": printers])
+            self.listPrintersCall = nil
         }
     }
     
     // MARK: - CBCentralManagerDelegate
     
     public func centralManagerDidUpdateState(_ central: CBCentralManager) {
-        // State updated, scanning will start when ready
+        // If we're waiting to list printers, start scanning now
+        if let call = listPrintersCall {
+            switch central.state {
+            case .poweredOn:
+                // Get existing MFi printers first
+                let manager = EAAccessoryManager.shared()
+                let accessories = manager.connectedAccessories
+                let mfiPrinters: [[String: String]] = accessories.compactMap { accessory in
+                    guard accessory.protocolStrings.contains(where: { supportedPrinterProtocols.contains($0) }) else {
+                        return nil
+                    }
+                    return [
+                        "name": accessory.name,
+                        "address": accessory.serialNumber.isEmpty ? "\(accessory.connectionID)" : accessory.serialNumber,
+                    ]
+                }
+                startBLEScan(for: call, existingPrinters: mfiPrinters)
+            case .poweredOff:
+                call.resolve(["printers": []])
+                listPrintersCall = nil
+            case .unauthorized:
+                call.reject("Bluetooth access denied. Please enable Bluetooth permissions in Settings.")
+                listPrintersCall = nil
+            case .unsupported:
+                call.reject("Bluetooth is not supported on this device.")
+                listPrintersCall = nil
+            default:
+                break
+            }
+        }
     }
     
     public func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber) {

package/package.json

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