favalib 0.0.10 → 0.0.12

package/build/platformProviders/node/qrCodeLib.mjs

@@ -0,0 +1,54 @@
+import { TwoFALibError } from '../../TwoFALibError.mjs';
+import { isUint8Array } from 'uint8array-extras';
+/**
+ * Gets the ImageData from an image, for Node.js environments.
+ * This ImageData is then further processed to get QR codes.
+ * @param inputImage - The image to get the ImageData from.
+ * @returns A promise that resolves to the ImageData.
+ */
+export const getImageDataFromInput = async (inputImage) => {
+    if (inputImage instanceof File) {
+        throw new TwoFALibError('Getting data from QR where image type is "File" is not supported in the node environment');
+    }
+    const canvasLib = await import('canvas');
+    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);
+};
+/**
+ * Node.js implementation of QR code library wrapper
+ */
+export class NodeQrCodeLib {
+    constructor() {
+        this.qrCodeModule = null;
+    }
+    /**
+     * Gets the QR code module, loading it if necessary
+     * @returns Promise that resolves to the QR code module
+     */
+    async getQrCodeModule() {
+        if (!this.qrCodeModule) {
+            const qrcode = await import('qrcode');
+            this.qrCodeModule = qrcode.default;
+        }
+        return this.qrCodeModule;
+    }
+    /**
+     * @inheritdoc
+     */
+    async toDataURL(text) {
+        const qrCode = await this.getQrCodeModule();
+        return qrCode.toDataURL(text);
+    }
+    /**
+     * @inheritdoc
+     */
+    async getImageDataFromInput(imageInput) {
+        return getImageDataFromInput(imageInput);
+    }
+}

package/build/subclasses/ExportImportManager.mjs

@@ -51,7 +51,7 @@ class ExportImportManager {
         }
         if (passphrase) {
             await validatePassphraseStrength(this.libraryLoader, passphrase, this.passphraseExtraDict);
-            return encryptExport(await this.libraryLoader.getOpenPGPLib(), exportData, passphrase);
+            return encryptExport(this.libraryLoader.getOpenPGPLib(), exportData, passphrase);
         }
         return exportData;
     }
@@ -59,7 +59,7 @@ class ExportImportManager {
         return generateTextExport(this.vaultDataManager.getAllEntries());
     }
     async generateHtmlExport() {
-        const qrGeneratorLib = await this.libraryLoader.getQrGeneratorLib();
+        const qrGeneratorLib = this.libraryLoader.getQrGeneratorLib();
         return generateHtmlExport(qrGeneratorLib, this.vaultDataManager.getAllEntries());
     }
     /**
@@ -71,7 +71,7 @@ class ExportImportManager {
      */
     async importFromTextFile(fileContents, passphrase) {
         if (passphrase) {
-            const decrypted = await decryptExport(await this.libraryLoader.getOpenPGPLib(), fileContents, passphrase);
+            const decrypted = await decryptExport(this.libraryLoader.getOpenPGPLib(), fileContents, passphrase);
             return this.importFromTextFile(decrypted);
         }
         const lines = fileContents.trim().split('\n');

package/build/subclasses/LibraryLoader.d.mts

@@ -1,52 +1,66 @@
 import type CryptoLib from '../interfaces/CryptoLib.mjs';
+import type { PlatformProviders } from '../interfaces/PlatformProviders.mjs';
+import type { QrCodeLib } from '../interfaces/QrCodeLib.mjs';
+import type { OpenPgpLib } from '../interfaces/OpenPgpLib.mjs';
 /**
  * Class responsible for loading various external (big) libraries required by the application.
  * All libraries (except CryptoLib) are loaded on demand. This helps to reduce the initial bundle size.
  */
 declare class LibraryLoader {
+    private platformProviders;
     private cryptoLib;
     private openPgpLib?;
     private qrGeneratorLib?;
     private jsQrLib?;
-    private canvasLib?;
     private urlParserLib?;
     private zxcvbn?;
+    private webSocketLib?;
     /**
      * Constructs a new instance of LibraryLoader.
-     * @param cryptoLib - An instance of CryptoLib that is required for library operations.
-     * @throws {InitializationError} If the provided CryptoLib instance is invalid.
+     * @param platformProviders - Platform-specific providers containing CryptoLib and other providers.
+     * @throws {InitializationError} If the provided platform providers are invalid.
      */
-    constructor(cryptoLib: CryptoLib);
+    constructor(platformProviders: PlatformProviders);
     /**
      * @returns The CryptoLib instance.
      */
     getCryptoLib(): CryptoLib;
+    /**
+     * @returns The PlatformProviders instance.
+     */
+    getPlatformProviders(): PlatformProviders;
     /**
      * Loads and returns the OpenPGP library on demand.
      * @returns A promise that resolves to the OpenPGP library.
      */
-    getOpenPGPLib(): Promise<typeof import("openpgp")>;
+    getOpenPGPLib(): OpenPgpLib;
     /**
      * Loads and returns the QR Generator library on demand.
      * @returns A promise that resolves to the QR Generator library.
      */
-    getQrGeneratorLib(): Promise<typeof import("qrcode")>;
+    getQrGeneratorLib(): QrCodeLib;
     /**
      * Loads and returns the JsQR library on demand.
      * @returns A promise that resolves to the JsQR library.
      */
     getJsQrLib(): Promise<typeof import("jsqr").default>;
-    /**
-     * Loads and returns the Canvas library on demand.
-     * @returns A promise that resolves to the Canvas library.
-     * @throws {TwoFALibError} If the library cannot be loaded in a browser environment.
-     */
-    getCanvasLib(): Promise<typeof import("canvas")>;
     /**
      * Loads and returns the URL Parser library on demand.
      * @returns A promise that resolves to the URL Parser library.
      */
     getUrlParserLib(): Promise<typeof import("whatwg-url")>;
+    /**
+     * Loads and returns the WebSocket library on demand.
+     * @returns The WebSocket library.
+     */
+    getWebSocketLib(): {
+        new (url: string | URL, protocols?: string | string[]): WebSocket;
+        prototype: WebSocket;
+        readonly CONNECTING: 0;
+        readonly OPEN: 1;
+        readonly CLOSING: 2;
+        readonly CLOSED: 3;
+    };
     /**
      * Loads and returns the Zxcvbn library on demand.
      * @returns A promise that resolves to the Zxcvbn library.

package/build/subclasses/LibraryLoader.mjs

@@ -1,4 +1,4 @@
-import { InitializationError, TwoFALibError } from '../TwoFALibError.mjs';
+import { InitializationError } from '../TwoFALibError.mjs';
 /**
  * Class responsible for loading various external (big) libraries required by the application.
  * All libraries (except CryptoLib) are loaded on demand. This helps to reduce the initial bundle size.
@@ -6,14 +6,15 @@ import { InitializationError, TwoFALibError } from '../TwoFALibError.mjs';
 class LibraryLoader {
     /**
      * Constructs a new instance of LibraryLoader.
-     * @param cryptoLib - An instance of CryptoLib that is required for library operations.
-     * @throws {InitializationError} If the provided CryptoLib instance is invalid.
+     * @param platformProviders - Platform-specific providers containing CryptoLib and other providers.
+     * @throws {InitializationError} If the provided platform providers are invalid.
      */
-    constructor(cryptoLib) {
-        if (!cryptoLib) {
-            throw new InitializationError('CryptoLib is required');
+    constructor(platformProviders) {
+        if (!platformProviders?.CryptoLib) {
+            throw new InitializationError('PlatformProviders with CryptoLib is required');
         }
-        this.cryptoLib = cryptoLib;
+        this.platformProviders = platformProviders;
+        this.cryptoLib = new platformProviders.CryptoLib();
     }
     /**
      * @returns The CryptoLib instance.
@@ -21,28 +22,26 @@ class LibraryLoader {
     getCryptoLib() {
         return this.cryptoLib;
     }
+    /**
+     * @returns The PlatformProviders instance.
+     */
+    getPlatformProviders() {
+        return this.platformProviders;
+    }
     /**
      * Loads and returns the OpenPGP library on demand.
      * @returns A promise that resolves to the OpenPGP library.
      */
-    async getOpenPGPLib() {
-        if (!this.openPgpLib) {
-            const module = await import('openpgp');
-            // enable Authenticated Encryption with Associated Data
-            module.config.aeadProtect = true;
-            this.openPgpLib = module;
-        }
+    getOpenPGPLib() {
+        this.openPgpLib ??= new this.platformProviders.OpenPgpLib();
         return this.openPgpLib;
     }
     /**
      * Loads and returns the QR Generator library on demand.
      * @returns A promise that resolves to the QR Generator library.
      */
-    async getQrGeneratorLib() {
-        if (!this.qrGeneratorLib) {
-            const module = await import('qrcode');
-            this.qrGeneratorLib = module.default;
-        }
+    getQrGeneratorLib() {
+        this.qrGeneratorLib ??= new this.platformProviders.QrCodeLib();
         return this.qrGeneratorLib;
     }
     /**
@@ -56,21 +55,6 @@ class LibraryLoader {
         }
         return this.jsQrLib;
     }
-    /**
-     * Loads and returns the Canvas library on demand.
-     * @returns A promise that resolves to the Canvas library.
-     * @throws {TwoFALibError} If the library cannot be loaded in a browser environment.
-     */
-    async getCanvasLib() {
-        if (typeof window !== 'undefined') {
-            throw new TwoFALibError('Canvas lib can not be loaded in browser env');
-        }
-        if (!this.canvasLib) {
-            const module = await import('canvas');
-            this.canvasLib = module.default;
-        }
-        return this.canvasLib;
-    }
     /**
      * Loads and returns the URL Parser library on demand.
      * @returns A promise that resolves to the URL Parser library.
@@ -82,6 +66,14 @@ class LibraryLoader {
         }
         return this.urlParserLib;
     }
+    /**
+     * Loads and returns the WebSocket library on demand.
+     * @returns The WebSocket library.
+     */
+    getWebSocketLib() {
+        this.webSocketLib ??= this.platformProviders.WebSocketLib();
+        return this.webSocketLib;
+    }
     /**
      * Loads and returns the Zxcvbn library on demand.
      * @returns A promise that resolves to the Zxcvbn library.

package/build/subclasses/SyncManager.mjs

@@ -141,12 +141,13 @@ class SyncManager {
      * Initializes the WebSocket connection to the server.
      */
     initServerConnection() {
-        const ws = new WebSocket(this.serverUrl);
+        const WebSocketLib = this.libraryLoader.getWebSocketLib();
+        const ws = new WebSocketLib(this.serverUrl);
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const syncManager = this;
-        ws.addEventListener('error', (event) => {
-            // eslint-disable-next-line @typescript-eslint/no-base-to-string
-            syncManager.log('warning', `Error in websocket: ${event.toString()}`);
+        ws.addEventListener('error', () => {
+            // no error information seems to be available...
+            syncManager.log('warning', `Error in websocket.`);
         });
         ws.addEventListener('message', function message(message) {
             try {
@@ -326,7 +327,7 @@ class SyncManager {
         };
         let returnQr = null;
         if (returnAs.qr) {
-            const qrGeneratorLib = await this.libraryLoader.getQrGeneratorLib();
+            const qrGeneratorLib = this.libraryLoader.getQrGeneratorLib();
             returnQr = await qrGeneratorLib.toDataURL(JSON.stringify(returnData));
         }
         const returnText = returnAs.text
@@ -352,7 +353,7 @@ class SyncManager {
         if (this.activeAddDeviceFlow) {
             throw new SyncAddDeviceFlowConflictError();
         }
-        const { addDevicePassword, initiatorDeviceId, timestamp, pass1Result } = await decodeInitiatorData(initiatorData, initiatorDataType, await this.libraryLoader.getJsQrLib(), this.libraryLoader.getCanvasLib.bind(this));
+        const { addDevicePassword, initiatorDeviceId, timestamp, pass1Result } = await decodeInitiatorData(initiatorData, initiatorDataType, await this.libraryLoader.getJsQrLib(), this.libraryLoader.getQrGeneratorLib());
         if (!addDevicePassword ||
             !initiatorDeviceId ||
             !timestamp ||

package/build/utils/creationUtils.d.mts

@@ -1,5 +1,5 @@
 import type { ZxcvbnResult } from '@zxcvbn-ts/core';
-import type CryptoLib from '../interfaces/CryptoLib.mjs';
+import type { PlatformProviders } from '../interfaces/PlatformProviders.mjs';
 import type { Passphrase } from '../interfaces/CryptoLib.mjs';
 import type { DeviceType } from '../interfaces/SyncTypes.mjs';
 import TwoFaLib from '../TwoFaLib.mjs';
@@ -25,14 +25,14 @@ export declare const getPassphraseStrength: (libraryLoader: LibraryLoader, passp
 export declare const validatePassphraseStrength: (libraryLoader: LibraryLoader, passphrase: Passphrase, passphraseExtraDict: PassphraseExtraDict) => Promise<void>;
 /**
  * Returns utility functions useful in creating a new twoFaLib vault
- * @param cryptoLib - An instance of CryptoLib that is compatible with the environment.
+ * @param platformProviders - The platform-specific providers containing CryptoLib and other providers.
  * @param deviceType - A unique identifier for this device type (e.g. 2fa-cli).
  * @param passphraseExtraDict - Additional words to be used for passphrase strength evaluation.
  * @param saveFunction - The function to save the data.
  * @param serverUrl - The server URL for syncing.
  * @returns An object with methods to evaluate passphrase strength and create a new TwoFaLib vault.
  */
-export declare const getTwoFaLibVaultCreationUtils: (cryptoLib: CryptoLib, deviceType: DeviceType, passphraseExtraDict: PassphraseExtraDict, saveFunction?: SaveFunction, serverUrl?: string) => {
+export declare const getTwoFaLibVaultCreationUtils: (platformProviders: PlatformProviders, deviceType: DeviceType, passphraseExtraDict: PassphraseExtraDict, saveFunction?: SaveFunction, serverUrl?: string) => {
     getPassphraseStrength: (passphrase: Passphrase, passphraseExtraDict: PassphraseExtraDict) => Promise<ZxcvbnResult>;
     createNewTwoFaLibVault: (passphrase: Passphrase) => Promise<{
         twoFaLib: TwoFaLib;

package/build/utils/creationUtils.mjs

@@ -62,10 +62,11 @@ export const validatePassphraseStrength = async (libraryLoader, passphrase, pass
  */
 const createNewTwoFaLibVault = async (libraryLoader, deviceType, serverUrl, passphraseExtraDict, saveFunction, passphrase) => {
     const cryptoLib = libraryLoader.getCryptoLib();
+    const platformProviders = libraryLoader.getPlatformProviders();
     const { publicKey, privateKey, symmetricKey, encryptedPrivateKey, encryptedSymmetricKey, salt, } = await cryptoLib.createKeys(passphrase);
     await validatePassphraseStrength(libraryLoader, passphrase, passphraseExtraDict);
     const deviceId = genUuidV4();
-    const twoFaLib = new TwoFaLib(deviceType, cryptoLib, passphraseExtraDict, privateKey, symmetricKey, encryptedPrivateKey, encryptedSymmetricKey, salt, publicKey, {
+    const twoFaLib = new TwoFaLib(deviceType, platformProviders, passphraseExtraDict, privateKey, symmetricKey, encryptedPrivateKey, encryptedSymmetricKey, salt, publicKey, {
         deviceId,
     }, [], saveFunction, {
         serverUrl,
@@ -93,6 +94,7 @@ const createNewTwoFaLibVault = async (libraryLoader, deviceType, serverUrl, pass
  */
 const loadTwoFaLibFromLockedRepesentation = async (libraryLoader, deviceType, passphraseExtraDict, saveFunction, lockedRepresentationString, passphrase) => {
     const cryptoLib = libraryLoader.getCryptoLib();
+    const platformProviders = libraryLoader.getPlatformProviders();
     const lockedRepresentation = JSON.parse(lockedRepresentationString);
     if (!lockedRepresentation ||
         !lockedRepresentation.encryptedPrivateKey ||
@@ -109,22 +111,22 @@ const loadTwoFaLibFromLockedRepesentation = async (libraryLoader, deviceType, pa
         !vaultState.sync?.devices) {
         throw new InitializationError('encryptedVaultState is incomplete or corrupted');
     }
-    return new TwoFaLib(deviceType, cryptoLib, passphraseExtraDict, privateKey, symmetricKey, lockedRepresentation.encryptedPrivateKey, lockedRepresentation.encryptedSymmetricKey, lockedRepresentation.salt, publicKey, {
+    return new TwoFaLib(deviceType, platformProviders, passphraseExtraDict, privateKey, symmetricKey, lockedRepresentation.encryptedPrivateKey, lockedRepresentation.encryptedSymmetricKey, lockedRepresentation.salt, publicKey, {
         deviceId: vaultState.deviceId,
         deviceFriendlyName: vaultState.deviceFriendlyName,
     }, vaultState.vault, saveFunction, vaultState.sync);
 };
 /**
  * Returns utility functions useful in creating a new twoFaLib vault
- * @param cryptoLib - An instance of CryptoLib that is compatible with the environment.
+ * @param platformProviders - The platform-specific providers containing CryptoLib and other providers.
  * @param deviceType - A unique identifier for this device type (e.g. 2fa-cli).
  * @param passphraseExtraDict - Additional words to be used for passphrase strength evaluation.
  * @param saveFunction - The function to save the data.
  * @param serverUrl - The server URL for syncing.
  * @returns An object with methods to evaluate passphrase strength and create a new TwoFaLib vault.
  */
-export const getTwoFaLibVaultCreationUtils = (cryptoLib, deviceType, passphraseExtraDict, saveFunction, serverUrl) => {
-    const libraryLoader = new LibraryLoader(cryptoLib);
+export const getTwoFaLibVaultCreationUtils = (platformProviders, deviceType, passphraseExtraDict, saveFunction, serverUrl) => {
+    const libraryLoader = new LibraryLoader(platformProviders);
     return {
         getPassphraseStrength: getPassphraseStrength.bind(null, libraryLoader),
         createNewTwoFaLibVault: createNewTwoFaLibVault.bind(null, libraryLoader, deviceType, serverUrl, passphraseExtraDict, saveFunction),

package/build/utils/exportImportUtils.d.mts

@@ -1,6 +1,8 @@
 import type { NewEntry } from '../interfaces/Entry.mjs';
 import type Entry from '../interfaces/Entry.mjs';
 import type { EntryId } from '../interfaces/Entry.mjs';
+import type { QrCodeLib } from '../interfaces/QrCodeLib.mjs';
+import type { OpenPgpLib } from '../interfaces/OpenPgpLib.mjs';
 /**
  * Parses an OTP URI and extracts the relevant information to create a new entry.
  * @param UrlParser - The URL parsing library.
@@ -15,7 +17,7 @@ export declare const parseOtpUri: (UrlParser: typeof import("whatwg-url"), otpUr
  * @param entries - An array of OTP entries.
  * @returns A promise that resolves to the HTML string.
  */
-export declare const generateHtmlExport: (qrGeneratorLib: typeof import("qrcode"), entries: Entry[]) => Promise<string>;
+export declare const generateHtmlExport: (qrGeneratorLib: QrCodeLib, entries: Entry[]) => Promise<string>;
 /**
  * Generates a text export of OTP URIs for the provided entries.
  * @param entries - An array of OTP entries.
@@ -42,7 +44,7 @@ export declare const processImportLines: (lines: string[], importFromUri: (uri:
  * @param password - The password to use for encryption.
  * @returns A promise that resolves to the encrypted data.
  */
-export declare const encryptExport: (openPgpLib: typeof import("openpgp"), data: string, password: string) => Promise<string>;
+export declare const encryptExport: (openPgpLib: OpenPgpLib, data: string, password: string) => Promise<string>;
 /**
  * Decrypts the given data using OpenPGP.
  * @param openPgpLib - The OpenPGP library.
@@ -50,4 +52,4 @@ export declare const encryptExport: (openPgpLib: typeof import("openpgp"), data:
  * @param password - The password to use for decryption.
  * @returns A promise that resolves to the decrypted data.
  */
-export declare const decryptExport: (openPgpLib: typeof import("openpgp"), data: string, password: string) => Promise<string>;
+export declare const decryptExport: (openPgpLib: OpenPgpLib, data: string, password: string) => Promise<string>;

package/build/utils/exportImportUtils.mjs

@@ -162,13 +162,7 @@ export const processImportLines = async (lines, importFromUri) => {
  * @returns A promise that resolves to the encrypted data.
  */
 export const encryptExport = async (openPgpLib, data, password) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const encrypted = await openPgpLib.encrypt({
-        message: await openPgpLib.createMessage({ text: data }),
-        passwords: [password],
-        format: 'armored',
-    });
-    return encrypted;
+    return openPgpLib.encrypt(data, password);
 };
 /**
  * Decrypts the given data using OpenPGP.
@@ -178,9 +172,5 @@ export const encryptExport = async (openPgpLib, data, password) => {
  * @returns A promise that resolves to the decrypted data.
  */
 export const decryptExport = async (openPgpLib, data, password) => {
-    const decrypted = await openPgpLib.decrypt({
-        message: await openPgpLib.readMessage({ armoredMessage: data }),
-        passwords: [password],
-    });
-    return decrypted.data;
+    return openPgpLib.decrypt(data, password);
 };

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.10",
+  "version": "0.0.12",
   "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"