expo-sqlite 58.0.11 → 58.0.13

package/web/wa-sqlite/sqlite-api.js

@@ -300,7 +300,10 @@ export function Factory(Module) {
     return async function (db) {
       verifyDatabase(db);
       const result = await f(db);
-      databases.delete(db);
+      // expo-sqlite: SQLite keeps the connection open when close fails, so keep it usable for a retry.
+      if (result === SQLite.SQLITE_OK) {
+        databases.delete(db);
+      }
       return check(fname, result, db);
     };
   })();

package/web/web.types.ts

@@ -8,6 +8,7 @@ import {
   type SQLiteColumnNames,
   type SQLiteColumnValues,
 } from '../src/NativeStatement';
+import { type SQLiteWebOptions } from '../src/WebConfiguration';
 import { type SQLAction } from './SQLAction';
 
 export interface SyncWorkerMessage {
@@ -250,6 +251,11 @@ type SessionInvertChangesetMessage = BaseWorkerMessage & {
   };
 };
 
+export interface ConfigureWorkerMessage {
+  type: 'configure';
+  data: SQLiteWebOptions;
+}
+
 //#endregion Request messages
 
 //#region Response messages

package/web/worker.ts

@@ -4,6 +4,7 @@
 
 import { type Changeset } from '../src/NativeSession';
 import { type SQLiteColumnNames, type SQLiteColumnValues } from '../src/NativeStatement';
+import { type SQLiteWebOptions } from '../src/WebConfiguration';
 import { createSQLAction } from './SQLAction';
 import { SQLiteOptions } from './SQLiteOptions';
 import { sendWorkerResult } from './WorkerChannel';
@@ -21,6 +22,7 @@ import WaSQLiteFactory from './wa-sqlite/wa-sqlite';
 // @ts-expect-error wasm module is not typed
 import wasmModule from './wa-sqlite/wa-sqlite.wasm';
 import {
+  type ConfigureWorkerMessage,
   type SQLiteWorkerMessage,
   type SQLiteWorkerMessageType,
   type MessageTypeMap,
@@ -40,6 +42,7 @@ interface DatabaseEntity {
 }
 interface StatementEntity {
   pointer: StatementPointer;
+  databasePointer: DatabasePointer;
 }
 interface SessionEntity {
   pointer: SessionPointer;
@@ -54,6 +57,7 @@ const MIN_INT32 = -0x80000000;
 let _sqlite3: SQLiteAPI | null = null;
 let _vfs: AccessHandlePoolVFS | null = null;
 let _vfsMemory: MemoryVFS | null = null;
+let _webOptions: SQLiteWebOptions = {};
 
 const databaseIdMap = new Map<number, DatabaseEntity>();
 const statementIdMap = new Map<number, StatementEntity>();
@@ -61,7 +65,12 @@ const sessionIdMap = new Map<number, SessionEntity>();
 
 class SQLiteErrorException extends Error {}
 
-self.onmessage = async (event: MessageEvent<SQLiteWorkerMessage>) => {
+self.onmessage = async (event: MessageEvent<SQLiteWorkerMessage | ConfigureWorkerMessage>) => {
+  if (event.data.type === 'configure') {
+    _webOptions = event.data.data;
+    return;
+  }
+
   let result: ResultType | null = null;
   let error: Error | null = null;
   try {
@@ -118,7 +127,7 @@ async function handleMessageImpl<T extends SQLiteWorkerMessageType>({
     }
 
     case 'finalize': {
-      await finalize(data.nativeDatabaseId, data.nativeStatementId);
+      await finalize(data.nativeStatementId);
       break;
     }
 
@@ -253,12 +262,20 @@ async function backupDatabase(
 }
 
 async function closeDatabase(nativeDatabaseId: number) {
-  maybeFinalizeAllStatements(nativeDatabaseId);
   const { sqlite3 } = await maybeInitAsync();
   const dbEntity = databaseIdMap.get(nativeDatabaseId);
-  if (dbEntity) {
-    databaseIdMap.delete(nativeDatabaseId);
+  if (!dbEntity) throw new Error(`Database not found - nativeDatabaseId[${nativeDatabaseId}]`);
+
+  databaseIdMap.delete(nativeDatabaseId);
+  if ([...databaseIdMap.values()].includes(dbEntity)) {
+    return;
+  }
+  try {
+    await maybeFinalizeAllStatements(sqlite3, dbEntity);
     await sqlite3.close(dbEntity.pointer);
+  } catch (e) {
+    databaseIdMap.set(nativeDatabaseId, dbEntity);
+    throw e;
   }
 }
 
@@ -289,10 +306,9 @@ async function exec(nativeDatabaseId: number, source: string) {
   await sqlite3.exec(dbEntity.pointer, source);
 }
 
-async function finalize(nativeDatabaseId: number, nativeStatementId: number): Promise<void> {
+// A closed handle to a shared connection may still own statements, so don't require its id here.
+async function finalize(nativeStatementId: number): Promise<void> {
   const { sqlite3 } = await maybeInitAsync();
-  const dbEntity = databaseIdMap.get(nativeDatabaseId);
-  if (!dbEntity) throw new Error(`Database not found - nativeDatabaseId[${nativeDatabaseId}]`);
   const stmt = statementIdMap.get(nativeStatementId);
   if (!stmt) throw new Error(`Statement not found - nativeStatementId[${nativeStatementId}]`);
 
@@ -429,7 +445,10 @@ async function prepare(
   const { value: statementPointer } = await asyncIterator.next();
   asyncIterator.return?.();
   if (!statementPointer) throw new Error('Failed to prepare statement');
-  statementIdMap.set(nativeStatementId, { pointer: statementPointer });
+  statementIdMap.set(nativeStatementId, {
+    pointer: statementPointer,
+    databasePointer: dbEntity.pointer,
+  });
 }
 
 async function run(
@@ -736,40 +755,21 @@ async function initDb(sqlite3: SQLiteAPI, dbEntity: DatabaseEntity) {
   }
 }
 
-async function maybeFinalizeAllStatements(nativeDatabaseId: number) {
-  const { sqlite3 } = await maybeInitAsync();
-  const dbEntity = databaseIdMap.get(nativeDatabaseId);
-  if (!dbEntity) throw new Error(`Database not found - nativeDatabaseId[${nativeDatabaseId}]`);
+async function maybeFinalizeAllStatements(sqlite3: SQLiteAPI, dbEntity: DatabaseEntity) {
   if (!dbEntity.openOptions.finalizeUnusedStatementsBeforeClosing) {
     return;
   }
 
-  let error: Error | null = null;
-  const finalizedStatements: StatementPointer[] = [];
-  let stmt: StatementPointer | null = sqlite3.next_stmt(dbEntity.pointer, null);
-  while (stmt != null && stmt !== 0) {
-    const nextStmt: StatementPointer = sqlite3.next_stmt(dbEntity.pointer, stmt);
-    try {
-      sqlite3.finalize(stmt);
-      finalizedStatements.push(stmt);
-    } catch (e) {
-      error = e;
-    }
-    stmt = nextStmt;
-  }
-
-  // Delete finalized statements from the map
-  const statementsToDelete: number[] = [];
   for (const [nativeStatementId, stmtEntity] of statementIdMap.entries()) {
-    if (finalizedStatements.includes(stmtEntity.pointer)) {
-      statementsToDelete.push(nativeStatementId);
+    if (stmtEntity.databasePointer !== dbEntity.pointer) {
+      continue;
     }
-  }
-  for (const nativeStatementId of statementsToDelete) {
     statementIdMap.delete(nativeStatementId);
+    const result = await sqlite3.finalize(stmtEntity.pointer);
+    if (result !== SQLITE_OK) {
+      console.warn(`Finalizing a statement during close failed - error code[${result}]`);
+    }
   }
-
-  if (error) throw error;
 }
 
 async function maybeInitAsync(): Promise<{
@@ -778,9 +778,7 @@ async function maybeInitAsync(): Promise<{
   vfsMemory: MemoryVFS;
 }> {
   if (!_sqlite3) {
-    const module = await WaSQLiteFactory({
-      locateFile: () => wasmModule,
-    });
+    const module = await loadWaSQLiteModuleAsync();
     _sqlite3 = SQLite.Factory(module) as SQLiteAPI;
     if (!_sqlite3) {
       throw new Error('Failed to initialize wa-sqlite');
@@ -808,4 +806,18 @@ async function maybeInitAsync(): Promise<{
   return { sqlite3: _sqlite3, vfs: _vfs, vfsMemory: _vfsMemory };
 }
 
+async function loadWaSQLiteModuleAsync(): Promise<any> {
+  const { wasmURL } = _webOptions;
+  try {
+    return await WaSQLiteFactory({ locateFile: () => wasmURL ?? wasmModule });
+  } catch (e) {
+    if (wasmURL == null) throw e;
+    throw new Error(
+      `Failed to load the SQLite WebAssembly module from "${wasmURL}". ` +
+        'Check that the `wasmURL` passed to `configureWeb()` is reachable and built from the `expo/wa-sqlite` revision that this `expo-sqlite` uses. ' +
+        `Cause: ${e instanceof Error ? e.message : String(e)}`
+    );
+  }
+}
+
 //#endregion Internal helpers

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.aar.md5

@@ -1 +0,0 @@
-91c6e3c5043af7233d9dc78dccd8b0a9

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.aar.sha1

@@ -1 +0,0 @@
-63ce3f0e1b020dae031364283a1159bcdd8be178

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.aar.sha256

@@ -1 +0,0 @@
-0832753b21e57b16e425e77702b1f0fdcb2cf1a6614c5a5bc0721f92bf3fb60c

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.aar.sha512

@@ -1 +0,0 @@
-fe5e05c035e8a3b493952282f2a26f117cf856664daf52600e32e532e1767da7a0636626289a4a99fcd50afabbe4f558d8015e0a2df8f4ced1b5eaeea59e216a

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.module.md5

@@ -1 +0,0 @@
-762c7133979a05af5a3417e88953e89a

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.module.sha1

@@ -1 +0,0 @@
-56572a8f420ce6940cbca275c77b3a8f92900dad

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.module.sha256

@@ -1 +0,0 @@
-376b11b9a3ff1e4b56b41ccdcdb5879e2b85b5d80806f288f895cecb36f5a74c

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.module.sha512

@@ -1 +0,0 @@
-5180af07e56734ca90b61f172c2984a788ec4f60db8389a550994c5b3d72a2dc3de085a1c098cc21c93cb9c93fac644e95c288054b682bfb213c3e49352e7f93

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.pom.md5

@@ -1 +0,0 @@
-776df96a837a75ba32e6d4be6afc81d3

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.pom.sha1

@@ -1 +0,0 @@
-43e553b1f0fc48e936991fbe4dc08dd54ddb3909

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.pom.sha256

@@ -1 +0,0 @@
-3ed8156bef90899add45b91bb45d8375b5f4685653a9904414a34e9d8b258129

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.11/expo.modules.sqlite-58.0.11.pom.sha512

@@ -1 +0,0 @@
-a0b811afaadb78812cebc329aa2e4fc34ee2accf893d43ea4babfd594f2fd02b620cbca73361289ffda1fe8186cce5af2b5ae0227d69d3c1cf9ef04cc9cbb698