@lng2004/node-datachannel 0.32.3-20260815.2 → 0.32.3-20260815.4

package/CMakeLists.txt

@@ -14,7 +14,8 @@ add_definitions(-DNAPI_VERSION=8)
 include_directories(${CMAKE_JS_INC})
 
 if(WIN32)
-    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set(OPENSSL_MSVC_STATIC_RT TRUE)
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 endif()
 
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")
@@ -26,30 +27,8 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -frtti")
 endif()
 
-option(USE_MBEDTLS "Use Mbed TLS instead of OpenSSL" ON)
-option(USE_GNUTLS "Use GnuTLS instead of OpenSSL" OFF)
-
-if(USE_MBEDTLS AND USE_GNUTLS)
-    message(FATAL_ERROR "Both USE_MBEDTLS and USE_GNUTLS cannot be enabled at the same time")
-endif()
-
-set(NDC_MBEDTLS_INSTALL_DIR "${CMAKE_SOURCE_DIR}/deps/mbedtls/install" CACHE PATH "Path to manually built MbedTLS install prefix")
-
-if(DEFINED ENV{NDC_MBEDTLS_INSTALL_DIR} AND NOT "$ENV{NDC_MBEDTLS_INSTALL_DIR}" STREQUAL "")
-    set(NDC_MBEDTLS_INSTALL_DIR "$ENV{NDC_MBEDTLS_INSTALL_DIR}" CACHE PATH "Path to manually built MbedTLS install prefix" FORCE)
-endif()
-
-if(USE_MBEDTLS)
-    if(EXISTS "${NDC_MBEDTLS_INSTALL_DIR}")
-        list(PREPEND CMAKE_PREFIX_PATH "${NDC_MBEDTLS_INSTALL_DIR}")
-    else()
-        message(WARNING "MbedTLS install directory not found at ${NDC_MBEDTLS_INSTALL_DIR}. Run scripts/build-mbedtls.sh or scripts/build-mbedtls.ps1 first.")
-    endif()
-endif()
-
-# Forward crypto backend selection to libdatachannel.
-set(USE_MBEDTLS ${USE_MBEDTLS} CACHE BOOL "Use Mbed TLS instead of OpenSSL" FORCE)
-set(USE_GNUTLS ${USE_GNUTLS} CACHE BOOL "Use GnuTLS instead of OpenSSL" FORCE)
+set(OPENSSL_USE_STATIC_LIBS TRUE)
+find_package(OpenSSL REQUIRED)
 
 include(FetchContent)
 
@@ -145,6 +124,7 @@ elseif(UNIX)
 endif()
 
 if(WIN32)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
     list(APPEND LINK_LIBRARIES crypt32.lib)
 endif()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lng2004/node-datachannel",
-  "version": "0.32.3-20260815.2",
+  "version": "0.32.3-20260815.4",
   "description": "WebRTC For Node.js and Electron. libdatachannel node bindings.",
   "main": "./dist/cjs/lib/index.cjs",
   "module": "./dist/esm/lib/index.mjs",
@@ -34,14 +34,13 @@
   },
   "scripts": {
     "install": "pkg-prebuilds-verify ./binding-options.js || (npm install --ignore-scripts --production=false && npm run compile)",
-    "rebuild": "pkg-prebuilds-verify ./binding-options.js || (npm run build:mbedtls && cmake-js rebuild)",
-    "install:nice": "npm run clean && npm install --ignore-scripts --production=false && npm run build:mbedtls && cmake-js configure --CDUSE_NICE=1 && cmake-js build",
+    "rebuild": "pkg-prebuilds-verify ./binding-options.js || cmake-js rebuild",
+    "install:nice": "npm run clean && npm install --ignore-scripts --production=false && cmake-js configure --CDUSE_NICE=1 && cmake-js build",
     "install:gnu": "npm run clean && npm install --ignore-scripts --production=false && cmake-js configure --CDUSE_GNUTLS=1 && cmake-js build",
-    "build:mbedtls": "node ./scripts/build-mbedtls.js",
     "build": "npm run compile && npm run build:tsc",
-    "compile": "npm run build:mbedtls && cmake-js build",
+    "compile": "cmake-js build",
     "build:debug": "npm run compile:debug && npm run build:tsc",
-    "compile:debug": "npm run build:mbedtls && cmake-js configure -D && cmake-js build -D",
+    "compile:debug": "cmake-js configure -D && cmake-js build -D",
     "build:tsc": "rimraf dist && rollup -c",
     "build:tsc:watch": "rollup -c -w",
     "clean": "rimraf dist build",
@@ -58,7 +57,6 @@
   "files": [
     "dist",
     "prebuilds",
-    "scripts",
     "binding-options.js",
     "src/cpp",
     "CMakeLists.txt",

package/scripts/build-mbedtls.js

@@ -1,28 +0,0 @@
-const { spawnSync } = require('node:child_process');
-const path = require('node:path');
-
-const rootDir = path.resolve(__dirname, '..');
-const shellScript = path.join(rootDir, 'scripts', 'build-mbedtls.sh');
-const psScript = path.join(rootDir, 'scripts', 'build-mbedtls.ps1');
-
-function run(command, args) {
-  const result = spawnSync(command, args, {
-    cwd: rootDir,
-    env: process.env,
-    stdio: 'inherit',
-  });
-
-  if (result.error) {
-    throw result.error;
-  }
-
-  if (typeof result.status === 'number' && result.status !== 0) {
-    process.exit(result.status);
-  }
-}
-
-if (process.platform === 'win32') {
-  run('powershell', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', psScript]);
-} else {
-  run('sh', [shellScript]);
-}

package/scripts/build-mbedtls.ps1

@@ -1,84 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-$RootDir = Resolve-Path (Join-Path $PSScriptRoot "..")
-$MbedTlsVersion = if ($env:MBEDTLS_VERSION) { $env:MBEDTLS_VERSION } else { "3.6.1" }
-$MbedTlsTag = "v$MbedTlsVersion"
-$MbedTlsRepo = "https://github.com/Mbed-TLS/mbedtls.git"
-
-$MbedTlsRoot = Join-Path $RootDir "deps/mbedtls"
-$MbedTlsSrc = Join-Path $MbedTlsRoot "src"
-$MbedTlsBuild = Join-Path $MbedTlsRoot "build"
-$MbedTlsInstall = if ($env:NDC_MBEDTLS_INSTALL_DIR) { $env:NDC_MBEDTLS_INSTALL_DIR } else { Join-Path $MbedTlsRoot "install" }
-$MbedTlsConfig = Join-Path $MbedTlsSrc "include/mbedtls/mbedtls_config.h"
-
-if (-not (Get-Command cmake -ErrorAction SilentlyContinue)) {
-  throw "cmake is required to build mbedtls"
-}
-
-if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
-  throw "git is required to build mbedtls"
-}
-
-New-Item -ItemType Directory -Force -Path $MbedTlsRoot | Out-Null
-
-if (-not (Test-Path (Join-Path $MbedTlsSrc ".git"))) {
-  if (Test-Path $MbedTlsSrc) {
-    Remove-Item -Recurse -Force $MbedTlsSrc
-  }
-  git clone --recursive --depth 1 --branch $MbedTlsTag $MbedTlsRepo $MbedTlsSrc
-} else {
-  git -C $MbedTlsSrc fetch --depth 1 origin $MbedTlsTag
-  git -C $MbedTlsSrc checkout --force $MbedTlsTag
-}
-
-if (Test-Path $MbedTlsConfig) {
-  $configText = Get-Content -Path $MbedTlsConfig -Raw
-  $updated = $configText -replace '(?m)^//\s*#define MBEDTLS_SSL_DTLS_SRTP', '#define MBEDTLS_SSL_DTLS_SRTP'
-  if ($updated -ne $configText) {
-    Set-Content -Path $MbedTlsConfig -Value $updated -NoNewline
-  }
-}
-
-if (Test-Path $MbedTlsBuild) {
-  Remove-Item -Recurse -Force $MbedTlsBuild
-}
-if (Test-Path $MbedTlsInstall) {
-  Remove-Item -Recurse -Force $MbedTlsInstall
-}
-
-$cmakeArgs = @(
-  "-S", $MbedTlsSrc,
-  "-B", $MbedTlsBuild,
-  "-DCMAKE_BUILD_TYPE=Release",
-  "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
-  "-DENABLE_PROGRAMS=OFF",
-  "-DENABLE_TESTING=OFF",
-  "-DUSE_STATIC_MBEDTLS_LIBRARY=ON",
-  "-DUSE_SHARED_MBEDTLS_LIBRARY=OFF",
-  "-DCMAKE_INSTALL_PREFIX=$MbedTlsInstall"
-)
-
-$cmakePlatform = $null
-if ($env:VSCMD_ARG_TGT_ARCH) {
-  switch ($env:VSCMD_ARG_TGT_ARCH.ToLowerInvariant()) {
-    "x86"   { $cmakePlatform = "Win32" }
-    "x64"   { $cmakePlatform = "x64" }
-    "arm"   { $cmakePlatform = "ARM" }
-    "arm64" { $cmakePlatform = "ARM64" }
-    default { Write-Warning "Unknown VSCMD_ARG_TGT_ARCH '$($env:VSCMD_ARG_TGT_ARCH)'; not setting CMake platform." }
-  }
-}
-
-if ($cmakePlatform) {
-  $cmakeArgs += "-A"
-  $cmakeArgs += $cmakePlatform
-}
-
-if ($env:NDC_MBEDTLS_CMAKE_ARGS) {
-  $cmakeArgs += $env:NDC_MBEDTLS_CMAKE_ARGS.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)
-}
-
-& cmake @cmakeArgs
-& cmake --build $MbedTlsBuild --config Release --target install --parallel
-
-Write-Host "Built mbedtls $MbedTlsVersion into $MbedTlsInstall"

package/scripts/build-mbedtls.sh

@@ -1,50 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
-MBEDTLS_VERSION="${MBEDTLS_VERSION:-3.6.1}"
-MBEDTLS_GIT_TAG="v${MBEDTLS_VERSION}"
-MBEDTLS_REPO_URL="https://github.com/Mbed-TLS/mbedtls.git"
-
-MBEDTLS_ROOT_DIR="${ROOT_DIR}/deps/mbedtls"
-MBEDTLS_SRC_DIR="${MBEDTLS_ROOT_DIR}/src"
-MBEDTLS_BUILD_DIR="${MBEDTLS_ROOT_DIR}/build"
-MBEDTLS_INSTALL_DIR="${NDC_MBEDTLS_INSTALL_DIR:-${MBEDTLS_ROOT_DIR}/install}"
-MBEDTLS_CONFIG_FILE="${MBEDTLS_SRC_DIR}/include/mbedtls/mbedtls_config.h"
-
-if ! command -v cmake >/dev/null 2>&1; then
-  echo "cmake is required to build mbedtls" >&2
-  exit 1
-fi
-
-if ! command -v git >/dev/null 2>&1; then
-  echo "git is required to build mbedtls" >&2
-  exit 1
-fi
-
-mkdir -p "${MBEDTLS_ROOT_DIR}"
-
-if [ ! -d "${MBEDTLS_SRC_DIR}/.git" ]; then
-  rm -rf "${MBEDTLS_SRC_DIR}"
-  git clone --recursive --depth 1 --branch "${MBEDTLS_GIT_TAG}" "${MBEDTLS_REPO_URL}" "${MBEDTLS_SRC_DIR}"
-else
-  git -C "${MBEDTLS_SRC_DIR}" fetch --depth 1 origin "${MBEDTLS_GIT_TAG}"
-  git -C "${MBEDTLS_SRC_DIR}" checkout --force "${MBEDTLS_GIT_TAG}"
-fi
-
-if [ -f "${MBEDTLS_CONFIG_FILE}" ] && grep -q '^//[[:space:]]*#define MBEDTLS_SSL_DTLS_SRTP' "${MBEDTLS_CONFIG_FILE}"; then
-  sed -i.bak 's|^//[[:space:]]*#define MBEDTLS_SSL_DTLS_SRTP|#define MBEDTLS_SSL_DTLS_SRTP|' "${MBEDTLS_CONFIG_FILE}"
-fi
-
-rm -rf "${MBEDTLS_BUILD_DIR}" "${MBEDTLS_INSTALL_DIR}"
-
-CMAKE_ARGS="-S ${MBEDTLS_SRC_DIR} -B ${MBEDTLS_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DCMAKE_INSTALL_PREFIX=${MBEDTLS_INSTALL_DIR}"
-
-if [ -n "${NDC_MBEDTLS_CMAKE_ARGS:-}" ]; then
-  CMAKE_ARGS="${CMAKE_ARGS} ${NDC_MBEDTLS_CMAKE_ARGS}"
-fi
-
-cmake ${CMAKE_ARGS}
-cmake --build "${MBEDTLS_BUILD_DIR}" --config Release --target install --parallel
-
-echo "Built mbedtls ${MBEDTLS_VERSION} into ${MBEDTLS_INSTALL_DIR}"