@willwade/aac-processors 0.1.20 → 0.2.0

package/dist/browser/processors/obfProcessor.js

@@ -2,8 +2,7 @@ import { BaseProcessor, } from '../core/baseProcessor';
 import { AACTree, AACPage, AACButton, AACSemanticCategory, AACSemanticIntent, } from '../core/treeStructure';
 import { generateCloneId } from '../utilities/analytics/utils/idGenerator';
 import { extractAllButtonsForTranslation, validateTranslationResults, } from '../utilities/translation/translationProcessor';
-import { readBinaryFromInput, readTextFromInput, writeTextToPath, encodeBase64, decodeText, getNodeRequire, isNodeRuntime, } from '../utils/io';
-import { openZipFromInput } from '../utils/zip';
+import { encodeBase64, decodeText } from '../utils/io';
 const OBF_FORMAT_VERSION = 'open-board-0.1';
 /**
  * Map OBF hidden value to AAC standard visibility
@@ -167,8 +166,7 @@ class ObfProcessor extends BaseProcessor {
                 buttonParameters.image_id = btn.image_id;
             }
             return new AACButton({
-                // Make button ID unique by combining page ID and button ID
-                id: `${pageId}::${btn?.id || ''}`,
+                id: String(btn.id),
                 label: String(btn?.label || ''),
                 message: String(btn?.vocalization || btn?.label || ''),
                 visibility: mapObfVisibility(btn.hidden),
@@ -217,7 +215,7 @@ class ObfProcessor extends BaseProcessor {
                                 return;
                             if (rowIndex >= rows || colIndex >= cols)
                                 return;
-                            const aacBtn = buttonMap.get(`${pageId}::${cellId}`);
+                            const aacBtn = buttonMap.get(String(cellId));
                             if (aacBtn) {
                                 grid[rowIndex][colIndex] = aacBtn;
                             }
@@ -230,7 +228,7 @@ class ObfProcessor extends BaseProcessor {
                             const row = Math.floor(btn.box_id / cols);
                             const col = btn.box_id % cols;
                             if (row < rows && col < cols) {
-                                const aacBtn = buttonMap.get(`${pageId}::${btn.id}`);
+                                const aacBtn = buttonMap.get(String(btn.id));
                                 if (aacBtn) {
                                     grid[row][col] = aacBtn;
                                 }
@@ -283,10 +281,11 @@ class ObfProcessor extends BaseProcessor {
         return texts;
     }
     async loadIntoTree(filePathOrBuffer) {
+        const { readBinaryFromInput, readTextFromInput } = this.options.fileAdapter;
         // Detailed logging for debugging input
         const bufferLength = typeof filePathOrBuffer === 'string'
             ? null
-            : readBinaryFromInput(filePathOrBuffer).byteLength;
+            : (await readBinaryFromInput(filePathOrBuffer)).byteLength;
         console.log('[OBF] loadIntoTree called with:', {
             type: typeof filePathOrBuffer,
             isBuffer: typeof Buffer !== 'undefined' && Buffer.isBuffer(filePathOrBuffer),
@@ -296,9 +295,9 @@ class ObfProcessor extends BaseProcessor {
         });
         const tree = new AACTree();
         // Helper: try to parse JSON OBF
-        function tryParseObfJson(data) {
+        async function tryParseObfJson(data) {
             try {
-                const str = typeof data === 'string' ? data : readTextFromInput(data);
+                const str = typeof data === 'string' ? data : await readTextFromInput(data);
                 // Check for empty or whitespace-only content
                 if (!str.trim()) {
                     return null;
@@ -320,8 +319,8 @@ class ObfProcessor extends BaseProcessor {
         // If input is a string path and ends with .obf, treat as JSON
         if (typeof filePathOrBuffer === 'string' && filePathOrBuffer.toLowerCase().endsWith('.obf')) {
             try {
-                const content = readTextFromInput(filePathOrBuffer);
-                const boardData = tryParseObfJson(content);
+                const content = await readTextFromInput(filePathOrBuffer);
+                const boardData = await tryParseObfJson(content);
                 if (boardData) {
                     console.log('[OBF] Detected .obf file, parsed as JSON');
                     const page = await this.processBoard(boardData, filePathOrBuffer, false);
@@ -349,17 +348,17 @@ class ObfProcessor extends BaseProcessor {
             }
         }
         // Detect likely zip signature first
-        function isLikelyZip(input) {
+        async function isLikelyZip(input) {
             if (typeof input === 'string') {
                 const lowered = input.toLowerCase();
                 return lowered.endsWith('.zip') || lowered.endsWith('.obz');
             }
-            const bytes = readBinaryFromInput(input);
+            const bytes = await readBinaryFromInput(input);
             return bytes.length >= 2 && bytes[0] === 0x50 && bytes[1] === 0x4b;
         }
         // Check if input is a buffer or string that parses as OBF JSON; throw if neither JSON nor ZIP
-        if (!isLikelyZip(filePathOrBuffer)) {
-            const asJson = tryParseObfJson(filePathOrBuffer);
+        if (!(await isLikelyZip(filePathOrBuffer))) {
+            const asJson = await tryParseObfJson(filePathOrBuffer);
             if (!asJson)
                 throw new Error('Invalid OBF content: not JSON and not ZIP');
             console.log('[OBF] Detected buffer/string as OBF JSON');
@@ -380,10 +379,7 @@ class ObfProcessor extends BaseProcessor {
             return tree;
         }
         try {
-            const zipResult = this.options.zipAdapter
-                ? await this.options.zipAdapter(filePathOrBuffer)
-                : await openZipFromInput(filePathOrBuffer);
-            this.zipFile = zipResult.zip;
+            this.zipFile = await this.options.zipAdapter(filePathOrBuffer);
         }
         catch (err) {
             console.error('[OBF] Error loading ZIP:', err);
@@ -401,7 +397,7 @@ class ObfProcessor extends BaseProcessor {
             try {
                 const content = await this.zipFile.readFile(manifestFile[0]);
                 const data = decodeText(content);
-                const str = typeof data === 'string' ? data : readTextFromInput(data);
+                const str = typeof data === 'string' ? data : await readTextFromInput(data);
                 if (!str.trim())
                     throw new Error('Manifest object missing');
                 const manifestObject = JSON.parse(str);
@@ -425,7 +421,7 @@ class ObfProcessor extends BaseProcessor {
         for (const entryName of obfEntries) {
             try {
                 const content = await this.zipFile.readFile(entryName);
-                const boardData = tryParseObfJson(decodeText(content));
+                const boardData = await tryParseObfJson(decodeText(content));
                 if (boardData) {
                     const page = await this.processBoard(boardData, entryName, true);
                     tree.addPage(page);
@@ -539,6 +535,7 @@ class ObfProcessor extends BaseProcessor {
         };
     }
     async processTexts(filePathOrBuffer, translations, outputPath) {
+        const { readBinaryFromInput } = this.options.fileAdapter;
         // Load the tree, apply translations, and save to new file
         const tree = await this.loadIntoTree(filePathOrBuffer);
         // Apply translations to all text content
@@ -568,9 +565,10 @@ class ObfProcessor extends BaseProcessor {
         });
         // Save the translated tree and return its content
         await this.saveFromTree(tree, outputPath);
-        return readBinaryFromInput(outputPath);
+        return await readBinaryFromInput(outputPath);
     }
     async saveFromTree(tree, outputPath) {
+        const { writeTextToPath, writeBinaryToPath, pathExists } = this.options.fileAdapter;
         if (outputPath.endsWith('.obf')) {
             // Save as single OBF JSON file
             const rootPage = tree.rootId ? tree.getPage(tree.rootId) : Object.values(tree.pages)[0];
@@ -578,35 +576,22 @@ class ObfProcessor extends BaseProcessor {
                 throw new Error('No pages to save');
             }
             const obfBoard = this.createObfBoardFromPage(rootPage, 'Exported Board', tree.metadata);
-            writeTextToPath(outputPath, JSON.stringify(obfBoard, null, 2));
+            await writeTextToPath(outputPath, JSON.stringify(obfBoard, null, 2));
         }
         else {
-            // Save as OBZ (zip with multiple OBF files)
-            if (isNodeRuntime()) {
-                const AdmZip = getNodeRequire()('adm-zip');
-                const zip = new AdmZip();
-                Object.values(tree.pages).forEach((page) => {
-                    const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata);
-                    const obfContent = JSON.stringify(obfBoard, null, 2);
-                    zip.addFile(`${page.id}.obf`, Buffer.from(obfContent, 'utf8'));
-                });
-                const zipBuffer = zip.toBuffer();
-                const { writeBinaryToPath } = await import('../utils/io');
-                writeBinaryToPath(outputPath, zipBuffer);
-            }
-            else {
-                const module = await import('jszip');
-                const JSZip = module.default || module;
-                const zip = new JSZip();
-                Object.values(tree.pages).forEach((page) => {
-                    const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata);
-                    const obfContent = JSON.stringify(obfBoard, null, 2);
-                    zip.file(`${page.id}.obf`, obfContent);
-                });
-                const zipBuffer = await zip.generateAsync({ type: 'uint8array' });
-                const { writeBinaryToPath } = await import('../utils/io');
-                writeBinaryToPath(outputPath, zipBuffer);
-            }
+            const files = Object.values(tree.pages).map((page) => {
+                const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata);
+                const obfContent = JSON.stringify(obfBoard, null, 2);
+                const name = page.id.endsWith('.obf') ? page.id : `${page.id}.obf`;
+                return {
+                    name,
+                    data: new TextEncoder().encode(obfContent),
+                };
+            });
+            const fileExists = await pathExists(outputPath);
+            this.zipFile = await this.options.zipAdapter(fileExists ? outputPath : undefined, this.options.fileAdapter);
+            const zipData = await this.zipFile.writeFiles(files);
+            await writeBinaryToPath(outputPath, zipData);
         }
     }
     /**
@@ -630,7 +615,7 @@ class ObfProcessor extends BaseProcessor {
      */
     async validate(filePath) {
         const ObfValidator = this.getObfValidator();
-        return ObfValidator.validateFile(filePath);
+        return ObfValidator.validateFile(filePath, this.options.fileAdapter);
     }
     /**
      * Extract symbol information from an OBF/OBZ file for LLM-based translation.
@@ -639,7 +624,7 @@ class ObfProcessor extends BaseProcessor {
      * This method uses shared translation utilities that work across all AAC formats.
      *
      * @param filePathOrBuffer - Path to OBF/OBZ file or buffer
-     * @returns Array of symbol information for LLM processing
+     * @returns Promise resolving to symbol information for LLM processing
      */
     async extractSymbolsForLLM(filePathOrBuffer) {
         const tree = await this.loadIntoTree(filePathOrBuffer);
@@ -669,9 +654,10 @@ class ObfProcessor extends BaseProcessor {
      * @param llmTranslations - Array of LLM translations with symbol info
      * @param outputPath - Where to save the translated OBF/OBZ file
      * @param options - Translation options (e.g., allowPartial for testing)
-     * @returns Buffer of the translated OBF/OBZ file
+     * @returns Promise resolving to a buffer of the translated OBF/OBZ file
      */
     async processLLMTranslations(filePathOrBuffer, llmTranslations, outputPath, options) {
+        const { readBinaryFromInput } = this.options.fileAdapter;
         const tree = await this.loadIntoTree(filePathOrBuffer);
         // Validate translations using shared utility
         const buttonIds = Object.values(tree.pages).flatMap((page) => page.buttons.map((b) => b.id));
@@ -710,7 +696,7 @@ class ObfProcessor extends BaseProcessor {
         });
         // Save and return
         await this.saveFromTree(tree, outputPath);
-        return readBinaryFromInput(outputPath);
+        return await readBinaryFromInput(outputPath);
     }
     getObfValidator() {
         try {

package/dist/browser/processors/opmlProcessor.js

@@ -1,9 +1,8 @@
 import { BaseProcessor, } from '../core/baseProcessor';
 import { AACTree, AACPage, AACButton, AACSemanticIntent } from '../core/treeStructure';
-// Removed unused import: FileProcessor
 import { XMLParser, XMLValidator, XMLBuilder } from 'fast-xml-parser';
 import { ValidationFailureError, buildValidationResultFromMessage, } from '../validation/validationTypes';
-import { getBasename, readBinaryFromInput, readTextFromInput, writeBinaryToPath, writeTextToPath, encodeText, } from '../utils/io';
+import { getBasename, encodeText } from '../utils/io';
 class OpmlProcessor extends BaseProcessor {
     constructor(options) {
         super(options);
@@ -50,8 +49,8 @@ class OpmlProcessor extends BaseProcessor {
         return { page, childPages };
     }
     async extractTexts(filePathOrBuffer) {
-        await Promise.resolve();
-        const content = readTextFromInput(filePathOrBuffer);
+        const { readTextFromInput } = this.options.fileAdapter;
+        const content = await readTextFromInput(filePathOrBuffer);
         const parser = new XMLParser({ ignoreAttributes: false });
         const data = parser.parse(content);
         const texts = [];
@@ -82,10 +81,10 @@ class OpmlProcessor extends BaseProcessor {
         return texts;
     }
     async loadIntoTree(filePathOrBuffer) {
-        await Promise.resolve();
+        const { readBinaryFromInput, readTextFromInput } = this.options.fileAdapter;
         const filename = typeof filePathOrBuffer === 'string' ? getBasename(filePathOrBuffer) : 'upload.opml';
-        const buffer = readBinaryFromInput(filePathOrBuffer);
-        const content = readTextFromInput(buffer);
+        const buffer = await readBinaryFromInput(filePathOrBuffer);
+        const content = await readTextFromInput(buffer);
         try {
             if (!content || !content.trim()) {
                 const validationResult = buildValidationResultFromMessage({
@@ -168,8 +167,8 @@ class OpmlProcessor extends BaseProcessor {
         }
     }
     async processTexts(filePathOrBuffer, translations, outputPath) {
-        await Promise.resolve();
-        const content = readTextFromInput(filePathOrBuffer);
+        const { writeBinaryToPath, readTextFromInput } = this.options.fileAdapter;
+        const content = await readTextFromInput(filePathOrBuffer);
         let translatedContent = content;
         // Apply translations to text attributes in OPML outline elements
         translations.forEach((translation, originalText) => {
@@ -180,11 +179,11 @@ class OpmlProcessor extends BaseProcessor {
             }
         });
         const resultBuffer = encodeText(translatedContent);
-        writeBinaryToPath(outputPath, resultBuffer);
+        await writeBinaryToPath(outputPath, resultBuffer);
         return resultBuffer;
     }
     async saveFromTree(tree, outputPath) {
-        await Promise.resolve();
+        const { writeTextToPath } = this.options.fileAdapter;
         // Helper to recursively build outline nodes with cycle detection
         function buildOutline(page, visited = new Set()) {
             // Prevent infinite recursion by tracking visited pages
@@ -254,7 +253,7 @@ class OpmlProcessor extends BaseProcessor {
             attributeNamePrefix: '@_',
         });
         const xml = '<?xml version="1.0" encoding="UTF-8"?>\n' + builder.build(opmlObj);
-        writeTextToPath(outputPath, xml);
+        await writeTextToPath(outputPath, xml);
     }
     /**
      * Extract strings with metadata for aac-tools-platform compatibility

package/dist/browser/processors/snap/helpers.js

@@ -1,8 +1,7 @@
 import { AACSemanticCategory, AACSemanticIntent, } from '../../core/treeStructure';
-import * as fs from 'fs';
-import * as path from 'path';
-import Database from 'better-sqlite3';
 import { dotNetTicksToDate } from '../../utils/dotnetTicks';
+import { defaultFileAdapter, extname, getNodeRequire, } from '../../utils/io';
+import { requireBetterSqlite3 } from '../../utils/sqlite';
 // Minimal Snap helpers (stubs) to align with processors/<engine>/helpers pattern
 // NOTE: Snap files can store different types of image data in PageSetData:
 // - PNG/JPEG binaries: Actual images that can be displayed
@@ -11,7 +10,8 @@ import { dotNetTicksToDate } from '../../utils/dotnetTicks';
 // We extract PNG/JPEG images but skip vector graphics (requires renderer).
 // NOTE: Snap buttons currently do not populate resolvedImageEntry; these helpers
 // therefore return empty collections until image resolution is implemented.
-function collectFiles(root, matcher, maxDepth = 3) {
+async function collectFiles(root, matcher, maxDepth = 3, fileAdapter = defaultFileAdapter) {
+    const { listDir, join, isDirectory } = fileAdapter;
     const results = new Set();
     const stack = [{ dir: root, depth: 0 }];
     while (stack.length > 0) {
@@ -22,14 +22,14 @@ function collectFiles(root, matcher, maxDepth = 3) {
             continue;
         let entries;
         try {
-            entries = fs.readdirSync(current.dir, { withFileTypes: true });
+            entries = await listDir(current.dir);
         }
         catch (error) {
             continue;
         }
         for (const entry of entries) {
-            const fullPath = path.join(current.dir, entry.name);
-            if (entry.isDirectory()) {
+            const fullPath = join(current.dir, entry);
+            if (await isDirectory(entry)) {
                 stack.push({ dir: fullPath, depth: current.depth + 1 });
             }
             else if (matcher(fullPath)) {
@@ -83,17 +83,15 @@ export function getAllowedImageEntries(tree) {
  * @param entryPath Symbol identifier (e.g., "SYM:12345")
  * @returns Image data buffer or null if not found
  */
-export function openImage(dbOrFile, entryPath) {
+export async function openImage(dbOrFile, entryPath, fileAdapter = defaultFileAdapter) {
+    const { mkTempDir, join, writeBinaryToPath, removePath, dirname } = fileAdapter;
     let dbPath;
     let cleanupNeeded = false;
     // Handle Buffer input by writing to temp file
     if (Buffer.isBuffer(dbOrFile)) {
-        if (typeof fs.mkdtempSync !== 'function') {
-            return null; // Not in Node environment
-        }
-        const tempDir = fs.mkdtempSync(path.join(process.cwd(), 'snap-'));
-        dbPath = path.join(tempDir, 'temp.sps');
-        fs.writeFileSync(dbPath, dbOrFile);
+        const tempDir = await mkTempDir(join(process.cwd(), 'snap-'));
+        dbPath = join(tempDir, 'temp.sps');
+        await writeBinaryToPath(dbPath, dbOrFile);
         cleanupNeeded = true;
     }
     else if (typeof dbOrFile === 'string') {
@@ -102,9 +100,10 @@ export function openImage(dbOrFile, entryPath) {
     else {
         return null;
     }
+    const better_sqlite3 = getNodeRequire()('better-sqlite3');
     let db = null;
     try {
-        db = new Database(dbPath, { readonly: true });
+        db = new better_sqlite3.Database(dbPath, { readonly: true });
         // Query PageSetData for the symbol
         const row = db
             .prepare('SELECT Id, Identifier, Data FROM PageSetData WHERE Identifier = ?')
@@ -127,9 +126,9 @@ export function openImage(dbOrFile, entryPath) {
         }
         if (cleanupNeeded && dbPath) {
             try {
-                fs.unlinkSync(dbPath);
-                const dir = path.dirname(dbPath);
-                fs.rmdirSync(dir);
+                await removePath(dbPath);
+                const dir = dirname(dbPath);
+                await removePath(dir);
             }
             catch (e) {
                 // Ignore cleanup errors
@@ -143,7 +142,8 @@ export function openImage(dbOrFile, entryPath) {
  * @param packageNamePattern Optional pattern to filter package names (default: 'TobiiDynavox')
  * @returns Array of Snap package path information
  */
-export function findSnapPackages(packageNamePattern = 'TobiiDynavox') {
+export async function findSnapPackages(packageNamePattern = 'TobiiDynavox', fileAdapter = defaultFileAdapter) {
+    const { join, listDir, isDirectory, pathExists } = fileAdapter;
     const results = [];
     // Only works on Windows
     if (process.platform !== 'win32') {
@@ -154,22 +154,22 @@ export function findSnapPackages(packageNamePattern = 'TobiiDynavox') {
         if (!localAppData) {
             return results;
         }
-        const packagesPath = path.join(localAppData, 'Packages');
+        const packagesPath = join(localAppData, 'Packages');
         // Check if Packages directory exists
-        if (!fs.existsSync(packagesPath)) {
+        if (!(await pathExists(packagesPath))) {
             return results;
         }
         // Enumerate packages
-        const packages = fs.readdirSync(packagesPath, { withFileTypes: true });
+        const packages = await listDir(packagesPath);
         for (const packageDir of packages) {
-            if (!packageDir.isDirectory())
+            if (!(await isDirectory(packageDir)))
                 continue;
-            const packageName = packageDir.name;
+            const packageName = packageDir;
             // Filter by pattern
             if (packageName.includes(packageNamePattern)) {
                 results.push({
                     packageName,
-                    packagePath: path.join(packagesPath, packageName),
+                    packagePath: join(packagesPath, packageName),
                 });
             }
         }
@@ -185,8 +185,8 @@ export function findSnapPackages(packageNamePattern = 'TobiiDynavox') {
  * @param packageNamePattern Optional pattern to filter package names (default: 'TobiiDynavox')
  * @returns Path to the first matching Snap package, or null if not found
  */
-export function findSnapPackagePath(packageNamePattern = 'TobiiDynavox') {
-    const packages = findSnapPackages(packageNamePattern);
+export async function findSnapPackagePath(packageNamePattern = 'TobiiDynavox', fileAdapter) {
+    const packages = await findSnapPackages(packageNamePattern, fileAdapter);
     return packages.length > 0 ? packages[0].packagePath : null;
 }
 /**
@@ -196,32 +196,33 @@ export function findSnapPackagePath(packageNamePattern = 'TobiiDynavox') {
  * @param packageNamePattern Optional package filter (default TobiiDynavox)
  * @returns Array of user info with vocab paths
  */
-export function findSnapUsers(packageNamePattern = 'TobiiDynavox') {
+export async function findSnapUsers(packageNamePattern = 'TobiiDynavox', fileAdapter = defaultFileAdapter) {
+    const { join, listDir, isDirectory, pathExists } = fileAdapter;
     const results = [];
     if (process.platform !== 'win32') {
         return results;
     }
-    const packagePath = findSnapPackagePath(packageNamePattern);
+    const packagePath = await findSnapPackagePath(packageNamePattern, fileAdapter);
     if (!packagePath) {
         return results;
     }
-    const usersRoot = path.join(packagePath, 'LocalState', 'Users');
-    if (!fs.existsSync(usersRoot)) {
+    const usersRoot = join(packagePath, 'LocalState', 'Users');
+    if (!(await pathExists(usersRoot))) {
         return results;
     }
-    const entries = fs.readdirSync(usersRoot, { withFileTypes: true });
+    const entries = await listDir(usersRoot);
     for (const entry of entries) {
-        if (!entry.isDirectory())
+        if (!(await isDirectory(entry)))
             continue;
-        if (entry.name.toLowerCase().startsWith('swiftkey'))
+        if (entry.toLowerCase().startsWith('swiftkey'))
             continue;
-        const userPath = path.join(usersRoot, entry.name);
-        const vocabPaths = collectFiles(userPath, (full) => {
-            const ext = path.extname(full).toLowerCase();
+        const userPath = join(usersRoot, entry);
+        const vocabPaths = await collectFiles(userPath, (full) => {
+            const ext = extname(full).toLowerCase();
             return ext === '.sps' || ext === '.spb';
-        }, 2);
+        }, 2, fileAdapter);
         results.push({
-            userId: entry.name,
+            userId: entry,
             userPath,
             vocabPaths,
         });
@@ -234,8 +235,9 @@ export function findSnapUsers(packageNamePattern = 'TobiiDynavox') {
  * @param packageNamePattern Optional package filter
  * @returns Array of vocab file paths
  */
-export function findSnapUserVocabularies(userId, packageNamePattern = 'TobiiDynavox') {
-    const users = findSnapUsers(packageNamePattern).filter((u) => !userId || u.userId === userId);
+export async function findSnapUserVocabularies(userId, packageNamePattern = 'TobiiDynavox', fileAdapter) {
+    const allUsers = await findSnapUsers(packageNamePattern, fileAdapter);
+    const users = allUsers.filter((u) => !userId || u.userId === userId);
     return users.flatMap((u) => u.vocabPaths);
 }
 /**
@@ -245,11 +247,13 @@ export function findSnapUserVocabularies(userId, packageNamePattern = 'TobiiDyna
  * @param packageNamePattern Optional package filter
  * @returns Array of history file paths (may be empty if not found)
  */
-export function findSnapUserHistory(userId, packageNamePattern = 'TobiiDynavox') {
-    const user = findSnapUsers(packageNamePattern).find((u) => u.userId === userId);
+export async function findSnapUserHistory(userId, packageNamePattern = 'TobiiDynavox', fileAdapter = defaultFileAdapter) {
+    const { basename } = fileAdapter;
+    const allUsers = await findSnapUsers(packageNamePattern, fileAdapter);
+    const user = allUsers.find((u) => u.userId === userId);
     if (!user)
         return [];
-    return collectFiles(user.userPath, (full) => path.basename(full).toLowerCase().includes('history'), 2);
+    return await collectFiles(user.userPath, (full) => basename(full).toLowerCase().includes('history'), 2, fileAdapter);
 }
 /**
  * Check whether TD Snap appears to be installed (Windows only)
@@ -262,9 +266,11 @@ export function isSnapInstalled(packageNamePattern = 'TobiiDynavox') {
 /**
  * Read Snap usage history from a pageset file (.sps/.spb)
  */
-export function readSnapUsage(pagesetPath) {
-    if (!fs.existsSync(pagesetPath))
+export async function readSnapUsage(pagesetPath, fileAdapter = defaultFileAdapter) {
+    const { pathExists } = fileAdapter;
+    if (!(await pathExists(pagesetPath)))
         return [];
+    const Database = requireBetterSqlite3();
     const db = new Database(pagesetPath, { readonly: true });
     const tableCheck = db
         .prepare("SELECT name FROM sqlite_master WHERE type='table' AND name IN ('ButtonUsage','Button')")
@@ -319,8 +325,10 @@ export function readSnapUsage(pagesetPath) {
 /**
  * Read Snap usage history for a user (all pagesets)
  */
-export function readSnapUsageForUser(userId, packageNamePattern = 'TobiiDynavox') {
-    const users = findSnapUsers(packageNamePattern).filter((u) => !userId || u.userId === userId);
+export async function readSnapUsageForUser(userId, packageNamePattern = 'TobiiDynavox') {
+    const allUsers = await findSnapUsers(packageNamePattern);
+    const users = allUsers.filter((u) => !userId || u.userId === userId);
     const pagesets = users.flatMap((u) => u.vocabPaths);
-    return pagesets.flatMap((p) => readSnapUsage(p));
+    const usage = await Promise.all(pagesets.map(async (p) => await readSnapUsage(p)));
+    return usage.flat();
 }