Fix issue with worker_threads

src/Addon.cc

@@ -14,8 +14,6 @@
     limitations under the License.
 */
 
-#ifndef _ADDON_H_
-#define _ADDON_H_
 #include <napi.h>
 #include "GSException.h"
 #include "StoreFactory.h"
@@ -29,14 +27,16 @@
 #include "Store.h"
 #include "RowKeyPredicate.h"
 #include "QueryAnalysisEntry.h"
+#include "Util.h"
 
 Napi::Object init(Napi::Env env, Napi::Object exports);
 
-#endif // _ADDON_H_
-
 using namespace griddb;
 
 Napi::Object init(Napi::Env env, Napi::Object exports) {
+#if NAPI_VERSION > 5
+    env.SetInstanceData<AddonData, Util::addonDataFinalizer>(new AddonData());
+#endif
     GSException::init(env, exports);
     StoreFactory::init(env, exports);
     Store::init(env, exports);
@@ -53,4 +53,3 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
 }
 
 NODE_API_MODULE(addon, init);
-

src/AggregationResult.cpp

@@ -19,16 +19,24 @@
 
 namespace griddb {
 
+#if NAPI_VERSION <= 5
 Napi::FunctionReference AggregationResult::constructor;
+#endif
 
 Napi::Object AggregationResult::init(Napi::Env env, Napi::Object exports) {
     Napi::HandleScope scope(env);
 
     Napi::Function func = DefineClass(env, "AggregationResult", {
             InstanceMethod("get", &AggregationResult::get) });
 
+#if NAPI_VERSION > 5
+    Napi::FunctionReference* constructor = new Napi::FunctionReference();
+    *constructor = Napi::Persistent(func);
+    Util::setInstanceData(env, "AggregationResult", constructor);
+#else
     constructor = Napi::Persistent(func);
     constructor.SuppressDestruct();
+#endif
     exports.Set("AggregationResult", func);
     return exports;
 }

src/AggregationResult.h

@@ -25,8 +25,10 @@ namespace griddb {
 
 class AggregationResult : public Napi::ObjectWrap<AggregationResult> {
  public:
+#if NAPI_VERSION <= 5
     // Constructor static variable
     static Napi::FunctionReference constructor;
+#endif
     static Napi::Object init(Napi::Env env, Napi::Object exports);
 
     explicit AggregationResult(const Napi::CallbackInfo &info);

src/Container.cpp

@@ -19,7 +19,9 @@
 
 namespace griddb {
 
+#if NAPI_VERSION <= 5
 Napi::FunctionReference Container::constructor;
+#endif
 
 Napi::Object Container::init(Napi::Env env, Napi::Object exports) {
     Napi::HandleScope scope(env);
@@ -41,8 +43,14 @@ Napi::Object Container::init(Napi::Env env, Napi::Object exports) {
                 InstanceAccessor("type", &Container::getType, nullptr)
             });
 
+#if NAPI_VERSION > 5
+    Napi::FunctionReference* constructor = new Napi::FunctionReference();
+    *constructor = Napi::Persistent(func);
+    Util::setInstanceData(env, "Container", constructor);
+#else
     constructor = Napi::Persistent(func);
     constructor.SuppressDestruct();
+#endif
     exports.Set("Container", func);
     return exports;
 }
@@ -201,8 +209,13 @@ Napi::Value Container::query(const Napi::CallbackInfo &info) {
             mContainerInfo);
     auto gsRowPtr = Napi::External<GSRow>::New(env, mRow);
 
+#if NAPI_VERSION > 5
+    return scope.Escape(Util::getInstanceData(env, "Query")->
+            New({queryPtr, containerInfoPtr, gsRowPtr})).ToObject();
+#else
     return scope.Escape(Query::constructor.New( { queryPtr, containerInfoPtr,
             gsRowPtr })).ToObject();
+#endif
 }
 
 Napi::Value Container::get(const Napi::CallbackInfo &info) {
@@ -329,8 +342,13 @@ Napi::Value Container::queryByTimeSeriesRange(const Napi::CallbackInfo &info) {
             mContainerInfo);
     auto gsRowPtr = Napi::External<GSRow>::New(env, mRow);
 
+#if NAPI_VERSION > 5
+    return scope.Escape(Util::getInstanceData(env, "Query")->
+            New({queryPtr, containerInfoPtr, gsRowPtr})).ToObject();
+#else
     return scope.Escape(Query::constructor.New( { queryPtr, containerInfoPtr,
             gsRowPtr })).ToObject();
+#endif
 }
 
 Container::~Container() {

src/Container.h

@@ -30,8 +30,10 @@ namespace griddb {
 
 class Container: public Napi::ObjectWrap<Container> {
  public:
+#if NAPI_VERSION <= 5
     // Contructor static variable
     static Napi::FunctionReference constructor;
+#endif
     static Napi::Object init(Napi::Env env, Napi::Object exports);
 
     explicit Container(const Napi::CallbackInfo &info);

src/ContainerInfo.cpp

@@ -19,7 +19,9 @@
 
 namespace griddb {
 
+#if NAPI_VERSION <= 5
 Napi::FunctionReference ContainerInfo::constructor;
+#endif
 
 Napi::Object ContainerInfo::init(const Napi::Env env, Napi::Object exports) {
     Napi::HandleScope scope(env);
@@ -42,8 +44,14 @@ Napi::Object ContainerInfo::init(const Napi::Env env, Napi::Object exports) {
                     &ContainerInfo::setExpiration),
         });
 
+#if NAPI_VERSION > 5
+    Napi::FunctionReference* constructor = new Napi::FunctionReference();
+    *constructor = Napi::Persistent(func);
+    Util::setInstanceData(env, "ContainerInfo", constructor);
+#else
     constructor = Napi::Persistent(func);
     constructor.SuppressDestruct();
+#endif
     exports.Set("ContainerInfo", func);
     return exports;
 }
@@ -632,9 +640,15 @@ Napi::Value ContainerInfo::getExpiration(
                 mContainerInfo.timeSeriesProperties->expirationDivisionCount;
         // Create new ExpirationInfo object
         Napi::EscapableHandleScope scope(env);
+#if NAPI_VERSION > 5
+        return scope.Escape(Util::getInstanceData(env, "ExpirationInfo")->New( {
+                Napi::Number::New(env, time), Napi::Number::New(env, unit),
+                Napi::Number::New(env, division_count) })).ToObject();
+#else
         return scope.Escape(ExpirationInfo::constructor.New( {
                 Napi::Number::New(env, time), Napi::Number::New(env, unit),
                 Napi::Number::New(env, division_count) })).ToObject();
+#endif
     } else {
         return env.Null();
     }

src/ContainerInfo.h

@@ -34,8 +34,10 @@ namespace griddb {
 
 class ContainerInfo: public Napi::ObjectWrap<ContainerInfo> {
  public:
+#if NAPI_VERSION <= 5
     // Constructor
     static Napi::FunctionReference constructor;
+#endif
     explicit ContainerInfo(const Napi::CallbackInfo &info);
     static Napi::Object init(Napi::Env env, Napi::Object exports);
 

src/ExpirationInfo.cpp

@@ -17,10 +17,13 @@
 #include "ExpirationInfo.h"
 #include "GSException.h"
 #include "Macro.h"
+#include "Util.h"
 
 namespace griddb {
 
+#if NAPI_VERSION <= 5
 Napi::FunctionReference ExpirationInfo::constructor;
+#endif
 
 void ExpirationInfo::init(Napi::Env env, Napi::Object exports) {
     Napi::Function func = DefineClass(env, "ExpirationInfo",
@@ -30,8 +33,14 @@ void ExpirationInfo::init(Napi::Env env, Napi::Object exports) {
                     ExpirationInfo::InstanceAccessor("divisionCount",
                             &ExpirationInfo::getDivisionCount,
                             &ExpirationInfo::setDivisionCount), });
+#if NAPI_VERSION > 5
+    Napi::FunctionReference* constructor = new Napi::FunctionReference();
+    *constructor = Napi::Persistent(func);
+    Util::setInstanceData(env, "ExpirationInfo", constructor);
+#else
     constructor = Napi::Persistent(func);
     constructor.SuppressDestruct();
+#endif
     exports.Set("ExpirationInfo", func);
 }
 

src/ExpirationInfo.h

@@ -24,8 +24,10 @@ namespace griddb {
 
 class ExpirationInfo: public Napi::ObjectWrap<ExpirationInfo> {
  public:
+#if NAPI_VERSION <= 5
     // Constructor
     static Napi::FunctionReference constructor;
+#endif
     explicit ExpirationInfo(const Napi::CallbackInfo &info);
     static void init(Napi::Env env, Napi::Object exports);
 

src/GSException.cpp

@@ -16,9 +16,12 @@
 
 #include <string>
 #include "GSException.h"
+#include "Util.h"
 
 namespace griddb {
+#if NAPI_VERSION <= 5
 Napi::FunctionReference GSException::constructor;
+#endif
 Napi::Object GSException::init(Napi::Env env, Napi::Object exports) {
     Napi::HandleScope scope(env);
     Napi::Function t = DefineClass(env, "GSException", {
@@ -29,8 +32,14 @@ Napi::Object GSException::init(Napi::Env env, Napi::Object exports) {
         InstanceMethod("getMessage", &GSException::getMessage),
         InstanceMethod("getLocation", &GSException::getLocation)
     });
+#if NAPI_VERSION > 5
+    Napi::FunctionReference* constructor = new Napi::FunctionReference();
+    *constructor = Napi::Persistent(t);
+    Util::setInstanceData(env, "GSException", constructor);
+#else
     constructor = Napi::Persistent(t);
     constructor.SuppressDestruct();
+#endif
     exports.Set("GSException", t);
     return exports;
 }
@@ -74,12 +83,21 @@ Napi::Object GSException::New(Napi::Env env, std::string message,
 }
 Napi::Object GSException::New(Napi::Env env, GSResult code,
         const char* message, const char* location, void* resource) {
+#if NAPI_VERSION > 5
+    return Util::getInstanceData(env, "GSException")->New({
+        Napi::Number::New(env, code),
+        message  ? Napi::String::New(env, message) : env.Null(),
+        location ? Napi::String::New(env, location) : env.Null(),
+        resource ? Napi::External<void>::New(env, resource) : env.Null()
+    });
+#else
     return constructor.New( {
         Napi::Number::New(env, code),
         message  ? Napi::String::New(env, message) : env.Null(),
         location ? Napi::String::New(env, location) : env.Null(),
         resource ? Napi::External<void>::New(env, resource) : env.Null()
     });
+#endif
 }
 GSException::~GSException() {
 }

src/GSException.h

@@ -28,7 +28,9 @@
 namespace griddb {
 class GSException : public Napi::ObjectWrap<GSException>{
  public:
+#if NAPI_VERSION <= 5
     static Napi::FunctionReference constructor;
+#endif
     static Napi::Object init(Napi::Env env, Napi::Object exports);
     static Napi::Object New(Napi::Env env, GSResult code,
             void* resource = NULL);

src/PartitionController.cpp

@@ -19,7 +19,9 @@
 
 namespace griddb {
 
+#if NAPI_VERSION <= 5
 Napi::FunctionReference PartitionController::constructor;
+#endif
 
 Napi::Object PartitionController::init(Napi::Env env, Napi::Object exports) {
     Napi::HandleScope scope(env);
@@ -36,8 +38,14 @@ Napi::Object PartitionController::init(Napi::Env env, Napi::Object exports) {
                             &PartitionController::getContainerNames)
             });
 
+#if NAPI_VERSION > 5
+    Napi::FunctionReference* constructor = new Napi::FunctionReference();
+    *constructor = Napi::Persistent(func);
+    Util::setInstanceData(env, "PartitionController", constructor);
+#else
     constructor = Napi::Persistent(func);
     constructor.SuppressDestruct();
+#endif
     exports.Set("PartitionController", func);
     return exports;
 }

src/PartitionController.h

@@ -25,8 +25,10 @@ namespace griddb {
 
 class PartitionController: public Napi::ObjectWrap<PartitionController> {
  public:
+#if NAPI_VERSION <= 5
     // Constructor
     static Napi::FunctionReference constructor;
+#endif
     static Napi::Object init(Napi::Env env, Napi::Object exports);
     explicit PartitionController(const Napi::CallbackInfo &info);
 

src/Query.cpp

@@ -18,7 +18,9 @@
 
 namespace griddb {
 
+#if NAPI_VERSION <= 5
 Napi::FunctionReference Query::constructor;
+#endif
 
 Napi::Object Query::init(Napi::Env env, Napi::Object exports) {
     Napi::HandleScope scope(env);
@@ -29,8 +31,14 @@ Napi::Object Query::init(Napi::Env env, Napi::Object exports) {
               InstanceMethod("getRowSet", &Query::getRowSet),
             });
 
+#if NAPI_VERSION > 5
+    Napi::FunctionReference* constructor = new Napi::FunctionReference();
+    *constructor = Napi::Persistent(func);
+    Util::setInstanceData(env, "Query", constructor);
+#else
     constructor = Napi::Persistent(func);
     constructor.SuppressDestruct();
+#endif
     exports.Set("Query", func);
     return exports;
 }
@@ -69,8 +77,14 @@ Napi::Value Query::fetch(const Napi::CallbackInfo &info) {
     auto gsContainerInfoPtr =
             Napi::External<GSContainerInfo>::New(env, mContainerInfo);
     auto gsRowPtr = Napi::External<GSRow>::New(env, mRow);
+#if NAPI_VERSION > 5
+    Napi::Value rowsetWrapper = scope.Escape(
+            Util::getInstanceData(env, "RowSet")->New({
+                    rowsetPtr, gsContainerInfoPtr, gsRowPtr })).ToObject();
+#else
     Napi::Value rowsetWrapper = scope.Escape(RowSet::constructor.New({
             rowsetPtr, gsContainerInfoPtr, gsRowPtr })).ToObject();
+#endif
     deferred.Resolve(rowsetWrapper);
     return deferred.Promise();
 }
@@ -132,8 +146,13 @@ Napi::Value Query::getRowSet(const Napi::CallbackInfo &info) {
                 ::New(env, mContainerInfo);
     auto row_ptr = Napi::External<GSRow>::New(env, mRow);
     Napi::EscapableHandleScope scope(env);
+#if NAPI_VERSION > 5
+    return scope.Escape(Util::getInstanceData(env, "RowSet")->New({
+            rowset_ptr, containerInfo_ptr, row_ptr })).ToObject();
+#else
     return scope.Escape(RowSet::constructor.New({
             rowset_ptr, containerInfo_ptr, row_ptr })).ToObject();
+#endif
 }
 
 GSQuery* Query::gsPtr() {

src/Query.h

@@ -26,8 +26,10 @@ namespace griddb {
 
 class Query: public Napi::ObjectWrap<Query> {
  public:
+#if NAPI_VERSION <= 5
     // Constructor static variable
     static Napi::FunctionReference constructor;
+#endif
     static Napi::Object init(Napi::Env env, Napi::Object exports);
 
     explicit Query(const Napi::CallbackInfo &info);