node-datachannel 0.9.1 → 0.10.0

package/lib/index.d.cts

@@ -63,7 +63,7 @@ export interface RtcConfig {
 }
 
 // Lowercase to match the description type string from libdatachannel
-export const enum DescriptionType {
+export enum DescriptionType {
     Unspec = 'unspec',
     Offer = 'offer',
     Answer = 'answer',
@@ -71,26 +71,13 @@ export const enum DescriptionType {
     Rollback = 'rollback',
 }
 
-export const enum ReliabilityType {
-    Reliable = 0,
-    Rexmit = 1,
-    Timed = 2,
-}
-
 export interface DataChannelInitConfig {
     protocol?: string;
     negotiated?: boolean;
     id?: number;
-    ordered?: boolean;
-    maxPacketLifeTime?: number;
-    maxRetransmits?: number;
-
-    // Deprecated, use ordered, maxPacketLifeTime, and maxRetransmits
-    reliability?: {
-        type?: ReliabilityType;
-        unordered?: boolean;
-        rexmit?: number;
-    };
+    unordered?: boolean; // Reliability
+    maxPacketLifeTime?: number; // Reliability
+    maxRetransmits?: number; // Reliability
 }
 
 export interface SelectedCandidateInfo {
@@ -113,8 +100,7 @@ export const enum Direction {
 }
 
 export class RtcpReceivingSession {
-    requestBitrate(bitRate: number): void;
-    requestKeyframe(): boolean;
+    //
 }
 
 export class Audio {

package/lib/index.d.ts

@@ -63,7 +63,7 @@ export interface RtcConfig {
 }
 
 // Lowercase to match the description type string from libdatachannel
-export const enum DescriptionType {
+export enum DescriptionType {
     Unspec = 'unspec',
     Offer = 'offer',
     Answer = 'answer',
@@ -71,26 +71,13 @@ export const enum DescriptionType {
     Rollback = 'rollback',
 }
 
-export const enum ReliabilityType {
-    Reliable = 0,
-    Rexmit = 1,
-    Timed = 2,
-}
-
 export interface DataChannelInitConfig {
     protocol?: string;
     negotiated?: boolean;
     id?: number;
-    ordered?: boolean;
-    maxPacketLifeTime?: number;
-    maxRetransmits?: number;
-
-    // Deprecated, use ordered, maxPacketLifeTime, and maxRetransmits
-    reliability?: {
-        type?: ReliabilityType;
-        unordered?: boolean;
-        rexmit?: number;
-    };
+    unordered?: boolean; // Reliability
+    maxPacketLifeTime?: number; // Reliability
+    maxRetransmits?: number; // Reliability
 }
 
 export interface SelectedCandidateInfo {
@@ -113,8 +100,7 @@ export const enum Direction {
 }
 
 export class RtcpReceivingSession {
-    requestBitrate(bitRate: number): void;
-    requestKeyframe(): boolean;
+    //
 }
 
 export class Audio {

package/lib/index.js

@@ -41,3 +41,11 @@ export default {
     ...nodeDataChannel,
     DataChannelStream,
 };
+
+export const DescriptionType = {
+    Unspec: 'unspec',
+    Offer: 'offer',
+    Answer: 'answer',
+    Pranswer: 'pranswer',
+    Rollback: 'rollback',
+};

package/package.json

@@ -1,27 +1,28 @@
 {
     "name": "node-datachannel",
-    "version": "0.9.1",
+    "version": "0.10.0",
     "description": "libdatachannel node bindings",
     "type": "module",
+    "types": "./lib/index.d.ts",
     "exports": {
         ".": {
             "import": {
-                "default": "./lib/index.js",
-                "types": "./lib/index.d.ts"
+                "types": "./lib/index.d.ts",
+                "default": "./lib/index.js"
             },
             "require": {
-                "default": "./lib/index.cjs",
-                "types": "./lib/index.d.cts"
+                "types": "./lib/index.d.cts",
+                "default": "./lib/index.cjs"
             }
         },
         "./polyfill": {
             "import": {
-                "default": "./polyfill/index.js",
-                "types": "./polyfill/index.d.ts"
+                "types": "./polyfill/index.d.ts",
+                "default": "./polyfill/index.js"
             },
             "require": {
-                "default": "./polyfill/index.cjs",
-                "types": "./polyfill/index.d.cts"
+                "types": "./polyfill/index.d.cts",
+                "default": "./polyfill/index.cjs"
             }
         }
     },

package/polyfill/RTCPeerConnection.js

@@ -4,11 +4,11 @@ import RTCDataChannel from './RTCDataChannel.js';
 import RTCIceCandidate from './RTCIceCandidate.js';
 import { RTCDataChannelEvent, RTCPeerConnectionIceEvent } from './Events.js';
 import RTCSctpTransport from './RTCSctpTransport.js';
-import DOMException from 'node-domexception';
+import 'node-domexception';
 
 export default class _RTCPeerConnection extends EventTarget {
     static async generateCertificate() {
-        throw new Error('Not implemented');
+        throw new DOMException('Not implemented');
     }
 
     #peerConnection;
@@ -192,10 +192,6 @@ export default class _RTCPeerConnection extends EventTarget {
         return this.#peerConnection.signalingState();
     }
 
-    static generateCertificate(keygenAlgorithm) {
-        throw new DOMException('Not implemented');
-    }
-
     async addIceCandidate(candidate) {
         if (candidate == null || candidate.candidate == null) {
             throw new DOMException('Candidate invalid');

package/polyfill/index.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var DOMException = require('node-domexception');
+var DOMException$1 = require('node-domexception');
 var module$1 = require('module');
 var stream = require('stream');
 
@@ -113,7 +113,7 @@ class _RTCDataChannel extends EventTarget {
 
     set binaryType(type) {
         if (type !== 'blob' && type !== 'arraybuffer') {
-            throw new DOMException(
+            throw new DOMException$1(
                 "Failed to set the 'binaryType' property on 'RTCDataChannel': Unknown binary type : " + type,
                 'TypeMismatchError',
             );
@@ -173,7 +173,7 @@ class _RTCDataChannel extends EventTarget {
 
     send(data) {
         if (this.#readyState !== 'open') {
-            throw new DOMException(
+            throw new DOMException$1(
                 "Failed to execute 'send' on 'RTCDataChannel': RTCDataChannel.readyState is not 'open'",
                 'InvalidStateError',
             );
@@ -223,7 +223,7 @@ class _RTCIceCandidate {
 
     constructor({ candidate, sdpMLineIndex, sdpMid, usernameFragment }) {
         if (candidate == null) {
-            throw new DOMException('candidate must be specified');
+            throw new DOMException$1('candidate must be specified');
         }
 
         this.#candidate = candidate;
@@ -676,7 +676,7 @@ class _RTCSctpTransport extends EventTarget {
 
 class _RTCPeerConnection extends EventTarget {
     static async generateCertificate() {
-        throw new Error('Not implemented');
+        throw new DOMException('Not implemented');
     }
 
     #peerConnection;
@@ -860,10 +860,6 @@ class _RTCPeerConnection extends EventTarget {
         return this.#peerConnection.signalingState();
     }
 
-    static generateCertificate(keygenAlgorithm) {
-        throw new DOMException('Not implemented');
-    }
-
     async addIceCandidate(candidate) {
         if (candidate == null || candidate.candidate == null) {
             throw new DOMException('Candidate invalid');

package/src/media-rtcpreceivingsession-wrapper.cpp

@@ -11,8 +11,7 @@ Napi::Object RtcpReceivingSessionWrapper::Init(Napi::Env env, Napi::Object expor
         env,
         "RtcpReceivingSession",
         {
-            Napi::ObjectWrap<RtcpReceivingSessionWrapper>::InstanceMethod("requestBitrate", &RtcpReceivingSessionWrapper::requestBitrate),
-            Napi::ObjectWrap<RtcpReceivingSessionWrapper>::InstanceMethod("requestKeyframe", &RtcpReceivingSessionWrapper::requestKeyframe),
+            // Instance Methods
         });
 
     constructor = Napi::Persistent(func);
@@ -39,24 +38,3 @@ std::shared_ptr<rtc::RtcpReceivingSession> RtcpReceivingSessionWrapper::getSessi
 {
     return mSessionPtr;
 }
-
-void RtcpReceivingSessionWrapper::requestBitrate(const Napi::CallbackInfo &info)
-{
-    Napi::Env env = info.Env();
-    int length = info.Length();
-
-    if (length < 1 || !info[0].IsNumber())
-    {
-        Napi::TypeError::New(env, "We expect (Number) as param").ThrowAsJavaScriptException();
-        return;
-    }
-
-    unsigned int bitrate = static_cast<uint32_t>(info[0].As<Napi::Number>().ToNumber());
-    mSessionPtr->requestBitrate(bitrate);
-}
-
-Napi::Value RtcpReceivingSessionWrapper::requestKeyframe(const Napi::CallbackInfo &info)
-{
-    Napi::Env env = info.Env();
-    return Napi::Boolean::New(env, mSessionPtr->requestKeyframe());
-}

package/src/media-rtcpreceivingsession-wrapper.h

@@ -22,15 +22,12 @@ public:
   std::shared_ptr<rtc::RtcpReceivingSession> getSessionInstance();
 
   // Functions
-  void requestBitrate(const Napi::CallbackInfo &info);
-  Napi::Value requestKeyframe(const Napi::CallbackInfo &info);
 
   // Callbacks
-  
 
 private:
-  static std::unordered_set<RtcpReceivingSessionWrapper*> instances;
+  static std::unordered_set<RtcpReceivingSessionWrapper *> instances;
   std::shared_ptr<rtc::RtcpReceivingSession> mSessionPtr = nullptr;
 };
 
-#endif // MEDIA_RTCPRECEIVINGSESSION_WRAPPER_H
+#endif // MEDIA_RTCPRECEIVINGSESSION_WRAPPER_H

package/src/peer-connection-wrapper.cpp

@@ -249,7 +249,7 @@ PeerConnectionWrapper::PeerConnectionWrapper(const Napi::CallbackInfo &info) : N
     PLOG_DEBUG << "Peer Connection created";
 
     // State change callback must be set to trigger cleanup on close
-    mOnStateChangeCallback = std::make_unique<ThreadSafeCallback>(Napi::Function::New(info.Env(), [](const Napi::CallbackInfo&){}));
+    mOnStateChangeCallback = std::make_unique<ThreadSafeCallback>(Napi::Function::New(info.Env(), [](const Napi::CallbackInfo &) {}));
 
     instances.insert(this);
 }
@@ -503,81 +503,17 @@ Napi::Value PeerConnectionWrapper::createDataChannel(const Napi::CallbackInfo &i
             init.id = uint16_t(initConfig.Get("id").As<Napi::Number>().Uint32Value());
         }
 
-        // Deprecated reliability object, kept for retro-compatibility
-        if (!initConfig.Get("reliability").IsUndefined())
+        // Reliability.unordered parameter
+        if (!initConfig.Get("unordered").IsUndefined())
         {
-            if (!initConfig.Get("reliability").IsObject())
+            if (!initConfig.Get("unordered").IsBoolean())
             {
-                Napi::TypeError::New(env, "Wrong DataChannel Init Config (reliability)").ThrowAsJavaScriptException();
+                Napi::TypeError::New(env, "Wrong DataChannel Init Config (unordered)").ThrowAsJavaScriptException();
                 return info.Env().Null();
             }
-
-            Napi::Object reliability = initConfig.Get("reliability").As<Napi::Object>();
-            if (!reliability.Get("type").IsUndefined())
-            {
-                if (!reliability.Get("type").IsNumber())
-                {
-                    Napi::TypeError::New(env, "Wrong Reliability Config (type)").ThrowAsJavaScriptException();
-                    return info.Env().Null();
-                }
-                switch (reliability.Get("type").As<Napi::Number>().Uint32Value())
-                {
-                case 0:
-                    init.reliability.type = rtc::Reliability::Type::Reliable;
-                    break;
-                case 1:
-                    init.reliability.type = rtc::Reliability::Type::Rexmit;
-                    break;
-                case 2:
-                    init.reliability.type = rtc::Reliability::Type::Timed;
-                    break;
-                default:
-                    Napi::TypeError::New(env, "Unknown DataChannel Reliability Type").ThrowAsJavaScriptException();
-                    return info.Env().Null();
-                }
-            }
-
-            if (!reliability.Get("unordered").IsUndefined())
-            {
-                if (!reliability.Get("unordered").IsBoolean())
-                {
-                    Napi::TypeError::New(env, "Wrong reliability Config (unordered)").ThrowAsJavaScriptException();
-                    return info.Env().Null();
-                }
-                init.reliability.unordered = reliability.Get("unordered").As<Napi::Boolean>();
-            }
-
-            if (!reliability.Get("rexmit").IsUndefined())
-            {
-                if (!reliability.Get("rexmit").IsNumber())
-                {
-                    Napi::TypeError::New(env, "Wrong Reliability Config (rexmit)").ThrowAsJavaScriptException();
-                    return info.Env().Null();
-                }
-                switch (reliability.Get("type").As<Napi::Number>().Uint32Value())
-                {
-                case 1:
-                    init.reliability.rexmit = int(reliability.Get("rexmit").As<Napi::Number>().ToNumber().Uint32Value());
-                    break;
-                case 2:
-                    init.reliability.rexmit = std::chrono::milliseconds(reliability.Get("rexmit").As<Napi::Number>().Int32Value());
-                    break;
-                }
-            }
+            init.reliability.unordered = !initConfig.Get("unordered").As<Napi::Boolean>();
         }
 
-        // Reliability parameters
-        if (!initConfig.Get("ordered").IsUndefined())
-        {
-            if (!initConfig.Get("ordered").IsBoolean())
-            {
-                Napi::TypeError::New(env, "Wrong DataChannel Init Config (ordered)").ThrowAsJavaScriptException();
-                return info.Env().Null();
-            }
-            init.reliability.unordered = !initConfig.Get("ordered").As<Napi::Boolean>();
-        }
-
-
         if (!initConfig.Get("maxPacketLifeTime").IsUndefined() && !initConfig.Get("maxPacketLifeTime").IsNull() &&
             !initConfig.Get("maxRetransmits").IsUndefined() && !initConfig.Get("maxRetransmits").IsNull())
         {

package/test/jest-tests/polyfill.test.js

@@ -0,0 +1,10 @@
+import { expect } from '@jest/globals';
+import polyfill from '../../polyfill/index.js';
+
+describe('polyfill', () => {
+    test('generateCertificate should throw', () => {
+        expect(async () => {
+            await polyfill.RTCPeerConnection.generateCertificate({});
+        }).rejects.toEqual(new DOMException('Not implemented'));
+    });
+});

package/cmake/toolchain/arm64.cmake

@@ -1,17 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(TOOLCHAIN_PREFIX aarch64-linux-gnu)
-
-# cross compilers to use for C and C++
-set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
-
-# Needed sysroot
-# https://github.com/webrtc-uwp/chromium-build/blob/master/linux/sysroot_scripts/sysroots.json
-set(CMAKE_SYSROOT "$ENV{ARM64_SYSROOT}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(CMAKE_C_FLAGS "-march=armv8-a -fPIC -Wno-error=format-truncation" CACHE STRING "Compiler Flags")
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "Compiler Flags")

package/cmake/toolchain/armv7.cmake

@@ -1,17 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(TOOLCHAIN_PREFIX arm-linux-gnueabihf)
-
-# cross compilers to use for C and C++
-set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
-
-# Needed sysroot
-# https://github.com/webrtc-uwp/chromium-build/blob/master/linux/sysroot_scripts/sysroots.json
-set(CMAKE_SYSROOT "$ENV{ARM_SYSROOT}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(CMAKE_C_FLAGS "-march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard -fPIC -Wno-error=format-truncation" CACHE STRING "Compiler Flags")
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "Compiler Flags")