@stoprocent/bleno 0.9.0 → 0.10.0

package/lib/common/include/ThreadSafeCallback.h

@@ -0,0 +1,95 @@
+#pragma once
+
+#include <napi.h>
+#include <vector>
+#include <functional>
+
+class ThreadSafeCallback {
+public:
+    // More descriptive type aliases
+    using ArgumentVector = std::vector<napi_value>;
+    using ArgumentFunction = std::function<void(napi_env, ArgumentVector&)>;
+
+    // Constructor with validation
+    ThreadSafeCallback(const Napi::Value& receiver, const Napi::Function& jsCallback);
+    
+    // Destructor
+    ~ThreadSafeCallback();
+
+    // Delete copy and move operations explicitly
+    ThreadSafeCallback(const ThreadSafeCallback&) = delete;
+    ThreadSafeCallback& operator=(const ThreadSafeCallback&) = delete;
+    ThreadSafeCallback& operator=(ThreadSafeCallback&&) = delete;
+
+    // Public interface
+    void call(ArgumentFunction argFunction);
+
+private:
+    // Static callback handler
+    static void callJsCallback(Napi::Env env,
+                             Napi::Function jsCallback,
+                             Napi::Reference<Napi::Value>* context,
+                             ArgumentFunction* argFn);
+
+    // Type alias for the thread-safe function
+    using ThreadSafeFunc = Napi::TypedThreadSafeFunction<
+        Napi::Reference<Napi::Value>,
+        ArgumentFunction,
+        callJsCallback>;
+
+    // Member variables
+    Napi::Reference<Napi::Value> receiver_;
+    ThreadSafeFunc threadSafeFunction_;
+};
+
+// Implementation
+
+inline ThreadSafeCallback::ThreadSafeCallback(
+    const Napi::Value& receiver,
+    const Napi::Function& jsCallback) {
+    
+    if (!(receiver.IsObject() || receiver.IsFunction())) {
+        throw Napi::Error::New(jsCallback.Env(),
+            "Callback receiver must be an object or function");
+    }
+    if (!jsCallback.IsFunction()) {
+        throw Napi::Error::New(jsCallback.Env(),
+            "Callback must be a function");
+    }
+
+    receiver_ = Napi::Persistent(receiver);
+    threadSafeFunction_ = ThreadSafeFunc::New(
+        jsCallback.Env(),
+        jsCallback,
+        "ThreadSafeCallback callback",
+        0, 1,
+        &receiver_);
+}
+
+inline ThreadSafeCallback::~ThreadSafeCallback() {
+    threadSafeFunction_.Abort();
+}
+
+inline void ThreadSafeCallback::call(ArgumentFunction argFunction) {
+    auto argFn = new ArgumentFunction(argFunction);
+    if (threadSafeFunction_.BlockingCall(argFn) != napi_ok) {
+        delete argFn;
+    }
+}
+
+inline void ThreadSafeCallback::callJsCallback(
+    Napi::Env env,
+    Napi::Function jsCallback,
+    Napi::Reference<Napi::Value>* context,
+    ArgumentFunction* argFn) {
+    
+    if (argFn != nullptr) {
+        ArgumentVector args;
+        (*argFn)(env, args);
+        delete argFn;
+
+        if (env != nullptr && jsCallback != nullptr) {
+            jsCallback.Call(context->Value(), args);
+        }
+    }
+}

package/lib/mac/binding.gyp

@@ -6,15 +6,11 @@
     {
       'target_name': 'binding',
       'sources': [ 
-        'src/bleno_mac.mm', 
-        'src/napi_objc.mm', 
-        'src/ble_peripheral_manager.mm', 
-        'src/objc_cpp.mm',
-        'src/callbacks.mm' 
+        "<!@(node -p \"require('fs').readdirSync('src').filter(f=>new RegExp('.*\\\\.(c|cc|cpp|mm)$').test(f)).map(f=>'src/'+f).join(' ')\")",
       ],
       'include_dirs': [
         "<!(node -p \"require('node-addon-api').include_dir\")",
-        "<!@(node -p \"require('napi-thread-safe-callback').include\")"
+        "../common/include"
       ],
       'cflags!': [ '-fno-exceptions' ],
       'cflags_cc!': [ '-fno-exceptions' ],

package/lib/mac/bindings.js

@@ -1,5 +1,4 @@
-const events = require('events');
-const util = require('util');
+const { EventEmitter } = require('events');
 
 const { resolve } = require('path');
 const dir = resolve(__dirname, '..', '..');
@@ -7,6 +6,6 @@ const binding = require('node-gyp-build')(dir);
 
 const { BlenoMac } = binding;
 
-util.inherits(BlenoMac, events.EventEmitter);
+Object.setPrototypeOf(BlenoMac.prototype, EventEmitter.prototype);
 
 module.exports = BlenoMac;

package/lib/mac/src/callbacks.mm

@@ -4,10 +4,11 @@
 //
 //  Created by Georg Vienna on 30.08.18.
 //
-#include <napi-thread-safe-callback.hpp>
+
 #include "callbacks.h"
 #include "napi_objc.h"
 #include "objc_cpp.h"
+#include "ThreadSafeCallback.h"
 
 #define _a(val) Napi::String::New(env, convertToBlenoAddress(val))
 #define _s(val) Napi::String::New(env, val)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoprocent/bleno",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A Node.js module for implementing BLE (Bluetooth Low Energy) peripherals",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -65,7 +65,6 @@
   },
   "dependencies": {
     "debug": "^4.4.0",
-    "napi-thread-safe-callback": "^0.0.6",
     "node-addon-api": "^8.3.1",
     "node-gyp-build": "^4.8.4"
   },