@onekeyfe/react-native-background-thread 1.1.20 → 1.1.22

package/BackgroundThread.podspec

@@ -16,5 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift,cpp}"
   s.public_header_files = "ios/**/*.h"
 
+  s.dependency 'ReactNativeNativeLogger'
+
   install_modules_dependencies(s)
 end

package/ios/BTLogger.h

@@ -0,0 +1,16 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Lightweight logging wrapper that dynamically dispatches to OneKeyLog.
+/// Avoids `@import ReactNativeNativeLogger` which fails in .mm (Objective-C++) files.
+@interface BTLogger : NSObject
+
++ (void)debug:(NSString *)message;
++ (void)info:(NSString *)message;
++ (void)warn:(NSString *)message;
++ (void)error:(NSString *)message;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/BTLogger.m

@@ -0,0 +1,42 @@
+#import "BTLogger.h"
+
+static NSString *const kTag = @"BackgroundThread";
+
+@implementation BTLogger
+
++ (void)debug:(NSString *)message {
+    [self _log:@"debug::" message:message];
+}
+
++ (void)info:(NSString *)message {
+    [self _log:@"info::" message:message];
+}
+
++ (void)warn:(NSString *)message {
+    [self _log:@"warn::" message:message];
+}
+
++ (void)error:(NSString *)message {
+    [self _log:@"error::" message:message];
+}
+
+#pragma mark - Private
+
++ (void)_log:(NSString *)selectorName message:(NSString *)message {
+    Class logClass = NSClassFromString(@"ReactNativeNativeLogger.OneKeyLog");
+    if (!logClass) {
+        logClass = NSClassFromString(@"OneKeyLog");
+    }
+    if (!logClass) {
+        return;
+    }
+    SEL sel = NSSelectorFromString(selectorName);
+    if (![logClass respondsToSelector:sel]) {
+        return;
+    }
+    typedef void (*LogFunc)(id, SEL, NSString *, NSString *);
+    LogFunc func = (LogFunc)[logClass methodForSelector:sel];
+    func(logClass, sel, kTag, message);
+}
+
+@end

package/ios/BackgroundRunnerReactNativeDelegate.mm

@@ -1,4 +1,5 @@
 #import "BackgroundRunnerReactNativeDelegate.h"
+#import "BTLogger.h"
 
 #include <jsi/JSIDynamic.h>
 #include <jsi/decorator.h>
@@ -156,45 +157,20 @@ static std::string safeGetStringProperty(jsi::Runtime &rt, const jsi::Object &ob
 
       _onMessageSandbox->call(runtime, {std::move(parsedValue)});
     } catch (const jsi::JSError &e) {
-    //   if (self.eventEmitter && self.hasOnErrorHandler) {
-    //     SandboxReactNativeViewEventEmitter::OnError errorEvent = {
-    //         .isFatal = false, .name = "JSError", .message = e.getMessage(), .stack = e.getStack()};
-    //     self.eventEmitter->onError(errorEvent);
-    //   }
+      [BTLogger error:[NSString stringWithFormat:@"JSError during postMessage: %s", e.getMessage().c_str()]];
     } catch (const std::exception &e) {
-    //   if (self.eventEmitter && self.hasOnErrorHandler) {
-    //     SandboxReactNativeViewEventEmitter::OnError errorEvent = {
-    //         .isFatal = false, .name = "RuntimeError", .message = e.what(), .stack = ""};
-    //     self.eventEmitter->onError(errorEvent);
-    //   }
+      [BTLogger error:[NSString stringWithFormat:@"RuntimeError during postMessage: %s", e.what()]];
     } catch (...) {
-      NSLog(@"[BackgroundReactNativeDelegate] Runtime invalid during postMessage for sandbox %s", _origin.c_str());
+      [BTLogger error:[NSString stringWithFormat:@"Runtime invalid during postMessage for sandbox %s", _origin.c_str()]];
     }
   }];
 }
 
 - (bool)routeMessage:(const std::string &)message toSandbox:(const std::string &)targetId
 {
-//   auto &registry = SandboxRegistry::getInstance();
-//   auto target = registry.find(targetId);
-//   if (!target) {
-//     return false;
-//   }
-
-//   // Check if the current sandbox is permitted to send messages to the target
-//   if (!registry.isPermittedFrom(_origin, targetId)) {
-//     // if (self.eventEmitter && self.hasOnErrorHandler) {
-//     //   std::string errorMessage =
-//     //       fmt::format("Access denied: Sandbox '{}' is not permitted to send messages to '{}'", _origin, targetId);
-//     //   SandboxReactNativeViewEventEmitter::OnError errorEvent = {
-//     //       .isFatal = false, .name = "AccessDeniedError", .message = errorMessage, .stack = ""};
-//     //   self.eventEmitter->onError(errorEvent);
-//     // }
-//     return false;
-//   }
-
-//  target->postMessage(message);
-  return true;
+  // Sandbox routing is not yet implemented. Deny all cross-sandbox messages by default.
+  [BTLogger warn:@"routeMessage denied: sandbox routing not implemented"];
+  return false;
 }
 
 - (void)hostDidStart:(RCTHost *)host

package/ios/BackgroundThread.mm

@@ -1,5 +1,6 @@
 #import "BackgroundThread.h"
 #import "BackgroundThreadManager.h"
+#import "BTLogger.h"
 
 
 @implementation BackgroundThread
@@ -8,6 +9,7 @@
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
+    [BTLogger info:@"BackgroundThread module initialized"];
     return std::make_shared<facebook::react::NativeBackgroundThreadSpecJSI>(params);
 }
 

package/ios/BackgroundThreadManager.mm

@@ -13,6 +13,7 @@
 #import "RCTAppDependencyProvider.h"
 #endif
 #import "BackgroundRunnerReactNativeDelegate.h"
+#import "BTLogger.h"
 
 @interface BackgroundThreadManager ()
 @property (nonatomic, strong) BackgroundReactNativeDelegate *reactNativeFactoryDelegate;
@@ -50,7 +51,12 @@ static NSString *const MODULE_DEBUG_URL = @"http://localhost:8082/apps/mobile/ba
 #pragma mark - Public Methods
 
 - (void)startBackgroundRunner {
+#if DEBUG
     [self startBackgroundRunnerWithEntryURL:MODULE_DEBUG_URL];
+#else
+    // In production, use the bundled background.bundle (not the debug HTTP URL)
+    [self startBackgroundRunnerWithEntryURL:@"background.bundle"];
+#endif
 }
 
 - (void)startBackgroundRunnerWithEntryURL:(NSString *)entryURL {
@@ -58,7 +64,8 @@ static NSString *const MODULE_DEBUG_URL = @"http://localhost:8082/apps/mobile/ba
         return;
     }
     self.isStarted = YES;
-    
+    [BTLogger info:[NSString stringWithFormat:@"Starting background runner with entryURL: %@", entryURL]];
+
     dispatch_async(dispatch_get_main_queue(), ^{
         NSDictionary *initialProperties = @{};
         NSDictionary *launchOptions = @{};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-background-thread",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "description": "react-native-background-thread",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",