Merge pull request #32 from AIGNE-io/master

fix: add support for commonjs module

Author: crouchcd

.gitignore

@@ -6,4 +6,5 @@ dist/
 .vscode/
 src/index.browser.ts
 src/index.node.ts
+src/index.node.cts
 browser-test/index.out.js

package.json

@@ -7,12 +7,21 @@
   "browser": "dist/index.browser.js",
   "type": "module",
   "types": "dist/index.node.d.ts",
+  "exports": {
+    ".": {
+      "browser": "./dist/index.browser.js",
+      "node": {
+        "import": "./dist/index.node.js",
+        "require": "./dist/index.node.cjs"
+      }
+    }
+  },
   "files": [
     "dist/"
   ],
   "scripts": {
     "watch": "tsc --watch --declaration",
-    "preprocess": "env=browser diverge -f src/index.ts src/index.browser.ts && env=node diverge -f src/index.ts src/index.node.ts",
+    "preprocess": "env=browser diverge -f src/index.ts src/index.browser.ts && env=node diverge -f src/index.ts src/index.node.ts && env=node diverge -f src/index.ts src/index.node.cts",
     "build": "npm run preprocess && tsc --declaration",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "test:bundle": "esbuild browser-test/index.js --bundle --outfile=browser-test/index.out.js"

src/index.ts

@@ -1,34 +1,34 @@
 import type { webcrypto } from 'node:crypto';
 
-let crypto: webcrypto.Crypto;
+let crypto: webcrypto.Crypto | Promise<webcrypto.Crypto>;
 
 // diverge:if env=browser
 crypto = globalThis.crypto; // web browsers
 // diverge:else
 crypto =
   globalThis.crypto?.webcrypto ?? // Node.js 16 REPL has globalThis.crypto as node:crypto
-  globalThis.crypto ?? // Node.js 18+ 
-  (await import("node:crypto")).webcrypto; // Node.js 16 non-REPL
+  globalThis.crypto ?? // Node.js 18+
+  import("node:crypto").then(m => m.webcrypto); // Node.js 16 non-REPL
 // diverge:fi
 
 /**
  * Creates an array of length `size` of random bytes
  * @param size
  * @returns Array of random ints (0 to 255)
  */
-function getRandomValues(size: number) {
-  return crypto.getRandomValues(new Uint8Array(size));
+async function getRandomValues(size: number) {
+  return (await crypto).getRandomValues(new Uint8Array(size));
 }
 
 /** Generate cryptographically strong random string
  * @param size The desired length of the string
  * @returns The random string
  */
-function random(size: number) {
+async function random(size: number) {
   const mask =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~";
   let result = "";
-  const randomUints = getRandomValues(size);
+  const randomUints = await getRandomValues(size);
   for (let i = 0; i < size; i++) {
     // cap the value of the randomIndex to mask.length - 1
     const randomIndex = randomUints[i] % mask.length;
@@ -41,16 +41,16 @@ function random(size: number) {
  * @param length Length of the verifier
  * @returns A random verifier `length` characters long
  */
-function generateVerifier(length: number): string {
-  return random(length);
+async function generateVerifier(length: number): Promise<string> {
+  return await random(length);
 }
 
 /** Generate a PKCE code challenge from a code verifier
  * @param code_verifier
  * @returns The base64 url encoded code challenge
  */
 export async function generateChallenge(code_verifier: string) {
-  const buffer = await crypto.subtle.digest(
+  const buffer = await (await crypto).subtle.digest(
     "SHA-256",
     new TextEncoder().encode(code_verifier)
   );
@@ -77,7 +77,7 @@ export default async function pkceChallenge(length?: number): Promise<{
     throw `Expected a length between 43 and 128. Received ${length}.`;
   }
 
-  const verifier = generateVerifier(length);
+  const verifier = await generateVerifier(length);
   const challenge = await generateChallenge(verifier);
 
   return {

tsconfig.json

@@ -9,6 +9,7 @@
   },
   "files": [
     "src/index.browser.ts",
-    "src/index.node.ts"
+    "src/index.node.ts",
+    "src/index.node.cts"
   ]
 }