node-datachannel 0.2.4 → 0.3.0

package/.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

package/.eslintignore

@@ -0,0 +1,2 @@
+node_modules
+build

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+    parser: '@typescript-eslint/parser',
+    plugins: ['@typescript-eslint'],
+    extends: ['plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
+    env: {
+        node: true,
+    },
+};

package/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+# These are supported funding model platforms
+open_collective: node-datachannel

package/.github/workflows/build-linux.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
+        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
+        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
     steps:
       - uses: actions/checkout@v2
       - name: Prepare Cross Compile
@@ -68,7 +68,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
+        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
     steps:
       - uses: actions/checkout@v2
       - name: Prepare Cross Compile

package/.github/workflows/build-mac.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
+        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
 
     steps:
       - uses: actions/checkout@v2

package/.github/workflows/build-win.yml

@@ -11,10 +11,10 @@ env:
 
 jobs:
   build-windows-x64:
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
-        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
+        node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -39,10 +39,10 @@ jobs:
           CI: true
 
   build-windows-x86:
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
-        node_version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
+        node_version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
         node_arch:
           - x86
     steps:

package/.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports =  {
+  semi:  true,
+  trailingComma:  'all',
+  singleQuote:  true,
+  printWidth:  120,
+  tabWidth:  4,
+};

package/CMakeLists.txt

@@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 3.15)
 cmake_policy(SET CMP0091 NEW)
 project(node_datachannel VERSION 0.2.4)
 
+# Workaround for https://github.com/murat-dogan/node-datachannel/issues/65
+if( NODE_RUNTIMEVERSION VERSION_GREATER_EQUAL "17.0.0")
+    add_compile_definitions(OPENSSL_API_COMPAT=0x10100001L)
+    add_compile_definitions(OPENSSL_CONFIGURED_API=0x30000000L)    
+endif()
+
 include_directories(${CMAKE_JS_INC})
 
 set(CMAKE_BUILD_TYPE Release)
@@ -27,7 +33,7 @@ include(FetchContent)
 FetchContent_Declare(
     libdatachannel
     GIT_REPOSITORY https://github.com/paullouisageneau/libdatachannel.git
-    GIT_TAG "v0.16.6"
+    GIT_TAG "v0.17.0"
 )
 
 option(NO_MEDIA "Disable media transport support in libdatachannel" OFF)

package/README.md

@@ -118,7 +118,7 @@ export const enum RelayType {
 
 export interface IceServer {
     hostname: string;
-    port: Number;
+    port: number;
     username?: string;
     password?: string;
     relayType?: RelayType;
@@ -271,15 +271,15 @@ Send Message as binary
 
 Query data-channel
 
-**bufferedAmount: () => Number**
+**bufferedAmount: () => number**
 
 Get current buffered amount level
 
-**maxMessageSize: () => Number**
+**maxMessageSize: () => number**
 
 Get max message size of the data-channel, that could be sent
 
-**setBufferedAmountLowThreshold: (newSize: Number) => void**
+**setBufferedAmountLowThreshold: (newSize: number) => void**
 
 Set buffer level of the `onBufferedAmountLow` callback
 

package/lib/datachannel-stream.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const stream = require('stream');
 
 /**
@@ -9,12 +10,11 @@ const stream = require('stream');
  * the protocol level, and is preserved here throughout.
  */
 module.exports = class DataChannelStream extends stream.Duplex {
-
     constructor(rawChannel, streamOptions) {
         super({
             allowHalfOpen: false, // Default to autoclose on end().
             ...streamOptions,
-            objectMode: true // Preserve the string/buffer distinction (WebRTC treats them differently)
+            objectMode: true, // Preserve the string/buffer distinction (WebRTC treats them differently)
         });
 
         this._rawChannel = rawChannel;
@@ -51,20 +51,24 @@ module.exports = class DataChannelStream extends stream.Duplex {
 
     _write(chunk, encoding, callback) {
         let sentOk;
-        if (Buffer.isBuffer(chunk)) {
-            sentOk = this._rawChannel.sendMessageBinary(chunk);
-        } else if (typeof chunk === 'string') {
-            sentOk = this._rawChannel.sendMessage(chunk);
-        } else {
-            const typeName = chunk.constructor.name || typeof chunk;
-            callback(new Error(`Cannot write ${typeName} to DataChannel stream`));
-            return;
+
+        try {
+            if (Buffer.isBuffer(chunk)) {
+                sentOk = this._rawChannel.sendMessageBinary(chunk);
+            } else if (typeof chunk === 'string') {
+                sentOk = this._rawChannel.sendMessage(chunk);
+            } else {
+                const typeName = chunk.constructor.name || typeof chunk;
+                throw new Error(`Cannot write ${typeName} to DataChannel stream`);
+            }
+        } catch (err) {
+            return callback(err);
         }
 
         if (sentOk) {
             callback(null);
         } else {
-            callback(new Error("Failed to write to DataChannel"));
+            callback(new Error('Failed to write to DataChannel'));
         }
     }
 
@@ -83,4 +87,11 @@ module.exports = class DataChannelStream extends stream.Duplex {
         return this._rawChannel.getLabel();
     }
 
-}
+    get id() {
+        return this._rawChannel.getId();
+    }
+
+    get protocol() {
+        return this._rawChannel.getProtocol();
+    }
+};

package/lib/index.d.ts

@@ -3,7 +3,7 @@ import * as stream from 'stream';
 export as namespace NodeDataChannel;
 
 // Enum in d.ts is tricky
-export type LogLevel = "Verbose" | "Debug" | "Info" | "Warning" | "Error" | "Fatal";
+export type LogLevel = 'Verbose' | 'Debug' | 'Info' | 'Warning' | 'Error' | 'Fatal';
 
 // SCTP Settings
 export interface SctpSettings {
@@ -26,7 +26,7 @@ export type ProxyServerType = 'None' | 'Socks5' | 'Http';
 export interface ProxyServer {
     type: ProxyServerType;
     ip: string;
-    port: Number;
+    port: number;
     username?: string;
     password?: string;
 }
@@ -34,12 +34,12 @@ export interface ProxyServer {
 export const enum RelayType {
     TurnUdp = 'TurnUdp',
     TurnTcp = 'TurnTcp',
-    TurnTls = 'TurnTls'
+    TurnTls = 'TurnTls',
 }
 
 export interface IceServer {
     hostname: string;
-    port: Number;
+    port: number;
     username?: string;
     password?: string;
     relayType?: RelayType;
@@ -61,11 +61,13 @@ export const enum DescriptionType {
     Offer = 'Offer',
     Answer = 'Answer',
     Pranswer = 'Pranswer',
-    Rollback = 'Rollback'
+    Rollback = 'Rollback',
 }
 
 export const enum ReliabilityType {
-    Reliable = 0, Rexmit = 1, Timed = 2
+    Reliable = 0,
+    Rexmit = 1,
+    Timed = 2,
 }
 
 export interface DataChannelInitConfig {
@@ -81,7 +83,7 @@ export interface DataChannelInitConfig {
         type?: ReliabilityType;
         unordered?: boolean;
         rexmit?: number;
-    }
+    };
 }
 
 export interface SelectedCandidateInfo {
@@ -97,18 +99,18 @@ export const enum Direction {
     RecvOnly = 'RecvOnly',
     SendRecv = 'SendRecv',
     Inactive = 'Inactive',
-    Unknown = 'Unknown'
+    Unknown = 'Unknown',
 }
 
 export class RtcpReceivingSession {
-    requestBitrate: (bitRate: Number) => void;
+    requestBitrate: (bitRate: number) => void;
     requestKeyframe: () => boolean;
 }
 
 export class Audio {
     constructor(mid: string, dir: Direction);
-    addAudioCodec: (payloadType: Number, codec: string, profile?: string) => void;
-    addOpusCodec: (payloadType: Number, profile?: string) => string;
+    addAudioCodec: (payloadType: number, codec: string, profile?: string) => void;
+    addOpusCodec: (payloadType: number, profile?: string) => string;
 
     direction: () => Direction;
     generateSdp: (eol: string, addr: string, port: string) => string;
@@ -116,26 +118,26 @@ export class Audio {
     setDirection: (dir: Direction) => void;
     description: () => string;
     removeFormat: (fmt: string) => void;
-    addSSRC: (ssrc: Number, name?: string, msid?: string, trackID?: string) => void;
-    removeSSRC: (ssrc: Number) => void;
-    replaceSSRC: (oldSsrc: Number, ssrc: Number, name?: string, msid?: string, trackID?: string) => void;
-    hasSSRC: (ssrc: Number) => boolean;
-    getSSRCs: () => Number[];
-    getCNameForSsrc: (ssrc: Number) => string;
-    setBitrate: (bitRate: Number) => void;
-    getBitrate: () => Number;
-    hasPayloadType: (payloadType: Number) => boolean;
-    addRTXCodec: (payloadType: Number, originalPayloadType: Number, clockRate: Number) => void;
+    addSSRC: (ssrc: number, name?: string, msid?: string, trackID?: string) => void;
+    removeSSRC: (ssrc: number) => void;
+    replaceSSRC: (oldSsrc: number, ssrc: number, name?: string, msid?: string, trackID?: string) => void;
+    hasSSRC: (ssrc: number) => boolean;
+    getSSRCs: () => number[];
+    getCNameForSsrc: (ssrc: number) => string;
+    setBitrate: (bitRate: number) => void;
+    getBitrate: () => number;
+    hasPayloadType: (payloadType: number) => boolean;
+    addRTXCodec: (payloadType: number, originalPayloadType: number, clockRate: number) => void;
     addRTPMap: () => void;
     parseSdpLine: (line: string) => void;
 }
 
 export class Video {
     constructor(mid: string, dir: Direction);
-    addVideoCodec: (payloadType: Number, codec: string, profile?: string) => void;
-    addH264Codec: (payloadType: Number, profile?: string) => void;
-    addVP8Codec: (payloadType: Number) => void;
-    addVP9Codec: (payloadType: Number) => void;
+    addVideoCodec: (payloadType: number, codec: string, profile?: string) => void;
+    addH264Codec: (payloadType: number, profile?: string) => void;
+    addVP8Codec: (payloadType: number) => void;
+    addVP9Codec: (payloadType: number) => void;
 
     direction: () => Direction;
     generateSdp: (eol: string, addr: string, port: string) => string;
@@ -143,16 +145,16 @@ export class Video {
     setDirection: (dir: Direction) => void;
     description: () => string;
     removeFormat: (fmt: string) => void;
-    addSSRC: (ssrc: Number, name?: string, msid?: string, trackID?: string) => void;
-    removeSSRC: (ssrc: Number) => void;
-    replaceSSRC: (oldSsrc: Number, ssrc: Number, name?: string, msid?: string, trackID?: string) => void;
-    hasSSRC: (ssrc: Number) => boolean;
-    getSSRCs: () => Number[];
-    getCNameForSsrc: (ssrc: Number) => string;
-    setBitrate: (bitRate: Number) => void;
-    getBitrate: () => Number;
-    hasPayloadType: (payloadType: Number) => boolean;
-    addRTXCodec: (payloadType: Number, originalPayloadType: Number, clockRate: Number) => void;
+    addSSRC: (ssrc: number, name?: string, msid?: string, trackID?: string) => void;
+    removeSSRC: (ssrc: number) => void;
+    replaceSSRC: (oldSsrc: number, ssrc: number, name?: string, msid?: string, trackID?: string) => void;
+    hasSSRC: (ssrc: number) => boolean;
+    getSSRCs: () => number[];
+    getCNameForSsrc: (ssrc: number) => string;
+    setBitrate: (bitRate: number) => void;
+    getBitrate: () => number;
+    hasPayloadType: (payloadType: number) => boolean;
+    addRTXCodec: (payloadType: number, originalPayloadType: number, clockRate: number) => void;
     addRTPMap: () => void;
     parseSdpLine: (line: string) => void;
 }
@@ -160,39 +162,37 @@ export class Video {
 export class Track {
     direction: () => Direction;
     mid: () => string;
+    type: () => string;
     close: () => void;
     sendMessage: (msg: string) => boolean;
     sendMessageBinary: (buffer: Buffer) => boolean;
     isOpen: () => boolean;
     isClosed: () => boolean;
-    availableAmount: () => Number;
-    bufferedAmount: () => Number;
-    maxMessageSize: () => Number;
-    setBufferedAmountLowThreshold: (newSize: Number) => void;
+    bufferedAmount: () => number;
+    maxMessageSize: () => number;
+    setBufferedAmountLowThreshold: (newSize: number) => void;
     requestKeyframe: () => boolean;
-    setMediaHandler: (handler: RtcpReceivingSession) => void
+    setMediaHandler: (handler: RtcpReceivingSession) => void;
     onOpen: (cb: () => void) => void;
     onClosed: (cb: () => void) => void;
     onError: (cb: (err: string) => void) => void;
-    onAvailable: (cb: () => void) => void;
-    onBufferedAmountLow: (cb: () => void) => void;
-    onMessage: (cb: (msg: string | Buffer) => void) => void;
+    onMessage: (cb: (msg: Buffer) => void) => void;
 }
 
 export class DataChannel {
     close: () => void;
     getLabel: () => string;
+    getId: () => number;
+    getProtocol: () => string;
     sendMessage: (msg: string) => boolean;
     sendMessageBinary: (buffer: Buffer) => boolean;
     isOpen: () => boolean;
-    availableAmount: () => Number;
-    bufferedAmount: () => Number;
-    maxMessageSize: () => Number;
-    setBufferedAmountLowThreshold: (newSize: Number) => void;
+    bufferedAmount: () => number;
+    maxMessageSize: () => number;
+    setBufferedAmountLowThreshold: (newSize: number) => void;
     onOpen: (cb: () => void) => void;
     onClosed: (cb: () => void) => void;
     onError: (cb: (err: string) => void) => void;
-    onAvailable: (cb: () => void) => void;
     onBufferedAmountLow: (cb: () => void) => void;
     onMessage: (cb: (msg: string | Buffer) => void) => void;
 }
@@ -200,9 +200,9 @@ export class DataChannel {
 export class PeerConnection {
     constructor(peerName: string, config: RtcConfig);
     close: () => void;
-    setLocalDescription: (type: DescriptionType) => void;
+    setLocalDescription: (type?: DescriptionType) => void;
     setRemoteDescription: (sdp: string, type: DescriptionType) => void;
-    localDescription: () => { type: string, sdp: string };
+    localDescription: () => { type: string; sdp: string };
     addRemoteCandidate: (candidate: string, mid: string) => void;
     createDataChannel: (label: string, config?: DataChannelInitConfig) => DataChannel;
     addTrack: (media: Video | Audio) => Track;
@@ -216,17 +216,14 @@ export class PeerConnection {
     onSignalingStateChange: (state: (sdp: string) => void) => void;
     onGatheringStateChange: (state: (sdp: string) => void) => void;
     onDataChannel: (cb: (dc: DataChannel) => void) => void;
-    onTrack: () => Track;
+    onTrack: (cb: (track: Track) => void) => void;
     bytesSent: () => number;
     bytesReceived: () => number;
     rtt: () => number;
-    getSelectedCandidatePair: () => { local: SelectedCandidateInfo, remote: SelectedCandidateInfo } | null;
+    getSelectedCandidatePair: () => { local: SelectedCandidateInfo; remote: SelectedCandidateInfo } | null;
 }
 
 export class DataChannelStream extends stream.Duplex {
-    constructor(
-        rawChannel: DataChannel,
-        options?: Omit<stream.DuplexOptions, 'objectMode'>
-    );
+    constructor(rawChannel: DataChannel, options?: Omit<stream.DuplexOptions, 'objectMode'>);
     get label(): string;
-}
+}

package/lib/index.js

@@ -1,4 +1,5 @@
-const nodeDataChannel = require("../build/Release/node_datachannel.node");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const nodeDataChannel = require('../build/Release/node_datachannel.node');
 module.exports = nodeDataChannel;
 
-module.exports.DataChannelStream = require('./datachannel-stream');
+module.exports.DataChannelStream = require('./datachannel-stream');

package/node_modules/detect-libc/package.json

@@ -22,6 +22,7 @@
     "fetchSpec": "2.0.1"
   },
   "_requiredBy": [
+    "/prebuild",
     "/prebuild-install"
   ],
   "_resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",

package/node_modules/lru-cache/package.json

@@ -22,9 +22,10 @@
     "fetchSpec": "6.0.0"
   },
   "_requiredBy": [
+    "/@typescript-eslint/eslint-plugin/semver",
+    "/@typescript-eslint/typescript-estree/semver",
     "/jest-snapshot/semver",
-    "/node-abi/semver",
-    "/prebuild/node-abi/semver"
+    "/node-abi/semver"
   ],
   "_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
   "_spec": "6.0.0",

package/node_modules/minimist/index.js

@@ -70,7 +70,7 @@ module.exports = function (args, opts) {
         var o = obj;
         for (var i = 0; i < keys.length-1; i++) {
             var key = keys[i];
-            if (key === '__proto__') return;
+            if (isConstructorOrProto(o, key)) return;
             if (o[key] === undefined) o[key] = {};
             if (o[key] === Object.prototype || o[key] === Number.prototype
                 || o[key] === String.prototype) o[key] = {};
@@ -79,7 +79,7 @@ module.exports = function (args, opts) {
         }
 
         var key = keys[keys.length - 1];
-        if (key === '__proto__') return;
+        if (isConstructorOrProto(o, key)) return;
         if (o === Object.prototype || o === Number.prototype
             || o === String.prototype) o = {};
         if (o === Array.prototype) o = [];
@@ -243,3 +243,7 @@ function isNumber (x) {
     return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
 }
 
+
+function isConstructorOrProto (obj, key) {
+    return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
+}

package/node_modules/minimist/package.json

@@ -1,25 +1,25 @@
 {
   "_args": [
     [
-      "minimist@1.2.5",
+      "minimist@1.2.6",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "minimist@1.2.5",
-  "_id": "minimist@1.2.5",
+  "_from": "minimist@1.2.6",
+  "_id": "minimist@1.2.6",
   "_inBundle": false,
-  "_integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+  "_integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
   "_location": "/minimist",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "minimist@1.2.5",
+    "raw": "minimist@1.2.6",
     "name": "minimist",
     "escapedName": "minimist",
-    "rawSpec": "1.2.5",
+    "rawSpec": "1.2.6",
     "saveSpec": null,
-    "fetchSpec": "1.2.5"
+    "fetchSpec": "1.2.6"
   },
   "_requiredBy": [
     "/json5",
@@ -28,8 +28,8 @@
     "/prebuild-install",
     "/rc"
   ],
-  "_resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-  "_spec": "1.2.5",
+  "_resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+  "_spec": "1.2.6",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "author": {
     "name": "James Halliday",
@@ -76,5 +76,5 @@
       "opera/12"
     ]
   },
-  "version": "1.2.5"
+  "version": "1.2.6"
 }

package/node_modules/minimist/readme.markdown

@@ -34,7 +34,10 @@ $ node example/parse.js -x 3 -y 4 -n5 -abc --beep=boop foo bar baz
 Previous versions had a prototype pollution bug that could cause privilege
 escalation in some circumstances when handling untrusted user input.
 
-Please use version 1.2.3 or later: https://snyk.io/vuln/SNYK-JS-MINIMIST-559764
+Please use version 1.2.6 or later:
+
+* https://security.snyk.io/vuln/SNYK-JS-MINIMIST-2429795 (version <=1.2.5)
+* https://snyk.io/vuln/SNYK-JS-MINIMIST-559764 (version <=1.2.3)
 
 # methods
 

package/node_modules/minimist/test/proto.js

@@ -42,3 +42,19 @@ test('proto pollution (constructor)', function (t) {
     t.equal(argv.y, undefined);
     t.end();
 });
+
+test('proto pollution (constructor function)', function (t) {
+    var argv = parse(['--_.concat.constructor.prototype.y', '123']);
+    function fnToBeTested() {}
+    t.equal(fnToBeTested.y, undefined);
+    t.equal(argv.y, undefined);
+    t.end();
+});
+
+// powered by snyk - https://github.com/backstage/backstage/issues/10343
+test('proto pollution (constructor function) snyk', function (t) {
+    var argv = parse('--_.constructor.constructor.prototype.foo bar'.split(' '));
+    t.equal((function(){}).foo, undefined);
+    t.equal(argv.y, undefined);
+    t.end();
+})

package/node_modules/node-abi/package.json

@@ -24,6 +24,7 @@
     "fetchSpec": "3.8.0"
   },
   "_requiredBy": [
+    "/prebuild",
     "/prebuild-install"
   ],
   "_resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-datachannel",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "libdatachannel node bindings",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -15,6 +15,7 @@
     "build": "cmake-js build",
     "_prebuild": "prebuild --backend cmake-js",
     "clean": "cmake-js clean",
+    "lint": "eslint lib/**/*",
     "test": "jest"
   },
   "repository": {
@@ -46,18 +47,25 @@
   },
   "homepage": "https://github.com/murat-dogan/node-datachannel#readme",
   "devDependencies": {
+    "@types/node": "^17.0.23",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
     "cmake-js": "^6.3.0",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
     "jest": "^27.5.1",
     "nan": "^2.15.0",
     "napi-thread-safe-callback-cancellable": "^0.0.7",
-    "node-addon-api": "^4.2.0",
-    "prebuild": "^11.0.3"
+    "node-addon-api": "^4.3.0",
+    "prebuild": "^11.0.3",
+    "prettier": "^2.6.2",
+    "typescript": "^4.6.3"
   },
   "bundledDependencies": [
     "prebuild-install"
   ],
   "dependencies": {
-    "@types/node": "^17.0.21",
     "prebuild-install": "^7.0.1"
   }
 }

package/src/data-channel-wrapper.cpp

@@ -20,6 +20,8 @@ Napi::Object DataChannelWrapper::Init(Napi::Env env, Napi::Object exports)
         {
             InstanceMethod("close", &DataChannelWrapper::close),
             InstanceMethod("getLabel", &DataChannelWrapper::getLabel),
+            InstanceMethod("getId", &DataChannelWrapper::getId),
+            InstanceMethod("getProtocol", &DataChannelWrapper::getProtocol),
             InstanceMethod("sendMessage", &DataChannelWrapper::sendMessage),
             InstanceMethod("sendMessageBinary", &DataChannelWrapper::sendMessageBinary),
             InstanceMethod("isOpen", &DataChannelWrapper::isOpen),
@@ -42,8 +44,26 @@ Napi::Object DataChannelWrapper::Init(Napi::Env env, Napi::Object exports)
 
 DataChannelWrapper::DataChannelWrapper(const Napi::CallbackInfo &info) : Napi::ObjectWrap<DataChannelWrapper>(info)
 {
-    mDataChannelPtr = *(info[0].As<Napi::External<std::shared_ptr<rtc::DataChannel>>>().Data());
+    mDataChannelPtr = *(info[0].As<Napi::External<std::shared_ptr<rtc::DataChannel>>>().Data());    
 
+    mDataChannelPtr->onClosed([&]()
+                              {                                  
+        if (mOnClosedCallback)
+            mOnClosedCallback->call([this](Napi::Env env, std::vector<napi_value> &args) {
+                // Check the peer connection is not closed
+                if(instances.find(this) == instances.end())
+                    throw ThreadSafeCallback::CancelException();
+
+                cleanCbsAndEraseInstance();
+
+                // This will run in main thread and needs to construct the
+                // arguments for the call
+                args = {};
+            });
+         else {
+             cleanCbsAndEraseInstance();
+         } });
+    
     instances.insert(this);
 }
 
@@ -54,20 +74,11 @@ DataChannelWrapper::~DataChannelWrapper()
 
 void DataChannelWrapper::doClose()
 {
-    instances.erase(this);
-
     if (mDataChannelPtr)
     {
         try
         {
-            mOnOpenCallback.reset();
-            mOnClosedCallback.reset();
-            mOnErrorCallback.reset();
-            mOnBufferedAmountLowCallback.reset();
-            mOnMessageCallback.reset();
-
             mDataChannelPtr->close();
-            mDataChannelPtr.reset();
         }
         catch (std::exception &ex)
         {
@@ -77,6 +88,18 @@ void DataChannelWrapper::doClose()
     }
 }
 
+void DataChannelWrapper::cleanCbsAndEraseInstance()
+{
+    mOnOpenCallback.reset();
+    mOnClosedCallback.reset();
+    mOnErrorCallback.reset();
+    mOnBufferedAmountLowCallback.reset();
+    mOnMessageCallback.reset();
+
+    instances.erase(this);
+    mDataChannelPtr.reset();
+}
+
 void DataChannelWrapper::close(const Napi::CallbackInfo &info)
 {
     doClose();
@@ -93,6 +116,28 @@ Napi::Value DataChannelWrapper::getLabel(const Napi::CallbackInfo &info)
     return Napi::String::New(info.Env(), mDataChannelPtr->label());
 }
 
+Napi::Value DataChannelWrapper::getId(const Napi::CallbackInfo &info)
+{
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "It seems data-channel is destroyed!").ThrowAsJavaScriptException();
+        return info.Env().Null();
+    }
+
+    return Napi::Number::New(info.Env(), mDataChannelPtr->id());
+}
+
+Napi::Value DataChannelWrapper::getProtocol(const Napi::CallbackInfo &info)
+{
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "It seems data-channel is destroyed!").ThrowAsJavaScriptException();
+        return info.Env().Null();
+    }
+
+    return Napi::String::New(info.Env(), mDataChannelPtr->protocol());
+}
+
 Napi::Value DataChannelWrapper::sendMessage(const Napi::CallbackInfo &info)
 {
     if (!mDataChannelPtr)
@@ -278,18 +323,7 @@ void DataChannelWrapper::onClosed(const Napi::CallbackInfo &info)
     // Callback
     mOnClosedCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    mDataChannelPtr->onClosed([&]()
-                              {
-        if (mOnClosedCallback)
-            mOnClosedCallback->call([this](Napi::Env env, std::vector<napi_value> &args) {
-                // Check the peer connection is not closed
-                if(instances.find(this) == instances.end())
-                    throw ThreadSafeCallback::CancelException();
-
-                // This will run in main thread and needs to construct the
-                // arguments for the call
-                args = {};
-            }); });
+    // Object cb call moved to the constructor    
 }
 
 void DataChannelWrapper::onError(const Napi::CallbackInfo &info)

package/src/data-channel-wrapper.h

@@ -23,6 +23,8 @@ public:
   // Functions
   void close(const Napi::CallbackInfo &info);
   Napi::Value getLabel(const Napi::CallbackInfo &info);
+  Napi::Value getId(const Napi::CallbackInfo &info);
+  Napi::Value getProtocol(const Napi::CallbackInfo &info);
   Napi::Value sendMessage(const Napi::CallbackInfo &info);
   Napi::Value sendMessageBinary(const Napi::CallbackInfo &info);
   Napi::Value isOpen(const Napi::CallbackInfo &info);
@@ -44,6 +46,7 @@ private:
   static std::unordered_set<DataChannelWrapper*> instances;
 
   void doClose();
+  void cleanCbsAndEraseInstance();
 
   std::string mLabel;
   std::shared_ptr<rtc::DataChannel> mDataChannelPtr = nullptr;

package/src/media-audio-wrapper.cpp

@@ -157,15 +157,15 @@ Napi::Value AudioWrapper::generateSdp(const Napi::CallbackInfo &info)
     Napi::Env env = info.Env();
     int length = info.Length();
 
-    if (length < 3 || !info[0].IsString() || !info[1].IsString() || !info[2].IsString())
+    if (length < 3 || !info[0].IsString() || !info[1].IsString() || !info[2].IsNumber())
     {
-        Napi::TypeError::New(env, "We expect (String, String, String) as param").ThrowAsJavaScriptException();
+        Napi::TypeError::New(env, "We expect (String, String, Number) as param").ThrowAsJavaScriptException();
         return Napi::String::New(env, "");
     }
 
     std::string eol = info[0].As<Napi::String>().ToString();
     std::string addr = info[1].As<Napi::String>().ToString();
-    std::string port = info[2].As<Napi::String>().ToString();
+    uint16_t port = info[2].As<Napi::Number>().Uint32Value();
 
     return Napi::String::New(env, mAudioPtr->generateSdp(eol, addr, port));
 }
@@ -398,7 +398,7 @@ void AudioWrapper::setBitrate(const Napi::CallbackInfo &info)
 Napi::Value AudioWrapper::getBitrate(const Napi::CallbackInfo &info)
 {
 
-    return Napi::Number::New(info.Env(), mAudioPtr->getBitrate());
+    return Napi::Number::New(info.Env(), mAudioPtr->bitrate());
 }
 
 Napi::Value AudioWrapper::hasPayloadType(const Napi::CallbackInfo &info)
@@ -432,7 +432,7 @@ void AudioWrapper::addRTXCodec(const Napi::CallbackInfo &info)
     unsigned int originalPayloadType = static_cast<unsigned int>(info[1].As<Napi::Number>().ToNumber());
     unsigned int clockRate = static_cast<unsigned int>(info[2].As<Napi::Number>().ToNumber());
 
-    mAudioPtr->addRTXCodec(payloadType, originalPayloadType, clockRate);
+    mAudioPtr->addRtxCodec(payloadType, originalPayloadType, clockRate);
 }
 
 void AudioWrapper::addRTPMap(const Napi::CallbackInfo &info)

package/src/media-track-wrapper.cpp

@@ -22,6 +22,7 @@ Napi::Object TrackWrapper::Init(Napi::Env env, Napi::Object exports)
         {
             InstanceMethod("direction", &TrackWrapper::direction),
             InstanceMethod("mid", &TrackWrapper::mid),
+            InstanceMethod("type", &TrackWrapper::type),
             InstanceMethod("close", &TrackWrapper::close),
             InstanceMethod("sendMessage", &TrackWrapper::sendMessage),
             InstanceMethod("sendMessageBinary", &TrackWrapper::sendMessageBinary),
@@ -45,8 +46,26 @@ Napi::Object TrackWrapper::Init(Napi::Env env, Napi::Object exports)
 
 TrackWrapper::TrackWrapper(const Napi::CallbackInfo &info) : Napi::ObjectWrap<TrackWrapper>(info)
 {
-    mTrackPtr = *(info[0].As<Napi::External<std::shared_ptr<rtc::Track>>>().Data());
+    mTrackPtr = *(info[0].As<Napi::External<std::shared_ptr<rtc::Track>>>().Data());    
 
+    mTrackPtr->onClosed([&]()
+                        {
+        if (mOnClosedCallback)
+            mOnClosedCallback->call([this](Napi::Env env, std::vector<napi_value> &args) {
+                // Check the peer connection is not closed
+                if(instances.find(this) == instances.end())
+                    throw ThreadSafeCallback::CancelException();
+
+                cleanCbsAndEraseInstance();
+
+                // This will run in main thread and needs to construct the
+                // arguments for the call
+                args = {};
+            }); 
+            else {
+             cleanCbsAndEraseInstance();
+         } });
+    
     instances.insert(this);
 }
 
@@ -57,19 +76,11 @@ TrackWrapper::~TrackWrapper()
 
 void TrackWrapper::doClose()
 {
-    instances.erase(this);
-
     if (mTrackPtr)
     {
         try
         {
-            mOnOpenCallback.reset();
-            mOnClosedCallback.reset();
-            mOnErrorCallback.reset();
-            mOnMessageCallback.reset();
-
             mTrackPtr->close();
-            mTrackPtr.reset();
         }
         catch (std::exception &ex)
         {
@@ -79,6 +90,17 @@ void TrackWrapper::doClose()
     }
 }
 
+void TrackWrapper::cleanCbsAndEraseInstance()
+{
+    mOnOpenCallback.reset();
+    mOnClosedCallback.reset();
+    mOnErrorCallback.reset();
+    mOnMessageCallback.reset();
+
+    instances.erase(this);
+    mTrackPtr.reset();
+}
+
 void TrackWrapper::close(const Napi::CallbackInfo &info)
 {
     doClose();
@@ -96,6 +118,12 @@ Napi::Value TrackWrapper::mid(const Napi::CallbackInfo &info)
     return Napi::String::New(env, mTrackPtr->mid());
 }
 
+Napi::Value TrackWrapper::type(const Napi::CallbackInfo &info)
+{
+    Napi::Env env = info.Env();
+    return Napi::String::New(env, mTrackPtr->description().type());
+}
+
 Napi::Value TrackWrapper::sendMessage(const Napi::CallbackInfo &info)
 {
     if (!mTrackPtr)
@@ -254,18 +282,7 @@ void TrackWrapper::onClosed(const Napi::CallbackInfo &info)
     // Callback
     mOnClosedCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    mTrackPtr->onClosed([&]()
-                        {
-        if (mOnClosedCallback)
-            mOnClosedCallback->call([this](Napi::Env env, std::vector<napi_value> &args) {
-                // Check the peer connection is not closed
-                if(instances.find(this) == instances.end())
-                    throw ThreadSafeCallback::CancelException();
-
-                // This will run in main thread and needs to construct the
-                // arguments for the call
-                args = {};
-            }); });
+    // Object cb call moved to the constructor    
 }
 
 void TrackWrapper::onError(const Napi::CallbackInfo &info)
@@ -323,6 +340,8 @@ void TrackWrapper::onMessage(const Napi::CallbackInfo &info)
                 Napi::Object payload = Napi::Object::New(env);
                 if (std::holds_alternative<std::string>(message))
                 {
+                    // Track will always send message as binary
+                    // So this code is not needed actually 
                     args = {Napi::String::New(env, std::get<std::string>(message))};
                 }
                 else

package/src/media-track-wrapper.h

@@ -23,6 +23,7 @@ public:
   // Functions
   Napi::Value direction(const Napi::CallbackInfo &info);
   Napi::Value mid(const Napi::CallbackInfo &info);
+  Napi::Value type(const Napi::CallbackInfo &info);
   void close(const Napi::CallbackInfo &info);
   Napi::Value sendMessage(const Napi::CallbackInfo &info);
   Napi::Value sendMessageBinary(const Napi::CallbackInfo &info);
@@ -45,6 +46,7 @@ private:
   static std::unordered_set<TrackWrapper *> instances;
 
   void doClose();
+  void cleanCbsAndEraseInstance();
 
   std::shared_ptr<rtc::Track> mTrackPtr = nullptr;
 

package/src/media-video-wrapper.cpp

@@ -190,15 +190,15 @@ Napi::Value VideoWrapper::generateSdp(const Napi::CallbackInfo &info)
     Napi::Env env = info.Env();
     int length = info.Length();
 
-    if (length < 3 || !info[0].IsString() || !info[1].IsString() || !info[2].IsString())
+    if (length < 3 || !info[0].IsString() || !info[1].IsString() || !info[2].IsNumber())
     {
-        Napi::TypeError::New(env, "We expect (String, String, String) as param").ThrowAsJavaScriptException();
+        Napi::TypeError::New(env, "We expect (String, String, Number) as param").ThrowAsJavaScriptException();
         return Napi::String::New(env, "");
     }
 
     std::string eol = info[0].As<Napi::String>().ToString();
     std::string addr = info[1].As<Napi::String>().ToString();
-    std::string port = info[2].As<Napi::String>().ToString();
+    uint16_t port = info[2].As<Napi::Number>().Uint32Value();
 
     return Napi::String::New(env, mVideoPtr->generateSdp(eol, addr, port));
 }
@@ -431,7 +431,7 @@ void VideoWrapper::setBitrate(const Napi::CallbackInfo &info)
 Napi::Value VideoWrapper::getBitrate(const Napi::CallbackInfo &info)
 {
 
-    return Napi::Number::New(info.Env(), mVideoPtr->getBitrate());
+    return Napi::Number::New(info.Env(), mVideoPtr->bitrate());
 }
 
 Napi::Value VideoWrapper::hasPayloadType(const Napi::CallbackInfo &info)
@@ -465,7 +465,7 @@ void VideoWrapper::addRTXCodec(const Napi::CallbackInfo &info)
     unsigned int originalPayloadType = static_cast<unsigned int>(info[1].As<Napi::Number>().ToNumber());
     unsigned int clockRate = static_cast<unsigned int>(info[2].As<Napi::Number>().ToNumber());
 
-    mVideoPtr->addRTXCodec(payloadType, originalPayloadType, clockRate);
+    mVideoPtr->addRtxCodec(payloadType, originalPayloadType, clockRate);
 }
 
 void VideoWrapper::addRTPMap(const Napi::CallbackInfo &info)

package/src/peer-connection-wrapper.cpp

@@ -147,10 +147,6 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
         std::string strType = proxyServer.Get("type").As<Napi::String>().ToString();
         rtc::ProxyServer::Type type = rtc::ProxyServer::Type::Http;
 
-        if (strType == "None")
-            type = rtc::ProxyServer::Type::None;
-        if (strType == "Http")
-            type = rtc::ProxyServer::Type::Http;
         if (strType == "Socks5")
             type = rtc::ProxyServer::Type::Socks5;
 
@@ -176,6 +172,14 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
     if (config.Get("enableIceTcp").IsBoolean())
         rtcConfig.enableIceTcp = config.Get("enableIceTcp").As<Napi::Boolean>();
 
+    // enableIceUdpMux option
+    if (config.Get("enableIceUdpMux").IsBoolean())
+        rtcConfig.enableIceUdpMux = config.Get("enableIceUdpMux").As<Napi::Boolean>();
+
+    // disableAutoNegotiation option
+    if (config.Get("disableAutoNegotiation").IsBoolean())
+        rtcConfig.disableAutoNegotiation = config.Get("disableAutoNegotiation").As<Napi::Boolean>();
+
     // Max Message Size
     if (config.Get("maxMessageSize").IsNumber())
         rtcConfig.maxMessageSize = config.Get("maxMessageSize").As<Napi::Number>().Uint32Value();
@@ -211,6 +215,27 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
         return;
     }
 
+    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
+                if(instances.find(this) == instances.end())
+                    throw ThreadSafeCallback::CancelException();
+
+                if(mDoCloseFlag && state == rtc::PeerConnection::State::Closed)
+                    cleanCbsAndEraseInstance();
+
+                // This will run in main thread and needs to construct the
+                // arguments for the call
+                std::ostringstream stream;
+                stream << state;
+                args = {Napi::String::New(env, stream.str())};
+            });
+        else {
+            if(mDoCloseFlag && state == rtc::PeerConnection::State::Closed)
+                cleanCbsAndEraseInstance();
+         } });
+
     instances.insert(this);
 }
 
@@ -221,20 +246,14 @@ PeerConnectionWrapper::~PeerConnectionWrapper()
 
 void PeerConnectionWrapper::doClose()
 {
-    instances.erase(this);
-
-    if (mRtcPeerConnPtr)
+    if (mRtcPeerConnPtr && !mDoCloseFlag)
     {
         try
         {
-            mOnLocalDescriptionCallback.reset();
-            mOnLocalCandidateCallback.reset();
-            mOnStateChangeCallback.reset();
-            mOnGatheringStateChangeCallback.reset();
-            mOnDataChannelCallback.reset();
-            mOnTrackCallback.reset();
-
+            mDoCloseFlag = true;
             mRtcPeerConnPtr->close();
+
+            // Resetting in cleanCbsAndEraseInstance causes a deadlock
             mRtcPeerConnPtr.reset();
         }
         catch (std::exception &ex)
@@ -245,6 +264,20 @@ void PeerConnectionWrapper::doClose()
     }
 }
 
+void PeerConnectionWrapper::cleanCbsAndEraseInstance()
+{
+    mOnLocalDescriptionCallback.reset();
+    mOnLocalCandidateCallback.reset();
+    mOnStateChangeCallback.reset();
+    mOnGatheringStateChangeCallback.reset();
+    mOnDataChannelCallback.reset();
+    mOnTrackCallback.reset();
+
+    instances.erase(this);
+
+    mDoCloseFlag = false;
+}
+
 void PeerConnectionWrapper::close(const Napi::CallbackInfo &info)
 {
     doClose();
@@ -598,19 +631,7 @@ void PeerConnectionWrapper::onStateChange(const Napi::CallbackInfo &info)
     // Callback
     mOnStateChangeCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    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
-                if(instances.find(this) == instances.end())
-                    throw ThreadSafeCallback::CancelException();
-
-                // This will run in main thread and needs to construct the
-                // arguments for the call
-                std::ostringstream stream;
-                stream << state;
-                args = {Napi::String::New(env, stream.str())};
-            }); });
+    // onState cb will be called from constructor
 }
 
 void PeerConnectionWrapper::onSignalingStateChange(const Napi::CallbackInfo &info)

package/src/peer-connection-wrapper.h

@@ -55,6 +55,8 @@ private:
   static std::unordered_set<PeerConnectionWrapper *> instances;
 
   void doClose();
+  void cleanCbsAndEraseInstance();
+  bool mDoCloseFlag = false;
 
   std::string mPeerName;
   std::unique_ptr<rtc::PeerConnection> mRtcPeerConnPtr = nullptr;

package/test/connectivity.js

@@ -66,6 +66,9 @@ peer2.onDataChannel((dc) => {
         console.log('Peer2 Received Msg:', msg);
     });
     dc2.sendMessage("Hello From Peer2");
+    dc2.onClosed(() => {
+        console.log('dc2 closed');
+     });
 });
 
 // DataChannel Options
@@ -85,17 +88,14 @@ dc1.onOpen(() => {
 dc1.onMessage((msg) => {
     console.log('Peer1 Received Msg:', msg);
 });
+dc1.onClosed(() => {
+   console.log('dc1 closed');
+});
 
 setTimeout(() => {
     dc1.close();
     dc2.close();
     peer1.close();
     peer2.close();
-    dc1 = null;
-    dc2 = null;
-    peer1 = null;
-    peer2 = null;
     nodeDataChannel.cleanup();
-    // No need for this (>= V0.1.14)
-    // process.exit();
 }, 5 * 1000);

package/test/test.js

@@ -24,8 +24,11 @@ describe('PeerConnection Classes', () => {
 
     test('Create Data Channel', () => {
         let peer = new nodeDataChannel.PeerConnection("Peer", { iceServers: ["stun:stun.l.google.com:19302"] });
-        let dc = peer.createDataChannel('test');
+        let dc = peer.createDataChannel('test', { protocol: 'test-protocol' });
         expect(dc).toBeDefined();
+        expect(dc.getId()).toBeDefined();
+        expect(dc.getProtocol()).toBe('test-protocol');
+        expect(dc.getLabel()).toBe('test');
         expect(dc.onOpen).toBeDefined();
         expect(dc.onMessage).toBeDefined();
 
@@ -184,9 +187,6 @@ describe('DataChannel streams', () => {
 
         expect(await clientResponsePromise).toBe("test message");
 
-        clientChannel.close();
-        await new Promise((resolve) => echoStream.on('end', resolve));
-
         clientPeer.close();
         echoPeer.close();
     });