Expose correct UUID length

thegecko · May 7, 2023 · 2f25429 · 2f25429
1 parent d6a1a11
commit 2f25429
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/peripheral.cpp b/lib/peripheral.cpp
@@ -179,7 +179,7 @@ Napi::Value Peripheral::GetServices(const Napi::CallbackInfo &info) {
     }
 
     Napi::String uuid =
-        Napi::String::New(env, service.uuid.value, SIMPLEBLE_UUID_STR_LEN);
+        Napi::String::New(env, service.uuid.value, SIMPLEBLE_UUID_STR_LEN_TS);
 
     Napi::Uint8Array data = Napi::Uint8Array::New(env, service.data_length);
     for (size_t i = 0; i < service.data_length; i++) {
@@ -197,7 +197,7 @@ Napi::Value Peripheral::GetServices(const Napi::CallbackInfo &info) {
       for (size_t j = 0; j < characteristic.descriptor_count; j++) {
         descriptors[j] =
             Napi::String::New(env, characteristic.descriptors[j].uuid.value,
-                              SIMPLEBLE_UUID_STR_LEN);
+                              SIMPLEBLE_UUID_STR_LEN_TS);
       }
 
       obj.Set("uuid", characteristic.uuid.value);

diff --git a/lib/peripheral.h b/lib/peripheral.h
@@ -3,6 +3,8 @@
 #include <napi.h>
 #include <simpleble_c/peripheral.h>
 
+#define SIMPLEBLE_UUID_STR_LEN_TS SIMPLEBLE_UUID_STR_LEN - 1 // remove null terminator
+
 class Peripheral : public Napi::ObjectWrap<Peripheral> {
 public:
   static Napi::Object Init(Napi::Env env, Napi::Object exports);