node-datachannel 0.2.2 → 0.3.0

package/node_modules/prebuild-install/package.json

@@ -1,31 +1,31 @@
 {
   "_args": [
     [
-      "prebuild-install@6.1.4",
+      "prebuild-install@7.0.1",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "prebuild-install@6.1.4",
-  "_id": "prebuild-install@6.1.4",
+  "_from": "prebuild-install@7.0.1",
+  "_id": "prebuild-install@7.0.1",
   "_inBundle": false,
-  "_integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
+  "_integrity": "sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg==",
   "_location": "/prebuild-install",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "prebuild-install@6.1.4",
+    "raw": "prebuild-install@7.0.1",
     "name": "prebuild-install",
     "escapedName": "prebuild-install",
-    "rawSpec": "6.1.4",
+    "rawSpec": "7.0.1",
     "saveSpec": null,
-    "fetchSpec": "6.1.4"
+    "fetchSpec": "7.0.1"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
-  "_spec": "6.1.4",
+  "_resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz",
+  "_spec": "7.0.1",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "author": {
     "name": "Mathias Buus",
@@ -75,32 +75,32 @@
     }
   ],
   "dependencies": {
-    "detect-libc": "^1.0.3",
+    "detect-libc": "^2.0.0",
     "expand-template": "^2.0.3",
     "github-from-package": "0.0.0",
     "minimist": "^1.2.3",
     "mkdirp-classic": "^0.5.3",
     "napi-build-utils": "^1.0.1",
-    "node-abi": "^2.21.0",
+    "node-abi": "^3.3.0",
     "npmlog": "^4.0.1",
     "pump": "^3.0.0",
     "rc": "^1.2.7",
-    "simple-get": "^3.0.3",
+    "simple-get": "^4.0.0",
     "tar-fs": "^2.0.0",
     "tunnel-agent": "^0.6.0"
   },
   "description": "A command line tool to easily install prebuilt binaries for multiple version of node/iojs on a specific platform",
   "devDependencies": {
     "a-native-module": "^1.0.0",
-    "hallmark": "^3.0.0",
+    "hallmark": "^4.0.0",
     "nock": "^10.0.6",
     "rimraf": "^2.5.2",
-    "standard": "^13.0.2",
-    "tape": "^4.5.1",
+    "standard": "^16.0.4",
+    "tape": "^5.3.1",
     "tempy": "0.2.1"
   },
   "engines": {
-    "node": ">=6"
+    "node": ">=10"
   },
   "homepage": "https://github.com/prebuild/prebuild-install",
   "keywords": [
@@ -123,8 +123,7 @@
   },
   "scripts": {
     "hallmark": "hallmark --fix",
-    "lint": "standard && hallmark",
-    "test": "tape test/*-test.js && npm run lint"
+    "test": "standard && hallmark && tape test/*-test.js"
   },
-  "version": "6.1.4"
+  "version": "7.0.1"
 }

package/node_modules/prebuild-install/proxy.js

@@ -1,20 +1,20 @@
-var url = require('url')
-var tunnel = require('tunnel-agent')
-var util = require('./util')
+const url = require('url')
+const tunnel = require('tunnel-agent')
+const util = require('./util')
 
 function applyProxy (reqOpts, opts) {
-  var log = opts.log || util.noopLogger
+  const log = opts.log || util.noopLogger
 
-  var proxy = opts['https-proxy'] || opts.proxy
+  const proxy = opts['https-proxy'] || opts.proxy
 
   if (proxy) {
     // eslint-disable-next-line node/no-deprecated-api
-    var parsedDownloadUrl = url.parse(reqOpts.url)
+    const parsedDownloadUrl = url.parse(reqOpts.url)
     // eslint-disable-next-line node/no-deprecated-api
-    var parsedProxy = url.parse(proxy)
-    var uriProtocol = (parsedDownloadUrl.protocol === 'https:' ? 'https' : 'http')
-    var proxyProtocol = (parsedProxy.protocol === 'https:' ? 'Https' : 'Http')
-    var tunnelFnName = [uriProtocol, proxyProtocol].join('Over')
+    const parsedProxy = url.parse(proxy)
+    const uriProtocol = (parsedDownloadUrl.protocol === 'https:' ? 'https' : 'http')
+    const proxyProtocol = (parsedProxy.protocol === 'https:' ? 'Https' : 'Http')
+    const tunnelFnName = [uriProtocol, proxyProtocol].join('Over')
     reqOpts.agent = tunnel[tunnelFnName]({
       proxy: {
         host: parsedProxy.hostname,

package/node_modules/prebuild-install/rc.js

@@ -1,18 +1,18 @@
-var path = require('path')
-var minimist = require('minimist')
-var getAbi = require('node-abi').getAbi
-var detectLibc = require('detect-libc')
-var napi = require('napi-build-utils')
+const path = require('path')
+const minimist = require('minimist')
+const getAbi = require('node-abi').getAbi
+const detectLibc = require('detect-libc')
+const napi = require('napi-build-utils')
 
-var env = process.env
-var libc = env.LIBC || (detectLibc.isNonGlibcLinux && detectLibc.family) || ''
+const env = process.env
+const libc = env.LIBC || (detectLibc.isNonGlibcLinuxSync() && detectLibc.familySync()) || ''
 
 // Get the configuration
 module.exports = function (pkg) {
-  var pkgConf = pkg.config || {}
-  var buildFromSource = env.npm_config_build_from_source
+  const pkgConf = pkg.config || {}
+  const buildFromSource = env.npm_config_build_from_source
 
-  var rc = require('rc')('prebuild-install', {
+  const rc = require('rc')('prebuild-install', {
     target: pkgConf.target || env.npm_config_target || process.versions.node,
     runtime: pkgConf.runtime || env.npm_config_runtime || 'node',
     arch: pkgConf.arch || env.npm_config_arch || process.arch,
@@ -23,8 +23,8 @@ module.exports = function (pkg) {
     verbose: env.npm_config_verbose === 'true',
     buildFromSource: buildFromSource === pkg.name || buildFromSource === 'true',
     path: '.',
-    proxy: env.npm_config_proxy || env['http_proxy'] || env['HTTP_PROXY'],
-    'https-proxy': env.npm_config_https_proxy || env['https_proxy'] || env['HTTPS_PROXY'],
+    proxy: env.npm_config_proxy || env.http_proxy || env.HTTP_PROXY,
+    'https-proxy': env.npm_config_https_proxy || env.https_proxy || env.HTTPS_PROXY,
     'local-address': env.npm_config_local_address,
     'local-prebuilds': 'prebuilds',
     'tag-prefix': 'v',

package/node_modules/prebuild-install/util.js

@@ -1,11 +1,11 @@
-var path = require('path')
-var github = require('github-from-package')
-var home = require('os').homedir
-var crypto = require('crypto')
-var expandTemplate = require('expand-template')()
+const path = require('path')
+const github = require('github-from-package')
+const home = require('os').homedir
+const crypto = require('crypto')
+const expandTemplate = require('expand-template')()
 
 function getDownloadUrl (opts) {
-  var pkgName = opts.pkg.name.replace(/^@[a-zA-Z0-9_\-.~]+\//, '')
+  const pkgName = opts.pkg.name.replace(/^@[a-zA-Z0-9_\-.~]+\//, '')
   return expandTemplate(urlTemplate(opts), {
     name: pkgName,
     package_name: pkgName,
@@ -40,8 +40,8 @@ function urlTemplate (opts) {
     return opts.download
   }
 
-  var packageName = '{name}-v{version}-{runtime}-v{abi}-{platform}{libc}-{arch}.tar.gz'
-  var hostMirrorUrl = getHostMirrorUrl(opts)
+  const packageName = '{name}-v{version}-{runtime}-v{abi}-{platform}{libc}-{arch}.tar.gz'
+  const hostMirrorUrl = getHostMirrorUrl(opts)
 
   if (hostMirrorUrl) {
     return hostMirrorUrl + '/{tag_prefix}{version}/' + packageName
@@ -65,7 +65,7 @@ function getEnvPrefix (pkgName) {
 }
 
 function getHostMirrorUrl (opts) {
-  var propName = getEnvPrefix(opts.pkg.name) + '_binary_host'
+  const propName = getEnvPrefix(opts.pkg.name) + '_binary_host'
   return process.env[propName] || process.env[propName + '_mirror']
 }
 
@@ -74,12 +74,12 @@ function trimSlashes (str) {
 }
 
 function cachedPrebuild (url) {
-  var digest = crypto.createHash('md5').update(url).digest('hex').slice(0, 6)
+  const digest = crypto.createHash('md5').update(url).digest('hex').slice(0, 6)
   return path.join(prebuildCache(), digest + '-' + path.basename(url).replace(/[^a-zA-Z0-9.]+/g, '-'))
 }
 
 function npmCache () {
-  var env = process.env
+  const env = process.env
   return env.npm_config_cache || (env.APPDATA ? path.join(env.APPDATA, 'npm-cache') : path.join(home(), '.npm'))
 }
 
@@ -110,12 +110,12 @@ function packageOrigin (env, pkg) {
 }
 
 function localPrebuild (url, opts) {
-  var propName = getEnvPrefix(opts.pkg.name) + '_local_prebuilds'
-  var prefix = process.env[propName] || opts['local-prebuilds'] || 'prebuilds'
+  const propName = getEnvPrefix(opts.pkg.name) + '_local_prebuilds'
+  const prefix = process.env[propName] || opts['local-prebuilds'] || 'prebuilds'
   return path.join(prefix, path.basename(url))
 }
 
-var noopLogger = {
+const noopLogger = {
   http: function () {},
   silly: function () {},
   debug: function () {},

package/node_modules/simple-get/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily
+    labels:
+      - dependency
+    versioning-strategy: increase-if-necessary
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+    labels:
+      - dependency

package/node_modules/simple-get/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: ci
+'on':
+  - push
+  - pull_request
+jobs:
+  test:
+    name: Node ${{ matrix.node }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        node:
+          - '14'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install
+      - run: npm run build --if-present
+      - run: npm test

package/node_modules/simple-get/README.md

@@ -1,7 +1,7 @@
-# simple-get [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
+# simple-get [![ci][ci-image]][ci-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
 
-[travis-image]: https://img.shields.io/travis/feross/simple-get/master.svg
-[travis-url]: https://travis-ci.org/feross/simple-get
+[ci-image]: https://img.shields.io/github/workflow/status/feross/simple-get/ci/master
+[ci-url]: https://github.com/feross/simple-get/actions
 [npm-image]: https://img.shields.io/npm/v/simple-get.svg
 [npm-url]: https://npmjs.org/package/simple-get
 [downloads-image]: https://img.shields.io/npm/dm/simple-get.svg
@@ -254,6 +254,20 @@ const opts = {
 get(opts, function (err, res) {})
 ```
 
+### Basic Auth
+
+```js
+const user = 'someuser'
+const pass = 'pa$$word'
+const encodedAuth = Buffer.from(`${user}:${pass}`).toString('base64')
+
+get('http://example.com', {
+  headers: {
+    authorization: `Basic ${encodedAuth}`
+  }
+})
+```
+
 ### OAuth
 
 You can use the [`oauth-1.0a`](https://github.com/ddo/oauth-1.0a) module to create

package/node_modules/simple-get/index.js

@@ -1,3 +1,4 @@
+/*! simple-get. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 module.exports = simpleGet
 
 const concat = require('simple-concat')
@@ -43,6 +44,7 @@ function simpleGet (opts, cb) {
   if (opts.json) opts.headers.accept = 'application/json'
   if (opts.method) opts.method = opts.method.toUpperCase()
 
+  const originalHost = opts.hostname // hostname before potential redirect
   const protocol = opts.protocol === 'https:' ? https : http // Support http/https urls
   const req = protocol.request(opts, res => {
     if (opts.followRedirects !== false && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
@@ -50,6 +52,13 @@ function simpleGet (opts, cb) {
       delete opts.headers.host // Discard `host` header on redirect (see #32)
       res.resume() // Discard response
 
+      const redirectHost = url.parse(opts.url).hostname // eslint-disable-line node/no-deprecated-api
+      // If redirected host is different than original host, drop headers to prevent cookie leak (#73)
+      if (redirectHost !== null && redirectHost !== originalHost) {
+        delete opts.headers.cookie
+        delete opts.headers.authorization
+      }
+
       if (opts.method === 'POST' && [301, 302].includes(res.statusCode)) {
         opts.method = 'GET' // On 301/302 redirect, change POST to GET (see #35)
         delete opts.headers['content-length']; delete opts.headers['content-type']

package/node_modules/simple-get/package.json

@@ -1,36 +1,36 @@
 {
   "_args": [
     [
-      "simple-get@3.1.0",
+      "simple-get@4.0.1",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "simple-get@3.1.0",
-  "_id": "simple-get@3.1.0",
+  "_from": "simple-get@4.0.1",
+  "_id": "simple-get@4.0.1",
   "_inBundle": false,
-  "_integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+  "_integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
   "_location": "/simple-get",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "simple-get@3.1.0",
+    "raw": "simple-get@4.0.1",
     "name": "simple-get",
     "escapedName": "simple-get",
-    "rawSpec": "3.1.0",
+    "rawSpec": "4.0.1",
     "saveSpec": null,
-    "fetchSpec": "3.1.0"
+    "fetchSpec": "4.0.1"
   },
   "_requiredBy": [
     "/prebuild-install"
   ],
-  "_resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
-  "_spec": "3.1.0",
+  "_resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+  "_spec": "4.0.1",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "author": {
     "name": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
-    "url": "http://feross.org/"
+    "url": "https://feross.org"
   },
   "browser": {
     "decompress-response": false
@@ -39,7 +39,7 @@
     "url": "https://github.com/feross/simple-get/issues"
   },
   "dependencies": {
-    "decompress-response": "^4.2.0",
+    "decompress-response": "^6.0.0",
     "once": "^1.3.1",
     "simple-concat": "^1.0.0"
   },
@@ -48,8 +48,22 @@
     "self-signed-https": "^1.0.5",
     "standard": "*",
     "string-to-stream": "^3.0.0",
-    "tape": "^4.0.0"
+    "tape": "^5.0.0"
   },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/feross"
+    },
+    {
+      "type": "patreon",
+      "url": "https://www.patreon.com/feross"
+    },
+    {
+      "type": "consulting",
+      "url": "https://feross.org/support"
+    }
+  ],
   "homepage": "https://github.com/feross/simple-get",
   "keywords": [
     "request",
@@ -77,5 +91,5 @@
   "scripts": {
     "test": "standard && tape test/*.js"
   },
-  "version": "3.1.0"
+  "version": "4.0.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-datachannel",
-  "version": "0.2.2",
+  "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,17 +47,25 @@
   },
   "homepage": "https://github.com/murat-dogan/node-datachannel#readme",
   "devDependencies": {
-    "cmake-js": "^6.2.1",
-    "jest": "^27.2.5",
+    "@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.0"
+    "node-addon-api": "^4.3.0",
+    "prebuild": "^11.0.3",
+    "prettier": "^2.6.2",
+    "typescript": "^4.6.3"
   },
   "bundledDependencies": [
     "prebuild-install"
   ],
   "dependencies": {
-    "prebuild-install": "^6.1.4"
+    "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

@@ -51,7 +51,7 @@ AudioWrapper::AudioWrapper(const Napi::CallbackInfo &info) : Napi::ObjectWrap<Au
     rtc::Description::Direction dir = rtc::Description::Direction::SendOnly;
 
     // optional
-    if (length > 1)
+    if (length > 0)
     {
         if (!info[0].IsString())
         {
@@ -62,7 +62,7 @@ AudioWrapper::AudioWrapper(const Napi::CallbackInfo &info) : Napi::ObjectWrap<Au
     }
 
     // ootional
-    if (length > 2)
+    if (length > 1)
     {
         if (!info[1].IsString())
         {
@@ -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)