Merge pull request #717 from MasterKale/fix/deno-2-4-support

Upgrade project to Deno v2.4

Author: MasterKale

.github/workflows/ciChecks.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         node-version: [20, 22]
-        deno-version: ['v2.1.x']
+        deno-version: ['v2.1.x', 'v2.4.x']
 
     steps:
       - uses: actions/checkout@v4

README.md

@@ -82,7 +82,7 @@ request new features, or to suggest changes to existing features.
 
 Install the following before proceeding:
 
-- **Deno v2.1.x**
+- **Deno v2.4.x**
 
 After pulling down the code, set up dependencies:
 

packages/browser/src/methods/startAuthentication.test.ts

@@ -14,6 +14,7 @@ import type {
   AuthenticationExtensionsClientInputs,
   AuthenticationExtensionsClientOutputs,
   PublicKeyCredentialRequestOptionsJSON,
+  Uint8Array_,
 } from '../types/index.ts';
 
 import { _browserSupportsWebAuthnInternals } from '../helpers/browserSupportsWebAuthn.ts';
@@ -41,7 +42,9 @@ const goodOpts1: PublicKeyCredentialRequestOptionsJSON = {
 
 // With UTF-8 challenge
 const goodOpts2UTF8: PublicKeyCredentialRequestOptionsJSON = {
-  challenge: bufferToBase64URLString(new TextEncoder().encode('やれやれだぜ')),
+  challenge: bufferToBase64URLString(
+    (new TextEncoder().encode('やれやれだぜ') as Uint8Array_).buffer,
+  ),
   allowCredentials: [],
   timeout: 1,
 };

packages/browser/src/types/index.ts

@@ -185,7 +185,7 @@ export interface AuthenticatorAssertionResponseJSON {
  */
 export type WebAuthnCredential = {
   id: Base64URLString;
-  publicKey: Uint8Array;
+  publicKey: Uint8Array_;
   // Number of times this authenticator is expected to have been used
   counter: number;
   // From browser's `startRegistration()` -> RegistrationCredentialJSON.transports (API L2 and up)
@@ -293,3 +293,19 @@ export type AttestationFormat =
   | 'tpm'
   | 'apple'
   | 'none';
+
+/**
+ * Equivalent to `Uint8Array` before TypeScript 5.7, and `Uint8Array<ArrayBuffer>` in TypeScript 5.7
+ * and beyond.
+ *
+ * **Context**
+ *
+ * `Uint8Array` became a generic type in TypeScript 5.7, requiring types defined simply as
+ * `Uint8Array` to be refactored to `Uint8Array<ArrayBuffer>` starting in Deno 2.2. `Uint8Array` is
+ * _not_ generic in Deno 2.1.x and earlier, though, so this type helps bridge this gap.
+ *
+ * Inspired by Deno's std library:
+ *
+ * https://github.com/denoland/std/blob/b5a5fe4f96b91c1fe8dba5cc0270092dd11d3287/bytes/_types.ts#L11
+ */
+export type Uint8Array_ = ReturnType<Uint8Array['slice']>;

packages/server/src/authentication/generateAuthenticationOptions.ts

@@ -3,6 +3,7 @@ import type {
   AuthenticatorTransportFuture,
   Base64URLString,
   PublicKeyCredentialRequestOptionsJSON,
+  Uint8Array_,
 } from '../types/index.ts';
 import { isoBase64URL, isoUint8Array } from '../helpers/iso/index.ts';
 import { generateChallenge } from '../helpers/generateChallenge.ts';
@@ -28,7 +29,7 @@ export async function generateAuthenticationOptions(
       id: Base64URLString;
       transports?: AuthenticatorTransportFuture[];
     }[];
-    challenge?: string | Uint8Array;
+    challenge?: string | Uint8Array_;
     timeout?: number;
     userVerification?: 'required' | 'preferred' | 'discouraged';
     extensions?: AuthenticationExtensionsClientInputs;

packages/server/src/helpers/convertAAGUIDToString.ts

@@ -1,9 +1,10 @@
 import { isoUint8Array } from './iso/index.ts';
+import type { Uint8Array_ } from '../types/index.ts';
 
 /**
  * Convert the aaguid buffer in authData into a UUID string
  */
-export function convertAAGUIDToString(aaguid: Uint8Array): string {
+export function convertAAGUIDToString(aaguid: Uint8Array_): string {
   // Raw Hex: adce000235bcc60a648b0b25f1f05503
   const hex = isoUint8Array.toHex(aaguid);
 

packages/server/src/helpers/convertCOSEtoPKCS.ts

@@ -1,10 +1,11 @@
 import { isoCBOR, isoUint8Array } from './iso/index.ts';
-import { COSEKEYS, COSEPublicKeyEC2 } from './cose.ts';
+import { COSEKEYS, type COSEPublicKeyEC2 } from './cose.ts';
+import type { Uint8Array_ } from '../types/index.ts';
 
 /**
  * Takes COSE-encoded public key and converts it to PKCS key
  */
-export function convertCOSEtoPKCS(cosePublicKey: Uint8Array): Uint8Array {
+export function convertCOSEtoPKCS(cosePublicKey: Uint8Array_): Uint8Array_ {
   // This is a little sloppy, I'm using COSEPublicKeyEC2 since it could have both x and y, but when
   // there's no y it means it's probably better typed as COSEPublicKeyOKP. I'll leave this for now
   // and revisit it later if it ever becomes an actual problem.

packages/server/src/helpers/convertCertBufferToPEM.ts

@@ -1,11 +1,11 @@
-import type { Base64URLString } from '../types/index.ts';
+import type { Base64URLString, Uint8Array_ } from '../types/index.ts';
 import { isoBase64URL } from './iso/index.ts';
 
 /**
  * Convert buffer to an OpenSSL-compatible PEM text format.
  */
 export function convertCertBufferToPEM(
-  certBuffer: Uint8Array | Base64URLString,
+  certBuffer: Uint8Array_ | Base64URLString,
 ): string {
   let b64cert: string;
 

packages/server/src/helpers/convertPEMToBytes.ts

@@ -1,9 +1,10 @@
 import { isoBase64URL } from './iso/index.ts';
+import type { Uint8Array_ } from '../types/index.ts';
 
 /**
  * Take a certificate in PEM format and convert it to bytes
  */
-export function convertPEMToBytes(pem: string): Uint8Array {
+export function convertPEMToBytes(pem: string): Uint8Array_ {
   const certBase64 = pem
     .replace('-----BEGIN CERTIFICATE-----', '')
     .replace('-----END CERTIFICATE-----', '')

packages/server/src/helpers/convertX509PublicKeyToCOSE.ts

@@ -1,6 +1,8 @@
 import { AsnParser } from '@peculiar/asn1-schema';
 import { Certificate } from '@peculiar/asn1-x509';
 import { ECParameters, id_ecPublicKey, id_secp256r1, id_secp384r1 } from '@peculiar/asn1-ecc';
+import { id_rsaEncryption, RSAPublicKey } from '@peculiar/asn1-rsa';
+
 import {
   COSECRV,
   COSEKEYS,
@@ -9,12 +11,11 @@ import {
   COSEPublicKeyEC2,
   COSEPublicKeyRSA,
 } from './cose.ts';
-import { RSAPublicKey } from '@peculiar/asn1-rsa';
-
 import { mapX509SignatureAlgToCOSEAlg } from './mapX509SignatureAlgToCOSEAlg.ts';
+import type { Uint8Array_ } from '../types/index.ts';
 
 export function convertX509PublicKeyToCOSE(
-  x509Certificate: Uint8Array,
+  x509Certificate: Uint8Array_,
 ): COSEPublicKey {
   let cosePublicKey: COSEPublicKey = new Map();
 
@@ -59,8 +60,8 @@ export function convertX509PublicKeyToCOSE(
       subjectPublicKeyInfo.subjectPublicKey,
     );
 
-    let x: Uint8Array;
-    let y: Uint8Array;
+    let x: Uint8Array_;
+    let y: Uint8Array_;
     if (subjectPublicKey[0] === 0x04) {
       // Public key is in "uncompressed form", so we can split the remaining bytes in half
       let pointer = 1;
@@ -84,7 +85,7 @@ export function convertX509PublicKeyToCOSE(
     coseEC2PubKey.set(COSEKEYS.y, y);
 
     cosePublicKey = coseEC2PubKey;
-  } else if (publicKeyAlgorithmID === '1.2.840.113549.1.1.1') {
+  } else if (publicKeyAlgorithmID === id_rsaEncryption) {
     /**
      * RSA public key
      */