favalib 0.0.11 → 0.0.13

package/build/utils/qrUtils.d.mts

@@ -1,20 +1,4 @@
-import type { ImageData } from 'canvas';
 import LibraryLoader from '../subclasses/LibraryLoader.mjs';
-/**
- * Gets the ImageData from an image, for browser environments.
- * This ImageData is then further processed to get QR codes.
- * @param input - The image to get the ImageData from.
- * @returns A promise that resolves to the ImageData.
- */
-export declare const getImageDataBrowser: (input: string | File) => Promise<ImageData>;
-/**
- * Gets the ImageData from an image, for Node.js environments.
- * This ImageData is then further processed to get QR codes.
- * @param canvasLib - The Canvas library.
- * @param inputImage - The image to get the ImageData from.
- * @returns A promise that resolves to the ImageData.
- */
-export declare const getImageDataNode: (canvasLib: typeof import("canvas"), inputImage: Uint8Array | string) => Promise<ImageData>;
 /**
  * Import an entry from a QR code image.
  * @param libraryLoader - An instance of LibraryLoader.

package/build/utils/qrUtils.mjs

@@ -1,59 +1,4 @@
-import { isUint8Array } from 'uint8array-extras';
 import { TwoFALibError } from '../TwoFALibError.mjs';
-/**
- * Gets the ImageData from an image, for browser environments.
- * This ImageData is then further processed to get QR codes.
- * @param input - The image to get the ImageData from.
- * @returns A promise that resolves to the ImageData.
- */
-export const getImageDataBrowser = (input) => {
-    return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => {
-            const canvas = document.createElement('canvas');
-            canvas.width = img.width;
-            canvas.height = img.height;
-            const ctx = canvas.getContext('2d');
-            if (!ctx) {
-                reject(new TwoFALibError('Could not create canvas context'));
-                return;
-            }
-            ctx.drawImage(img, 0, 0);
-            resolve(ctx.getImageData(0, 0, img.width, img.height));
-        };
-        img.onerror = () => reject(new TwoFALibError('Failed to load image'));
-        if (typeof input === 'string') {
-            // URL or Data URL
-            img.src = input;
-        }
-        else {
-            // File object
-            const reader = new FileReader();
-            reader.onload = (e) => {
-                img.src = e.target?.result;
-            };
-            reader.onerror = () => reject(new TwoFALibError('Failed to read file'));
-            reader.readAsDataURL(input);
-        }
-    });
-};
-/**
- * Gets the ImageData from an image, for Node.js environments.
- * This ImageData is then further processed to get QR codes.
- * @param canvasLib - The Canvas library.
- * @param inputImage - The image to get the ImageData from.
- * @returns A promise that resolves to the ImageData.
- */
-export const getImageDataNode = async (canvasLib, inputImage) => {
-    const { createCanvas, loadImage } = canvasLib;
-    // eslint-disable-next-line no-restricted-globals
-    const input = isUint8Array(inputImage) ? Buffer.from(inputImage) : inputImage;
-    const image = await loadImage(input); // canvaslib expects a buffer
-    const canvas = createCanvas(image.width, image.height);
-    const ctx = canvas.getContext('2d');
-    ctx.drawImage(image, 0, 0);
-    return ctx.getImageData(0, 0, image.width, image.height);
-};
 /**
  * Import an entry from a QR code image.
  * @param libraryLoader - An instance of LibraryLoader.
@@ -63,19 +8,8 @@ export const getImageDataNode = async (canvasLib, inputImage) => {
  */
 export const getDataFromQRImage = async (libraryLoader, imageInput) => {
     const jsQr = await libraryLoader.getJsQrLib();
-    let imageData;
-    if (typeof window !== 'undefined') {
-        // Browser environment
-        imageData = await getImageDataBrowser(imageInput);
-    }
-    else {
-        if (imageInput instanceof File) {
-            throw new TwoFALibError('Getting data from QR where image type is "File" is not supported in the node environment');
-        }
-        // Node.js environment
-        const canvasLib = await libraryLoader.getCanvasLib();
-        imageData = await getImageDataNode(canvasLib, imageInput);
-    }
+    const qrLib = libraryLoader.getQrGeneratorLib();
+    const imageData = await qrLib.getImageDataFromInput(imageInput);
     const qrCodeResult = jsQr(imageData.data, imageData.width, imageData.height);
     if (!qrCodeResult) {
         throw new TwoFALibError("Couldn't read QR code data from image");

package/build/utils/syncUtils.d.mts

@@ -1,13 +1,14 @@
 import { InitiateAddDeviceFlowResult } from '../interfaces/SyncTypes.mjs';
+import type { QrCodeLib } from '../interfaces/QrCodeLib.mjs';
 /**
  * Decodes the initiator data from a string or QR code.
  * @param initiatorData - The initiator data to decode.
  * @param initiatorDataType The type of the initiatorData, determines how it should be decoded
  * @param jsQr - The QR code decoder.
- * @param getCanvasLib - A function to get the Canvas library.
+ * @param qrCodeLib - The extended QR code library with platform-specific image processing.
  * @returns A promise that resolves to the decoded initiator data.
  */
-export declare const decodeInitiatorData: (initiatorData: string | Uint8Array | File, initiatorDataType: "text" | "qr", jsQr: typeof import("jsqr").default, getCanvasLib: () => Promise<typeof import("canvas")>) => Promise<InitiateAddDeviceFlowResult>;
+export declare const decodeInitiatorData: (initiatorData: string | Uint8Array | File, initiatorDataType: "text" | "qr", jsQr: typeof import("jsqr").default, qrCodeLib: QrCodeLib) => Promise<InitiateAddDeviceFlowResult>;
 /**
  * Converts a JSONified Uint8Array to a Uint8Array.
  * A JSONified Uint8Array is the output of JSON.stringify on a Uint8Array.

package/build/utils/syncUtils.mjs

@@ -1,33 +1,17 @@
 import { base64ToString } from 'uint8array-extras';
-import { getImageDataBrowser, getImageDataNode } from './qrUtils.mjs';
 import { SyncError } from '../TwoFALibError.mjs';
 /**
  * Decodes the initiator data from a string or QR code.
  * @param initiatorData - The initiator data to decode.
  * @param initiatorDataType The type of the initiatorData, determines how it should be decoded
  * @param jsQr - The QR code decoder.
- * @param getCanvasLib - A function to get the Canvas library.
+ * @param qrCodeLib - The extended QR code library with platform-specific image processing.
  * @returns A promise that resolves to the decoded initiator data.
  */
-export const decodeInitiatorData = async (initiatorData, initiatorDataType, jsQr, getCanvasLib) => {
+export const decodeInitiatorData = async (initiatorData, initiatorDataType, jsQr, qrCodeLib) => {
     if (initiatorDataType === 'qr') {
         try {
-            let imageData;
-            if (typeof window !== 'undefined') {
-                if (initiatorData instanceof Uint8Array) {
-                    throw new SyncError('Invalid initiator data type, should be a string or File in browser environment');
-                }
-                // Browser environment
-                imageData = await getImageDataBrowser(initiatorData);
-            }
-            else {
-                if (!(initiatorData instanceof Uint8Array)) {
-                    throw new SyncError('Invalid initiator data type, should be a Uint8Array in Node.js environment');
-                }
-                // Node.js environment
-                const canvasLib = await getCanvasLib();
-                imageData = await getImageDataNode(canvasLib, initiatorData);
-            }
+            const imageData = await qrCodeLib.getImageDataFromInput(initiatorData);
             const qrCodeResult = jsQr(imageData.data, imageData.width, imageData.height);
             if (!qrCodeResult) {
                 throw new SyncError('Invalid QR code');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "favalib",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "",
   "type": "module",
   "exports": {
@@ -8,13 +8,13 @@
       "import": "./build/main.mjs",
       "types": "./build/main.d.mts"
     },
-    "./cryptoProviders/browser": {
-      "import": "./build/CryptoProviders/browser/index.mjs",
-      "types": "./build/CryptoProviders/browser/index.d.mts"
+    "./platformProviders/browser": {
+      "import": "./build/platformProviders/browser/index.mjs",
+      "types": "./build/platformProviders/browser/index.d.mts"
     },
-    "./cryptoProviders/node": {
-      "import": "./build/CryptoProviders/node/index.mjs",
-      "types": "./build/CryptoProviders/node/index.d.mts"
+    "./platformProviders/node": {
+      "import": "./build/platformProviders/node/index.mjs",
+      "types": "./build/platformProviders/node/index.d.mts"
     }
   },
   "types": "./build/main.d.mts",
@@ -39,6 +39,7 @@
     "@zxcvbn-ts/language-common": "^3.0.4",
     "@zxcvbn-ts/language-en": "^3.0.2",
     "canvas": "^3.1.0",
+    "esbuild": "^0.25.8",
     "hash-wasm": "^4.12.0",
     "jpake-ts": "^1.0.1",
     "jsqr": "^1.4.0",
@@ -48,7 +49,6 @@
     "totp-generator": "^1.0.0",
     "typescript-event-target": "^1.1.1",
     "uint8array-extras": "^1.4.0",
-    "unws": "^0.3.2",
     "uuid": "^11.1.0",
     "whatwg-url": "^14.2.0",
     "ws": "^8.18.2"

package/build/interfaces/PassphraseExtraDict.d.ts

@@ -1,2 +0,0 @@
-import type { NonEmptyTuple } from 'type-fest';
-export type PassphraseExtraDict = NonEmptyTuple<string>;