Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use native crypto.randomUUID when available #600

Merged
merged 4 commits into from Dec 2, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -32,6 +32,7 @@
"module": "./dist/esm-node/index.js",
"browser": {
"./dist/md5.js": "./dist/md5-browser.js",
"./dist/native.js": "./dist/native-browser.js",
"./dist/rng.js": "./dist/rng-browser.js",
"./dist/sha1.js": "./dist/sha1-browser.js",
"./dist/esm-node/index.js": "./dist/esm-browser/index.js"
Expand Down
4 changes: 4 additions & 0 deletions src/native-browser.js
@@ -0,0 +1,4 @@
const randomUUID =
typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);

export default { randomUUID };
3 changes: 3 additions & 0 deletions src/native.js
@@ -0,0 +1,3 @@
import crypto from 'crypto';

export default { randomUUID: crypto.randomUUID };
5 changes: 5 additions & 0 deletions src/v4.js
@@ -1,9 +1,14 @@
import native from './native.js';
import rng from './rng.js';
import stringify from './stringify.js';

function v4(options, buf, offset) {
options = options || {};

if (native.randomUUID && buf == null && options.random == null && options.rng == null) {
return native.randomUUID();
}

LinusU marked this conversation as resolved.
Show resolved Hide resolved
const rnds = options.random || (options.rng || rng)();

// Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
Expand Down
9 changes: 9 additions & 0 deletions wdio.conf.js
Expand Up @@ -34,13 +34,22 @@ const capabilities = [
},

// Chrome
// Chrome 92 introduced native support for crypto.randomUUID
{
...commonCapabilities,
browserName: 'Chrome',
browser_version: '92.0',
os: 'Windows',
os_version: '10',
},
{
...commonCapabilities,
browserName: 'Chrome',
browser_version: '81.0',
os: 'Windows',
os_version: '10',
},
// Chrome 49 released on 2016-03-02 was the last version supported on Windows XP, Windows Vista, Mac OS X 10.6, 10.7, and 10.8
{
...commonCapabilities,
browserName: 'Chrome',
Expand Down