node-datachannel 0.1.10 → 0.1.14-dev

package/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 cmake_policy(SET CMP0091 NEW)
-project(node_datachannel VERSION 0.1.10)
+project(node_datachannel VERSION 0.1.14)
 
 include_directories(${CMAKE_JS_INC})
 
@@ -27,9 +27,12 @@ include(FetchContent)
 FetchContent_Declare(
     libdatachannel
     GIT_REPOSITORY https://github.com/paullouisageneau/libdatachannel.git
-    GIT_TAG "v0.15.2"
+    GIT_TAG "v0.16.0"
 )
 
+option(NO_MEDIA "Disable media transport support in libdatachannel" ON)
+option(NO_WEBSOCKET "Disable WebSocket support in libdatachannel" ON)
+
 FetchContent_GetProperties(libdatachannel)
 if(NOT libdatachannel)
   FetchContent_Populate(libdatachannel)
@@ -41,6 +44,7 @@ add_library(${PROJECT_NAME} SHARED
     src/rtc-wrapper.cpp
     src/data-channel-wrapper.cpp
     src/peer-connection-wrapper.cpp
+    src/thread-safe-callback.cpp
     src/main.cpp
     ${CMAKE_JS_SRC}
 )
@@ -50,10 +54,16 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_SOURCE_DIR}/node_modules/node-addon-api
-    ${CMAKE_SOURCE_DIR}/node_modules/napi-thread-safe-callback
     ${CMAKE_BINARY_DIR}/_deps/libdatachannel-src/include
 )
 
+# For compatibility with Node.js 12
+# This should be removed along with the napi-thread-safe-callback-cancellable dependency when dropping support at end-of-life
+target_compile_definitions(${PROJECT_NAME} PRIVATE -DLEGACY_NAPI_THREAD_SAFE_CALLBACK)
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ${CMAKE_SOURCE_DIR}/node_modules/napi-thread-safe-callback-cancellable
+)
+
 set(LINK_LIBRARIES
     ${CMAKE_JS_LIB}
     datachannel-static

package/README.md

@@ -152,15 +152,10 @@ Prebuilt binaries are available (Node Version >= 10);
 > npm i
 ```
 
-Build with libnice support
-```sh
-> npm run install-nice
-```
-
 Other Options
 ```sh
-> npm run install -- -DUSE_GNUTLS=1   # Use GNU TLS instead of OpenSSL (Default False)
-> npm run install -- -DUSE_SRTP=1   # Enable SRTP for media support ( Default False)
+> npm run install -- -DUSE_GNUTLS=1  # Use GnuTLS instead of OpenSSL (Default False)
+> npm run install -- -DUSE_NICE=1    # Use libnice instead of libjuice (Default False)
 ```
 
 ### Test

package/node_modules/delegates/package.json

@@ -23,7 +23,6 @@
   },
   "_requiredBy": [
     "/are-we-there-yet",
-    "/cmake-js/are-we-there-yet",
     "/node-ninja/are-we-there-yet",
     "/npmlog/are-we-there-yet"
   ],

package/node_modules/has-unicode/package.json

@@ -22,7 +22,6 @@
     "fetchSpec": "2.0.1"
   },
   "_requiredBy": [
-    "/cmake-js/gauge",
     "/gauge",
     "/npmlog/gauge"
   ],

package/node_modules/ini/ini.js

@@ -15,7 +15,7 @@ function encode (obj, opt) {
   if (typeof opt === 'string') {
     opt = {
       section: opt,
-      whitespace: false
+      whitespace: false,
     }
   } else {
     opt = opt || {}
@@ -30,27 +30,25 @@ function encode (obj, opt) {
       val.forEach(function (item) {
         out += safe(k + '[]') + separator + safe(item) + '\n'
       })
-    } else if (val && typeof val === 'object') {
+    } else if (val && typeof val === 'object')
       children.push(k)
-    } else {
+    else
       out += safe(k) + separator + safe(val) + eol
-    }
   })
 
-  if (opt.section && out.length) {
+  if (opt.section && out.length)
     out = '[' + safe(opt.section) + ']' + eol + out
-  }
 
   children.forEach(function (k, _, __) {
     var nk = dotSplit(k).join('\\.')
     var section = (opt.section ? opt.section + '.' : '') + nk
     var child = encode(obj[k], {
       section: section,
-      whitespace: opt.whitespace
+      whitespace: opt.whitespace,
     })
-    if (out.length && child.length) {
+    if (out.length && child.length)
       out += eol
-    }
+
     out += child
   })
 
@@ -62,7 +60,7 @@ function dotSplit (str) {
     .replace(/\\\./g, '\u0001')
     .split(/\./).map(function (part) {
       return part.replace(/\1/g, '\\.')
-      .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
+        .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
     })
 }
 
@@ -75,15 +73,25 @@ function decode (str) {
   var lines = str.split(/[\r\n]+/g)
 
   lines.forEach(function (line, _, __) {
-    if (!line || line.match(/^\s*[;#]/)) return
+    if (!line || line.match(/^\s*[;#]/))
+      return
     var match = line.match(re)
-    if (!match) return
+    if (!match)
+      return
     if (match[1] !== undefined) {
       section = unsafe(match[1])
+      if (section === '__proto__') {
+        // not allowed
+        // keep parsing the section, but don't attach it.
+        p = {}
+        return
+      }
       p = out[section] = out[section] || {}
       return
     }
     var key = unsafe(match[2])
+    if (key === '__proto__')
+      return
     var value = match[3] ? unsafe(match[4]) : true
     switch (value) {
       case 'true':
@@ -94,20 +102,20 @@ function decode (str) {
     // Convert keys with '[]' suffix to an array
     if (key.length > 2 && key.slice(-2) === '[]') {
       key = key.substring(0, key.length - 2)
-      if (!p[key]) {
+      if (key === '__proto__')
+        return
+      if (!p[key])
         p[key] = []
-      } else if (!Array.isArray(p[key])) {
+      else if (!Array.isArray(p[key]))
         p[key] = [p[key]]
-      }
     }
 
     // safeguard against resetting a previously defined
     // array by accidentally forgetting the brackets
-    if (Array.isArray(p[key])) {
+    if (Array.isArray(p[key]))
       p[key].push(value)
-    } else {
+    else
       p[key] = value
-    }
   })
 
   // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
@@ -115,9 +123,9 @@ function decode (str) {
   Object.keys(out).filter(function (k, _, __) {
     if (!out[k] ||
       typeof out[k] !== 'object' ||
-      Array.isArray(out[k])) {
+      Array.isArray(out[k]))
       return false
-    }
+
     // see if the parent section is also an object.
     // if so, add it to that, and mark this one for deletion
     var parts = dotSplit(k)
@@ -125,12 +133,15 @@ function decode (str) {
     var l = parts.pop()
     var nl = l.replace(/\\\./g, '.')
     parts.forEach(function (part, _, __) {
-      if (!p[part] || typeof p[part] !== 'object') p[part] = {}
+      if (part === '__proto__')
+        return
+      if (!p[part] || typeof p[part] !== 'object')
+        p[part] = {}
       p = p[part]
     })
-    if (p === out && nl === l) {
+    if (p === out && nl === l)
       return false
-    }
+
     p[nl] = out[k]
     return true
   }).forEach(function (del, _, __) {
@@ -152,18 +163,20 @@ function safe (val) {
     (val.length > 1 &&
      isQuoted(val)) ||
     val !== val.trim())
-      ? JSON.stringify(val)
-      : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
+    ? JSON.stringify(val)
+    : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
 }
 
 function unsafe (val, doUnesc) {
   val = (val || '').trim()
   if (isQuoted(val)) {
     // remove the single quotes before calling JSON.parse
-    if (val.charAt(0) === "'") {
+    if (val.charAt(0) === "'")
       val = val.substr(1, val.length - 2)
-    }
-    try { val = JSON.parse(val) } catch (_) {}
+
+    try {
+      val = JSON.parse(val)
+    } catch (_) {}
   } else {
     // walk the val to find the first not-escaped ; character
     var esc = false
@@ -171,23 +184,22 @@ function unsafe (val, doUnesc) {
     for (var i = 0, l = val.length; i < l; i++) {
       var c = val.charAt(i)
       if (esc) {
-        if ('\\;#'.indexOf(c) !== -1) {
+        if ('\\;#'.indexOf(c) !== -1)
           unesc += c
-        } else {
+        else
           unesc += '\\' + c
-        }
+
         esc = false
-      } else if (';#'.indexOf(c) !== -1) {
+      } else if (';#'.indexOf(c) !== -1)
         break
-      } else if (c === '\\') {
+      else if (c === '\\')
         esc = true
-      } else {
+      else
         unesc += c
-      }
     }
-    if (esc) {
+    if (esc)
       unesc += '\\'
-    }
+
     return unesc.trim()
   }
   return val

package/node_modules/ini/package.json

@@ -1,31 +1,31 @@
 {
   "_args": [
     [
-      "ini@1.3.5",
+      "ini@1.3.8",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "ini@1.3.5",
-  "_id": "ini@1.3.5",
+  "_from": "ini@1.3.8",
+  "_id": "ini@1.3.8",
   "_inBundle": false,
-  "_integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+  "_integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
   "_location": "/ini",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "ini@1.3.5",
+    "raw": "ini@1.3.8",
     "name": "ini",
     "escapedName": "ini",
-    "rawSpec": "1.3.5",
+    "rawSpec": "1.3.8",
     "saveSpec": null,
-    "fetchSpec": "1.3.5"
+    "fetchSpec": "1.3.8"
   },
   "_requiredBy": [
     "/rc"
   ],
-  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-  "_spec": "1.3.5",
+  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+  "_spec": "1.3.8",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "author": {
     "name": "Isaac Z. Schlueter",
@@ -35,14 +35,14 @@
   "bugs": {
     "url": "https://github.com/isaacs/ini/issues"
   },
-  "dependencies": {},
   "description": "An ini encoder/decoder for node",
   "devDependencies": {
-    "standard": "^10.0.3",
-    "tap": "^10.7.3 || 11"
-  },
-  "engines": {
-    "node": "*"
+    "eslint": "^7.9.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "tap": "14"
   },
   "files": [
     "ini.js"
@@ -56,11 +56,14 @@
     "url": "git://github.com/isaacs/ini.git"
   },
   "scripts": {
-    "postpublish": "git push origin --all; git push origin --tags",
+    "eslint": "eslint",
+    "lint": "npm run eslint -- ini.js test/*.js",
+    "lintfix": "npm run lint -- --fix",
+    "posttest": "npm run lint",
     "postversion": "npm publish",
-    "pretest": "standard ini.js",
+    "prepublishOnly": "git push origin --follow-tags",
     "preversion": "npm test",
-    "test": "tap test/*.js --100 -J"
+    "test": "tap"
   },
-  "version": "1.3.5"
+  "version": "1.3.8"
 }

package/node_modules/node-abi/.github/workflows/update-abi.yml

@@ -1,7 +1,7 @@
 name: Auto-update ABI JSON file
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 * * * *'
 jobs:
   autoupdate:
     runs-on: ubuntu-latest

package/node_modules/node-abi/.travis.yml

@@ -5,13 +5,11 @@ cache:
 notifications:
   email: false
 node_js:
+  - '14'
+  - '12'
   - '10'
   - '9'
   - '8'
-  - '6'
-  - '4'
-  - '0.12'
-  - '0.10'
 after_success:
   - npm run travis-deploy-once "npm run semantic-release"
 branches:

package/node_modules/node-abi/README.md

@@ -47,4 +47,4 @@ nodeAbi.futureTargets
 
 - https://github.com/lgeiger/electron-abi
 - https://nodejs.org/en/download/releases/
-- https://github.com/nodejs/LTS
+- https://github.com/nodejs/Release

package/node_modules/node-abi/abi_registry.json

@@ -40,6 +40,16 @@
     "future": false,
     "abi": "88"
   },
+  {
+    "runtime": "node",
+    "target": "16.0.0",
+    "lts": [
+      "2021-10-26",
+      "2022-10-18"
+    ],
+    "future": false,
+    "abi": "93"
+  },
   {
     "abi": "70",
     "future": false,
@@ -68,6 +78,13 @@
     "runtime": "electron",
     "target": "8.0.0-beta.1"
   },
+  {
+    "abi": "76",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "9.0.0-beta.1"
+  },
   {
     "abi": "80",
     "future": false,
@@ -82,6 +99,13 @@
     "runtime": "electron",
     "target": "10.0.0-beta.1"
   },
+  {
+    "abi": "82",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "11.0.0-beta.1"
+  },
   {
     "abi": "85",
     "future": false,
@@ -91,9 +115,30 @@
   },
   {
     "abi": "87",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "12.0.0-beta.1"
+  },
+  {
+    "abi": "89",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "14.0.0-beta.1"
+  },
+  {
+    "abi": "89",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "13.0.0-beta.2"
+  },
+  {
+    "abi": "89",
     "future": true,
     "lts": false,
     "runtime": "electron",
-    "target": "12.0.0-nightly.20201013"
+    "target": "15.0.0-alpha.1"
   }
 ]

package/node_modules/node-abi/index.js

@@ -4,7 +4,13 @@ function getNextTarget (runtime, targets) {
   if (targets == null) targets = allTargets
   var latest = targets.filter(function (t) { return t.runtime === runtime }).slice(-1)[0]
   var increment = runtime === 'electron' ? 'minor' : 'major'
-  return semver.inc(latest.target, increment)
+  var next = semver.inc(latest.target, increment)
+  // Electron releases appear in the registry in their beta form, sometimes there is
+  // no active beta line.  During this time we need to double bump
+  if (runtime === 'electron' && semver.parse(latest.target).prerelease.length) {
+    next = semver.inc(next, 'major')
+  }
+  return next
 }
 
 function getAbi (target, runtime) {

package/node_modules/node-abi/package.json

@@ -1,32 +1,31 @@
 {
   "_args": [
     [
-      "node-abi@2.19.3",
+      "node-abi@2.30.1",
       "/home/runner/work/node-datachannel/node-datachannel"
     ]
   ],
-  "_from": "node-abi@2.19.3",
-  "_id": "node-abi@2.19.3",
+  "_from": "node-abi@2.30.1",
+  "_id": "node-abi@2.30.1",
   "_inBundle": false,
-  "_integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
+  "_integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
   "_location": "/node-abi",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "node-abi@2.19.3",
+    "raw": "node-abi@2.30.1",
     "name": "node-abi",
     "escapedName": "node-abi",
-    "rawSpec": "2.19.3",
+    "rawSpec": "2.30.1",
     "saveSpec": null,
-    "fetchSpec": "2.19.3"
+    "fetchSpec": "2.30.1"
   },
   "_requiredBy": [
-    "/prebuild",
     "/prebuild-install"
   ],
-  "_resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
-  "_spec": "2.19.3",
+  "_resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
+  "_spec": "2.30.1",
   "_where": "/home/runner/work/node-datachannel/node-datachannel",
   "author": {
     "name": "Lukas Geiger"
@@ -65,5 +64,5 @@
     "travis-deploy-once": "travis-deploy-once",
     "update-abi-registry": "node --unhandled-rejections=strict scripts/update-abi-registry.js"
   },
-  "version": "2.19.3"
+  "version": "2.30.1"
 }

package/node_modules/node-abi/scripts/update-abi-registry.js

@@ -9,7 +9,8 @@ async function getJSONFromCDN (urlPath) {
 }
 
 async function fetchElectronReleases () {
-  return (await getJSONFromCDN('electron/releases/lite.json'))
+  const response = await got(`https://electronjs.org/headers/index.json`)
+  return JSON.parse(response.body)
 }
 
 async function fetchNodeVersions () {
@@ -42,22 +43,27 @@ async function fetchAbiVersions () {
 function electronReleasesToTargets (releases) {
   const versions = releases.map(({ version }) => version)
   const versionsByModules = releases
-    .filter(release => release.deps && Number(release.deps.modules) >= 70)
-    .map(({ version, deps: { modules } }) => ({
+    .filter(release => Number(release.modules) >= 70)
+    .map(({ version, modules }) => ({
       version,
       modules,
     }))
+    .filter(({ version }) => !version.includes('nightly'))
+    .sort((a, b) => Number(a.modules) - Number(b.modules))
     .reduce(
       (acc, { modules, version }) => ({
         ...acc,
-        [modules]: version,
+        [`${version.split('.')[0]}-${modules}`]: {
+          version,
+          modules,
+        }
       }),
       {}
     )
 
     return Object.entries(versionsByModules)
       .map(
-        ([modules, version]) => ({
+        ([major, {version, modules}]) => ({
           abi: modules,
           future: !versions.find(
             v => {

package/node_modules/prebuild-install/CHANGELOG.md

@@ -1,7 +1,81 @@
 # Changelog
 
-## 5.3.6 - 2020-10-20
+## [6.1.4] - 2021-08-11
+
+### Fixed
+
+- Move auth token to header instead of query param ([#160](https://github.com/prebuild/prebuild-install/issues/160)) ([`b3fad76`](https://github.com/prebuild/prebuild-install/commit/b3fad76)) (nicolai-nordic)
+- Remove `_` prefix as it isn't allowed by npm config ([#153](https://github.com/prebuild/prebuild-install/issues/153)) ([`a964e5b`](https://github.com/prebuild/prebuild-install/commit/a964e5b)) (Tom Boothman)
+- Make `rc.path` absolute ([#158](https://github.com/prebuild/prebuild-install/issues/158)) ([`57bcc06`](https://github.com/prebuild/prebuild-install/commit/57bcc06)) (George Waters).
+
+## [6.1.3] - 2021-06-03
+
+### Changed
+
+- Inline no longer maintained `noop-logger` ([#155](https://github.com/prebuild/prebuild-install/issues/155)) ([`e08d75a`](https://github.com/prebuild/prebuild-install/commit/e08d75a)) (Alexandru Dima)
+- Point users towards `prebuildify` in README ([#150](https://github.com/prebuild/prebuild-install/issues/150)) ([`5ee1a2f`](https://github.com/prebuild/prebuild-install/commit/5ee1a2f)) (Vincent Weevers)
+
+## [6.1.2] - 2021-04-24
+
+### Fixed
+
+- Support URL-safe strings in scoped packages ([#148](https://github.com/prebuild/prebuild-install/issues/148)) ([`db36c7a`](https://github.com/prebuild/prebuild-install/commit/db36c7a)) (Marco)
+
+## [6.1.1] - 2021-04-04
+
+### Fixed
+
+- Support `force` & `buildFromSource` options in yarn ([#140](https://github.com/prebuild/prebuild-install/issues/140)) ([`8cb1ced`](https://github.com/prebuild/prebuild-install/commit/8cb1ced)) (João Moreno)
+- Bump `node-abi` to prevent dedupe (closes [#135](https://github.com/prebuild/prebuild-install/issues/135)) ([`2950fb2`](https://github.com/prebuild/prebuild-install/commit/2950fb2)) (Vincent Weevers)
+
+## [6.1.0] - 2021-04-03
+
+### Added
+
+- Restore local prebuilds feature ([#137](https://github.com/prebuild/prebuild-install/issues/137)) ([`dc4e5ea`](https://github.com/prebuild/prebuild-install/commit/dc4e5ea)) (Wes Roberts). Previously removed in [#81](https://github.com/prebuild/prebuild-install/issues/81) / [`a069253`](https://github.com/prebuild/prebuild-install/commit/a06925378d38ca821bfa93aa4c1fdedc253b2420).
+
+## [6.0.1] - 2021-02-14
+
+### Fixed
+
+- Fixes empty `--tag-prefix` ([#143](https://github.com/prebuild/prebuild-install/issues/143)) ([**@mathiask88**](https://github.com/mathiask88))
+
+## [6.0.0] - 2020-10-23
+
+### Changed
+
+- **Breaking:** don't skip downloads in standalone mode ([`b6f3b36`](https://github.com/prebuild/prebuild-install/commit/b6f3b36)) ([**@vweevers**](https://github.com/vweevers))
+
+### Added
+
+- Document cross platform options ([`e5c9a5a`](https://github.com/prebuild/prebuild-install/commit/e5c9a5a)) ([**@fishbone1**](https://github.com/fishbone1))
+
+### Removed
+
+- **Breaking:** remove `--compile` and `--prebuild` options ([`94f2492`](https://github.com/prebuild/prebuild-install/commit/94f2492)) ([**@vweevers**](https://github.com/vweevers))
+
+### Fixed
+
+- Support npm 7 ([`8acccac`](https://github.com/prebuild/prebuild-install/commit/8acccac), [`08eaf6d`](https://github.com/prebuild/prebuild-install/commit/08eaf6d), [`22175b8`](https://github.com/prebuild/prebuild-install/commit/22175b8)) ([**@vweevers**](https://github.com/vweevers))
+
+## [5.3.6] - 2020-10-20
 
 ### Changed
 
 - Replace `mkdirp` dependency with `mkdirp-classic` ([**@ralphtheninja**](https://github.com/ralphtheninja))
+
+[6.1.4]: https://github.com/prebuild/prebuild-install/compare/v6.1.3...v6.1.4
+
+[6.1.3]: https://github.com/prebuild/prebuild-install/compare/v6.1.2...v6.1.3
+
+[6.1.2]: https://github.com/prebuild/prebuild-install/compare/v6.1.1...v6.1.2
+
+[6.1.1]: https://github.com/prebuild/prebuild-install/compare/v6.1.0...v6.1.1
+
+[6.1.0]: https://github.com/prebuild/prebuild-install/compare/v6.0.1...v6.1.0
+
+[6.0.1]: https://github.com/prebuild/prebuild-install/compare/v6.0.0...v6.0.1
+
+[6.0.0]: https://github.com/prebuild/prebuild-install/compare/v5.3.6...v6.0.0
+
+[5.3.6]: https://github.com/prebuild/prebuild-install/releases/tag/v5.3.6