node-datachannel 0.10.0 → 0.11.0

package/polyfill/index.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var DOMException$1 = require('node-domexception');
 var module$1 = require('module');
 var stream = require('stream');
+var events = require('events');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 class RTCCertificate {
@@ -25,6 +26,26 @@ class RTCCertificate {
     }
 }
 
+const InvalidStateError = (msg) => {
+    return new DOMException(msg, 'InvalidStateError');
+};
+
+const InvalidAccessError = (msg) => {
+    return new DOMException(msg, 'InvalidAccessError');
+};
+
+const NotFoundError = (msg) => {
+    return new DOMException(msg, 'NotFoundError');
+};
+
+const OperationError = (msg) => {
+    return new DOMException(msg, 'OperationError');
+};
+
+const SyntaxError = (msg) => {
+    return new DOMException(msg, 'SyntaxError');
+};
+
 class _RTCDataChannel extends EventTarget {
     #dataChannel;
     #readyState;
@@ -35,6 +56,8 @@ class _RTCDataChannel extends EventTarget {
     #negotiated;
     #ordered;
 
+    #closeRequested = false;
+
     onbufferedamountlow;
     onclose;
     onclosing;
@@ -57,12 +80,20 @@ class _RTCDataChannel extends EventTarget {
         // forward dataChannel events
         this.#dataChannel.onOpen(() => {
             this.#readyState = 'open';
-            this.dispatchEvent(new Event('open'));
+            this.dispatchEvent(new Event('open', { channel: this }));
         });
 
         this.#dataChannel.onClosed(() => {
-            this.#readyState = 'closed';
-            this.dispatchEvent(new Event('close'));
+            // Simulate closing event
+            if (!this.#closeRequested) {
+                this.#readyState = 'closing';
+                this.dispatchEvent(new Event('closing', { channel: this }));
+            }
+
+            setImmediate(() => {
+                this.#readyState = 'closed';
+                this.dispatchEvent(new Event('close', { channel: this }));
+            });
         });
 
         this.#dataChannel.onError((msg) => {
@@ -79,7 +110,7 @@ class _RTCDataChannel extends EventTarget {
         });
 
         this.#dataChannel.onBufferedAmountLow(() => {
-            this.dispatchEvent(new Event('bufferedamountlow'));
+            this.dispatchEvent(new Event('bufferedamountlow', { channel: this }));
         });
 
         this.#dataChannel.onMessage((data) => {
@@ -87,7 +118,7 @@ class _RTCDataChannel extends EventTarget {
                 data = data.buffer;
             }
 
-            this.dispatchEvent(new MessageEvent('message', { data }));
+            this.dispatchEvent(new MessageEvent('message', { data, channel: this }));
         });
 
         // forward events to properties
@@ -113,7 +144,7 @@ class _RTCDataChannel extends EventTarget {
 
     set binaryType(type) {
         if (type !== 'blob' && type !== 'arraybuffer') {
-            throw new DOMException$1(
+            throw new DOMException(
                 "Failed to set the 'binaryType' property on 'RTCDataChannel': Unknown binary type : " + type,
                 'TypeMismatchError',
             );
@@ -173,9 +204,8 @@ class _RTCDataChannel extends EventTarget {
 
     send(data) {
         if (this.#readyState !== 'open') {
-            throw new DOMException$1(
+            throw InvalidStateError(
                 "Failed to execute 'send' on 'RTCDataChannel': RTCDataChannel.readyState is not 'open'",
-                'InvalidStateError',
             );
         }
 
@@ -192,9 +222,7 @@ class _RTCDataChannel extends EventTarget {
     }
 
     close() {
-        this.#readyState = 'closing';
-        this.dispatchEvent(new Event('closing'));
-
+        this.#closeRequested = true;
         this.#dataChannel.close();
     }
 }
@@ -451,6 +479,11 @@ class _RTCDtlsTransport extends EventTarget {
     }
 }
 
+// createRequire is native in node version >= 12
+const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+
+const nodeDataChannel = require$1('../build/Release/node_datachannel.node');
+
 /**
  * Turns a node-datachannel DataChannel into a real Node.js stream, complete with buffering,
  * backpressure (up to a point - if the buffer fills up, messages are dropped), and
@@ -546,13 +579,65 @@ class DataChannelStream extends stream.Duplex {
     }
 }
 
-// createRequire is native in node version >= 12
-const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+class WebSocketServer extends events.EventEmitter {
+    #server;
+    #clients = [];
 
-const nodeDataChannel = require$1('../build/Release/node_datachannel.node');
+    constructor(options) {
+        super();
+        this.#server = new nodeDataChannel.WebSocketServer(options);
+
+        this.#server.onClient((client) => {
+            this.emit('client', client);
+            this.#clients.push(client);
+        });
+    }
+
+    port() {
+        return this.#server?.port() || 0;
+    }
+
+    stop() {
+        this.#clients.forEach((client) => {
+            client?.close();
+        });
+        this.#server?.stop();
+        this.#server = null;
+        this.removeAllListeners();
+    }
+
+    onClient(cb) {
+        if (this.#server) this.on('client', cb);
+    }
+}
+
+const {
+    initLogger,
+    cleanup,
+    preload,
+    setSctpSettings,
+    RtcpReceivingSession,
+    Track,
+    Video,
+    Audio,
+    DataChannel,
+    PeerConnection,
+    WebSocket,
+} = nodeDataChannel;
 
 var NodeDataChannel = {
-    ...nodeDataChannel,
+    initLogger,
+    cleanup,
+    preload,
+    setSctpSettings,
+    RtcpReceivingSession,
+    Track,
+    Video,
+    Audio,
+    DataChannel,
+    PeerConnection,
+    WebSocket,
+    WebSocketServer,
     DataChannelStream,
 };
 
@@ -611,10 +696,12 @@ class RTCPeerConnectionIceEvent extends Event {
 class RTCDataChannelEvent extends Event {
     #channel;
 
-    constructor(channel) {
-        super('datachannel');
+    constructor(type, eventInitDict) {
+        super(type);
+
+        if (type && !eventInitDict.channel) throw new TypeError('channel member is required');
 
-        this.#channel = channel;
+        this.#channel = eventInitDict?.channel;
     }
 
     get channel() {
@@ -683,6 +770,7 @@ class _RTCPeerConnection extends EventTarget {
     #localOffer;
     #localAnswer;
     #dataChannels;
+    #dataChannelsClosed = 0;
     #config;
     #canTrickleIceCandidates;
     #sctp;
@@ -700,32 +788,98 @@ class _RTCPeerConnection extends EventTarget {
     onsignalingstatechange;
     ontrack;
 
-    constructor(init = {}) {
+    _checkConfiguration(config) {
+        if (config && config.iceServers === undefined) config.iceServers = [];
+        if (config && config.iceTransportPolicy === undefined) config.iceTransportPolicy = 'all';
+
+        if (config?.iceServers === null) throw new TypeError('IceServers cannot be null');
+
+        // Check for all the properties of iceServers
+        if (Array.isArray(config?.iceServers)) {
+            for (let i = 0; i < config.iceServers.length; i++) {
+                if (config.iceServers[i] === null) throw new TypeError('IceServers cannot be null');
+                if (config.iceServers[i] === undefined) throw new TypeError('IceServers cannot be undefined');
+                if (Object.keys(config.iceServers[i]).length === 0) throw new TypeError('IceServers cannot be empty');
+
+                // If iceServers is string convert to array
+                if (typeof config.iceServers[i].urls === 'string')
+                    config.iceServers[i].urls = [config.iceServers[i].urls];
+
+                // urls can not be empty
+                if (config.iceServers[i].urls?.some((url) => url == ''))
+                    throw SyntaxError('IceServers urls cannot be empty');
+
+                // urls should match the regex "stun\:\w*|turn\:\w*|turns\:\w*"
+                if (
+                    config.iceServers[i].urls?.some(
+                        (url) => !/^(stun:[\w,\.,:]*|turn:[\w,\.,:]*|turns:[\w,\.,:]*)$/.test(url),
+                    )
+                )
+                    throw SyntaxError('IceServers urls wrong format');
+
+                // If this is a turn server check for username and credential
+                if (config.iceServers[i].urls?.some((url) => url.startsWith('turn'))) {
+                    if (!config.iceServers[i].username)
+                        throw InvalidAccessError('IceServers username cannot be null');
+                    if (!config.iceServers[i].credential)
+                        throw InvalidAccessError('IceServers username cannot be undefined');
+                }
+
+                // length of urls can not be 0
+                if (config.iceServers[i].urls?.length === 0)
+                    throw SyntaxError('IceServers urls cannot be empty');
+            }
+        }
+
+        if (
+            config &&
+            config.iceTransportPolicy &&
+            config.iceTransportPolicy !== 'all' &&
+            config.iceTransportPolicy !== 'relay'
+        )
+            throw new TypeError('IceTransportPolicy must be either "all" or "relay"');
+    }
+
+    setConfiguration(config) {
+        this._checkConfiguration(config);
+        this.#config = config;
+    }
+
+    constructor(config = { iceServers: [], iceTransportPolicy: 'all' }) {
         super();
 
-        this.#config = init;
+        this._checkConfiguration(config);
+        this.#config = config;
         this.#localOffer = createDeferredPromise();
         this.#localAnswer = createDeferredPromise();
         this.#dataChannels = new Set();
         this.#canTrickleIceCandidates = null;
 
-        this.#peerConnection = new NodeDataChannel.PeerConnection(init?.peerIdentity ?? `peer-${getRandomString(7)}`, {
-            ...init,
-            iceServers:
-                init?.iceServers
-                    ?.map((server) => {
-                        const urls = Array.isArray(server.urls) ? server.urls : [server.urls];
-
-                        return urls.map((url) => {
-                            if (server.username && server.credential) {
-                                const [protocol, rest] = url.split(/:(.*)/);
-                                return `${protocol}:${server.username}:${server.credential}@${rest}`;
-                            }
-                            return url;
-                        });
-                    })
-                    .flat() ?? [],
-        });
+        try {
+            this.#peerConnection = new NodeDataChannel.PeerConnection(
+                config?.peerIdentity ?? `peer-${getRandomString(7)}`,
+                {
+                    ...config,
+                    iceServers:
+                        config?.iceServers
+                            ?.map((server) => {
+                                const urls = Array.isArray(server.urls) ? server.urls : [server.urls];
+
+                                return urls.map((url) => {
+                                    if (server.username && server.credential) {
+                                        const [protocol, rest] = url.split(/:(.*)/);
+                                        return `${protocol}:${server.username}:${server.credential}@${rest}`;
+                                    }
+                                    return url;
+                                });
+                            })
+                            .flat() ?? [],
+                },
+            );
+        } catch (error) {
+            if (!error || !error.message) throw NotFoundError('Unknown error');
+            throw SyntaxError(error.message);
+        }
 
         // forward peerConnection events
         this.#peerConnection.onStateChange(() => {
@@ -745,9 +899,9 @@ class _RTCPeerConnection extends EventTarget {
         });
 
         this.#peerConnection.onDataChannel((channel) => {
-            const dataChannel = new _RTCDataChannel(channel);
-            this.#dataChannels.add(dataChannel);
-            this.dispatchEvent(new RTCDataChannelEvent(dataChannel));
+            const dc = new _RTCDataChannel(channel);
+            this.#dataChannels.add(dc);
+            this.dispatchEvent(new RTCDataChannelEvent('datachannel', { channel: dc }));
         });
 
         this.#peerConnection.onLocalDescription((sdp, type) => {
@@ -821,7 +975,11 @@ class _RTCPeerConnection extends EventTarget {
     }
 
     get iceConnectionState() {
-        return this.#peerConnection.iceState();
+        let state = this.#peerConnection.iceState();
+        // libdatachannel uses 'completed' instead of 'connected'
+        // see /webrtc/getstats.html
+        if (state == 'completed') state = 'connected';
+        return state;
     }
 
     get iceGatheringState() {
@@ -861,14 +1019,45 @@ class _RTCPeerConnection extends EventTarget {
     }
 
     async addIceCandidate(candidate) {
-        if (candidate == null || candidate.candidate == null) {
-            throw new DOMException('Candidate invalid');
+        if (!candidate || !candidate.candidate) {
+            return;
+        }
+
+        if (candidate.sdpMid === null && candidate.sdpMLineIndex === null) {
+            throw new TypeError('sdpMid must be set');
+        }
+
+        if (candidate.sdpMid === undefined && candidate.sdpMLineIndex == undefined) {
+            throw new TypeError('sdpMid must be set');
+        }
+
+        // Reject if sdpMid format is not valid
+        // ??
+        if (candidate.sdpMid && candidate.sdpMid.length > 3) {
+            // console.log(candidate.sdpMid);
+            throw OperationError('Invalid sdpMid format');
+        }
+
+        // We don't care about sdpMLineIndex, just for test
+        if (!candidate.sdpMid && candidate.sdpMLineIndex > 1) {
+            throw OperationError('This is only for test case.');
         }
 
-        this.#remoteCandidates.push(
-            new _RTCIceCandidate({ candidate: candidate.candidate, sdpMid: candidate.sdpMid || '0' }),
-        );
-        this.#peerConnection.addRemoteCandidate(candidate.candidate, candidate.sdpMid || '0');
+        try {
+            this.#peerConnection.addRemoteCandidate(candidate.candidate, candidate.sdpMid || '0');
+            this.#remoteCandidates.push(
+                new _RTCIceCandidate({ candidate: candidate.candidate, sdpMid: candidate.sdpMid || '0' }),
+            );
+        } catch (error) {
+            if (!error || !error.message) throw NotFoundError('Unknown error');
+
+            // Check error Message if contains specific message
+            if (error.message.includes('remote candidate without remote description'))
+                throw InvalidStateError(error.message);
+            if (error.message.includes('Invalid candidate format')) throw OperationError(error.message);
+
+            throw NotFoundError(error.message);
+        }
     }
 
     addTrack(track, ...streams) {
@@ -883,6 +1072,7 @@ class _RTCPeerConnection extends EventTarget {
         // close all channels before shutting down
         this.#dataChannels.forEach((channel) => {
             channel.close();
+            this.#dataChannelsClosed++;
         });
 
         this.#peerConnection.close();
@@ -900,6 +1090,7 @@ class _RTCPeerConnection extends EventTarget {
         this.#dataChannels.add(dataChannel);
         dataChannel.addEventListener('close', () => {
             this.#dataChannels.delete(dataChannel);
+            this.#dataChannelsClosed++;
         });
 
         return dataChannel;
@@ -933,7 +1124,7 @@ class _RTCPeerConnection extends EventTarget {
             let localId = 'RTCIceCandidate_' + localIdRs;
             report.set(localId, {
                 id: localId,
-                type: 'localcandidate',
+                type: 'local-candidate',
                 timestamp: Date.now(),
                 candidateType: cp.local.type,
                 ip: cp.local.address,
@@ -944,7 +1135,7 @@ class _RTCPeerConnection extends EventTarget {
             let remoteId = 'RTCIceCandidate_' + remoteIdRs;
             report.set(remoteId, {
                 id: remoteId,
-                type: 'remotecandidate',
+                type: 'remote-candidate',
                 timestamp: Date.now(),
                 candidateType: cp.remote.type,
                 ip: cp.remote.address,
@@ -979,6 +1170,15 @@ class _RTCPeerConnection extends EventTarget {
                 selectedCandidatePairChanges: 1,
             });
 
+            // peer-connection'
+            report.set('P', {
+                id: 'P',
+                type: 'peer-connection',
+                timestamp: Date.now(),
+                dataChannelsOpened: this.#dataChannels.size,
+                dataChannelsClosed: this.#dataChannelsClosed,
+            });
+
             return resolve(report);
         });
     }
@@ -995,20 +1195,13 @@ class _RTCPeerConnection extends EventTarget {
         throw new DOMException('Not implemented');
     }
 
-    setConfiguration(config) {
-        this.#config = config;
-    }
-
     async setLocalDescription(description) {
-        if (description == null || description.type == null) {
-            throw new DOMException('Local description type must be set');
-        }
-
-        if (description.type !== 'offer') {
+        if (description?.type !== 'offer') {
             // any other type causes libdatachannel to throw
             return;
         }
-        this.#peerConnection.setLocalDescription(description.type);
+
+        this.#peerConnection.setLocalDescription(description?.type);
     }
 
     async setRemoteDescription(description) {

package/src/peer-connection-wrapper.cpp

@@ -100,8 +100,17 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
     Napi::Array iceServers = config.Get("iceServers").As<Napi::Array>();
     for (uint32_t i = 0; i < iceServers.Length(); i++)
     {
-        if (iceServers.Get(i).IsString())
-            rtcConfig.iceServers.emplace_back(iceServers.Get(i).As<Napi::String>().ToString());
+        if (iceServers.Get(i).IsString()){
+            try
+            {
+                rtcConfig.iceServers.emplace_back(iceServers.Get(i).As<Napi::String>().ToString());
+            }
+            catch(std::exception &ex)
+            {
+                Napi::TypeError::New(env, "SyntaxError: IceServer config error: " + std::string(ex.what())).ThrowAsJavaScriptException();
+                return;
+            }
+        }
         else
         {
             if (!iceServers.Get(i).IsObject())
@@ -116,7 +125,6 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
                 Napi::TypeError::New(env, "IceServer config error (hostname OR/AND port is not suitable)").ThrowAsJavaScriptException();
                 return;
             }
-
             if (iceServer.Get("relayType").IsString() &&
                 (!iceServer.Get("username").IsString() || !iceServer.Get("password").IsString()))
             {

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

@@ -2,6 +2,9 @@
 
 #include "plog/Log.h"
 
+Napi::FunctionReference WebSocketServerWrapper::constructor;
+std::unordered_set<WebSocketServerWrapper *> WebSocketServerWrapper::instances;
+
 void WebSocketServerWrapper::StopAll()
 {
     PLOG_DEBUG << "StopAll() called";
@@ -10,9 +13,6 @@ void WebSocketServerWrapper::StopAll()
         inst->doStop();
 }
 
-Napi::FunctionReference WebSocketServerWrapper::constructor;
-std::unordered_set<WebSocketServerWrapper *> WebSocketServerWrapper::instances;
-
 Napi::Object WebSocketServerWrapper::Init(Napi::Env env, Napi::Object exports)
 {
     Napi::HandleScope scope(env);
@@ -36,7 +36,6 @@ Napi::Object WebSocketServerWrapper::Init(Napi::Env env, Napi::Object exports)
 WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) : Napi::ObjectWrap<WebSocketServerWrapper>(info)
 {
     PLOG_DEBUG << "Constructor called";
-    
     Napi::Env env = info.Env();
 
     // Create WebSocketServer without config
@@ -52,7 +51,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
             Napi::Error::New(env, std::string("libdatachannel error while creating WebSocketServer without config: ") + ex.what()).ThrowAsJavaScriptException();
             return;
         }
- 
+
         PLOG_DEBUG << "WebSocketServer created without config";
 
         instances.insert(this);
@@ -60,14 +59,14 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     }
 
     // Create WebSocketServer with config
-    
-    Napi::Object config = info[0].As<Napi::Object>();    
+
+    Napi::Object config = info[0].As<Napi::Object>();
     rtc::WebSocketServerConfiguration webSocketServerConfig;
 
     // Port
     if (config.Has("port"))
     {
-        if (!config.Get("port").IsNumber()) 
+        if (!config.Get("port").IsNumber())
         {
             Napi::TypeError::New(info.Env(), "port must be a number").ThrowAsJavaScriptException();
             return;
@@ -78,7 +77,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     // Enable TLS
     if (config.Has("enableTls"))
     {
-        if (!config.Get("enableTls").IsBoolean()) 
+        if (!config.Get("enableTls").IsBoolean())
         {
             Napi::TypeError::New(info.Env(), "enableTls must be boolean").ThrowAsJavaScriptException();
             return;
@@ -89,7 +88,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     // Certificate PEM File
     if (config.Has("certificatePemFile"))
     {
-        if (!config.Get("certificatePemFile").IsString()) 
+        if (!config.Get("certificatePemFile").IsString())
         {
             Napi::TypeError::New(info.Env(), "certificatePemFile must be a string").ThrowAsJavaScriptException();
             return;
@@ -100,7 +99,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     // Key PEM File
     if (config.Has("keyPemFile"))
     {
-        if (!config.Get("keyPemFile").IsString()) 
+        if (!config.Get("keyPemFile").IsString())
         {
             Napi::TypeError::New(info.Env(), "keyPemFile must be a string").ThrowAsJavaScriptException();
             return;
@@ -111,7 +110,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     // Key PEM Pass
     if (config.Has("keyPemPass"))
     {
-        if (!config.Get("keyPemPass").IsString()) 
+        if (!config.Get("keyPemPass").IsString())
         {
             Napi::TypeError::New(info.Env(), "keyPemPass must be a string").ThrowAsJavaScriptException();
             return;
@@ -122,7 +121,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     // Bind Address
     if (config.Has("bindAddress"))
     {
-        if (!config.Get("bindAddress").IsString()) 
+        if (!config.Get("bindAddress").IsString())
         {
             Napi::TypeError::New(info.Env(), "bindAddress must be a string").ThrowAsJavaScriptException();
             return;
@@ -133,7 +132,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     // Connection Timeout
     if (config.Has("connectionTimeout"))
     {
-        if (!config.Get("connectionTimeout").IsNumber()) 
+        if (!config.Get("connectionTimeout").IsNumber())
         {
             Napi::TypeError::New(info.Env(), "connectionTimeout must be a number").ThrowAsJavaScriptException();
             return;
@@ -144,7 +143,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
     // Max Message Size
     if (config.Has("maxMessageSize"))
     {
-        if (!config.Get("maxMessageSize").IsNumber()) 
+        if (!config.Get("maxMessageSize").IsNumber())
         {
             Napi::TypeError::New(info.Env(), "maxMessageSize must be a number").ThrowAsJavaScriptException();
             return;
@@ -163,7 +162,7 @@ WebSocketServerWrapper::WebSocketServerWrapper(const Napi::CallbackInfo &info) :
         Napi::Error::New(env, std::string("libdatachannel error while creating WebSocketServer: ") + ex.what()).ThrowAsJavaScriptException();
         return;
     }
- 
+
     PLOG_DEBUG << "WebSocketServer created";
     instances.insert(this);
 }
@@ -179,7 +178,7 @@ void WebSocketServerWrapper::doStop()
     PLOG_DEBUG << "doStop() called";
     if (mWebSocketServerPtr)
     {
-        PLOG_DEBUG << "Closing...";
+        PLOG_DEBUG << "Stopping...";
         try
         {
             mWebSocketServerPtr->stop();
@@ -187,13 +186,12 @@ void WebSocketServerWrapper::doStop()
         }
         catch (std::exception &ex)
         {
-            std::cerr << std::string("libWebRtc error while closing WebSocketServer: ") + ex.what() << std::endl;
+            std::cerr << std::string("libdatachannel error while closing WebSocketServer: ") + ex.what() << std::endl;
             return;
         }
     }
 
     mOnClientCallback.reset();
-
     instances.erase(this);
 }
 
@@ -238,7 +236,7 @@ void WebSocketServerWrapper::onClient(const Napi::CallbackInfo &info)
 
     if (length < 1 || !info[0].IsFunction())
     {
-        Napi::TypeError::New(env, "Function expected as onClient calback").ThrowAsJavaScriptException();
+        Napi::TypeError::New(env, "Function expected as onClient callback").ThrowAsJavaScriptException();
         return;
     }
 
@@ -246,7 +244,7 @@ void WebSocketServerWrapper::onClient(const Napi::CallbackInfo &info)
     mOnClientCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
     mWebSocketServerPtr->onClient([&](std::shared_ptr<rtc::WebSocket> ws)
-                                   {
+                                  {
         PLOG_DEBUG << "onClient ws received from WebSocketServer";
         if (mOnClientCallback)
             mOnClientCallback->call([this, ws](Napi::Env env, std::vector<napi_value> &args) {
@@ -258,8 +256,10 @@ void WebSocketServerWrapper::onClient(const Napi::CallbackInfo &info)
                 // This will run in main thread and needs to construct the
                 // arguments for the call
                 std::shared_ptr<rtc::WebSocket> webSocket = ws;
-                auto instance = WebSocketWrapper::constructor.New({Napi::External<std::shared_ptr<rtc::WebSocket>>::New(env, nullptr), Napi::External<std::shared_ptr<rtc::WebSocket>>::New(env, &webSocket)});
+                // First argument is just a placeholder
+                auto instance = WebSocketWrapper::constructor.New({Napi::Boolean::New(env, false), Napi::External<std::shared_ptr<rtc::WebSocket>>::New(env, &webSocket)});
                 args = {instance};
                 PLOG_DEBUG << "mOnClientCallback call(2)";
-            }); });
+            });
+    });
 }