@stoprocent/noble 2.3.6 → 2.3.8

package/lib/common/include/ThreadSafeCallback.h

@@ -72,7 +72,9 @@ inline ThreadSafeCallback::~ThreadSafeCallback() {
 
 inline void ThreadSafeCallback::call(ArgumentFunction argFunction) {
     auto argFn = new ArgumentFunction(argFunction);
-    if (threadSafeFunction_.BlockingCall(argFn) != napi_ok) {
+    // Use NonBlockingCall to avoid hanging if environment is destroyed
+    // This will queue the callback but not block waiting for it
+    if (threadSafeFunction_.NonBlockingCall(argFn) != napi_ok) {
         delete argFn;
     }
 }
@@ -83,13 +85,50 @@ inline void ThreadSafeCallback::callJsCallback(
     Napi::Reference<Napi::Value>* context,
     ArgumentFunction* argFn) {
     
-    if (argFn != nullptr) {
+    if (argFn == nullptr) {
+        return;
+    }
+
+    // Check if environment and callback are valid before proceeding
+    if (env == nullptr || jsCallback == nullptr || context == nullptr) {
+        delete argFn;
+        return;
+    }
+
+    // Check if context reference is still valid
+    if (context->IsEmpty()) {
+        delete argFn;
+        return;
+    }
+    
+    try {
         ArgumentVector args;
         (*argFn)(env, args);
         delete argFn;
 
-        if (env != nullptr && jsCallback != nullptr) {
-            jsCallback.Call(context->Value(), args);
+        // Get the receiver value and check if it's valid
+        Napi::Value receiverValue = context->Value();
+        // Check if receiver value is null or undefined (invalid)
+        if (receiverValue.IsNull() || receiverValue.IsUndefined()) {
+            return;
+        }
+
+        // Attempt to call the callback with error handling
+        // If the environment is being destroyed, this may fail
+        // Note: N-API errors don't throw C++ exceptions, so this won't catch
+        // napi_open_callback_scope failures, but it helps with other cases
+        try {
+            jsCallback.Call(receiverValue, args);
+        } catch (const std::exception&) {
+            // Silently ignore exceptions - environment might be destroyed
+        } catch (...) {
+            // Catch any other exceptions during callback execution
         }
+    } catch (const std::exception&) {
+        // If argument building fails, just clean up
+        delete argFn;
+    } catch (...) {
+        // Catch any other exceptions and clean up
+        delete argFn;
     }
 }

package/lib/hci-socket/hci.js

@@ -158,20 +158,29 @@ Hci.prototype.init = function (options) {
   this._socket.on('error', this.onSocketError.bind(this));
   this._socket.on('state', this.pollIsDevUp.bind(this));
 
-  if (this._userChannel) {
-    this._socket.bindUser(this._deviceId, this._bindParams);
-    this._socket.start();
-
-    this.reset();
-  } else {
-    if (!this._bound) {
-      this._socket.bindRaw(this._deviceId, this._bindParams);
-      this._bound = true;
+  try {
+    // Bind first (either user channel or raw)
+    if (this._userChannel) {
+      this._socket.bindUser(this._deviceId, this._bindParams);
+    } else {
+      if (!this._bound) {
+        this._socket.bindRaw(this._deviceId, this._bindParams);
+        this._bound = true;
+      }
     }
+
+    // Start and reset (common to both paths)
     this._socket.start();
-    this._isStarted = true;
     this.reset();
-    this.pollIsDevUp();
+
+    // Set started flag and poll only for non-userChannel
+    if (!this._userChannel) {
+      this._isStarted = true;
+      this.pollIsDevUp();
+    }
+  } catch (error) {
+    debug(`init error: ${error.message}`);
+    this.emit('stateChange', 'unsupported');
   }
 };
 

package/lib/mac/src/ble_manager.h

@@ -16,6 +16,7 @@
 @property NSMutableDictionary *peripherals;
 @property NSMutableDictionary *mtus;
 @property NSMutableSet *discovered;
+@property (strong) dispatch_source_t stateCheckTimer;
 
 
 - (instancetype)init: (const Napi::Value&) receiver with: (const Napi::Function&) callback;

package/lib/mac/src/ble_manager.mm

@@ -21,6 +21,27 @@
         self.discovered = [NSMutableSet set];
         self.peripherals = [NSMutableDictionary dictionaryWithCapacity:10];
         self.mtus = [NSMutableDictionary dictionaryWithCapacity:10];
+        
+        // Set up periodic state checking to handle sleep/wake cycles using GCD timer
+        // Check every 2 seconds for state changes on the same dispatch queue
+        self.stateCheckTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, self.dispatchQueue);
+        if (self.stateCheckTimer) {
+            dispatch_source_set_timer(self.stateCheckTimer, 
+                                    dispatch_time(DISPATCH_TIME_NOW, 2.0 * NSEC_PER_SEC),
+                                    2.0 * NSEC_PER_SEC, 
+                                    0.1 * NSEC_PER_SEC); // 100ms leeway
+            __weak typeof(self) weakSelf = self;
+            dispatch_source_set_event_handler(self.stateCheckTimer, ^{
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                if (strongSelf) {
+                    CBManagerState currentState = strongSelf.centralManager.state;
+                    if (currentState != strongSelf.lastState) {
+                        [strongSelf centralManagerDidUpdateState:strongSelf.centralManager];
+                    }
+                }
+            });
+            dispatch_resume(self.stateCheckTimer);
+        }
     }
     return self;
 }
@@ -519,5 +540,12 @@
     return nil;
 }
 
-@end
+- (void)dealloc {
+    // Clean up GCD timer
+    if (self.stateCheckTimer) {
+        dispatch_source_cancel(self.stateCheckTimer);
+        self.stateCheckTimer = nil;
+    }
+}
 
+@end

package/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "name": "@stoprocent/noble",
   "description": "A Node.js BLE (Bluetooth Low Energy) central library.",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/stoprocent/noble.git"