Merge branch 'main' into td/unmodifiableMap

Author: cloudwebrtc

.github/workflows/publish.yaml

@@ -13,9 +13,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Publish
-        uses: sakebook/actions-flutter-pub-publisher@v1.3.1
+        uses: k-paxian/dart-package-publisher@v1.5.1
         with:
-          credential: ${{ secrets.CREDENTIAL_JSON }}
-          flutter_package: true
-          skip_test: true
-          dry_run: false
+          credentialJson: ${{ secrets.CREDENTIAL_JSON }}
+          flutter: true
+          skipTests: true
+          force: true

CHANGELOG.md

@@ -1,6 +1,34 @@
 # Changelog
 
 --------------------------------------------
+[1.4.2] - 2024-04-15
+
+* fix.
+
+[1.4.1] - 2024-04-12
+
+* remove RTCConfiguration convert.
+
+[1.4.0] - 2024-04-09
+
+* Fixed bug for RTCConfiguration convert.
+
+[1.3.3] - 2024-04-09
+
+* Fix DC data parse.
+
+[1.3.2] - 2024-04-09
+
+* Fix error when constructing RTCDataChannelInit.
+
+[1.3.1] - 2024-04-08
+
+* Add keyRingSize/discardFrameWhenCryptorNotReady to KeyProviderOptions.
+
+[1.3.0] - 2024-04-08
+
+* update to package:web by @jezell in #29.
+
 [1.2.1] - 2024-02-05
 
 * Downgrade some dependencies make more compatible.

lib/src/e2ee.worker/crypto.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
-import 'dart:html' as html;
 import 'dart:js_util' as jsutil;
 import 'dart:typed_data';
 
 import 'package:js/js.dart';
+import 'package:web/web.dart' as web;
 
 @JS('Promise')
 class Promise<T> {
@@ -18,14 +18,14 @@ class Algorithm {
 @JS('crypto.subtle.encrypt')
 external Promise<ByteBuffer> encrypt(
   dynamic algorithm,
-  html.CryptoKey key,
+  web.CryptoKey key,
   ByteBuffer data,
 );
 
 @JS('crypto.subtle.decrypt')
 external Promise<ByteBuffer> decrypt(
   dynamic algorithm,
-  html.CryptoKey key,
+  web.CryptoKey key,
   ByteBuffer data,
 );
 
@@ -52,7 +52,7 @@ ByteBuffer jsArrayBufferFrom(List<int> data) {
 }
 
 @JS('crypto.subtle.importKey')
-external Promise<html.CryptoKey> importKey(
+external Promise<web.CryptoKey> importKey(
   String format,
   ByteBuffer keyData,
   dynamic algorithm,
@@ -63,28 +63,28 @@ external Promise<html.CryptoKey> importKey(
 @JS('crypto.subtle.exportKey')
 external Promise<ByteBuffer> exportKey(
   String format,
-  html.CryptoKey key,
+  web.CryptoKey key,
 );
 
 @JS('crypto.subtle.deriveKey')
-external Promise<html.CryptoKey> deriveKey(
+external Promise<web.CryptoKey> deriveKey(
     dynamic algorithm,
-    html.CryptoKey baseKey,
+    web.CryptoKey baseKey,
     dynamic derivedKeyAlgorithm,
     bool extractable,
     List<String> keyUsages);
 
 @JS('crypto.subtle.deriveBits')
 external Promise<ByteBuffer> deriveBits(
   dynamic algorithm,
-  html.CryptoKey baseKey,
+  web.CryptoKey baseKey,
   int length,
 );
 
-Future<html.CryptoKey> impportKeyFromRawData(List<int> secretKeyData,
+Future<web.CryptoKey> impportKeyFromRawData(List<int> secretKeyData,
     {required String webCryptoAlgorithm,
     required List<String> keyUsages}) async {
-  return jsutil.promiseToFuture<html.CryptoKey>(importKey(
+  return jsutil.promiseToFuture<web.CryptoKey>(importKey(
     'raw',
     jsArrayBufferFrom(secretKeyData),
     jsutil.jsify({'name': webCryptoAlgorithm}),

lib/src/e2ee.worker/e2ee.cryptor.dart

@@ -1,11 +1,13 @@
 import 'dart:async';
-import 'dart:html';
 import 'dart:js';
+import 'dart:js_interop';
 import 'dart:js_util' as jsutil;
 import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:dart_webrtc/src/rtc_transform_stream.dart';
+import 'package:web/web.dart' as web;
+
 import 'crypto.dart' as crypto;
 import 'e2ee.keyhandler.dart';
 import 'e2ee.logger.dart';
@@ -136,7 +138,7 @@ class FrameCryptor {
   bool _enabled = false;
   CryptorError lastError = CryptorError.kNew;
   int currentKeyIndex = 0;
-  final DedicatedWorkerGlobalScope worker;
+  final web.DedicatedWorkerGlobalScope worker;
   SifGuard sifGuard = SifGuard();
 
   void setParticipant(String identity, ParticipantKeyHandler keys) {
@@ -219,7 +221,7 @@ class FrameCryptor {
   }
 
   void postMessage(Object message) {
-    worker.postMessage(message);
+    worker.postMessage(message.jsify());
   }
 
   Future<void> setupTransform({
@@ -299,6 +301,9 @@ class FrameCryptor {
     if (!enabled ||
         // skip for encryption for empty dtx frames
         buffer.isEmpty) {
+      if (keyOptions.discardFrameWhenCryptorNotReady) {
+        return;
+      }
       controller.enqueue(frame);
       return;
     }
@@ -403,6 +408,9 @@ class FrameCryptor {
         // skip for encryption for empty dtx frames
         buffer.isEmpty) {
       sifGuard.recordUserFrame();
+      if (keyOptions.discardFrameWhenCryptorNotReady) {
+        return;
+      }
       controller.enqueue(frame);
       return;
     }
@@ -480,7 +488,7 @@ class FrameCryptor {
           ));
 
           if (currentkeySet != initialKeySet) {
-            logger.warning(
+            logger.fine(
                 'ratchetKey: decryption ok, reset state to kKeyRatcheted');
             await keyHandler.setKeySetFromMaterial(
                 currentkeySet, initialKeyIndex);

lib/src/e2ee.worker/e2ee.keyhandler.dart

@@ -1,25 +1,32 @@
 import 'dart:async';
-import 'dart:html';
 import 'dart:js_util' as jsutil;
 import 'dart:typed_data';
 
+import 'package:web/web.dart' as web;
+
 import 'crypto.dart' as crypto;
 import 'e2ee.logger.dart';
 import 'e2ee.utils.dart';
 
+const KEYRING_SIZE = 16;
+
 class KeyOptions {
   KeyOptions({
     required this.sharedKey,
     required this.ratchetSalt,
     required this.ratchetWindowSize,
     this.uncryptedMagicBytes,
     this.failureTolerance = -1,
+    this.keyRingSze = KEYRING_SIZE,
+    this.discardFrameWhenCryptorNotReady = false,
   });
   bool sharedKey;
   Uint8List ratchetSalt;
   int ratchetWindowSize = 0;
   int failureTolerance;
   Uint8List? uncryptedMagicBytes;
+  int keyRingSze;
+  bool discardFrameWhenCryptorNotReady;
 
   @override
   String toString() {
@@ -29,7 +36,7 @@ class KeyOptions {
 
 class KeyProvider {
   KeyProvider(this.worker, this.id, this.keyProviderOptions);
-  final DedicatedWorkerGlobalScope worker;
+  final web.DedicatedWorkerGlobalScope worker;
   final String id;
   final KeyOptions keyProviderOptions;
   var participantKeys = <String, ParticipantKeyHandler>{};
@@ -76,31 +83,34 @@ class KeyProvider {
   }
 }
 
-const KEYRING_SIZE = 16;
-
 class KeySet {
   KeySet(this.material, this.encryptionKey);
-  CryptoKey material;
-  CryptoKey encryptionKey;
+  web.CryptoKey material;
+  web.CryptoKey encryptionKey;
 }
 
 class ParticipantKeyHandler {
   ParticipantKeyHandler({
     required this.worker,
     required this.keyOptions,
     required this.participantIdentity,
-  });
+  }) {
+    if (keyOptions.keyRingSze <= 0 || keyOptions.keyRingSze > 255) {
+      throw Exception('Invalid key ring size');
+    }
+    cryptoKeyRing = List.filled(keyOptions.keyRingSze, null);
+  }
   int currentKeyIndex = 0;
 
-  List<KeySet?> cryptoKeyRing = List.filled(KEYRING_SIZE, null);
+  late List<KeySet?> cryptoKeyRing;
 
   bool _hasValidKey = false;
 
   bool get hasValidKey => _hasValidKey;
 
   final KeyOptions keyOptions;
 
-  final DedicatedWorkerGlobalScope worker;
+  final web.DedicatedWorkerGlobalScope worker;
 
   final String participantIdentity;
 
@@ -157,8 +167,8 @@ class ParticipantKeyHandler {
     return newKey;
   }
 
-  Future<CryptoKey> ratchetMaterial(
-      CryptoKey currentMaterial, ByteBuffer newKeyBuffer) async {
+  Future<web.CryptoKey> ratchetMaterial(
+      web.CryptoKey currentMaterial, ByteBuffer newKeyBuffer) async {
     var newMaterial = await jsutil.promiseToFuture(crypto.importKey(
       'raw',
       newKeyBuffer,
@@ -194,14 +204,14 @@ class ParticipantKeyHandler {
 
   /// Derives a set of keys from the master key.
   /// See https://tools.ietf.org/html/draft-omara-sframe-00#section-4.3.1
-  Future<KeySet> deriveKeys(CryptoKey material, Uint8List salt) async {
+  Future<KeySet> deriveKeys(web.CryptoKey material, Uint8List salt) async {
     var algorithmOptions =
         getAlgoOptions((material.algorithm as crypto.Algorithm).name, salt);
 
     // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/deriveKey#HKDF
     // https://developer.mozilla.org/en-US/docs/Web/API/HkdfParams
     var encryptionKey =
-        await jsutil.promiseToFuture<CryptoKey>(crypto.deriveKey(
+        await jsutil.promiseToFuture<web.CryptoKey>(crypto.deriveKey(
       jsutil.jsify(algorithmOptions),
       material,
       jsutil.jsify({'name': 'AES-GCM', 'length': 128}),
@@ -215,7 +225,7 @@ class ParticipantKeyHandler {
   /// Ratchets a key. See
   /// https://tools.ietf.org/html/draft-omara-sframe-00#section-4.3.5.1
 
-  Future<Uint8List> ratchet(CryptoKey material, Uint8List salt) async {
+  Future<Uint8List> ratchet(web.CryptoKey material, Uint8List salt) async {
     var algorithmOptions = getAlgoOptions('PBKDF2', salt);
 
     // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/deriveBits

lib/src/e2ee.worker/e2ee.utils.dart

@@ -1,7 +1,9 @@
-import 'dart:html';
 import 'dart:js' as js;
 import 'dart:typed_data';
 
+import 'package:js/js_util.dart';
+import 'package:web/web.dart' as web;
+
 import 'crypto.dart' as crypto;
 
 bool isE2EESupported() {
@@ -17,10 +19,10 @@ bool isInsertableStreamSupported() {
       js.context['RTCRtpSender']['prototype']['createEncodedStreams'] != null;
 }
 
-Future<CryptoKey> importKey(
+Future<web.CryptoKey> importKey(
     Uint8List keyBytes, String algorithm, String usage) {
   // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey
-  return promiseToFuture<CryptoKey>(crypto.importKey(
+  return promiseToFuture<web.CryptoKey>(crypto.importKey(
     'raw',
     crypto.jsArrayBufferFrom(keyBytes),
     js.JsObject.jsify({'name': algorithm}),
@@ -29,10 +31,10 @@ Future<CryptoKey> importKey(
   ));
 }
 
-Future<CryptoKey> createKeyMaterialFromString(
+Future<web.CryptoKey> createKeyMaterialFromString(
     Uint8List keyBytes, String algorithm, String usage) {
   // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey
-  return promiseToFuture<CryptoKey>(crypto.importKey(
+  return promiseToFuture<web.CryptoKey>(crypto.importKey(
     'raw',
     crypto.jsArrayBufferFrom(keyBytes),
     js.JsObject.jsify({'name': 'PBKDF2'}),