Merge branch 'master' into v1

Author: dipu-bd

.github/workflows/release.yml

@@ -52,19 +52,19 @@ jobs:
       - name: Extract release notes from CHANGELOG.md
         run: |
           awk 'BEGIN{p=0} /^# / {if(p++) exit; next} p' CHANGELOG.md | awk 'NF' > RELEASE_NOTES.md
- 
+
       - name: Append changelog comparison link
         run: |
           git fetch --tags
           CUR_TAG=${GITHUB_REF#refs/tags/v}
           PREV_TAG=$(git tag --sort=-v:refname | grep '^v[0-9]' | grep -A1 "^v$CUR_TAG" | tail -n1)
-          echo -e "\n**Full Changelog**: https://github.com/bitanon/hashlib/compare/${PREV_TAG}...${CUR_TAG}" >> RELEASE_NOTES.md
+          echo -e "\n**Full Changelog**: https://github.com/bitanon/hashlib/compare/${PREV_TAG}...v${CUR_TAG}" >> RELEASE_NOTES.md
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
-          name: Version ${{ github.ref_name }}
+          name: Version ${GITHUB_REF#refs/tags/v}
           body_path: RELEASE_NOTES.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -4,6 +4,7 @@
 .packages
 
 # Conventional directory for outputs.
+dart-*/
 build/
 doc/
 coverage/

.pubignore

@@ -5,3 +5,4 @@
 /build
 /scripts
 /.github
+/dart-*

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.24.0
+
+- generator_vm.dart
+  - Avoids mixing predictable datetime output with CSPRNG output.
+- generator_js.dart
+  - Avoids mixing predictable datetime output with CSPRNG output.
+  - Adds `NodeRandom` as an implementation of `Random` for NodeJS.
+    - `nextInt(max)` draws 32-bit values from NodeJS's internal `crypto` package.
+  - `secureRandom()` uses `NodeRandom` for secure random numbers.
+  - `$generateSeed()` delegates to `secureRandom()`.
+- generators.dart
+  - Fixes spelling of `_hashGenerator`
+
 # 1.23.0
 
 - Fixes typo: Alder is renamed to Adler

dart_test.yaml

@@ -3,7 +3,7 @@
 
 timeout: 1m
 concurrency: 8
-platforms: [vm, node]
+platforms: [vm, node, chrome]
 allow_duplicate_test_names: false
 
 tags:

lib/src/random/generator_js.dart

@@ -1,24 +1,38 @@
-// Copyright (c) 2024, Sudipto Chandra
+// Copyright (c) 2025, Sudipto Chandra
 // All rights reserved. Check LICENSE file for details.
 
-import 'dart:async';
 import 'dart:math' show Random;
 
+import 'generator_js_legacy.dart'
+    if (dart.library.js_interop) 'generator_js_interop.dart';
+
 const int _mask32 = 0xFFFFFFFF;
 
-int _seedCounter = Zone.current.hashCode;
+/// For Node.js environment + dart2js compiler
+class NodeRandom extends CryptoRandom implements Random {
+  @override
+  int nextInt(final int max) {
+    if (max < 1 || max > _mask32 + 1) {
+      throw RangeError.range(
+          max, 1, _mask32 + 1, 'max', 'max must be <= (1 << 32)');
+    }
+    return cryptoRandomInt(max);
+  }
 
-/// Returns a secure random generator in JS runtime
-Random secureRandom() => Random($generateSeed());
-
-/// Generates a random seed in JS runtime
-int $generateSeed() {
-  int code = DateTime.now().millisecondsSinceEpoch;
-  code -= _seedCounter++;
-  if (code.bitLength & 1 == 1) {
-    code *= ~code;
+  @override
+  double nextDouble() {
+    final int first26Bits = nextInt(1 << 26);
+    final int next27Bits = nextInt(1 << 27);
+    final int random53Bits = (first26Bits << 27) + next27Bits; // JS int limit
+    return random53Bits / (1 << 53);
   }
-  code ^= ~_seedCounter << 5;
-  _seedCounter += code & 7;
-  return code & _mask32;
+
+  @override
+  bool nextBool() => nextInt(2) == 1;
 }
+
+/// Returns a secure random generator in JS runtime
+Random secureRandom() => NodeRandom();
+
+/// Generates a random seed
+int $generateSeed() => secureRandom().nextInt(_mask32);

lib/src/random/generator_js_interop.dart

@@ -0,0 +1,33 @@
+// Copyright (c) 2025, Sudipto Chandra
+// All rights reserved. Check LICENSE file for details.
+
+import 'dart:js_interop';
+
+@JS()
+@staticInterop
+class Process {}
+
+@JS()
+@staticInterop
+class Versions {}
+
+@JS()
+@staticInterop
+class Crypto {}
+
+extension on Crypto {
+  external int randomInt(final int max);
+}
+
+@JS('require')
+external Crypto require(final String id);
+
+/// For Node.js environment + dart2js compiler
+abstract class CryptoRandom {
+  Crypto? _crypto;
+
+  int cryptoRandomInt(final int max) {
+    _crypto ??= require('crypto');
+    return _crypto!.randomInt(max);
+  }
+}

lib/src/random/generator_js_legacy.dart

@@ -0,0 +1,29 @@
+// Copyright (c) 2025, Sudipto Chandra
+// All rights reserved. Check LICENSE file for details.
+
+// Pre `js_interop` compatible version
+// Works with dart2js in a Node.js runtime (where `require` exists).
+
+// ignore_for_file: deprecated_member_use, depend_on_referenced_packages
+
+import 'dart:js' as js;
+
+js.JsObject _require(String id) {
+  final r = js.context['require'];
+  if (r == null) {
+    throw StateError("`require` is not available.");
+  }
+  return (r as js.JsFunction).apply([id]) as js.JsObject;
+}
+
+/// For Node.js environment + dart2js compiler
+abstract class CryptoRandom {
+  js.JsObject? _crypto;
+  js.JsFunction? _randomInt;
+
+  int cryptoRandomInt(final int max) {
+    _crypto ??= _require('crypto');
+    _randomInt ??= _crypto!['randomInt'] as js.JsFunction;
+    return (_randomInt!.apply([max]) as num).toInt();
+  }
+}

lib/src/random/generator_vm.dart

@@ -11,6 +11,4 @@ Random secureRandom() => Random.secure();
 
 /// Generates a random seed
 @pragma('vm:prefer-inline')
-int $generateSeed() =>
-    (DateTime.now().microsecondsSinceEpoch & _mask32) ^
-    Random.secure().nextInt(_mask32);
+int $generateSeed() => Random.secure().nextInt(_mask32);

lib/src/random/generators.dart

@@ -11,8 +11,12 @@ import 'package:hashlib/src/algorithms/sm3.dart';
 import 'package:hashlib/src/algorithms/xxh64/xxh64.dart';
 import 'package:hashlib/src/core/hash_base.dart';
 
-import 'generator_vm.dart' if (dart.library.js) 'generator_js.dart';
-export 'generator_vm.dart' if (dart.library.js) 'generator_js.dart';
+import 'generator_vm.dart'
+    if (dart.library.html) 'generator_vm.dart'
+    if (dart.library.js) 'generator_js.dart';
+export 'generator_vm.dart'
+    if (dart.library.html) 'generator_vm.dart'
+    if (dart.library.js) 'generator_js.dart';
 
 const int _mask32 = 0xFFFFFFFF;
 
@@ -36,13 +40,13 @@ extension RNGBuilder on RNG {
       case RNG.keccak:
         return _keccakGenerateor(seed);
       case RNG.sha256:
-        return _hashGenerateor(SHA256Hash(), seed);
+        return _hashGenerator(SHA256Hash(), seed);
       case RNG.md5:
-        return _hashGenerateor(MD4Hash(), seed);
+        return _hashGenerator(MD4Hash(), seed);
       case RNG.xxh64:
-        return _hashGenerateor(XXHash64Sink(111), seed);
+        return _hashGenerator(XXHash64Sink(111), seed);
       case RNG.sm3:
-        return _hashGenerateor(SM3Hash(), seed);
+        return _hashGenerator(SM3Hash(), seed);
       case RNG.system:
         return _systemGenerator(seed);
       case RNG.secure:
@@ -117,7 +121,7 @@ NextIntFunction _keccakGenerateor([int? seed]) {
 }
 
 /// Returns a iterable of 32-bit integers generated from the [sink].
-NextIntFunction _hashGenerateor(
+NextIntFunction _hashGenerator(
   HashDigestSink sink, [
   int? seed,
 ]) {