react-native-bluetooth-escpos-printer-fork 0.0.19 → 0.0.21

package/ios/RNBluetoothManager.m

@@ -236,30 +236,13 @@ RCT_EXPORT_METHOD(scanDevices:(RCTPromiseResolveBlock)resolve
             NSString *name = connected.name ? connected.name : @"";
             NSString *address = connected.identifier.UUIDString;
             
-            // Create device info with device class for connected device
             NSMutableDictionary *deviceInfo = [[NSMutableDictionary alloc] init];
             [deviceInfo setObject:address forKey:@"address"];
             [deviceInfo setObject:name forKey:@"name"];
-            [deviceInfo setObject:@(0) forKey:@"rssi"];  // Unknown RSSI for already connected device
-            
-            // Try to infer if it's a printer from the name
-            BOOL isPrinter = NO;
-            NSString *upperName = name.uppercaseString;
-            if ([upperName containsString:@"PRINT"] || 
-                [upperName containsString:@"POS"] ||
-                [upperName containsString:@"ESCPOS"] ||
-                [upperName containsString:@"THERMAL"] ||
-                [upperName containsString:@"RECEIPT"]) {
-                isPrinter = YES;
-            }
-            
-            if (isPrinter) {
-                [deviceInfo setObject:@(1536) forKey:@"majorDeviceClass"];  // Imaging
-                [deviceInfo setObject:@(1664) forKey:@"deviceClass"];       // Printer
-            } else {
-                [deviceInfo setObject:@(7936) forKey:@"majorDeviceClass"];  // Unknown
-                [deviceInfo setObject:@(7936) forKey:@"deviceClass"];       // Unknown
-            }
+            [deviceInfo setObject:@(0) forKey:@"rssi"];
+            [deviceInfo setObject:@(0) forKey:@"deviceClass"];
+            [deviceInfo setObject:@(0) forKey:@"majorDeviceClass"];
+            [deviceInfo setObject:@{} forKey:@"advertisementData"];
             
             NSDictionary *peripheralStored = @{address:connected};
             if(!self.foundDevices){
@@ -280,7 +263,7 @@ RCT_EXPORT_METHOD(scanDevices:(RCTPromiseResolveBlock)resolve
             [timer invalidate];
             timer = nil;
         }
-        timer = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(callStop) userInfo:nil repeats:NO];
+        timer = [NSTimer scheduledTimerWithTimeInterval:12 target:self selector:@selector(callStop) userInfo:nil repeats:NO];
     
     }
     @catch(NSException *exception){
@@ -540,52 +523,46 @@ RCT_EXPORT_METHOD(unpaire:(NSString *)address
     
     // Try to infer device class from advertising data
     // iOS BLE doesn't expose Classic Bluetooth device class, but we can make educated guesses
-    NSInteger deviceClass = 0;
-    NSInteger majorDeviceClass = 0;
-    
-    // Check if device advertises printer-related services
+    // Build advertisementData dictionary for JS layer
+    NSMutableDictionary *advData = [[NSMutableDictionary alloc] init];
+
+    // Service UUIDs
     NSArray *serviceUUIDs = advertisementData[CBAdvertisementDataServiceUUIDsKey];
-    BOOL isPrinter = NO;
-    
     if (serviceUUIDs && serviceUUIDs.count > 0) {
+        NSMutableArray *uuidStrings = [[NSMutableArray alloc] init];
         for (CBUUID *uuid in serviceUUIDs) {
-            NSString *uuidString = uuid.UUIDString.uppercaseString;
-            // Serial Port Profile (SPP) UUID - common for printers
-            // Also check for other printer-related service UUIDs
-            if ([uuidString isEqualToString:@"00001101-0000-1000-8000-00805F9B34FB"] ||
-                [uuidString isEqualToString:@"49535343-FE7D-4AE5-8FA9-9FAFD205E455"] ||
-                [uuidString containsString:@"18F0"]) {
-                isPrinter = YES;
-                break;
-            }
+            [uuidStrings addObject:uuid.UUIDString];
         }
+        [advData setObject:uuidStrings forKey:@"serviceUUIDs"];
     }
-    
-    // Check device name for printer keywords
-    NSString *name = peripheral.name ? peripheral.name.uppercaseString : @"";
-    if ([name containsString:@"PRINT"] || 
-        [name containsString:@"POS"] ||
-        [name containsString:@"ESCPOS"] ||
-        [name containsString:@"THERMAL"] ||
-        [name containsString:@"RECEIPT"]) {
-        isPrinter = YES;
+
+    // Local name (may differ from peripheral.name)
+    NSString *localName = advertisementData[CBAdvertisementDataLocalNameKey];
+    if (localName) {
+        [advData setObject:localName forKey:@"localName"];
     }
-    
-    if (isPrinter) {
-        // Android Bluetooth Class values for printers:
-        // Major Device Class: 0x0600 (Imaging - printers, scanners, cameras, etc.)
-        // Device Class: 0x000680 (Imaging/Printer)
-        majorDeviceClass = 1536;  // 0x0600 in decimal
-        deviceClass = 1664;       // 0x0680 in decimal
-    } else {
-        // Unknown/Unclassified device
-        // Major Device Class: 0x1F00 (Uncategorized)
-        majorDeviceClass = 7936;  // 0x1F00 in decimal
-        deviceClass = 7936;
+
+    // Manufacturer data as base64
+    NSData *manufacturerData = advertisementData[CBAdvertisementDataManufacturerDataKey];
+    if (manufacturerData) {
+        [advData setObject:[manufacturerData base64EncodedStringWithOptions:0] forKey:@"manufacturerData"];
     }
-    
-    [deviceInfo setObject:@(deviceClass) forKey:@"deviceClass"];
-    [deviceInfo setObject:@(majorDeviceClass) forKey:@"majorDeviceClass"];
+
+    // TX power level
+    NSNumber *txPowerLevel = advertisementData[CBAdvertisementDataTxPowerLevelKey];
+    if (txPowerLevel) {
+        [advData setObject:txPowerLevel forKey:@"txPowerLevel"];
+    }
+
+    // Connectable flag
+    NSNumber *isConnectable = advertisementData[CBAdvertisementDataIsConnectable];
+    if (isConnectable) {
+        [advData setObject:isConnectable forKey:@"isConnectable"];
+    }
+
+    [deviceInfo setObject:@(0) forKey:@"deviceClass"];
+    [deviceInfo setObject:@(0) forKey:@"majorDeviceClass"];
+    [deviceInfo setObject:advData forKey:@"advertisementData"];
     
     // Store the peripheral object for connection
     NSDictionary *peripheralStored = @{peripheral.identifier.UUIDString:peripheral};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bluetooth-escpos-printer-fork",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "React-Native plugin for the bluetooth ESC/POS printers.",
   "main": "index.js",
   "scripts": {