node-datachannel 0.3.6 → 0.4.1

package/README.md

@@ -30,6 +30,7 @@ npm install node-datachannel
 | Node V15 |     +     |      +      |      +           |      +      |      +      |       +        |
 | Node V16 |     +     |      +      |      +           |      +      |      +      |       +        |
 | Node V17 |     +     |      +      |      +           |      +      |      +      |       +        |
+| Node V18 |     +     |      +      |      +           |      +      |      +      |       +        |
 
 1) Please note that; For Linux-arm64 platform we need OpenSSL to be installed locally.
 

package/lib/index.d.ts

@@ -17,7 +17,7 @@ export interface SctpSettings {
 
 // Functions
 export function preload(): void;
-export function initLogger(level: LogLevel): void;
+export function initLogger(level: LogLevel, callback?: (level: LogLevel, message: string) => void): void;
 export function cleanup(): void;
 export function setSctpSettings(settings: SctpSettings): void;
 
@@ -46,9 +46,11 @@ export interface IceServer {
 }
 
 export type TransportPolicy = 'all' | 'relay';
+
 export interface RtcConfig {
     iceServers: (string | IceServer)[];
     proxyServer?: ProxyServer;
+    bindAddress?: string;
     enableIceTcp?: boolean;
     enableIceUdpMux?: boolean;
     disableAutoNegotiation?: boolean;
@@ -204,6 +206,7 @@ export class DataChannel {
 export class PeerConnection {
     constructor(peerName: string, config: RtcConfig);
     close(): void;
+    destroy(): void;
     setLocalDescription(type?: DescriptionType): void;
     setRemoteDescription(sdp: string, type: DescriptionType): void;
     localDescription(): { type: string; sdp: string } | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-datachannel",
-  "version": "0.3.6",
+  "version": "0.4.1",
   "description": "libdatachannel node bindings",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,6 +13,7 @@
     "install": "prebuild-install || (npm install --ignore-scripts && npm run _prebuild)",
     "install-nice": "npm run clean && cmake-js build --CDUSE_NICE=1",
     "build": "cmake-js build",
+    "build:debug": "cmake-js build -D",
     "_prebuild": "prebuild --backend cmake-js",
     "clean": "cmake-js clean",
     "lint": "eslint lib/**/* test/**/*",
@@ -40,7 +41,7 @@
       "url": "https://github.com/paullouisageneau"
     }
   ],
-  "license": "LGPL",
+  "license": "MPL 2.0",
   "gypfile": true,
   "bugs": {
     "url": "https://github.com/murat-dogan/node-datachannel/issues"

package/src/data-channel-wrapper.cpp

@@ -103,7 +103,7 @@ Napi::Value DataChannelWrapper::getId(const Napi::CallbackInfo &info)
         return info.Env().Null();
     }
 
-    return Napi::Number::New(info.Env(), mDataChannelPtr->id());
+    return Napi::Number::New(info.Env(), mDataChannelPtr->id().value_or(-1));
 }
 
 Napi::Value DataChannelWrapper::getProtocol(const Napi::CallbackInfo &info)

package/src/peer-connection-wrapper.cpp

@@ -17,6 +17,13 @@ void PeerConnectionWrapper::CloseAll()
         inst->doClose();
 }
 
+void PeerConnectionWrapper::ResetCallbacksAll()
+{
+    auto copy(instances);
+    for (auto inst : copy)
+        inst->doResetCallbacks();
+}
+
 Napi::Object PeerConnectionWrapper::Init(Napi::Env env, Napi::Object exports)
 {
     Napi::HandleScope scope(env);
@@ -26,6 +33,7 @@ Napi::Object PeerConnectionWrapper::Init(Napi::Env env, Napi::Object exports)
         "PeerConnection",
         {
             InstanceMethod("close", &PeerConnectionWrapper::close),
+            InstanceMethod("destroy", &PeerConnectionWrapper::destroy),
             InstanceMethod("setLocalDescription", &PeerConnectionWrapper::setLocalDescription),
             InstanceMethod("setRemoteDescription", &PeerConnectionWrapper::setRemoteDescription),
             InstanceMethod("localDescription", &PeerConnectionWrapper::localDescription),
@@ -163,6 +171,10 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
         rtcConfig.proxyServer = rtc::ProxyServer(type, ip, port, username, password);
     }
 
+    // bind address, libjuice only
+    if(config.Get("bindAddress").IsString())
+        rtcConfig.bindAddress = config.Get("bindAddress").As<Napi::String>().ToString();
+
     // Port Ranges
     if (config.Get("portRangeBegin").IsNumber())
         rtcConfig.portRangeBegin = config.Get("portRangeBegin").As<Napi::Number>().Uint32Value();
@@ -225,7 +237,7 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
 
 PeerConnectionWrapper::~PeerConnectionWrapper()
 {
-    doClose();
+    doDestroy();
 }
 
 void PeerConnectionWrapper::doClose()
@@ -243,7 +255,21 @@ void PeerConnectionWrapper::doClose()
             return;
         }
     }
+}
 
+void PeerConnectionWrapper::close(const Napi::CallbackInfo &info)
+{
+    doClose();
+}
+
+void PeerConnectionWrapper::doDestroy()
+{
+    doClose();
+    doResetCallbacks();
+}
+
+void PeerConnectionWrapper::doResetCallbacks()
+{
     mOnLocalDescriptionCallback.reset();
     mOnLocalCandidateCallback.reset();
     mOnStateChangeCallback.reset();
@@ -254,9 +280,9 @@ void PeerConnectionWrapper::doClose()
     instances.erase(this);
 }
 
-void PeerConnectionWrapper::close(const Napi::CallbackInfo &info)
+void PeerConnectionWrapper::destroy(const Napi::CallbackInfo &info)
 {
-    doClose();
+    doDestroy();
 }
 
 void PeerConnectionWrapper::setLocalDescription(const Napi::CallbackInfo &info)
@@ -640,8 +666,7 @@ void PeerConnectionWrapper::onStateChange(const Napi::CallbackInfo &info)
     mRtcPeerConnPtr->onStateChange([&](rtc::PeerConnection::State state) {
         if (mOnStateChangeCallback)
             mOnStateChangeCallback->call([this, state](Napi::Env env, std::vector<napi_value> &args) {
-                // Check the peer connection is not closed but still allow a call for State::Closed
-                if(state != rtc::PeerConnection::State::Closed && instances.find(this) == instances.end())
+                if(instances.find(this) == instances.end())
                     throw ThreadSafeCallback::CancelException();
 
                 // This will run in main thread and needs to construct the

package/src/peer-connection-wrapper.h

@@ -19,6 +19,8 @@ public:
   PeerConnectionWrapper(const Napi::CallbackInfo &info);
   ~PeerConnectionWrapper();
 
+  void destroy(const Napi::CallbackInfo &info);
+
   // Functions
   void close(const Napi::CallbackInfo &info);
   void setLocalDescription(const Napi::CallbackInfo &info);
@@ -47,14 +49,19 @@ public:
   Napi::Value rtt(const Napi::CallbackInfo &info);
   Napi::Value getSelectedCandidatePair(const Napi::CallbackInfo &info);
 
-  // Close all existing DataChannels
+  // Close all existing Peer Connections
   static void CloseAll();
 
+  // Reset all Callbacks for existing Peer Connections
+  static void ResetCallbacksAll();
+
 private:
   static Napi::FunctionReference constructor;
   static std::unordered_set<PeerConnectionWrapper *> instances;
 
   void doClose();
+  void doDestroy();
+  void doResetCallbacks();
 
   std::string mPeerName;
   std::unique_ptr<rtc::PeerConnection> mRtcPeerConnPtr = nullptr;

package/src/rtc-wrapper.cpp

@@ -61,7 +61,42 @@ void RtcWrapper::initLogger(const Napi::CallbackInfo &info)
 
     try
     {
-        rtc::InitLogger(logLevel);
+        if (length < 2)
+        {
+            rtc::InitLogger(logLevel);
+        }
+        else
+        {
+            if (!info[1].IsFunction())
+            {
+                Napi::TypeError::New(env, "Function expected").ThrowAsJavaScriptException();
+                return;
+            }
+            logCallback = std::make_unique<ThreadSafeCallback>(info[1].As<Napi::Function>());
+            rtc::InitLogger(logLevel, [&](rtc::LogLevel level, std::string message) {
+                if (logCallback)
+                    logCallback->call([level, message = std::move(message)](Napi::Env env, std::vector<napi_value> &args) {
+                        // This will run in main thread and needs to construct the
+                        // arguments for the call
+
+                        std::string logLevel;
+                        if (level == rtc::LogLevel::Verbose)
+                            logLevel = "Verbose";
+                        if (level == rtc::LogLevel::Debug)
+                            logLevel = "Debug";
+                        if (level == rtc::LogLevel::Info)
+                            logLevel = "Info";
+                        if (level == rtc::LogLevel::Warning)
+                            logLevel = "Warning";
+                        if (level == rtc::LogLevel::Error)
+                            logLevel = "Error";
+                        if (level == rtc::LogLevel::Fatal)
+                            logLevel = "Fatal";
+                        args = {Napi::String::New(env, logLevel), Napi::String::New(env, message)};
+                    });
+            });
+        }
+
     }
     catch (std::exception &ex)
     {
@@ -82,7 +117,12 @@ void RtcWrapper::cleanup(const Napi::CallbackInfo &info)
         const auto timeout = std::chrono::seconds(10);
         if(rtc::Cleanup().wait_for(std::chrono::seconds(timeout)) == std::future_status::timeout)
             throw std::runtime_error("cleanup timeout (possible deadlock)");
-    }
+        
+        // Clear Callbacks    
+        PeerConnectionWrapper::ResetCallbacksAll();
+
+        if (logCallback) logCallback.reset();
+    }        
     catch (std::exception &ex)
     {
         Napi::Error::New(env, std::string("libdatachannel error# ") + ex.what()).ThrowAsJavaScriptException();

package/src/rtc-wrapper.h

@@ -8,6 +8,8 @@
 
 #include "rtc/rtc.hpp"
 
+#include "thread-safe-callback.h"
+
 class RtcWrapper
 {
 public:
@@ -16,6 +18,8 @@ public:
     static void initLogger(const Napi::CallbackInfo &info);
     static void cleanup(const Napi::CallbackInfo &info);
     static void setSctpSettings(const Napi::CallbackInfo &info);
+private:
+    static inline std::unique_ptr<ThreadSafeCallback> logCallback = nullptr;
 };
 
 #endif // RTC_WRAPPER_H

package/test/connectivity.js

@@ -11,6 +11,7 @@ let dc2 = null;
 // export interface RtcConfig {
 //     iceServers: string[];
 //     proxyServer?: ProxyServer;
+//     bindAddress?: string;
 //     enableIceTcp?: boolean;
 //     portRangeBegin?: number;
 //     portRangeEnd?: number;