statically check CallJs; add no-Finalizer overload

Author: KevinEady

napi-inl.h

@@ -196,6 +196,22 @@ struct ThreadSafeFinalize {
   FinalizerDataType* data;
   Finalizer callback;
 };
+
+template <typename ContextType, typename DataType, typename CallJs, CallJs call>
+typename std::enable_if<call != nullptr>::type
+static inline CallJsWrapper(napi_env env, napi_value jsCallback, void *context, void *data) {
+  call(env, Function(env, jsCallback), static_cast<ContextType *>(context),
+       static_cast<DataType *>(data));
+}
+
+template <typename ContextType, typename DataType, typename CallJs, CallJs call>
+typename std::enable_if<call == nullptr>::type
+static inline CallJsWrapper(napi_env env, napi_value jsCallback, void * /*context*/,
+              void * /*data*/) {
+  if (jsCallback != nullptr) {
+    Function(env, jsCallback).Call(0, nullptr);
+  }
+}
 #endif
 
 template <typename Getter, typename Setter>
@@ -4260,6 +4276,20 @@ inline void AsyncWorker::OnWorkComplete(Napi::Env /*env*/, napi_status status) {
 // ThreadSafeFunctionEx<ContextType,DataType,CallJs> class
 ////////////////////////////////////////////////////////////////////////////////
 
+// static
+template <typename ContextType, typename DataType,
+          void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
+template <typename ResourceString>
+inline ThreadSafeFunctionEx<ContextType, DataType, CallJs>
+ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
+    napi_env env, const Function &callback, const Object &resource,
+    ResourceString resourceName, size_t maxQueueSize, size_t initialThreadCount,
+    ContextType *context) {
+  return New(
+      env, callback, resource, resourceName, maxQueueSize, initialThreadCount,
+      context, [](Env, void *, ContextType *) {}, static_cast<void *>(nullptr));
+}
+
 // static
 template <typename ContextType, typename DataType,
           void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
@@ -4397,19 +4427,13 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
   return tsfn;
 }
 
+// static
 template <typename ContextType, typename DataType,
           void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
 void ThreadSafeFunctionEx<ContextType, DataType, CallJs>::CallJsInternal(
     napi_env env, napi_value jsCallback, void *context, void *data) {
-
-  if (CallJs == nullptr) {
-    if (jsCallback != nullptr) {
-      Function(env, jsCallback).Call(0, nullptr);
-    }
-  } else {
-    CallJs(env, Function(env, jsCallback), static_cast<ContextType *>(context),
-           static_cast<DataType *>(data));
-  }
+  details::CallJsWrapper<ContextType, DataType, decltype(CallJs), CallJs>(
+      env, jsCallback, context, data);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

napi.h

@@ -2041,7 +2041,17 @@ namespace Napi {
   public:
 
     // This API may only be called from the main thread.
-    template <typename ResourceString, typename Finalizer, typename FinalizerDataType>
+    template <typename ResourceString>
+    static ThreadSafeFunctionEx<ContextType, DataType, CallJs> New(napi_env env,
+                                  const Function& callback,
+                                  const Object& resource,
+                                  ResourceString resourceName,
+                                  size_t maxQueueSize,
+                                  size_t initialThreadCount,
+                                  ContextType* context = nullptr);
+
+    // This API may only be called from the main thread.
+    template <typename ResourceString, typename Finalizer, typename FinalizerDataType = void>
     static ThreadSafeFunctionEx<ContextType, DataType, CallJs> New(napi_env env,
                                   const Function& callback,
                                   const Object& resource,
@@ -2050,7 +2060,7 @@ namespace Napi {
                                   size_t initialThreadCount,
                                   ContextType* context,
                                   Finalizer finalizeCallback,
-                                  FinalizerDataType* data);
+                                  FinalizerDataType* data = nullptr);
 
     ThreadSafeFunctionEx<ContextType, DataType, CallJs>();
     ThreadSafeFunctionEx<ContextType, DataType, CallJs>(napi_threadsafe_function tsFunctionValue);

test/threadsafe_function_ex/simple.cc

@@ -43,18 +43,12 @@ TSFNWrap::TSFNWrap(const CallbackInfo &info)
     : ObjectWrap<TSFNWrap>(info),
       _deferred(Promise::Deferred::New(info.Env())) {
 
-  _tsfn = TSFN::New(
-      info.Env(),                   // napi_env env,
-      Function(),                   // const Function& callback,
-      Value(),                      // const Object& resource,
-      "Test",                       // ResourceString resourceName,
-      1,                            // size_t maxQueueSize,
-      1,                            // size_t initialThreadCount,
-      static_cast<void *>(nullptr), // ContextType* context,
-      [this](Napi::Env env,         // Finalizer finalizeCallback,
-             void * /*data*/,
-             void * /*ctx*/) { _deferred.Resolve(env.Undefined()); },
-      static_cast<void *>(nullptr) // FinalizerDataType* data,
+  _tsfn = TSFN::New(info.Env(), // napi_env env,
+                    Function(), // const Function& callback,
+                    Value(),    // const Object& resource,
+                    "Test",     // ResourceString resourceName,
+                    1,          // size_t maxQueueSize,
+                    1           // size_t initialThreadCount
   );
 }
 } // namespace