feat: reopen() and parseOpenV2Flag() utils #7

Author: subframe7536

playground/src/worker.ts

@@ -1,6 +1,6 @@
 import { uuidv7 } from 'uuidv7'
 import url from '../../dist/wa-sqlite.wasm?url'
-import { customFunction, initSQLite, isOpfsSupported, iterator, withExistDB } from '../../src'
+import { customFunction, initSQLite, isOpfsSupported, withExistDB } from '../../src'
 import { useOpfsStorage } from '../../src/vfs/opfs'
 import { runIterator, runSQLStream } from './runSQL'
 
@@ -22,8 +22,9 @@ onmessage = async ({ data }) => {
  // await db.sync(data)
  // }
  await runSQLStream(db.run, db.stream, data => postMessage(data))
+ console.log(db.lastInsertRowId(), db.changes(), db.sqliteModule._sqlite3_changes64(db.pointer))
  await runIterator(db)
- console.log(db.lastInsertRowId(), db.changes())
+ console.log(db.lastInsertRowId(), db.changes(), db.sqliteModule._sqlite3_changes64(db.pointer))
  customFunction(db.sqlite, db.pointer, 'uuidv7', () => uuidv7())
  console.log(
  'uuidv7():',

src/core.ts

@@ -1,12 +1,7 @@
 import type { InitSQLiteOptions, Promisable, SQLiteDB, SQLiteDBCore } from './types'
-import {
- Factory,
- SQLITE_OPEN_CREATE,
- SQLITE_OPEN_READONLY,
- SQLITE_OPEN_READWRITE,
-} from 'wa-sqlite'
+import { Factory } from 'wa-sqlite'
 import { exportDatabase, importDatabase } from './io'
-import { changes, close, lastInsertRowId, run, stream } from './utils'
+import { changes, close, lastInsertRowId, parseOpenV2Flag, run, stream } from './utils'
 
 /**
  * Load SQLite database, presets:
@@ -48,7 +43,7 @@ export async function initSQLiteCore(
  await beforeOpen?.(vfs, path)
  const pointer = await sqlite.open_v2(
  path,
- readonly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
+ parseOpenV2Flag(readonly),
  )
  /// keep-sorted
  return {

src/types/index.ts

@@ -98,7 +98,7 @@ export type SQLiteDBCore = {
 
 export type SQLiteDB = SQLiteDBCore & {
  /**
- * Close db
+ * Close db. Throw error if fail to close
  */
  close: () => Promise<void>
  /**

src/utils.ts

@@ -1,5 +1,13 @@
 import type { BaseStorageOptions, SQLiteDBCore } from './types'
-import { SQLITE_DETERMINISTIC, SQLITE_DIRECTONLY, SQLITE_OK, SQLITE_UTF8 } from 'wa-sqlite'
+import {
+ SQLITE_DETERMINISTIC,
+ SQLITE_DIRECTONLY,
+ SQLITE_OK,
+ SQLITE_OPEN_CREATE,
+ SQLITE_OPEN_READONLY,
+ SQLITE_OPEN_READWRITE,
+ SQLITE_UTF8,
+} from 'wa-sqlite'
 import { SQLITE_ROW } from 'wa-sqlite/src/sqlite-constants.js'
 import { importDatabase } from './io'
 
@@ -181,7 +189,6 @@ export function withExistDB<T extends BaseStorageOptions>(
 
 export async function close(core: SQLiteDBCore): Promise<void> {
  await core.sqlite.close(core.pointer)
- await core.vfs.close()
 }
 
 export function changes(core: SQLiteDBCore): number | bigint {
@@ -259,3 +266,13 @@ export async function* iterator(
  }
  cache = undefined!
 }
+
+export function parseOpenV2Flag(readonly?: boolean): number {
+ return readonly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
+}
+
+export async function reopen(core: SQLiteDBCore, readonly?: boolean): Promise<void> {
+ await close(core)
+ const newPointer = await core.sqlite.open_v2(core.path, parseOpenV2Flag(readonly))
+ core.pointer = newPointer
+}