node-datachannel 0.21.0 → 0.23.0

package/src/cpp/peer-connection-wrapper.cpp

@@ -9,7 +9,7 @@
 #include <cctype>
 #include <sstream>
 
-Napi::FunctionReference PeerConnectionWrapper::constructor;
+Napi::FunctionReference PeerConnectionWrapper::constructor = Napi::FunctionReference();
 std::unordered_set<PeerConnectionWrapper *> PeerConnectionWrapper::instances;
 
 void PeerConnectionWrapper::CloseAll()
@@ -65,8 +65,12 @@ Napi::Object PeerConnectionWrapper::Init(Napi::Env env, Napi::Object exports)
             InstanceMethod("maxMessageSize", &PeerConnectionWrapper::maxMessageSize),
         });
 
-    constructor = Napi::Persistent(func);
-    constructor.SuppressDestruct();
+    // If this is not the first call, we don't want to reassign the constructor (hot-reload problem)
+    if(constructor.IsEmpty())
+    {
+        constructor = Napi::Persistent(func);
+        constructor.SuppressDestruct();
+    }
 
     exports.Set("PeerConnection", func);
     return exports;
@@ -242,6 +246,11 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
         }
     }
 
+    // Allow skipping fingerprint validation
+    if (config.Get("disableFingerprintVerification").IsBoolean()) {
+        rtcConfig.disableFingerprintVerification = config.Get("disableFingerprintVerification").As<Napi::Boolean>();
+    }
+
     // Create peer-connection
     try
     {

package/src/cpp/web-socket-server-wrapper.cpp

@@ -2,7 +2,7 @@
 
 #include "plog/Log.h"
 
-Napi::FunctionReference WebSocketServerWrapper::constructor;
+Napi::FunctionReference WebSocketServerWrapper::constructor = Napi::FunctionReference();
 std::unordered_set<WebSocketServerWrapper *> WebSocketServerWrapper::instances;
 
 void WebSocketServerWrapper::StopAll()
@@ -26,8 +26,12 @@ Napi::Object WebSocketServerWrapper::Init(Napi::Env env, Napi::Object exports)
             InstanceMethod("onClient", &WebSocketServerWrapper::onClient)
         });
 
-    constructor = Napi::Persistent(func);
-    constructor.SuppressDestruct();
+    // If this is not the first call, we don't want to reassign the constructor (hot-reload problem)
+    if(constructor.IsEmpty())
+    {
+        constructor = Napi::Persistent(func);
+        constructor.SuppressDestruct();
+    }
 
     exports.Set("WebSocketServer", func);
     return exports;

package/src/cpp/web-socket-wrapper.cpp

@@ -2,7 +2,7 @@
 
 #include "plog/Log.h"
 
-Napi::FunctionReference WebSocketWrapper::constructor;
+Napi::FunctionReference WebSocketWrapper::constructor = Napi::FunctionReference();
 std::unordered_set<WebSocketWrapper *> WebSocketWrapper::instances;
 
 void WebSocketWrapper::CloseAll()
@@ -47,8 +47,12 @@ Napi::Object WebSocketWrapper::Init(Napi::Env env, Napi::Object exports)
             InstanceMethod("path", &WebSocketWrapper::path),
         });
 
-    constructor = Napi::Persistent(func);
-    constructor.SuppressDestruct();
+    // If this is not the first call, we don't want to reassign the constructor (hot-reload problem)
+    if(constructor.IsEmpty())
+    {
+        constructor = Napi::Persistent(func);
+        constructor.SuppressDestruct();
+    }
 
     exports.Set("WebSocket", func);
     return exports;

package/src/lib/datachannel-stream.ts

@@ -1,5 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import * as stream from 'stream';
-// import { DataChannel } from './node-datachannel.js';
 
 /**
  * Turns a node-datachannel DataChannel into a real Node.js stream, complete with buffering,

package/src/lib/index.ts

@@ -1,7 +1,7 @@
 import nodeDataChannel from './node-datachannel';
 import _DataChannelStream from './datachannel-stream';
 import { WebSocketServer } from './websocket-server';
-import { Channel, DataChannelInitConfig, DescriptionType, Direction, LogLevel, RtcConfig, RTCIceConnectionState, RTCIceGatheringState, RTCPeerConnectionState, RTCSdpType, RTCSignalingState, SctpSettings, SelectedCandidateInfo } from './types';
+import { Channel, DataChannelInitConfig, DescriptionType, Direction, LogLevel, RtcConfig, RTCIceConnectionState, RTCIceGatheringState, RTCPeerConnectionState, RTCSignalingState, SctpSettings, SelectedCandidateInfo } from './types';
 import { WebSocket } from './websocket';
 
 export function preload(): void { nodeDataChannel.preload(); }
@@ -105,7 +105,7 @@ export interface DataChannel extends Channel {
     onClosed(cb: () => void): void;
     onError(cb: (err: string) => void): void;
     onBufferedAmountLow(cb: () => void): void;
-    onMessage(cb: (msg: string | Buffer) => void): void;
+    onMessage(cb: (msg: string | Buffer | ArrayBuffer) => void): void;
 }
 export const DataChannel: {
     // DataChannel implementation
@@ -115,7 +115,7 @@ export interface PeerConnection {
     close(): void;
     setLocalDescription(type?: DescriptionType): void;
     setRemoteDescription(sdp: string, type: DescriptionType): void;
-    localDescription(): { type: DescriptionType; sdp: RTCSdpType } | null;
+    localDescription(): { type: DescriptionType; sdp: string } | null;
     remoteDescription(): { type: DescriptionType; sdp: string } | null;
     addRemoteCandidate(candidate: string, mid: string): void;
     createDataChannel(label: string, config?: DataChannelInitConfig): DataChannel;

package/src/lib/node-datachannel.ts

@@ -5,6 +5,11 @@ try {
     nodeDataChannel = require('../../../build/Release/node_datachannel.node');
 }
 catch (e) {
+    // If this is not a module not found error, rethrow it
+    if (e.code !== 'MODULE_NOT_FOUND') {
+        throw e;
+    }
+
     // from src
     nodeDataChannel = require('../../build/Release/node_datachannel.node');
 }

package/src/lib/types.ts

@@ -10,7 +10,7 @@ export interface Channel {
     onClosed(cb: () => void): void;
     onError(cb: (err: string) => void): void;
     onBufferedAmountLow(cb: () => void): void;
-    onMessage(cb: (msg: string | Buffer) => void): void;
+    onMessage(cb: (msg: string | Buffer | ArrayBuffer) => void): void;
 }
 
 export interface WebSocketServerConfiguration {
@@ -76,6 +76,7 @@ export interface RtcConfig {
     maxMessageSize?: number;
     mtu?: number;
     iceTransportPolicy?: TransportPolicy;
+    disableFingerprintVerification?: boolean;
 }
 
 // Lowercase to match the description type string from libdatachannel

package/src/lib/websocket-server.ts

@@ -4,6 +4,7 @@ import { WebSocketServerConfiguration } from './types';
 import { WebSocket } from './websocket';
 
 export class WebSocketServer extends EventEmitter {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     #server: any;
     #clients: WebSocket[] = [];
 

package/src/polyfill/RTCDataChannel.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import 'node-domexception';
 import * as exceptions from './Exception';
 import { DataChannel } from '../lib/index';
 
@@ -27,7 +26,7 @@ export default class RTCDataChannel extends EventTarget implements globalThis.RT
         super();
 
         this.#dataChannel = dataChannel;
-        this.#binaryType = 'arraybuffer';
+        this.#binaryType = 'blob';
         this.#readyState = this.#dataChannel.isOpen() ? 'open' : 'connecting';
         this.#bufferedAmountLowThreshold = 0;
         this.#maxPacketLifeTime = opts.maxPacketLifeTime || null;
@@ -73,7 +72,10 @@ export default class RTCDataChannel extends EventTarget implements globalThis.RT
 
         this.#dataChannel.onMessage((data) => {
             if (ArrayBuffer.isView(data)) {
-                data = Buffer.from(data.buffer);
+                if (this.binaryType == 'arraybuffer')
+                    data = data.buffer;
+                else
+                    data = Buffer.from(data.buffer);
             }
 
             this.dispatchEvent(new MessageEvent('message', { data }));

package/src/polyfill/RTCIceCandidate.ts

@@ -2,7 +2,6 @@
 //
 // Example: candidate:123456 1 UDP 123456 192.168.1.1 12345 typ host raddr=10.0.0.1 rport=54321 generation 0
 
-import 'node-domexception';
 
 export default class RTCIceCandidate implements globalThis.RTCIceCandidate {
     #address: string | null;

package/src/polyfill/RTCPeerConnection.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import 'node-domexception';
 import { SelectedCandidateInfo } from '../lib/types';
 import { PeerConnection } from '../lib/index';
 import RTCSessionDescription from './RTCSessionDescription';
@@ -383,10 +382,14 @@ export default class RTCPeerConnection extends EventTarget implements globalThis
     getStats(): Promise<globalThis.RTCStatsReport> {
         return new Promise((resolve) => {
             const report = new Map();
-            const cp = this.#peerConnection.getSelectedCandidatePair();
-            const bytesSent = this.#peerConnection.bytesSent();
-            const bytesReceived = this.#peerConnection.bytesReceived();
-            const rtt = this.#peerConnection.rtt();
+            const cp = this.#peerConnection?.getSelectedCandidatePair();
+            const bytesSent = this.#peerConnection?.bytesSent();
+            const bytesReceived = this.#peerConnection?.bytesReceived();
+            const rtt = this.#peerConnection?.rtt();
+
+            if(!cp) {
+                return resolve(report);
+            }
 
             const localIdRs = getRandomString(8);
             const localId = 'RTCIceCandidate_' + localIdRs;