set non-exsisting advertisment fields to NULL

rickymohk · Jul 14, 2022 · 59e6ba6 · 59e6ba6
1 parent 0731b93
commit 59e6ba6
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/callbacks.cc b/src/callbacks.cc
@@ -111,11 +111,19 @@ void Emit::Scan(const std::string& uuid, int rssi, const Peripheral& peripheral)
         {
             advertisment.Set(_s("localName"), _s(name));
         }
+        else
+        {
+            advertisment.Set(_s("localName"), NULL);
+        }
         advertisment.Set(_s("txPowerLevel"), txPowerLevel);
         if(!manufacturerData.empty())
         {
             advertisment.Set(_s("manufacturerData"), toBuffer(env, manufacturerData));
         }
+        else
+        {
+            advertisment.Set(_s("manufacturerData"), toBuffer(env, NULL));
+        }
         if(!serviceData.empty())
         {
             auto array = serviceData.empty() ? Napi::Array::New(env) : Napi::Array::New(env, serviceData.size());
@@ -128,10 +136,18 @@ void Emit::Scan(const std::string& uuid, int rssi, const Peripheral& peripheral)
             }
             advertisment.Set(_s("serviceData"), array);
         }
+        else
+        {
+            advertisment.Set(_s("serviceData"), NULL);
+        }
         if(!serviceUuids.empty())
         {
             advertisment.Set(_s("serviceUuids"), toUuidArray(env, serviceUuids));
         }
+        else
+        {
+            advertisment.Set(_s("serviceUuids"), toUuidArray(env, NULL));
+        }
         // emit('discover', deviceUuid, address, addressType, connectable, advertisement, rssi);
         args = { _s("discover"),  _u(uuid),     _s(address), toAddressType(env, addressType),
                  _b(connectable), advertisment, _n(rssi) };