Merge pull request #10 from murat-dogan/0.0.11-dev

0.0.11

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(node_datachannel VERSION 0.0.10)
+project(node_datachannel VERSION 0.0.11)
 
 include_directories(${CMAKE_JS_INC})
 
@@ -11,7 +11,7 @@ include(FetchContent)
 FetchContent_Declare(
     libdatachannel
     GIT_REPOSITORY https://github.com/paullouisageneau/libdatachannel.git
-    GIT_TAG        "v0.8.0"
+    GIT_TAG        "v0.9.4"
 )
 FetchContent_MakeAvailable(libdatachannel)
 

lib/index.d.ts

@@ -11,6 +11,7 @@ export enum LogLevel {
 
 // Functions
 export function initLogger(level: LogLevel): void;
+export function cleanup(): void;
 
 export enum ProxyServerType {
     None = 'None',
@@ -48,6 +49,7 @@ export class DataChannel {
     availableAmount: () => Number;
     bufferedAmount: () => Number;
     maxMessageSize: () => Number;
+    setBufferedAmountLowThreshold: (newSize: Number) => void;
     onOpen: (cb: () => void) => void;
     onClosed: (cb: () => void) => void;
     onError: (cb: (err: string) => void) => void;

package.json

@@ -45,4 +45,4 @@
   "dependencies": {
     "prebuild-install": "^5.3.5"
   }
-}
+}

src/data-channel-wrapper.cpp

@@ -16,6 +16,7 @@ Napi::Object DataChannelWrapper::Init(Napi::Env env, Napi::Object exports)
          InstanceMethod("availableAmount", &DataChannelWrapper::availableAmount),
          InstanceMethod("bufferedAmount", &DataChannelWrapper::bufferedAmount),
          InstanceMethod("maxMessageSize", &DataChannelWrapper::maxMessageSize),
+         InstanceMethod("setBufferedAmountLowThreshold", &DataChannelWrapper::setBufferedAmountLowThreshold),
          InstanceMethod("onOpen", &DataChannelWrapper::onOpen),
          InstanceMethod("onClosed", &DataChannelWrapper::onClosed),
          InstanceMethod("onError", &DataChannelWrapper::onError),
@@ -182,6 +183,26 @@ Napi::Value DataChannelWrapper::maxMessageSize(const Napi::CallbackInfo &info)
     return Napi::Number::New(info.Env(), mDataChannelPtr->maxMessageSize());
 }
 
+void DataChannelWrapper::setBufferedAmountLowThreshold(const Napi::CallbackInfo &info)
+{
+    if (!mDataChannelPtr)
+    {
+        Napi::TypeError::New(info.Env(), "It seems data-channel is destroyed!").ThrowAsJavaScriptException();
+        return;
+    }
+
+    Napi::Env env = info.Env();
+    int length = info.Length();
+
+    if (length < 1 || !info[0].IsNumber())
+    {
+        Napi::TypeError::New(env, "Number expected").ThrowAsJavaScriptException();
+        return;
+    }
+
+    mDataChannelPtr->setBufferedAmountLowThreshold(info[0].ToNumber().Uint32Value());
+}
+
 void DataChannelWrapper::onOpen(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();

src/data-channel-wrapper.h

@@ -25,6 +25,7 @@ class DataChannelWrapper : public Napi::ObjectWrap<DataChannelWrapper>
   Napi::Value availableAmount(const Napi::CallbackInfo &info);
   Napi::Value bufferedAmount(const Napi::CallbackInfo &info);
   Napi::Value maxMessageSize(const Napi::CallbackInfo &info);
+  void setBufferedAmountLowThreshold(const Napi::CallbackInfo &info);
 
   // Callbacks
   void onOpen(const Napi::CallbackInfo &info);

src/rtc-wrapper.cpp

@@ -5,6 +5,7 @@ Napi::Object RtcWrapper::Init(Napi::Env env, Napi::Object exports)
     Napi::HandleScope scope(env);
 
     exports.Set("initLogger", Napi::Function::New(env, &RtcWrapper::initLogger));
+    exports.Set("cleanup", Napi::Function::New(env, &RtcWrapper::cleanup));
     return exports;
 }
 
@@ -37,4 +38,9 @@ void RtcWrapper::initLogger(const Napi::CallbackInfo &info)
         logLevel = rtc::LogLevel::Fatal;
 
     rtc::InitLogger(logLevel);
+}
+
+void RtcWrapper::cleanup(const Napi::CallbackInfo &info)
+{
+    rtc::Cleanup();
 }

src/rtc-wrapper.h

@@ -11,6 +11,7 @@ class RtcWrapper
 public:
     static Napi::Object Init(Napi::Env env, Napi::Object exports);
     static void initLogger(const Napi::CallbackInfo &info);
+    static void cleanup(const Napi::CallbackInfo &info);
 };
 
 #endif // RTC_WRAPPER_H

test/connectivity.js

@@ -69,4 +69,10 @@ setTimeout(() => {
     dc2.close();
     peer1.close();
     peer2.close();
+    dc1 = null;
+    dc2 = null;
+    peer1 = null;
+    peer2 = null;
+    nodeDataChannel.cleanup();
+
 }, 10 * 1000);

test/test.js

@@ -113,6 +113,11 @@ describe('P2P', () => {
             peer1 = null;
             peer2 = null;
 
+            // Cleanup Threads
+            nodeDataChannel.cleanup();
+        }, 5 * 1000);
+
+        setTimeout(() => {
             // State Callbacks
             expect(p1StateMock.mock.calls.length).toBeGreaterThanOrEqual(1);
             expect(p1GatheringStateMock.mock.calls.length).toBeGreaterThanOrEqual(1);
@@ -136,7 +141,7 @@ describe('P2P', () => {
             expect(p2DCMessageMock.mock.calls[0][0]).toEqual("Hello From Peer1");
 
             done();
-        }, 10 * 1000);
+        }, 15 * 1000);
 
     });
 });