chore: refactor environment sensing

ChainSafe · Jul 15, 2024 · 3a3ea23 · 3a3ea23
1 parent 301566e
commit 3a3ea23
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/checksum.ts b/src/checksum.ts
@@ -2,6 +2,7 @@ import { sha256 } from "ethereum-cryptography/sha256";
 import { concatBytes, equalsBytes, hexToBytes } from "ethereum-cryptography/utils";
 
 import { IChecksumModule } from "./types";
+import { hasWebCrypto } from "./env";
 
 // default checksum configuration
 
@@ -27,7 +28,7 @@ export function checksum(mod: IChecksumModule, key: Uint8Array, ciphertext: Uint
 
 export async function verifyChecksum(mod: IChecksumModule, key: Uint8Array, ciphertext: Uint8Array): Promise<boolean> {
   if (mod.function === "sha256") {
-    if (globalThis?.crypto?.subtle) {
+    if (hasWebCrypto) {
       return verifyChecksumWebCrypto(mod, key, ciphertext);
     }
     return equalsBytes(hexToBytes(mod.message), sha256(checksumData(key, ciphertext)));

diff --git a/src/cipher.ts b/src/cipher.ts
@@ -3,6 +3,7 @@ import { encrypt as aesEncrypt, decrypt as aesDecrypt } from "ethereum-cryptogra
 
 import { ICipherModule } from "./types";
 import { bytesToHex, hexToBytes } from "ethereum-cryptography/utils";
+import { hasWebCrypto } from "./env";
 
 export function defaultAes128CtrModule(): Pick<ICipherModule, "function" | "params"> {
   return {
@@ -16,7 +17,7 @@ export function defaultAes128CtrModule(): Pick<ICipherModule, "function" | "para
 export async function cipherEncrypt(mod: ICipherModule, key: Uint8Array, data: Uint8Array): Promise<Uint8Array> {
   if (mod.function === "aes-128-ctr") {
     try {
-      if (globalThis?.crypto?.subtle) {
+      if (hasWebCrypto) {
         return await cipherEncryptWebCrypto(mod, key, data);
       }
       return await aesEncrypt(
@@ -52,7 +53,7 @@ async function cipherEncryptWebCrypto(
 export async function cipherDecrypt(mod: ICipherModule, key: Uint8Array): Promise<Uint8Array> {
   if (mod.function === "aes-128-ctr") {
     try {
-      if (globalThis?.crypto?.subtle) {
+      if (hasWebCrypto) {
         return await cipherDecryptWebCrypto(mod, key);
       }
       return await aesDecrypt(

diff --git a/src/env.ts b/src/env.ts
@@ -0,0 +1,6 @@
+export const isNode =
+  typeof process !== "undefined" &&
+  process.versions != null &&
+  process.versions.node != null;
+
+export const hasWebCrypto = globalThis?.crypto?.subtle != null;
diff --git a/src/kdf.ts b/src/kdf.ts
@@ -4,6 +4,7 @@ import { scrypt } from "ethereum-cryptography/scrypt";
 import { bytesToHex, hexToBytes } from "ethereum-cryptography/utils"
 
 import { IKdfModule, IPbkdf2KdfModule, IScryptKdfModule } from "./types";
+import { hasWebCrypto, isNode } from "./env";
 
 // default kdf configurations
 
@@ -34,11 +35,6 @@ export function defaultScryptModule(): Pick<IScryptKdfModule, "function" | "para
 
 // kdf operations
 
-const isNode =
-  typeof process !== "undefined" &&
-  process.versions != null &&
-  process.versions.node != null;
-
 
 export async function kdf(mod: IKdfModule, password: Uint8Array): Promise<Uint8Array> {
   if (mod.function === "pbkdf2") {
@@ -53,7 +49,7 @@ async function doPbkdf2(params: IPbkdf2KdfModule["params"], password: Uint8Array
   if (isNode) {
     return await doPbkdf2Node(params, password);
   }
-  if (globalThis?.crypto?.subtle) {
+  if (hasWebCrypto) {
     return await doPbkdf2WebCrypto(params, password);
   }
   return pbkdf2(