node-datachannel 0.2.4 → 0.3.2

package/node_modules/npmlog/node_modules/are-we-there-yet/package.json

@@ -1,31 +1,31 @@
 {
   "_args": [
     [
-      "are-we-there-yet@1.1.5",
+      "are-we-there-yet@1.1.7",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "are-we-there-yet@1.1.5",
-  "_id": "are-we-there-yet@1.1.5",
+  "_from": "are-we-there-yet@1.1.7",
+  "_id": "are-we-there-yet@1.1.7",
   "_inBundle": false,
-  "_integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+  "_integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
   "_location": "/npmlog/are-we-there-yet",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "are-we-there-yet@1.1.5",
+    "raw": "are-we-there-yet@1.1.7",
     "name": "are-we-there-yet",
     "escapedName": "are-we-there-yet",
-    "rawSpec": "1.1.5",
+    "rawSpec": "1.1.7",
     "saveSpec": null,
-    "fetchSpec": "1.1.5"
+    "fetchSpec": "1.1.7"
   },
   "_requiredBy": [
     "/npmlog"
   ],
-  "_resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-  "_spec": "1.1.5",
+  "_resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+  "_spec": "1.1.7",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "author": {
     "name": "Rebecca Turner",
@@ -62,5 +62,5 @@
   "scripts": {
     "test": "standard && tap test/*.js"
   },
-  "version": "1.1.5"
+  "version": "1.1.7"
 }

package/node_modules/npmlog/package.json

@@ -20,7 +20,7 @@
     "signal-exit": "3.0.3",
     "string-width": "1.0.2",
     "strip-ansi": "3.0.1",
-    "wide-align": "1.1.3"
+    "wide-align": "1.1.5"
   },
   "_requested": {
     "type": "version",

package/node_modules/tar-stream/node_modules/bl/.travis.yml

@@ -1,4 +1,7 @@
 sudo: false
+arch:
+ - amd64
+ - ppc64le
 language: node_js
 node_js:
   - '6'
@@ -6,10 +9,8 @@ node_js:
   - '10'
   - '12'
   - '14'
+  - '15'
   - lts/*
-branches:
-  only:
-    - master
 notifications:
   email:
     - rod@vagg.org

package/node_modules/tar-stream/node_modules/bl/BufferList.js

@@ -373,7 +373,7 @@ BufferList.prototype._match = function (offset, search) {
           return this.slice(offset, offset + byteLength)[m](0, byteLength)
         }
       } else {
-        BufferList.prototype[m] = function (offset) {
+        BufferList.prototype[m] = function (offset = 0) {
           return this.slice(offset, offset + methods[m])[m](0)
         }
       }

package/node_modules/tar-stream/node_modules/bl/package.json

@@ -1,31 +1,31 @@
 {
   "_args": [
     [
-      "bl@4.0.3",
+      "bl@4.1.0",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "bl@4.0.3",
-  "_id": "bl@4.0.3",
+  "_from": "bl@4.1.0",
+  "_id": "bl@4.1.0",
   "_inBundle": false,
-  "_integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+  "_integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
   "_location": "/tar-stream/bl",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "bl@4.0.3",
+    "raw": "bl@4.1.0",
     "name": "bl",
     "escapedName": "bl",
-    "rawSpec": "4.0.3",
+    "rawSpec": "4.1.0",
     "saveSpec": null,
-    "fetchSpec": "4.0.3"
+    "fetchSpec": "4.1.0"
   },
   "_requiredBy": [
     "/tar-stream"
   ],
-  "_resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
-  "_spec": "4.0.3",
+  "_resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+  "_spec": "4.1.0",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "authors": [
     "Rod Vagg <rod@vagg.org> (https://github.com/rvagg)",
@@ -64,5 +64,5 @@
     "lint": "standard *.js test/*.js",
     "test": "npm run lint && node test/test.js | faucet"
   },
-  "version": "4.0.3"
+  "version": "4.1.0"
 }

package/node_modules/tar-stream/node_modules/bl/test/test.js

@@ -265,6 +265,7 @@ tape('test readUInt8 / readInt8', function (t) {
   const buf3 = Buffer.alloc(3)
   const bl = new BufferList()
 
+  buf1[0] = 0x1
   buf2[1] = 0x3
   buf2[2] = 0x4
   buf3[0] = 0x23
@@ -274,6 +275,7 @@ tape('test readUInt8 / readInt8', function (t) {
   bl.append(buf2)
   bl.append(buf3)
 
+  t.equal(bl.readUInt8(), 0x1)
   t.equal(bl.readUInt8(2), 0x3)
   t.equal(bl.readInt8(2), 0x3)
   t.equal(bl.readUInt8(3), 0x4)
@@ -292,6 +294,7 @@ tape('test readUInt16LE / readUInt16BE / readInt16LE / readInt16BE', function (t
   const buf3 = Buffer.alloc(3)
   const bl = new BufferList()
 
+  buf1[0] = 0x1
   buf2[1] = 0x3
   buf2[2] = 0x4
   buf3[0] = 0x23
@@ -301,6 +304,8 @@ tape('test readUInt16LE / readUInt16BE / readInt16LE / readInt16BE', function (t
   bl.append(buf2)
   bl.append(buf3)
 
+  t.equal(bl.readUInt16BE(), 0x0100)
+  t.equal(bl.readUInt16LE(), 0x0001)
   t.equal(bl.readUInt16BE(2), 0x0304)
   t.equal(bl.readUInt16LE(2), 0x0403)
   t.equal(bl.readInt16BE(2), 0x0304)
@@ -323,6 +328,7 @@ tape('test readUInt32LE / readUInt32BE / readInt32LE / readInt32BE', function (t
   const buf3 = Buffer.alloc(3)
   const bl = new BufferList()
 
+  buf1[0] = 0x1
   buf2[1] = 0x3
   buf2[2] = 0x4
   buf3[0] = 0x23
@@ -332,6 +338,8 @@ tape('test readUInt32LE / readUInt32BE / readInt32LE / readInt32BE', function (t
   bl.append(buf2)
   bl.append(buf3)
 
+  t.equal(bl.readUInt32BE(), 0x01000304)
+  t.equal(bl.readUInt32LE(), 0x04030001)
   t.equal(bl.readUInt32BE(2), 0x03042342)
   t.equal(bl.readUInt32LE(2), 0x42230403)
   t.equal(bl.readInt32BE(2), 0x03042342)
@@ -391,6 +399,7 @@ tape('test readFloatLE / readFloatBE', function (t) {
   const buf3 = Buffer.alloc(3)
   const bl = new BufferList()
 
+  buf1[0] = 0x01
   buf2[1] = 0x00
   buf2[2] = 0x00
   buf3[0] = 0x80
@@ -400,7 +409,11 @@ tape('test readFloatLE / readFloatBE', function (t) {
   bl.append(buf2)
   bl.append(buf3)
 
-  t.equal(bl.readFloatLE(2), 0x01)
+  const canonical = Buffer.concat([buf1, buf2, buf3])
+  t.equal(bl.readFloatLE(), canonical.readFloatLE())
+  t.equal(bl.readFloatBE(), canonical.readFloatBE())
+  t.equal(bl.readFloatLE(2), canonical.readFloatLE(2))
+  t.equal(bl.readFloatBE(2), canonical.readFloatBE(2))
 
   t.end()
 })
@@ -411,6 +424,7 @@ tape('test readDoubleLE / readDoubleBE', function (t) {
   const buf3 = Buffer.alloc(10)
   const bl = new BufferList()
 
+  buf1[0] = 0x01
   buf2[1] = 0x55
   buf2[2] = 0x55
   buf3[0] = 0x55
@@ -424,7 +438,11 @@ tape('test readDoubleLE / readDoubleBE', function (t) {
   bl.append(buf2)
   bl.append(buf3)
 
-  t.equal(bl.readDoubleLE(2), 0.3333333333333333)
+  const canonical = Buffer.concat([buf1, buf2, buf3])
+  t.equal(bl.readDoubleBE(), canonical.readDoubleBE())
+  t.equal(bl.readDoubleLE(), canonical.readDoubleLE())
+  t.equal(bl.readDoubleBE(2), canonical.readDoubleBE(2))
+  t.equal(bl.readDoubleLE(2), canonical.readDoubleLE(2))
 
   t.end()
 })

package/node_modules/wide-align/package.json

@@ -1,31 +1,32 @@
 {
+  "//": "But not version 5 of string-width, as that's ESM only",
   "_args": [
     [
-      "wide-align@1.1.3",
+      "wide-align@1.1.5",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "wide-align@1.1.3",
-  "_id": "wide-align@1.1.3",
+  "_from": "wide-align@1.1.5",
+  "_id": "wide-align@1.1.5",
   "_inBundle": false,
-  "_integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+  "_integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
   "_location": "/wide-align",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "wide-align@1.1.3",
+    "raw": "wide-align@1.1.5",
     "name": "wide-align",
     "escapedName": "wide-align",
-    "rawSpec": "1.1.3",
+    "rawSpec": "1.1.5",
     "saveSpec": null,
-    "fetchSpec": "1.1.3"
+    "fetchSpec": "1.1.5"
   },
   "_requiredBy": [
     "/npmlog/gauge"
   ],
-  "_resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-  "_spec": "1.1.3",
+  "_resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+  "_spec": "1.1.5",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "author": {
     "name": "Rebecca Turner",
@@ -36,11 +37,11 @@
     "url": "https://github.com/iarna/wide-align/issues"
   },
   "dependencies": {
-    "string-width": "^1.0.2 || 2"
+    "string-width": "^1.0.2 || 2 || 3 || 4"
   },
   "description": "A wide-character aware text alignment function for use on the console or with fixed width fonts.",
   "devDependencies": {
-    "tap": "10 || 11 || 12"
+    "tap": "*"
   },
   "files": [
     "align.js"
@@ -62,8 +63,7 @@
     "url": "git+https://github.com/iarna/wide-align.git"
   },
   "scripts": {
-    "test": "tap --coverage test/*.js",
-    "version": "perl -pi -e 's/^(  \"version\": $ENV{npm_config_node_version}\").*?\",/$1abc\",/' package-lock.json ; git add package-lock.json"
+    "test": "tap --coverage test/*.js"
   },
-  "version": "1.1.3"
+  "version": "1.1.5"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-datachannel",
-  "version": "0.2.4",
+  "version": "0.3.2",
   "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/**/*",
     "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),
@@ -54,27 +56,27 @@ 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)
         {
-            std::cout << std::string("libdatachannel error while closing dataChannel# ") + ex.what() << std::endl;
+            std::cerr << std::string("libdatachannel error while closing data channel: ") + ex.what() << std::endl;
             return;
         }
     }
+
+    mOnOpenCallback.reset();
+    mOnClosedCallback.reset();
+    mOnErrorCallback.reset();
+    mOnBufferedAmountLowCallback.reset();
+    mOnMessageCallback.reset();
+
+    instances.erase(this);
 }
 
 void DataChannelWrapper::close(const Napi::CallbackInfo &info)
@@ -86,18 +88,40 @@ Napi::Value DataChannelWrapper::getLabel(const Napi::CallbackInfo &info)
 {
     if (!mDataChannelPtr)
     {
-        Napi::Error::New(info.Env(), "It seems data-channel is destroyed!").ThrowAsJavaScriptException();
+        Napi::Error::New(info.Env(), "getLabel() called on destroyed channel").ThrowAsJavaScriptException();
         return info.Env().Null();
     }
 
     return Napi::String::New(info.Env(), mDataChannelPtr->label());
 }
 
+Napi::Value DataChannelWrapper::getId(const Napi::CallbackInfo &info)
+{
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "getId() called on destroyed channel").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(), "getProtocol() called on destroyed channel").ThrowAsJavaScriptException();
+        return info.Env().Null();
+    }
+
+    return Napi::String::New(info.Env(), mDataChannelPtr->protocol());
+}
+
 Napi::Value DataChannelWrapper::sendMessage(const Napi::CallbackInfo &info)
 {
     if (!mDataChannelPtr)
     {
-        Napi::Error::New(info.Env(), "It seems data-channel is destroyed!").ThrowAsJavaScriptException();
+        Napi::Error::New(info.Env(), "sendMessage() called on destroyed channel").ThrowAsJavaScriptException();
         return info.Env().Null();
     }
 
@@ -117,7 +141,7 @@ Napi::Value DataChannelWrapper::sendMessage(const Napi::CallbackInfo &info)
     }
     catch (std::exception &ex)
     {
-        Napi::Error::New(env, std::string("libdatachannel error while sending dataChannel msg# ") + ex.what()).ThrowAsJavaScriptException();
+        Napi::Error::New(env, std::string("libdatachannel error while sending data channel message: ") + ex.what()).ThrowAsJavaScriptException();
         return Napi::Boolean::New(info.Env(), false);
     }
 }
@@ -126,7 +150,7 @@ Napi::Value DataChannelWrapper::sendMessageBinary(const Napi::CallbackInfo &info
 {
     if (!mDataChannelPtr)
     {
-        Napi::Error::New(info.Env(), "It seems data-channel is destroyed!").ThrowAsJavaScriptException();
+        Napi::Error::New(info.Env(), "sendMessagBinary() called on destroyed channel").ThrowAsJavaScriptException();
         return info.Env().Null();
     }
 
@@ -146,7 +170,7 @@ Napi::Value DataChannelWrapper::sendMessageBinary(const Napi::CallbackInfo &info
     }
     catch (std::exception &ex)
     {
-        Napi::Error::New(env, std::string("libdatachannel error while sending dataChannel msg# ") + ex.what()).ThrowAsJavaScriptException();
+        Napi::Error::New(env, std::string("libdatachannel error while sending data channel message: ") + ex.what()).ThrowAsJavaScriptException();
         return Napi::Boolean::New(info.Env(), false);
     }
 }
@@ -154,6 +178,7 @@ Napi::Value DataChannelWrapper::sendMessageBinary(const Napi::CallbackInfo &info
 Napi::Value DataChannelWrapper::isOpen(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
+
     if (!mDataChannelPtr)
     {
         return Napi::Boolean::New(info.Env(), false);
@@ -165,7 +190,7 @@ Napi::Value DataChannelWrapper::isOpen(const Napi::CallbackInfo &info)
     }
     catch (std::exception &ex)
     {
-        Napi::Error::New(env, std::string("libdatachannel error# ") + ex.what()).ThrowAsJavaScriptException();
+        Napi::Error::New(env, std::string("libdatachannel error: ") + ex.what()).ThrowAsJavaScriptException();
         return Napi::Boolean::New(info.Env(), false);
     }
 }
@@ -173,6 +198,7 @@ Napi::Value DataChannelWrapper::isOpen(const Napi::CallbackInfo &info)
 Napi::Value DataChannelWrapper::bufferedAmount(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
+
     if (!mDataChannelPtr)
     {
         return Napi::Number::New(info.Env(), 0);
@@ -184,7 +210,7 @@ Napi::Value DataChannelWrapper::bufferedAmount(const Napi::CallbackInfo &info)
     }
     catch (std::exception &ex)
     {
-        Napi::Error::New(env, std::string("libdatachannel error# ") + ex.what()).ThrowAsJavaScriptException();
+        Napi::Error::New(env, std::string("libdatachannel error: ") + ex.what()).ThrowAsJavaScriptException();
         return Napi::Number::New(info.Env(), 0);
     }
 }
@@ -192,6 +218,7 @@ Napi::Value DataChannelWrapper::bufferedAmount(const Napi::CallbackInfo &info)
 Napi::Value DataChannelWrapper::maxMessageSize(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
+
     if (!mDataChannelPtr)
     {
         return Napi::Number::New(info.Env(), 0);
@@ -203,7 +230,7 @@ Napi::Value DataChannelWrapper::maxMessageSize(const Napi::CallbackInfo &info)
     }
     catch (std::exception &ex)
     {
-        Napi::Error::New(env, std::string("libdatachannel error# ") + ex.what()).ThrowAsJavaScriptException();
+        Napi::Error::New(env, std::string("libdatachannel error: ") + ex.what()).ThrowAsJavaScriptException();
         return Napi::Number::New(info.Env(), 0);
     }
 }
@@ -212,7 +239,7 @@ void DataChannelWrapper::setBufferedAmountLowThreshold(const Napi::CallbackInfo
 {
     if (!mDataChannelPtr)
     {
-        Napi::Error::New(info.Env(), "It seems data-channel is destroyed!").ThrowAsJavaScriptException();
+        Napi::Error::New(info.Env(), "setBufferedAmountLowThreshold() called on destroyed channel").ThrowAsJavaScriptException();
         return;
     }
 
@@ -231,13 +258,19 @@ void DataChannelWrapper::setBufferedAmountLowThreshold(const Napi::CallbackInfo
     }
     catch (std::exception &ex)
     {
-        Napi::Error::New(env, std::string("libdatachannel error# ") + ex.what()).ThrowAsJavaScriptException();
+        Napi::Error::New(env, std::string("libdatachannel error: ") + ex.what()).ThrowAsJavaScriptException();
         return;
     }
 }
 
 void DataChannelWrapper::onOpen(const Napi::CallbackInfo &info)
 {
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "onOpen() called on destroyed channel").ThrowAsJavaScriptException();
+        return;
+    }
+
     Napi::Env env = info.Env();
     int length = info.Length();
 
@@ -250,11 +283,10 @@ void DataChannelWrapper::onOpen(const Napi::CallbackInfo &info)
     // Callback
     mOnOpenCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    mDataChannelPtr->onOpen([&]()
-                            {
+    mDataChannelPtr->onOpen([&]() {
         if (mOnOpenCallback)
             mOnOpenCallback->call([this](Napi::Env env, std::vector<napi_value> &args) {
-                // Check the peer connection is not closed
+                // Check the data channel is not closed
                 if(instances.find(this) == instances.end())
                     throw ThreadSafeCallback::CancelException();
 
@@ -266,6 +298,12 @@ void DataChannelWrapper::onOpen(const Napi::CallbackInfo &info)
 
 void DataChannelWrapper::onClosed(const Napi::CallbackInfo &info)
 {
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "onClosed() called on destroyed channel").ThrowAsJavaScriptException();
+        return;
+    }
+
     Napi::Env env = info.Env();
     int length = info.Length();
 
@@ -278,13 +316,10 @@ void DataChannelWrapper::onClosed(const Napi::CallbackInfo &info)
     // Callback
     mOnClosedCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    mDataChannelPtr->onClosed([&]()
-                              {
+    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();
+                // Do not check if the data channel has been closed here
 
                 // This will run in main thread and needs to construct the
                 // arguments for the call
@@ -294,6 +329,12 @@ void DataChannelWrapper::onClosed(const Napi::CallbackInfo &info)
 
 void DataChannelWrapper::onError(const Napi::CallbackInfo &info)
 {
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "onError() called on destroyed channel").ThrowAsJavaScriptException();
+        return;
+    }
+
     Napi::Env env = info.Env();
     int length = info.Length();
 
@@ -306,11 +347,10 @@ void DataChannelWrapper::onError(const Napi::CallbackInfo &info)
     // Callback
     mOnErrorCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    mDataChannelPtr->onError([&](const std::string &error)
-                             {
+    mDataChannelPtr->onError([&](std::string error) {
         if (mOnErrorCallback)
-            mOnErrorCallback->call([this, error](Napi::Env env, std::vector<napi_value> &args) {
-                // Check the peer connection is not closed
+            mOnErrorCallback->call([this, error = std::move(error)](Napi::Env env, std::vector<napi_value> &args) {
+                // Check the data channel is not closed
                 if(instances.find(this) == instances.end())
                     throw ThreadSafeCallback::CancelException();
 
@@ -322,6 +362,12 @@ void DataChannelWrapper::onError(const Napi::CallbackInfo &info)
 
 void DataChannelWrapper::onBufferedAmountLow(const Napi::CallbackInfo &info)
 {
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "onBufferedAmountLow() called on destroyed channel").ThrowAsJavaScriptException();
+        return;
+    }
+
     Napi::Env env = info.Env();
     int length = info.Length();
 
@@ -334,11 +380,10 @@ void DataChannelWrapper::onBufferedAmountLow(const Napi::CallbackInfo &info)
     // Callback
     mOnBufferedAmountLowCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    mDataChannelPtr->onBufferedAmountLow([&]()
-                                         {
+    mDataChannelPtr->onBufferedAmountLow([&]() {
         if (mOnBufferedAmountLowCallback)
             mOnBufferedAmountLowCallback->call([this](Napi::Env env, std::vector<napi_value> &args) {
-                // Check the peer connection is not closed
+                // Check the data channel is not closed
                 if(instances.find(this) == instances.end())
                     throw ThreadSafeCallback::CancelException();
 
@@ -350,6 +395,12 @@ void DataChannelWrapper::onBufferedAmountLow(const Napi::CallbackInfo &info)
 
 void DataChannelWrapper::onMessage(const Napi::CallbackInfo &info)
 {
+    if (!mDataChannelPtr)
+    {
+        Napi::Error::New(info.Env(), "onMessage() called on destroyed channel").ThrowAsJavaScriptException();
+        return;
+    }
+
     Napi::Env env = info.Env();
     int length = info.Length();
 
@@ -362,24 +413,23 @@ void DataChannelWrapper::onMessage(const Napi::CallbackInfo &info)
     // Callback
     mOnMessageCallback = std::make_unique<ThreadSafeCallback>(info[0].As<Napi::Function>());
 
-    mDataChannelPtr->onMessage([&](const std::variant<rtc::binary, std::string> &message)
-                               {
+    mDataChannelPtr->onMessage([&](std::variant<rtc::binary, std::string> message) {
         if (mOnMessageCallback)
-            mOnMessageCallback->call([this, message](Napi::Env env, std::vector<napi_value> &args) {
-                // Check the peer connection is not closed
+            mOnMessageCallback->call([this, message = std::move(message)](Napi::Env env, std::vector<napi_value> &args) {
+                // Check the data channel 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
-                Napi::Object payload = Napi::Object::New(env);
                 if (std::holds_alternative<std::string>(message))
                 {
                     args = {Napi::String::New(env, std::get<std::string>(message))};
                 }
                 else
                 {
-                    args = {Napi::Buffer<std::byte>::Copy(env, std::get<rtc::binary>(message).data(), std::get<rtc::binary>(message).size())};
+                    auto bin = std::get<rtc::binary>(std::move(message));
+                    args = {Napi::Buffer<std::byte>::Copy(env, bin.data(), bin.size())};
                 }
             }); });
 }