Improve crypto import

esm/package.json

@@ -1,7 +1,9 @@
 {
   "type": "module",
   "browser": {
-    "crypto": false,
-    "./crypto": "./esm/cryptoBrowser.js"
+    "node:crypto": false
+  },
+  "node": {
+    "./crypto": "./esm/cryptoNode.js"
   }
 }

package.json

@@ -30,7 +30,7 @@
   },
   "license": "MIT",
   "browser": {
-    "crypto": false,
+    "node:crypto": false,
     "./crypto": "./crypto.js"
   },
   "devDependencies": {

src/crypto.ts

@@ -1,6 +1,3 @@
-// Global symbol available in browsers only, node.js 19+, deno and others
 declare const globalThis: Record<string, any> | undefined;
-export const crypto: { node?: any; web?: any } = {
-  node: undefined,
-  web: typeof globalThis === 'object' && 'crypto' in globalThis ? globalThis.crypto : undefined,
-};
+export const crypto =
+  typeof globalThis === 'object' && 'crypto' in globalThis ? globalThis.crypto : undefined;

src/cryptoNode.ts

@@ -1,6 +1,3 @@
-import * as nodeCrypto from 'crypto';
-
-export const crypto: { node?: any; web?: any } = {
-  node: nodeCrypto,
-  web: undefined,
-};
+import * as nc from 'node:crypto';
+export const crypto =
+  nc && typeof nc === 'object' && 'webcrypto' in nc ? (nc.webcrypto as any) : undefined;

src/utils.ts

@@ -186,11 +186,8 @@ export function wrapConstructorWithOpts<H extends Hash<H>, T extends Object>(
  * Secure PRNG
  */
 export function randomBytes(bytesLength = 32): Uint8Array {
-  if (crypto.web) {
-    return crypto.web.getRandomValues(new Uint8Array(bytesLength));
-  } else if (crypto.node) {
-    return new Uint8Array(crypto.node.randomBytes(bytesLength).buffer);
-  } else {
-    throw new Error("The environment doesn't have randomBytes function");
+  if (crypto && typeof crypto.getRandomValues === 'function') {
+    return crypto.getRandomValues(new Uint8Array(bytesLength));
   }
+  throw new Error("The environment doesn't have randomBytes function");
 }