src: consolidate duplicated tsfnex code

Author: KevinEady

napi-inl.h

@@ -213,6 +213,14 @@ static inline CallJsWrapper(napi_env env, napi_value jsCallback, void * /*contex
     Function(env, jsCallback).Call(0, nullptr);
   }
 }
+
+template <typename CallbackType>
+typename ThreadSafeFunctionEx<>::DefaultFunctionType
+DefaultCallbackWrapper(
+    napi_env env, CallbackType cb) {
+  return ThreadSafeFunctionEx<>::DefaultFunctionFactory(env);
+}
+
 #endif
 
 template <typename Getter, typename Setter>
@@ -4342,28 +4350,6 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
   return tsfn;
 }
 
-// static, with Callback [nullptr] Resource [missing] Finalizer [missing]
-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, std::nullptr_t callback, ResourceString resourceName, size_t maxQueueSize,
-    size_t initialThreadCount, ContextType *context) {
-  ThreadSafeFunctionEx<ContextType, DataType, CallJs> tsfn;
-
-  napi_status status = napi_create_threadsafe_function(
-      env, nullptr, nullptr, String::From(env, resourceName), maxQueueSize,
-      initialThreadCount, nullptr, nullptr, context,
-      CallJsInternal, &tsfn._tsfn);
-  if (status != napi_ok) {
-    NAPI_THROW_IF_FAILED(env, status,
-                         ThreadSafeFunctionEx<ContextType, DataType, CallJs>());
-  }
-
-  return tsfn;
-}
-
 // static, with Callback [missing] Resource [passed] Finalizer [missing]
 template <typename ContextType, typename DataType,
           void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
@@ -4386,28 +4372,6 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
   return tsfn;
 }
 
-// static, with Callback [nullptr] Resource [passed] Finalizer [missing]
-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, std::nullptr_t callback, const Object &resource, ResourceString resourceName,
-    size_t maxQueueSize, size_t initialThreadCount, ContextType *context) {
-  ThreadSafeFunctionEx<ContextType, DataType, CallJs> tsfn;
-
-  napi_status status = napi_create_threadsafe_function(
-      env, nullptr, resource, String::From(env, resourceName), maxQueueSize,
-      initialThreadCount, nullptr, nullptr, context, CallJsInternal,
-      &tsfn._tsfn);
-  if (status != napi_ok) {
-    NAPI_THROW_IF_FAILED(env, status,
-                         ThreadSafeFunctionEx<ContextType, DataType, CallJs>());
-  }
-
-  return tsfn;
-}
-
 // static, with Callback [missing] Resource [missing] Finalizer [passed]
 template <typename ContextType, typename DataType,
           void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
@@ -4438,36 +4402,6 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
   return tsfn;
 }
 
-// static, with Callback [nullptr] Resource [missing] Finalizer [passed]
-template <typename ContextType, typename DataType,
-          void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
-template <typename ResourceString, typename Finalizer,
-          typename FinalizerDataType>
-inline ThreadSafeFunctionEx<ContextType, DataType, CallJs>
-ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
-    napi_env env, std::nullptr_t callback, ResourceString resourceName, size_t maxQueueSize,
-    size_t initialThreadCount, ContextType *context, Finalizer finalizeCallback,
-    FinalizerDataType *data) {
-  ThreadSafeFunctionEx<ContextType, DataType, CallJs> tsfn;
-
-  auto *finalizeData = new details::ThreadSafeFinalize<ContextType, Finalizer,
-                                                       FinalizerDataType>(
-      {data, finalizeCallback});
-  napi_status status = napi_create_threadsafe_function(
-      env, nullptr, nullptr, String::From(env, resourceName), maxQueueSize,
-      initialThreadCount, finalizeData,
-      details::ThreadSafeFinalize<ContextType, Finalizer, FinalizerDataType>::
-          FinalizeFinalizeWrapperWithDataAndContext,
-      context, CallJsInternal, &tsfn._tsfn);
-  if (status != napi_ok) {
-    delete finalizeData;
-    NAPI_THROW_IF_FAILED(env, status,
-                         ThreadSafeFunctionEx<ContextType, DataType, CallJs>());
-  }
-
-  return tsfn;
-}
-
 // static, with Callback [missing] Resource [passed] Finalizer [passed]
 template <typename ContextType, typename DataType,
           void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
@@ -4497,36 +4431,6 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
 
   return tsfn;
 }
-
-// static, with Callback [nullptr] Resource [passed] Finalizer [passed]
-template <typename ContextType, typename DataType,
-          void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
-template <typename ResourceString, typename Finalizer,
-          typename FinalizerDataType>
-inline ThreadSafeFunctionEx<ContextType, DataType, CallJs>
-ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
-    napi_env env, std::nullptr_t callback, const Object &resource, ResourceString resourceName,
-    size_t maxQueueSize, size_t initialThreadCount, ContextType *context,
-    Finalizer finalizeCallback, FinalizerDataType *data) {
-  ThreadSafeFunctionEx<ContextType, DataType, CallJs> tsfn;
-
-  auto *finalizeData = new details::ThreadSafeFinalize<ContextType, Finalizer,
-                                                       FinalizerDataType>(
-      {data, finalizeCallback});
-  napi_status status = napi_create_threadsafe_function(
-      env, nullptr, resource, String::From(env, resourceName), maxQueueSize,
-      initialThreadCount, finalizeData,
-      details::ThreadSafeFinalize<ContextType, Finalizer, FinalizerDataType>::
-          FinalizeFinalizeWrapperWithDataAndContext,
-      context, CallJsInternal, &tsfn._tsfn);
-  if (status != napi_ok) {
-    delete finalizeData;
-    NAPI_THROW_IF_FAILED(env, status,
-                         ThreadSafeFunctionEx<ContextType, DataType, CallJs>());
-  }
-
-  return tsfn;
-}
 #endif
 
 // static, with Callback [passed] Resource [missing] Finalizer [missing]
@@ -4607,11 +4511,11 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
 // static, with: Callback [passed] Resource [passed] Finalizer [passed]
 template <typename ContextType, typename DataType,
           void (*CallJs)(Napi::Env, Napi::Function, ContextType *, DataType *)>
-template <typename ResourceString, typename Finalizer,
+template <typename CallbackType, typename ResourceString, typename Finalizer,
           typename FinalizerDataType>
 inline ThreadSafeFunctionEx<ContextType, DataType, CallJs>
 ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
-    napi_env env, const Function &callback, const Object &resource,
+    napi_env env, CallbackType callback, const Object &resource,
     ResourceString resourceName, size_t maxQueueSize, size_t initialThreadCount,
     ContextType *context, Finalizer finalizeCallback, FinalizerDataType *data) {
   ThreadSafeFunctionEx<ContextType, DataType, CallJs> tsfn;
@@ -4620,7 +4524,7 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::New(
                                                        FinalizerDataType>(
       {data, finalizeCallback});
   napi_status status = napi_create_threadsafe_function(
-      env, callback, resource, String::From(env, resourceName), maxQueueSize,
+      env, details::DefaultCallbackWrapper<CallbackType>(env, callback), resource, String::From(env, resourceName), maxQueueSize,
       initialThreadCount, finalizeData,
       details::ThreadSafeFinalize<ContextType, Finalizer, FinalizerDataType>::
           FinalizeFinalizeWrapperWithDataAndContext,
@@ -4743,6 +4647,7 @@ ThreadSafeFunctionEx<ContextType, DataType, CallJs>::DefaultFunctionFactory(
 #endif
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // ThreadSafeFunction class
 ////////////////////////////////////////////////////////////////////////////////

napi.h

@@ -2049,21 +2049,21 @@ namespace Napi {
             void (*CallJs)(Napi::Env, Napi::Function, ContextType *,
                            DataType *) = nullptr>
   class ThreadSafeFunctionEx {
-  private:
+
+  public:
 #if NAPI_VERSION > 4
     using DefaultFunctionType = std::nullptr_t;
 #else
     using DefaultFunctionType = const Napi::Function;
 #endif
-
-  public:
     // This API may only be called from the main thread.
     // Helper function that returns nullptr if running N-API 5+, otherwise a
     // non-empty, no-op Function. This provides the ability to specify at
     // compile-time a callback parameter to `New` that safely does no action
     // when targeting _any_ N-API version.
     static DefaultFunctionType DefaultFunctionFactory(Napi::Env env);
 
+
 #if NAPI_VERSION > 4
     // This API may only be called from the main thread.
     // Creates a new threadsafe function with:
@@ -2073,14 +2073,6 @@ namespace Napi {
     New(napi_env env, ResourceString resourceName, size_t maxQueueSize,
         size_t initialThreadCount, ContextType *context = nullptr);
 
-    // This API may only be called from the main thread.
-    //   Callback [nullptr] Resource [missing] Finalizer [missing]
-    template <typename ResourceString>
-    static ThreadSafeFunctionEx<ContextType, DataType, CallJs>
-    New(napi_env env, std::nullptr_t callback, ResourceString resourceName,
-        size_t maxQueueSize, size_t initialThreadCount,
-        ContextType *context = nullptr);
-
     // This API may only be called from the main thread.
     // Creates a new threadsafe function with:
     //   Callback [missing] Resource [passed] Finalizer [missing]
@@ -2090,15 +2082,6 @@ namespace Napi {
         size_t maxQueueSize, size_t initialThreadCount,
         ContextType *context = nullptr);
 
-    // This API may only be called from the main thread.
-    // Creates a new threadsafe function with:
-    //   Callback [nullptr] Resource [passed] Finalizer [missing]
-    template <typename ResourceString>
-    static ThreadSafeFunctionEx<ContextType, DataType, CallJs>
-    New(napi_env env, std::nullptr_t 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.
     // Creates a new threadsafe function with:
     //   Callback [missing] Resource [missing] Finalizer [passed]
@@ -2109,16 +2092,6 @@ namespace Napi {
         size_t initialThreadCount, ContextType *context,
         Finalizer finalizeCallback, FinalizerDataType *data = nullptr);
 
-    // This API may only be called from the main thread.
-    // Creates a new threadsafe function with:
-    //   Callback [nullptr] Resource [missing] Finalizer [passed]
-    template <typename ResourceString, typename Finalizer,
-              typename FinalizerDataType = void>
-    static ThreadSafeFunctionEx<ContextType, DataType, CallJs>
-    New(napi_env env, std::nullptr_t callback, ResourceString resourceName,
-        size_t maxQueueSize, size_t initialThreadCount, ContextType *context,
-        Finalizer finalizeCallback, FinalizerDataType *data = nullptr);
-
     // This API may only be called from the main thread.
     // Creates a new threadsafe function with:
     //   Callback [missing] Resource [passed] Finalizer [passed]
@@ -2128,17 +2101,6 @@ namespace Napi {
     New(napi_env env, const Object &resource, ResourceString resourceName,
         size_t maxQueueSize, size_t initialThreadCount, ContextType *context,
         Finalizer finalizeCallback, FinalizerDataType *data = nullptr);
-
-    // This API may only be called from the main thread.
-    // Creates a new threadsafe function with:
-    //   Callback [nullptr] Resource [passed] Finalizer [passed]
-    template <typename ResourceString, typename Finalizer,
-              typename FinalizerDataType = void>
-    static ThreadSafeFunctionEx<ContextType, DataType, CallJs>
-    New(napi_env env, std::nullptr_t callback, const Object &resource,
-        ResourceString resourceName, size_t maxQueueSize,
-        size_t initialThreadCount, ContextType *context,
-        Finalizer finalizeCallback, FinalizerDataType *data = nullptr);
 #endif
 
     // This API may only be called from the main thread.
@@ -2172,10 +2134,10 @@ namespace Napi {
     // This API may only be called from the main thread.
     // Creates a new threadsafe function with:
     //   Callback [passed] Resource [passed] Finalizer [passed]
-    template <typename ResourceString, typename Finalizer,
-              typename FinalizerDataType = void>
+    template <typename CallbackType, typename ResourceString, typename Finalizer,
+          typename FinalizerDataType>
     static ThreadSafeFunctionEx<ContextType, DataType, CallJs>
-    New(napi_env env, const Function &callback, const Object &resource,
+    New(napi_env env, CallbackType callback, const Object &resource,
         ResourceString resourceName, size_t maxQueueSize,
         size_t initialThreadCount, ContextType *context,
         Finalizer finalizeCallback, FinalizerDataType *data = nullptr);