From c6feee037bedf52d55830a9d157125119a4dc6cb Mon Sep 17 00:00:00 2001
From: Antti Pihlaja <antti.pihlaja@live.fi>
Date: Tue, 2 Jul 2019 18:18:11 +0300
Subject: [PATCH] Fix usage of deprecated v8 apis

---
 src/cpp/IRSDKWrapper.h          |  92 +++++++--------
 src/cpp/IrSdkBindingHelpers.cpp |  20 ++--
 src/cpp/IrSdkBindingHelpers.h   |  14 +--
 src/cpp/IrSdkNodeBindings.cpp   | 196 +++++++++++++++++---------------
 4 files changed, 169 insertions(+), 153 deletions(-)

diff --git a/src/cpp/IRSDKWrapper.h b/src/cpp/IRSDKWrapper.h
index 935d0bd..b6a4294 100644
--- a/src/cpp/IRSDKWrapper.h
+++ b/src/cpp/IRSDKWrapper.h
@@ -9,64 +9,64 @@
 #include <string>
 #include <vector>
 
-namespace NodeIrSdk {
+namespace NodeIrSdk
+{
 
-  class IRSDKWrapper
-  {
-  public:
-    IRSDKWrapper();
-    ~IRSDKWrapper();
-
-    bool startup();
-    void shutdown();
-
-    bool isInitialized() const;
-    bool isConnected() const;
+class IRSDKWrapper
+{
+public:
+  IRSDKWrapper();
+  ~IRSDKWrapper();
 
-    bool updateTelemetry(); // returns true if telemetry update available
-    bool updateSessionInfo(); // returns true if session info update available
+  bool startup();
+  void shutdown();
 
-    const std::string getSessionInfo() const; // returns yaml string
+  bool isInitialized() const;
+  bool isConnected() const;
 
-    struct TelemetryVar
-    {
-      irsdk_varHeader* header;
-      irsdk_VarType type;
+  bool updateTelemetry();   // returns true if telemetry update available
+  bool updateSessionInfo(); // returns true if session info update available
 
-      union { // choose correct based on irsdk_VarType
-        char* value;
-        float* floatValue;
-        int* intValue;
-        bool* boolValue;
-        double* doubleValue;
-      };
+  const std::string getSessionInfo() const; // returns yaml string
 
-      TelemetryVar(irsdk_varHeader* varHeader);
-      ~TelemetryVar();
+  struct TelemetryVar
+  {
+    irsdk_varHeader *header;
+    irsdk_VarType type;
+
+    union { // choose correct based on irsdk_VarType
+      char *value;
+      float *floatValue;
+      int *intValue;
+      bool *boolValue;
+      double *doubleValue;
     };
 
-    const std::vector<irsdk_varHeader*> getVarHeaders() const;
+    TelemetryVar(irsdk_varHeader *varHeader);
+    ~TelemetryVar();
+  };
 
-    bool getVarVal(TelemetryVar& var) const;
+  const std::vector<irsdk_varHeader *> getVarHeaders() const;
 
-    const double getLastTelemetryUpdateTS() const; // returns JS compatible TS
+  bool getVarVal(TelemetryVar &var) const;
 
-  private:
-    HANDLE hMemMapFile;
-    const char *pSharedMem;
-    const irsdk_header *pHeader;
-    int lastTickCount;
-    int lastSessionInfoUpdate;
-    time_t lastValidTime;
-    char* data;
-    int dataLen;
-    std::string sessionInfoStr;
+  const double getLastTelemetryUpdateTS() const; // returns JS compatible TS
 
-    std::vector<irsdk_varHeader*> varHeadersArr;
+private:
+  HANDLE hMemMapFile;
+  const char *pSharedMem;
+  const irsdk_header *pHeader;
+  int lastTickCount;
+  int lastSessionInfoUpdate;
+  time_t lastValidTime;
+  char *data;
+  int dataLen;
+  std::string sessionInfoStr;
 
-    void updateVarHeaders(); // updates map and vector
-    const char* getSessionInfoStr() const;
+  std::vector<irsdk_varHeader *> varHeadersArr;
 
-  };
+  void updateVarHeaders(); // updates map and vector
+  const char *getSessionInfoStr() const;
+};
 
-}
\ No newline at end of file
+} // namespace NodeIrSdk
diff --git a/src/cpp/IrSdkBindingHelpers.cpp b/src/cpp/IrSdkBindingHelpers.cpp
index bb6d82d..a059632 100644
--- a/src/cpp/IrSdkBindingHelpers.cpp
+++ b/src/cpp/IrSdkBindingHelpers.cpp
@@ -5,7 +5,7 @@
 using namespace v8;
 using namespace std;
 
-Handle<Value> NodeIrSdk::convertTelemetryValueToObject(IRSDKWrapper::TelemetryVar& var, const int& index)
+Local<Value> NodeIrSdk::convertTelemetryValueToObject(IRSDKWrapper::TelemetryVar& var, const int& index)
 {
   switch (var.type) {
   case irsdk_char:
@@ -34,10 +34,10 @@ Handle<Value> NodeIrSdk::convertTelemetryValueToObject(IRSDKWrapper::TelemetryVa
   }
 }
 
-Handle<Value> NodeIrSdk::convertTelemetryVarToObject(IRSDKWrapper::TelemetryVar& var)
+Local<Value> NodeIrSdk::convertTelemetryVarToObject(IRSDKWrapper::TelemetryVar& var)
 {
   if (var.header->count > 1) {
-    Handle<Array> arr = Nan::New<Array>(var.header->count);
+    Local<Array> arr = Nan::New<Array>(var.header->count);
     for (int i = 0; i < var.header->count; ++i)
     {
       arr->Set(i, convertTelemetryValueToObject(var, i));
@@ -50,13 +50,13 @@ Handle<Value> NodeIrSdk::convertTelemetryVarToObject(IRSDKWrapper::TelemetryVar&
   }
 }
 
-void NodeIrSdk::convertVarHeaderToObject(IRSDKWrapper::TelemetryVar& var, Handle<Object>& obj)
+void NodeIrSdk::convertVarHeaderToObject(IRSDKWrapper::TelemetryVar& var, Local<Object>& obj)
 {
   Nan::Set(obj, Nan::New("name").ToLocalChecked(), Nan::New(var.header->name).ToLocalChecked());
   Nan::Set(obj, Nan::New("desc").ToLocalChecked(), Nan::New(var.header->desc).ToLocalChecked());
   Nan::Set(obj, Nan::New("unit").ToLocalChecked(), Nan::New(var.header->unit).ToLocalChecked());
   Nan::Set(obj, Nan::New("count").ToLocalChecked(), Nan::New(var.header->count));
-  
+
   switch (var.header->type) {
   case irsdk_char:
     Nan::Set(obj, Nan::New("type").ToLocalChecked(), Nan::New("char").ToLocalChecked());
@@ -82,7 +82,7 @@ void NodeIrSdk::convertVarHeaderToObject(IRSDKWrapper::TelemetryVar& var, Handle
   }
 }
 
-Handle<Value> NodeIrSdk::getMaskedValues(const int& val, char* unit)
+Local<Value> NodeIrSdk::getMaskedValues(const int& val, char* unit)
 {
   if (strcmp(unit,"irsdk_Flags") == 0) {
     return getValueArr(val, FLAG_MASKS);
@@ -103,9 +103,9 @@ Handle<Value> NodeIrSdk::getMaskedValues(const int& val, char* unit)
   return Nan::New(static_cast<int32_t>(val));
 }
 
-Handle<Array> NodeIrSdk::getValueArr(const int& val, const std::vector<NodeIrSdk::MaskName> MASKS)
+Local<Array> NodeIrSdk::getValueArr(const int& val, const std::vector<NodeIrSdk::MaskName> MASKS)
 {
-  Handle<Array> arr = Nan::New<Array>();
+  Local<Array> arr = Nan::New<Array>();
   int counter = 0;
   for (const auto& mask : MASKS)
   {
@@ -116,7 +116,7 @@ Handle<Array> NodeIrSdk::getValueArr(const int& val, const std::vector<NodeIrSdk
   return arr;
 }
 
-Handle<Value> NodeIrSdk::getStringValue(const int& val, const std::vector<NodeIrSdk::MaskName>& map) 
+Local<Value> NodeIrSdk::getStringValue(const int& val, const std::vector<NodeIrSdk::MaskName>& map)
 {
   for (const auto& mask : map) {
     if (mask.val == val) {
@@ -126,7 +126,7 @@ Handle<Value> NodeIrSdk::getStringValue(const int& val, const std::vector<NodeIr
   return Nan::Undefined();
 }
 
-NodeIrSdk::MaskName::MaskName(int val, const char* name) : 
+NodeIrSdk::MaskName::MaskName(int val, const char* name) :
 val(val), name(name)
 {
 }
diff --git a/src/cpp/IrSdkBindingHelpers.h b/src/cpp/IrSdkBindingHelpers.h
index 692ae66..fd79470 100644
--- a/src/cpp/IrSdkBindingHelpers.h
+++ b/src/cpp/IrSdkBindingHelpers.h
@@ -10,9 +10,9 @@ using namespace v8;
 namespace NodeIrSdk
 {
 
-  Handle<Value> convertTelemetryValueToObject(IRSDKWrapper::TelemetryVar& var, const int& index);
-  Handle<Value> convertTelemetryVarToObject(IRSDKWrapper::TelemetryVar& var);
-  void convertVarHeaderToObject(IRSDKWrapper::TelemetryVar& var, Handle<Object>& obj);
+  Local<Value> convertTelemetryValueToObject(IRSDKWrapper::TelemetryVar& var, const int& index);
+  Local<Value> convertTelemetryVarToObject(IRSDKWrapper::TelemetryVar& var);
+  void convertVarHeaderToObject(IRSDKWrapper::TelemetryVar& var, Local<Object>& obj);
 
 
   struct MaskName {
@@ -22,10 +22,10 @@ namespace NodeIrSdk
     MaskName(int val, const char* name);
   };
 
-  Handle<Value> getStringValue(const int& val, const std::vector<MaskName>& map);
+  Local<Value> getStringValue(const int& val, const std::vector<MaskName>& map);
 
-  Handle<Value> getMaskedValues(const int& val, char* unit);
-  Handle<Array> getValueArr(const int& val, const std::vector<MaskName> MASKS);
+  Local<Value> getMaskedValues(const int& val, char* unit);
+  Local<Array> getValueArr(const int& val, const std::vector<MaskName> MASKS);
 
   const std::vector<MaskName> FLAG_MASKS = {
     MaskName((int)irsdk_checkered, "Checkered"),
@@ -58,7 +58,7 @@ namespace NodeIrSdk
     MaskName((int)irsdk_startSet, "StartSet"),
     MaskName((int)irsdk_startGo, "StartGo")
   };
-  
+
   const std::vector<MaskName> PIT_SV_MASKS = {
     MaskName((int)irsdk_LFTireChange, "LFTireChange"),
     MaskName((int)irsdk_RFTireChange, "RFTireChange"),
diff --git a/src/cpp/IrSdkNodeBindings.cpp b/src/cpp/IrSdkNodeBindings.cpp
index 8fc71de..f9a8265 100644
--- a/src/cpp/IrSdkNodeBindings.cpp
+++ b/src/cpp/IrSdkNodeBindings.cpp
@@ -10,118 +10,134 @@
 
 using namespace v8;
 
-namespace NodeIrSdk {
+namespace NodeIrSdk
+{
 
-  void start(const Nan::FunctionCallbackInfo<v8::Value>& args)
-  {
-    args.GetReturnValue().Set(Nan::New(irsdk.startup()));
-  }
+void start(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  args.GetReturnValue().Set(Nan::New(irsdk.startup()));
+}
 
-  void shutdown(const Nan::FunctionCallbackInfo<v8::Value>& args)
-  {
-    irsdk.shutdown();
-    args.GetReturnValue().Set(Nan::Undefined());
-  }
+void shutdown(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  irsdk.shutdown();
+  args.GetReturnValue().Set(Nan::Undefined());
+}
 
-  void isInitialized(const Nan::FunctionCallbackInfo<v8::Value>& args)
-  {
-    args.GetReturnValue().Set(Nan::New(irsdk.isInitialized()));
-  }
+void isInitialized(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  args.GetReturnValue().Set(Nan::New(irsdk.isInitialized()));
+}
 
-  void isConnected(const Nan::FunctionCallbackInfo<v8::Value>& args)
-  {
-    args.GetReturnValue().Set(Nan::New(irsdk.isConnected()));
-  }
+void isConnected(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  args.GetReturnValue().Set(Nan::New(irsdk.isConnected()));
+}
 
-  void updateSessionInfo(const Nan::FunctionCallbackInfo<v8::Value>& args)
-  {
-    args.GetReturnValue().Set(Nan::New(irsdk.updateSessionInfo()));
-  }
+void updateSessionInfo(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  args.GetReturnValue().Set(Nan::New(irsdk.updateSessionInfo()));
+}
 
-  void getSessionInfo(const Nan::FunctionCallbackInfo<v8::Value>& args)
-  {
-    args.GetReturnValue().Set(
+void getSessionInfo(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  args.GetReturnValue().Set(
       Nan::Encode(irsdk.getSessionInfo().c_str(), irsdk.getSessionInfo().length(), Nan::BINARY));
-  }
+}
+
+void updateTelemetry(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  args.GetReturnValue().Set(Nan::New(irsdk.updateTelemetry()));
+}
+
+void getTelemetry(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  Local<Object> rootObj = Nan::New<v8::Object>();
+  Local<Object> valuesObj = Nan::New<v8::Object>();
+  Nan::Set(rootObj, Nan::New("timestamp").ToLocalChecked(), Nan::New<Date>(irsdk.getLastTelemetryUpdateTS()).ToLocalChecked());
+
+  std::vector<irsdk_varHeader *> headers = irsdk.getVarHeaders();
 
-  void updateTelemetry(const Nan::FunctionCallbackInfo<v8::Value>& args)
+  for (const auto item : headers)
   {
-    args.GetReturnValue().Set(Nan::New(irsdk.updateTelemetry()));
+    IRSDKWrapper::TelemetryVar var(item);
+    irsdk.getVarVal(var);
+    Local<Value> varValue = convertTelemetryVarToObject(var);
+    Nan::Set(valuesObj, Nan::New(var.header->name).ToLocalChecked(), varValue);
   }
+  Nan::Set(rootObj, Nan::New("values").ToLocalChecked(), valuesObj);
+  args.GetReturnValue().Set(rootObj);
+}
+
+void getTelemetryDescription(const Nan::FunctionCallbackInfo<v8::Value> &args)
+{
+  Local<Object> obj = Nan::New<Object>();
+  std::vector<irsdk_varHeader *> headers = irsdk.getVarHeaders();
 
-  void getTelemetry(const Nan::FunctionCallbackInfo<v8::Value>& args)
+  for (const auto item : headers)
   {
-    Local<Object> rootObj = Nan::New<v8::Object>();
-    Local<Object> valuesObj = Nan::New<v8::Object>();
-    Nan::Set(rootObj, Nan::New("timestamp").ToLocalChecked(), Nan::New<Date>(irsdk.getLastTelemetryUpdateTS()).ToLocalChecked());
+    IRSDKWrapper::TelemetryVar var(item);
+    irsdk.getVarVal(var);
+    Local<Object> varObj = Nan::New<Object>();
+    convertVarHeaderToObject(var, varObj);
+    Nan::Set(obj, Nan::New(var.header->name).ToLocalChecked(), varObj);
+  }
+  args.GetReturnValue().Set(obj);
+}
 
-    std::vector<irsdk_varHeader*> headers = irsdk.getVarHeaders();
+NAN_METHOD(sendCmd)
+{
 
-    for (const auto item : headers)
-    {
-      IRSDKWrapper::TelemetryVar var(item);
-      irsdk.getVarVal(var);
-      Handle<Value> varValue = convertTelemetryVarToObject(var);
-      Nan::Set(valuesObj, Nan::New(var.header->name).ToLocalChecked(), varValue);
-    }
-    Nan::Set(rootObj, Nan::New("values").ToLocalChecked(), valuesObj);
-    args.GetReturnValue().Set(rootObj);
-  }
+  if (!irsdk.isInitialized() || !irsdk.isConnected())
+    return;
 
-  void getTelemetryDescription(const Nan::FunctionCallbackInfo<v8::Value>& args)
+  if (info.Length() > 4 || info.Length() < 1)
   {
-    Local<Object> obj = Nan::New<Object>();
-    std::vector<irsdk_varHeader*> headers = irsdk.getVarHeaders();
-
-    for (const auto item : headers)
-    {
-      IRSDKWrapper::TelemetryVar var(item);
-      irsdk.getVarVal(var);
-      Handle<Object> varObj = Nan::New<Object>();
-      convertVarHeaderToObject(var, varObj);
-      Nan::Set(obj, Nan::New(var.header->name).ToLocalChecked(), varObj);
-    }
-    args.GetReturnValue().Set(obj);
+    std::cerr << "sendCommand: invalid arguments (1 to 4 accepted)" << std::endl;
+    return;
   }
-  
-  NAN_METHOD(sendCmd) {
 
-    if (!irsdk.isInitialized() || !irsdk.isConnected()) return;
-    
-    if (info.Length() > 4 || info.Length() < 1 ) {
-      std::cerr << "sendCommand: invalid arguments (1 to 4 accepted)" << std::endl;
+  for (int i = 0; i < info.Length(); ++i)
+  {
+    if (!info[i]->IsInt32())
+    {
+      std::cerr << "sendCommand: invalid argument type, int32 needed" << std::endl;
       return;
     }
-    
-    
-    for (int i = 0; i < info.Length(); ++i) {
-      if (!info[i]->IsInt32()) {
-        std::cerr << "sendCommand: invalid argument type, int32 needed" << std::endl;
-        return;
-      }
-    }
-    
-    switch (info.Length()) {
-    case 1:
-      broadcastCmd(info[0]->Int32Value(), 0, 0);
-      break;
-    case 2:
-      broadcastCmd(info[0]->Int32Value(), info[1]->Int32Value(), 0);
-      break;
-    case 3:
-      broadcastCmd(
-        info[0]->Int32Value(), info[1]->Int32Value(), info[2]->Int32Value());
-      break;
-    case 4:
-      broadcastCmd(
-        info[0]->Int32Value(), info[1]->Int32Value(), 
-        info[2]->Int32Value(), info[3]->Int32Value());
-      break;
-    }
   }
 
-  static void cleanUp(void* arg)
+  switch (info.Length())
   {
-    irsdk.shutdown();
+  case 1:
+    broadcastCmd(
+        info[0]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        0,
+        0);
+    break;
+  case 2:
+    broadcastCmd(
+        info[0]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        info[1]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        0);
+    break;
+  case 3:
+    broadcastCmd(
+        info[0]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        info[1]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        info[2]->Int32Value(Nan::GetCurrentContext()).FromJust());
+    break;
+  case 4:
+    broadcastCmd(
+        info[0]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        info[1]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        info[2]->Int32Value(Nan::GetCurrentContext()).FromJust(),
+        info[3]->Int32Value(Nan::GetCurrentContext()).FromJust());
+    break;
   }
 }
+
+static void cleanUp(void *arg)
+{
+  irsdk.shutdown();
+}
+} // namespace NodeIrSdk