@munchi_oy/react-native-label-printer 2.0.0 → 2.0.2

package/ios/BrotherPrinterModule.mm

@@ -164,48 +164,160 @@ RCT_REMAP_METHOD(checkPrinterAtIp,
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-  @try {
-    BRLMChannel *channel = [[BRLMChannel alloc] initWithWifiIPAddress:ipAddress];
-    if (channel == nil) {
-      NSMutableDictionary *result = [self errorWithStage:@"channel_create" reason:@"Failed to create BRLMChannel from IP"];
-      result[@"inputIp"] = ipAddress ?: @"";
-      resolve(result);
-      return;
-    }
+  dispatch_async([self labelPrintQueue], ^{
+    @try {
+      NSInteger maxAttempts = 4;
+      NSTimeInterval retryDelay = 1.0;
+      NSMutableArray *attemptLogs = [NSMutableArray array];
+      NSMutableDictionary *lastFailure = nil;
 
-    BRLMPrinterDriverGenerateResult *openResult = [BRLMPrinterDriverGenerator openChannel:channel];
+      for (NSInteger attempt = 1; attempt <= maxAttempts; attempt++) {
+        id driver = nil;
 
-    if (openResult == nil) {
-      NSMutableDictionary *result = [self errorWithStage:@"open_channel" reason:@"openChannel returned nil"];
-      result[@"inputIp"] = ipAddress ?: @"";
-      resolve(result);
-      return;
-    }
+        @try {
+          BRLMChannel *channel = [[BRLMChannel alloc] initWithWifiIPAddress:ipAddress];
+          if (channel == nil) {
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"channel_create"
+                                                 reason:@"Failed to create BRLMChannel from IP"];
+            [attemptLogs addObject:lastFailure];
+
+            if (attempt < maxAttempts) {
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
+            continue;
+          }
+
+          BRLMPrinterDriverGenerateResult *openResult = [BRLMPrinterDriverGenerator openChannel:channel];
+
+          NSInteger openChannelCode = 0;
+          NSString *openChannelError = @"";
+          if (openResult != nil && openResult.error != nil) {
+            openChannelCode = openResult.error.code;
+            openChannelError = [openResult.error description] ?: @"";
+          }
+
+          if (openResult == nil || openResult.driver == nil) {
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"open_channel"
+                                                 reason:@"Failed to open printer driver from channel"
+                                                 extras:@{
+                                                   @"openChannelCode": @(openChannelCode),
+                                                   @"openChannelError": openChannelError
+                                                 }];
+            [attemptLogs addObject:lastFailure];
+
+            // warm-up open/close, same idea as print flow
+            if (attempt < maxAttempts) {
+              @try {
+                BRLMChannel *warmupChannel = [[BRLMChannel alloc] initWithWifiIPAddress:ipAddress];
+                if (warmupChannel != nil) {
+                  BRLMPrinterDriverGenerateResult *warmupResult =
+                    [BRLMPrinterDriverGenerator openChannel:warmupChannel];
+
+                  if (warmupResult != nil && warmupResult.driver != nil) {
+                    if ([warmupResult.driver respondsToSelector:@selector(closeChannel)]) {
+                      [warmupResult.driver closeChannel];
+                    }
+                  }
+                }
+              } @catch (NSException *warmupException) {
+              }
+
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
+            continue;
+          }
+
+          driver = openResult.driver;
+
+          // settle time after reconnect/open
+          [NSThread sleepForTimeInterval:0.8];
+
+          BRLMGetPrinterStatusResult *statusResult = nil;
+          BOOL printerReady = NO;
+
+          for (NSInteger statusTry = 1; statusTry <= 3; statusTry++) {
+            statusResult = [driver getPrinterStatus];
+
+            if (statusResult != nil && statusResult.status != nil) {
+              printerReady = YES;
+              break;
+            }
+
+            if (statusTry < 3) {
+              [NSThread sleepForTimeInterval:0.7];
+            }
+          }
+
+          if (!printerReady) {
+            if (driver && [driver respondsToSelector:@selector(closeChannel)]) {
+              [driver closeChannel];
+            }
+
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"get_status"
+                                                 reason:@"Failed to get printer status after reconnect"
+                                                 extras:@{
+                                                   @"statusAvailable": @(statusResult != nil),
+                                                   @"statusObjectAvailable": @((statusResult != nil && statusResult.status != nil))
+                                                 }];
+            [attemptLogs addObject:lastFailure];
+
+            if (attempt < maxAttempts) {
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
+            continue;
+          }
+
+          NSDictionary *success = @{
+            @"ok": @YES,
+            @"inputIp": ipAddress ?: @"",
+            @"stage": @"open_channel_success",
+            @"attempt": @(attempt),
+            @"attemptLogs": attemptLogs
+          };
+
+          if (driver && [driver respondsToSelector:@selector(closeChannel)]) {
+            [driver closeChannel];
+          }
+
+          resolve(success);
+          return;
 
-    if (openResult.driver == nil) {
-      NSMutableDictionary *result = [self errorWithStage:@"open_channel"
-                                                  reason:@"Failed to open printer driver from channel"
-                                                  extras:@{ @"openChannelError": openResult.error ? [openResult.error description] : @"" }];
+        } @catch (NSException *innerException) {
+          if (driver && [driver respondsToSelector:@selector(closeChannel)]) {
+            [driver closeChannel];
+          }
+
+          lastFailure = [self attemptErrorWithAttempt:attempt
+                                                stage:@"exception"
+                                               reason:innerException.reason ?: @"Unknown native exception"];
+          [attemptLogs addObject:lastFailure];
+
+          if (attempt < maxAttempts) {
+            [NSThread sleepForTimeInterval:retryDelay];
+          }
+        }
+      }
+
+      NSMutableDictionary *result = [self errorWithStage:@"retry_exhausted"
+                                                  reason:@"Printer connection test failed after all recovery attempts"];
       result[@"inputIp"] = ipAddress ?: @"";
+      result[@"attemptLogs"] = attemptLogs;
+
+      if (lastFailure != nil) {
+        result[@"lastFailureStage"] = lastFailure[@"stage"] ?: @"unknown";
+        result[@"lastFailureReason"] = lastFailure[@"reason"] ?: @"Unknown error";
+        result[@"lastFailureDetails"] = lastFailure;
+      }
+
       resolve(result);
-      return;
-    }
 
-    if ([openResult.driver respondsToSelector:@selector(closeChannel)]) {
-      [openResult.driver closeChannel];
+    } @catch (NSException *exception) {
+      reject(@"CHECK_PRINTER_IP_ERROR", exception.reason, nil);
     }
-
-    resolve(@{
-      @"ok": @YES,
-      @"inputIp": ipAddress ?: @"",
-      @"stage": @"open_channel_success",
-      @"channelInfo": channel.channelInfo ?: @"",
-      @"extraInfo": channel.extraInfo ?: @{},
-      @"driverClass": NSStringFromClass([openResult.driver class])
-    });
-  } @catch (NSException *exception) {
-    reject(@"CHECK_PRINTER_IP_ERROR", exception.reason, nil);
-  }
+  });
 }
 
 RCT_REMAP_METHOD(printLabel,
@@ -246,10 +358,11 @@ RCT_REMAP_METHOD(printLabel,
       CGFloat titlePointSize = [fontSizes[@"title"] doubleValue];
       CGFloat bodyPointSize = [fontSizes[@"body"] doubleValue];
 
-      NSInteger maxAttempts = 3;
-      NSTimeInterval retryDelay = 0.35;
+      NSInteger maxAttempts = 4;
+      NSTimeInterval retryDelay = 1.0;
       NSMutableArray *attemptLogs = [NSMutableArray array];
       NSDictionary *finalSuccessResult = nil;
+      NSMutableDictionary *lastFailure = nil;
 
       for (NSInteger attempt = 1; attempt <= maxAttempts; attempt++) {
         BRLMChannel *channel = nil;
@@ -258,44 +371,123 @@ RCT_REMAP_METHOD(printLabel,
         @try {
           channel = [[BRLMChannel alloc] initWithWifiIPAddress:ipAddress];
           if (channel == nil) {
-            [attemptLogs addObject:[self attemptErrorWithAttempt:attempt stage:@"channel_create" reason:@"Failed to create channel"]];
-            if (attempt < maxAttempts) [NSThread sleepForTimeInterval:retryDelay];
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"channel_create"
+                                                 reason:@"Failed to create channel"];
+            [attemptLogs addObject:lastFailure];
+
+            if (attempt < maxAttempts) {
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
             continue;
           }
 
           BRLMPrinterDriverGenerateResult *openResult = [BRLMPrinterDriverGenerator openChannel:channel];
 
+          NSInteger openChannelCode = 0;
+          NSString *openChannelError = @"";
+          if (openResult != nil && openResult.error != nil) {
+            openChannelCode = openResult.error.code;
+            openChannelError = [openResult.error description] ?: @"";
+          }
+
           if (openResult == nil || openResult.driver == nil) {
-            [attemptLogs addObject:[self attemptErrorWithAttempt:attempt
-                                                           stage:@"open_channel"
-                                                          reason:@"Failed to open driver"
-                                                          extras:@{ @"openChannelError": openResult.error ? [openResult.error description] : @"" }]];
-            if (attempt < maxAttempts) [NSThread sleepForTimeInterval:retryDelay];
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"open_channel"
+                                                 reason:@"Failed to open driver"
+                                                 extras:@{
+                                                   @"openChannelCode": @(openChannelCode),
+                                                   @"openChannelError": openChannelError
+                                                 }];
+            [attemptLogs addObject:lastFailure];
+
+       
+            if (attempt < maxAttempts) {
+              @try {
+                BRLMChannel *warmupChannel = [[BRLMChannel alloc] initWithWifiIPAddress:ipAddress];
+                if (warmupChannel != nil) {
+                  BRLMPrinterDriverGenerateResult *warmupResult = [BRLMPrinterDriverGenerator openChannel:warmupChannel];
+                  if (warmupResult != nil && warmupResult.driver != nil) {
+                    if ([warmupResult.driver respondsToSelector:@selector(closeChannel)]) {
+                      [warmupResult.driver closeChannel];
+                    }
+                  }
+                }
+              } @catch (NSException *warmupException) {
+              
+              }
+
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
             continue;
           }
 
           driver = openResult.driver;
 
-        
+         
+          [NSThread sleepForTimeInterval:0.8];
+
           BRLMQLPrintSettings *settings = [[BRLMQLPrintSettings alloc] initDefaultPrintSettingsWithPrinterModel:BRLMPrinterModelQL_810W];
 
           if (settings == nil) {
             if ([driver respondsToSelector:@selector(closeChannel)]) {
               [driver closeChannel];
             }
-            [attemptLogs addObject:[self attemptErrorWithAttempt:attempt stage:@"settings_create" reason:@"Failed to create QL print settings"]];
-            if (attempt < maxAttempts) [NSThread sleepForTimeInterval:retryDelay];
+
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"settings_create"
+                                                 reason:@"Failed to create QL print settings"];
+            [attemptLogs addObject:lastFailure];
+
+            if (attempt < maxAttempts) {
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
             continue;
           }
 
-          BRLMGetPrinterStatusResult *statusResult = [driver getPrinterStatus];
-          BRLMMediaInfo *mediaInfo = statusResult.status.mediaInfo;
+          BRLMGetPrinterStatusResult *statusResult = nil;
+          BRLMMediaInfo *mediaInfo = nil;
+          BOOL printerReady = NO;
 
-          bool succeeded = false;
-          if (mediaInfo != nil) {
-            settings.labelSize = [mediaInfo getQLLabelSize:&succeeded];
+          for (NSInteger statusTry = 1; statusTry <= 3; statusTry++) {
+            statusResult = [driver getPrinterStatus];
+
+            if (statusResult != nil && statusResult.status != nil) {
+              mediaInfo = statusResult.status.mediaInfo;
+              if (mediaInfo != nil) {
+                printerReady = YES;
+                break;
+              }
+            }
+
+            if (statusTry < 3) {
+              [NSThread sleepForTimeInterval:0.7];
+            }
+          }
+
+          if (!printerReady) {
+            if ([driver respondsToSelector:@selector(closeChannel)]) {
+              [driver closeChannel];
+            }
+
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"get_status"
+                                                 reason:@"Printer status/media not ready after reconnect"
+                                                 extras:@{
+                                                   @"statusAvailable": @(statusResult != nil),
+                                                   @"statusObjectAvailable": @((statusResult != nil && statusResult.status != nil))
+                                                 }];
+            [attemptLogs addObject:lastFailure];
+
+            if (attempt < maxAttempts) {
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
+            continue;
           }
 
+          bool succeeded = false;
+          settings.labelSize = [mediaInfo getQLLabelSize:&succeeded];
+
           NSDictionary *mediaExtras = @{
             @"mediaType": mediaInfo ? @(mediaInfo.mediaType) : [NSNull null],
             @"width_mm": mediaInfo ? @(mediaInfo.width_mm) : [NSNull null],
@@ -307,11 +499,16 @@ RCT_REMAP_METHOD(printLabel,
             if ([driver respondsToSelector:@selector(closeChannel)]) {
               [driver closeChannel];
             }
-            [attemptLogs addObject:[self attemptErrorWithAttempt:attempt
-                                                           stage:@"media_to_label_size"
-                                                          reason:@"Failed to determine QL label size from loaded media"
-                                                          extras:mediaExtras]];
-            if (attempt < maxAttempts) [NSThread sleepForTimeInterval:retryDelay];
+
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"media_to_label_size"
+                                                 reason:@"Failed to determine QL label size from loaded media"
+                                                 extras:mediaExtras];
+            [attemptLogs addObject:lastFailure];
+
+            if (attempt < maxAttempts) {
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
             continue;
           }
 
@@ -391,12 +588,18 @@ RCT_REMAP_METHOD(printLabel,
 
           if (printError != nil && printError.code != BRLMPrintErrorCodeNoError) {
             NSMutableDictionary *printExtras = [mediaExtras mutableCopy];
+            printExtras[@"printErrorCode"] = @(printError.code);
             printExtras[@"printError"] = [printError description] ?: @"";
-            [attemptLogs addObject:[self attemptErrorWithAttempt:attempt
-                                                           stage:@"print"
-                                                          reason:@"Printer returned print error"
-                                                          extras:printExtras]];
-            if (attempt < maxAttempts) [NSThread sleepForTimeInterval:retryDelay];
+
+            lastFailure = [self attemptErrorWithAttempt:attempt
+                                                  stage:@"print"
+                                                 reason:@"Printer returned print error"
+                                                 extras:printExtras];
+            [attemptLogs addObject:lastFailure];
+
+            if (attempt < maxAttempts) {
+              [NSThread sleepForTimeInterval:retryDelay];
+            }
             continue;
           }
 
@@ -424,10 +627,15 @@ RCT_REMAP_METHOD(printLabel,
           if (driver && [driver respondsToSelector:@selector(closeChannel)]) {
             [driver closeChannel];
           }
-          [attemptLogs addObject:[self attemptErrorWithAttempt:attempt
-                                                         stage:@"exception"
-                                                        reason:innerException.reason ?: @"Unknown native exception"]];
-          if (attempt < maxAttempts) [NSThread sleepForTimeInterval:retryDelay];
+
+          lastFailure = [self attemptErrorWithAttempt:attempt
+                                                stage:@"exception"
+                                               reason:innerException.reason ?: @"Unknown native exception"];
+          [attemptLogs addObject:lastFailure];
+
+          if (attempt < maxAttempts) {
+            [NSThread sleepForTimeInterval:retryDelay];
+          }
         }
       }
 
@@ -436,13 +644,21 @@ RCT_REMAP_METHOD(printLabel,
         return;
       }
 
-      NSMutableDictionary *exhaustedResult = [self errorWithStage:@"retry_exhausted" reason:@"Print failed after 3 attempts"];
+      NSMutableDictionary *exhaustedResult = [self errorWithStage:@"retry_exhausted"
+                                                           reason:@"Print failed after all recovery attempts"];
       exhaustedResult[@"attemptLogs"] = attemptLogs;
       exhaustedResult[@"fontSize"] = fontSizeValue ?: @"Medium";
       exhaustedResult[@"fontStyle"] = fontStyleValue ?: @"Normal";
       exhaustedResult[@"title"] = title ?: @"";
       exhaustedResult[@"hideTitle"] = @(hideTitle);
       exhaustedResult[@"copies"] = @(copies);
+
+      if (lastFailure != nil) {
+        exhaustedResult[@"lastFailureStage"] = lastFailure[@"stage"] ?: @"unknown";
+        exhaustedResult[@"lastFailureReason"] = lastFailure[@"reason"] ?: @"Unknown error";
+        exhaustedResult[@"lastFailureDetails"] = lastFailure;
+      }
+
       resolve(exhaustedResult);
 
     } @catch (NSException *exception) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@munchi_oy/react-native-label-printer",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "React Native bridge for label printers",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",