include a file missed before

.cursor/rules/absurd-sql.mdc

@@ -1,153 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: true
----
-# Absurd SQL - Cursor Development Guide
-
-## Project Overview
-Absurd SQL is a backend implementation for sql.js that enables persistent SQLite databases in the browser by using IndexedDB as a block storage system. This guide provides rules and best practices for developing with this project in Cursor.
-
-## Project Structure
-```
-absurd-sql/
-├── src/               # Source code
-├── dist/             # Built files
-├── package.json      # Dependencies and scripts
-├── rollup.config.js  # Build configuration
-└── jest.config.js    # Test configuration
-```
-
-## Development Rules
-
-### 1. Worker Thread Requirements
-- All SQL operations MUST be performed in a worker thread
-- Main thread should only handle worker initialization and communication
-- Never block the main thread with database operations
-
-### 2. Code Organization
-- Keep worker code in separate files (e.g., `*.worker.js`)
-- Use ES modules for imports/exports
-- Follow the project's existing module structure
-
-### 3. Required Headers
-When developing locally or deploying, ensure these headers are set:
-```
-Cross-Origin-Opener-Policy: same-origin
-Cross-Origin-Embedder-Policy: require-corp
-```
-
-### 4. Browser Compatibility
-- Primary target: Modern browsers with SharedArrayBuffer support
-- Fallback mode: Safari (with limitations)
-- Always test in both modes
-
-### 5. Database Configuration
-Recommended database settings:
-```sql
-PRAGMA journal_mode=MEMORY;
-PRAGMA page_size=8192;  -- Optional, but recommended
-```
-
-### 6. Development Workflow
-1. Install dependencies:
-   ```bash
-   yarn add @jlongster/sql.js absurd-sql
-   ```
-
-2. Development commands:
-   - `yarn build` - Build the project
-   - `yarn jest` - Run tests
-   - `yarn serve` - Start development server
-
-### 7. Testing Guidelines
-- Write tests for both SharedArrayBuffer and fallback modes
-- Use Jest for testing
-- Include performance benchmarks for critical operations
-
-### 8. Performance Considerations
-- Use bulk operations when possible
-- Monitor read/write performance
-- Consider using transactions for multiple operations
-- Avoid unnecessary database connections
-
-### 9. Error Handling
-- Implement proper error handling for:
-  - Worker initialization failures
-  - Database connection issues
-  - Concurrent access conflicts (in fallback mode)
-  - Storage quota exceeded scenarios
-
-### 10. Security Best Practices
-- Never expose database operations directly to the client
-- Validate all SQL queries
-- Implement proper access controls
-- Handle sensitive data appropriately
-
-### 11. Code Style
-- Follow ESLint configuration
-- Use async/await for asynchronous operations
-- Document complex database operations
-- Include comments for non-obvious optimizations
-
-### 12. Debugging
-- Use `jest-debug` for debugging tests
-- Monitor IndexedDB usage in browser dev tools
-- Check worker communication in console
-- Use performance monitoring tools
-
-## Common Patterns
-
-### Worker Initialization
-```javascript
-// Main thread
-import { initBackend } from 'absurd-sql/dist/indexeddb-main-thread';
-
-function init() {
-  let worker = new Worker(new URL('./index.worker.js', import.meta.url));
-  initBackend(worker);
-}
-```
-
-### Database Setup
-```javascript
-// Worker thread
-import initSqlJs from '@jlongster/sql.js';
-import { SQLiteFS } from 'absurd-sql';
-import IndexedDBBackend from 'absurd-sql/dist/indexeddb-backend';
-
-async function setupDatabase() {
-  let SQL = await initSqlJs({ locateFile: file => file });
-  let sqlFS = new SQLiteFS(SQL.FS, new IndexedDBBackend());
-  SQL.register_for_idb(sqlFS);
-  
-  SQL.FS.mkdir('/sql');
-  SQL.FS.mount(sqlFS, {}, '/sql');
-  
-  return new SQL.Database('/sql/db.sqlite', { filename: true });
-}
-```
-
-## Troubleshooting
-
-### Common Issues
-1. SharedArrayBuffer not available
-   - Check COOP/COEP headers
-   - Verify browser support
-   - Test fallback mode
-
-2. Worker initialization failures
-   - Check file paths
-   - Verify module imports
-   - Check browser console for errors
-
-3. Performance issues
-   - Monitor IndexedDB usage
-   - Check for unnecessary operations
-   - Verify transaction usage
-
-## Resources
-- [Project Demo](https://priceless-keller-d097e5.netlify.app/)
-- [Example Project](https://github.com/jlongster/absurd-example-project)
-- [Blog Post](https://jlongster.com/future-sql-web)
-- [SQL.js Documentation](https://github.com/sql-js/sql.js/) 

.cursor/rules/crowd-funder-for-time-pwa/docs/camera-implementation.mdc

@@ -1,7 +1,7 @@
 ---
 description: 
 globs: 
-alwaysApply: false
+alwaysApply: true
 ---
 # Camera Implementation Documentation
 

.cursor/rules/wa-sqlite.mdc

@@ -1,267 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: true
----
-# wa-sqlite Usage Guide
-
-## Table of Contents
-- [1. Overview](#1-overview)
-- [2. Installation](#2-installation)
-- [3. Basic Setup](#3-basic-setup)
-  - [3.1 Import and Initialize](#31-import-and-initialize)
-  - [3.2 Basic Database Operations](#32-basic-database-operations)
-- [4. Virtual File Systems (VFS)](#4-virtual-file-systems-vfs)
-  - [4.1 Available VFS Options](#41-available-vfs-options)
-  - [4.2 Using a VFS](#42-using-a-vfs)
-- [5. Best Practices](#5-best-practices)
-  - [5.1 Error Handling](#51-error-handling)
-  - [5.2 Transaction Management](#52-transaction-management)
-  - [5.3 Prepared Statements](#53-prepared-statements)
-- [6. Performance Considerations](#6-performance-considerations)
-- [7. Common Issues and Solutions](#7-common-issues-and-solutions)
-- [8. TypeScript Support](#8-typescript-support)
-
-## 1. Overview
-wa-sqlite is a WebAssembly build of SQLite that enables SQLite database operations in web browsers and JavaScript environments. It provides both synchronous and asynchronous builds, with support for custom virtual file systems (VFS) for persistent storage.
-
-## 2. Installation
-```bash
-npm install wa-sqlite
-# or
-yarn add wa-sqlite
-```
-
-## 3. Basic Setup
-
-### 3.1 Import and Initialize
-```javascript
-// Choose one of these imports based on your needs:
-// - wa-sqlite.mjs: Synchronous build
-// - wa-sqlite-async.mjs: Asynchronous build (required for async VFS)
-// - wa-sqlite-jspi.mjs: JSPI-based async build (experimental, Chromium only)
-import SQLiteESMFactory from 'wa-sqlite/dist/wa-sqlite.mjs';
-import * as SQLite from 'wa-sqlite';
-
-async function initDatabase() {
-  // Initialize SQLite module
-  const module = await SQLiteESMFactory();
-  const sqlite3 = SQLite.Factory(module);
-  
-  // Open database (returns a Promise)
-  const db = await sqlite3.open_v2('myDatabase');
-  return { sqlite3, db };
-}
-```
-
-### 3.2 Basic Database Operations
-```javascript
-async function basicOperations() {
-  const { sqlite3, db } = await initDatabase();
-  
-  try {
-    // Create a table
-    await sqlite3.exec(db, `
-      CREATE TABLE IF NOT EXISTS users (
-        id INTEGER PRIMARY KEY,
-        name TEXT NOT NULL,
-        email TEXT UNIQUE
-      )
-    `);
-    
-    // Insert data
-    await sqlite3.exec(db, `
-      INSERT INTO users (name, email) 
-      VALUES ('John Doe', 'john@example.com')
-    `);
-    
-    // Query data
-    const results = [];
-    await sqlite3.exec(db, 'SELECT * FROM users', (row, columns) => {
-      results.push({ row, columns });
-    });
-    
-    return results;
-  } finally {
-    // Always close the database when done
-    await sqlite3.close(db);
-  }
-}
-```
-
-## 4. Virtual File Systems (VFS)
-
-### 4.1 Available VFS Options
-wa-sqlite provides several VFS implementations for persistent storage:
-
-1. **IDBBatchAtomicVFS** (Recommended for general use)
-   - Uses IndexedDB with batch atomic writes
-   - Works in all contexts (Window, Worker, Service Worker)
-   - Supports WAL mode
-   - Best performance with `PRAGMA synchronous=normal`
-
-2. **IDBMirrorVFS**
-   - Keeps files in memory, persists to IndexedDB
-   - Works in all contexts
-   - Good for smaller databases
-
-3. **OPFS-based VFS** (Origin Private File System)
-   - Various implementations available:
-     - AccessHandlePoolVFS
-     - OPFSAdaptiveVFS
-     - OPFSCoopSyncVFS
-     - OPFSPermutedVFS
-   - Better performance but limited to Worker contexts
-
-### 4.2 Using a VFS
-```javascript
-import { IDBBatchAtomicVFS } from 'wa-sqlite/src/examples/IDBBatchAtomicVFS.js';
-import SQLiteESMFactory from 'wa-sqlite/dist/wa-sqlite-async.mjs';
-import * as SQLite from 'wa-sqlite';
-
-async function initDatabaseWithVFS() {
-  const module = await SQLiteESMFactory();
-  const sqlite3 = SQLite.Factory(module);
-  
-  // Register VFS
-  const vfs = await IDBBatchAtomicVFS.create('myApp', module);
-  sqlite3.vfs_register(vfs, true);
-  
-  // Open database with VFS
-  const db = await sqlite3.open_v2('myDatabase');
-  
-  // Configure for better performance
-  await sqlite3.exec(db, 'PRAGMA synchronous = normal');
-  await sqlite3.exec(db, 'PRAGMA journal_mode = WAL');
-  
-  return { sqlite3, db };
-}
-```
-
-## 5. Best Practices
-
-### 5.1 Error Handling
-```javascript
-async function safeDatabaseOperation() {
-  const { sqlite3, db } = await initDatabase();
-  
-  try {
-    await sqlite3.exec(db, 'SELECT * FROM non_existent_table');
-  } catch (error) {
-    if (error.code === SQLite.SQLITE_ERROR) {
-      console.error('SQL error:', error.message);
-    } else {
-      console.error('Database error:', error);
-    }
-  } finally {
-    await sqlite3.close(db);
-  }
-}
-```
-
-### 5.2 Transaction Management
-```javascript
-async function transactionExample() {
-  const { sqlite3, db } = await initDatabase();
-  
-  try {
-    await sqlite3.exec(db, 'BEGIN TRANSACTION');
-    
-    // Perform multiple operations
-    await sqlite3.exec(db, 'INSERT INTO users (name) VALUES (?)', ['Alice']);
-    await sqlite3.exec(db, 'INSERT INTO users (name) VALUES (?)', ['Bob']);
-    
-    await sqlite3.exec(db, 'COMMIT');
-  } catch (error) {
-    await sqlite3.exec(db, 'ROLLBACK');
-    throw error;
-  } finally {
-    await sqlite3.close(db);
-  }
-}
-```
-
-### 5.3 Prepared Statements
-```javascript
-async function preparedStatementExample() {
-  const { sqlite3, db } = await initDatabase();
-  
-  try {
-    // Prepare statement
-    const stmt = await sqlite3.prepare(db, 'SELECT * FROM users WHERE id = ?');
-    
-    // Execute with different parameters
-    await sqlite3.bind(stmt, 1, 1);
-    while (await sqlite3.step(stmt) === SQLite.SQLITE_ROW) {
-      const row = sqlite3.row(stmt);
-      console.log(row);
-    }
-    
-    // Reset and reuse
-    await sqlite3.reset(stmt);
-    await sqlite3.bind(stmt, 1, 2);
-    // ... execute again
-    
-    await sqlite3.finalize(stmt);
-  } finally {
-    await sqlite3.close(db);
-  }
-}
-```
-
-## 6. Performance Considerations
-
-1. **VFS Selection**
-   - Use IDBBatchAtomicVFS for general-purpose applications
-   - Consider OPFS-based VFS for better performance in Worker contexts
-   - Use MemoryVFS for temporary databases
-
-2. **Configuration**
-   - Set appropriate page size (default is usually fine)
-   - Use WAL mode for better concurrency
-   - Consider `PRAGMA synchronous=normal` for better performance
-   - Adjust cache size based on your needs
-
-3. **Concurrency**
-   - Use transactions for multiple operations
-   - Be aware of VFS-specific concurrency limitations
-   - Consider using Web Workers for heavy database operations
-
-## 7. Common Issues and Solutions
-
-1. **Database Locking**
-   - Use appropriate transaction isolation levels
-   - Implement retry logic for busy errors
-   - Consider using WAL mode
-
-2. **Storage Limitations**
-   - Be aware of browser storage quotas
-   - Implement cleanup strategies
-   - Monitor database size
-
-3. **Cross-Context Access**
-   - Use appropriate VFS for your context
-   - Consider message passing for cross-context communication
-   - Be aware of storage access limitations
-
-## 8. TypeScript Support
-wa-sqlite includes TypeScript definitions. The main types are:
-
-```typescript
-type SQLiteCompatibleType = number | string | Uint8Array | Array<number> | bigint | null;
-
-interface SQLiteAPI {
-  open_v2(filename: string, flags?: number, zVfs?: string): Promise<number>;
-  exec(db: number, sql: string, callback?: (row: any[], columns: string[]) => void): Promise<number>;
-  close(db: number): Promise<number>;
-  // ... other methods
-}
-```
-
-## Additional Resources
-
-- [Official GitHub Repository](https://github.com/rhashimoto/wa-sqlite)
-- [Online Demo](https://rhashimoto.github.io/wa-sqlite/demo/)
-- [API Reference](https://rhashimoto.github.io/wa-sqlite/docs/)
-- [FAQ](https://github.com/rhashimoto/wa-sqlite/issues?q=is%3Aissue+label%3Afaq+)
-- [Discussion Forums](https://github.com/rhashimoto/wa-sqlite/discussions) 

.env.development

@@ -9,5 +9,4 @@ VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000
 # Using shared server by default to ease setup, which works for shared test users.
 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app
 VITE_DEFAULT_PARTNER_API_SERVER=http://localhost:3000
-#VITE_DEFAULT_PUSH_SERVER... can't be set up with localhost domain
 VITE_PASSKEYS_ENABLED=true

.env.example

@@ -0,0 +1,6 @@
+# Admin DID credentials
+ADMIN_DID=did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F
+ADMIN_PRIVATE_KEY=2b6472c026ec2aa2c4235c994a63868fc9212d18b58f6cbfe861b52e71330f5b
+
+# API Configuration
+ENDORSER_API_URL=https://test-api.endorser.ch/api/v2/claim 

.env.production

@@ -9,4 +9,3 @@ VITE_DEFAULT_ENDORSER_API_SERVER=https://api.endorser.ch
 
 VITE_DEFAULT_IMAGE_API_SERVER=https://image-api.timesafari.app
 VITE_DEFAULT_PARTNER_API_SERVER=https://partner-api.endorser.ch
-VITE_DEFAULT_PUSH_SERVER=https://timesafari.app

.env.staging

@@ -9,5 +9,4 @@ VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch
 
 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app
 VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch
-VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app
 VITE_PASSKEYS_ENABLED=true

.eslintrc.js

@@ -4,12 +4,6 @@ module.exports = {
     node: true,
     es2022: true,
   },
-  ignorePatterns: [
-    'node_modules/',
-    'dist/',
-    'dist-electron/',
-    '*.d.ts'
-  ],
   extends: [
     "plugin:vue/vue3-recommended",
     "eslint:recommended",

BUILDING.md

@@ -84,7 +84,7 @@ Install dependencies:
 * For test, build the app (because test server is not yet set up to build):
 
 ```bash
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app VITE_PASSKEYS_ENABLED=true npm run build
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_PASSKEYS_ENABLED=true npm run build
 ```
 
    ... and transfer to the test server:
@@ -241,9 +241,7 @@ docker run -d \
 1. Build the electron app in production mode:
 
    ```bash
-   npm run build:web
+   npm run build:electron-prod
-   npm run build:electron
-   npm run electron:build-mac
    ```
 
 2. Package the Electron app for macOS:

android/app/build.gradle

@@ -91,8 +91,6 @@ dependencies {
     implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
     implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
     implementation project(':capacitor-android')
-    implementation project(':capacitor-community-sqlite')
-    implementation "androidx.biometric:biometric:1.2.0-alpha05"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

android/app/capacitor.build.gradle

@@ -9,7 +9,6 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-    implementation project(':capacitor-community-sqlite')
     implementation project(':capacitor-mlkit-barcode-scanning')
     implementation project(':capacitor-app')
     implementation project(':capacitor-camera')

android/app/src/main/assets/capacitor.config.json

@@ -16,41 +16,6 @@
 					}
 				]
 			}
-		},
-		"SQLite": {
-			"iosDatabaseLocation": "Library/CapacitorDatabase",
-			"iosIsEncryption": true,
-			"iosBiometric": {
-				"biometricAuth": true,
-				"biometricTitle": "Biometric login for TimeSafari"
-			},
-			"androidIsEncryption": true,
-			"androidBiometric": {
-				"biometricAuth": true,
-				"biometricTitle": "Biometric login for TimeSafari"
-			}
 		}
-	},
-	"ios": {
-		"contentInset": "always",
-		"allowsLinkPreview": true,
-		"scrollEnabled": true,
-		"limitsNavigationsToAppBoundDomains": true,
-		"backgroundColor": "#ffffff",
-		"allowNavigation": [
-			"*.timesafari.app",
-			"*.jsdelivr.net",
-			"api.endorser.ch"
-		]
-	},
-	"android": {
-		"allowMixedContent": false,
-		"captureInput": true,
-		"webContentsDebuggingEnabled": false,
-		"allowNavigation": [
-			"*.timesafari.app",
-			"*.jsdelivr.net",
-			"api.endorser.ch"
-		]
 	}
 }

android/app/src/main/assets/capacitor.plugins.json

@@ -1,8 +1,4 @@
 [
-	{
-		"pkg": "@capacitor-community/sqlite",
-		"classpath": "com.getcapacitor.community.database.sqlite.CapacitorSQLitePlugin"
-	},
 	{
 		"pkg": "@capacitor-mlkit/barcode-scanning",
 		"classpath": "io.capawesome.capacitorjs.plugins.mlkit.barcodescanning.BarcodeScannerPlugin"

android/app/src/main/java/app/timesafari/MainActivity.java

@@ -1,15 +1,7 @@
 package app.timesafari;
 
-import android.os.Bundle;
 import com.getcapacitor.BridgeActivity;
-import com.getcapacitor.community.sqlite.SQLite;
 
 public class MainActivity extends BridgeActivity {
-    @Override
+    // ... existing code ...
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        // Initialize SQLite
-        registerPlugin(SQLite.class);
-    }
 } 

android/capacitor.settings.gradle

@@ -2,9 +2,6 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
-include ':capacitor-community-sqlite'
-project(':capacitor-community-sqlite').projectDir = new File('../node_modules/@capacitor-community/sqlite/android')
-
 include ':capacitor-mlkit-barcode-scanning'
 project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/@capacitor-mlkit/barcode-scanning/android')
 

capacitor.config.json

@@ -1,11 +1,10 @@
 {
-	"appId": "com.timesafari.app",
+	"appId": "app.timesafari",
 	"appName": "TimeSafari",
 	"webDir": "dist",
 	"bundledWebRuntime": false,
 	"server": {
-		"cleartext": true,
+		"cleartext": true
-		"androidScheme": "https"
 	},
 	"plugins": {
 		"App": {
@@ -17,47 +16,6 @@
 					}
 				]
 			}
-		},
-		"SQLite": {
-			"iosDatabaseLocation": "Library/CapacitorDatabase",
-			"iosIsEncryption": true,
-			"iosBiometric": {
-				"biometricAuth": true,
-				"biometricTitle": "Biometric login for TimeSafari"
-			},
-			"androidIsEncryption": true,
-			"androidBiometric": {
-				"biometricAuth": true,
-				"biometricTitle": "Biometric login for TimeSafari"
-			}
-		},
-		"CapacitorSQLite": {
-			"electronIsEncryption": false,
-			"electronMacLocation": "~/Library/Application Support/TimeSafari",
-			"electronWindowsLocation": "C:\\ProgramData\\TimeSafari",
-			"electronLinuxLocation": "~/.local/share/TimeSafari"
 		}
-	},
-	"ios": {
-		"contentInset": "always",
-		"allowsLinkPreview": true,
-		"scrollEnabled": true,
-		"limitsNavigationsToAppBoundDomains": true,
-		"backgroundColor": "#ffffff",
-		"allowNavigation": [
-			"*.timesafari.app",
-			"*.jsdelivr.net",
-			"api.endorser.ch"
-		]
-	},
-	"android": {
-		"allowMixedContent": false,
-		"captureInput": true,
-		"webContentsDebuggingEnabled": false,
-		"allowNavigation": [
-			"*.timesafari.app",
-			"*.jsdelivr.net",
-			"api.endorser.ch"
-		]
 	}
 }

doc/dexie-to-sqlite-mapping.md

@@ -1,399 +0,0 @@
-# Dexie to absurd-sql Mapping Guide
-
-## Schema Mapping
-
-### Current Dexie Schema
-```typescript
-// Current Dexie schema
-const db = new Dexie('TimeSafariDB');
-
-db.version(1).stores({
-  accounts: 'did, publicKeyHex, createdAt, updatedAt',
-  settings: 'key, value, updatedAt',
-  contacts: 'id, did, name, createdAt, updatedAt'
-});
-```
-
-### New SQLite Schema
-```sql
--- New SQLite schema
-CREATE TABLE accounts (
-  did TEXT PRIMARY KEY,
-  public_key_hex TEXT NOT NULL,
-  created_at INTEGER NOT NULL,
-  updated_at INTEGER NOT NULL
-);
-
-CREATE TABLE settings (
-  key TEXT PRIMARY KEY,
-  value TEXT NOT NULL,
-  updated_at INTEGER NOT NULL
-);
-
-CREATE TABLE contacts (
-  id TEXT PRIMARY KEY,
-  did TEXT NOT NULL,
-  name TEXT,
-  created_at INTEGER NOT NULL,
-  updated_at INTEGER NOT NULL,
-  FOREIGN KEY (did) REFERENCES accounts(did)
-);
-
--- Indexes for performance
-CREATE INDEX idx_accounts_created_at ON accounts(created_at);
-CREATE INDEX idx_contacts_did ON contacts(did);
-CREATE INDEX idx_settings_updated_at ON settings(updated_at);
-```
-
-## Query Mapping
-
-### 1. Account Operations
-
-#### Get Account by DID
-```typescript
-// Dexie
-const account = await db.accounts.get(did);
-
-// absurd-sql
-const result = await db.exec(`
-  SELECT * FROM accounts WHERE did = ?
-`, [did]);
-const account = result[0]?.values[0];
-```
-
-#### Get All Accounts
-```typescript
-// Dexie
-const accounts = await db.accounts.toArray();
-
-// absurd-sql
-const result = await db.exec(`
-  SELECT * FROM accounts ORDER BY created_at DESC
-`);
-const accounts = result[0]?.values || [];
-```
-
-#### Add Account
-```typescript
-// Dexie
-await db.accounts.add({
-  did,
-  publicKeyHex,
-  createdAt: Date.now(),
-  updatedAt: Date.now()
-});
-
-// absurd-sql
-await db.run(`
-  INSERT INTO accounts (did, public_key_hex, created_at, updated_at)
-  VALUES (?, ?, ?, ?)
-`, [did, publicKeyHex, Date.now(), Date.now()]);
-```
-
-#### Update Account
-```typescript
-// Dexie
-await db.accounts.update(did, {
-  publicKeyHex,
-  updatedAt: Date.now()
-});
-
-// absurd-sql
-await db.run(`
-  UPDATE accounts 
-  SET public_key_hex = ?, updated_at = ?
-  WHERE did = ?
-`, [publicKeyHex, Date.now(), did]);
-```
-
-### 2. Settings Operations
-
-#### Get Setting
-```typescript
-// Dexie
-const setting = await db.settings.get(key);
-
-// absurd-sql
-const result = await db.exec(`
-  SELECT * FROM settings WHERE key = ?
-`, [key]);
-const setting = result[0]?.values[0];
-```
-
-#### Set Setting
-```typescript
-// Dexie
-await db.settings.put({
-  key,
-  value,
-  updatedAt: Date.now()
-});
-
-// absurd-sql
-await db.run(`
-  INSERT INTO settings (key, value, updated_at)
-  VALUES (?, ?, ?)
-  ON CONFLICT(key) DO UPDATE SET
-    value = excluded.value,
-    updated_at = excluded.updated_at
-`, [key, value, Date.now()]);
-```
-
-### 3. Contact Operations
-
-#### Get Contacts by Account
-```typescript
-// Dexie
-const contacts = await db.contacts
-  .where('did')
-  .equals(accountDid)
-  .toArray();
-
-// absurd-sql
-const result = await db.exec(`
-  SELECT * FROM contacts 
-  WHERE did = ?
-  ORDER BY created_at DESC
-`, [accountDid]);
-const contacts = result[0]?.values || [];
-```
-
-#### Add Contact
-```typescript
-// Dexie
-await db.contacts.add({
-  id: generateId(),
-  did: accountDid,
-  name,
-  createdAt: Date.now(),
-  updatedAt: Date.now()
-});
-
-// absurd-sql
-await db.run(`
-  INSERT INTO contacts (id, did, name, created_at, updated_at)
-  VALUES (?, ?, ?, ?, ?)
-`, [generateId(), accountDid, name, Date.now(), Date.now()]);
-```
-
-## Transaction Mapping
-
-### Batch Operations
-```typescript
-// Dexie
-await db.transaction('rw', [db.accounts, db.contacts], async () => {
-  await db.accounts.add(account);
-  await db.contacts.bulkAdd(contacts);
-});
-
-// absurd-sql
-await db.exec('BEGIN TRANSACTION;');
-try {
-  await db.run(`
-    INSERT INTO accounts (did, public_key_hex, created_at, updated_at)
-    VALUES (?, ?, ?, ?)
-  `, [account.did, account.publicKeyHex, account.createdAt, account.updatedAt]);
-
-  for (const contact of contacts) {
-    await db.run(`
-      INSERT INTO contacts (id, did, name, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?)
-    `, [contact.id, contact.did, contact.name, contact.createdAt, contact.updatedAt]);
-  }
-  await db.exec('COMMIT;');
-} catch (error) {
-  await db.exec('ROLLBACK;');
-  throw error;
-}
-```
-
-## Migration Helper Functions
-
-### 1. Data Export (Dexie to JSON)
-```typescript
-async function exportDexieData(): Promise<MigrationData> {
-  const db = new Dexie('TimeSafariDB');
-  
-  return {
-    accounts: await db.accounts.toArray(),
-    settings: await db.settings.toArray(),
-    contacts: await db.contacts.toArray(),
-    metadata: {
-      version: '1.0.0',
-      timestamp: Date.now(),
-      dexieVersion: Dexie.version
-    }
-  };
-}
-```
-
-### 2. Data Import (JSON to absurd-sql)
-```typescript
-async function importToAbsurdSql(data: MigrationData): Promise<void> {
-  await db.exec('BEGIN TRANSACTION;');
-  try {
-    // Import accounts
-    for (const account of data.accounts) {
-      await db.run(`
-        INSERT INTO accounts (did, public_key_hex, created_at, updated_at)
-        VALUES (?, ?, ?, ?)
-      `, [account.did, account.publicKeyHex, account.createdAt, account.updatedAt]);
-    }
-    
-    // Import settings
-    for (const setting of data.settings) {
-      await db.run(`
-        INSERT INTO settings (key, value, updated_at)
-        VALUES (?, ?, ?)
-      `, [setting.key, setting.value, setting.updatedAt]);
-    }
-    
-    // Import contacts
-    for (const contact of data.contacts) {
-      await db.run(`
-        INSERT INTO contacts (id, did, name, created_at, updated_at)
-        VALUES (?, ?, ?, ?, ?)
-      `, [contact.id, contact.did, contact.name, contact.createdAt, contact.updatedAt]);
-    }
-    await db.exec('COMMIT;');
-  } catch (error) {
-    await db.exec('ROLLBACK;');
-    throw error;
-  }
-}
-```
-
-### 3. Verification
-```typescript
-async function verifyMigration(dexieData: MigrationData): Promise<boolean> {
-  // Verify account count
-  const accountResult = await db.exec('SELECT COUNT(*) as count FROM accounts');
-  const accountCount = accountResult[0].values[0][0];
-  if (accountCount !== dexieData.accounts.length) {
-    return false;
-  }
-  
-  // Verify settings count
-  const settingsResult = await db.exec('SELECT COUNT(*) as count FROM settings');
-  const settingsCount = settingsResult[0].values[0][0];
-  if (settingsCount !== dexieData.settings.length) {
-    return false;
-  }
-  
-  // Verify contacts count
-  const contactsResult = await db.exec('SELECT COUNT(*) as count FROM contacts');
-  const contactsCount = contactsResult[0].values[0][0];
-  if (contactsCount !== dexieData.contacts.length) {
-    return false;
-  }
-  
-  // Verify data integrity
-  for (const account of dexieData.accounts) {
-    const result = await db.exec(
-      'SELECT * FROM accounts WHERE did = ?',
-      [account.did]
-    );
-    const migratedAccount = result[0]?.values[0];
-    if (!migratedAccount || 
-        migratedAccount[1] !== account.publicKeyHex) { // public_key_hex is second column
-      return false;
-    }
-  }
-  
-  return true;
-}
-```
-
-## Performance Considerations
-
-### 1. Indexing
-- Dexie automatically creates indexes based on the schema
-- absurd-sql requires explicit index creation
-- Added indexes for frequently queried fields
-- Use `PRAGMA journal_mode=MEMORY;` for better performance
-
-### 2. Batch Operations
-- Dexie has built-in bulk operations
-- absurd-sql uses transactions for batch operations
-- Consider chunking large datasets
-- Use prepared statements for repeated queries
-
-### 3. Query Optimization
-- Dexie uses IndexedDB's native indexing
-- absurd-sql requires explicit query optimization
-- Use prepared statements for repeated queries
-- Consider using `PRAGMA synchronous=NORMAL;` for better performance
-
-## Error Handling
-
-### 1. Common Errors
-```typescript
-// Dexie errors
-try {
-  await db.accounts.add(account);
-} catch (error) {
-  if (error instanceof Dexie.ConstraintError) {
-    // Handle duplicate key
-  }
-}
-
-// absurd-sql errors
-try {
-  await db.run(`
-    INSERT INTO accounts (did, public_key_hex, created_at, updated_at)
-    VALUES (?, ?, ?, ?)
-  `, [account.did, account.publicKeyHex, account.createdAt, account.updatedAt]);
-} catch (error) {
-  if (error.message.includes('UNIQUE constraint failed')) {
-    // Handle duplicate key
-  }
-}
-```
-
-### 2. Transaction Recovery
-```typescript
-// Dexie transaction
-try {
-  await db.transaction('rw', db.accounts, async () => {
-    // Operations
-  });
-} catch (error) {
-  // Dexie automatically rolls back
-}
-
-// absurd-sql transaction
-try {
-  await db.exec('BEGIN TRANSACTION;');
-  // Operations
-  await db.exec('COMMIT;');
-} catch (error) {
-  await db.exec('ROLLBACK;');
-  throw error;
-}
-```
-
-## Migration Strategy
-
-1. **Preparation**
-   - Export all Dexie data
-   - Verify data integrity
-   - Create SQLite schema
-   - Setup indexes
-
-2. **Migration**
-   - Import data in transactions
-   - Verify each batch
-   - Handle errors gracefully
-   - Maintain backup
-
-3. **Verification**
-   - Compare record counts
-   - Verify data integrity
-   - Test common queries
-   - Validate relationships
-
-4. **Cleanup**
-   - Remove Dexie database
-   - Clear IndexedDB storage
-   - Update application code
-   - Remove old dependencies 

doc/electron-migration.md

@@ -1,270 +0,0 @@
-# Electron App Migration Strategy
-
-## Overview
-
-This document outlines the migration strategy for the TimeSafari Electron app, focusing on the transition from web-based storage to native SQLite implementation while maintaining cross-platform compatibility.
-
-## Current Architecture
-
-### 1. Platform Services
-- `ElectronPlatformService`: Implements platform-specific features for desktop
-- Uses `@capacitor-community/sqlite` for database operations
-- Maintains compatibility with web/mobile platforms through shared interfaces
-
-### 2. Database Implementation
-- SQLite with native Node.js backend
-- WAL journal mode for better concurrency
-- Connection pooling for performance
-- Migration system for schema updates
-- Secure file permissions (0o755)
-
-### 3. Build Process
-```bash
-# Development
-npm run dev:electron
-
-# Production Build
-npm run build:web
-npm run build:electron
-npm run electron:build-linux  # or electron:build-mac
-```
-
-## Migration Goals
-
-1. **Data Integrity**
-   - Preserve existing data during migration
-   - Maintain data relationships
-   - Ensure ACID compliance
-   - Implement proper backup/restore
-
-2. **Performance**
-   - Optimize SQLite configuration
-   - Implement connection pooling
-   - Use WAL journal mode
-   - Configure optimal PRAGMA settings
-
-3. **Security**
-   - Secure file permissions
-   - Proper IPC communication
-   - Context isolation
-   - Safe preload scripts
-
-4. **User Experience**
-   - Zero data loss
-   - Automatic migration
-   - Progress indicators
-   - Error recovery
-
-## Implementation Details
-
-### 1. Database Initialization
-```typescript
-// electron/src/rt/sqlite-init.ts
-export async function initializeSQLite() {
-  // Set up database path with proper permissions
-  const dbPath = path.join(app.getPath('userData'), 'timesafari.db');
-  
-  // Initialize SQLite plugin
-  const sqlite = new CapacitorSQLite();
-  
-  // Configure database
-  await sqlite.createConnection({
-    database: 'timesafari',
-    path: dbPath,
-    encrypted: false,
-    mode: 'no-encryption'
-  });
-  
-  // Set optimal PRAGMA settings
-  await sqlite.execute({
-    database: 'timesafari',
-    statements: [
-      'PRAGMA journal_mode = WAL;',
-      'PRAGMA synchronous = NORMAL;',
-      'PRAGMA foreign_keys = ON;'
-    ]
-  });
-}
-```
-
-### 2. Migration System
-```typescript
-// electron/src/rt/sqlite-migrations.ts
-interface Migration {
-  version: number;
-  name: string;
-  description: string;
-  sql: string;
-  rollback?: string;
-}
-
-async function runMigrations(plugin: any, database: string) {
-  // Track migration state
-  const state = await getMigrationState(plugin, database);
-  
-  // Execute migrations in transaction
-  for (const migration of pendingMigrations) {
-    await executeMigration(plugin, database, migration);
-  }
-}
-```
-
-### 3. Platform Service Implementation
-```typescript
-// src/services/platforms/ElectronPlatformService.ts
-export class ElectronPlatformService implements PlatformService {
-  private sqlite: any;
-  
-  async dbQuery(sql: string, params: any[]): Promise<QueryExecResult> {
-    return await this.sqlite.execute({
-      database: 'timesafari',
-      statements: [{ statement: sql, values: params }]
-    });
-  }
-}
-```
-
-### 4. Preload Script
-```typescript
-// electron/preload.ts
-contextBridge.exposeInMainWorld('electron', {
-  sqlite: {
-    isAvailable: () => ipcRenderer.invoke('sqlite:isAvailable'),
-    execute: (method: string, ...args: unknown[]) => 
-      ipcRenderer.invoke('sqlite:execute', method, ...args)
-  },
-  getPath: (pathType: string) => ipcRenderer.invoke('get-path', pathType),
-  env: {
-    platform: 'electron'
-  }
-});
-```
-
-## Build Configuration
-
-### 1. Vite Configuration
-```typescript
-// vite.config.app.electron.mts
-export default defineConfig({
-  build: {
-    outDir: 'dist',
-    emptyOutDir: true
-  },
-  define: {
-    'process.env.VITE_PLATFORM': JSON.stringify('electron'),
-    'process.env.VITE_PWA_ENABLED': JSON.stringify(false)
-  }
-});
-```
-
-### 2. Package Scripts
-```json
-{
-  "scripts": {
-    "dev:electron": "vite build --watch --config vite.config.app.electron.mts",
-    "build:electron": "vite build --config vite.config.app.electron.mts",
-    "electron:build-linux": "electron-builder --linux",
-    "electron:build-mac": "electron-builder --mac"
-  }
-}
-```
-
-## Testing Strategy
-
-1. **Unit Tests**
-   - Database operations
-   - Migration system
-   - Platform service methods
-   - IPC communication
-
-2. **Integration Tests**
-   - Full migration process
-   - Data integrity verification
-   - Cross-platform compatibility
-   - Error recovery
-
-3. **End-to-End Tests**
-   - User workflows
-   - Data persistence
-   - UI interactions
-   - Platform-specific features
-
-## Error Handling
-
-1. **Database Errors**
-   - Connection failures
-   - Migration errors
-   - Query execution errors
-   - Transaction failures
-
-2. **Platform Errors**
-   - File system errors
-   - IPC communication errors
-   - Permission issues
-   - Resource constraints
-
-3. **Recovery Mechanisms**
-   - Automatic retry logic
-   - Transaction rollback
-   - State verification
-   - User notifications
-
-## Security Considerations
-
-1. **File System**
-   - Secure file permissions
-   - Path validation
-   - Access control
-   - Data encryption
-
-2. **IPC Communication**
-   - Context isolation
-   - Channel validation
-   - Data sanitization
-   - Error handling
-
-3. **Preload Scripts**
-   - Minimal API exposure
-   - Type safety
-   - Input validation
-   - Error boundaries
-
-## Future Improvements
-
-1. **Performance**
-   - Query optimization
-   - Index tuning
-   - Connection management
-   - Cache implementation
-
-2. **Features**
-   - Offline support
-   - Sync capabilities
-   - Backup/restore
-   - Data export/import
-
-3. **Security**
-   - Database encryption
-   - Secure storage
-   - Access control
-   - Audit logging
-
-## Maintenance
-
-1. **Regular Tasks**
-   - Database optimization
-   - Log rotation
-   - Error monitoring
-   - Performance tracking
-
-2. **Updates**
-   - Dependency updates
-   - Security patches
-   - Feature additions
-   - Bug fixes
-
-3. **Documentation**
-   - API documentation
-   - Migration guides
-   - Troubleshooting
-   - Best practices 

doc/migration-to-wa-sqlite.md

@@ -1,613 +0,0 @@
-# Migration Guide: Dexie to absurd-sql
-
-## Overview
-
-This document outlines the migration process from Dexie.js to absurd-sql for the TimeSafari app's storage implementation. The migration aims to provide a consistent SQLite-based storage solution across all platforms while maintaining data integrity and ensuring a smooth transition for users.
-
-## Migration Goals
-
-1. **Data Integrity**
-   - Preserve all existing data
-   - Maintain data relationships
-   - Ensure data consistency
-
-2. **Performance**
-   - Improve query performance
-   - Reduce storage overhead
-   - Optimize for platform-specific features
-
-3. **Security**
-   - Maintain or improve encryption
-   - Preserve access controls
-   - Enhance data protection
-
-4. **User Experience**
-   - Zero data loss
-   - Minimal downtime
-   - Automatic migration where possible
-
-## Prerequisites
-
-1. **Backup Requirements**
-   ```typescript
-   interface MigrationBackup {
-     timestamp: number;
-     accounts: Account[];
-     settings: Setting[];
-     contacts: Contact[];
-     metadata: {
-       version: string;
-       platform: string;
-       dexieVersion: string;
-     };
-   }
-   ```
-
-2. **Dependencies**
-   ```json
-   {
-     "@jlongster/sql.js": "^1.8.0",
-     "absurd-sql": "^1.8.0"
-   }
-   ```
-
-3. **Storage Requirements**
-   - Sufficient IndexedDB quota
-   - Available disk space for SQLite
-   - Backup storage space
-
-4. **Platform Support**
-   - Web: Modern browser with IndexedDB support
-   - iOS: iOS 13+ with SQLite support
-   - Android: Android 5+ with SQLite support
-   - Electron: Latest version with SQLite support
-
-## Migration Process
-
-### 1. Preparation
-
-```typescript
-// src/services/storage/migration/MigrationService.ts
-import initSqlJs from '@jlongster/sql.js';
-import { SQLiteFS } from 'absurd-sql';
-import IndexedDBBackend from 'absurd-sql/dist/indexeddb-backend';
-
-export class MigrationService {
-  private static instance: MigrationService;
-  private backup: MigrationBackup | null = null;
-  private sql: any = null;
-  private db: any = null;
-
-  async prepare(): Promise<void> {
-    try {
-      // 1. Check prerequisites
-      await this.checkPrerequisites();
-      
-      // 2. Create backup
-      this.backup = await this.createBackup();
-      
-      // 3. Verify backup integrity
-      await this.verifyBackup();
-      
-      // 4. Initialize absurd-sql
-      await this.initializeAbsurdSql();
-    } catch (error) {
-      throw new StorageError(
-        'Migration preparation failed',
-        StorageErrorCodes.MIGRATION_FAILED,
-        error
-      );
-    }
-  }
-
-  private async initializeAbsurdSql(): Promise<void> {
-    // Initialize SQL.js
-    this.sql = await initSqlJs({
-      locateFile: (file: string) => {
-        return new URL(`/node_modules/@jlongster/sql.js/dist/${file}`, import.meta.url).href;
-      }
-    });
-
-    // Setup SQLiteFS with IndexedDB backend
-    const sqlFS = new SQLiteFS(this.sql.FS, new IndexedDBBackend());
-    this.sql.register_for_idb(sqlFS);
-
-    // Create and mount filesystem
-    this.sql.FS.mkdir('/sql');
-    this.sql.FS.mount(sqlFS, {}, '/sql');
-
-    // Open database
-    const path = '/sql/db.sqlite';
-    if (typeof SharedArrayBuffer === 'undefined') {
-      let stream = this.sql.FS.open(path, 'a+');
-      await stream.node.contents.readIfFallback();
-      this.sql.FS.close(stream);
-    }
-
-    this.db = new this.sql.Database(path, { filename: true });
-    if (!this.db) {
-      throw new StorageError(
-        'Database initialization failed',
-        StorageErrorCodes.INITIALIZATION_FAILED
-      );
-    }
-
-    // Configure database
-    await this.db.exec(`PRAGMA journal_mode=MEMORY;`);
-  }
-
-  private async checkPrerequisites(): Promise<void> {
-    // Check IndexedDB availability
-    if (!window.indexedDB) {
-      throw new StorageError(
-        'IndexedDB not available',
-        StorageErrorCodes.INITIALIZATION_FAILED
-      );
-    }
-
-    // Check storage quota
-    const quota = await navigator.storage.estimate();
-    if (quota.quota && quota.usage && quota.usage > quota.quota * 0.9) {
-      throw new StorageError(
-        'Insufficient storage space',
-        StorageErrorCodes.STORAGE_FULL
-      );
-    }
-
-    // Check platform support
-    const capabilities = await PlatformDetection.getCapabilities();
-    if (!capabilities.hasFileSystem) {
-      throw new StorageError(
-        'Platform does not support required features',
-        StorageErrorCodes.INITIALIZATION_FAILED
-      );
-    }
-  }
-
-  private async createBackup(): Promise<MigrationBackup> {
-    const dexieDB = new Dexie('TimeSafariDB');
-    
-    return {
-      timestamp: Date.now(),
-      accounts: await dexieDB.accounts.toArray(),
-      settings: await dexieDB.settings.toArray(),
-      contacts: await dexieDB.contacts.toArray(),
-      metadata: {
-        version: '1.0.0',
-        platform: await PlatformDetection.getPlatform(),
-        dexieVersion: Dexie.version
-      }
-    };
-  }
-}
-```
-
-### 2. Data Migration
-
-```typescript
-// src/services/storage/migration/DataMigration.ts
-export class DataMigration {
-  async migrate(backup: MigrationBackup): Promise<void> {
-    try {
-      // 1. Create new database schema
-      await this.createSchema();
-      
-      // 2. Migrate accounts
-      await this.migrateAccounts(backup.accounts);
-      
-      // 3. Migrate settings
-      await this.migrateSettings(backup.settings);
-      
-      // 4. Migrate contacts
-      await this.migrateContacts(backup.contacts);
-      
-      // 5. Verify migration
-      await this.verifyMigration(backup);
-    } catch (error) {
-      // 6. Handle failure
-      await this.handleMigrationFailure(error, backup);
-    }
-  }
-
-  private async migrateAccounts(accounts: Account[]): Promise<void> {
-    // Use transaction for atomicity
-    await this.db.exec('BEGIN TRANSACTION;');
-    try {
-      for (const account of accounts) {
-        await this.db.run(`
-          INSERT INTO accounts (did, public_key_hex, created_at, updated_at)
-          VALUES (?, ?, ?, ?)
-        `, [
-          account.did,
-          account.publicKeyHex,
-          account.createdAt,
-          account.updatedAt
-        ]);
-      }
-      await this.db.exec('COMMIT;');
-    } catch (error) {
-      await this.db.exec('ROLLBACK;');
-      throw error;
-    }
-  }
-
-  private async verifyMigration(backup: MigrationBackup): Promise<void> {
-    // Verify account count
-    const result = await this.db.exec('SELECT COUNT(*) as count FROM accounts');
-    const accountCount = result[0].values[0][0];
-    
-    if (accountCount !== backup.accounts.length) {
-      throw new StorageError(
-        'Account count mismatch',
-        StorageErrorCodes.VERIFICATION_FAILED
-      );
-    }
-
-    // Verify data integrity
-    await this.verifyDataIntegrity(backup);
-  }
-}
-```
-
-### 3. Rollback Strategy
-
-```typescript
-// src/services/storage/migration/RollbackService.ts
-export class RollbackService {
-  async rollback(backup: MigrationBackup): Promise<void> {
-    try {
-      // 1. Stop all database operations
-      await this.stopDatabaseOperations();
-      
-      // 2. Restore from backup
-      await this.restoreFromBackup(backup);
-      
-      // 3. Verify restoration
-      await this.verifyRestoration(backup);
-      
-      // 4. Clean up absurd-sql
-      await this.cleanupAbsurdSql();
-    } catch (error) {
-      throw new StorageError(
-        'Rollback failed',
-        StorageErrorCodes.ROLLBACK_FAILED,
-        error
-      );
-    }
-  }
-
-  private async restoreFromBackup(backup: MigrationBackup): Promise<void> {
-    const dexieDB = new Dexie('TimeSafariDB');
-    
-    // Restore accounts
-    await dexieDB.accounts.bulkPut(backup.accounts);
-    
-    // Restore settings
-    await dexieDB.settings.bulkPut(backup.settings);
-    
-    // Restore contacts
-    await dexieDB.contacts.bulkPut(backup.contacts);
-  }
-}
-```
-
-## Migration UI
-
-```vue
-<!-- src/components/MigrationProgress.vue -->
-<template>
-  <div class="migration-progress">
-    <h2>Database Migration</h2>
-    
-    <div class="progress-container">
-      <div class="progress-bar" :style="{ width: `${progress}%` }" />
-      <div class="progress-text">{{ progress }}%</div>
-    </div>
-    
-    <div class="status-message">{{ statusMessage }}</div>
-    
-    <div v-if="error" class="error-message">
-      {{ error }}
-      <button @click="retryMigration">Retry</button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted } from 'vue';
-import { MigrationService } from '@/services/storage/migration/MigrationService';
-
-const progress = ref(0);
-const statusMessage = ref('Preparing migration...');
-const error = ref<string | null>(null);
-
-const migrationService = MigrationService.getInstance();
-
-async function startMigration() {
-  try {
-    // 1. Preparation
-    statusMessage.value = 'Creating backup...';
-    await migrationService.prepare();
-    progress.value = 20;
-    
-    // 2. Data migration
-    statusMessage.value = 'Migrating data...';
-    await migrationService.migrate();
-    progress.value = 80;
-    
-    // 3. Verification
-    statusMessage.value = 'Verifying migration...';
-    await migrationService.verify();
-    progress.value = 100;
-    
-    statusMessage.value = 'Migration completed successfully!';
-  } catch (err) {
-    error.value = err instanceof Error ? err.message : 'Migration failed';
-    statusMessage.value = 'Migration failed';
-  }
-}
-
-async function retryMigration() {
-  error.value = null;
-  progress.value = 0;
-  await startMigration();
-}
-
-onMounted(() => {
-  startMigration();
-});
-</script>
-
-<style scoped>
-.migration-progress {
-  padding: 2rem;
-  max-width: 600px;
-  margin: 0 auto;
-}
-
-.progress-container {
-  position: relative;
-  height: 20px;
-  background: #eee;
-  border-radius: 10px;
-  overflow: hidden;
-  margin: 1rem 0;
-}
-
-.progress-bar {
-  position: absolute;
-  height: 100%;
-  background: #4CAF50;
-  transition: width 0.3s ease;
-}
-
-.progress-text {
-  position: absolute;
-  width: 100%;
-  text-align: center;
-  line-height: 20px;
-  color: #000;
-}
-
-.status-message {
-  text-align: center;
-  margin: 1rem 0;
-}
-
-.error-message {
-  color: #f44336;
-  text-align: center;
-  margin: 1rem 0;
-}
-
-button {
-  margin-top: 1rem;
-  padding: 0.5rem 1rem;
-  background: #2196F3;
-  color: white;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-}
-
-button:hover {
-  background: #1976D2;
-}
-</style>
-```
-
-## Testing Strategy
-
-1. **Unit Tests**
-   ```typescript
-   // src/services/storage/migration/__tests__/MigrationService.spec.ts
-   describe('MigrationService', () => {
-     it('should initialize absurd-sql correctly', async () => {
-       const service = MigrationService.getInstance();
-       await service.initializeAbsurdSql();
-       
-       expect(service.isInitialized()).toBe(true);
-       expect(service.getDatabase()).toBeDefined();
-     });
-
-     it('should create valid backup', async () => {
-       const service = MigrationService.getInstance();
-       const backup = await service.createBackup();
-       
-       expect(backup).toBeDefined();
-       expect(backup.accounts).toBeInstanceOf(Array);
-       expect(backup.settings).toBeInstanceOf(Array);
-       expect(backup.contacts).toBeInstanceOf(Array);
-     });
-
-     it('should migrate data correctly', async () => {
-       const service = MigrationService.getInstance();
-       const backup = await service.createBackup();
-       
-       await service.migrate(backup);
-       
-       // Verify migration
-       const accounts = await service.getMigratedAccounts();
-       expect(accounts).toHaveLength(backup.accounts.length);
-     });
-
-     it('should handle rollback correctly', async () => {
-       const service = MigrationService.getInstance();
-       const backup = await service.createBackup();
-       
-       // Simulate failed migration
-       await service.migrate(backup);
-       await service.simulateFailure();
-       
-       // Perform rollback
-       await service.rollback(backup);
-       
-       // Verify rollback
-       const accounts = await service.getOriginalAccounts();
-       expect(accounts).toHaveLength(backup.accounts.length);
-     });
-   });
-   ```
-
-2. **Integration Tests**
-   ```typescript
-   // src/services/storage/migration/__tests__/integration/Migration.spec.ts
-   describe('Migration Integration', () => {
-     it('should handle concurrent access during migration', async () => {
-       const service = MigrationService.getInstance();
-       
-       // Start migration
-       const migrationPromise = service.migrate();
-       
-       // Simulate concurrent access
-       const accessPromises = Array(5).fill(null).map(() =>
-         service.getAccount('did:test:123')
-       );
-       
-       // Wait for all operations
-       const [migrationResult, ...accessResults] = await Promise.allSettled([
-         migrationPromise,
-         ...accessPromises
-       ]);
-       
-       // Verify results
-       expect(migrationResult.status).toBe('fulfilled');
-       expect(accessResults.some(r => r.status === 'rejected')).toBe(true);
-     });
-
-     it('should maintain data integrity during platform transition', async () => {
-       const service = MigrationService.getInstance();
-       
-       // Simulate platform change
-       await service.simulatePlatformChange();
-       
-       // Verify data
-       const accounts = await service.getAllAccounts();
-       const settings = await service.getAllSettings();
-       const contacts = await service.getAllContacts();
-       
-       expect(accounts).toBeDefined();
-       expect(settings).toBeDefined();
-       expect(contacts).toBeDefined();
-     });
-   });
-   ```
-
-## Success Criteria
-
-1. **Data Integrity**
-   - [ ] All accounts migrated successfully
-   - [ ] All settings preserved
-   - [ ] All contacts transferred
-   - [ ] No data corruption
-
-2. **Performance**
-   - [ ] Migration completes within acceptable time
-   - [ ] No significant performance degradation
-   - [ ] Efficient storage usage
-   - [ ] Smooth user experience
-
-3. **Security**
-   - [ ] Encrypted data remains secure
-   - [ ] Access controls maintained
-   - [ ] No sensitive data exposure
-   - [ ] Secure backup process
-
-4. **User Experience**
-   - [ ] Clear migration progress
-   - [ ] Informative error messages
-   - [ ] Automatic recovery from failures
-   - [ ] No data loss
-
-## Rollback Plan
-
-1. **Automatic Rollback**
-   - Triggered by migration failure
-   - Restores from verified backup
-   - Maintains data consistency
-   - Logs rollback reason
-
-2. **Manual Rollback**
-   - Available through settings
-   - Requires user confirmation
-   - Preserves backup data
-   - Provides rollback status
-
-3. **Emergency Recovery**
-   - Manual backup restoration
-   - Database repair tools
-   - Data recovery procedures
-   - Support contact information
-
-## Post-Migration
-
-1. **Verification**
-   - Data integrity checks
-   - Performance monitoring
-   - Error rate tracking
-   - User feedback collection
-
-2. **Cleanup**
-   - Remove old database
-   - Clear migration artifacts
-   - Update application state
-   - Archive backup data
-
-3. **Monitoring**
-   - Track migration success rate
-   - Monitor performance metrics
-   - Collect error reports
-   - Gather user feedback
-
-## Support
-
-For assistance with migration:
-1. Check the troubleshooting guide
-2. Review error logs
-3. Contact support team
-4. Submit issue report
-
-## Timeline
-
-1. **Preparation Phase** (1 week)
-   - Backup system implementation
-   - Migration service development
-   - Testing framework setup
-
-2. **Testing Phase** (2 weeks)
-   - Unit testing
-   - Integration testing
-   - Performance testing
-   - Security testing
-
-3. **Deployment Phase** (1 week)
-   - Staged rollout
-   - Monitoring
-   - Support preparation
-   - Documentation updates
-
-4. **Post-Deployment** (2 weeks)
-   - Monitoring
-   - Bug fixes
-   - Performance optimization
-   - User feedback collection 

doc/secure-storage-implementation.md

@@ -1,339 +0,0 @@
-# Secure Storage Implementation Guide for TimeSafari App
-
-## Overview
-
-This document outlines the implementation of secure storage for the TimeSafari app. The implementation focuses on:
-
-1. **Platform-Specific Storage Solutions**:
-   - Web: SQLite with IndexedDB backend (absurd-sql)
-   - Electron: SQLite with Node.js backend
-   - Native: (Planned) SQLCipher with platform-specific secure storage
-
-2. **Key Features**:
-   - SQLite-based storage using absurd-sql for web
-   - Platform-specific service factory pattern
-   - Consistent API across platforms
-   - Migration support from Dexie.js
-
-## Quick Start
-
-### 1. Installation
-
-```bash
-# Core dependencies
-npm install @jlongster/sql.js
-npm install absurd-sql
-
-# Platform-specific dependencies (for future native support)
-npm install @capacitor/preferences
-npm install @capacitor-community/biometric-auth
-```
-
-### 2. Basic Usage
-
-```typescript
-// Using the platform service
-import { PlatformServiceFactory } from '../services/PlatformServiceFactory';
-
-// Get platform-specific service instance
-const platformService = PlatformServiceFactory.getInstance();
-
-// Example database operations
-async function example() {
-  try {
-    // Query example
-    const result = await platformService.dbQuery(
-      "SELECT * FROM accounts WHERE did = ?",
-      [did]
-    );
-
-    // Execute example
-    await platformService.dbExec(
-      "INSERT INTO accounts (did, public_key_hex) VALUES (?, ?)",
-      [did, publicKeyHex]
-    );
-
-    } catch (error) {
-    console.error('Database operation failed:', error);
-  }
-}
-```
-
-### 3. Platform Detection
-
-```typescript
-// src/services/PlatformServiceFactory.ts
-export class PlatformServiceFactory {
-  static getInstance(): PlatformService {
-    if (process.env.ELECTRON) {
-      // Electron platform
-      return new ElectronPlatformService();
-    } else {
-      // Web platform (default)
-      return new AbsurdSqlDatabaseService();
-    }
-  }
-}
-```
-
-### 4. Current Implementation Details
-
-#### Web Platform (AbsurdSqlDatabaseService)
-
-The web platform uses absurd-sql with IndexedDB backend:
-
-```typescript
-// src/services/AbsurdSqlDatabaseService.ts
-export class AbsurdSqlDatabaseService implements PlatformService {
-  private static instance: AbsurdSqlDatabaseService | null = null;
-  private db: AbsurdSqlDatabase | null = null;
-  private initialized: boolean = false;
-      
-  // Singleton pattern
-  static getInstance(): AbsurdSqlDatabaseService {
-    if (!AbsurdSqlDatabaseService.instance) {
-      AbsurdSqlDatabaseService.instance = new AbsurdSqlDatabaseService();
-    }
-    return AbsurdSqlDatabaseService.instance;
-  }
-
-  // Database operations
-  async dbQuery(sql: string, params: unknown[] = []): Promise<QueryExecResult[]> {
-    await this.waitForInitialization();
-    return this.queueOperation<QueryExecResult[]>("query", sql, params);
-    }
-
-  async dbExec(sql: string, params: unknown[] = []): Promise<void> {
-    await this.waitForInitialization();
-    await this.queueOperation<void>("run", sql, params);
-  }
-}
-```
-
-Key features:
-- Uses absurd-sql for SQLite in the browser
-- Implements operation queuing for thread safety
-- Handles initialization and connection management
-- Provides consistent API across platforms
-
-### 5. Migration from Dexie.js
-
-The current implementation supports gradual migration from Dexie.js:
-
-```typescript
-// Example of dual-storage pattern
-async function getAccount(did: string): Promise<Account | undefined> {
-  // Try SQLite first
-  const platform = PlatformServiceFactory.getInstance();
-  let account = await platform.dbQuery(
-    "SELECT * FROM accounts WHERE did = ?",
-    [did]
-  );
-
-  // Fallback to Dexie if needed
-  if (USE_DEXIE_DB) {
-    account = await db.accounts.get(did);
-  }
-
-  return account;
-   }
-```
-
-#### A. Modifying Code
-
-When converting from Dexie.js to SQL-based implementation, follow these patterns:
-
-1. **Database Access Pattern**
-   ```typescript
-   // Before (Dexie)
-   const result = await db.table.where("field").equals(value).first();
-
-   // After (SQL)
-   const platform = PlatformServiceFactory.getInstance();
-   let result = await platform.dbQuery(
-     "SELECT * FROM table WHERE field = ?",
-     [value]
-   );
-   result = databaseUtil.mapQueryResultToValues(result);
-   
-   // Fallback to Dexie if needed
-   if (USE_DEXIE_DB) {
-     result = await db.table.where("field").equals(value).first();
-   }
-   ```
-
-2. **Update Operations**
-   ```typescript
-   // Before (Dexie)
-   await db.table.where("id").equals(id).modify(changes);
-
-   // After (SQL)
-   // For settings updates, use the utility methods:
-   await databaseUtil.updateDefaultSettings(changes);
-   // OR
-   await databaseUtil.updateAccountSettings(did, changes);
-
-   // For other tables, use direct SQL:
-   const platform = PlatformServiceFactory.getInstance();
-   await platform.dbExec(
-     "UPDATE table SET field1 = ?, field2 = ? WHERE id = ?",
-     [changes.field1, changes.field2, id]
-   );
-
-   // Fallback to Dexie if needed
-   if (USE_DEXIE_DB) {
-     await db.table.where("id").equals(id).modify(changes);
-   }
-   ```
-
-3. **Insert Operations**
-   ```typescript
-   // Before (Dexie)
-   await db.table.add(item);
-
-   // After (SQL)
-   const platform = PlatformServiceFactory.getInstance();
-   const columns = Object.keys(item);
-   const values = Object.values(item);
-   const placeholders = values.map(() => '?').join(', ');
-   const sql = `INSERT INTO table (${columns.join(', ')}) VALUES (${placeholders})`;
-   await platform.dbExec(sql, values);
-
-   // Fallback to Dexie if needed
-   if (USE_DEXIE_DB) {
-     await db.table.add(item);
-   }
-   ```
-
-4. **Delete Operations**
-   ```typescript
-   // Before (Dexie)
-   await db.table.where("id").equals(id).delete();
-
-   // After (SQL)
-   const platform = PlatformServiceFactory.getInstance();
-   await platform.dbExec("DELETE FROM table WHERE id = ?", [id]);
-
-   // Fallback to Dexie if needed
-   if (USE_DEXIE_DB) {
-     await db.table.where("id").equals(id).delete();
-   }
-   ```
-
-5. **Result Processing**
-   ```typescript
-   // Before (Dexie)
-   const items = await db.table.toArray();
-
-   // After (SQL)
-   const platform = PlatformServiceFactory.getInstance();
-   let items = await platform.dbQuery("SELECT * FROM table");
-   items = databaseUtil.mapQueryResultToValues(items);
-
-   // Fallback to Dexie if needed
-   if (USE_DEXIE_DB) {
-     items = await db.table.toArray();
-   }
-   ```
-
-6. **Using Utility Methods**
-
-When working with settings or other common operations, use the utility methods in `db/index.ts`:
-
-```typescript
-// Settings operations
-await databaseUtil.updateDefaultSettings(settings);
-await databaseUtil.updateAccountSettings(did, settings);
-const settings = await databaseUtil.retrieveSettingsForDefaultAccount();
-const settings = await databaseUtil.retrieveSettingsForActiveAccount();
-
-// Logging operations
-await databaseUtil.logToDb(message);
-await databaseUtil.logConsoleAndDb(message, showInConsole);
-```
-
-Key Considerations:
-- Always use `databaseUtil.mapQueryResultToValues()` to process SQL query results
-- Use utility methods from `db/index.ts` when available instead of direct SQL
-- Keep Dexie fallbacks wrapped in `if (USE_DEXIE_DB)` checks
-- For queries that return results, use `let` variables to allow Dexie fallback to override
-- For updates/inserts/deletes, execute both SQL and Dexie operations when `USE_DEXIE_DB` is true
-
-Example Migration:
-```typescript
-// Before (Dexie)
-export async function updateSettings(settings: Settings): Promise<void> {
-  await db.settings.put(settings);
-}
-
-// After (SQL)
-export async function updateSettings(settings: Settings): Promise<void> {
-  const platform = PlatformServiceFactory.getInstance();
-  const { sql, params } = generateUpdateStatement(
-    settings,
-    "settings",
-    "id = ?",
-    [settings.id]
-  );
-  await platform.dbExec(sql, params);
-}
-```
-
-Remember to:
-- Create database access code to use the platform service, putting it in front of the Dexie version
-- Instead of removing Dexie-specific code, keep it.
-
-  - For creates & updates & deletes, the duplicate code is fine.
-
-  - For queries where we use the results, make the setting from SQL into a 'let' variable, then wrap the Dexie code in a check for USE_DEXIE_DB from app.ts and if
-it's true then use that result instead of the SQL code's result.
-
-- Consider data migration needs, and warn if there are any potential migration problems
-
-## Success Criteria
-
-1. **Functionality**
-   - [x] Basic CRUD operations work correctly
-   - [x] Platform service factory pattern implemented
-   - [x] Error handling in place
-   - [ ] Native platform support (planned)
-
-2. **Performance**
-   - [x] Database operations complete within acceptable time
-   - [x] Operation queuing for thread safety
-   - [x] Proper initialization handling
-   - [ ] Performance monitoring (planned)
-
-3. **Security**
-   - [x] Basic data integrity
-   - [ ] Encryption (planned for native platforms)
-   - [ ] Secure key storage (planned)
-   - [ ] Platform-specific security features (planned)
-
-4. **Testing**
-   - [x] Basic unit tests
-   - [ ] Comprehensive integration tests (planned)
-   - [ ] Platform-specific tests (planned)
-   - [ ] Migration tests (planned)
-
-## Next Steps
-
-1. **Native Platform Support**
-   - Implement SQLCipher for iOS/Android
-   - Add platform-specific secure storage
-   - Implement biometric authentication
-
-2. **Enhanced Security**
-   - Add encryption for sensitive data
-   - Implement secure key storage
-   - Add platform-specific security features
-
-3. **Testing and Monitoring**
-   - Add comprehensive test coverage
-   - Implement performance monitoring
-   - Add error tracking and analytics
-
-4. **Documentation**
-   - Add API documentation
-   - Create migration guides
-   - Document security measures

doc/storage-implementation-checklist.md

@@ -1,329 +0,0 @@
-# Storage Implementation Checklist
-
-## Core Services
-
-### 1. Storage Service Layer
-- [x] Create base `PlatformService` interface
-  - [x] Define common methods for all platforms
-  - [x] Add platform-specific method signatures
-  - [x] Include error handling types
-  - [x] Add migration support methods
-
-- [x] Implement platform-specific services
-  - [x] `AbsurdSqlDatabaseService` (web)
-    - [x] Database initialization
-    - [x] VFS setup with IndexedDB backend
-    - [x] Connection management
-    - [x] Operation queuing
-  - [ ] `NativeSQLiteService` (iOS/Android) (planned)
-    - [ ] SQLCipher integration
-    - [ ] Native bridge setup
-    - [ ] File system access
-  - [ ] `ElectronSQLiteService` (planned)
-    - [ ] Node SQLite integration
-    - [ ] IPC communication
-    - [ ] File system access
-
-### 2. Migration Services
-- [x] Implement basic migration support
-  - [x] Dual-storage pattern (SQLite + Dexie)
-  - [x] Basic data verification
-  - [ ] Rollback procedures (planned)
-  - [ ] Progress tracking (planned)
-- [ ] Create `MigrationUI` components (planned)
-  - [ ] Progress indicators
-  - [ ] Error handling
-  - [ ] User notifications
-  - [ ] Manual triggers
-
-### 3. Security Layer
-- [x] Basic data integrity
-- [ ] Implement `EncryptionService` (planned)
-  - [ ] Key management
-  - [ ] Encryption/decryption
-  - [ ] Secure storage
-- [ ] Add `BiometricService` (planned)
-  - [ ] Platform detection
-  - [ ] Authentication flow
-  - [ ] Fallback mechanisms
-
-## Platform-Specific Implementation
-
-### Web Platform
-- [x] Setup absurd-sql
-  - [x] Install dependencies
-    ```json
-    {
-      "@jlongster/sql.js": "^1.8.0",
-      "absurd-sql": "^1.8.0"
-    }
-    ```
-  - [x] Configure VFS with IndexedDB backend
-  - [x] Setup worker threads
-  - [x] Implement operation queuing
-  - [x] Configure database pragmas
-  
-    ```sql
-    PRAGMA journal_mode=MEMORY;
-    PRAGMA synchronous=NORMAL;
-    PRAGMA foreign_keys=ON;
-    PRAGMA busy_timeout=5000;
-    ```
-
-- [x] Update build configuration
-  - [x] Modify `vite.config.ts`
-  - [x] Add worker configuration
-  - [x] Update chunk splitting
-  - [x] Configure asset handling
-
-- [x] Implement IndexedDB backend
-  - [x] Create database service
-  - [x] Add operation queuing
-  - [x] Handle initialization
-  - [x] Implement atomic operations
-
-### iOS Platform (Planned)
-- [ ] Setup SQLCipher
-  - [ ] Install pod dependencies
-  - [ ] Configure encryption
-  - [ ] Setup keychain access
-  - [ ] Implement secure storage
-
-- [ ] Update Capacitor config
-  - [ ] Modify `capacitor.config.ts`
-  - [ ] Add iOS permissions
-  - [ ] Configure backup
-  - [ ] Setup app groups
-
-### Android Platform (Planned)
-- [ ] Setup SQLCipher
-  - [ ] Add Gradle dependencies
-  - [ ] Configure encryption
-  - [ ] Setup keystore
-  - [ ] Implement secure storage
-
-- [ ] Update Capacitor config
-  - [ ] Modify `capacitor.config.ts`
-  - [ ] Add Android permissions
-  - [ ] Configure backup
-  - [ ] Setup file provider
-
-### Electron Platform (Planned)
-- [ ] Setup Node SQLite
-  - [ ] Install dependencies
-  - [ ] Configure IPC
-  - [ ] Setup file system access
-  - [ ] Implement secure storage
-
-- [ ] Update Electron config
-  - [ ] Modify `electron.config.ts`
-  - [ ] Add security policies
-  - [ ] Configure file access
-  - [ ] Setup auto-updates
-
-## Data Models and Types
-
-### 1. Database Schema
-- [x] Define tables
-
-  ```sql
-  -- Accounts table
-  CREATE TABLE accounts (
-    did TEXT PRIMARY KEY,
-    public_key_hex TEXT NOT NULL,
-    created_at INTEGER NOT NULL,
-    updated_at INTEGER NOT NULL
-  );
-
-  -- Settings table
-  CREATE TABLE settings (
-    key TEXT PRIMARY KEY,
-    value TEXT NOT NULL,
-    updated_at INTEGER NOT NULL
-  );
-
-  -- Contacts table
-  CREATE TABLE contacts (
-    id TEXT PRIMARY KEY,
-    did TEXT NOT NULL,
-    name TEXT,
-    created_at INTEGER NOT NULL,
-    updated_at INTEGER NOT NULL,
-    FOREIGN KEY (did) REFERENCES accounts(did)
-  );
-
-  -- Indexes for performance
-  CREATE INDEX idx_accounts_created_at ON accounts(created_at);
-  CREATE INDEX idx_contacts_did ON contacts(did);
-  CREATE INDEX idx_settings_updated_at ON settings(updated_at);
-  ```
-
-- [x] Create indexes
-- [x] Define constraints
-- [ ] Add triggers (planned)
-- [ ] Setup migrations (planned)
-
-### 2. Type Definitions
-
-- [x] Create interfaces
-  ```typescript
-  interface Account {
-    did: string;
-    publicKeyHex: string;
-    createdAt: number;
-    updatedAt: number;
-  }
-
-  interface Setting {
-    key: string;
-    value: string;
-    updatedAt: number;
-  }
-
-  interface Contact {
-    id: string;
-    did: string;
-    name?: string;
-    createdAt: number;
-    updatedAt: number;
-  }
-  ```
-
-- [x] Add validation
-- [x] Create DTOs
-- [x] Define enums
-- [x] Add type guards
-
-## UI Components
-
-### 1. Migration UI (Planned)
-- [ ] Create components
-  - [ ] `MigrationProgress.vue`
-  - [ ] `MigrationError.vue`
-  - [ ] `MigrationSettings.vue`
-  - [ ] `MigrationStatus.vue`
-
-### 2. Settings UI (Planned)
-- [ ] Update components
-  - [ ] Add storage settings
-  - [ ] Add migration controls
-  - [ ] Add backup options
-  - [ ] Add security settings
-
-### 3. Error Handling UI (Planned)
-- [ ] Create components
-  - [ ] `StorageError.vue`
-  - [ ] `QuotaExceeded.vue`
-  - [ ] `MigrationFailed.vue`
-  - [ ] `RecoveryOptions.vue`
-
-## Testing
-
-### 1. Unit Tests
-- [x] Basic service tests
-  - [x] Platform service tests
-  - [x] Database operation tests
-  - [ ] Security service tests (planned)
-  - [ ] Platform detection tests (planned)
-
-### 2. Integration Tests (Planned)
-- [ ] Test migrations
-  - [ ] Web platform tests
-  - [ ] iOS platform tests
-  - [ ] Android platform tests
-  - [ ] Electron platform tests
-
-### 3. E2E Tests (Planned)
-- [ ] Test workflows
-  - [ ] Account management
-  - [ ] Settings management
-  - [ ] Contact management
-  - [ ] Migration process
-
-## Documentation
-
-### 1. Technical Documentation
-- [x] Update architecture docs
-- [x] Add API documentation
-- [ ] Create migration guides (planned)
-- [ ] Document security measures (planned)
-
-### 2. User Documentation (Planned)
-- [ ] Update user guides
-- [ ] Add troubleshooting guides
-- [ ] Create FAQ
-- [ ] Document new features
-
-## Deployment
-
-### 1. Build Process
-- [x] Update build scripts
-- [x] Add platform-specific builds
-- [ ] Configure CI/CD (planned)
-- [ ] Setup automated testing (planned)
-
-### 2. Release Process (Planned)
-- [ ] Create release checklist
-- [ ] Add version management
-- [ ] Setup rollback procedures
-- [ ] Configure monitoring
-
-## Monitoring and Analytics (Planned)
-
-### 1. Error Tracking
-- [ ] Setup error logging
-- [ ] Add performance monitoring
-- [ ] Configure alerts
-- [ ] Create dashboards
-
-### 2. Usage Analytics
-- [ ] Add storage metrics
-- [ ] Track migration success
-- [ ] Monitor performance
-- [ ] Collect user feedback
-
-## Security Audit (Planned)
-
-### 1. Code Review
-- [ ] Review encryption
-- [ ] Check access controls
-- [ ] Verify data handling
-- [ ] Audit dependencies
-
-### 2. Penetration Testing
-- [ ] Test data access
-- [ ] Verify encryption
-- [ ] Check authentication
-- [ ] Review permissions
-
-## Success Criteria
-
-### 1. Performance
-- [x] Query response time < 100ms
-- [x] Operation queuing for thread safety
-- [x] Proper initialization handling
-- [ ] Migration time < 5s per 1000 records (planned)
-- [ ] Storage overhead < 10% (planned)
-- [ ] Memory usage < 50MB (planned)
-
-### 2. Reliability
-- [x] Basic data integrity
-- [x] Operation queuing
-- [ ] Automatic recovery (planned)
-- [ ] Backup verification (planned)
-- [ ] Transaction atomicity (planned)
-- [ ] Data consistency (planned)
-
-### 3. Security
-- [x] Basic data integrity
-- [ ] AES-256 encryption (planned)
-- [ ] Secure key storage (planned)
-- [ ] Access control (planned)
-- [ ] Audit logging (planned)
-
-### 4. User Experience
-- [x] Basic database operations
-- [ ] Smooth migration (planned)
-- [ ] Clear error messages (planned)
-- [ ] Progress indicators (planned)
-- [ ] Recovery options (planned) 

electron/.gitignore

@@ -1,55 +0,0 @@
-# NPM renames .gitignore to .npmignore
-# In order to prevent that, we remove the initial "."
-# And the CLI then renames it
-app
-node_modules
-build
-dist
-logs
-# Node.js dependencies
-node_modules/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-.pnpm-debug.log*
-
-# Capacitor build outputs
-web/
-ios/
-android/
-electron/app/
-
-# Capacitor SQLite plugin data (important!)
-capacitor-sqlite/
-
-# TypeScript / build output
-dist/
-build/
-*.log
-
-# Development / IDE files
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-# VS Code
-.vscode/
-!.vscode/extensions.json
-
-# JetBrains IDEs (IntelliJ, WebStorm, etc.)
-.idea/
-*.iml
-*.iws
-
-# macOS specific
-.DS_Store
-*.swp
-*~
-*.tmp
-
-# Windows specific
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/

electron/capacitor.config.json

@@ -1,62 +0,0 @@
-{
-	"appId": "com.timesafari.app",
-	"appName": "TimeSafari",
-	"webDir": "dist",
-	"bundledWebRuntime": false,
-	"server": {
-		"cleartext": true,
-		"androidScheme": "https"
-	},
-	"plugins": {
-		"App": {
-			"appUrlOpen": {
-				"handlers": [
-					{
-						"url": "timesafari://*",
-						"autoVerify": true
-					}
-				]
-			}
-		},
-		"SQLite": {
-			"iosDatabaseLocation": "Library/CapacitorDatabase",
-			"iosIsEncryption": true,
-			"iosBiometric": {
-				"biometricAuth": true,
-				"biometricTitle": "Biometric login for TimeSafari"
-			},
-			"androidIsEncryption": true,
-			"androidBiometric": {
-				"biometricAuth": true,
-				"biometricTitle": "Biometric login for TimeSafari"
-			}
-		},
-		"CapacitorSQLite": {
-			"electronIsEncryption": false,
-			"electronMacLocation": "~/Library/Application Support/TimeSafari",
-			"electronWindowsLocation": "C:\\ProgramData\\TimeSafari"
-		}
-	},
-	"ios": {
-		"contentInset": "always",
-		"allowsLinkPreview": true,
-		"scrollEnabled": true,
-		"limitsNavigationsToAppBoundDomains": true,
-		"backgroundColor": "#ffffff",
-		"allowNavigation": [
-			"*.timesafari.app",
-			"*.jsdelivr.net",
-			"api.endorser.ch"
-		]
-	},
-	"android": {
-		"allowMixedContent": false,
-		"captureInput": true,
-		"webContentsDebuggingEnabled": false,
-		"allowNavigation": [
-			"*.timesafari.app",
-			"*.jsdelivr.net",
-			"api.endorser.ch"
-		]
-	}
-}

electron/electron-builder.config.json

@@ -1,28 +0,0 @@
-{
-  "appId": "com.yourdoamnin.yourapp",
-  "directories": {
-    "buildResources": "resources"
-  },
-  "files": [
-    "assets/**/*",
-    "build/**/*",
-    "capacitor.config.*",
-    "app/**/*"
-  ],
-  "publish": {
-    "provider": "github"
-  },
-  "nsis": {
-    "allowElevation": true,
-    "oneClick": false,
-    "allowToChangeInstallationDirectory": true
-  },
-  "win": {
-    "target": "nsis",
-    "icon": "assets/appIcon.ico"
-  },
-  "mac": {
-    "category": "your.app.category.type",
-    "target": "dmg"
-  }
-}

electron/live-runner.js

@@ -1,75 +0,0 @@
-/* eslint-disable no-undef */
-/* eslint-disable @typescript-eslint/no-var-requires */
-const cp = require('child_process');
-const chokidar = require('chokidar');
-const electron = require('electron');
-
-let child = null;
-const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-const reloadWatcher = {
-  debouncer: null,
-  ready: false,
-  watcher: null,
-  restarting: false,
-};
-
-///*
-function runBuild() {
-  return new Promise((resolve, _reject) => {
-    let tempChild = cp.spawn(npmCmd, ['run', 'build']);
-    tempChild.once('exit', () => {
-      resolve();
-    });
-    tempChild.stdout.pipe(process.stdout);
-  });
-}
-//*/
-
-async function spawnElectron() {
-  if (child !== null) {
-    child.stdin.pause();
-    child.kill();
-    child = null;
-    await runBuild();
-  }
-  child = cp.spawn(electron, ['--inspect=5858', './']);
-  child.on('exit', () => {
-    if (!reloadWatcher.restarting) {
-      process.exit(0);
-    }
-  });
-  child.stdout.pipe(process.stdout);
-}
-
-function setupReloadWatcher() {
-  reloadWatcher.watcher = chokidar
-    .watch('./src/**/*', {
-      ignored: /[/\\]\./,
-      persistent: true,
-    })
-    .on('ready', () => {
-      reloadWatcher.ready = true;
-    })
-    .on('all', (_event, _path) => {
-      if (reloadWatcher.ready) {
-        clearTimeout(reloadWatcher.debouncer);
-        reloadWatcher.debouncer = setTimeout(async () => {
-          console.log('Restarting');
-          reloadWatcher.restarting = true;
-          await spawnElectron();
-          reloadWatcher.restarting = false;
-          reloadWatcher.ready = false;
-          clearTimeout(reloadWatcher.debouncer);
-          reloadWatcher.debouncer = null;
-          reloadWatcher.watcher = null;
-          setupReloadWatcher();
-        }, 500);
-      }
-    });
-}
-
-(async () => {
-  await runBuild();
-  await spawnElectron();
-  setupReloadWatcher();
-})();

electron/package.json

@@ -1,52 +0,0 @@
-{
-  "name": "TimeSafari",
-  "version": "1.0.0",
-  "description": "TimeSafari Electron App",
-  "author": {
-    "name": "",
-    "email": ""
-  },
-  "repository": {
-    "type": "git",
-    "url": ""
-  },
-  "license": "MIT",
-  "main": "build/src/index.js",
-  "scripts": {
-    "build": "tsc && electron-rebuild",
-    "electron:start-live": "node ./live-runner.js",
-    "electron:start": "npm run build && electron --inspect=5858 ./",
-    "electron:pack": "npm run build && electron-builder build --dir -c ./electron-builder.config.json",
-    "electron:make": "npm run build && electron-builder build -c ./electron-builder.config.json -p always"
-  },
-  "dependencies": {
-    "@capacitor-community/electron": "^5.0.0",
-    "@capacitor-community/sqlite": "^6.0.2",
-    "better-sqlite3-multiple-ciphers": "^11.10.0",
-    "chokidar": "~3.5.3",
-    "crypto": "^1.0.1",
-    "crypto-js": "^4.2.0",
-    "electron-is-dev": "~2.0.0",
-    "electron-json-storage": "^4.6.0",
-    "electron-serve": "~1.1.0",
-    "electron-unhandled": "~4.0.1",
-    "electron-updater": "^5.3.0",
-    "electron-window-state": "^5.0.3",
-    "jszip": "^3.10.1",
-    "node-fetch": "^2.6.7",
-    "winston": "^3.17.0"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/crypto-js": "^4.2.2",
-    "@types/electron-json-storage": "^4.5.4",
-    "electron": "^26.2.2",
-    "electron-builder": "~23.6.0",
-    "source-map-support": "^0.5.21",
-    "typescript": "^5.0.4"
-  },
-  "keywords": [
-    "capacitor",
-    "electron"
-  ]
-}

electron/resources/electron-publisher-custom.js

@@ -1,10 +0,0 @@
-/* eslint-disable no-undef */
-/* eslint-disable @typescript-eslint/no-var-requires */
-const electronPublish = require('electron-publish');
-
-class Publisher extends electronPublish.Publisher {
-  async upload(task) {
-    console.log('electron-publisher-custom', task.file);
-  }
-}
-module.exports = Publisher;

electron/src/index.ts

@@ -1,140 +0,0 @@
-import type { CapacitorElectronConfig } from '@capacitor-community/electron';
-import { getCapacitorElectronConfig, setupElectronDeepLinking } from '@capacitor-community/electron';
-import type { MenuItemConstructorOptions } from 'electron';
-import { app, MenuItem } from 'electron';
-import electronIsDev from 'electron-is-dev';
-import unhandled from 'electron-unhandled';
-import { autoUpdater } from 'electron-updater';
-
-import { ElectronCapacitorApp, setupContentSecurityPolicy, setupReloadWatcher } from './setup';
-import { initializeSQLite, setupSQLiteHandlers } from './rt/sqlite-init';
-
-// Graceful handling of unhandled errors.
-unhandled();
-
-// Define our menu templates (these are optional)
-const trayMenuTemplate: (MenuItemConstructorOptions | MenuItem)[] = [new MenuItem({ label: 'Quit App', role: 'quit' })];
-const appMenuBarMenuTemplate: (MenuItemConstructorOptions | MenuItem)[] = [
-  { role: process.platform === 'darwin' ? 'appMenu' : 'fileMenu' },
-  { role: 'viewMenu' },
-];
-
-// Get Config options from capacitor.config
-const capacitorFileConfig: CapacitorElectronConfig = getCapacitorElectronConfig();
-
-// Initialize our app. You can pass menu templates into the app here.
-const myCapacitorApp = new ElectronCapacitorApp(capacitorFileConfig, trayMenuTemplate, appMenuBarMenuTemplate);
-
-// If deeplinking is enabled then we will set it up here.
-if (capacitorFileConfig.electron?.deepLinkingEnabled) {
-  setupElectronDeepLinking(myCapacitorApp, {
-    customProtocol: capacitorFileConfig.electron.deepLinkingCustomProtocol ?? 'mycapacitorapp',
-  });
-}
-
-// If we are in Dev mode, use the file watcher components.
-if (electronIsDev) {
-  setupReloadWatcher(myCapacitorApp);
-}
-
-// Run Application
-(async () => {
-  try {
-    // Wait for electron app to be ready first
-    await app.whenReady();
-    console.log('[Electron Main Process] App is ready');
-
-    // Initialize SQLite plugin and handlers BEFORE creating any windows
-    console.log('[Electron Main Process] Initializing SQLite...');
-    setupSQLiteHandlers();
-    await initializeSQLite();
-    console.log('[Electron Main Process] SQLite initialization complete');
-
-    // Security - Set Content-Security-Policy
-    setupContentSecurityPolicy(myCapacitorApp.getCustomURLScheme());
-    
-    // Initialize our app and create window
-    console.log('[Electron Main Process] Starting app initialization...');
-    await myCapacitorApp.init();
-    console.log('[Electron Main Process] App initialization complete');
-
-    // Get the main window
-    const mainWindow = myCapacitorApp.getMainWindow();
-    if (!mainWindow) {
-      throw new Error('Main window not available after app initialization');
-    }
-
-    // Wait for window to be ready and loaded
-    await new Promise<void>((resolve) => {
-      const handleReady = () => {
-        console.log('[Electron Main Process] Window ready to show');
-        mainWindow.show();
-        
-        // Wait for window to finish loading
-        mainWindow.webContents.once('did-finish-load', () => {
-          console.log('[Electron Main Process] Window finished loading');
-          
-          // Send SQLite ready signal after window is fully loaded
-          if (!mainWindow.isDestroyed()) {
-            mainWindow.webContents.send('sqlite-ready');
-            console.log('[Electron Main Process] Sent SQLite ready signal to renderer');
-          } else {
-            console.warn('[Electron Main Process] Window was destroyed before sending SQLite ready signal');
-          }
-          
-          resolve();
-        });
-      };
-
-      // Always use the event since isReadyToShow is not reliable
-      mainWindow.once('ready-to-show', handleReady);
-    });
-
-    // Check for updates if we are in a packaged app
-    if (!electronIsDev) {
-      console.log('[Electron Main Process] Checking for updates...');
-      autoUpdater.checkForUpdatesAndNotify();
-    }
-
-    // Handle window close
-    mainWindow.on('closed', () => {
-      console.log('[Electron Main Process] Main window closed');
-    });
-
-    // Handle window close request
-    mainWindow.on('close', (event) => {
-      console.log('[Electron Main Process] Window close requested');
-      if (mainWindow.webContents.isLoading()) {
-        event.preventDefault();
-        console.log('[Electron Main Process] Deferring window close due to loading state');
-        mainWindow.webContents.once('did-finish-load', () => {
-          mainWindow.close();
-        });
-      }
-    });
-
-  } catch (error) {
-    console.error('[Electron Main Process] Fatal error during initialization:', error);
-    app.quit();
-  }
-})();
-
-// Handle when all of our windows are close (platforms have their own expectations).
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});
-
-// When the dock icon is clicked.
-app.on('activate', async function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (myCapacitorApp.getMainWindow().isDestroyed()) {
-    await myCapacitorApp.init();
-  }
-});
-
-// Place all ipc or other electron api calls and custom functionality under this line

electron/src/preload.ts

@@ -1,303 +0,0 @@
-/**
- * Preload script for Electron
- * Sets up secure IPC communication between renderer and main process
- * 
- * @author Matthew Raymer
- */
-
-import { contextBridge, ipcRenderer } from 'electron';
-
-// Enhanced logger for preload script that forwards to main process
-const logger = {
-  log: (...args: unknown[]) => {
-    console.log('[Preload]', ...args);
-    ipcRenderer.send('renderer-log', { level: 'log', args });
-  },
-  error: (...args: unknown[]) => {
-    console.error('[Preload]', ...args);
-    ipcRenderer.send('renderer-log', { level: 'error', args });
-  },
-  info: (...args: unknown[]) => {
-    console.info('[Preload]', ...args);
-    ipcRenderer.send('renderer-log', { level: 'info', args });
-  },
-  warn: (...args: unknown[]) => {
-    console.warn('[Preload]', ...args);
-    ipcRenderer.send('renderer-log', { level: 'warn', args });
-  },
-  debug: (...args: unknown[]) => {
-    console.debug('[Preload]', ...args);
-    ipcRenderer.send('renderer-log', { level: 'debug', args });
-  },
-  sqlite: {
-    log: (operation: string, ...args: unknown[]) => {
-      const message = ['[Preload][SQLite]', operation, ...args];
-      console.log(...message);
-      ipcRenderer.send('renderer-log', { 
-        level: 'log', 
-        args: message,
-        source: 'sqlite',
-        operation
-      });
-    },
-    error: (operation: string, error: unknown) => {
-      const message = ['[Preload][SQLite]', operation, 'failed:', error];
-      console.error(...message);
-      ipcRenderer.send('renderer-log', { 
-        level: 'error', 
-        args: message,
-        source: 'sqlite',
-        operation,
-        error: error instanceof Error ? {
-          name: error.name,
-          message: error.message,
-          stack: error.stack
-        } : error
-      });
-    },
-    debug: (operation: string, ...args: unknown[]) => {
-      const message = ['[Preload][SQLite]', operation, ...args];
-      console.debug(...message);
-      ipcRenderer.send('renderer-log', { 
-        level: 'debug', 
-        args: message,
-        source: 'sqlite',
-        operation
-      });
-    }
-  }
-};
-
-// Types for SQLite connection options
-interface SQLiteConnectionOptions {
-  database: string;
-  version?: number;
-  readOnly?: boolean;
-  readonly?: boolean; // Handle both cases
-  encryption?: string;
-  mode?: string;
-  useNative?: boolean;
-  [key: string]: unknown; // Allow other properties
-}
-
-// Define valid channels for security
-const VALID_CHANNELS = {
-  send: ['toMain'] as const,
-  receive: ['fromMain', 'sqlite-ready', 'database-status'] as const,
-  invoke: [
-    'sqlite-is-available',
-    'sqlite-echo',
-    'sqlite-create-connection',
-    'sqlite-execute',
-    'sqlite-query',
-    'sqlite-run',
-    'sqlite-close-connection',
-    'sqlite-open',
-    'sqlite-close',
-    'sqlite-is-db-open',
-    'sqlite-status',
-    'get-path',
-    'get-base-path'
-  ] as const
-};
-
-type ValidSendChannel = typeof VALID_CHANNELS.send[number];
-type ValidReceiveChannel = typeof VALID_CHANNELS.receive[number];
-type ValidInvokeChannel = typeof VALID_CHANNELS.invoke[number];
-
-// Create a secure IPC bridge
-const createSecureIPCBridge = () => {
-  return {
-    send: (channel: string, data: unknown) => {
-      if (VALID_CHANNELS.send.includes(channel as ValidSendChannel)) {
-        logger.debug('IPC Send:', channel, data);
-        ipcRenderer.send(channel, data);
-      } else {
-        logger.warn(`[Preload] Attempted to send on invalid channel: ${channel}`);
-      }
-    },
-
-    receive: (channel: string, func: (...args: unknown[]) => void) => {
-      if (VALID_CHANNELS.receive.includes(channel as ValidReceiveChannel)) {
-        logger.debug('IPC Receive:', channel);
-        ipcRenderer.on(channel, (_event, ...args) => {
-          logger.debug('IPC Received:', channel, args);
-          func(...args);
-        });
-      } else {
-        logger.warn(`[Preload] Attempted to receive on invalid channel: ${channel}`);
-      }
-    },
-
-    once: (channel: string, func: (...args: unknown[]) => void) => {
-      if (VALID_CHANNELS.receive.includes(channel as ValidReceiveChannel)) {
-        logger.debug('IPC Once:', channel);
-        ipcRenderer.once(channel, (_event, ...args) => {
-          logger.debug('IPC Received Once:', channel, args);
-          func(...args);
-        });
-      } else {
-        logger.warn(`[Preload] Attempted to receive once on invalid channel: ${channel}`);
-      }
-    },
-
-    invoke: async (channel: string, ...args: unknown[]) => {
-      if (VALID_CHANNELS.invoke.includes(channel as ValidInvokeChannel)) {
-        logger.debug('IPC Invoke:', channel, args);
-        try {
-          const result = await ipcRenderer.invoke(channel, ...args);
-          logger.debug('IPC Invoke Result:', channel, result);
-          return result;
-        } catch (error) {
-          logger.error('IPC Invoke Error:', channel, error);
-          throw error;
-        }
-      } else {
-        logger.warn(`[Preload] Attempted to invoke on invalid channel: ${channel}`);
-        throw new Error(`Invalid channel: ${channel}`);
-      }
-    }
-  };
-};
-
-// Create SQLite proxy with retry logic
-const createSQLiteProxy = () => {
-  const MAX_RETRIES = 3;
-  const RETRY_DELAY = 1000;
-
-  const withRetry = async <T>(operation: string, ...args: unknown[]): Promise<T> => {
-    let lastError: Error | undefined;
-    const operationId = `${operation}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-    const startTime = Date.now();
-    
-    logger.sqlite.debug(operation, 'starting with args:', {
-      operationId,
-      args,
-      timestamp: new Date().toISOString()
-    });
-    
-    for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
-      try {
-        logger.sqlite.debug(operation, `attempt ${attempt}/${MAX_RETRIES}`, {
-          operationId,
-          attempt,
-          args,
-          timestamp: new Date().toISOString()
-        });
-        
-        // Log the exact IPC call
-        logger.sqlite.debug(operation, 'invoking IPC', {
-          operationId,
-          channel: `sqlite-${operation}`,
-          args,
-          timestamp: new Date().toISOString()
-        });
-        
-        const result = await ipcRenderer.invoke(`sqlite-${operation}`, ...args);
-        
-        const duration = Date.now() - startTime;
-        logger.sqlite.log(operation, 'success', {
-          operationId,
-          attempt,
-          result,
-          duration: `${duration}ms`,
-          timestamp: new Date().toISOString()
-        });
-        
-        return result as T;
-      } catch (error) {
-        const duration = Date.now() - startTime;
-        lastError = error instanceof Error ? error : new Error(String(error));
-        
-        logger.sqlite.error(operation, {
-          operationId,
-          attempt,
-          error: {
-            name: lastError.name,
-            message: lastError.message,
-            stack: lastError.stack
-          },
-          args,
-          duration: `${duration}ms`,
-          timestamp: new Date().toISOString()
-        });
-        
-        if (attempt < MAX_RETRIES) {
-          const backoffDelay = RETRY_DELAY * Math.pow(2, attempt - 1);
-          logger.warn(`[Preload] SQLite ${operation} failed (attempt ${attempt}/${MAX_RETRIES}), retrying in ${backoffDelay}ms...`, {
-            operationId,
-            error: lastError,
-            args,
-            nextAttemptIn: `${backoffDelay}ms`,
-            timestamp: new Date().toISOString()
-          });
-          await new Promise(resolve => setTimeout(resolve, backoffDelay));
-        }
-      }
-    }
-    
-    const finalError = new Error(
-      `SQLite ${operation} failed after ${MAX_RETRIES} attempts: ${lastError?.message || "Unknown error"}`
-    );
-    
-    logger.error('[Preload] SQLite operation failed permanently:', {
-      operation,
-      operationId,
-      error: {
-        name: finalError.name,
-        message: finalError.message,
-        stack: finalError.stack,
-        originalError: lastError
-      },
-      args,
-      attempts: MAX_RETRIES,
-      timestamp: new Date().toISOString()
-    });
-    
-    throw finalError;
-  };
-
-  return {
-    isAvailable: () => withRetry('is-available'),
-    echo: (value: string) => withRetry('echo', { value }),
-    createConnection: (options: SQLiteConnectionOptions) => withRetry('create-connection', options),
-    closeConnection: (options: { database: string }) => withRetry('close-connection', options),
-    query: (options: { statement: string; values?: unknown[] }) => withRetry('query', options),
-    run: (options: { statement: string; values?: unknown[] }) => withRetry('run', options),
-    execute: (options: { statements: { statement: string; values?: unknown[] }[] }) => withRetry('execute', options),
-    getPlatform: () => Promise.resolve('electron')
-  };
-};
-
-try {
-  // Expose the secure IPC bridge and SQLite proxy
-  const electronAPI = {
-    ipcRenderer: createSecureIPCBridge(),
-    sqlite: createSQLiteProxy(),
-    env: {
-      platform: 'electron',
-      isDev: process.env.NODE_ENV === 'development'
-    }
-  };
-
-  // Log the exposed API for debugging
-  logger.debug('Exposing Electron API:', {
-    hasIpcRenderer: !!electronAPI.ipcRenderer,
-    hasSqlite: !!electronAPI.sqlite,
-    sqliteMethods: Object.keys(electronAPI.sqlite),
-    env: electronAPI.env
-  });
-
-  contextBridge.exposeInMainWorld('electron', electronAPI);
-  logger.info('[Preload] IPC bridge and SQLite proxy initialized successfully');
-} catch (error) {
-  logger.error('[Preload] Failed to initialize IPC bridge:', error);
-}
-
-// Log startup
-logger.log('[CapacitorSQLite] Preload script starting...');
-
-// Handle window load
-window.addEventListener('load', () => {
-  logger.log('[CapacitorSQLite] Preload script complete');
-});

electron/src/rt/electron-plugins.js

@@ -1,6 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const CapacitorCommunitySqlite = require('../../../node_modules/@capacitor-community/sqlite/electron/dist/plugin.js');
-
-module.exports = {
-  CapacitorCommunitySqlite,
-}

electron/src/rt/electron-rt.ts

@@ -1,88 +0,0 @@
-import { randomBytes } from 'crypto';
-import { ipcRenderer, contextBridge } from 'electron';
-import { EventEmitter } from 'events';
-
-////////////////////////////////////////////////////////
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const plugins = require('./electron-plugins');
-
-const randomId = (length = 5) => randomBytes(length).toString('hex');
-
-const contextApi: {
-  [plugin: string]: { [functionName: string]: () => Promise<any> };
-} = {};
-
-Object.keys(plugins).forEach((pluginKey) => {
-  Object.keys(plugins[pluginKey])
-    .filter((className) => className !== 'default')
-    .forEach((classKey) => {
-      const functionList = Object.getOwnPropertyNames(plugins[pluginKey][classKey].prototype).filter(
-        (v) => v !== 'constructor'
-      );
-
-      if (!contextApi[classKey]) {
-        contextApi[classKey] = {};
-      }
-
-      functionList.forEach((functionName) => {
-        if (!contextApi[classKey][functionName]) {
-          contextApi[classKey][functionName] = (...args) => ipcRenderer.invoke(`${classKey}-${functionName}`, ...args);
-        }
-      });
-
-      // Events
-      if (plugins[pluginKey][classKey].prototype instanceof EventEmitter) {
-        const listeners: { [key: string]: { type: string; listener: (...args: any[]) => void } } = {};
-        const listenersOfTypeExist = (type) =>
-          !!Object.values(listeners).find((listenerObj) => listenerObj.type === type);
-
-        Object.assign(contextApi[classKey], {
-          addListener(type: string, callback: (...args) => void) {
-            const id = randomId();
-
-            // Deduplicate events
-            if (!listenersOfTypeExist(type)) {
-              ipcRenderer.send(`event-add-${classKey}`, type);
-            }
-
-            const eventHandler = (_, ...args) => callback(...args);
-
-            ipcRenderer.addListener(`event-${classKey}-${type}`, eventHandler);
-            listeners[id] = { type, listener: eventHandler };
-
-            return id;
-          },
-          removeListener(id: string) {
-            if (!listeners[id]) {
-              throw new Error('Invalid id');
-            }
-
-            const { type, listener } = listeners[id];
-
-            ipcRenderer.removeListener(`event-${classKey}-${type}`, listener);
-
-            delete listeners[id];
-
-            if (!listenersOfTypeExist(type)) {
-              ipcRenderer.send(`event-remove-${classKey}-${type}`);
-            }
-          },
-          removeAllListeners(type: string) {
-            Object.entries(listeners).forEach(([id, listenerObj]) => {
-              if (!type || listenerObj.type === type) {
-                ipcRenderer.removeListener(`event-${classKey}-${listenerObj.type}`, listenerObj.listener);
-                ipcRenderer.send(`event-remove-${classKey}-${listenerObj.type}`);
-                delete listeners[id];
-              }
-            });
-          },
-        });
-      }
-    });
-});
-
-contextBridge.exposeInMainWorld('CapacitorCustomPlatform', {
-  name: 'electron',
-  plugins: contextApi,
-});
-////////////////////////////////////////////////////////

electron/src/rt/logger.ts

@@ -1,188 +0,0 @@
-/**
- * Enhanced logging system for TimeSafari Electron
- * Provides structured logging with proper levels and formatting
- * Supports both console and file output with different verbosity levels
- * 
- * @author Matthew Raymer
- */
-
-import { app, ipcMain } from 'electron';
-import winston from 'winston';
-import path from 'path';
-import os from 'os';
-import fs from 'fs';
-
-// Extend Winston Logger type with our custom loggers
-declare module 'winston' {
-  interface Logger {
-    sqlite: {
-      debug: (message: string, ...args: unknown[]) => void;
-      info: (message: string, ...args: unknown[]) => void;
-      warn: (message: string, ...args: unknown[]) => void;
-      error: (message: string, ...args: unknown[]) => void;
-    };
-    migration: {
-      debug: (message: string, ...args: unknown[]) => void;
-      info: (message: string, ...args: unknown[]) => void;
-      warn: (message: string, ...args: unknown[]) => void;
-      error: (message: string, ...args: unknown[]) => void;
-    };
-  }
-}
-
-// Create logs directory if it doesn't exist
-const logsDir = path.join(app.getPath('userData'), 'logs');
-if (!fs.existsSync(logsDir)) {
-  fs.mkdirSync(logsDir, { recursive: true });
-}
-
-// Custom format for console output with migration filtering
-const consoleFormat = winston.format.combine(
-  winston.format.timestamp(),
-  winston.format.colorize(),
-  winston.format.printf(({ level, message, timestamp, ...metadata }) => {
-    // Skip migration logs unless DEBUG_MIGRATIONS is set
-    if (level === 'info' && 
-        typeof message === 'string' && 
-        message.includes('[Migration]') && 
-        !process.env.DEBUG_MIGRATIONS) {
-      return '';
-    }
-    
-    let msg = `${timestamp} [${level}] ${message}`;
-    if (Object.keys(metadata).length > 0) {
-      msg += ` ${JSON.stringify(metadata, null, 2)}`;
-    }
-    return msg;
-  })
-);
-
-// Custom format for file output
-const fileFormat = winston.format.combine(
-  winston.format.timestamp(),
-  winston.format.json()
-);
-
-// Create logger instance
-const logger = winston.createLogger({
-  level: process.env.NODE_ENV === 'development' ? 'debug' : 'info',
-  format: fileFormat,
-  defaultMeta: { service: 'timesafari-electron' },
-  transports: [
-    // Console transport with custom format and migration filtering
-    new winston.transports.Console({
-      format: consoleFormat,
-      level: process.env.NODE_ENV === 'development' ? 'debug' : 'info',
-      silent: false // Ensure we can still see non-migration logs
-    }),
-    // File transport for all logs
-    new winston.transports.File({
-      filename: path.join(logsDir, 'error.log'),
-      level: 'error',
-      maxsize: 5242880, // 5MB
-      maxFiles: 5
-    }),
-    // File transport for all logs including debug
-    new winston.transports.File({
-      filename: path.join(logsDir, 'combined.log'),
-      maxsize: 5242880, // 5MB
-      maxFiles: 5
-    })
-  ]
-}) as winston.Logger & {
-  sqlite: {
-    debug: (message: string, ...args: unknown[]) => void;
-    info: (message: string, ...args: unknown[]) => void;
-    warn: (message: string, ...args: unknown[]) => void;
-    error: (message: string, ...args: unknown[]) => void;
-  };
-  migration: {
-    debug: (message: string, ...args: unknown[]) => void;
-    info: (message: string, ...args: unknown[]) => void;
-    warn: (message: string, ...args: unknown[]) => void;
-    error: (message: string, ...args: unknown[]) => void;
-  };
-};
-
-// Add SQLite specific logger
-logger.sqlite = {
-  debug: (message: string, ...args: unknown[]) => {
-    logger.debug(`[SQLite] ${message}`, ...args);
-  },
-  info: (message: string, ...args: unknown[]) => {
-    logger.info(`[SQLite] ${message}`, ...args);
-  },
-  warn: (message: string, ...args: unknown[]) => {
-    logger.warn(`[SQLite] ${message}`, ...args);
-  },
-  error: (message: string, ...args: unknown[]) => {
-    logger.error(`[SQLite] ${message}`, ...args);
-  }
-};
-
-// Add migration specific logger with debug filtering
-logger.migration = {
-  debug: (message: string, ...args: unknown[]) => {
-    if (process.env.DEBUG_MIGRATIONS) {
-      //logger.debug(`[Migration] ${message}`, ...args);
-    }
-  },
-  info: (message: string, ...args: unknown[]) => {
-    // Always log to file, but only log to console if DEBUG_MIGRATIONS is set
-    if (process.env.DEBUG_MIGRATIONS) {
-      //logger.info(`[Migration] ${message}`, ...args);
-    } else {
-      // Use a separate transport for migration logs to file only
-      const metadata = args[0] as Record<string, unknown>;
-      logger.write({
-        level: 'info',
-        message: `[Migration] ${message}`,
-        ...(metadata || {})
-      });
-    }
-  },
-  warn: (message: string, ...args: unknown[]) => {
-    // Always log warnings to both console and file
-    //logger.warn(`[Migration] ${message}`, ...args);
-  },
-  error: (message: string, ...args: unknown[]) => {
-    // Always log errors to both console and file
-    //logger.error(`[Migration] ${message}`, ...args);
-  }
-};
-
-// Add renderer log handler
-ipcMain.on('renderer-log', (_event, { level, args, source, operation, error }) => {
-  const message = args.map((arg: unknown) => 
-    typeof arg === 'object' ? JSON.stringify(arg, null, 2) : String(arg)
-  ).join(' ');
-
-  const meta = {
-    source: source || 'renderer',
-    ...(operation && { operation }),
-    ...(error && { error })
-  };
-
-  switch (level) {
-    case 'error':
-      logger.error(message, meta);
-      break;
-    case 'warn':
-      logger.warn(message, meta);
-      break;
-    case 'info':
-      logger.info(message, meta);
-      break;
-    case 'debug':
-      logger.debug(message, meta);
-      break;
-    default:
-      logger.log(level, message, meta);
-  }
-});
-
-// Export logger instance
-export { logger };
-
-// Export a function to get the logs directory
-export const getLogsDirectory = () => logsDir; 

electron/src/rt/sqlite-error.ts

@@ -1,14 +0,0 @@
-/**
- * Custom error class for SQLite operations
- * Provides additional context and error tracking for SQLite operations
- */
-export class SQLiteError extends Error {
-  constructor(
-    message: string,
-    public operation: string,
-    public cause?: unknown
-  ) {
-    super(message);
-    this.name = 'SQLiteError';
-  }
-}

electron/src/setup.ts

@@ -1,442 +0,0 @@
-import type { CapacitorElectronConfig } from '@capacitor-community/electron';
-import {
-  CapElectronEventEmitter,
-  CapacitorSplashScreen,
-  setupCapacitorElectronPlugins,
-} from '@capacitor-community/electron';
-import chokidar from 'chokidar';
-import type { MenuItemConstructorOptions } from 'electron';
-import { app, BrowserWindow, Menu, MenuItem, nativeImage, Tray, session } from 'electron';
-import electronIsDev from 'electron-is-dev';
-import electronServe from 'electron-serve';
-import windowStateKeeper from 'electron-window-state';
-import { join } from 'path';
-
-/**
- * Reload watcher configuration and state management
- * Prevents infinite reload loops and implements rate limiting
- * Also prevents reloads during critical database operations
- * 
- * @author Matthew Raymer
- */
-const RELOAD_CONFIG = {
-  DEBOUNCE_MS: 1500,
-  COOLDOWN_MS: 5000,
-  MAX_RELOADS_PER_MINUTE: 10,
-  MAX_RELOADS_PER_SESSION: 100,
-  DATABASE_OPERATION_TIMEOUT_MS: 10000  // 10 second timeout for database operations
-};
-
-// Track database operation state
-let isDatabaseOperationInProgress = false;
-let lastDatabaseOperationTime = 0;
-
-/**
- * Checks if a database operation is in progress or recently completed
- * @returns {boolean} Whether a database operation is active
- */
-const isDatabaseOperationActive = (): boolean => {
-  const now = Date.now();
-  return isDatabaseOperationInProgress || 
-         (now - lastDatabaseOperationTime < RELOAD_CONFIG.DATABASE_OPERATION_TIMEOUT_MS);
-};
-
-/**
- * Marks the start of a database operation
- */
-export const startDatabaseOperation = (): void => {
-  isDatabaseOperationInProgress = true;
-  lastDatabaseOperationTime = Date.now();
-};
-
-/**
- * Marks the end of a database operation
- */
-export const endDatabaseOperation = (): void => {
-  isDatabaseOperationInProgress = false;
-  lastDatabaseOperationTime = Date.now();
-};
-
-const reloadWatcher = {
-  debouncer: null as NodeJS.Timeout | null,
-  ready: false,
-  watcher: null as chokidar.FSWatcher | null,
-  lastReloadTime: 0,
-  reloadCount: 0,
-  sessionReloadCount: 0,
-  resetTimeout: null as NodeJS.Timeout | null,
-  isReloading: false
-};
-
-/**
- * Resets the reload counter after one minute
- */
-const resetReloadCounter = () => {
-  reloadWatcher.reloadCount = 0;
-  reloadWatcher.resetTimeout = null;
-};
-
-/**
- * Checks if a reload is allowed based on rate limits, cooldown, and database state
- * @returns {boolean} Whether a reload is allowed
- */
-const canReload = (): boolean => {
-  const now = Date.now();
-  
-  // Check if database operation is active
-  if (isDatabaseOperationActive()) {
-    console.warn('[Reload Watcher] Skipping reload - database operation in progress');
-    return false;
-  }
-  
-  // Check cooldown period
-  if (now - reloadWatcher.lastReloadTime < RELOAD_CONFIG.COOLDOWN_MS) {
-    console.warn('[Reload Watcher] Skipping reload - cooldown period active');
-    return false;
-  }
-  
-  // Check per-minute limit
-  if (reloadWatcher.reloadCount >= RELOAD_CONFIG.MAX_RELOADS_PER_MINUTE) {
-    console.warn('[Reload Watcher] Skipping reload - maximum reloads per minute reached');
-    return false;
-  }
-  
-  // Check session limit
-  if (reloadWatcher.sessionReloadCount >= RELOAD_CONFIG.MAX_RELOADS_PER_SESSION) {
-    console.error('[Reload Watcher] Maximum reloads per session reached. Please restart the application.');
-    return false;
-  }
-  
-  return true;
-};
-
-/**
- * Cleans up the current watcher instance
- */
-const cleanupWatcher = () => {
-  if (reloadWatcher.watcher) {
-    reloadWatcher.watcher.close();
-    reloadWatcher.watcher = null;
-  }
-  if (reloadWatcher.debouncer) {
-    clearTimeout(reloadWatcher.debouncer);
-    reloadWatcher.debouncer = null;
-  }
-  if (reloadWatcher.resetTimeout) {
-    clearTimeout(reloadWatcher.resetTimeout);
-    reloadWatcher.resetTimeout = null;
-  }
-};
-
-/**
- * Sets up the file watcher for development mode reloading
- * Implements rate limiting and prevents infinite reload loops
- * 
- * @param electronCapacitorApp - The Electron Capacitor app instance
- */
-export function setupReloadWatcher(electronCapacitorApp: ElectronCapacitorApp): void {
-  // Cleanup any existing watcher
-  cleanupWatcher();
-  
-  // Reset state
-  reloadWatcher.ready = false;
-  reloadWatcher.isReloading = false;
-  
-  reloadWatcher.watcher = chokidar
-    .watch(join(app.getAppPath(), 'app'), {
-      ignored: /[/\\]\./,
-      persistent: true,
-      awaitWriteFinish: {
-        stabilityThreshold: 1000,
-        pollInterval: 100
-      }
-    })
-    .on('ready', () => {
-      reloadWatcher.ready = true;
-      console.log('[Reload Watcher] Ready to watch for changes');
-    })
-    .on('all', (_event, _path) => {
-      if (!reloadWatcher.ready || reloadWatcher.isReloading) {
-        return;
-      }
-      
-      // Clear existing debouncer
-      if (reloadWatcher.debouncer) {
-        clearTimeout(reloadWatcher.debouncer);
-      }
-      
-      // Set up new debouncer
-        reloadWatcher.debouncer = setTimeout(async () => {
-        if (!canReload()) {
-          return;
-        }
-        
-        try {
-          reloadWatcher.isReloading = true;
-          
-          // Update reload counters
-          reloadWatcher.lastReloadTime = Date.now();
-          reloadWatcher.reloadCount++;
-          reloadWatcher.sessionReloadCount++;
-          
-          // Set up reset timeout for per-minute counter
-          if (!reloadWatcher.resetTimeout) {
-            reloadWatcher.resetTimeout = setTimeout(resetReloadCounter, 60000);
-          }
-          
-          // Perform reload
-          console.log('[Reload Watcher] Reloading window...');
-          await electronCapacitorApp.getMainWindow().webContents.reload();
-          
-          // Reset state after reload
-          reloadWatcher.ready = false;
-          reloadWatcher.isReloading = false;
-          
-          // Re-setup watcher after successful reload
-          setupReloadWatcher(electronCapacitorApp);
-          
-        } catch (error) {
-          console.error('[Reload Watcher] Error during reload:', error);
-          reloadWatcher.isReloading = false;
-          reloadWatcher.ready = true;
-        }
-      }, RELOAD_CONFIG.DEBOUNCE_MS);
-    })
-    .on('error', (error) => {
-      console.error('[Reload Watcher] Error:', error);
-      cleanupWatcher();
-    });
-}
-
-// Define our class to manage our app.
-export class ElectronCapacitorApp {
-  private MainWindow: BrowserWindow | null = null;
-  private SplashScreen: CapacitorSplashScreen | null = null;
-  private TrayIcon: Tray | null = null;
-  private CapacitorFileConfig: CapacitorElectronConfig;
-  private TrayMenuTemplate: (MenuItem | MenuItemConstructorOptions)[] = [
-    new MenuItem({ label: 'Quit App', role: 'quit' }),
-  ];
-  private AppMenuBarMenuTemplate: (MenuItem | MenuItemConstructorOptions)[] = [
-    { role: process.platform === 'darwin' ? 'appMenu' : 'fileMenu' },
-    { role: 'viewMenu' },
-  ];
-  private mainWindowState;
-  private loadWebApp;
-  private customScheme: string;
-
-  constructor(
-    capacitorFileConfig: CapacitorElectronConfig,
-    trayMenuTemplate?: (MenuItemConstructorOptions | MenuItem)[],
-    appMenuBarMenuTemplate?: (MenuItemConstructorOptions | MenuItem)[]
-  ) {
-    this.CapacitorFileConfig = capacitorFileConfig;
-
-    this.customScheme = this.CapacitorFileConfig.electron?.customUrlScheme ?? 'capacitor-electron';
-
-    if (trayMenuTemplate) {
-      this.TrayMenuTemplate = trayMenuTemplate;
-    }
-
-    if (appMenuBarMenuTemplate) {
-      this.AppMenuBarMenuTemplate = appMenuBarMenuTemplate;
-    }
-
-    // Setup our web app loader, this lets us load apps like react, vue, and angular without changing their build chains.
-    this.loadWebApp = electronServe({
-      directory: join(app.getAppPath(), 'app'),
-      scheme: this.customScheme,
-    });
-  }
-
-  // Helper function to load in the app.
-  private async loadMainWindow(thisRef: any) {
-    await thisRef.loadWebApp(thisRef.MainWindow);
-  }
-
-  // Expose the mainWindow ref for use outside of the class.
-  getMainWindow(): BrowserWindow {
-    return this.MainWindow;
-  }
-
-  getCustomURLScheme(): string {
-    return this.customScheme;
-  }
-
-  async init(): Promise<void> {
-    const icon = nativeImage.createFromPath(
-      join(app.getAppPath(), 'assets', process.platform === 'win32' ? 'appIcon.ico' : 'appIcon.png')
-    );
-    this.mainWindowState = windowStateKeeper({
-      defaultWidth: 1000,
-      defaultHeight: 800,
-    });
-
-    // Setup preload script path based on environment
-    const preloadPath = app.isPackaged
-      ? join(process.resourcesPath, 'preload.js')
-      : join(__dirname, 'preload.js');
-
-    console.log('[Electron Main Process] Preload path:', preloadPath);
-    console.log('[Electron Main Process] Preload exists:', require('fs').existsSync(preloadPath));
-
-    this.MainWindow = new BrowserWindow({
-      icon,
-      show: false,
-      x: this.mainWindowState.x,
-      y: this.mainWindowState.y,
-      width: this.mainWindowState.width,
-      height: this.mainWindowState.height,
-      webPreferences: {
-        nodeIntegration: false,
-        contextIsolation: true,
-        sandbox: false,
-        preload: preloadPath,
-        webSecurity: true,
-        allowRunningInsecureContent: false,
-      },
-    });
-    this.mainWindowState.manage(this.MainWindow);
-
-    if (this.CapacitorFileConfig.backgroundColor) {
-      this.MainWindow.setBackgroundColor(this.CapacitorFileConfig.electron.backgroundColor);
-    }
-
-    // If we close the main window with the splashscreen enabled we need to destory the ref.
-    this.MainWindow.on('closed', () => {
-      if (this.SplashScreen?.getSplashWindow() && !this.SplashScreen.getSplashWindow().isDestroyed()) {
-        this.SplashScreen.getSplashWindow().close();
-      }
-    });
-
-    // When the tray icon is enabled, setup the options.
-    if (this.CapacitorFileConfig.electron?.trayIconAndMenuEnabled) {
-      this.TrayIcon = new Tray(icon);
-      this.TrayIcon.on('double-click', () => {
-        if (this.MainWindow) {
-          if (this.MainWindow.isVisible()) {
-            this.MainWindow.hide();
-          } else {
-            this.MainWindow.show();
-            this.MainWindow.focus();
-          }
-        }
-      });
-      this.TrayIcon.on('click', () => {
-        if (this.MainWindow) {
-          if (this.MainWindow.isVisible()) {
-            this.MainWindow.hide();
-          } else {
-            this.MainWindow.show();
-            this.MainWindow.focus();
-          }
-        }
-      });
-      this.TrayIcon.setToolTip(app.getName());
-      this.TrayIcon.setContextMenu(Menu.buildFromTemplate(this.TrayMenuTemplate));
-    }
-
-    // Setup the main manu bar at the top of our window.
-    Menu.setApplicationMenu(Menu.buildFromTemplate(this.AppMenuBarMenuTemplate));
-
-    // If the splashscreen is enabled, show it first while the main window loads then switch it out for the main window, or just load the main window from the start.
-    if (this.CapacitorFileConfig.electron?.splashScreenEnabled) {
-      this.SplashScreen = new CapacitorSplashScreen({
-        imageFilePath: join(
-          app.getAppPath(),
-          'assets',
-          this.CapacitorFileConfig.electron?.splashScreenImageName ?? 'splash.png'
-        ),
-        windowWidth: 400,
-        windowHeight: 400,
-      });
-      this.SplashScreen.init(this.loadMainWindow, this);
-    } else {
-      this.loadMainWindow(this);
-    }
-
-    // Security
-    this.MainWindow.webContents.setWindowOpenHandler((details) => {
-      if (!details.url.includes(this.customScheme)) {
-        return { action: 'deny' };
-      } else {
-        return { action: 'allow' };
-      }
-    });
-    this.MainWindow.webContents.on('will-navigate', (event, _newURL) => {
-      if (!this.MainWindow.webContents.getURL().includes(this.customScheme)) {
-        event.preventDefault();
-      }
-    });
-
-    // Link electron plugins into the system.
-    setupCapacitorElectronPlugins();
-
-    // When the web app is loaded we hide the splashscreen if needed and show the mainwindow.
-    this.MainWindow.webContents.on('dom-ready', () => {
-      if (this.CapacitorFileConfig.electron?.splashScreenEnabled) {
-        this.SplashScreen.getSplashWindow().hide();
-      }
-      if (!this.CapacitorFileConfig.electron?.hideMainWindowOnLaunch) {
-        this.MainWindow.show();
-      }
-      
-      // Re-register SQLite handlers after reload
-      if (electronIsDev) {
-        console.log('[Electron Main Process] Re-registering SQLite handlers after reload');
-        const { setupSQLiteHandlers } = require('./rt/sqlite-init');
-        setupSQLiteHandlers();
-      }
-      
-      setTimeout(() => {
-        if (electronIsDev) {
-          this.MainWindow.webContents.openDevTools();
-        }
-        CapElectronEventEmitter.emit('CAPELECTRON_DeeplinkListenerInitialized', '');
-      }, 400);
-    });
-  }
-}
-
-// Set a CSP up for our application based on the custom scheme
-export function setupContentSecurityPolicy(customScheme: string): void {
-  session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
-    callback({
-      responseHeaders: {
-        ...details.responseHeaders,
-        'Content-Security-Policy': [
-          // Base CSP for both dev and prod
-          `default-src ${customScheme}://*;`,
-          // Script sources
-          `script-src ${customScheme}://* 'self' 'unsafe-inline'${electronIsDev ? " 'unsafe-eval'" : ''};`,
-          // Style sources
-          `style-src ${customScheme}://* 'self' 'unsafe-inline' https://fonts.googleapis.com;`,
-          // Font sources
-          `font-src ${customScheme}://* 'self' https://fonts.gstatic.com;`,
-          // Image sources
-          `img-src ${customScheme}://* 'self' data: https:;`,
-          // Connect sources (for API calls)
-          `connect-src ${customScheme}://* 'self' https:;`,
-          // Worker sources
-          `worker-src ${customScheme}://* 'self' blob:;`,
-          // Frame sources
-          `frame-src ${customScheme}://* 'self';`,
-          // Media sources
-          `media-src ${customScheme}://* 'self' data:;`,
-          // Object sources
-          `object-src 'none';`,
-          // Base URI
-          `base-uri 'self';`,
-          // Form action
-          `form-action ${customScheme}://* 'self';`,
-          // Frame ancestors
-          `frame-ancestors 'none';`,
-          // Upgrade insecure requests
-          'upgrade-insecure-requests;',
-          // Block mixed content
-          'block-all-mixed-content;'
-        ].join(' ')
-      },
-    });
-  });
-}

electron/tsconfig.json

@@ -1,18 +0,0 @@
-{
-  "compileOnSave": true,
-  "include": ["./src/**/*", "./capacitor.config.ts", "./capacitor.config.js"],
-  "compilerOptions": {
-    "outDir": "./build",
-    "importHelpers": true,
-    "target": "ES2020",
-    "module": "CommonJS",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "typeRoots": ["./node_modules/@types"],
-    "allowJs": true,
-    "rootDir": ".",
-    "skipLibCheck": true,
-    "resolveJsonModule": true
-  }
-}
- 

experiment.sh

@@ -1,155 +0,0 @@
-#!/bin/bash
-# experiment.sh
-# Author: Matthew Raymer
-# Description: Build script for TimeSafari Electron application
-# This script handles the complete build process for the TimeSafari Electron app,
-# including web asset compilation and Capacitor sync.
-#
-# Build Process:
-# 1. Environment setup and dependency checks
-# 2. Web asset compilation (Vite)
-# 3. Capacitor sync
-# 4. Electron start
-#
-# Dependencies:
-# - Node.js and npm
-# - TypeScript
-# - Vite
-# - @capacitor-community/electron
-#
-# Usage: ./experiment.sh
-#
-# Exit Codes:
-# 1 - Required command not found
-# 2 - TypeScript installation failed
-# 3 - Build process failed
-# 4 - Capacitor sync failed
-# 5 - Electron start failed
-
-# Exit on any error
-set -e
-
-# ANSI color codes for better output formatting
-readonly RED='\033[0;31m'
-readonly GREEN='\033[0;32m'
-readonly YELLOW='\033[1;33m'
-readonly BLUE='\033[0;34m'
-readonly NC='\033[0m' # No Color
-
-# Logging functions
-log_info() {
-    echo -e "${BLUE}[$(date '+%Y-%m-%d %H:%M:%S')] [INFO]${NC} $1"
-}
-
-log_success() {
-    echo -e "${GREEN}[$(date '+%Y-%m-%d %H:%M:%S')] [SUCCESS]${NC} $1"
-}
-
-log_warn() {
-    echo -e "${YELLOW}[$(date '+%Y-%m-%d %H:%M:%S')] [WARN]${NC} $1"
-}
-
-log_error() {
-    echo -e "${RED}[$(date '+%Y-%m-%d %H:%M:%S')] [ERROR]${NC} $1"
-}
-
-# Function to check if a command exists
-check_command() {
-    if ! command -v "$1" &> /dev/null; then
-        log_error "$1 is required but not installed."
-        exit 1
-    fi
-    log_info "Found $1: $(command -v "$1")"
-}
-
-# Function to measure and log execution time
-measure_time() {
-    local start_time=$(date +%s)
-    "$@"
-    local end_time=$(date +%s)
-    local duration=$((end_time - start_time))
-    log_success "Completed in ${duration} seconds"
-}
-
-# Print build header
-echo -e "\n${BLUE}=== TimeSafari Electron Build Process ===${NC}\n"
-log_info "Starting build process at $(date)"
-
-# Check required commands
-log_info "Checking required dependencies..."
-check_command node
-check_command npm
-check_command git
-
-# Create application data directory
-log_info "Setting up application directories..."
-mkdir -p ~/.local/share/TimeSafari/timesafari
-
-# Clean up previous builds
-log_info "Cleaning previous builds..."
-rm -rf dist* || log_warn "No previous builds to clean"
-
-# Set environment variables for the build
-log_info "Configuring build environment..."
-export VITE_PLATFORM=electron
-export VITE_PWA_ENABLED=false
-export VITE_DISABLE_PWA=true
-export DEBUG_MIGRATIONS=0
-
-# Ensure TypeScript is installed
-log_info "Verifying TypeScript installation..."
-if [ ! -f "./node_modules/.bin/tsc" ]; then
-    log_info "Installing TypeScript..."
-    if ! npm install --save-dev typescript@~5.2.2; then
-        log_error "TypeScript installation failed!"
-        exit 2
-    fi
-    # Verify installation
-    if [ ! -f "./node_modules/.bin/tsc" ]; then
-        log_error "TypeScript installation verification failed!"
-        exit 2
-    fi
-    log_success "TypeScript installed successfully"
-else
-    log_info "TypeScript already installed"
-fi
-
-# Get git hash for versioning
-GIT_HASH=$(git log -1 --pretty=format:%h)
-log_info "Using git hash: ${GIT_HASH}"
-
-# Build web assets
-log_info "Building web assets with Vite..."
-if ! measure_time env VITE_GIT_HASH="$GIT_HASH" npx vite build --config vite.config.app.electron.mts --mode electron; then
-    log_error "Web asset build failed!"
-    exit 3
-fi
-
-# Sync with Capacitor
-log_info "Syncing with Capacitor..."
-if ! measure_time npx cap sync electron; then
-    log_error "Capacitor sync failed!"
-    exit 4
-fi
-
-# Restore capacitor config
-log_info "Restoring capacitor config..."
-if ! git checkout electron/capacitor.config.json; then
-    log_error "Failed to restore capacitor config!"
-    exit 4
-fi
-
-# Start Electron
-log_info "Starting Electron..."
-cd electron/
-if ! measure_time npm run electron:start; then
-    log_error "Electron start failed!"
-    exit 5
-fi
-
-# Print build summary
-log_success "Build and start completed successfully!"
-echo -e "\n${GREEN}=== End of Build Process ===${NC}\n"
-
-# Exit with success
-exit 0

ios/App/App/AppDelegate.swift

@@ -1,6 +1,5 @@
 import UIKit
 import Capacitor
-import CapacitorCommunitySqlite
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -8,10 +7,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // Initialize SQLite
-        let sqlite = SQLite()
-        sqlite.initialize()
-        
         // Override point for customization after application launch.
         return true
     }

ios/App/Podfile

@@ -11,7 +11,6 @@ install! 'cocoapods', :disable_input_output_paths => true
 def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
-  pod 'CapacitorCommunitySqlite', :path => '../../node_modules/@capacitor-community/sqlite'
   pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/@capacitor-mlkit/barcode-scanning'
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
   pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'

main.js

@@ -0,0 +1,29 @@
+const { app, BrowserWindow } = require('electron');
+const path = require('path');
+
+function createWindow() {
+  const win = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: true,
+      contextIsolation: false
+    }
+  });
+
+  win.loadFile(path.join(__dirname, 'dist-electron/www/index.html'));
+}
+
+app.whenReady().then(createWindow);
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+});
+
+app.on('activate', () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow();
+  }
+}); 

package.json

@@ -11,7 +11,7 @@
     "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.mts",
     "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
     "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
-    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.cjs && node scripts/copy-wasm.cjs",
+    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js",
     "test:all": "npm run test:prerequisites && npm run build && npm run test:web && npm run test:mobile",
     "test:prerequisites": "node scripts/check-prerequisites.js",
     "test:web": "npx playwright test -c playwright.config-local.ts --trace on",
@@ -22,15 +22,14 @@
     "check:ios-device": "xcrun xctrace list devices 2>&1 | grep -w 'Booted' || (echo 'No iOS simulator running' && exit 1)",
     "clean:electron": "rimraf dist-electron",
     "build:pywebview": "vite build --config vite.config.pywebview.mts",
-    "build:web": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.web.mts",
+    "build:electron": "npm run clean:electron && tsc -p tsconfig.electron.json && vite build --config vite.config.electron.mts && node scripts/build-electron.js",
-    "build:web:electron": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.web.mts && VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.electron.mts --mode electron",
-    "build:electron": "npm run clean:electron && npm run build:web:electron && tsc -p tsconfig.electron.json && vite build --config vite.config.electron.mts && node scripts/build-electron.cjs",
     "build:capacitor": "vite build --mode capacitor --config vite.config.capacitor.mts",
+    "build:web": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.web.mts",
     "electron:dev": "npm run build && electron .",
     "electron:start": "electron .",
     "clean:android": "adb uninstall app.timesafari.app || true",
     "build:android": "npm run clean:android && rm -rf dist && npm run build:web && npm run build:capacitor && cd android && ./gradlew clean && ./gradlew assembleDebug && cd .. && npx cap sync android && npx capacitor-assets generate --android && npx cap open android",
-    "electron:build-linux": "electron-builder --linux AppImage",
+    "electron:build-linux": "npm run build:electron && electron-builder --linux AppImage",
     "electron:build-linux-deb": "npm run build:electron && electron-builder --linux deb",
     "electron:build-linux-prod": "NODE_ENV=production npm run build:electron && electron-builder --linux AppImage",
     "build:electron-prod": "NODE_ENV=production npm run build:electron",
@@ -47,7 +46,6 @@
     "electron:build-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal"
   },
   "dependencies": {
-    "@capacitor-community/sqlite": "^6.0.2",
     "@capacitor-mlkit/barcode-scanning": "^6.0.0",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.0",
@@ -58,19 +56,18 @@
     "@capacitor/ios": "^6.2.0",
     "@capacitor/share": "^6.0.3",
     "@capawesome/capacitor-file-picker": "^6.2.0",
-    "@dicebear/collection": "^5.4.3",
+    "@dicebear/collection": "^5.4.1",
-    "@dicebear/core": "^5.4.3",
+    "@dicebear/core": "^5.4.1",
     "@ethersproject/hdnode": "^5.7.0",
     "@ethersproject/wallet": "^5.8.0",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/vue-fontawesome": "^3.0.6",
-    "@jlongster/sql.js": "^1.6.7",
     "@peculiar/asn1-ecc": "^2.3.8",
     "@peculiar/asn1-schema": "^2.3.8",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
     "@simplewebauthn/browser": "^10.0.0",
-    "@simplewebauthn/server": "^10.0.1",
+    "@simplewebauthn/server": "^10.0.0",
     "@tweenjs/tween.js": "^21.1.1",
     "@types/qrcode": "^1.5.5",
     "@veramo/core": "^5.6.0",
@@ -84,10 +81,8 @@
     "@vue-leaflet/vue-leaflet": "^0.10.1",
     "@vueuse/core": "^12.3.0",
     "@zxing/text-encoding": "^0.9.0",
-    "absurd-sql": "^0.0.54",
     "asn1-ber": "^1.2.2",
     "axios": "^1.6.8",
-    "better-sqlite3-multiple-ciphers": "^11.10.0",
     "cbor-x": "^1.5.9",
     "class-transformer": "^0.5.1",
     "dexie": "^3.2.7",
@@ -95,23 +90,22 @@
     "did-jwt": "^7.4.7",
     "did-resolver": "^4.1.0",
     "dotenv": "^16.0.3",
-    "electron-json-storage": "^4.6.0",
+    "ethereum-cryptography": "^2.1.3",
-    "ethereum-cryptography": "^2.2.1",
     "ethereumjs-util": "^7.1.5",
-    "jdenticon": "^3.3.0",
+    "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
     "js-yaml": "^4.1.0",
     "jsqr": "^1.4.0",
     "leaflet": "^1.9.4",
     "localstorage-slim": "^2.7.0",
-    "lru-cache": "^10.4.3",
+    "lru-cache": "^10.2.0",
     "luxon": "^3.4.4",
     "merkletreejs": "^0.3.11",
-    "nostr-tools": "^2.13.1",
+    "nostr-tools": "^2.10.4",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
-    "pinia-plugin-persistedstate": "^3.2.3",
+    "pinia-plugin-persistedstate": "^3.2.1",
     "qr-code-generator-vue3": "^1.4.21",
     "qrcode": "^1.5.4",
     "ramda": "^0.29.1",
@@ -127,13 +121,13 @@
     "vue-axios": "^3.5.2",
     "vue-facing-decorator": "^3.0.4",
     "vue-picture-cropper": "^0.7.0",
-    "vue-qrcode-reader": "^5.7.2",
+    "vue-qrcode-reader": "^5.5.3",
     "vue-router": "^4.5.0",
-    "web-did-resolver": "^2.0.30",
+    "wa-sqlite": "github:rhashimoto/wa-sqlite",
+    "web-did-resolver": "^2.0.27",
     "zod": "^3.24.2"
   },
   "devDependencies": {
-    "@capacitor-community/electron": "^5.0.1",
     "@capacitor/assets": "^3.0.5",
     "@playwright/test": "^1.45.2",
     "@types/dom-webcodecs": "^0.1.7",
@@ -148,12 +142,10 @@
     "@types/ua-parser-js": "^0.7.39",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "@vitejs/plugin-vue": "^5.2.4",
+    "@vitejs/plugin-vue": "^5.2.1",
     "@vue/eslint-config-typescript": "^11.0.3",
     "autoprefixer": "^10.4.19",
-    "browserify-fs": "^1.0.0",
     "concurrently": "^8.2.2",
-    "crypto-browserify": "^3.12.1",
     "electron": "^33.2.1",
     "electron-builder": "^25.1.8",
     "eslint": "^8.57.0",
@@ -164,17 +156,15 @@
     "markdownlint": "^0.37.4",
     "markdownlint-cli": "^0.44.0",
     "npm-check-updates": "^17.1.13",
-    "path-browserify": "^1.0.1",
     "postcss": "^8.4.38",
     "prettier": "^3.2.5",
     "rimraf": "^6.0.1",
-    "source-map-support": "^0.5.21",
     "tailwindcss": "^3.4.1",
     "typescript": "~5.2.2",
     "vite": "^5.2.0",
-    "vite-plugin-pwa": "^1.0.0"
+    "vite-plugin-pwa": "^0.19.8"
   },
-  "main": "./dist-electron/main.mjs",
+  "main": "./dist-electron/main.js",
   "build": {
     "appId": "app.timesafari",
     "productName": "TimeSafari",
@@ -183,17 +173,12 @@
     },
     "files": [
       "dist-electron/**/*",
-      "dist/**/*",
+      "dist/**/*"
-      "capacitor.config.json"
     ],
     "extraResources": [
       {
-        "from": "dist-electron/www",
+        "from": "dist",
         "to": "www"
-      },
-      {
-        "from": "dist-electron/resources/preload.js",
-        "to": "preload.js"
       }
     ],
     "linux": {
@@ -231,6 +216,5 @@
         }
       ]
     }
-  },
+  }
-  "type": "module"
 }

requirements.txt

@@ -1,6 +1,5 @@
 eth_keys
 pywebview
 pyinstaller>=6.12.0
-setuptools>=69.0.0  # Required for distutils for electron-builder on macOS
 # For development
 watchdog>=3.0.0  # For file watching support 

scripts/build-electron.cjs

@@ -1,96 +0,0 @@
-const fs = require("fs");
-const fse = require("fs-extra");
-const path = require("path");
-const { execSync } = require('child_process');
-
-console.log("Starting Electron build finalization...");
-
-// Define paths
-const distPath = path.join(__dirname, "..", "dist");
-const electronDistPath = path.join(__dirname, "..", "dist-electron");
-const wwwPath = path.join(electronDistPath, "www");
-const builtIndexPath = path.join(distPath, "index.html");
-const finalIndexPath = path.join(wwwPath, "index.html");
-
-// Ensure target directory exists
-if (!fs.existsSync(wwwPath)) {
-  fs.mkdirSync(wwwPath, { recursive: true });
-}
-
-// Copy assets directory
-const assetsSrc = path.join(distPath, "assets");
-const assetsDest = path.join(wwwPath, "assets");
-if (fs.existsSync(assetsSrc)) {
-  fse.copySync(assetsSrc, assetsDest, { overwrite: true });
-}
-
-// Copy favicon.ico
-const faviconSrc = path.join(distPath, "favicon.ico");
-if (fs.existsSync(faviconSrc)) {
-  fs.copyFileSync(faviconSrc, path.join(wwwPath, "favicon.ico"));
-}
-
-// Copy manifest.webmanifest
-const manifestSrc = path.join(distPath, "manifest.webmanifest");
-if (fs.existsSync(manifestSrc)) {
-  fs.copyFileSync(manifestSrc, path.join(wwwPath, "manifest.webmanifest"));
-}
-
-// Load and modify index.html from Vite output
-let indexContent = fs.readFileSync(builtIndexPath, "utf-8");
-
-// Inject the window.process shim after the first <script> block
-indexContent = indexContent.replace(
-  /<script[^>]*type="module"[^>]*>/,
-  match => `${match}\n  window.process = { env: { VITE_PLATFORM: 'electron' } };`
-);
-
-// Write the modified index.html to dist-electron/www
-fs.writeFileSync(finalIndexPath, indexContent);
-
-// Copy preload script to resources
-const preloadSrc = path.join(electronDistPath, "preload.mjs");
-const preloadDest = path.join(electronDistPath, "resources", "preload.js");
-
-// Ensure resources directory exists
-const resourcesDir = path.join(electronDistPath, "resources");
-if (!fs.existsSync(resourcesDir)) {
-  fs.mkdirSync(resourcesDir, { recursive: true });
-}
-
-if (fs.existsSync(preloadSrc)) {
-  // Read the preload script
-  let preloadContent = fs.readFileSync(preloadSrc, 'utf-8');
-  
-  // Convert ESM to CommonJS if needed
-  preloadContent = preloadContent
-    .replace(/import\s*{\s*([^}]+)\s*}\s*from\s*['"]electron['"];?/g, 'const { $1 } = require("electron");')
-    .replace(/export\s*{([^}]+)};?/g, '')
-    .replace(/export\s+default\s+([^;]+);?/g, 'module.exports = $1;');
-  
-  // Write the modified preload script
-  fs.writeFileSync(preloadDest, preloadContent);
-  console.log("Preload script copied and converted to resources directory");
-} else {
-  console.error("Preload script not found at:", preloadSrc);
-  process.exit(1);
-}
-
-// Copy capacitor.config.json to dist-electron
-try {
-  console.log("Copying capacitor.config.json to dist-electron...");
-  const configPath = path.join(process.cwd(), 'capacitor.config.json');
-  const targetPath = path.join(process.cwd(), 'dist-electron', 'capacitor.config.json');
-  
-  if (!fs.existsSync(configPath)) {
-    throw new Error('capacitor.config.json not found in project root');
-  }
-  
-  fs.copyFileSync(configPath, targetPath);
-  console.log("Successfully copied capacitor.config.json");
-} catch (error) {
-  console.error("Failed to copy capacitor.config.json:", error);
-  throw error;
-}
-
-console.log("Electron index.html copied and patched for Electron context.");

scripts/build-electron.js

@@ -0,0 +1,243 @@
+const fs = require('fs');
+const path = require('path');
+
+    console.log('Starting electron build process...');
+
+    // Copy web files
+const webDistPath = path.join(__dirname, '..', 'dist');
+const electronDistPath = path.join(__dirname, '..', 'dist-electron');
+const wwwPath = path.join(electronDistPath, 'www');
+
+// Create www directory if it doesn't exist
+if (!fs.existsSync(wwwPath)) {
+  fs.mkdirSync(wwwPath, { recursive: true });
+}
+
+// Copy web files to www directory
+fs.cpSync(webDistPath, wwwPath, { recursive: true });
+
+// Fix asset paths in index.html
+const indexPath = path.join(wwwPath, 'index.html');
+let indexContent = fs.readFileSync(indexPath, 'utf8');
+
+// Fix asset paths
+    indexContent = indexContent
+  .replace(/\/assets\//g, './assets/')
+  .replace(/href="\//g, 'href="./')
+  .replace(/src="\//g, 'src="./');
+
+fs.writeFileSync(indexPath, indexContent);
+
+// Check for remaining /assets/ paths
+    console.log('After path fixing, checking for remaining /assets/ paths:', indexContent.includes('/assets/'));
+console.log('Sample of fixed content:', indexContent.substring(0, 500));
+    
+console.log('Copied and fixed web files in:', wwwPath);
+
+    // Copy main process files
+    console.log('Copying main process files...');
+
+// Create the main process file with inlined logger
+const mainContent = `const { app, BrowserWindow } = require("electron");
+const path = require("path");
+const fs = require("fs");
+
+// Inline logger implementation
+const logger = {
+  log: (...args) => console.log(...args),
+  error: (...args) => console.error(...args),
+  info: (...args) => console.info(...args),
+  warn: (...args) => console.warn(...args),
+  debug: (...args) => console.debug(...args),
+};
+
+// Check if running in dev mode
+const isDev = process.argv.includes("--inspect");
+
+function createWindow() {
+  // Add before createWindow function
+  const preloadPath = path.join(__dirname, "preload.js");
+  logger.log("Checking preload path:", preloadPath);
+  logger.log("Preload exists:", fs.existsSync(preloadPath));
+
+  // Create the browser window.
+  const mainWindow = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: false,
+      contextIsolation: true,
+      webSecurity: true,
+      allowRunningInsecureContent: false,
+      preload: path.join(__dirname, "preload.js"),
+    },
+  });
+
+  // Always open DevTools for now
+  mainWindow.webContents.openDevTools();
+
+  // Intercept requests to fix asset paths
+  mainWindow.webContents.session.webRequest.onBeforeRequest(
+    {
+      urls: [
+        "file://*/*/assets/*",
+        "file://*/assets/*",
+        "file:///assets/*", // Catch absolute paths
+        "<all_urls>", // Catch all URLs as a fallback
+      ],
+    },
+    (details, callback) => {
+      let url = details.url;
+
+      // Handle paths that don't start with file://
+      if (!url.startsWith("file://") && url.includes("/assets/")) {
+        url = \`file://\${path.join(__dirname, "www", url)}\`;
+      }
+
+      // Handle absolute paths starting with /assets/
+      if (url.includes("/assets/") && !url.includes("/www/assets/")) {
+        const baseDir = url.includes("dist-electron")
+          ? url.substring(
+              0,
+              url.indexOf("/dist-electron") + "/dist-electron".length,
+            )
+          : \`file://\${__dirname}\`;
+        const assetPath = url.split("/assets/")[1];
+        const newUrl = \`\${baseDir}/www/assets/\${assetPath}\`;
+        callback({ redirectURL: newUrl });
+        return;
+      }
+
+      callback({}); // No redirect for other URLs
+    },
+  );
+
+  if (isDev) {
+    // Debug info
+    logger.log("Debug Info:");
+    logger.log("Running in dev mode:", isDev);
+    logger.log("App is packaged:", app.isPackaged);
+    logger.log("Process resource path:", process.resourcesPath);
+    logger.log("App path:", app.getAppPath());
+    logger.log("__dirname:", __dirname);
+    logger.log("process.cwd():", process.cwd());
+  }
+
+  const indexPath = path.join(__dirname, "www", "index.html");
+
+  if (isDev) {
+    logger.log("Loading index from:", indexPath);
+    logger.log("www path:", path.join(__dirname, "www"));
+    logger.log("www assets path:", path.join(__dirname, "www", "assets"));
+  }
+
+  if (!fs.existsSync(indexPath)) {
+    logger.error(\`Index file not found at: \${indexPath}\`);
+    throw new Error("Index file not found");
+  }
+
+  // Add CSP headers to allow API connections, Google Fonts, and zxing-wasm
+  mainWindow.webContents.session.webRequest.onHeadersReceived(
+    (details, callback) => {
+      callback({
+        responseHeaders: {
+          ...details.responseHeaders,
+          "Content-Security-Policy": [
+            "default-src 'self';" +
+            "connect-src 'self' https://api.endorser.ch https://*.timesafari.app https://*.jsdelivr.net;" +
+            "img-src 'self' data: https: blob:;" +
+            "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.jsdelivr.net;" +
+            "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;" +
+            "font-src 'self' data: https://fonts.gstatic.com;" +
+            "style-src-elem 'self' 'unsafe-inline' https://fonts.googleapis.com;" +
+            "worker-src 'self' blob:;",
+          ],
+        },
+      });
+    },
+  );
+
+  // Load the index.html
+  mainWindow
+    .loadFile(indexPath)
+    .then(() => {
+      logger.log("Successfully loaded index.html");
+      if (isDev) {
+        mainWindow.webContents.openDevTools();
+        logger.log("DevTools opened - running in dev mode");
+      }
+    })
+    .catch((err) => {
+      logger.error("Failed to load index.html:", err);
+      logger.error("Attempted path:", indexPath);
+    });
+
+  // Listen for console messages from the renderer
+  mainWindow.webContents.on("console-message", (_event, _level, message) => {
+    logger.log("Renderer Console:", message);
+  });
+
+  // Add right after creating the BrowserWindow
+  mainWindow.webContents.on(
+    "did-fail-load",
+    (_event, errorCode, errorDescription) => {
+      logger.error("Page failed to load:", errorCode, errorDescription);
+    },
+  );
+
+  mainWindow.webContents.on("preload-error", (_event, preloadPath, error) => {
+    logger.error("Preload script error:", preloadPath, error);
+  });
+
+  mainWindow.webContents.on(
+    "console-message",
+    (_event, _level, message, line, sourceId) => {
+      logger.log("Renderer Console:", line, sourceId, message);
+    },
+  );
+
+  // Enable remote debugging when in dev mode
+  if (isDev) {
+    mainWindow.webContents.openDevTools();
+    }
+}
+
+// Handle app ready
+app.whenReady().then(createWindow);
+
+// Handle all windows closed
+app.on("window-all-closed", () => {
+  if (process.platform !== "darwin") {
+    app.quit();
+  }
+});
+
+app.on("activate", () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow();
+  }
+});
+
+// Handle any errors
+process.on("uncaughtException", (error) => {
+  logger.error("Uncaught Exception:", error);
+});
+`;
+
+// Write the main process file
+const mainDest = path.join(electronDistPath, 'main.js');
+fs.writeFileSync(mainDest, mainContent);
+
+// Copy preload script if it exists
+const preloadSrc = path.join(__dirname, '..', 'src', 'electron', 'preload.js');
+const preloadDest = path.join(electronDistPath, 'preload.js');
+if (fs.existsSync(preloadSrc)) {
+  console.log(`Copying ${preloadSrc} to ${preloadDest}`);
+  fs.copyFileSync(preloadSrc, preloadDest);
+}
+
+// Verify build structure
+console.log('\nVerifying build structure:');
+console.log('Files in dist-electron:', fs.readdirSync(electronDistPath));
+
+console.log('Build completed successfully!'); 

scripts/copy-wasm.cjs

@@ -1,15 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-// Create public/wasm directory if it doesn't exist
-const wasmDir = path.join(__dirname, '../public/wasm');
-if (!fs.existsSync(wasmDir)) {
-  fs.mkdirSync(wasmDir, { recursive: true });
-}
-
-// Copy the WASM file from node_modules to public/wasm
-const sourceFile = path.join(__dirname, '../node_modules/@jlongster/sql.js/dist/sql-wasm.wasm');
-const targetFile = path.join(wasmDir, 'sql-wasm.wasm');
-
-fs.copyFileSync(sourceFile, targetFile);
-console.log('WASM file copied successfully!'); 

src/App.vue

@@ -330,11 +330,8 @@
 
 <script lang="ts">
 import { Vue, Component } from "vue-facing-decorator";
-
+import { logConsoleAndDb, retrieveSettingsForActiveAccount } from "./db/index";
-import { NotificationIface, USE_DEXIE_DB } from "./constants/app";
+import { NotificationIface } from "./constants/app";
-import * as databaseUtil from "./db/databaseUtil";
-import { retrieveSettingsForActiveAccount } from "./db/index";
-import { logConsoleAndDb } from "./db/databaseUtil";
 import { logger } from "./utils/logger";
 
 interface Settings {
@@ -399,11 +396,7 @@ export default class App extends Vue {
 
     try {
       logger.log("Retrieving settings for the active account...");
-      let settings: Settings =
+      const settings: Settings = await retrieveSettingsForActiveAccount();
-        await databaseUtil.retrieveSettingsForActiveAccount();
-      if (USE_DEXIE_DB) {
-        settings = await retrieveSettingsForActiveAccount();
-      }
       logger.log("Retrieved settings:", settings);
 
       const notifyingNewActivity = !!settings?.notifyingNewActivityTime;
@@ -459,10 +452,9 @@ export default class App extends Vue {
         return true;
       }
 
-      const serverSubscription =
+      const serverSubscription = {
-        typeof subscription === "object" && subscription !== null
+        ...subscription,
-          ? { ...subscription }
+      };
-          : {};
       if (!allGoingOff) {
         serverSubscription["notifyType"] = notification.title;
         logger.log(

src/components/DataExportSection.vue

@@ -62,7 +62,7 @@ backup and database export, with platform-specific download instructions. * *
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
-import { AppString, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface } from "../constants/app";
 import { db } from "../db/index";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
@@ -131,15 +131,12 @@ export default class DataExportSection extends Vue {
    */
   public async exportDatabase() {
     try {
-      if (!USE_DEXIE_DB) {
-        throw new Error("Not implemented");
-      }
       const blob = await db.export({
         prettyJson: true,
         transform: (table, value, key) => {
           if (table === "contacts") {
             // Dexie inserts a number 0 when some are undefined, so we need to totally remove them.
-            Object.keys(value).forEach((prop) => {
+            Object.keys(value).forEach(prop => {
               if (value[prop] === undefined) {
                 delete value[prop];
               }
@@ -148,7 +145,7 @@ export default class DataExportSection extends Vue {
           return { value, key };
         },
       });
-      const fileName = `${AppString.APP_NAME_NO_SPACES}-backup.json`;
+      const fileName = `${db.name}-backup.json`;
 
       if (this.platformCapabilities.hasFileDownload) {
         // Web platform: Use download link
@@ -162,8 +159,6 @@ export default class DataExportSection extends Vue {
         // Native platform: Write to app directory
         const content = await blob.text();
         await this.platformService.writeAndShareFile(fileName, content);
-      } else {
-        throw new Error("This platform does not support file downloads.");
       }
 
       this.$notify(

src/components/FeedFilters.vue

@@ -99,12 +99,8 @@ import {
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
 import { Router } from "vue-router";
-
-import { USE_DEXIE_DB } from "@/constants/app";
-import * as databaseUtil from "../db/databaseUtil";
 import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 @Component({
   components: {
@@ -126,10 +122,7 @@ export default class FeedFilters extends Vue {
   async open(onCloseIfChanged: () => void) {
     this.onCloseIfChanged = onCloseIfChanged;
 
-    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    const settings = await retrieveSettingsForActiveAccount();
-    if (USE_DEXIE_DB) {
-      settings = await retrieveSettingsForActiveAccount();
-    }
     this.hasVisibleDid = !!settings.filterFeedByVisible;
     this.isNearby = !!settings.filterFeedByNearby;
     if (settings.searchBoxes && settings.searchBoxes.length > 0) {
@@ -151,17 +144,9 @@ export default class FeedFilters extends Vue {
   async toggleNearby() {
     this.settingChanged = true;
     this.isNearby = !this.isNearby;
-    const platformService = PlatformServiceFactory.getInstance();
+    await db.settings.update(MASTER_SETTINGS_KEY, {
-    await platformService.dbExec(
+      filterFeedByNearby: this.isNearby,
-      `UPDATE settings SET filterFeedByNearby = ? WHERE id = ?`,
+    });
-      [this.isNearby, MASTER_SETTINGS_KEY],
-    );
-
-    if (USE_DEXIE_DB) {
-      await db.settings.update(MASTER_SETTINGS_KEY, {
-        filterFeedByNearby: this.isNearby,
-      });
-    }
   }
 
   async clearAll() {
@@ -169,18 +154,10 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    const platformService = PlatformServiceFactory.getInstance();
+    await db.settings.update(MASTER_SETTINGS_KEY, {
-    await platformService.dbExec(
+      filterFeedByNearby: false,
-      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      filterFeedByVisible: false,
-      [false, false, MASTER_SETTINGS_KEY],
+    });
-    );
-
-    if (USE_DEXIE_DB) {
-      await db.settings.update(MASTER_SETTINGS_KEY, {
-        filterFeedByNearby: false,
-        filterFeedByVisible: false,
-      });
-    }
 
     this.hasVisibleDid = false;
     this.isNearby = false;
@@ -191,18 +168,10 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    const platformService = PlatformServiceFactory.getInstance();
+    await db.settings.update(MASTER_SETTINGS_KEY, {
-    await platformService.dbExec(
+      filterFeedByNearby: true,
-      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      filterFeedByVisible: true,
-      [true, true, MASTER_SETTINGS_KEY],
+    });
-    );
-
-    if (USE_DEXIE_DB) {
-      await db.settings.update(MASTER_SETTINGS_KEY, {
-        filterFeedByNearby: true,
-        filterFeedByVisible: true,
-      });
-    }
 
     this.hasVisibleDid = true;
     this.isNearby = true;

src/components/GiftedDialog.vue

@@ -89,7 +89,7 @@
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
-import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface } from "../constants/app";
 import {
   createAndSubmitGive,
   didInfo,
@@ -98,10 +98,8 @@ import {
 import * as libsUtil from "../libs/util";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
 import { Contact } from "../db/tables/contacts";
-import * as databaseUtil from "../db/databaseUtil";
 import { retrieveAccountDids } from "../libs/util";
 import { logger } from "../utils/logger";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 @Component
 export default class GiftedDialog extends Vue {
@@ -146,23 +144,11 @@ export default class GiftedDialog extends Vue {
     this.offerId = offerId || "";
 
     try {
-      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      const settings = await retrieveSettingsForActiveAccount();
-      if (USE_DEXIE_DB) {
-        settings = await retrieveSettingsForActiveAccount();
-      }
       this.apiServer = settings.apiServer || "";
       this.activeDid = settings.activeDid || "";
 
-      const platformService = PlatformServiceFactory.getInstance();
+      this.allContacts = await db.contacts.toArray();
-      const result = await platformService.dbQuery(`SELECT * FROM contacts`);
-      if (result) {
-        this.allContacts = databaseUtil.mapQueryResultToValues(
-          result,
-        ) as unknown as Contact[];
-      }
-      if (USE_DEXIE_DB) {
-        this.allContacts = await db.contacts.toArray();
-      }
 
       this.allMyDids = await retrieveAccountDids();
 
@@ -320,7 +306,10 @@ export default class GiftedDialog extends Vue {
         this.fromProjectId,
       );
 
-      if (!result.success) {
+      if (
+        result.type === "error" ||
+        this.isGiveCreationError(result.response)
+      ) {
         const errorMessage = this.getGiveCreationErrorMessage(result);
         logger.error("Error with give creation result:", result);
         this.$notify(
@@ -367,6 +356,15 @@ export default class GiftedDialog extends Vue {
 
   // Helper functions for readability
 
+  /**
+   * @param result response "data" from the server
+   * @returns true if the result indicates an error
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  isGiveCreationError(result: any) {
+    return result.status !== 201 || result.data?.error;
+  }
+
   /**
    * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
    * @returns best guess at an error message

src/components/GiftedPrompts.vue

@@ -74,12 +74,10 @@
 import { Vue, Component } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
-import { AppString, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { AppString, NotificationIface } from "../constants/app";
 import { db } from "../db/index";
 import { Contact } from "../db/tables/contacts";
-import * as databaseUtil from "../db/databaseUtil";
 import { GiverReceiverInputInfo } from "../libs/util";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 @Component
 export default class GivenPrompts extends Vue {
@@ -129,16 +127,8 @@ export default class GivenPrompts extends Vue {
     this.visible = true;
     this.callbackOnFullGiftInfo = callbackOnFullGiftInfo;
 
-    const platformService = PlatformServiceFactory.getInstance();
+    await db.open();
-    const result = await platformService.dbQuery(
+    this.numContacts = await db.contacts.count();
-      "SELECT COUNT(*) FROM contacts",
-    );
-    if (result) {
-      this.numContacts = result.values[0][0] as number;
-    }
-    if (USE_DEXIE_DB) {
-      this.numContacts = await db.contacts.count();
-    }
     this.shownContactDbIndices = new Array<boolean>(this.numContacts); // all undefined to start
   }
 
@@ -239,22 +229,10 @@ export default class GivenPrompts extends Vue {
       this.nextIdeaPastContacts();
     } else {
       // get the contact at that offset
-      const platformService = PlatformServiceFactory.getInstance();
+      await db.open();
-      const result = await platformService.dbQuery(
+      this.currentContact = await db.contacts
-        "SELECT * FROM contacts LIMIT 1 OFFSET ?",
+        .offset(someContactDbIndex)
-        [someContactDbIndex],
+        .first();
-      );
-      if (result) {
-        this.currentContact = databaseUtil.mapQueryResultToValues(result)[
-          someContactDbIndex
-        ] as unknown as Contact;
-      }
-      if (USE_DEXIE_DB) {
-        await db.open();
-        this.currentContact = await db.contacts
-          .offset(someContactDbIndex)
-          .first();
-      }
       this.shownContactDbIndices[someContactDbIndex] = true;
     }
   }

src/components/ImageMethodDialog.vue

@@ -247,16 +247,11 @@ import axios from "axios";
 import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
 import VuePictureCropper, { cropper } from "vue-picture-cropper";
-import {
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "../constants/app";
-  DEFAULT_IMAGE_API_SERVER,
-  NotificationIface,
-  USE_DEXIE_DB,
-} from "../constants/app";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 import { accessToken } from "../libs/crypto";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
-import * as databaseUtil from "../db/databaseUtil";
 
 const inputImageFileNameRef = ref<Blob>();
 
@@ -338,11 +333,9 @@ export default class ImageMethodDialog extends Vue {
    * @throws {Error} When settings retrieval fails
    */
   async mounted() {
+    logger.log("ImageMethodDialog mounted");
     try {
-      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      const settings = await retrieveSettingsForActiveAccount();
-      if (USE_DEXIE_DB) {
-        settings = await retrieveSettingsForActiveAccount();
-      }
       this.activeDid = settings.activeDid || "";
     } catch (error: unknown) {
       logger.error("Error retrieving settings from database:", error);

src/components/MembersList.vue

@@ -172,10 +172,8 @@ import {
 } from "../libs/endorserServer";
 import { decryptMessage } from "../libs/crypto";
 import { Contact } from "../db/tables/contacts";
-import * as databaseUtil from "../db/databaseUtil";
 import * as libsUtil from "../libs/util";
-import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface } from "../constants/app";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 interface Member {
   admitted: boolean;
@@ -211,10 +209,7 @@ export default class MembersList extends Vue {
   contacts: Array<Contact> = [];
 
   async created() {
-    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    const settings = await retrieveSettingsForActiveAccount();
-    if (USE_DEXIE_DB) {
-      settings = await retrieveSettingsForActiveAccount();
-    }
     this.activeDid = settings.activeDid || "";
     this.apiServer = settings.apiServer || "";
     this.firstName = settings.firstName || "";
@@ -360,16 +355,7 @@ export default class MembersList extends Vue {
   }
 
   async loadContacts() {
-    const platformService = PlatformServiceFactory.getInstance();
+    this.contacts = await db.contacts.toArray();
-    const result = await platformService.dbQuery("SELECT * FROM contacts");
-    if (result) {
-      this.contacts = databaseUtil.mapQueryResultToValues(
-        result,
-      ) as unknown as Contact[];
-    }
-    if (USE_DEXIE_DB) {
-      this.contacts = await db.contacts.toArray();
-    }
   }
 
   getContactFor(did: string): Contact | undefined {
@@ -453,14 +439,7 @@ export default class MembersList extends Vue {
           if (result.success) {
             decrMember.isRegistered = true;
             if (oldContact) {
-              const platformService = PlatformServiceFactory.getInstance();
+              await db.contacts.update(decrMember.did, { registered: true });
-              await platformService.dbExec(
-                "UPDATE contacts SET registered = ? WHERE did = ?",
-                [true, decrMember.did],
-              );
-              if (USE_DEXIE_DB) {
-                await db.contacts.update(decrMember.did, { registered: true });
-              }
               oldContact.registered = true;
             }
             this.$notify(
@@ -513,14 +492,7 @@ export default class MembersList extends Vue {
         name: member.name,
       };
 
-      const platformService = PlatformServiceFactory.getInstance();
+      await db.contacts.add(newContact);
-      await platformService.dbExec(
-        "INSERT INTO contacts (did, name) VALUES (?, ?)",
-        [member.did, member.name],
-      );
-      if (USE_DEXIE_DB) {
-        await db.contacts.add(newContact);
-      }
       this.contacts.push(newContact);
 
       this.$notify(

src/components/OfferDialog.vue

@@ -82,13 +82,12 @@
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
-import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface } from "../constants/app";
 import {
   createAndSubmitOffer,
   serverMessageForUser,
 } from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
-import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 import { logger } from "../utils/logger";
 
@@ -117,10 +116,7 @@ export default class OfferDialog extends Vue {
       this.recipientDid = recipientDid;
       this.recipientName = recipientName;
 
-      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      const settings = await retrieveSettingsForActiveAccount();
-      if (USE_DEXIE_DB) {
-        settings = await retrieveSettingsForActiveAccount();
-      }
       this.apiServer = settings.apiServer || "";
       this.activeDid = settings.activeDid || "";
 
@@ -249,7 +245,10 @@ export default class OfferDialog extends Vue {
         this.projectId,
       );
 
-      if (!result.success) {
+      if (
+        result.type === "error" ||
+        this.isOfferCreationError(result.response)
+      ) {
         const errorMessage = this.getOfferCreationErrorMessage(result);
         logger.error("Error with offer creation result:", result);
         this.$notify(
@@ -293,6 +292,15 @@ export default class OfferDialog extends Vue {
 
   // Helper functions for readability
 
+  /**
+   * @param result response "data" from the server
+   * @returns true if the result indicates an error
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  isOfferCreationError(result: any) {
+    return result.status !== 201 || result.data?.error;
+  }
+
   /**
    * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
    * @returns best guess at an error message

src/components/OnboardingDialog.vue

@@ -201,16 +201,13 @@
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
-import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface } from "../constants/app";
 import {
   db,
   retrieveSettingsForActiveAccount,
   updateAccountSettings,
 } from "../db/index";
-import * as databaseUtil from "../db/databaseUtil";
 import { OnboardPage } from "../libs/util";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
-import { Contact } from "@/db/tables/contacts";
 
 @Component({
   computed: {
@@ -225,7 +222,7 @@ export default class OnboardingDialog extends Vue {
   $router!: Router;
 
   activeDid = "";
-  firstContactName = "";
+  firstContactName = null;
   givenName = "";
   isRegistered = false;
   numContacts = 0;
@@ -234,54 +231,29 @@ export default class OnboardingDialog extends Vue {
 
   async open(page: OnboardPage) {
     this.page = page;
-    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    const settings = await retrieveSettingsForActiveAccount();
-    if (USE_DEXIE_DB) {
-      settings = await retrieveSettingsForActiveAccount();
-    }
     this.activeDid = settings.activeDid || "";
     this.isRegistered = !!settings.isRegistered;
-    const platformService = PlatformServiceFactory.getInstance();
+    const contacts = await db.contacts.toArray();
-    const dbContacts = await platformService.dbQuery("SELECT * FROM contacts");
+    this.numContacts = contacts.length;
-    if (dbContacts) {
+    if (this.numContacts > 0) {
-      this.numContacts = dbContacts.values.length;
+      this.firstContactName = contacts[0].name;
-      const firstContact = dbContacts.values[0];
-      const fullContact = databaseUtil.mapColumnsToValues(dbContacts.columns, [
-        firstContact,
-      ]) as unknown as Contact;
-      this.firstContactName = fullContact.name || "";
-    }
-    if (USE_DEXIE_DB) {
-      const contacts = await db.contacts.toArray();
-      this.numContacts = contacts.length;
-      if (this.numContacts > 0) {
-        this.firstContactName = contacts[0].name || "";
-      }
     }
     this.visible = true;
     if (this.page === OnboardPage.Create) {
       // we'll assume that they've been through all the other pages
-      await databaseUtil.updateAccountSettings(this.activeDid, {
+      await updateAccountSettings(this.activeDid, {
         finishedOnboarding: true,
       });
-      if (USE_DEXIE_DB) {
-        await updateAccountSettings(this.activeDid, {
-          finishedOnboarding: true,
-        });
-      }
     }
   }
 
   async onClickClose(done?: boolean, goHome?: boolean) {
     this.visible = false;
     if (done) {
-      await databaseUtil.updateAccountSettings(this.activeDid, {
+      await updateAccountSettings(this.activeDid, {
         finishedOnboarding: true,
       });
-      if (USE_DEXIE_DB) {
-        await updateAccountSettings(this.activeDid, {
-          finishedOnboarding: true,
-        });
-      }
       if (goHome) {
         this.$router.push({ name: "home" });
       }

src/components/PhotoDialog.vue

@@ -119,12 +119,7 @@ PhotoDialog.vue */
 import axios from "axios";
 import { Component, Vue } from "vue-facing-decorator";
 import VuePictureCropper, { cropper } from "vue-picture-cropper";
-import {
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "../constants/app";
-  DEFAULT_IMAGE_API_SERVER,
-  NotificationIface,
-  USE_DEXIE_DB,
-} from "../constants/app";
-import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 import { accessToken } from "../libs/crypto";
 import { logger } from "../utils/logger";
@@ -178,12 +173,9 @@ export default class PhotoDialog extends Vue {
    * @throws {Error} When settings retrieval fails
    */
   async mounted() {
-    // logger.log("PhotoDialog mounted");
+    logger.log("PhotoDialog mounted");
     try {
-      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      const settings = await retrieveSettingsForActiveAccount();
-      if (USE_DEXIE_DB) {
-        settings = await retrieveSettingsForActiveAccount();
-      }
       this.activeDid = settings.activeDid || "";
       this.isRegistered = !!settings.isRegistered;
       logger.log("isRegistered:", this.isRegistered);

src/components/PushNotificationPermission.vue

@@ -102,12 +102,7 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
-import {
+import { DEFAULT_PUSH_SERVER, NotificationIface } from "../constants/app";
-  DEFAULT_PUSH_SERVER,
-  NotificationIface,
-  USE_DEXIE_DB,
-} from "../constants/app";
-import * as databaseUtil from "../db/databaseUtil";
 import {
   logConsoleAndDb,
   retrieveSettingsForActiveAccount,
@@ -174,10 +169,7 @@ export default class PushNotificationPermission extends Vue {
     this.isVisible = true;
     this.pushType = pushType;
     try {
-      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      const settings = await retrieveSettingsForActiveAccount();
-      if (USE_DEXIE_DB) {
-        settings = await retrieveSettingsForActiveAccount();
-      }
       let pushUrl = DEFAULT_PUSH_SERVER;
       if (settings?.webPushServer) {
         pushUrl = settings.webPushServer;

src/components/TopMessage.vue

@@ -15,8 +15,7 @@
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-facing-decorator";
 
-import { AppString, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { AppString, NotificationIface } from "../constants/app";
-import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 
 @Component
@@ -29,10 +28,7 @@ export default class TopMessage extends Vue {
 
   async mounted() {
     try {
-      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      const settings = await retrieveSettingsForActiveAccount();
-      if (USE_DEXIE_DB) {
-        settings = await retrieveSettingsForActiveAccount();
-      }
       if (
         settings.warnIfTestServer &&
         settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER

src/components/UserNameDialog.vue

@@ -37,9 +37,8 @@
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
-import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface } from "../constants/app";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
-import * as databaseUtil from "../db/databaseUtil";
 import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
 
 @Component
@@ -62,23 +61,15 @@ export default class UserNameDialog extends Vue {
    */
   async open(aCallback?: (name?: string) => void) {
     this.callback = aCallback || this.callback;
-    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    const settings = await retrieveSettingsForActiveAccount();
-    if (USE_DEXIE_DB) {
-      settings = await retrieveSettingsForActiveAccount();
-    }
     this.givenName = settings.firstName || "";
     this.visible = true;
   }
 
   async onClickSaveChanges() {
-    await databaseUtil.updateDefaultSettings({
+    await db.settings.update(MASTER_SETTINGS_KEY, {
       firstName: this.givenName,
     });
-    if (USE_DEXIE_DB) {
-      await db.settings.update(MASTER_SETTINGS_KEY, {
-        firstName: this.givenName,
-      });
-    }
     this.visible = false;
     this.callback(this.givenName);
   }

src/components/World/components/objects/landmarks.js

@@ -3,8 +3,6 @@ import * as THREE from "three";
 import { GLTFLoader } from "three/addons/loaders/GLTFLoader";
 import * as SkeletonUtils from "three/addons/utils/SkeletonUtils";
 import * as TWEEN from "@tweenjs/tween.js";
-import { USE_DEXIE_DB } from "../../../../constants/app";
-import * as databaseUtil from "../../../../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../../../../db";
 import { getHeaders } from "../../../../libs/endorserServer";
 import { logger } from "../../../../utils/logger";
@@ -16,10 +14,7 @@ export async function loadLandmarks(vue, world, scene, loop) {
   vue.setWorldProperty("animationDurationSeconds", ANIMATION_DURATION_SECS);
 
   try {
-    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    const settings = await retrieveSettingsForActiveAccount();
-    if (USE_DEXIE_DB) {
-      settings = await retrieveSettingsForActiveAccount();
-    }
     const activeDid = settings.activeDid || "";
     const apiServer = settings.apiServer;
     const headers = await getHeaders(activeDid);

src/constants/app.ts

@@ -7,7 +7,6 @@ export enum AppString {
   // This is used in titles and verbiage inside the app.
   // There is also an app name without spaces, for packaging in the package.json file used in the manifest.
   APP_NAME = "Time Safari",
-  APP_NAME_NO_SPACES = "TimeSafari",
 
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
   TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
@@ -44,15 +43,13 @@ export const DEFAULT_PARTNER_API_SERVER =
   AppString.TEST_PARTNER_API_SERVER;
 
 export const DEFAULT_PUSH_SERVER =
-  import.meta.env.VITE_DEFAULT_PUSH_SERVER || "https://timesafari.app";
+  window.location.protocol + "//" + window.location.host;
 
 export const IMAGE_TYPE_PROFILE = "profile";
 
 export const PASSKEYS_ENABLED =
   !!import.meta.env.VITE_PASSKEYS_ENABLED || false;
 
-export const USE_DEXIE_DB = false;
-
 /**
  * The possible values for "group" and "type" are in App.vue.
  * Some of this comes from the notiwind package, some is custom.

src/db-sql/index.ts

@@ -0,0 +1,28 @@
+// Started with https://rhashimoto.github.io/wa-sqlite/docs/interfaces/SQLiteAPI.html
+// and then https://github.com/rhashimoto/wa-sqlite/blob/master/demo/demo-worker.js
+
+import SQLiteESMFactory from 'wa-sqlite/dist/wa-sqlite.mjs';
+
+import * as SQLite from 'wa-sqlite';
+
+const IDBBatchAtomicVFS = await import('wa-sqlite/src/examples/IDBBatchAtomicVFS.js');
+
+let db: any;
+
+export async function sql() {
+  if (!db) {
+    const module = await SQLiteESMFactory();
+
+    // Use the module to build the API instance.
+    const sqlite3 = SQLite.Factory(module);
+
+    const vfs = new IDBBatchAtomicVFS.create("IDBBatchAtomicVFS", module, { lockPolicy: 'shared+hint' });
+    sqlite3.vfs_register(vfs, true);
+  
+    // Use the API to open and access a database.
+    const db = await sqlite3.open_v2("myDB");
+    console.log("----- sqlite3 db", db);
+    sqlite3.close(db);
+  }
+  return db;
+}

src/db-sql/migration.ts

@@ -1,134 +0,0 @@
-import migrationService from "../services/migrationService";
-import type { QueryExecResult } from "../interfaces/database";
-import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
-import { arrayBufferToBase64 } from "@/libs/crypto";
-
-// Generate a random secret for the secret table
-
-// It's not really secure to maintain the secret next to the user's data.
-// However, until we have better hooks into a real wallet or reliable secure
-// storage, we'll do this for user convenience. As they sign more records
-// and integrate with more people, they'll value it more and want to be more
-// secure, so we'll prompt them to take steps to back it up, properly encrypt,
-// etc. At the beginning, we'll prompt for a password, then we'll prompt for a
-// PWA so it's not in a browser... and then we hope to be integrated with a
-// real wallet or something else more secure.
-
-// One might ask: why encrypt at all? We figure a basic encryption is better
-// than none. Plus, we expect to support their own password or keystore or
-// external wallet as better signing options in the future, so it's gonna be
-// important to have the structure where each account access might require
-// user action.
-
-// (Once upon a time we stored the secret in localStorage, but it frequently
-// got erased, even though the IndexedDB still had the identity data. This
-// ended up throwing lots of errors to the user... and they'd end up in a state
-// where they couldn't take action because they couldn't unlock that identity.)
-
-const randomBytes = crypto.getRandomValues(new Uint8Array(32));
-const secretBase64 = arrayBufferToBase64(randomBytes);
-
-// Each migration can include multiple SQL statements (with semicolons)
-const MIGRATIONS = [
-  {
-    name: "001_initial",
-    // see ../db/tables files for explanations of the fields
-    sql: `
-      CREATE TABLE IF NOT EXISTS accounts (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        dateCreated TEXT NOT NULL,
-        derivationPath TEXT,
-        did TEXT NOT NULL,
-        identityEncrBase64 TEXT, -- encrypted & base64-encoded
-        mnemonicEncrBase64 TEXT, -- encrypted & base64-encoded
-        passkeyCredIdHex TEXT,
-        publicKeyHex TEXT NOT NULL
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_accounts_did ON accounts(did);
-
-      CREATE TABLE IF NOT EXISTS secret (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        secretBase64 TEXT NOT NULL
-      );
-
-      INSERT INTO secret (id, secretBase64) VALUES (1, '${secretBase64}');
-
-      CREATE TABLE IF NOT EXISTS settings (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        accountDid TEXT,
-        activeDid TEXT,
-        apiServer TEXT,
-        filterFeedByNearby BOOLEAN,
-        filterFeedByVisible BOOLEAN,
-        finishedOnboarding BOOLEAN,
-        firstName TEXT,
-        hideRegisterPromptOnNewContact BOOLEAN,
-        isRegistered BOOLEAN,
-        lastName TEXT,
-        lastAckedOfferToUserJwtId TEXT,
-        lastAckedOfferToUserProjectsJwtId TEXT,
-        lastNotifiedClaimId TEXT,
-        lastViewedClaimId TEXT,
-        notifyingNewActivityTime TEXT,
-        notifyingReminderMessage TEXT,
-        notifyingReminderTime TEXT,
-        partnerApiServer TEXT,
-        passkeyExpirationMinutes INTEGER,
-        profileImageUrl TEXT,
-        searchBoxes TEXT, -- Stored as JSON string
-        showContactGivesInline BOOLEAN,
-        showGeneralAdvanced BOOLEAN,
-        showShortcutBvc BOOLEAN,
-        vapid TEXT,
-        warnIfProdServer BOOLEAN,
-        warnIfTestServer BOOLEAN,
-        webPushServer TEXT
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_settings_accountDid ON settings(accountDid);
-
-      INSERT INTO settings (id, apiServer) VALUES (1, '${DEFAULT_ENDORSER_API_SERVER}');
-
-      CREATE TABLE IF NOT EXISTS contacts (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        did TEXT NOT NULL,
-        name TEXT,
-        contactMethods TEXT, -- Stored as JSON string
-        nextPubKeyHashB64 TEXT,
-        notes TEXT,
-        profileImageUrl TEXT,
-        publicKeyBase64 TEXT,
-        seesMe BOOLEAN,
-        registered BOOLEAN
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_contacts_did ON contacts(did);
-      CREATE INDEX IF NOT EXISTS idx_contacts_name ON contacts(name);
-
-      CREATE TABLE IF NOT EXISTS logs (
-        date TEXT NOT NULL,
-        message TEXT NOT NULL
-      );
-
-      CREATE TABLE IF NOT EXISTS temp (
-        id TEXT PRIMARY KEY,
-        blobB64 TEXT
-      );
-      `,
-  },
-];
-
-export async function registerMigrations(): Promise<void> {
-  // Register all migrations
-  for (const migration of MIGRATIONS) {
-    await migrationService.registerMigration(migration);
-  }
-}
-
-export async function runMigrations(
-  sqlExec: (sql: string, params?: unknown[]) => Promise<Array<QueryExecResult>>,
-): Promise<void> {
-  await registerMigrations();
-  await migrationService.runMigrations(sqlExec);
-}

src/db/databaseUtil.ts

@@ -1,308 +0,0 @@
-/**
- * This file is the SQL replacement of the index.ts file in the db directory.
- * That file will eventually be deleted.
- */
-
-import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
-import { MASTER_SETTINGS_KEY, Settings } from "./tables/settings";
-import { logger } from "../utils/logger";
-import { DEFAULT_ENDORSER_API_SERVER } from "../constants/app";
-import { QueryExecResult } from "../interfaces/database";
-
-const formatLogObject = (obj: unknown): string => {
-  try {
-    return JSON.stringify(obj, null, 2);
-  } catch (error) {
-    return `[Object could not be stringified: ${error instanceof Error ? error.message : String(error)}]`;
-  }
-};
-
-export async function updateDefaultSettings(
-  settingsChanges: Settings,
-): Promise<boolean> {
-  delete settingsChanges.accountDid; // just in case
-  // ensure there is no "id" that would override the key
-  delete settingsChanges.id;
-  try {
-    const platformService = PlatformServiceFactory.getInstance();
-    const { sql, params } = generateUpdateStatement(
-      settingsChanges,
-      "settings",
-      "id = ?",
-      [MASTER_SETTINGS_KEY],
-    );
-    console.log("[databaseUtil] updateDefaultSettings", { sql, params });
-    const result = await platformService.dbExec(sql, params);
-    console.log("[databaseUtil] updateDefaultSettings result", { result });
-    return result.changes === 1;
-  } catch (error) {
-    logger.error("Error updating default settings:", error);
-    console.log("[databaseUtil] updateDefaultSettings error", { error });
-    if (error instanceof Error) {
-      throw error; // Re-throw if it's already an Error with a message
-    } else {
-      throw new Error(
-        `Failed to update settings. We recommend you try again or restart the app.`,
-      );
-    }
-  }
-}
-
-export async function updateAccountSettings(
-  accountDid: string,
-  settingsChanges: Settings,
-): Promise<boolean> {
-  settingsChanges.accountDid = accountDid;
-  delete settingsChanges.id; // key off account, not ID
-
-  const platform = PlatformServiceFactory.getInstance();
-
-  // First try to update existing record
-  const { sql: updateSql, params: updateParams } = generateUpdateStatement(
-    settingsChanges,
-    "settings",
-    "accountDid = ?",
-    [accountDid],
-  );
-
-  const updateResult = await platform.dbExec(updateSql, updateParams);
-
-  // If no record was updated, insert a new one
-  if (updateResult.changes === 1) {
-    return true;
-  } else {
-    const columns = Object.keys(settingsChanges);
-    const values = Object.values(settingsChanges);
-    const placeholders = values.map(() => "?").join(", ");
-
-    const insertSql = `INSERT INTO settings (${columns.join(", ")}) VALUES (${placeholders})`;
-    const result = await platform.dbExec(insertSql, values);
-
-    return result.changes === 1;
-  }
-}
-
-const DEFAULT_SETTINGS: Settings = {
-  id: MASTER_SETTINGS_KEY,
-  activeDid: undefined,
-  apiServer: DEFAULT_ENDORSER_API_SERVER,
-};
-
-// retrieves default settings
-export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
-  console.log('[DatabaseUtil] Retrieving default account settings');
-  const platform = PlatformServiceFactory.getInstance();
-  
-  console.log('[DatabaseUtil] Platform service state:', {
-    platformType: platform.constructor.name,
-    capabilities: platform.getCapabilities(),
-    timestamp: new Date().toISOString()
-  });
-
-  const result = await platform.dbQuery("SELECT * FROM settings WHERE id = ?", [
-    MASTER_SETTINGS_KEY,
-  ]);
-
-  if (!result) {
-    console.log('[DatabaseUtil] No settings found, returning defaults');
-    return DEFAULT_SETTINGS;
-  }
-
-  const settings = mapColumnsToValues(result.columns, result.values)[0] as Settings;
-  if (settings.searchBoxes) {
-    // @ts-expect-error - the searchBoxes field is a string in the DB
-    settings.searchBoxes = JSON.parse(settings.searchBoxes);
-  }
-
-  console.log('[DatabaseUtil] Retrieved settings:', {
-    settings: formatLogObject(settings),
-    timestamp: new Date().toISOString()
-  });
-
-  return settings;
-}
-
-export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
-  console.log('[DatabaseUtil] Retrieving active account settings');
-  const defaultSettings = await retrieveSettingsForDefaultAccount();
-  
-  console.log('[DatabaseUtil] Default settings retrieved:', {
-    defaultSettings: formatLogObject(defaultSettings),
-    timestamp: new Date().toISOString()
-  });
-
-  if (!defaultSettings.activeDid) {
-    console.log('[DatabaseUtil] No active DID, returning default settings');
-    return defaultSettings;
-  }
-
-  const platform = PlatformServiceFactory.getInstance();
-  const result = await platform.dbQuery(
-    "SELECT * FROM settings WHERE accountDid = ?",
-    [defaultSettings.activeDid],
-  );
-
-  const overrideSettings = result
-    ? (mapColumnsToValues(result.columns, result.values)[0] as Settings)
-    : {};
-
-  const overrideSettingsFiltered = Object.fromEntries(
-    Object.entries(overrideSettings).filter(([_, v]) => v !== null),
-  );
-
-  const settings = { ...defaultSettings, ...overrideSettingsFiltered };
-  if (settings.searchBoxes) {
-    // @ts-expect-error - the searchBoxes field is a string in the DB
-    settings.searchBoxes = JSON.parse(settings.searchBoxes);
-  }
-
-  console.log('[DatabaseUtil] Final active account settings:', {
-    settings: formatLogObject(settings),
-    timestamp: new Date().toISOString()
-  });
-
-  return settings;
-}
-
-let lastCleanupDate: string | null = null;
-
-/**
- * Logs a message to the database with proper handling of concurrent writes
- * @param message - The message to log
- * @author Matthew Raymer
- */
-export async function logToDb(message: string): Promise<void> {
-  //const platform = PlatformServiceFactory.getInstance();
-  const todayKey = new Date().toDateString();
-  //const nowKey = new Date().toISOString();
-
-  try {
-    // Try to insert first, if it fails due to UNIQUE constraint, update instead
-    // await platform.dbExec("INSERT INTO logs (date, message) VALUES (?, ?)", [
-    //   nowKey,
-    //   message,
-    // ]);
-
-    // Clean up old logs (keep only last 7 days) - do this less frequently
-    // Only clean up if the date is different from the last cleanup
-    if (!lastCleanupDate || lastCleanupDate !== todayKey) {
-      // const sevenDaysAgo = new Date(
-      //   new Date().getTime() - 7 * 24 * 60 * 60 * 1000,
-      // );
-      // await platform.dbExec("DELETE FROM logs WHERE date < ?", [
-      //   sevenDaysAgo.toDateString(),
-      // ]);
-      lastCleanupDate = todayKey;
-    }
-  } catch (error) {
-    // Log to console as fallback
-    // eslint-disable-next-line no-console
-    console.error(
-      "Error logging to database:",
-      error,
-      " ... for original message:",
-      message,
-    );
-  }
-}
-
-// similar method is in the sw_scripts/additional-scripts.js file
-export async function logConsoleAndDb(
-  message: string,
-  isError = false,
-): Promise<void> {
-  if (isError) {
-    logger.error(`${new Date().toISOString()} ${message}`);
-  } else {
-    logger.log(`${new Date().toISOString()} ${message}`);
-  }
-  await logToDb(message);
-}
-
-/**
- * Generates an SQL INSERT statement and parameters from a model object.
- * @param model The model object containing fields to update
- * @param tableName The name of the table to update
- * @returns Object containing the SQL statement and parameters array
- */
-export function generateInsertStatement(
-  model: Record<string, unknown>,
-  tableName: string,
-): { sql: string; params: unknown[] } {
-  const columns = Object.keys(model).filter((key) => model[key] !== undefined);
-  const values = Object.values(model).filter((value) => value !== undefined);
-  const placeholders = values.map(() => "?").join(", ");
-  const insertSql = `INSERT INTO ${tableName} (${columns.join(", ")}) VALUES (${placeholders})`;
-  return {
-    sql: insertSql,
-    params: values,
-  };
-}
-
-/**
- * Generates an SQL UPDATE statement and parameters from a model object.
- * @param model The model object containing fields to update
- * @param tableName The name of the table to update
- * @param whereClause The WHERE clause for the update (e.g. "id = ?")
- * @param whereParams Parameters for the WHERE clause
- * @returns Object containing the SQL statement and parameters array
- */
-export function generateUpdateStatement(
-  model: Record<string, unknown>,
-  tableName: string,
-  whereClause: string,
-  whereParams: unknown[] = [],
-): { sql: string; params: unknown[] } {
-  // Filter out undefined/null values and create SET clause
-  const setClauses: string[] = [];
-  const params: unknown[] = [];
-
-  Object.entries(model).forEach(([key, value]) => {
-    if (value !== undefined) {
-      setClauses.push(`${key} = ?`);
-      params.push(value);
-    }
-  });
-
-  if (setClauses.length === 0) {
-    throw new Error("No valid fields to update");
-  }
-
-  const sql = `UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE ${whereClause}`;
-
-  return {
-    sql,
-    params: [...params, ...whereParams],
-  };
-}
-
-export function mapQueryResultToValues(
-  record: QueryExecResult | undefined,
-): Array<Record<string, unknown>> {
-  if (!record) {
-    return [];
-  }
-  return mapColumnsToValues(record.columns, record.values) as Array<
-    Record<string, unknown>
-  >;
-}
-
-/**
- * Maps an array of column names to an array of value arrays, creating objects where each column name
- * is mapped to its corresponding value.
- * @param columns Array of column names to use as object keys
- * @param values Array of value arrays, where each inner array corresponds to one row of data
- * @returns Array of objects where each object maps column names to their corresponding values
- */
-export function mapColumnsToValues(
-  columns: string[],
-  values: unknown[][],
-): Array<Record<string, unknown>> {
-  return values.map((row) => {
-    const obj: Record<string, unknown> = {};
-    columns.forEach((column, index) => {
-      obj[column] = row[index];
-    });
-    return obj;
-  });
-}

src/db/index.ts

@@ -1,9 +1,3 @@
-/**
- * This is the original IndexedDB version of the database.
- * It will eventually be replaced fully by the SQL version in databaseUtil.ts.
- * Turn this on or off with the USE_DEXIE_DB constant in constants/app.ts.
- */
-
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
 import * as R from "ramda";
@@ -32,8 +26,8 @@ type NonsensitiveTables = {
 };
 
 // Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
-type SecretDexie<T extends unknown = SecretTable> = BaseDexie & T;
+export type SecretDexie<T extends unknown = SecretTable> = BaseDexie & T;
-type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
+export type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
 export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
   BaseDexie & T;
 
@@ -96,40 +90,40 @@ db.on("populate", async () => {
   try {
     await db.settings.add(DEFAULT_SETTINGS);
   } catch (error) {
-    logger.error("Error populating the database with default settings:", error);
+    console.error("Error populating the database with default settings:", error);
   }
 });
 
 // Helper function to safely open the database with retries
 async function safeOpenDatabase(retries = 1, delay = 500): Promise<void> {
-  // logger.log("Starting safeOpenDatabase with retries:", retries);
+  // console.log("Starting safeOpenDatabase with retries:", retries);
   for (let i = 0; i < retries; i++) {
     try {
-      // logger.log(`Attempt ${i + 1}: Checking if database is open...`);
+      // console.log(`Attempt ${i + 1}: Checking if database is open...`);
       if (!db.isOpen()) {
-        // logger.log(`Attempt ${i + 1}: Database is closed, attempting to open...`);
+        // console.log(`Attempt ${i + 1}: Database is closed, attempting to open...`);
 
         // Create a promise that rejects after 5 seconds
         const timeoutPromise = new Promise((_, reject) => {
-          setTimeout(() => reject(new Error("Database open timed out")), 500);
+          setTimeout(() => reject(new Error('Database open timed out')), 500);
         });
 
         // Race between the open operation and the timeout
         const openPromise = db.open();
-        // logger.log(`Attempt ${i + 1}: Waiting for db.open() promise...`);
+        // console.log(`Attempt ${i + 1}: Waiting for db.open() promise...`);
         await Promise.race([openPromise, timeoutPromise]);
 
         // If we get here, the open succeeded
-        // logger.log(`Attempt ${i + 1}: Database opened successfully`);
+        // console.log(`Attempt ${i + 1}: Database opened successfully`);
         return;
       }
-      // logger.log(`Attempt ${i + 1}: Database was already open`);
+      // console.log(`Attempt ${i + 1}: Database was already open`);
       return;
     } catch (error) {
-      logger.error(`Attempt ${i + 1}: Database open failed:`, error);
+      console.error(`Attempt ${i + 1}: Database open failed:`, error);
       if (i < retries - 1) {
-        logger.log(`Attempt ${i + 1}: Waiting ${delay}ms before retry...`);
+        console.log(`Attempt ${i + 1}: Waiting ${delay}ms before retry...`);
-        await new Promise((resolve) => setTimeout(resolve, delay));
+        await new Promise(resolve => setTimeout(resolve, delay));
       } else {
         throw error;
       }
@@ -145,29 +139,23 @@ export async function updateDefaultSettings(
   delete settingsChanges.id;
   try {
     try {
-      // logger.log("Database state before open:", db.isOpen() ? "open" : "closed");
+      // console.log("Database state before open:", db.isOpen() ? "open" : "closed");
-      // logger.log("Database name:", db.name);
+      // console.log("Database name:", db.name);
-      // logger.log("Database version:", db.verno);
+      // console.log("Database version:", db.verno);
       await safeOpenDatabase();
     } catch (openError: unknown) {
-      logger.error("Failed to open database:", openError, String(openError));
+      console.error("Failed to open database:", openError);
-      throw new Error(
+      const errorMessage = openError instanceof Error ? openError.message : String(openError);
-        `The database connection failed. We recommend you try again or restart the app.`,
+      throw new Error(`Database connection failed: ${errorMessage}. Please try again or restart the app.`);
-      );
     }
-    const result = await db.settings.update(
+    const result = await db.settings.update(MASTER_SETTINGS_KEY, settingsChanges);
-      MASTER_SETTINGS_KEY,
-      settingsChanges,
-    );
     return result;
   } catch (error) {
-    logger.error("Error updating default settings:", error);
+    console.error("Error updating default settings:", error);
     if (error instanceof Error) {
       throw error; // Re-throw if it's already an Error with a message
     } else {
-      throw new Error(
+      throw new Error(`Failed to update settings: ${error}`);
-        `Failed to update settings. We recommend you try again or restart the app.`,
-      );
     }
   }
 }

src/db/tables/accounts.ts

@@ -45,12 +45,6 @@ export type Account = {
   publicKeyHex: string;
 };
 
-// When finished with USE_DEXIE_DB, move these fields to Account and move identity and mnemonic here.
-export type AccountEncrypted = Account & {
-  identityEncrBase64: string;
-  mnemonicEncrBase64: string;
-};
-
 /**
  * Schema for the accounts table in the database.
  * Fields starting with a $ character are encrypted.

src/electron/main.js

@@ -0,0 +1,174 @@
+const { app, BrowserWindow } = require("electron");
+const path = require("path");
+const fs = require("fs");
+const logger = require("../utils/logger");
+
+// Check if running in dev mode
+const isDev = process.argv.includes("--inspect");
+
+function createWindow() {
+  // Add before createWindow function
+  const preloadPath = path.join(__dirname, "preload.js");
+  logger.log("Checking preload path:", preloadPath);
+  logger.log("Preload exists:", fs.existsSync(preloadPath));
+
+  // Create the browser window.
+  const mainWindow = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: false,
+      contextIsolation: true,
+      webSecurity: true,
+      allowRunningInsecureContent: false,
+      preload: path.join(__dirname, "preload.js"),
+    },
+  });
+
+  // Always open DevTools for now
+  mainWindow.webContents.openDevTools();
+
+  // Intercept requests to fix asset paths
+  mainWindow.webContents.session.webRequest.onBeforeRequest(
+    {
+      urls: [
+        "file://*/*/assets/*",
+        "file://*/assets/*",
+        "file:///assets/*", // Catch absolute paths
+        "<all_urls>", // Catch all URLs as a fallback
+      ],
+    },
+    (details, callback) => {
+      let url = details.url;
+
+      // Handle paths that don't start with file://
+      if (!url.startsWith("file://") && url.includes("/assets/")) {
+        url = `file://${path.join(__dirname, "www", url)}`;
+      }
+
+      // Handle absolute paths starting with /assets/
+      if (url.includes("/assets/") && !url.includes("/www/assets/")) {
+        const baseDir = url.includes("dist-electron")
+          ? url.substring(
+              0,
+              url.indexOf("/dist-electron") + "/dist-electron".length,
+            )
+          : `file://${__dirname}`;
+        const assetPath = url.split("/assets/")[1];
+        const newUrl = `${baseDir}/www/assets/${assetPath}`;
+        callback({ redirectURL: newUrl });
+        return;
+      }
+
+      callback({}); // No redirect for other URLs
+    },
+  );
+
+  if (isDev) {
+    // Debug info
+    logger.log("Debug Info:");
+    logger.log("Running in dev mode:", isDev);
+    logger.log("App is packaged:", app.isPackaged);
+    logger.log("Process resource path:", process.resourcesPath);
+    logger.log("App path:", app.getAppPath());
+    logger.log("__dirname:", __dirname);
+    logger.log("process.cwd():", process.cwd());
+  }
+
+  const indexPath = path.join(__dirname, "www", "index.html");
+
+  if (isDev) {
+    logger.log("Loading index from:", indexPath);
+    logger.log("www path:", path.join(__dirname, "www"));
+    logger.log("www assets path:", path.join(__dirname, "www", "assets"));
+  }
+
+  if (!fs.existsSync(indexPath)) {
+    logger.error(`Index file not found at: ${indexPath}`);
+    throw new Error("Index file not found");
+  }
+
+  // Add CSP headers to allow API connections
+  mainWindow.webContents.session.webRequest.onHeadersReceived(
+    (details, callback) => {
+      callback({
+        responseHeaders: {
+          ...details.responseHeaders,
+          "Content-Security-Policy": [
+            "default-src 'self';" +
+              "connect-src 'self' https://api.endorser.ch https://*.timesafari.app;" +
+              "img-src 'self' data: https: blob:;" +
+              "script-src 'self' 'unsafe-inline' 'unsafe-eval';" +
+              "style-src 'self' 'unsafe-inline';" +
+              "font-src 'self' data:;",
+          ],
+        },
+      });
+    },
+  );
+
+  // Load the index.html
+  mainWindow
+    .loadFile(indexPath)
+    .then(() => {
+      logger.log("Successfully loaded index.html");
+      if (isDev) {
+        mainWindow.webContents.openDevTools();
+        logger.log("DevTools opened - running in dev mode");
+      }
+    })
+    .catch((err) => {
+      logger.error("Failed to load index.html:", err);
+      logger.error("Attempted path:", indexPath);
+    });
+
+  // Listen for console messages from the renderer
+  mainWindow.webContents.on("console-message", (_event, level, message) => {
+    logger.log("Renderer Console:", message);
+  });
+
+  // Add right after creating the BrowserWindow
+  mainWindow.webContents.on(
+    "did-fail-load",
+    (event, errorCode, errorDescription) => {
+      logger.error("Page failed to load:", errorCode, errorDescription);
+    },
+  );
+
+  mainWindow.webContents.on("preload-error", (event, preloadPath, error) => {
+    logger.error("Preload script error:", preloadPath, error);
+  });
+
+  mainWindow.webContents.on(
+    "console-message",
+    (event, level, message, line, sourceId) => {
+      logger.log("Renderer Console:", line, sourceId, message);
+    },
+  );
+
+  // Enable remote debugging when in dev mode
+  if (isDev) {
+    mainWindow.webContents.openDevTools();
+  }
+}
+
+// Handle app ready
+app.whenReady().then(createWindow);
+
+// Handle all windows closed
+app.on("window-all-closed", () => {
+  if (process.platform !== "darwin") {
+    app.quit();
+  }
+});
+
+app.on("activate", () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow();
+  }
+});
+
+// Handle any errors
+process.on("uncaughtException", (error) => {
+  logger.error("Uncaught Exception:", error);
+});

src/electron/main.ts

@@ -0,0 +1,187 @@
+import { app, BrowserWindow } from "electron";
+import path from "path";
+import fs from "fs";
+
+// Simple logger implementation
+const logger = {
+  // eslint-disable-next-line no-console
+  log: (...args: unknown[]) => console.log(...args),
+  // eslint-disable-next-line no-console
+  error: (...args: unknown[]) => console.error(...args),
+  // eslint-disable-next-line no-console
+  info: (...args: unknown[]) => console.info(...args),
+  // eslint-disable-next-line no-console
+  warn: (...args: unknown[]) => console.warn(...args),
+  // eslint-disable-next-line no-console
+  debug: (...args: unknown[]) => console.debug(...args),
+};
+
+// Check if running in dev mode
+const isDev = process.argv.includes("--inspect");
+
+function createWindow(): void {
+  // Add before createWindow function
+  const preloadPath = path.join(__dirname, "preload.js");
+  logger.log("Checking preload path:", preloadPath);
+  logger.log("Preload exists:", fs.existsSync(preloadPath));
+
+  // Create the browser window.
+  const mainWindow = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: false,
+      contextIsolation: true,
+      webSecurity: true,
+      allowRunningInsecureContent: false,
+      preload: path.join(__dirname, "preload.js"),
+    },
+  });
+
+  // Always open DevTools for now
+  mainWindow.webContents.openDevTools();
+
+  // Intercept requests to fix asset paths
+  mainWindow.webContents.session.webRequest.onBeforeRequest(
+    {
+      urls: [
+        "file://*/*/assets/*",
+        "file://*/assets/*",
+        "file:///assets/*", // Catch absolute paths
+        "<all_urls>", // Catch all URLs as a fallback
+      ],
+    },
+    (details, callback) => {
+      let url = details.url;
+
+      // Handle paths that don't start with file://
+      if (!url.startsWith("file://") && url.includes("/assets/")) {
+        url = `file://${path.join(__dirname, "www", url)}`;
+      }
+
+      // Handle absolute paths starting with /assets/
+      if (url.includes("/assets/") && !url.includes("/www/assets/")) {
+        const baseDir = url.includes("dist-electron")
+          ? url.substring(
+              0,
+              url.indexOf("/dist-electron") + "/dist-electron".length,
+            )
+          : `file://${__dirname}`;
+        const assetPath = url.split("/assets/")[1];
+        const newUrl = `${baseDir}/www/assets/${assetPath}`;
+        callback({ redirectURL: newUrl });
+        return;
+      }
+
+      callback({}); // No redirect for other URLs
+    },
+  );
+
+  if (isDev) {
+    // Debug info
+    logger.log("Debug Info:");
+    logger.log("Running in dev mode:", isDev);
+    logger.log("App is packaged:", app.isPackaged);
+    logger.log("Process resource path:", process.resourcesPath);
+    logger.log("App path:", app.getAppPath());
+    logger.log("__dirname:", __dirname);
+    logger.log("process.cwd():", process.cwd());
+  }
+
+  const indexPath = path.join(__dirname, "www", "index.html");
+
+  if (isDev) {
+    logger.log("Loading index from:", indexPath);
+    logger.log("www path:", path.join(__dirname, "www"));
+    logger.log("www assets path:", path.join(__dirname, "www", "assets"));
+  }
+
+  if (!fs.existsSync(indexPath)) {
+    logger.error(`Index file not found at: ${indexPath}`);
+    throw new Error("Index file not found");
+  }
+
+  // Add CSP headers to allow API connections
+  mainWindow.webContents.session.webRequest.onHeadersReceived(
+    (details, callback) => {
+      callback({
+        responseHeaders: {
+          ...details.responseHeaders,
+          "Content-Security-Policy": [
+            "default-src 'self';" +
+              "connect-src 'self' https://api.endorser.ch https://*.timesafari.app;" +
+              "img-src 'self' data: https: blob:;" +
+              "script-src 'self' 'unsafe-inline' 'unsafe-eval';" +
+              "style-src 'self' 'unsafe-inline';" +
+              "font-src 'self' data:;",
+          ],
+        },
+      });
+    },
+  );
+
+  // Load the index.html
+  mainWindow
+    .loadFile(indexPath)
+    .then(() => {
+      logger.log("Successfully loaded index.html");
+      if (isDev) {
+        mainWindow.webContents.openDevTools();
+        logger.log("DevTools opened - running in dev mode");
+      }
+    })
+    .catch((err) => {
+      logger.error("Failed to load index.html:", err);
+      logger.error("Attempted path:", indexPath);
+    });
+
+  // Listen for console messages from the renderer
+  mainWindow.webContents.on("console-message", (_event, _level, message) => {
+    logger.log("Renderer Console:", message);
+  });
+
+  // Add right after creating the BrowserWindow
+  mainWindow.webContents.on(
+    "did-fail-load",
+    (_event, errorCode, errorDescription) => {
+      logger.error("Page failed to load:", errorCode, errorDescription);
+    },
+  );
+
+  mainWindow.webContents.on("preload-error", (_event, preloadPath, error) => {
+    logger.error("Preload script error:", preloadPath, error);
+  });
+
+  mainWindow.webContents.on(
+    "console-message",
+    (_event, _level, message, line, sourceId) => {
+      logger.log("Renderer Console:", line, sourceId, message);
+    },
+  );
+
+  // Enable remote debugging when in dev mode
+  if (isDev) {
+    mainWindow.webContents.openDevTools();
+  }
+}
+
+// Handle app ready
+app.whenReady().then(createWindow);
+
+// Handle all windows closed
+app.on("window-all-closed", () => {
+  if (process.platform !== "darwin") {
+    app.quit();
+  }
+});
+
+app.on("activate", () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow();
+  }
+});
+
+// Handle any errors
+process.on("uncaughtException", (error) => {
+  logger.error("Uncaught Exception:", error);
+});

src/electron/preload.js

@@ -0,0 +1,78 @@
+const { contextBridge, ipcRenderer } = require("electron");
+
+const logger = {
+  log: (message, ...args) => {
+    if (process.env.NODE_ENV !== "production") {
+      /* eslint-disable no-console */
+      console.log(message, ...args);
+      /* eslint-enable no-console */
+    }
+  },
+  warn: (message, ...args) => {
+    if (process.env.NODE_ENV !== "production") {
+      /* eslint-disable no-console */
+      console.warn(message, ...args);
+      /* eslint-enable no-console */
+    }
+  },
+  error: (message, ...args) => {
+    /* eslint-disable no-console */
+    console.error(message, ...args); // Errors should always be logged
+    /* eslint-enable no-console */
+  },
+};
+
+// Use a more direct path resolution approach
+const getPath = (pathType) => {
+  switch (pathType) {
+    case "userData":
+      return (
+        process.env.APPDATA ||
+        (process.platform === "darwin"
+          ? `${process.env.HOME}/Library/Application Support`
+          : `${process.env.HOME}/.local/share`)
+      );
+    case "home":
+      return process.env.HOME;
+    case "appPath":
+      return process.resourcesPath;
+    default:
+      return "";
+  }
+};
+
+logger.log("Preload script starting...");
+
+try {
+  contextBridge.exposeInMainWorld("electronAPI", {
+    // Path utilities
+    getPath,
+
+    // IPC functions
+    send: (channel, data) => {
+      const validChannels = ["toMain"];
+      if (validChannels.includes(channel)) {
+        ipcRenderer.send(channel, data);
+      }
+    },
+    receive: (channel, func) => {
+      const validChannels = ["fromMain"];
+      if (validChannels.includes(channel)) {
+        ipcRenderer.on(channel, (event, ...args) => func(...args));
+      }
+    },
+    // Environment info
+    env: {
+      isElectron: true,
+      isDev: process.env.NODE_ENV === "development",
+    },
+    // Path utilities
+    getBasePath: () => {
+      return process.env.NODE_ENV === "development" ? "/" : "./";
+    },
+  });
+
+  logger.log("Preload script completed successfully");
+} catch (error) {
+  logger.error("Error in preload script:", error);
+}

src/interfaces/absurd-sql.d.ts

@@ -1,59 +0,0 @@
-import type { QueryExecResult, SqlValue } from "./database";
-
-declare module "@jlongster/sql.js" {
-  interface SQL {
-    Database: new (path: string, options?: { filename: boolean }) => AbsurdSqlDatabase;
-    FS: {
-      mkdir: (path: string) => void;
-      mount: (fs: any, options: any, path: string) => void;
-      open: (path: string, flags: string) => any;
-      close: (stream: any) => void;
-    };
-    register_for_idb: (fs: any) => void;
-  }
-
-  interface AbsurdSqlDatabase {
-    exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
-    run: (
-      sql: string,
-      params?: unknown[],
-    ) => Promise<{ changes: number; lastId?: number }>;
-  }
-
-  const initSqlJs: (options?: {
-    locateFile?: (file: string) => string;
-  }) => Promise<SQL>;
-
-  export default initSqlJs;
-}
-
-declare module "absurd-sql" {
-  import type { SQL } from "@jlongster/sql.js";
-
-  export class SQLiteFS {
-    constructor(fs: any, backend: any);
-  }
-}
-
-declare module "absurd-sql/dist/indexeddb-backend" {
-  export default class IndexedDBBackend {
-    constructor();
-  }
-}
-
-declare module "absurd-sql/dist/indexeddb-main-thread" {
-  export interface SQLiteOptions {
-    filename?: string;
-    autoLoad?: boolean;
-    debug?: boolean;
-  }
-
-  export interface SQLiteDatabase {
-    exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
-    close: () => Promise<void>;
-  }
-
-  export function initSqlJs(options?: any): Promise<any>;
-  export function createDatabase(options?: SQLiteOptions): Promise<SQLiteDatabase>;
-  export function openDatabase(options?: SQLiteOptions): Promise<SQLiteDatabase>;
-} 

src/interfaces/claims.ts

@@ -1,24 +1,15 @@
-/**
+import { GenericVerifiableCredential } from "./common";
- * Types of Claims
- *
- * Note that these are for the claims that get signed.
- * Records that are the latest edited entities are in the records.ts file.
- *
- */
 
-import { ClaimObject } from "./common";
+export interface AgreeVerifiableCredential {
-
+  "@context": string;
-export interface AgreeActionClaim extends ClaimObject {
-  "@context": "https://schema.org";
   "@type": string;
   object: Record<string, unknown>;
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id4
-export interface GiveActionClaim extends ClaimObject {
+export interface GiveVerifiableCredential extends GenericVerifiableCredential {
-  // context is optional because it might be embedded in another claim, eg. an AgreeAction
+  "@context"?: string;
-  "@context"?: "https://schema.org";
   "@type": "GiveAction";
   agent?: { identifier: string };
   description?: string;
@@ -26,25 +17,16 @@ export interface GiveActionClaim extends ClaimObject {
   identifier?: string;
   image?: string;
   object?: { amountOfThisGood: number; unitCode: string };
-  provider?: ClaimObject;
+  provider?: GenericVerifiableCredential;
   recipient?: { identifier: string };
 }
 
-export interface JoinActionClaim extends ClaimObject {
-  agent?: { identifier: string };
-  event?: { organizer?: { name: string }; name?: string; startTime?: string };
-}
-
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferClaim extends ClaimObject {
+export interface OfferVerifiableCredential extends GenericVerifiableCredential {
-  "@context": "https://schema.org";
+  "@context"?: string;
   "@type": "Offer";
-  agent?: { identifier: string };
   description?: string;
-  fulfills?: { "@type": string; identifier?: string; lastClaimId?: string }[];
-  identifier?: string;
-  image?: string;
   includesObject?: { amountOfThisGood: number; unitCode: string };
   itemOffered?: {
     description?: string;
@@ -55,18 +37,14 @@ export interface OfferClaim extends ClaimObject {
       name?: string;
     };
   };
-  offeredBy?: {
+  offeredBy?: { identifier: string };
-    type?: "Person";
-    identifier: string;
-  };
-  provider?: ClaimObject;
   recipient?: { identifier: string };
   validThrough?: string;
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanActionClaim extends ClaimObject {
+export interface PlanVerifiableCredential extends GenericVerifiableCredential {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
@@ -80,18 +58,11 @@ export interface PlanActionClaim extends ClaimObject {
 }
 
 // AKA Registration & RegisterAction
-export interface RegisterActionClaim extends ClaimObject {
+export interface RegisterVerifiableCredential {
-  "@context": "https://schema.org";
+  "@context": string;
   "@type": "RegisterAction";
   agent: { identifier: string };
   identifier?: string;
-  object?: string;
+  object: string;
   participant?: { identifier: string };
 }
-
-export interface TenureClaim extends ClaimObject {
-  "@context": "https://endorser.ch";
-  "@type": "Tenure";
-  party?: { identifier: string };
-  spatialUnit?: { geo?: { polygon?: string } };
-}

src/interfaces/common.ts

@@ -34,77 +34,3 @@ export interface ErrorResult extends ResultWithType {
   type: "error";
   error: InternalError;
 }
-
-export interface KeyMeta {
-  did: string;
-  publicKeyHex: string;
-  derivationPath?: string;
-  passkeyCredIdHex?: string; // The Webauthn credential ID in hex, if this is from a passkey
-}
-
-export interface KeyMetaMaybeWithPrivate extends KeyMeta {
-  mnemonic?: string; // 12 or 24 words encoding the seed
-  identity?: string; // Stringified IIdentifier object from Veramo
-}
-
-export interface KeyMetaWithPrivate extends KeyMeta {
-  mnemonic: string; // 12 or 24 words encoding the seed
-  identity: string; // Stringified IIdentifier object from Veramo
-}
-
-export interface QuantitativeValue extends GenericVerifiableCredential {
-  "@type": "QuantitativeValue";
-  "@context"?: string;
-  amountOfThisGood: number;
-  unitCode: string;
-}
-
-export interface AxiosErrorResponse {
-  message?: string;
-  response?: {
-    data?: {
-      error?: {
-        message?: string;
-      };
-      [key: string]: unknown;
-    };
-    status?: number;
-    config?: unknown;
-  };
-  config?: unknown;
-  [key: string]: unknown;
-}
-
-export interface UserInfo {
-  did: string;
-  name: string;
-  publicEncKey: string;
-  registered: boolean;
-  profileImageUrl?: string;
-  nextPublicEncKeyHash?: string;
-}
-
-export interface CreateAndSubmitClaimResult {
-  success: boolean;
-  error?: string;
-  handleId?: string;
-}
-
-export interface Agent {
-  identifier?: string;
-  did?: string;
-}
-
-export interface ClaimObject {
-  "@type": string;
-  "@context"?: string;
-  [key: string]: unknown;
-}
-
-export interface VerifiableCredentialClaim {
-  "@context"?: string;
-  "@type": string;
-  type: string[];
-  credentialSubject: ClaimObject;
-  [key: string]: unknown;
-}

src/interfaces/database.ts

@@ -1,17 +0,0 @@
-export type SqlValue = string | number | null | Uint8Array;
-
-export interface QueryExecResult {
-  columns: Array<string>;
-  values: Array<Array<SqlValue>>;
-}
-
-export interface DatabaseService {
-  initialize(): Promise<void>;
-  query(sql: string, params?: unknown[]): Promise<QueryExecResult[]>;
-  run(
-    sql: string,
-    params?: unknown[],
-  ): Promise<{ changes: number; lastId?: number }>;
-  getOneRow(sql: string, params?: unknown[]): Promise<unknown[] | undefined>;
-  getAll(sql: string, params?: unknown[]): Promise<unknown[][]>;
-}

src/interfaces/index.ts

@@ -1,38 +1,7 @@
-export type {
+export * from "./claims";
-  // From common.ts
+export * from "./claims-result";
-  GenericCredWrapper,
+export * from "./common";
-  GenericVerifiableCredential,
-  KeyMeta,
-  // Exclude types that are also exported from other files
-  // GiveVerifiableCredential,
-  // OfferVerifiableCredential,
-  // RegisterVerifiableCredential,
-  // PlanSummaryRecord,
-  // UserInfo,
-} from "./common";
-
-export type {
-  // From claims.ts
-  GiveActionClaim,
-  OfferClaim,
-  RegisterActionClaim,
-} from "./claims";
-
-export type {
-  // From claims-result.ts
-  CreateAndSubmitClaimResult,
-} from "./claims-result";
-
-export type {
-  // From records.ts
-  PlanSummaryRecord,
-  GiveSummaryRecord,
-} from "./records";
-
-export type {
-  // From user.ts
-  UserInfo,
-} from "./user";
-
 export * from "./limits";
+export * from "./records";
+export * from "./user";
 export * from "./deepLinks";

src/interfaces/records.ts

@@ -1,14 +1,14 @@
-import { GiveActionClaim, OfferClaim } from "./claims";
+import { GiveVerifiableCredential, OfferVerifiableCredential } from "./claims";
 
 // a summary record; the VC is found the fullClaim field
 export interface GiveSummaryRecord {
-  [x: string]: PropertyKey | undefined | GiveActionClaim;
+  [x: string]: PropertyKey | undefined | GiveVerifiableCredential;
   type?: string;
   agentDid: string;
   amount: number;
   amountConfirmed: number;
   description: string;
-  fullClaim: GiveActionClaim;
+  fullClaim: GiveVerifiableCredential;
   fulfillsHandleId: string;
   fulfillsPlanHandleId?: string;
   fulfillsType?: string;
@@ -26,7 +26,7 @@ export interface OfferSummaryRecord {
   amount: number;
   amountGiven: number;
   amountGivenConfirmed: number;
-  fullClaim: OfferClaim;
+  fullClaim: OfferVerifiableCredential;
   fulfillsPlanHandleId: string;
   handleId: string;
   issuerDid: string;

src/libs/crypto/index.ts

@@ -159,7 +159,7 @@ export const nextDerivationPath = (origDerivPath: string) => {
 };
 
 // Base64 encoding/decoding utilities for browser
-export function base64ToArrayBuffer(base64: string): Uint8Array {
+function base64ToArrayBuffer(base64: string): Uint8Array {
   const binaryString = atob(base64);
   const bytes = new Uint8Array(binaryString.length);
   for (let i = 0; i < binaryString.length; i++) {
@@ -168,7 +168,7 @@ export function base64ToArrayBuffer(base64: string): Uint8Array {
   return bytes;
 }
 
-export function arrayBufferToBase64(buffer: ArrayBuffer): string {
+function arrayBufferToBase64(buffer: ArrayBuffer): string {
   const binary = String.fromCharCode(...new Uint8Array(buffer));
   return btoa(binary);
 }
@@ -178,7 +178,7 @@ const IV_LENGTH = 12;
 const KEY_LENGTH = 256;
 const ITERATIONS = 100000;
 
-// Message encryption helper function, used for onboarding meeting messages
+// Encryption helper function
 export async function encryptMessage(message: string, password: string) {
   const encoder = new TextEncoder();
   const salt = crypto.getRandomValues(new Uint8Array(SALT_LENGTH));
@@ -226,7 +226,7 @@ export async function encryptMessage(message: string, password: string) {
   return btoa(JSON.stringify(result));
 }
 
-// Message decryption helper function, used for onboarding meeting messages
+// Decryption helper function
 export async function decryptMessage(encryptedJson: string, password: string) {
   const decoder = new TextDecoder();
   const { salt, iv, encrypted } = JSON.parse(atob(encryptedJson));
@@ -273,7 +273,7 @@ export async function decryptMessage(encryptedJson: string, password: string) {
 }
 
 // Test function to verify encryption/decryption
-export async function testMessageEncryptionDecryption() {
+export async function testEncryptionDecryption() {
   try {
     const testMessage = "Hello, this is a test message! 🚀";
     const testPassword = "myTestPassword123";
@@ -299,111 +299,9 @@ export async function testMessageEncryptionDecryption() {
     logger.log("\nTesting with wrong password...");
     try {
       await decryptMessage(encrypted, "wrongPassword");
-      logger.log("Incorrectly decrypted with wrong password ❌");
+      logger.log("Should not reach here");
     } catch (error) {
-      logger.log("Correctly failed to decrypt with wrong password ✅");
+      logger.log("Correctly failed with wrong password ✅");
-    }
-
-    return success;
-  } catch (error) {
-    logger.error("Test failed with error:", error);
-    return false;
-  }
-}
-
-// Simple encryption using Node's crypto, used for the initial encryption of the identity and mnemonic
-export async function simpleEncrypt(
-  text: string,
-  secret: ArrayBuffer,
-): Promise<ArrayBuffer> {
-  const iv = crypto.getRandomValues(new Uint8Array(16));
-
-  // Derive a 256-bit key from the secret using SHA-256
-  const keyData = await crypto.subtle.digest("SHA-256", secret);
-  const key = await crypto.subtle.importKey(
-    "raw",
-    keyData,
-    { name: "AES-GCM" },
-    false,
-    ["encrypt"],
-  );
-
-  const encrypted = await crypto.subtle.encrypt(
-    { name: "AES-GCM", iv },
-    key,
-    new TextEncoder().encode(text),
-  );
-
-  // Combine IV and encrypted data
-  const result = new Uint8Array(iv.length + encrypted.byteLength);
-  result.set(iv);
-  result.set(new Uint8Array(encrypted), iv.length);
-
-  return result.buffer;
-}
-
-// Simple decryption using Node's crypto, used for the default decryption of identity and mnemonic
-export async function simpleDecrypt(
-  encryptedText: ArrayBuffer,
-  secret: ArrayBuffer,
-): Promise<string> {
-  const data = new Uint8Array(encryptedText);
-
-  // Extract IV and encrypted data
-  const iv = data.slice(0, 16);
-  const encrypted = data.slice(16);
-
-  // Derive the same 256-bit key from the secret using SHA-256
-  const keyData = await crypto.subtle.digest("SHA-256", secret);
-  const key = await crypto.subtle.importKey(
-    "raw",
-    keyData,
-    { name: "AES-GCM" },
-    false,
-    ["decrypt"],
-  );
-
-  const decrypted = await crypto.subtle.decrypt(
-    { name: "AES-GCM", iv },
-    key,
-    encrypted,
-  );
-
-  return new TextDecoder().decode(decrypted);
-}
-
-// Test function for simple encryption/decryption
-export async function testSimpleEncryptionDecryption() {
-  try {
-    const testMessage = "Hello, this is a test message! 🚀";
-    const testSecret = crypto.getRandomValues(new Uint8Array(32));
-
-    logger.log("Original message:", testMessage);
-
-    // Test encryption
-    logger.log("Encrypting...");
-    const encrypted = await simpleEncrypt(testMessage, testSecret);
-    const encryptedBase64 = arrayBufferToBase64(encrypted);
-    logger.log("Encrypted result:", encryptedBase64);
-
-    // Test decryption
-    logger.log("Decrypting...");
-    const encryptedArrayBuffer = base64ToArrayBuffer(encryptedBase64);
-    const decrypted = await simpleDecrypt(encryptedArrayBuffer, testSecret);
-    logger.log("Decrypted result:", decrypted);
-
-    // Verify
-    const success = testMessage === decrypted;
-    logger.log("Test " + (success ? "PASSED ✅" : "FAILED ❌"));
-    logger.log("Messages match:", success);
-
-    // Test with wrong secret
-    logger.log("\nTesting with wrong secret...");
-    try {
-      await simpleDecrypt(encryptedArrayBuffer, new Uint8Array(32));
-      logger.log("Incorrectly decrypted with wrong secret ❌");
-    } catch (error) {
-      logger.log("Correctly failed to decrypt with wrong secret ✅");
     }
 
     return success;

src/libs/crypto/vc/index.ts

@@ -17,12 +17,29 @@ import { didEthLocalResolver } from "./did-eth-local-resolver";
 import { PEER_DID_PREFIX, verifyPeerSignature } from "./didPeer";
 import { base64urlDecodeString, createDidPeerJwt } from "./passkeyDidPeer";
 import { urlBase64ToUint8Array } from "./util";
-import { KeyMeta, KeyMetaWithPrivate } from "../../../interfaces/common";
 
 export const ETHR_DID_PREFIX = "did:ethr:";
 export const JWT_VERIFY_FAILED_CODE = "JWT_VERIFY_FAILED";
 export const UNSUPPORTED_DID_METHOD_CODE = "UNSUPPORTED_DID_METHOD";
 
+/**
+ * Meta info about a key
+ */
+export interface KeyMeta {
+  /**
+   * Decentralized ID for the key
+   */
+  did: string;
+  /**
+   * Stringified IIDentifier object from Veramo
+   */
+  identity?: string;
+  /**
+   * The Webauthn credential ID in hex, if this is from a passkey
+   */
+  passkeyCredIdHex?: string;
+}
+
 const ethLocalResolver = new Resolver({ ethr: didEthLocalResolver });
 
 /**
@@ -34,7 +51,7 @@ export function isFromPasskey(keyMeta?: KeyMeta): boolean {
 }
 
 export async function createEndorserJwtForKey(
-  account: KeyMetaWithPrivate,
+  account: KeyMeta,
   payload: object,
   expiresIn?: number,
 ) {

src/libs/crypto/vc/passkeyDidPeer.ts

@@ -1,6 +1,7 @@
 import { Buffer } from "buffer/";
 import { JWTPayload } from "did-jwt";
-import { p256 } from "@noble/curves/p256";
+import { DIDResolutionResult } from "did-resolver";
+import { sha256 } from "ethereum-cryptography/sha256.js";
 import {
   startAuthentication,
   startRegistration,
@@ -10,13 +11,12 @@ import {
   generateRegistrationOptions,
   verifyAuthenticationResponse,
   verifyRegistrationResponse,
-  VerifyAuthenticationResponseOpts,
 } from "@simplewebauthn/server";
+import { VerifyAuthenticationResponseOpts } from "@simplewebauthn/server/esm/authentication/verifyAuthenticationResponse";
 import {
   Base64URLString,
   PublicKeyCredentialCreationOptionsJSON,
   PublicKeyCredentialRequestOptionsJSON,
-  AuthenticatorAssertionResponse,
 } from "@simplewebauthn/types";
 
 import { AppString } from "../../../constants/app";
@@ -194,19 +194,16 @@ export class PeerSetup {
       },
     };
 
-    const credential = (await navigator.credentials.get(
+    const credential = await navigator.credentials.get(options);
-      options,
-    )) as PublicKeyCredential;
     // console.log("nav credential get", credential);
 
-    const response = credential?.response as AuthenticatorAssertionResponse;
+    this.authenticatorData = credential?.response.authenticatorData;
-    this.authenticatorData = response?.authenticatorData;
     const authenticatorDataBase64Url = arrayBufferToBase64URLString(
       this.authenticatorData as ArrayBuffer,
     );
 
     this.clientDataJsonBase64Url = arrayBufferToBase64URLString(
-      response?.clientDataJSON,
+      credential?.response.clientDataJSON,
     );
 
     // Our custom type of JWANT means the signature is based on a concatenation of the two Webauthn properties
@@ -231,7 +228,9 @@ export class PeerSetup {
       .replace(/\//g, "_")
       .replace(/=+$/, "");
 
-    const origSignature = Buffer.from(response?.signature).toString("base64");
+    const origSignature = Buffer.from(credential?.response.signature).toString(
+      "base64",
+    );
     this.signature = origSignature
       .replace(/\+/g, "-")
       .replace(/\//g, "_")
@@ -316,18 +315,24 @@ export async function createDidPeerJwt(
 // ... and this import:
 // import { p256 } from "@noble/curves/p256";
 export async function verifyJwtP256(
+  credIdHex: string,
   issuerDid: string,
   authenticatorData: ArrayBuffer,
   challenge: Uint8Array,
+  clientDataJsonBase64Url: Base64URLString,
   signature: Base64URLString,
 ) {
   const authDataFromBase = Buffer.from(authenticatorData);
+  const clientDataFromBase = Buffer.from(clientDataJsonBase64Url, "base64");
   const sigBuffer = Buffer.from(signature, "base64");
   const finalSigBuffer = unwrapEC2Signature(sigBuffer);
   const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
 
-  // Use challenge in preimage construction
+  // Hash the client data
-  const preimage = Buffer.concat([authDataFromBase, Buffer.from(challenge)]);
+  const hash = sha256(clientDataFromBase);
+
+  // Construct the preimage
+  const preimage = Buffer.concat([authDataFromBase, hash]);
 
   const isValid = p256.verify(
     finalSigBuffer,
@@ -378,37 +383,122 @@ export async function verifyJwtSimplewebauthn(
 
 // similar code is in endorser-ch util-crypto.ts verifyPeerSignature
 export async function verifyJwtWebCrypto(
+  credId: Base64URLString,
   issuerDid: string,
   authenticatorData: ArrayBuffer,
   challenge: Uint8Array,
+  clientDataJsonBase64Url: Base64URLString,
   signature: Base64URLString,
 ) {
   const authDataFromBase = Buffer.from(authenticatorData);
+  const clientDataFromBase = Buffer.from(clientDataJsonBase64Url, "base64");
   const sigBuffer = Buffer.from(signature, "base64");
   const finalSigBuffer = unwrapEC2Signature(sigBuffer);
 
-  // Use challenge in preimage construction
+  // Hash the client data
-  const preimage = Buffer.concat([authDataFromBase, Buffer.from(challenge)]);
+  const hash = sha256(clientDataFromBase);
 
+  // Construct the preimage
+  const preimage = Buffer.concat([authDataFromBase, hash]);
   return verifyPeerSignature(preimage, issuerDid, finalSigBuffer);
 }
 
-// Remove unused functions:
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
-// - peerDidToDidDocument
+async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
-// - COSEtoPEM
+  if (!did.startsWith("did:peer:0z")) {
-// - base64urlDecodeArrayBuffer
+    throw new Error(
-// - base64urlEncodeArrayBuffer
+      "This only verifies a peer DID, method 0, encoded base58btc.",
-// - pemToCryptoKey
+    );
+  }
+  // this is basically hard-coded from https://www.w3.org/TR/did-core/#example-various-verification-method-types
+  // (another reference is the @aviarytech/did-peer resolver)
 
-// Keep only the used functions:
+  /**
+   * Looks like JsonWebKey2020 isn't too difficult:
+   * - change context security/suites link to jws-2020/v1
+   * - change publicKeyMultibase to publicKeyJwk generated with cborToKeys
+   * - change type to JsonWebKey2020
+   */
+
+  const id = did.split(":")[2];
+  const multibase = id.slice(1);
+  const encnumbasis = multibase.slice(1);
+  const didDocument = {
+    "@context": [
+      "https://www.w3.org/ns/did/v1",
+      "https://w3id.org/security/suites/secp256k1-2019/v1",
+    ],
+    assertionMethod: [did + "#" + encnumbasis],
+    authentication: [did + "#" + encnumbasis],
+    capabilityDelegation: [did + "#" + encnumbasis],
+    capabilityInvocation: [did + "#" + encnumbasis],
+    id: did,
+    keyAgreement: undefined,
+    service: undefined,
+    verificationMethod: [
+      {
+        controller: did,
+        id: did + "#" + encnumbasis,
+        publicKeyMultibase: multibase,
+        type: "EcdsaSecp256k1VerificationKey2019",
+      },
+    ],
+  };
+  return {
+    didDocument,
+    didDocumentMetadata: {},
+    didResolutionMetadata: { contentType: "application/did+ld+json" },
+  };
+}
+
+// convert COSE public key to PEM format
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function COSEtoPEM(cose: Buffer) {
+  // const alg = cose.get(3); // Algorithm
+  const x = cose[-2]; // x-coordinate
+  const y = cose[-3]; // y-coordinate
+
+  // Ensure the coordinates are in the correct format
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error because it complains about the type of x and y
+  const pubKeyBuffer = Buffer.concat([Buffer.from([0x04]), x, y]);
+
+  // Convert to PEM format
+  const pem = `-----BEGIN PUBLIC KEY-----
+${pubKeyBuffer.toString("base64")}
+-----END PUBLIC KEY-----`;
+
+  return pem;
+}
+
+// tried the base64url library but got an error using their Buffer
 export function base64urlDecodeString(input: string) {
   return atob(input.replace(/-/g, "+").replace(/_/g, "/"));
 }
 
+// tried the base64url library but got an error using their Buffer
 export function base64urlEncodeString(input: string) {
   return btoa(input).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function base64urlDecodeArrayBuffer(input: string) {
+  input = input.replace(/-/g, "+").replace(/_/g, "/");
+  const pad = input.length % 4 === 0 ? "" : "====".slice(input.length % 4);
+  const str = atob(input + pad);
+  const bytes = new Uint8Array(str.length);
+  for (let i = 0; i < str.length; i++) {
+    bytes[i] = str.charCodeAt(i);
+  }
+  return bytes.buffer;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function base64urlEncodeArrayBuffer(buffer: ArrayBuffer) {
+  const str = String.fromCharCode(...new Uint8Array(buffer));
+  return base64urlEncodeString(str);
+}
+
 // from @simplewebauthn/browser
 function arrayBufferToBase64URLString(buffer: ArrayBuffer) {
   const bytes = new Uint8Array(buffer);
@@ -433,3 +523,28 @@ function base64URLStringToArrayBuffer(base64URLString: string) {
   }
   return buffer;
 }
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+async function pemToCryptoKey(pem: string) {
+  const binaryDerString = atob(
+    pem
+      .split("\n")
+      .filter((x) => !x.includes("-----"))
+      .join(""),
+  );
+  const binaryDer = new Uint8Array(binaryDerString.length);
+  for (let i = 0; i < binaryDerString.length; i++) {
+    binaryDer[i] = binaryDerString.charCodeAt(i);
+  }
+  // console.log("binaryDer", binaryDer.buffer);
+  return await window.crypto.subtle.importKey(
+    "spki",
+    binaryDer.buffer,
+    {
+      name: "RSASSA-PKCS1-v1_5",
+      hash: "SHA-256",
+    },
+    true,
+    ["verify"],
+  );
+}

src/libs/endorserServer.ts

@@ -26,42 +26,29 @@ import {
   DEFAULT_IMAGE_API_SERVER,
   NotificationIface,
   APP_SERVER,
-  USE_DEXIE_DB,
 } from "../constants/app";
 import { Contact } from "../db/tables/contacts";
 import { accessToken, deriveAddress, nextDerivationPath } from "../libs/crypto";
-import { NonsensitiveDexie } from "../db/index";
+import { logConsoleAndDb, NonsensitiveDexie } from "../db/index";
-import { logConsoleAndDb } from "../db/databaseUtil";
+
 import {
   retrieveAccountMetadata,
   retrieveFullyDecryptedAccount,
   getPasskeyExpirationSeconds,
 } from "../libs/util";
-import { createEndorserJwtForKey } from "../libs/crypto/vc";
+import { createEndorserJwtForKey, KeyMeta } from "../libs/crypto/vc";
-import {
-  GiveActionClaim,
-  JoinActionClaim,
-  OfferClaim,
-  PlanActionClaim,
-  RegisterActionClaim,
-  TenureClaim,
-} from "../interfaces/claims";
 
 import {
-  GenericCredWrapper,
+  GiveVerifiableCredential,
+  OfferVerifiableCredential,
+  RegisterVerifiableCredential,
   GenericVerifiableCredential,
-  AxiosErrorResponse,
+  GenericCredWrapper,
+  PlanSummaryRecord,
   UserInfo,
   CreateAndSubmitClaimResult,
-  ClaimObject,
+} from "../interfaces";
-  VerifiableCredentialClaim,
-  QuantitativeValue,
-  KeyMetaWithPrivate,
-  KeyMetaMaybeWithPrivate,
-} from "../interfaces/common";
-import { PlanSummaryRecord } from "../interfaces/records";
 import { logger } from "../utils/logger";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 /**
  * Standard context for schema.org data
@@ -113,10 +100,7 @@ export const ENDORSER_CH_HANDLE_PREFIX = "https://endorser.ch/entity/";
 
 export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper<GenericVerifiableCredential> =
   {
-    claim: {
+    claim: { "@type": "" },
-      "@context": SCHEMA_ORG_CONTEXT,
-      "@type": "",
-    },
     handleId: "",
     id: "",
     issuedAt: "",
@@ -196,21 +180,37 @@ export function isEmptyOrHiddenDid(did?: string): boolean {
  * };
  * testRecursivelyOnStrings(isHiddenDid, obj); // Returns: true
  */
-const testRecursivelyOnStrings = (
+function testRecursivelyOnStrings(
+  func: (arg0: unknown) => boolean,
   input: unknown,
-  test: (s: string) => boolean,
+): boolean {
-): boolean => {
+  // Test direct string values
-  if (typeof input === "string") {
+  if (Object.prototype.toString.call(input) === "[object String]") {
-    return test(input);
+    return func(input);
-  } else if (Array.isArray(input)) {
-    return input.some((item) => testRecursivelyOnStrings(item, test));
-  } else if (input && typeof input === "object") {
-    return Object.values(input as Record<string, unknown>).some((value) =>
-      testRecursivelyOnStrings(value, test),
-    );
   }
-  return false;
+  // Recursively test objects and arrays
-};
+  else if (input instanceof Object) {
+    if (!Array.isArray(input)) {
+      // Handle plain objects
+      for (const key in input) {
+        if (testRecursivelyOnStrings(func, input[key])) {
+          return true;
+        }
+      }
+    } else {
+      // Handle arrays
+      for (const value of input) {
+        if (testRecursivelyOnStrings(func, value)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  } else {
+    // Non-string, non-object values can't contain strings
+    return false;
+  }
+}
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function containsHiddenDid(obj: any) {
@@ -551,11 +551,7 @@ export async function setPlanInCache(
  * @returns {string|undefined} User-friendly message or undefined if none found
  */
 export function serverMessageForUser(error: unknown): string | undefined {
-  if (error && typeof error === "object" && "response" in error) {
+  return error?.response?.data?.error?.message;
-    const err = error as AxiosErrorResponse;
-    return err.response?.data?.error?.message;
-  }
-  return undefined;
 }
 
 /**
@@ -577,27 +573,18 @@ export function errorStringForLog(error: unknown) {
     // --- property '_value' closes the circle
   }
   let fullError = "" + error + " - JSON: " + stringifiedError;
-
+  const errorResponseText = JSON.stringify(error.response);
-  if (error && typeof error === "object" && "response" in error) {
+  // for some reason, error.response is not included in stringify result (eg. for 400 errors on invite redemptions)
-    const err = error as AxiosErrorResponse;
+  if (!R.empty(errorResponseText) && !fullError.includes(errorResponseText)) {
-    const errorResponseText = JSON.stringify(err.response);
+    // add error.response stuff
-    // for some reason, error.response is not included in stringify result (eg. for 400 errors on invite redemptions)
+    if (R.equals(error?.config, error?.response?.config)) {
-    if (!R.empty(errorResponseText) && !fullError.includes(errorResponseText)) {
+      // but exclude "config" because it's already in there
-      // add error.response stuff
+      const newErrorResponseText = JSON.stringify(
-      if (
+        R.omit(["config"] as never[], error.response),
-        err.response?.config &&
+      );
-        err.config &&
+      fullError += " - .response w/o same config JSON: " + newErrorResponseText;
-        R.equals(err.config, err.response.config)
+    } else {
-      ) {
+      fullError += " - .response JSON: " + errorResponseText;
-        // but exclude "config" because it's already in there
-        const newErrorResponseText = JSON.stringify(
-          R.omit(["config"] as never[], err.response),
-        );
-        fullError +=
-          " - .response w/o same config JSON: " + newErrorResponseText;
-      } else {
-        fullError += " - .response JSON: " + errorResponseText;
-      }
     }
   }
   return fullError;
@@ -655,7 +642,7 @@ export async function getNewOffersToUserProjects(
  * @param lastClaimId supplied when editing a previous claim
  */
 export function hydrateGive(
-  vcClaimOrig?: GiveActionClaim,
+  vcClaimOrig?: GiveVerifiableCredential,
   fromDid?: string,
   toDid?: string,
   description?: string,
@@ -663,12 +650,14 @@ export function hydrateGive(
   unitCode?: string,
   fulfillsProjectHandleId?: string,
   fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
+  isTrade: boolean = false, // remove, because this app is all for gifting
   imageUrl?: string,
   providerPlanHandleId?: string,
   lastClaimId?: string,
-): GiveActionClaim {
+): GiveVerifiableCredential {
-  const vcClaim: GiveActionClaim = vcClaimOrig
+  // Remember: replace values or erase if it's null
+
+  const vcClaim: GiveVerifiableCredential = vcClaimOrig
     ? R.clone(vcClaimOrig)
     : {
         "@context": SCHEMA_ORG_CONTEXT,
@@ -676,72 +665,55 @@ export function hydrateGive(
       };
 
   if (lastClaimId) {
+    // this is an edit
     vcClaim.lastClaimId = lastClaimId;
     delete vcClaim.identifier;
   }
 
-  if (fromDid) {
+  vcClaim.agent = fromDid ? { identifier: fromDid } : undefined;
-    vcClaim.agent = { identifier: fromDid };
+  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  }
-  if (toDid) {
-    vcClaim.recipient = { identifier: toDid };
-  }
   vcClaim.description = description || undefined;
+  vcClaim.object =
+    amount && !isNaN(amount)
+      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
+      : undefined;
 
-  if (amount && !isNaN(amount)) {
+  // ensure fulfills is an array
-    const quantitativeValue: QuantitativeValue = {
-      "@type": "QuantitativeValue",
-      amountOfThisGood: amount,
-      unitCode: unitCode || "HUR",
-    };
-    vcClaim.object = quantitativeValue;
-  }
-
-  // Initialize fulfills array if not present
   if (!Array.isArray(vcClaim.fulfills)) {
     vcClaim.fulfills = vcClaim.fulfills ? [vcClaim.fulfills] : [];
   }
-
+  // ... and replace or add each element, ending with Trade or Donate
-  // Filter and add fulfills elements
+  // I realize the following doesn't change any elements that are not PlanAction or Offer or Trade/Action.
   vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem: { "@type": string }) => elem["@type"] !== "PlanAction",
+    (elem) => elem["@type"] !== "PlanAction",
   );
-
   if (fulfillsProjectHandleId) {
     vcClaim.fulfills.push({
       "@type": "PlanAction",
       identifier: fulfillsProjectHandleId,
     });
   }
-
   vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem: { "@type": string }) => elem["@type"] !== "Offer",
+    (elem) => elem["@type"] !== "Offer",
   );
-
   if (fulfillsOfferHandleId) {
     vcClaim.fulfills.push({
       "@type": "Offer",
       identifier: fulfillsOfferHandleId,
     });
   }
-
+  // do Trade/Donate last because current endorser.ch only looks at the first for plans & offers
   vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem: { "@type": string }) =>
+    (elem) =>
       elem["@type"] !== "DonateAction" && elem["@type"] !== "TradeAction",
   );
-
+  vcClaim.fulfills.push({ "@type": isTrade ? "TradeAction" : "DonateAction" });
-  vcClaim.fulfills.push({
-    "@type": isTrade ? "TradeAction" : "DonateAction",
-  });
 
   vcClaim.image = imageUrl || undefined;
 
-  if (providerPlanHandleId) {
+  vcClaim.provider = providerPlanHandleId
-    vcClaim.provider = {
+    ? { "@type": "PlanAction", identifier: providerPlanHandleId }
-      "@type": "PlanAction",
+    : undefined;
-      identifier: providerPlanHandleId,
-    };
-  }
 
   return vcClaim;
 }
@@ -802,7 +774,7 @@ export async function createAndSubmitGive(
 export async function editAndSubmitGive(
   axios: Axios,
   apiServer: string,
-  fullClaim: GenericCredWrapper<GiveActionClaim>,
+  fullClaim: GenericCredWrapper<GiveVerifiableCredential>,
   issuerDid: string,
   fromDid?: string,
   toDid?: string,
@@ -843,7 +815,7 @@ export async function editAndSubmitGive(
  * @param lastClaimId supplied when editing a previous claim
  */
 export function hydrateOffer(
-  vcClaimOrig?: OfferClaim,
+  vcClaimOrig?: OfferVerifiableCredential,
   fromDid?: string,
   toDid?: string,
   itemDescription?: string,
@@ -853,8 +825,10 @@ export function hydrateOffer(
   fulfillsProjectHandleId?: string,
   validThrough?: string,
   lastClaimId?: string,
-): OfferClaim {
+): OfferVerifiableCredential {
-  const vcClaim: OfferClaim = vcClaimOrig
+  // Remember: replace values or erase if it's null
+
+  const vcClaim: OfferVerifiableCredential = vcClaimOrig
     ? R.clone(vcClaimOrig)
     : {
         "@context": SCHEMA_ORG_CONTEXT,
@@ -867,20 +841,14 @@ export function hydrateOffer(
     delete vcClaim.identifier;
   }
 
-  if (fromDid) {
+  vcClaim.offeredBy = fromDid ? { identifier: fromDid } : undefined;
-    vcClaim.offeredBy = { identifier: fromDid };
+  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  }
-  if (toDid) {
-    vcClaim.recipient = { identifier: toDid };
-  }
   vcClaim.description = conditionDescription || undefined;
 
-  if (amount && !isNaN(amount)) {
+  vcClaim.includesObject =
-    vcClaim.includesObject = {
+    amount && !isNaN(amount)
-      amountOfThisGood: amount,
+      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-      unitCode: unitCode || "HUR",
+      : undefined;
-    };
-  }
 
   if (itemDescription || fulfillsProjectHandleId) {
     vcClaim.itemOffered = vcClaim.itemOffered || {};
@@ -892,7 +860,6 @@ export function hydrateOffer(
       };
     }
   }
-
   vcClaim.validThrough = validThrough || undefined;
 
   return vcClaim;
@@ -932,7 +899,7 @@ export async function createAndSubmitOffer(
     undefined,
   );
   return createAndSubmitClaim(
-    vcClaim as OfferClaim,
+    vcClaim as OfferVerifiableCredential,
     issuerDid,
     apiServer,
     axios,
@@ -942,7 +909,7 @@ export async function createAndSubmitOffer(
 export async function editAndSubmitOffer(
   axios: Axios,
   apiServer: string,
-  fullClaim: GenericCredWrapper<OfferClaim>,
+  fullClaim: GenericCredWrapper<OfferVerifiableCredential>,
   issuerDid: string,
   itemDescription: string,
   amount?: number,
@@ -965,7 +932,7 @@ export async function editAndSubmitOffer(
     fullClaim.id,
   );
   return createAndSubmitClaim(
-    vcClaim as OfferClaim,
+    vcClaim as OfferVerifiableCredential,
     issuerDid,
     apiServer,
     axios,
@@ -1001,12 +968,11 @@ export async function createAndSubmitClaim(
   axios: Axios,
 ): Promise<CreateAndSubmitClaimResult> {
   try {
-    const vcPayload: { vc: VerifiableCredentialClaim } = {
+    const vcPayload = {
       vc: {
-        "@context": "https://www.w3.org/2018/credentials/v1",
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
-        "@type": "VerifiableCredential",
         type: ["VerifiableCredential"],
-        credentialSubject: vcClaim as unknown as ClaimObject,
+        credentialSubject: vcClaim,
       },
     };
 
@@ -1022,25 +988,26 @@ export async function createAndSubmitClaim(
       },
     });
 
-    return { success: true, handleId: response.data?.handleId };
+    return { type: "success", response };
-  } catch (error: unknown) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } catch (error: any) {
     logger.error("Error submitting claim:", error);
     const errorMessage: string =
       serverMessageForUser(error) ||
-      (error && typeof error === "object" && "message" in error
+      error.message ||
-        ? String(error.message)
-        : undefined) ||
       "Got some error submitting the claim. Check your permissions, network, and error logs.";
 
     return {
-      success: false,
+      type: "error",
-      error: errorMessage,
+      error: {
+        error: errorMessage,
+      },
     };
   }
 }
 
 export async function generateEndorserJwtUrlForAccount(
-  account: KeyMetaMaybeWithPrivate,
+  account: KeyMeta,
   isRegistered: boolean,
   givenName: string,
   profileImageUrl: string,
@@ -1064,9 +1031,12 @@ export async function generateEndorserJwtUrlForAccount(
   }
 
   // Add the next key -- not recommended for the QR code for such a high resolution
-  if (isContact && account.derivationPath && account.mnemonic) {
+  if (isContact && account?.mnemonic && account?.derivationPath) {
-    const newDerivPath = nextDerivationPath(account.derivationPath);
+    const newDerivPath = nextDerivationPath(account.derivationPath as string);
-    const nextPublicHex = deriveAddress(account.mnemonic, newDerivPath)[2];
+    const nextPublicHex = deriveAddress(
+      account.mnemonic as string,
+      newDerivPath,
+    )[2];
     const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
     const nextPublicEncKeyHash = sha256(nextPublicEncKey);
     const nextPublicEncKeyHashBase64 =
@@ -1086,11 +1056,7 @@ export async function createEndorserJwtForDid(
   expiresIn?: number,
 ) {
   const account = await retrieveFullyDecryptedAccount(issuerDid);
-  return createEndorserJwtForKey(
+  return createEndorserJwtForKey(account as KeyMeta, payload, expiresIn);
-    account as KeyMetaWithPrivate,
-    payload,
-    expiresIn,
-  );
 }
 
 /**
@@ -1138,21 +1104,21 @@ export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => {
 
  similar code is also contained in endorser-mobile
  **/
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const claimSummary = (
-  claim:
+  claim: GenericCredWrapper<GenericVerifiableCredential>,
-    | GenericVerifiableCredential
-    | GenericCredWrapper<GenericVerifiableCredential>,
 ) => {
   if (!claim) {
+    // to differentiate from "something" above
     return "something";
   }
-  let specificClaim: GenericVerifiableCredential;
+  let specificClaim:
-  if ("claim" in claim) {
+    | GenericVerifiableCredential
-    // It's a GenericCredWrapper
+    | GenericCredWrapper<GenericVerifiableCredential> = claim;
-    specificClaim = claim.claim as GenericVerifiableCredential;
+  if (claim.claim) {
-  } else {
+    // probably a Verified Credential
-    // It's already a GenericVerifiableCredential
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    specificClaim = claim;
+    specificClaim = claim.claim;
   }
   if (Array.isArray(specificClaim)) {
     if (specificClaim.length === 1) {
@@ -1187,112 +1153,88 @@ export const claimSpecialDescription = (
   identifiers: Array<string>,
   contacts: Array<Contact>,
 ) => {
-  let claim:
+  let claim = record.claim;
-    | GenericVerifiableCredential
+  if (claim.claim) {
-    | GenericCredWrapper<GenericVerifiableCredential> = record.claim;
+    // it's probably a Verified Credential
-  if ("claim" in claim) {
+    claim = claim.claim;
-    // it's a nested GenericCredWrapper
-    claim = claim.claim as GenericVerifiableCredential;
   }
 
   const issuer = didInfo(record.issuer, activeDid, identifiers, contacts);
   const type = claim["@type"] || "UnknownType";
 
   if (type === "AgreeAction") {
-    return (
+    return issuer + " agreed with " + claimSummary(claim.object);
-      issuer +
-      " agreed with " +
-      claimSummary(claim.object as GenericVerifiableCredential)
-    );
   } else if (isAccept(claim)) {
-    return (
+    return issuer + " accepted " + claimSummary(claim.object);
-      issuer +
-      " accepted " +
-      claimSummary(claim.object as GenericVerifiableCredential)
-    );
   } else if (type === "GiveAction") {
-    const giveClaim = claim as GiveActionClaim;
+    // agent.did is for legacy data, before March 2023
-    // @ts-expect-error because .did may be found in legacy data, before March 2023
+    const giver = claim.agent?.identifier || claim.agent?.did;
-    const legacyGiverDid = giveClaim.agent?.did;
-    const giver = giveClaim.agent?.identifier || legacyGiverDid;
     const giverInfo = didInfo(giver, activeDid, identifiers, contacts);
-    let gaveAmount = giveClaim.object?.amountOfThisGood
+    let gaveAmount = claim.object?.amountOfThisGood
-      ? displayAmount(
+      ? displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
-          giveClaim.object.unitCode as string,
-          giveClaim.object.amountOfThisGood as number,
-        )
       : "";
-    if (giveClaim.description) {
+    if (claim.description) {
       if (gaveAmount) {
         gaveAmount = gaveAmount + ", and also: ";
       }
-      gaveAmount = gaveAmount + giveClaim.description;
+      gaveAmount = gaveAmount + claim.description;
     }
     if (!gaveAmount) {
       gaveAmount = "something not described";
     }
-    // @ts-expect-error because .did may be found in legacy data, before March 2023
+    // recipient.did is for legacy data, before March 2023
-    const legacyRecipDid = giveClaim.recipient?.did;
+    const gaveRecipientId = claim.recipient?.identifier || claim.recipient?.did;
-    const gaveRecipientId = giveClaim.recipient?.identifier || legacyRecipDid;
     const gaveRecipientInfo = gaveRecipientId
       ? " to " + didInfo(gaveRecipientId, activeDid, identifiers, contacts)
       : "";
     return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
   } else if (type === "JoinAction") {
-    const joinClaim = claim as JoinActionClaim;
+    // agent.did is for legacy data, before March 2023
-    // @ts-expect-error because .did may be found in legacy data, before March 2023
+    const agent = claim.agent?.identifier || claim.agent?.did;
-    const legacyDid = joinClaim.agent?.did;
-    const agent = joinClaim.agent?.identifier || legacyDid;
     const contactInfo = didInfo(agent, activeDid, identifiers, contacts);
 
     let eventOrganizer =
-      joinClaim.event &&
+      claim.event && claim.event.organizer && claim.event.organizer.name;
-      joinClaim.event.organizer &&
-      joinClaim.event.organizer.name;
     eventOrganizer = eventOrganizer || "";
-    let eventName = joinClaim.event && joinClaim.event.name;
+    let eventName = claim.event && claim.event.name;
     eventName = eventName ? " " + eventName : "";
     let fullEvent = eventOrganizer + eventName;
     fullEvent = fullEvent ? " attended the " + fullEvent : "";
 
-    let eventDate = joinClaim.event && joinClaim.event.startTime;
+    let eventDate = claim.event && claim.event.startTime;
     eventDate = eventDate ? " at " + eventDate : "";
     return contactInfo + fullEvent + eventDate;
   } else if (isOffer(claim)) {
-    const offerClaim = claim as OfferClaim;
+    const offerer = claim.offeredBy?.identifier;
-    const offerer = offerClaim.offeredBy?.identifier;
     const contactInfo = didInfo(offerer, activeDid, identifiers, contacts);
     let offering = "";
-    if (offerClaim.includesObject) {
+    if (claim.includesObject) {
       offering +=
         " " +
         displayAmount(
-          offerClaim.includesObject.unitCode,
+          claim.includesObject.unitCode,
-          offerClaim.includesObject.amountOfThisGood,
+          claim.includesObject.amountOfThisGood,
         );
     }
-    if (offerClaim.itemOffered?.description) {
+    if (claim.itemOffered?.description) {
-      offering += ", saying: " + offerClaim.itemOffered?.description;
+      offering += ", saying: " + claim.itemOffered?.description;
     }
-    // @ts-expect-error because .did may be found in legacy data, before March 2023
+    // recipient.did is for legacy data, before March 2023
-    const legacyDid = offerClaim.recipient?.did;
+    const offerRecipientId =
-    const offerRecipientId = offerClaim.recipient?.identifier || legacyDid;
+      claim.recipient?.identifier || claim.recipient?.did;
     const offerRecipientInfo = offerRecipientId
       ? " to " + didInfo(offerRecipientId, activeDid, identifiers, contacts)
       : "";
     return contactInfo + " offered" + offering + offerRecipientInfo;
   } else if (type === "PlanAction") {
-    const planClaim = claim as PlanActionClaim;
+    const claimer = claim.agent?.identifier || record.issuer;
-    const claimer = planClaim.agent?.identifier || record.issuer;
     const claimerInfo = didInfo(claimer, activeDid, identifiers, contacts);
-    return claimerInfo + " announced a project: " + planClaim.name;
+    return claimerInfo + " announced a project: " + claim.name;
   } else if (type === "Tenure") {
-    const tenureClaim = claim as TenureClaim;
+    // party.did is for legacy data, before March 2023
-    // @ts-expect-error because .did may be found in legacy data, before March 2023
+    const claimer = claim.party?.identifier || claim.party?.did;
-    const legacyDid = tenureClaim.party?.did;
-    const claimer = tenureClaim.party?.identifier || legacyDid;
     const contactInfo = didInfo(claimer, activeDid, identifiers, contacts);
-    const polygon = tenureClaim.spatialUnit?.geo?.polygon || "";
+    const polygon = claim.spatialUnit?.geo?.polygon || "";
     return (
       contactInfo +
       " possesses [" +
@@ -1300,7 +1242,11 @@ export const claimSpecialDescription = (
       "...]"
     );
   } else {
-    return issuer + " declared " + claimSummary(claim);
+    return (
+      issuer +
+      " declared " +
+      claimSummary(claim as GenericCredWrapper<GenericVerifiableCredential>)
+    );
   }
 };
 
@@ -1332,7 +1278,7 @@ export async function createEndorserJwtVcFromClaim(
   // Make a payload for the claim
   const vcPayload = {
     vc: {
-      "@context": "https://www.w3.org/2018/credentials/v1",
+      "@context": ["https://www.w3.org/2018/credentials/v1"],
       type: ["VerifiableCredential"],
       credentialSubject: claim,
     },
@@ -1340,42 +1286,32 @@ export async function createEndorserJwtVcFromClaim(
   return createEndorserJwtForDid(issuerDid, vcPayload);
 }
 
-/**
- * Create a JWT for a RegisterAction claim.
- *
- * @param activeDid - The DID of the user creating the invite
- * @param contact - The contact to register, with a 'did' field (all optional for invites)
- * @param identifier - The identifier for the invite, usually random
- * @param expiresIn - The number of seconds until the invite expires
- * @returns The JWT for the RegisterAction claim
- */
 export async function createInviteJwt(
   activeDid: string,
   contact?: Contact,
-  identifier?: string,
+  inviteId?: string,
-  expiresIn?: number, // in seconds
+  expiresIn?: number,
 ): Promise<string> {
-  const vcClaim: RegisterActionClaim = {
+  const vcClaim: RegisterVerifiableCredential = {
     "@context": SCHEMA_ORG_CONTEXT,
     "@type": "RegisterAction",
     agent: { identifier: activeDid },
     object: SERVICE_ID,
-    identifier: identifier,
   };
-  if (contact?.did) {
+  if (contact) {
     vcClaim.participant = { identifier: contact.did };
   }
-
+  if (inviteId) {
+    vcClaim.identifier = inviteId;
+  }
   // Make a payload for the claim
-  const vcPayload: { vc: VerifiableCredentialClaim } = {
+  const vcPayload = {
     vc: {
-      "@context": "https://www.w3.org/2018/credentials/v1",
+      "@context": ["https://www.w3.org/2018/credentials/v1"],
-      "@type": "VerifiableCredential",
       type: ["VerifiableCredential"],
-      credentialSubject: vcClaim as unknown as ClaimObject,
+      credentialSubject: vcClaim,
     },
   };
-
   // Create a signature using private key of identity
   const vcJwt = await createEndorserJwtForDid(activeDid, vcPayload, expiresIn);
   return vcJwt;
@@ -1387,44 +1323,21 @@ export async function register(
   axios: Axios,
   contact: Contact,
 ): Promise<{ success?: boolean; error?: string }> {
-  try {
+  const vcJwt = await createInviteJwt(activeDid, contact);
-    const vcJwt = await createInviteJwt(activeDid, contact);
-    const url = apiServer + "/api/v2/claim";
-    const resp = await axios.post<{
-      success?: {
-        handleId?: string;
-        embeddedRecordError?: string;
-      };
-      error?: string;
-      message?: string;
-    }>(url, { jwtEncoded: vcJwt });
 
-    if (resp.data?.success?.handleId) {
+  const url = apiServer + "/api/v2/claim";
-      return { success: true };
+  const resp = await axios.post(url, { jwtEncoded: vcJwt });
-    } else if (resp.data?.success?.embeddedRecordError) {
+  if (resp.data?.success?.handleId) {
-      let message =
+    return { success: true };
-        "There was some problem with the registration and so it may not be complete.";
+  } else if (resp.data?.success?.embeddedRecordError) {
-      if (typeof resp.data.success.embeddedRecordError === "string") {
+    let message =
-        message += " " + resp.data.success.embeddedRecordError;
+      "There was some problem with the registration and so it may not be complete.";
-      }
+    if (typeof resp.data.success.embeddedRecordError == "string") {
-      return { error: message };
+      message += " " + resp.data.success.embeddedRecordError;
-    } else {
-      logger.error("Registration error:", JSON.stringify(resp.data));
-      return { error: "Got a server error when registering." };
-    }
-  } catch (error: unknown) {
-    if (error && typeof error === "object") {
-      const err = error as AxiosErrorResponse;
-      const errorMessage =
-        err.message ||
-        (err.response?.data &&
-        typeof err.response.data === "object" &&
-        "message" in err.response.data
-          ? (err.response.data as { message: string }).message
-          : undefined);
-      logger.error("Registration error:", errorMessage || JSON.stringify(err));
-      return { error: errorMessage || "Got a server error when registering." };
     }
+    return { error: message };
+  } else {
+    logger.error(resp);
     return { error: "Got a server error when registering." };
   }
 }
@@ -1450,14 +1363,7 @@ export async function setVisibilityUtil(
     if (resp.status === 200) {
       const success = resp.data.success;
       if (success) {
-        const platformService = PlatformServiceFactory.getInstance();
+        db.contacts.update(contact.did, { seesMe: visibility });
-        await platformService.dbExec(
-          "UPDATE contacts SET seesMe = ? WHERE did = ?",
-          [visibility, contact.did],
-        );
-        if (USE_DEXIE_DB) {
-          db.contacts.update(contact.did, { seesMe: visibility });
-        }
       }
       return { success };
     } else {

src/libs/util.ts

@@ -5,43 +5,29 @@ import { Buffer } from "buffer";
 import * as R from "ramda";
 import { useClipboard } from "@vueuse/core";
 
-import {
+import { DEFAULT_PUSH_SERVER, NotificationIface } from "../constants/app";
-  DEFAULT_PUSH_SERVER,
-  NotificationIface,
-  USE_DEXIE_DB,
-} from "../constants/app";
 import {
   accountsDBPromise,
   retrieveSettingsForActiveAccount,
   updateAccountSettings,
   updateDefaultSettings,
 } from "../db/index";
-import { Account, AccountEncrypted } from "../db/tables/accounts";
+import { Account } from "../db/tables/accounts";
 import { Contact } from "../db/tables/contacts";
-import * as databaseUtil from "../db/databaseUtil";
 import { DEFAULT_PASSKEY_EXPIRATION_MINUTES } from "../db/tables/settings";
-import {
+import { deriveAddress, generateSeed, newIdentifier } from "../libs/crypto";
-  arrayBufferToBase64,
-  base64ToArrayBuffer,
-  deriveAddress,
-  generateSeed,
-  newIdentifier,
-  simpleDecrypt,
-  simpleEncrypt,
-} from "../libs/crypto";
 import * as serverUtil from "../libs/endorserServer";
-import { containsHiddenDid } from "../libs/endorserServer";
 import {
+  containsHiddenDid,
   GenericCredWrapper,
   GenericVerifiableCredential,
-  KeyMetaWithPrivate,
+  GiveSummaryRecord,
-} from "../interfaces/common";
+  OfferVerifiableCredential,
-import { GiveSummaryRecord } from "../interfaces/records";
+} from "../libs/endorserServer";
-import { OfferClaim } from "../interfaces/claims";
+import { KeyMeta } from "../libs/crypto/vc";
 import { createPeerDid } from "../libs/crypto/vc/didPeer";
 import { registerCredential } from "../libs/crypto/vc/passkeyDidPeer";
 import { logger } from "../utils/logger";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 export interface GiverReceiverInputInfo {
   did?: string;
@@ -378,19 +364,16 @@ export function base64ToBlob(base64DataUrl: string, sliceSize = 512) {
  * @param veriClaim is expected to have fields: claim and issuer
  */
 export function offerGiverDid(
-  veriClaim: GenericCredWrapper<OfferClaim>,
+  veriClaim: GenericCredWrapper<OfferVerifiableCredential>,
 ): string | undefined {
-  const innerClaim = veriClaim.claim as OfferClaim;
+  let giver;
-  let giver: string | undefined = undefined;
+  if (
-
+    veriClaim.claim.offeredBy?.identifier &&
-  giver = innerClaim.offeredBy?.identifier;
+    !serverUtil.isHiddenDid(veriClaim.claim.offeredBy.identifier as string)
-  if (giver && !serverUtil.isHiddenDid(giver)) {
+  ) {
-    return giver;
+    giver = veriClaim.claim.offeredBy.identifier;
-  }
+  } else if (veriClaim.issuer && !serverUtil.isHiddenDid(veriClaim.issuer)) {
-
+    giver = veriClaim.issuer;
-  giver = veriClaim.issuer;
-  if (giver && !serverUtil.isHiddenDid(giver)) {
-    return giver;
   }
   return giver;
 }
@@ -404,7 +387,7 @@ export const canFulfillOffer = (
 ) => {
   return (
     veriClaim.claimType === "Offer" &&
-    !!offerGiverDid(veriClaim as GenericCredWrapper<OfferClaim>)
+    !!offerGiverDid(veriClaim as GenericCredWrapper<OfferVerifiableCredential>)
   );
 };
 
@@ -474,235 +457,73 @@ export function findAllVisibleToDids(
  *
  **/
 
-export type AccountKeyInfo = Account & KeyMetaWithPrivate;
+export interface AccountKeyInfo extends Account, KeyMeta {}
 
 export const retrieveAccountCount = async (): Promise<number> => {
-  let result = 0;
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
-  const platformService = PlatformServiceFactory.getInstance();
+  const accountsDB = await accountsDBPromise;
-  const dbResult = await platformService.dbQuery(
+  return await accountsDB.accounts.count();
-    `SELECT COUNT(*) FROM accounts`,
-  );
-  if (dbResult?.values?.[0]?.[0]) {
-    result = dbResult.values[0][0] as number;
-  }
-
-  if (USE_DEXIE_DB) {
-    // one of the few times we use accountsDBPromise directly; try to avoid more usage
-    const accountsDB = await accountsDBPromise;
-    result = await accountsDB.accounts.count();
-  }
-  return result;
 };
 
 export const retrieveAccountDids = async (): Promise<string[]> => {
-  const platformService = PlatformServiceFactory.getInstance();
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
-  const dbAccounts = await platformService.dbQuery(`SELECT did FROM accounts`);
+  const accountsDB = await accountsDBPromise;
-  let allDids =
+  const allAccounts = await accountsDB.accounts.toArray();
-    databaseUtil
+  const allDids = allAccounts.map((acc) => acc.did);
-      .mapQueryResultToValues(dbAccounts)
-      ?.map((row) => row[0] as string) || [];
-  if (USE_DEXIE_DB) {
-    // this is the old way
-    // one of the few times we use accountsDBPromise directly; try to avoid more usage
-    const accountsDB = await accountsDBPromise;
-    const allAccounts = await accountsDB.accounts.toArray();
-    allDids = allAccounts.map((acc) => acc.did);
-  }
   return allDids;
 };
 
-/**
+// This is provided and recommended when the full key is not necessary so that
- * This is provided and recommended when the full key is not necessary so that
+// future work could separate this info from the sensitive key material.
- * future work could separate this info from the sensitive key material.
- *
- * If you need the private key data, use retrieveFullyDecryptedAccount instead.
- */
 export const retrieveAccountMetadata = async (
   activeDid: string,
-): Promise<Account | undefined> => {
+): Promise<AccountKeyInfo | undefined> => {
-  let result: Account | undefined = undefined;
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
-  const platformService = PlatformServiceFactory.getInstance();
+  const accountsDB = await accountsDBPromise;
-  const dbAccount = await platformService.dbQuery(
+  const account = (await accountsDB.accounts
-    `SELECT * FROM accounts WHERE did = ?`,
+    .where("did")
-    [activeDid],
+    .equals(activeDid)
-  );
+    .first()) as Account;
-  const account = databaseUtil.mapQueryResultToValues(dbAccount)[0] as Account;
   if (account) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { identity, mnemonic, ...metadata } = account;
-    result = metadata;
+    return metadata;
   } else {
-    result = undefined;
+    return undefined;
   }
-  if (USE_DEXIE_DB) {
-    // one of the few times we use accountsDBPromise directly; try to avoid more usage
-    const accountsDB = await accountsDBPromise;
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    if (account) {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { identity, mnemonic, ...metadata } = account;
-      result = metadata;
-    } else {
-      result = undefined;
-    }
-  }
-  return result;
-};
-
-/**
- * This contains sensitive data. If possible, use retrieveAccountMetadata instead.
- *
- * @param activeDid
- * @returns account info with private key data decrypted
- */
-export const retrieveFullyDecryptedAccount = async (
-  activeDid: string,
-): Promise<Account | undefined> => {
-  let result: Account | undefined = undefined;
-  const platformService = PlatformServiceFactory.getInstance();
-  const dbSecrets = await platformService.dbQuery(
-    `SELECT secretBase64 from secret`,
-  );
-  if (
-    !dbSecrets ||
-    dbSecrets.values.length === 0 ||
-    dbSecrets.values[0].length === 0
-  ) {
-    throw new Error(
-      "No secret found. We recommend you clear your data and start over.",
-    );
-  }
-  const secretBase64 = dbSecrets.values[0][0] as string;
-  const secret = base64ToArrayBuffer(secretBase64);
-  const dbAccount = await platformService.dbQuery(
-    `SELECT * FROM accounts WHERE did = ?`,
-    [activeDid],
-  );
-  if (
-    !dbAccount ||
-    dbAccount.values.length === 0 ||
-    dbAccount.values[0].length === 0
-  ) {
-    throw new Error("Account not found.");
-  }
-  const fullAccountData = databaseUtil.mapQueryResultToValues(
-    dbAccount,
-  )[0] as AccountEncrypted;
-  const identityEncr = base64ToArrayBuffer(fullAccountData.identityEncrBase64);
-  const mnemonicEncr = base64ToArrayBuffer(fullAccountData.mnemonicEncrBase64);
-  fullAccountData.identity = await simpleDecrypt(identityEncr, secret);
-  fullAccountData.mnemonic = await simpleDecrypt(mnemonicEncr, secret);
-  result = fullAccountData;
-
-  if (USE_DEXIE_DB) {
-    // one of the few times we use accountsDBPromise directly; try to avoid more usage
-    const accountsDB = await accountsDBPromise;
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    result = account;
-  }
-  return result;
 };
 
 export const retrieveAllAccountsMetadata = async (): Promise<Account[]> => {
-  const platformService = PlatformServiceFactory.getInstance();
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
-  const dbAccounts = await platformService.dbQuery(`SELECT * FROM accounts`);
+  const accountsDB = await accountsDBPromise;
-  const accounts = databaseUtil.mapQueryResultToValues(dbAccounts) as Account[];
+  const array = await accountsDB.accounts.toArray();
-  let result = accounts.map((account) => {
+  return array.map((account) => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { identity, mnemonic, ...metadata } = account;
-    return metadata as Account;
+    return metadata;
   });
-  if (USE_DEXIE_DB) {
-    // one of the few times we use accountsDBPromise directly; try to avoid more usage
-    const accountsDB = await accountsDBPromise;
-    const array = await accountsDB.accounts.toArray();
-    result = array.map((account) => {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { identity, mnemonic, ...metadata } = account;
-      return metadata as Account;
-    });
-  }
-  return result;
 };
 
-/**
+export const retrieveFullyDecryptedAccount = async (
- * Saves a new identity to both SQL and Dexie databases
+  activeDid: string,
- */
+): Promise<AccountKeyInfo | undefined> => {
-export async function saveNewIdentity(
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
-  identity: string,
+  const accountsDB = await accountsDBPromise;
-  mnemonic: string,
+  const account = (await accountsDB.accounts
-  newId: { did: string; keys: Array<{ publicKeyHex: string }> },
+    .where("did")
-  derivationPath: string,
+    .equals(activeDid)
-): Promise<void> {
+    .first()) as Account;
-  try {
+  return account;
-    // add to the new sql db
+};
-    const platformService = PlatformServiceFactory.getInstance();
-    const secrets = await platformService.dbQuery(
-      `SELECT secretBase64 FROM secret`,
-    );
 
-    // If no secret exists, create one
+// let's try and eliminate this
-    let secretBase64: string;
+export const retrieveAllFullyDecryptedAccounts = async (): Promise<
-    if (!secrets?.values?.length || !secrets.values[0]?.length) {
+  Array<AccountKeyInfo>
-      // Generate a new secret
+> => {
-      const randomBytes = crypto.getRandomValues(new Uint8Array(32));
+  const accountsDB = await accountsDBPromise;
-      secretBase64 = arrayBufferToBase64(randomBytes);
+  const allAccounts = await accountsDB.accounts.toArray();
-
+  return allAccounts;
-      // Store the new secret
+};
-      await platformService.dbExec(
-        `INSERT INTO secret (id, secretBase64) VALUES (1, ?)`,
-        [secretBase64],
-      );
-    } else {
-      secretBase64 = secrets.values[0][0] as string;
-    }
-
-    const secret = base64ToArrayBuffer(secretBase64);
-    const encryptedIdentity = await simpleEncrypt(identity, secret);
-    const encryptedMnemonic = await simpleEncrypt(mnemonic, secret);
-    const encryptedIdentityBase64 = arrayBufferToBase64(encryptedIdentity);
-    const encryptedMnemonicBase64 = arrayBufferToBase64(encryptedMnemonic);
-
-    await platformService.dbExec(
-      `INSERT INTO accounts (dateCreated, derivationPath, did, identityEncrBase64, mnemonicEncrBase64, publicKeyHex)
-       VALUES (?, ?, ?, ?, ?, ?)`,
-      [
-        new Date().toISOString(),
-        derivationPath,
-        newId.did,
-        encryptedIdentityBase64,
-        encryptedMnemonicBase64,
-        newId.keys[0].publicKeyHex,
-      ],
-    );
-    await databaseUtil.updateDefaultSettings({ activeDid: newId.did });
-
-    if (USE_DEXIE_DB) {
-      // one of the few times we use accountsDBPromise directly; try to avoid more usage
-      const accountsDB = await accountsDBPromise;
-      await accountsDB.accounts.add({
-        dateCreated: new Date().toISOString(),
-        derivationPath: derivationPath,
-        did: newId.did,
-        identity: identity,
-        mnemonic: mnemonic,
-        publicKeyHex: newId.keys[0].publicKeyHex,
-      });
-      await updateDefaultSettings({ activeDid: newId.did });
-    }
-  } catch (error) {
-    logger.error("Failed to update default settings:", error);
-    throw new Error(
-      "Failed to set default settings. Please try again or restart the app.",
-    );
-  }
-}
 
 /**
  * Generates a new identity, saves it to the database, and sets it as the active identity.
@@ -717,11 +538,24 @@ export const generateSaveAndActivateIdentity = async (): Promise<string> => {
   const newId = newIdentifier(address, publicHex, privateHex, derivationPath);
   const identity = JSON.stringify(newId);
 
-  await saveNewIdentity(identity, mnemonic, newId, derivationPath);
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
-  await databaseUtil.updateAccountSettings(newId.did, { isRegistered: false });
+  try {
-  if (USE_DEXIE_DB) {
+    const accountsDB = await accountsDBPromise;
-    await updateAccountSettings(newId.did, { isRegistered: false });
+    await accountsDB.accounts.add({
+      dateCreated: new Date().toISOString(),
+      derivationPath: derivationPath,
+      did: newId.did,
+      identity: identity,
+      mnemonic: mnemonic,
+      publicKeyHex: newId.keys[0].publicKeyHex,
+    });
+  
+    await updateDefaultSettings({ activeDid: newId.did });
+  } catch (error) {
+    console.error("Failed to update default settings:", error);
+    throw new Error("Failed to set default settings. Please try again or restart the app.");
   }
+  await updateAccountSettings(newId.did, { isRegistered: false });
   return newId.did;
 };
 
@@ -739,19 +573,9 @@ export const registerAndSavePasskey = async (
     passkeyCredIdHex,
     publicKeyHex: Buffer.from(publicKeyBytes).toString("hex"),
   };
-  const insertStatement = databaseUtil.generateInsertStatement(
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
-    account,
+  const accountsDB = await accountsDBPromise;
-    "accounts",
+  await accountsDB.accounts.add(account);
-  );
-  await PlatformServiceFactory.getInstance().dbExec(
-    insertStatement.sql,
-    insertStatement.params,
-  );
-  if (USE_DEXIE_DB) {
-    // one of the few times we use accountsDBPromise directly; try to avoid more usage
-    const accountsDB = await accountsDBPromise;
-    await accountsDB.accounts.add(account);
-  }
   return account;
 };
 
@@ -759,22 +583,13 @@ export const registerSaveAndActivatePasskey = async (
   keyName: string,
 ): Promise<Account> => {
   const account = await registerAndSavePasskey(keyName);
-  await databaseUtil.updateDefaultSettings({ activeDid: account.did });
+  await updateDefaultSettings({ activeDid: account.did });
-  await databaseUtil.updateAccountSettings(account.did, {
+  await updateAccountSettings(account.did, { isRegistered: false });
-    isRegistered: false,
-  });
-  if (USE_DEXIE_DB) {
-    await updateDefaultSettings({ activeDid: account.did });
-    await updateAccountSettings(account.did, { isRegistered: false });
-  }
   return account;
 };
 
 export const getPasskeyExpirationSeconds = async (): Promise<number> => {
-  let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+  const settings = await retrieveSettingsForActiveAccount();
-  if (USE_DEXIE_DB) {
-    settings = await retrieveSettingsForActiveAccount();
-  }
   return (
     (settings?.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES) *
     60
@@ -790,10 +605,7 @@ export const sendTestThroughPushServer = async (
   subscriptionJSON: PushSubscriptionJSON,
   skipFilter: boolean,
 ): Promise<AxiosResponse> => {
-  let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+  const settings = await retrieveSettingsForActiveAccount();
-  if (USE_DEXIE_DB) {
-    settings = await retrieveSettingsForActiveAccount();
-  }
   let pushUrl: string = DEFAULT_PUSH_SERVER as string;
   if (settings?.webPushServer) {
     pushUrl = settings.webPushServer;

src/main.capacitor.ts

@@ -34,7 +34,7 @@ import router from "./router";
 import { handleApiError } from "./services/api";
 import { AxiosError } from "axios";
 import { DeepLinkHandler } from "./services/deepLinks";
-import { logConsoleAndDb } from "./db/databaseUtil";
+import { logConsoleAndDb } from "./db";
 import { logger } from "./utils/logger";
 
 logger.log("[Capacitor] Starting initialization");

src/main.common.ts

@@ -2,7 +2,6 @@ import { createPinia } from "pinia";
 import { App as VueApp, ComponentPublicInstance, createApp } from "vue";
 import App from "./App.vue";
 import router from "./router";
-// Use the browser version of axios for web builds
 import axios from "axios";
 import VueAxios from "vue-axios";
 import Notifications from "notiwind";
@@ -11,12 +10,6 @@ import { FontAwesomeIcon } from "./libs/fontawesome";
 import Camera from "simple-vue-camera";
 import { logger } from "./utils/logger";
 
-const platform = process.env.VITE_PLATFORM;
-const pwa_enabled = process.env.VITE_PWA_ENABLED === "true";
-
-logger.log("Platform", { platform });
-logger.log("PWA enabled", { pwa_enabled });
-
 // Global Error Handler
 function setupGlobalErrorHandler(app: VueApp) {
   logger.log("[App Init] Setting up global error handler");

src/main.electron.ts

@@ -1,301 +1,4 @@
 import { initializeApp } from "./main.common";
-import { logger } from "./utils/logger";
-import { SQLiteQueryResult } from "./services/platforms/ElectronPlatformService";
 
-const platform = process.env.VITE_PLATFORM;
-const pwa_enabled = process.env.VITE_PWA_ENABLED === "true";
-
-logger.info("[Main Electron] Initializing app");
-logger.info("[Main Electron] Platform:", { platform });
-logger.info("[Main Electron] PWA enabled:", { pwa_enabled });
-
-if (pwa_enabled) {
-  logger.warn("[Main Electron] PWA is enabled, but not supported in electron");
-}
-
-// Initialize app and SQLite
 const app = initializeApp();
-
+app.mount("#app");
-// Create a promise that resolves when SQLite is ready
-const sqliteReady = new Promise<void>((resolve, reject) => {
-  let retryCount = 0;
-  let initializationTimeout: NodeJS.Timeout;
-
-  const attemptInitialization = () => {
-    // Clear any existing timeout
-    if (initializationTimeout) {
-      clearTimeout(initializationTimeout);
-    }
-
-    // Set timeout for this attempt
-    initializationTimeout = setTimeout(() => {
-      if (retryCount < 3) {
-        // Use same retry count as ElectronPlatformService
-        retryCount++;
-        logger.warn(
-          `[Main Electron] SQLite initialization attempt ${retryCount} timed out, retrying...`,
-        );
-        setTimeout(attemptInitialization, 1000); // Use same delay as ElectronPlatformService
-      } else {
-        logger.error(
-          "[Main Electron] SQLite initialization failed after all retries",
-        );
-        reject(new Error("SQLite initialization timeout after all retries"));
-      }
-    }, 10000); // Use same timeout as ElectronPlatformService
-
-    // Wait for electron bridge to be available
-    const checkElectronBridge = () => {
-      if (!window.electron?.ipcRenderer) {
-        // Check again in 100ms if bridge isn't ready
-        setTimeout(checkElectronBridge, 100);
-        return;
-      }
-
-      // At this point we know ipcRenderer exists
-      const ipcRenderer = window.electron.ipcRenderer;
-
-      logger.info("[Main Electron] [IPC:bridge] IPC renderer bridge available");
-
-      // Listen for SQLite ready signal
-      logger.debug(
-        "[Main Electron] [IPC:sqlite-ready] Registering listener for SQLite ready signal",
-      );
-      ipcRenderer.once("sqlite-ready", () => {
-        clearTimeout(initializationTimeout);
-        logger.info(
-          "[Main Electron] [IPC:sqlite-ready] Received SQLite ready signal",
-        );
-        resolve();
-      });
-
-      // Also listen for database errors
-      logger.debug(
-        "[Main Electron] [IPC:database-status] Registering listener for database status",
-      );
-      ipcRenderer.once("database-status", (...args: unknown[]) => {
-        clearTimeout(initializationTimeout);
-        const status = args[0] as { status: string; error?: string };
-        if (status.status === "error") {
-          logger.error(
-            "[Main Electron] [IPC:database-status] Database error:",
-            {
-              error: status.error,
-              channel: "database-status",
-            },
-          );
-          reject(new Error(status.error || "Database initialization failed"));
-        }
-      });
-
-      // Check if SQLite is already available
-      logger.debug(
-        "[Main Electron] [IPC:sqlite-is-available] Checking SQLite availability",
-      );
-      ipcRenderer
-        .invoke("sqlite-is-available")
-        .then(async (result: unknown) => {
-          const isAvailable = Boolean(result);
-          if (isAvailable) {
-            logger.info(
-              "[Main Electron] [IPC:sqlite-is-available] SQLite is available",
-            );
-
-            try {
-              // First create a database connection
-              logger.debug(
-                "[Main Electron] [IPC:get-path] Requesting database path",
-              );
-              const dbPath = await ipcRenderer.invoke("get-path");
-              logger.info(
-                "[Main Electron] [IPC:get-path] Database path received:",
-                { dbPath },
-              );
-
-              // Create the database connection
-              logger.debug(
-                "[Main Electron] [IPC:sqlite-create-connection] Creating database connection",
-              );
-              await ipcRenderer.invoke("sqlite-create-connection", {
-                database: "timesafari",
-                version: 1,
-              });
-              logger.info(
-                "[Main Electron] [IPC:sqlite-create-connection] Database connection created",
-              );
-
-              // Explicitly open the database
-              logger.debug(
-                "[Main Electron] [IPC:sqlite-open] Opening database",
-              );
-              await ipcRenderer.invoke("sqlite-open", {
-                database: "timesafari",
-              });
-              logger.info(
-                "[Main Electron] [IPC:sqlite-open] Database opened successfully",
-              );
-
-              // Verify the database is open
-              logger.debug(
-                "[Main Electron] [IPC:sqlite-is-db-open] Verifying database is open",
-              );
-              const isOpen = await ipcRenderer.invoke("sqlite-is-db-open", {
-                database: "timesafari",
-              });
-              logger.info(
-                "[Main Electron] [IPC:sqlite-is-db-open] Database open status:",
-                { isOpen },
-              );
-
-              if (!isOpen) {
-                throw new Error("Database failed to open");
-              }
-
-              // Now execute the test query
-              logger.debug(
-                "[Main Electron] [IPC:sqlite-query] Executing test query",
-              );
-              const testQuery = (await ipcRenderer.invoke("sqlite-query", {
-                database: "timesafari",
-                statement: "SELECT 1 as test;", // Safe test query
-              })) as SQLiteQueryResult;
-              logger.info(
-                "[Main Electron] [IPC:sqlite-query] Test query successful:",
-                {
-                  hasResults: Boolean(testQuery?.values),
-                  resultCount: testQuery?.values?.length,
-                },
-              );
-
-              // Signal that SQLite is ready - database stays open
-              logger.debug(
-                "[Main Electron] [IPC:sqlite-status] Sending SQLite ready status",
-              );
-              await ipcRenderer.invoke("sqlite-status", {
-                status: "ready",
-                database: "timesafari",
-                timestamp: Date.now(),
-              });
-              logger.info(
-                "[Main Electron] SQLite ready status sent, database connection maintained",
-              );
-
-              // Remove the close operations - database stays open for component use
-              // Database will be closed during app shutdown
-            } catch (error) {
-              logger.error(
-                "[Main Electron] [IPC:*] SQLite test operation failed:",
-                {
-                  error,
-                  lastOperation: "sqlite-test-query",
-                  database: "timesafari",
-                },
-              );
-
-              // Try to close everything if anything was opened
-              try {
-                logger.debug(
-                  "[Main Electron] [IPC:cleanup] Attempting database cleanup after error",
-                );
-                await ipcRenderer
-                  .invoke("sqlite-close", {
-                    database: "timesafari",
-                  })
-                  .catch((closeError) => {
-                    logger.warn(
-                      "[Main Electron] [IPC:sqlite-close] Failed to close database during cleanup:",
-                      closeError,
-                    );
-                  });
-
-                await ipcRenderer
-                  .invoke("sqlite-close-connection", {
-                    database: "timesafari",
-                  })
-                  .catch((closeError) => {
-                    logger.warn(
-                      "[Main Electron] [IPC:sqlite-close-connection] Failed to close connection during cleanup:",
-                      closeError,
-                    );
-                  });
-
-                logger.info(
-                  "[Main Electron] [IPC:cleanup] Database cleanup completed after error",
-                );
-              } catch (closeError) {
-                logger.error(
-                  "[Main Electron] [IPC:cleanup] Failed to cleanup database:",
-                  {
-                    error: closeError,
-                    database: "timesafari",
-                  },
-                );
-              }
-              // Don't reject here - we still want to wait for the ready signal
-            }
-          }
-        })
-        .catch((error: Error) => {
-          logger.error(
-            "[Main Electron] [IPC:sqlite-is-available] Failed to check SQLite availability:",
-            {
-              error,
-              channel: "sqlite-is-available",
-            },
-          );
-          // Don't reject here - wait for either ready signal or timeout
-        });
-    };
-
-    // Start checking for bridge
-    checkElectronBridge();
-  };
-
-  // Start first initialization attempt
-  attemptInitialization();
-});
-
-// Wait for SQLite to be ready before initializing router and mounting app
-sqliteReady
-  .then(async () => {
-    logger.info("[Main Electron] SQLite ready, initializing router...");
-
-    // Initialize router after SQLite is ready
-    const router = await import("./router").then((m) => m.default);
-    app.use(router);
-    logger.info("[Main Electron] Router initialized");
-
-    // Now mount the app
-    logger.info("[Main Electron] Mounting app...");
-    app.mount("#app");
-    logger.info("[Main Electron] App mounted successfully");
-  })
-  .catch((error) => {
-    logger.error(
-      "[Main Electron] Failed to initialize SQLite:",
-      error instanceof Error ? error.message : "Unknown error",
-    );
-    // Show error to user with retry option
-    const errorDiv = document.createElement("div");
-    errorDiv.style.cssText =
-      "position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); background: #ffebee; color: #c62828; padding: 20px; border-radius: 4px; text-align: center; max-width: 80%; z-index: 9999;";
-    errorDiv.innerHTML = `
-      <h2>Failed to Initialize Application</h2>
-      <p>There was an error initializing the database. This could be due to:</p>
-      <ul style="text-align: left; margin: 10px 0;">
-        <li>Database file is locked by another process</li>
-        <li>Insufficient permissions to access the database</li>
-        <li>Database file is corrupted</li>
-      </ul>
-      <p>Error details: ${error instanceof Error ? error.message : "Unknown error"}</p>
-      <div style="margin-top: 15px;">
-        <button onclick="window.location.reload()" style="margin: 0 5px; padding: 8px 16px; background: #c62828; color: white; border: none; border-radius: 4px; cursor: pointer;">
-          Retry
-        </button>
-        <button onclick="window.electron.ipcRenderer.send('sqlite-status', { action: 'reset' })" style="margin: 0 5px; padding: 8px 16px; background: #f57c00; color: white; border: none; border-radius: 4px; cursor: pointer;">
-          Reset Database
-        </button>
-      </div>
-    `;
-    document.body.appendChild(errorDiv);
-  });

src/main.ts

@@ -0,0 +1,215 @@
+import { createPinia } from "pinia";
+import { App as VueApp, ComponentPublicInstance, createApp } from "vue";
+import App from "./App.vue";
+import "./registerServiceWorker";
+import router from "./router";
+import axios from "axios";
+import VueAxios from "vue-axios";
+import Notifications from "notiwind";
+import "./assets/styles/tailwind.css";
+
+import { library } from "@fortawesome/fontawesome-svg-core";
+import {
+  faArrowDown,
+  faArrowLeft,
+  faArrowRight,
+  faArrowRotateBackward,
+  faArrowUpRightFromSquare,
+  faArrowUp,
+  faBan,
+  faBitcoinSign,
+  faBurst,
+  faCalendar,
+  faCamera,
+  faCameraRotate,
+  faCaretDown,
+  faChair,
+  faCheck,
+  faChevronDown,
+  faChevronLeft,
+  faChevronRight,
+  faChevronUp,
+  faCircle,
+  faCircleCheck,
+  faCircleInfo,
+  faCircleQuestion,
+  faCircleUser,
+  faClock,
+  faCoins,
+  faComment,
+  faCopy,
+  faDollar,
+  faEllipsis,
+  faEllipsisVertical,
+  faEnvelopeOpenText,
+  faEraser,
+  faEye,
+  faEyeSlash,
+  faFileContract,
+  faFileLines,
+  faFilter,
+  faFloppyDisk,
+  faFolderOpen,
+  faForward,
+  faGift,
+  faGlobe,
+  faHammer,
+  faHand,
+  faHandHoldingDollar,
+  faHandHoldingHeart,
+  faHouseChimney,
+  faImage,
+  faImagePortrait,
+  faLeftRight,
+  faLightbulb,
+  faLink,
+  faLocationDot,
+  faLongArrowAltLeft,
+  faLongArrowAltRight,
+  faMagnifyingGlass,
+  faMessage,
+  faMinus,
+  faPen,
+  faPersonCircleCheck,
+  faPersonCircleQuestion,
+  faPlus,
+  faQuestion,
+  faQrcode,
+  faRightFromBracket,
+  faRotate,
+  faShareNodes,
+  faSpinner,
+  faSquare,
+  faSquareCaretDown,
+  faSquareCaretUp,
+  faSquarePlus,
+  faTrashCan,
+  faTriangleExclamation,
+  faUser,
+  faUsers,
+  faXmark,
+} from "@fortawesome/free-solid-svg-icons";
+
+library.add(
+  faArrowDown,
+  faArrowLeft,
+  faArrowRight,
+  faArrowRotateBackward,
+  faArrowUpRightFromSquare,
+  faArrowUp,
+  faBan,
+  faBitcoinSign,
+  faBurst,
+  faCalendar,
+  faCamera,
+  faCameraRotate,
+  faCaretDown,
+  faChair,
+  faCheck,
+  faChevronDown,
+  faChevronLeft,
+  faChevronRight,
+  faChevronUp,
+  faCircle,
+  faCircleCheck,
+  faCircleInfo,
+  faCircleQuestion,
+  faCircleUser,
+  faClock,
+  faCoins,
+  faComment,
+  faCopy,
+  faDollar,
+  faEllipsis,
+  faEllipsisVertical,
+  faEnvelopeOpenText,
+  faEraser,
+  faEye,
+  faEyeSlash,
+  faFileContract,
+  faFileLines,
+  faFilter,
+  faFloppyDisk,
+  faFolderOpen,
+  faForward,
+  faGift,
+  faGlobe,
+  faHammer,
+  faHand,
+  faHandHoldingDollar,
+  faHandHoldingHeart,
+  faHouseChimney,
+  faImage,
+  faImagePortrait,
+  faLeftRight,
+  faLightbulb,
+  faLink,
+  faLocationDot,
+  faLongArrowAltLeft,
+  faLongArrowAltRight,
+  faMagnifyingGlass,
+  faMessage,
+  faMinus,
+  faPen,
+  faPersonCircleCheck,
+  faPersonCircleQuestion,
+  faPlus,
+  faQrcode,
+  faQuestion,
+  faRotate,
+  faRightFromBracket,
+  faShareNodes,
+  faSpinner,
+  faSquare,
+  faSquareCaretDown,
+  faSquareCaretUp,
+  faSquarePlus,
+  faTrashCan,
+  faTriangleExclamation,
+  faUser,
+  faUsers,
+  faXmark,
+);
+
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import Camera from "simple-vue-camera";
+import { logger } from "./utils/logger";
+
+// Can trigger this with a 'throw' inside some top-level function, eg. on the HomeView
+function setupGlobalErrorHandler(app: VueApp) {
+  // @ts-expect-error 'cause we cannot see why config is not defined
+  app.config.errorHandler = (
+    err: Error,
+    instance: ComponentPublicInstance | null,
+    info: string,
+  ) => {
+    logger.error(
+      "Ouch! Global Error Handler.",
+      "Error:",
+      err,
+      "- Error toString:",
+      err.toString(),
+      "- Info:",
+      info,
+      "- Instance:",
+      instance,
+    );
+    // Want to show a nice notiwind notification but can't figure out how.
+    alert(
+      (err.message || "Something bad happened") +
+        " - Try reloading or restarting the app.",
+    );
+  };
+}
+
+const app = createApp(App)
+  .component("fa", FontAwesomeIcon)
+  .component("camera", Camera)
+  .use(createPinia())
+  .use(VueAxios, axios)
+  .use(router)
+  .use(Notifications);
+
+setupGlobalErrorHandler(app);
+
+app.mount("#app");

src/main.web.ts

@@ -1,37 +1,5 @@
-import { initBackend } from "absurd-sql/dist/indexeddb-main-thread";
 import { initializeApp } from "./main.common";
-import { logger } from "./utils/logger";
+import "./registerServiceWorker"; // Web PWA support
-
-const platform = process.env.VITE_PLATFORM;
-const pwa_enabled = process.env.VITE_PWA_ENABLED === "true";
-
-logger.error("[Web] PWA enabled", { pwa_enabled });
-logger.error("[Web] Platform", { platform });
-
-// Only import service worker for web builds
-if (platform !== "electron" && pwa_enabled) {
-  import("./registerServiceWorker"); // Web PWA support
-}
 
 const app = initializeApp();
-
-function sqlInit() {
-  // see https://github.com/jlongster/absurd-sql
-  const worker = new Worker(
-    new URL("./registerSQLWorker.js", import.meta.url),
-    {
-      type: "module",
-    },
-  );
-  // This is only required because Safari doesn't support nested
-  // workers. This installs a handler that will proxy creating web
-  // workers through the main thread
-  initBackend(worker);
-}
-if (platform === "web" || platform === "development") {
-  sqlInit();
-} else {
-  logger.info("[Web] SQL not initialized for platform", { platform });
-}
-
 app.mount("#app");

src/registerSQLWorker.js

@@ -1,6 +0,0 @@
-import databaseService from "./services/AbsurdSqlDatabaseService";
-
-async function run() {
-  await databaseService.initialize();
-}
-run();

src/registerServiceWorker.ts

@@ -2,18 +2,8 @@
 
 import { register } from "register-service-worker";
 
-// Check if we're in an Electron environment
+// Only register service worker if explicitly enabled and in production
-const isElectron =
-  process.env.VITE_PLATFORM === "electron" ||
-  process.env.VITE_DISABLE_PWA === "true" ||
-  window.navigator.userAgent.toLowerCase().includes("electron");
-
-// Only register service worker if:
-// 1. Not in Electron
-// 2. PWA is explicitly enabled
-// 3. In production mode
 if (
-  !isElectron &&
   process.env.VITE_PWA_ENABLED === "true" &&
   process.env.NODE_ENV === "production"
 ) {
@@ -44,12 +34,6 @@ if (
   });
 } else {
   console.log(
-    `Service worker registration skipped - ${
+    "Service worker registration skipped - not enabled or not in production",
-      isElectron
-        ? "running in Electron"
-        : process.env.VITE_PWA_ENABLED !== "true"
-          ? "PWA not enabled"
-          : "not in production mode"
-    }`,
   );
 }

src/router/index.ts

@@ -2,11 +2,35 @@ import {
   createRouter,
   createWebHistory,
   createMemoryHistory,
+  NavigationGuardNext,
   RouteLocationNormalized,
   RouteRecordRaw,
 } from "vue-router";
+import { accountsDBPromise } from "../db/index";
 import { logger } from "../utils/logger";
 
+/**
+ *
+ * @param to :RouteLocationNormalized
+ * @param from :RouteLocationNormalized
+ * @param next :NavigationGuardNext
+ */
+const enterOrStart = async (
+  to: RouteLocationNormalized,
+  from: RouteLocationNormalized,
+  next: NavigationGuardNext,
+) => {
+  // one of the few times we use accountsDBPromise directly; try to avoid more usage
+  const accountsDB = await accountsDBPromise;
+  const num_accounts = await accountsDB.accounts.count();
+
+  if (num_accounts > 0) {
+    next();
+  } else {
+    next({ name: "start" });
+  }
+};
+
 const routes: Array<RouteRecordRaw> = [
   {
     path: "/account",
@@ -192,6 +216,7 @@ const routes: Array<RouteRecordRaw> = [
     path: "/projects",
     name: "projects",
     component: () => import("../views/ProjectsView.vue"),
+    beforeEnter: enterOrStart,
   },
   {
     path: "/quick-action-bvc",
@@ -277,31 +302,18 @@ const initialPath = isElectron
   ? window.location.pathname.split("/dist-electron/www/")[1] || "/"
   : window.location.pathname;
 
-logger.info("[Router] Initializing router", { isElectron, initialPath });
-
 const history = isElectron
   ? createMemoryHistory() // Memory history for Electron
   : createWebHistory("/"); // Add base path for web apps
 
+/** @type {*} */
 const router = createRouter({
   history,
   routes,
 });
 
-// Set initial route
-router.beforeEach((to, from, next) => {
-  logger.info("[Router] Navigation", { to: to.path, from: from.path });
-  next();
-});
-
 // Replace initial URL to start at `/` if necessary
-if (initialPath === "/" || !initialPath) {
+router.replace(initialPath || "/");
-  logger.info("[Router] Setting initial route to /");
-  router.replace("/");
-} else {
-  logger.info("[Router] Setting initial route to", initialPath);
-  router.replace(initialPath);
-}
 
 const errorHandler = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/services/AbsurdSqlDatabaseService.d.ts

@@ -1,29 +0,0 @@
-import { DatabaseService } from "../interfaces/database";
-
-declare module "@jlongster/sql.js" {
-  interface SQL {
-    Database: unknown;
-    FS: unknown;
-    register_for_idb: (fs: unknown) => void;
-  }
-
-  function initSqlJs(config: {
-    locateFile: (file: string) => string;
-  }): Promise<SQL>;
-  export default initSqlJs;
-}
-
-declare module "absurd-sql" {
-  export class SQLiteFS {
-    constructor(fs: unknown, backend: unknown);
-  }
-}
-
-declare module "absurd-sql/dist/indexeddb-backend" {
-  export default class IndexedDBBackend {
-    constructor();
-  }
-}
-
-declare const databaseService: DatabaseService;
-export default databaseService;

src/services/AbsurdSqlDatabaseService.ts

@@ -1,243 +0,0 @@
-import initSqlJs from "@jlongster/sql.js";
-import { SQLiteFS } from "absurd-sql";
-import IndexedDBBackend from "absurd-sql/dist/indexeddb-backend";
-
-import { runMigrations } from "../db-sql/migration";
-import type { DatabaseService, QueryExecResult } from "../interfaces/database";
-import { logger } from "@/utils/logger";
-
-interface QueuedOperation {
-  type: "run" | "query" | "getOneRow" | "getAll";
-  sql: string;
-  params: unknown[];
-  resolve: (value: unknown) => void;
-  reject: (reason: unknown) => void;
-}
-
-interface AbsurdSqlDatabase {
-  exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
-  run: (
-    sql: string,
-    params?: unknown[],
-  ) => Promise<{ changes: number; lastId?: number }>;
-}
-
-class AbsurdSqlDatabaseService implements DatabaseService {
-  private static instance: AbsurdSqlDatabaseService | null = null;
-  private db: AbsurdSqlDatabase | null;
-  private initialized: boolean;
-  private initializationPromise: Promise<void> | null = null;
-  private operationQueue: Array<QueuedOperation> = [];
-  private isProcessingQueue: boolean = false;
-
-  private constructor() {
-    this.db = null;
-    this.initialized = false;
-  }
-
-  static getInstance(): AbsurdSqlDatabaseService {
-    if (!AbsurdSqlDatabaseService.instance) {
-      AbsurdSqlDatabaseService.instance = new AbsurdSqlDatabaseService();
-    }
-    return AbsurdSqlDatabaseService.instance;
-  }
-
-  async initialize(): Promise<void> {
-    // If already initialized, return immediately
-    if (this.initialized) {
-      return;
-    }
-
-    // If initialization is in progress, wait for it
-    if (this.initializationPromise) {
-      return this.initializationPromise;
-    }
-
-    // Start initialization
-    this.initializationPromise = this._initialize();
-    try {
-      await this.initializationPromise;
-    } catch (error) {
-      logger.error(`AbsurdSqlDatabaseService initialize method failed:`, error);
-      this.initializationPromise = null; // Reset on failure
-      throw error;
-    }
-  }
-
-  private async _initialize(): Promise<void> {
-    if (this.initialized) {
-      return;
-    }
-
-    const SQL = await initSqlJs({
-      locateFile: (file: string) => {
-        return new URL(
-          `/node_modules/@jlongster/sql.js/dist/${file}`,
-          import.meta.url,
-        ).href;
-      },
-    });
-
-    const sqlFS = new SQLiteFS(SQL.FS, new IndexedDBBackend());
-    SQL.register_for_idb(sqlFS);
-
-    SQL.FS.mkdir("/sql");
-    SQL.FS.mount(sqlFS, {}, "/sql");
-
-    const path = "/sql/timesafari.absurd-sql";
-    if (typeof SharedArrayBuffer === "undefined") {
-      const stream = SQL.FS.open(path, "a+");
-      await stream.node.contents.readIfFallback();
-      SQL.FS.close(stream);
-    }
-
-    this.db = new SQL.Database(path, { filename: true });
-    if (!this.db) {
-      throw new Error(
-        "The database initialization failed. We recommend you restart or reinstall.",
-      );
-    }
-
-    // An error is thrown without this pragma: "File has invalid page size. (the first block of a new file must be written first)"
-    await this.db.exec(`PRAGMA journal_mode=MEMORY;`);
-    const sqlExec = this.db.exec.bind(this.db);
-
-    // Run migrations
-    await runMigrations(sqlExec);
-
-    this.initialized = true;
-
-    // Start processing the queue after initialization
-    this.processQueue();
-  }
-
-  private async processQueue(): Promise<void> {
-    if (this.isProcessingQueue || !this.initialized || !this.db) {
-      return;
-    }
-
-    this.isProcessingQueue = true;
-
-    while (this.operationQueue.length > 0) {
-      const operation = this.operationQueue.shift();
-      if (!operation) continue;
-
-      try {
-        let queryResult: QueryExecResult[] = [];
-        let result: unknown;
-        switch (operation.type) {
-          case "run":
-            result = await this.db.run(operation.sql, operation.params);
-            break;
-          case "query":
-            result = await this.db.exec(operation.sql, operation.params);
-            break;
-          case "getOneRow":
-            queryResult = await this.db.exec(operation.sql, operation.params);
-            result = queryResult[0]?.values[0];
-            break;
-          case "getAll":
-            queryResult = await this.db.exec(operation.sql, operation.params);
-            result = queryResult[0]?.values || [];
-            break;
-        }
-        operation.resolve(result);
-      } catch (error) {
-        logger.error(
-          "Error while processing SQL queue:",
-          error,
-          " ... for sql:",
-          operation.sql,
-          " ... with params:",
-          operation.params,
-        );
-        operation.reject(error);
-      }
-    }
-
-    this.isProcessingQueue = false;
-  }
-
-  private async queueOperation<R>(
-    type: QueuedOperation["type"],
-    sql: string,
-    params: unknown[] = [],
-  ): Promise<R> {
-    return new Promise<R>((resolve, reject) => {
-      const operation: QueuedOperation = {
-        type,
-        sql,
-        params,
-        resolve: (value: unknown) => resolve(value as R),
-        reject,
-      };
-      this.operationQueue.push(operation);
-
-      // If we're already initialized, start processing the queue
-      if (this.initialized && this.db) {
-        this.processQueue();
-      }
-    });
-  }
-
-  private async waitForInitialization(): Promise<void> {
-    // If we have an initialization promise, wait for it
-    if (this.initializationPromise) {
-      await this.initializationPromise;
-      return;
-    }
-
-    // If not initialized and no promise, start initialization
-    if (!this.initialized) {
-      await this.initialize();
-      return;
-    }
-
-    // If initialized but no db, something went wrong
-    if (!this.db) {
-      logger.error(
-        `Database not properly initialized after await waitForInitialization() - initialized flag is true but db is null`,
-      );
-      throw new Error(
-        `The database could not be initialized. We recommend you restart or reinstall.`,
-      );
-    }
-  }
-
-  // Used for inserts, updates, and deletes
-  async run(
-    sql: string,
-    params: unknown[] = [],
-  ): Promise<{ changes: number; lastId?: number }> {
-    await this.waitForInitialization();
-    return this.queueOperation<{ changes: number; lastId?: number }>(
-      "run",
-      sql,
-      params,
-    );
-  }
-
-  // Note that the resulting array may be empty if there are no results from the query
-  async query(sql: string, params: unknown[] = []): Promise<QueryExecResult[]> {
-    await this.waitForInitialization();
-    return this.queueOperation<QueryExecResult[]>("query", sql, params);
-  }
-
-  async getOneRow(
-    sql: string,
-    params: unknown[] = [],
-  ): Promise<unknown[] | undefined> {
-    await this.waitForInitialization();
-    return this.queueOperation<unknown[] | undefined>("getOneRow", sql, params);
-  }
-
-  async getAll(sql: string, params: unknown[] = []): Promise<unknown[][]> {
-    await this.waitForInitialization();
-    return this.queueOperation<unknown[][]>("getAll", sql, params);
-  }
-}
-
-// Create a singleton instance
-const databaseService = AbsurdSqlDatabaseService.getInstance();
-
-export default databaseService;

src/services/PlatformService.ts

@@ -1,13 +1,3 @@
-import { QueryExecResult } from "@/interfaces/database";
-
-/**
- * Query execution result interface
- */
-export interface QueryExecResult<T = unknown> {
-  columns: string[];
-  values: T[];
-}
-
 /**
  * Represents the result of an image capture or selection operation.
  * Contains both the image data as a Blob and the associated filename.
@@ -108,26 +98,4 @@ export interface PlatformService {
    * @returns Promise that resolves when the deep link has been handled
    */
   handleDeepLink(url: string): Promise<void>;
-
-  /**
-   * Execute a database query and return the results
-   * @param sql SQL query to execute
-   * @param params Query parameters
-   * @returns Query results with columns and values
-   */
-  dbQuery<T = unknown>(
-    sql: string,
-    params?: unknown[],
-  ): Promise<QueryExecResult<T>>;
-
-  /**
-   * Executes a create/update/delete on the database.
-   * @param sql - The SQL statement to execute
-   * @param params - The parameters to pass to the statement
-   * @returns Promise resolving to the result of the statement
-   */
-  dbExec(
-    sql: string,
-    params?: unknown[],
-  ): Promise<{ changes: number; lastId?: number }>;
 }

src/services/QRScanner/CapacitorQRScanner.ts

@@ -4,13 +4,7 @@ import {
   StartScanOptions,
   LensFacing,
 } from "@capacitor-mlkit/barcode-scanning";
-import {
+import { QRScannerService, ScanListener, QRScannerOptions } from "./types";
-  QRScannerService,
-  ScanListener,
-  QRScannerOptions,
-  CameraStateListener,
-  CameraState,
-} from "./types";
 import { logger } from "@/utils/logger";
 
 export class CapacitorQRScanner implements QRScannerService {
@@ -18,9 +12,6 @@ export class CapacitorQRScanner implements QRScannerService {
   private isScanning = false;
   private listenerHandles: Array<() => Promise<void>> = [];
   private cleanupPromise: Promise<void> | null = null;
-  private cameraStateListeners: Set<CameraStateListener> = new Set();
-  private currentState: CameraState = "off";
-  private currentStateMessage?: string;
 
   async checkPermissions(): Promise<boolean> {
     try {
@@ -88,11 +79,8 @@ export class CapacitorQRScanner implements QRScannerService {
     }
 
     try {
-      this.updateCameraState("initializing", "Starting camera...");
-
       // Ensure we have permissions before starting
       if (!(await this.checkPermissions())) {
-        this.updateCameraState("permission_denied", "Camera permission denied");
         logger.debug("Requesting camera permissions");
         const granted = await this.requestPermissions();
         if (!granted) {
@@ -102,16 +90,11 @@ export class CapacitorQRScanner implements QRScannerService {
 
       // Check if scanning is supported
       if (!(await this.isSupported())) {
-        this.updateCameraState(
-          "error",
-          "QR scanning not supported on this device",
-        );
         throw new Error("QR scanning not supported on this device");
       }
 
       logger.info("Starting MLKit scanner");
       this.isScanning = true;
-      this.updateCameraState("active", "Camera is active");
 
       const scanOptions: StartScanOptions = {
         formats: [BarcodeFormat.QrCode],
@@ -143,7 +126,6 @@ export class CapacitorQRScanner implements QRScannerService {
         stack: wrappedError.stack,
       });
       this.isScanning = false;
-      this.updateCameraState("error", wrappedError.message);
       await this.cleanup();
       this.scanListener?.onError?.(wrappedError);
       throw wrappedError;
@@ -158,7 +140,6 @@ export class CapacitorQRScanner implements QRScannerService {
 
     try {
       logger.debug("Stopping QR scanner");
-      this.updateCameraState("off", "Camera stopped");
       await BarcodeScanner.stopScan();
       logger.info("QR scanner stopped successfully");
     } catch (error) {
@@ -168,7 +149,6 @@ export class CapacitorQRScanner implements QRScannerService {
         error: wrappedError.message,
         stack: wrappedError.stack,
       });
-      this.updateCameraState("error", wrappedError.message);
       this.scanListener?.onError?.(wrappedError);
       throw wrappedError;
     } finally {
@@ -227,23 +207,4 @@ export class CapacitorQRScanner implements QRScannerService {
     // No-op for native scanner
     callback(null);
   }
-
-  addCameraStateListener(listener: CameraStateListener): void {
-    this.cameraStateListeners.add(listener);
-    // Immediately notify the new listener of current state
-    listener.onStateChange(this.currentState, this.currentStateMessage);
-  }
-
-  removeCameraStateListener(listener: CameraStateListener): void {
-    this.cameraStateListeners.delete(listener);
-  }
-
-  private updateCameraState(state: CameraState, message?: string): void {
-    this.currentState = state;
-    this.currentStateMessage = message;
-    // Notify all listeners of state change
-    for (const listener of this.cameraStateListeners) {
-      listener.onStateChange(state, message);
-    }
-  }
 }