Merge branch 'master' into feat/support-setting-ufrag-and-pwd

Author: achingbrain

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 cmake_policy(SET CMP0091 NEW)
 cmake_policy(SET CMP0042 NEW)
 
-project(node_datachannel VERSION 0.24.0)
+project(node_datachannel VERSION 0.25.0)
 
 # -Dnapi_build_version=8
 add_definitions(-DNAPI_VERSION=8)

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "node-datachannel",
-    "version": "0.24.0",
+    "version": "0.25.0",
     "description": "WebRTC For Node.js and Electron. libdatachannel node bindings.",
     "main": "./dist/cjs/lib/index.cjs",
     "module": "./dist/esm/lib/index.mjs",

package.json

@@ -18,6 +18,7 @@ Napi::Object RtcWrapper::Init(Napi::Env env, Napi::Object exports)
     exports.Set("cleanup", Napi::Function::New(env, &RtcWrapper::cleanup));
     exports.Set("preload", Napi::Function::New(env, &RtcWrapper::preload));
     exports.Set("setSctpSettings", Napi::Function::New(env, &RtcWrapper::setSctpSettings));
+    exports.Set("getLibraryVersion", Napi::Function::New(env, &RtcWrapper::getLibraryVersion));
 
     return exports;
 }
@@ -172,3 +173,11 @@ void RtcWrapper::setSctpSettings(const Napi::CallbackInfo &info)
 
     rtc::SetSctpSettings(settings);
 }
+
+
+Napi::Value RtcWrapper::getLibraryVersion(const Napi::CallbackInfo &info)
+{
+    PLOG_DEBUG << "getLibraryVersion() called";
+    Napi::Env env = info.Env();
+    return Napi::String::New(info.Env(), RTC_VERSION);
+}

src/cpp/rtc-wrapper.cpp

@@ -18,6 +18,7 @@ class RtcWrapper
     static void initLogger(const Napi::CallbackInfo &info);
     static void cleanup(const Napi::CallbackInfo &info);
     static void setSctpSettings(const Napi::CallbackInfo &info);
+    static Napi::Value getLibraryVersion(const Napi::CallbackInfo &info);
 private:
     static inline std::unique_ptr<ThreadSafeCallback> logCallback = nullptr;
     static inline std::mutex iceUdpMuxListenersMutex;

src/cpp/rtc-wrapper.h

@@ -9,6 +9,7 @@ export function preload(): void { nodeDataChannel.preload(); }
 export function initLogger(level: LogLevel): void { nodeDataChannel.initLogger(level); }
 export function cleanup(): void { nodeDataChannel.cleanup(); }
 export function setSctpSettings(settings: SctpSettings): void { nodeDataChannel.setSctpSettings(settings); }
+export function getLibraryVersion(): string { return nodeDataChannel.getLibraryVersion(); }
 
 export interface Audio {
     addAudioCodec(payloadType: number, codec: string, profile?: string): void;
@@ -170,6 +171,7 @@ export default {
     cleanup,
     preload,
     setSctpSettings,
+    getLibraryVersion,
     RtcpReceivingSession,
     Track,
     Video,

src/lib/index.ts

@@ -191,6 +191,8 @@ export default class RTCDataChannel extends EventTarget implements globalThis.RT
 
     close(): void {
         this.#closeRequested = true;
-        this.#dataChannel.close();
+        setImmediate(() => {
+            this.#dataChannel.close();
+        });
     }
 }