@livestore/sqlite-wasm 0.0.0-snapshot-9507e455a5c1ff8ca4b9414bde007fe51bb2bcd0 → 0.0.0-snapshot-9a455c26eafff7fa10c95dadbab62f61092aceaa

package/dist/browser/opfs/index.js

@@ -8,7 +8,7 @@ export const makeOpfsDb = ({ sqlite3, directory, fileName, }) => Effect.gen(func
     const pathSegment = safePath.length === 0 ? '' : `-${safePath}`;
     const vfsName = `opfs${pathSegment}`;
     if (sqlite3.vfs_registered.has(vfsName) === false) {
-        const vfs = yield* AccessHandlePoolVFS.create(vfsName, directory, sqlite3.module);
+        const vfs = yield* Effect.promise(() => AccessHandlePoolVFS.create(vfsName, directory, sqlite3.module));
         sqlite3.vfs_register(vfs, false);
         opfsVfsMap.set(vfsName, vfs);
     }

package/dist/browser/opfs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/opfs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAyB,MAAM,yBAAyB,CAAA;AAGvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAC9D,MAAM,UAAU,GAAG,IAAI,GAAG,EAA+B,CAAA;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACzB,OAAO,EACP,SAAS,EACT,QAAQ,GAKT,EAAkG,EAAE,CACnG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,kDAAkD;IAClD,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,GAAG,CAAC,CAAA;IAC3D,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAA;IAC/D,MAAM,OAAO,GAAG,OAAO,WAAW,EAAE,CAAA;IAEpC,IAAI,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC;QAClD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAG,OAAe,CAAC,MAAM,CAAC,CAAA;QAE1F,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAChC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACnE,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAE,CAAA;IAEpC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,CAAA;AAC3B,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/opfs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAC9D,MAAM,UAAU,GAAG,IAAI,GAAG,EAA+B,CAAA;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACzB,OAAO,EACP,SAAS,EACT,QAAQ,GAKT,EAAE,EAAE,CACH,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,kDAAkD;IAClD,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,GAAG,CAAC,CAAA;IAC3D,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAA;IAC/D,MAAM,OAAO,GAAG,OAAO,WAAW,EAAE,CAAA;IAEpC,IAAI,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC;QAClD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAG,OAAe,CAAC,MAAM,CAAC,CAAC,CAAA;QAEhH,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAChC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACnE,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAE,CAAA;IAEpC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,CAAA;AAC3B,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA"}

package/dist/browser/opfs/opfs-sah-pool.d.ts

@@ -1,3 +1,3 @@
 export declare const HEADER_OFFSET_DATA = 4096;
-export declare const decodeAccessHandlePoolFilename: (file: File) => Promise<string>;
+export declare const decodeSAHPoolFilename: (file: File) => Promise<string>;
 //# sourceMappingURL=opfs-sah-pool.d.ts.map

package/dist/browser/opfs/opfs-sah-pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opfs-sah-pool.d.ts","sourceRoot":"","sources":["../../../src/browser/opfs/opfs-sah-pool.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,OAAc,CAAA;AAO7C,eAAO,MAAM,8BAA8B,GAAU,MAAM,IAAI,KAAG,OAAO,CAAC,MAAM,CA+B/E,CAAA"}
+{"version":3,"file":"opfs-sah-pool.d.ts","sourceRoot":"","sources":["../../../src/browser/opfs/opfs-sah-pool.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,OAAc,CAAA;AAO7C,eAAO,MAAM,qBAAqB,GAAU,MAAM,IAAI,KAAG,OAAO,CAAC,MAAM,CA+BtE,CAAA"}

package/dist/browser/opfs/opfs-sah-pool.js

@@ -9,7 +9,7 @@ const HEADER_OFFSET_DIGEST = HEADER_CORPUS_SIZE;
 export const HEADER_OFFSET_DATA = SECTOR_SIZE;
 const PERSISTENT_FILE_TYPES = VFS.SQLITE_OPEN_MAIN_DB | VFS.SQLITE_OPEN_MAIN_JOURNAL | VFS.SQLITE_OPEN_SUPER_JOURNAL | VFS.SQLITE_OPEN_WAL;
 const textDecoder = new TextDecoder();
-export const decodeAccessHandlePoolFilename = async (file) => {
+export const decodeSAHPoolFilename = async (file) => {
     // Read the path and digest of the path from the file.
     const corpus = new Uint8Array(await file.slice(0, HEADER_CORPUS_SIZE).arrayBuffer());
     // Delete files not expected to be present.

package/dist/browser/opfs/opfs-sah-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"opfs-sah-pool.js","sourceRoot":"","sources":["../../../src/browser/opfs/opfs-sah-pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"opfs-sah-pool.js","sourceRoot":"","sources":["../../../src/browser/opfs/opfs-sah-pool.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/sqlite-wasm",
-  "version": "0.0.0-snapshot-9507e455a5c1ff8ca4b9414bde007fe51bb2bcd0",
+  "version": "0.0.0-snapshot-9a455c26eafff7fa10c95dadbab62f61092aceaa",
   "type": "module",
   "exports": {
     ".": {
@@ -30,10 +30,10 @@
   },
   "dependencies": {
     "@cloudflare/workers-types": "4.20250923.0",
-    "@livestore/common": "0.0.0-snapshot-9507e455a5c1ff8ca4b9414bde007fe51bb2bcd0",
-    "@livestore/common-cf": "0.0.0-snapshot-9507e455a5c1ff8ca4b9414bde007fe51bb2bcd0",
-    "@livestore/utils": "0.0.0-snapshot-9507e455a5c1ff8ca4b9414bde007fe51bb2bcd0",
-    "@livestore/wa-sqlite": "0.0.0-snapshot-9507e455a5c1ff8ca4b9414bde007fe51bb2bcd0"
+    "@livestore/common": "0.0.0-snapshot-9a455c26eafff7fa10c95dadbab62f61092aceaa",
+    "@livestore/common-cf": "0.0.0-snapshot-9a455c26eafff7fa10c95dadbab62f61092aceaa",
+    "@livestore/utils": "0.0.0-snapshot-9a455c26eafff7fa10c95dadbab62f61092aceaa",
+    "@livestore/wa-sqlite": "0.0.0-snapshot-9a455c26eafff7fa10c95dadbab62f61092aceaa"
   },
   "devDependencies": {
     "@types/chrome": "0.1.4",

package/src/FacadeVFS.ts

@@ -1,9 +1,4 @@
 // Based on https://github.com/rhashimoto/wa-sqlite/blob/master/src/FacadeVFS.js
-//
-// This TypeScript version lives in @livestore/sqlite-wasm instead of @livestore/wa-sqlite because:
-// - @livestore/wa-sqlite is a direct wrapper of upstream wa-sqlite (kept as JavaScript for easier upstream sync)
-// - @livestore/sqlite-wasm is where we add TypeScript abstractions on top of wa-sqlite
-
 /** biome-ignore-all lint/complexity/useLiteralKeys: not needed for this file */
 /** biome-ignore-all lint/correctness/noUnusedFunctionParameters: not needed for this file */
 /** biome-ignore-all lint/complexity/noUselessConstructor: keep constructor for compatibility */

package/src/ambient.d.ts

@@ -0,0 +1,18 @@
+// https://developer.mozilla.org/en-US/docs/Web/API/FileSystemSyncAccessHandle
+interface FileSystemSyncAccessHandle {
+  close: () => void
+  flush: () => Promise<void>
+  getSize: () => number
+  read: (buffer: Uint8Array<ArrayBuffer> | Uint32Array, options?: FileSystemReadWriteOptions) => number
+  truncate: (newSize: number) => void
+  write: (buffer: Uint8Array<ArrayBuffer> | Uint32Array, options?: FileSystemReadWriteOptions) => number
+  seek: (offset: number) => void
+}
+
+interface FileSystemReadWriteOptions {
+  at?: number
+}
+
+interface FileSystemFileHandle {
+  createSyncAccessHandle: () => Promise<FileSystemSyncAccessHandle>
+}

package/src/browser/mod.ts

@@ -1,5 +1,5 @@
 import type { MakeSqliteDb, PersistenceInfo, SqliteDb } from '@livestore/common'
-import { Effect, Hash, type Opfs, type Scope } from '@livestore/utils/effect'
+import { Effect, Hash } from '@livestore/utils/effect'
 import type { SQLiteAPI } from '@livestore/wa-sqlite'
 import type { MemoryVFS } from '@livestore/wa-sqlite/src/examples/MemoryVFS.js'
 
@@ -10,11 +10,6 @@ import { makeOpfsDb } from './opfs/index.ts'
 
 export * from './opfs/opfs-sah-pool.ts'
 
-type WebDatabaseReq = {
-  dbPointer: number
-  persistenceInfo: PersistenceInfo
-}
-
 export type WebDatabaseMetadataInMemory = {
   _tag: 'in-memory'
   vfs: MemoryVFS
@@ -52,29 +47,18 @@ export type WebDatabaseInputOpfs = {
   configureDb?: (db: SqliteDb) => void
 }
 
-type MakeInMemoryWebDatabase = MakeSqliteDb<WebDatabaseReq, WebDatabaseInputInMemory, WebDatabaseMetadataInMemory>
+export type WebDatabaseInput = WebDatabaseInputInMemory | WebDatabaseInputOpfs
 
-type MakeOpfsWebDatabase = MakeSqliteDb<
-  WebDatabaseReq,
-  WebDatabaseInputOpfs,
-  WebDatabaseMetadataOpfs,
-  Opfs.Opfs | Scope.Scope
+export type MakeWebSqliteDb = MakeSqliteDb<
+  { dbPointer: number; persistenceInfo: PersistenceInfo },
+  WebDatabaseInput,
+  WebDatabaseMetadata
 >
 
-export function sqliteDbFactory({ sqlite3 }: { sqlite3: SQLiteAPI }) {
-  function makeDb(input: WebDatabaseInputInMemory): ReturnType<MakeInMemoryWebDatabase>
-  function makeDb(input: WebDatabaseInputOpfs): ReturnType<MakeOpfsWebDatabase>
-  function makeDb(
-    input: WebDatabaseInputInMemory | WebDatabaseInputOpfs,
-  ): ReturnType<
-    MakeSqliteDb<
-      WebDatabaseReq,
-      WebDatabaseInputInMemory | WebDatabaseInputOpfs,
-      WebDatabaseMetadata,
-      Opfs.Opfs | Scope.Scope
-    >
-  > {
-    return Effect.gen(function* () {
+export const sqliteDbFactory =
+  ({ sqlite3 }: { sqlite3: SQLiteAPI }): MakeWebSqliteDb =>
+  (input: WebDatabaseInput) =>
+    Effect.gen(function* () {
       if (input._tag === 'in-memory') {
         const { dbPointer, vfs } = makeInMemoryDb(sqlite3)
         return makeSqliteDb<WebDatabaseMetadataInMemory>({
@@ -89,7 +73,7 @@ export function sqliteDbFactory({ sqlite3 }: { sqlite3: SQLiteAPI }) {
               fileName: ':memory:',
             },
           },
-        })
+        }) as any
       }
 
       // TODO figure out the actual max length
@@ -126,9 +110,3 @@ export function sqliteDbFactory({ sqlite3 }: { sqlite3: SQLiteAPI }) {
         },
       })
     })
-  }
-
-  return makeDb
-}
-
-export type MakeWebSqliteDb = ReturnType<typeof sqliteDbFactory>

package/src/browser/opfs/AccessHandlePoolVFS.ts

@@ -1,5 +1,5 @@
+import { Effect, Schedule, Schema } from '@livestore/utils/effect'
 // Based on https://github.com/rhashimoto/wa-sqlite/blob/master/src/examples/AccessHandlePoolVFS.js
-import { Effect, Opfs, Runtime, Schedule, Schema, type Scope, Stream } from '@livestore/utils/effect'
 import * as VFS from '@livestore/wa-sqlite/src/VFS.js'
 import { FacadeVFS } from '../../FacadeVFS.ts'
 
@@ -62,9 +62,6 @@ export class AccessHandlePoolVFS extends FacadeVFS {
   #directoryPath
   #directoryHandle: FileSystemDirectoryHandle | undefined
 
-  // Runtime for executing Effect operations
-  readonly #runtime: Runtime.Runtime<Opfs.Opfs | Scope.Scope>
-
   // The OPFS files all have randomly-generated names that do not match
   // the SQLite files whose data they contain. This map links those names
   // with their respective OPFS access handles.
@@ -78,33 +75,17 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
   #mapIdToFile = new Map<number, { path: string; flags: number; accessHandle: FileSystemSyncAccessHandle }>()
 
-  static create = Effect.fn(function* (name: string, directoryPath: string, module: any) {
-    const runtime = yield* Effect.runtime<Opfs.Opfs | Scope.Scope>()
-    const vfs = new AccessHandlePoolVFS({ name, directoryPath, module, runtime })
-    yield* Effect.promise(() => vfs.isReady())
+  static async create(name: string, directoryPath: string, module: any) {
+    const vfs = new AccessHandlePoolVFS(name, directoryPath, module)
+    await vfs.isReady()
     return vfs
-  })
-
-  constructor({
-    name,
-    directoryPath,
-    module,
-    runtime,
-  }: { name: string; directoryPath: string; module: any; runtime: Runtime.Runtime<Opfs.Opfs | Scope.Scope> }) {
+  }
+
+  constructor(name: string, directoryPath: string, module: any) {
     super(name, module)
     this.#directoryPath = directoryPath
-    this.#runtime = runtime
   }
 
-  /**
-   * Get the OPFS file name that contains the data for the given SQLite file.
-   *
-   * @remarks
-   *
-   * This would be for one of the files in the pool managed by this VFS.
-   * It's not the same as the SQLite file name. It's a randomly-generated
-   * string that is not meaningful to the application.
-   */
   getOpfsFileName(zName: string) {
     const path = this.#getPath(zName)
     const accessHandle = this.#mapPathToAccessHandle.get(path)!
@@ -131,7 +112,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
       })
     }
 
-    const fileSize = Opfs.Opfs.syncGetSize(accessHandle).pipe(Runtime.runSync(this.#runtime))
+    const fileSize = accessHandle.getSize()
     if (fileSize <= HEADER_OFFSET_DATA) {
       throw new OpfsError({
         path,
@@ -143,9 +124,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
     const payloadSize = fileSize - HEADER_OFFSET_DATA
     const payload = new Uint8Array(payloadSize)
-    const bytesRead = Opfs.Opfs.syncRead(accessHandle, payload, { at: HEADER_OFFSET_DATA }).pipe(
-      Runtime.runSync(this.#runtime),
-    )
+    const bytesRead = accessHandle.read(payload, { at: HEADER_OFFSET_DATA })
     if (bytesRead !== payloadSize) {
       throw new OpfsError({
         path,
@@ -158,7 +137,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
   resetAccessHandle(zName: string) {
     const path = this.#getPath(zName)
     const accessHandle = this.#mapPathToAccessHandle.get(path)!
-    Opfs.Opfs.syncTruncate(accessHandle, HEADER_OFFSET_DATA).pipe(Runtime.runSync(this.#runtime))
+    accessHandle.truncate(HEADER_OFFSET_DATA)
     // accessHandle.write(new Uint8Array(), { at: HEADER_OFFSET_DATA })
     // accessHandle.flush()
   }
@@ -199,7 +178,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
   jClose(fileId: number): number {
     const file = this.#mapIdToFile.get(fileId)
     if (file) {
-      Opfs.Opfs.syncFlush(file.accessHandle).pipe(Runtime.runSync(this.#runtime))
+      file.accessHandle.flush()
       this.#mapIdToFile.delete(fileId)
       if (file.flags & VFS.SQLITE_OPEN_DELETEONCLOSE) {
         this.#deletePath(file.path)
@@ -210,9 +189,9 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
   jRead(fileId: number, pData: Uint8Array<ArrayBuffer>, iOffset: number): number {
     const file = this.#mapIdToFile.get(fileId)!
-    const nBytes = Opfs.Opfs.syncRead(file.accessHandle, pData.subarray(), {
+    const nBytes = file.accessHandle.read(pData.subarray(), {
       at: HEADER_OFFSET_DATA + iOffset,
-    }).pipe(Runtime.runSync(this.#runtime))
+    })
     if (nBytes < pData.byteLength) {
       pData.fill(0, nBytes, pData.byteLength)
       return VFS.SQLITE_IOERR_SHORT_READ
@@ -222,27 +201,27 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
   jWrite(fileId: number, pData: Uint8Array<ArrayBuffer>, iOffset: number): number {
     const file = this.#mapIdToFile.get(fileId)!
-    const nBytes = Opfs.Opfs.syncWrite(file.accessHandle, pData.subarray(), {
+    const nBytes = file.accessHandle.write(pData.subarray(), {
       at: HEADER_OFFSET_DATA + iOffset,
-    }).pipe(Runtime.runSync(this.#runtime))
+    })
     return nBytes === pData.byteLength ? VFS.SQLITE_OK : VFS.SQLITE_IOERR
   }
 
   jTruncate(fileId: number, iSize: number): number {
     const file = this.#mapIdToFile.get(fileId)!
-    Opfs.Opfs.syncTruncate(file.accessHandle, HEADER_OFFSET_DATA + iSize).pipe(Runtime.runSync(this.#runtime))
+    file.accessHandle.truncate(HEADER_OFFSET_DATA + iSize)
     return VFS.SQLITE_OK
   }
 
   jSync(fileId: number, _flags: number): number {
     const file = this.#mapIdToFile.get(fileId)!
-    Opfs.Opfs.syncFlush(file.accessHandle).pipe(Runtime.runSync(this.#runtime))
+    file.accessHandle.flush()
     return VFS.SQLITE_OK
   }
 
   jFileSize(fileId: number, pSize64: DataView): number {
     const file = this.#mapIdToFile.get(fileId)!
-    const size = Opfs.Opfs.syncGetSize(file.accessHandle).pipe(Runtime.runSync(this.#runtime)) - HEADER_OFFSET_DATA
+    const size = file.accessHandle.getSize() - HEADER_OFFSET_DATA
     pSize64.setBigInt64(0, BigInt(size), true)
     return VFS.SQLITE_OK
   }
@@ -267,16 +246,20 @@ export class AccessHandlePoolVFS extends FacadeVFS {
     return VFS.SQLITE_OK
   }
 
-  close() {
+  async close() {
     this.#releaseAccessHandles()
   }
 
   async isReady() {
     if (!this.#directoryHandle) {
       // All files are stored in a single directory.
-      this.#directoryHandle = await Opfs.getDirectoryHandleByPath(this.#directoryPath, { create: true }).pipe(
-        Runtime.runPromise(this.#runtime),
-      )
+      let handle = await navigator.storage.getDirectory()
+      for (const d of this.#directoryPath.split('/')) {
+        if (d) {
+          handle = await handle.getDirectoryHandle(d, { create: true })
+        }
+      }
+      this.#directoryHandle = handle
 
       await this.#acquireAccessHandles()
       if (this.getCapacity() === 0) {
@@ -316,12 +299,14 @@ export class AccessHandlePoolVFS extends FacadeVFS {
   async addCapacity(n: number): Promise<number> {
     for (let i = 0; i < n; ++i) {
       const name = Math.random().toString(36).replace('0.', '')
-      const accessHandle = await Opfs.Opfs.getFileHandle(this.#directoryHandle!, name, { create: true }).pipe(
-        Effect.andThen((handle) => Opfs.Opfs.createSyncAccessHandle(handle)),
-        Effect.mapError((error) => new OpfsError({ cause: error, path: name })),
-        Effect.retry(Schedule.exponentialBackoff10Sec),
-        Runtime.runPromise(this.#runtime),
-      )
+      const handle = await this.#directoryHandle!.getFileHandle(name, {
+        create: true,
+      })
+
+      const accessHandle = await Effect.tryPromise({
+        try: () => handle.createSyncAccessHandle(),
+        catch: (cause) => new OpfsError({ cause, path: name }),
+      }).pipe(Effect.retry(Schedule.exponentialBackoff10Sec), Effect.runPromise)
       this.#mapAccessHandleToName.set(accessHandle, name)
 
       this.#setAssociatedPath(accessHandle, '', 0)
@@ -341,7 +326,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
       const name = this.#mapAccessHandleToName.get(accessHandle)!
       accessHandle.close()
-      Opfs.Opfs.removeEntry(this.#directoryHandle!, name).pipe(Runtime.runPromise(this.#runtime))
+      await this.#directoryHandle!.removeEntry(name)
       this.#mapAccessHandleToName.delete(accessHandle)
       this.#availableAccessHandles.delete(accessHandle)
       ++nRemoved
@@ -350,24 +335,21 @@ export class AccessHandlePoolVFS extends FacadeVFS {
   }
 
   async #acquireAccessHandles() {
-    const handlesStream = Opfs.Opfs.values(this.#directoryHandle!).pipe(Runtime.runSync(this.#runtime))
-
     // Enumerate all the files in the directory.
-    const files = await handlesStream.pipe(
-      Stream.filter((handle): handle is FileSystemFileHandle => handle.kind === 'file'),
-      Stream.map((fileHandle) => [fileHandle.name, fileHandle] as const),
-      Stream.runCollectReadonlyArray,
-      Runtime.runPromise(this.#runtime),
-    )
+    const files = [] as [string, FileSystemFileHandle][]
+    for await (const [name, handle] of this.#directoryHandle!) {
+      if (handle.kind === 'file') {
+        files.push([name, handle as FileSystemFileHandle])
+      }
+    }
 
     // Open access handles in parallel, separating associated and unassociated.
     await Promise.all(
       files.map(async ([name, handle]) => {
-        const accessHandle = await Opfs.Opfs.createSyncAccessHandle(handle).pipe(
-          Effect.mapError((error) => new OpfsError({ cause: error, path: name })),
-          Effect.retry(Schedule.exponentialBackoff10Sec),
-          Runtime.runPromise(this.#runtime),
-        )
+        const accessHandle = await Effect.tryPromise({
+          try: () => handle.createSyncAccessHandle(),
+          catch: (cause) => new OpfsError({ cause, path: name }),
+        }).pipe(Effect.retry(Schedule.exponentialBackoff10Sec), Effect.runPromise)
         this.#mapAccessHandleToName.set(accessHandle, name)
         const path = this.#getAssociatedPath(accessHandle)
         if (path) {
@@ -396,7 +378,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
   #getAssociatedPath(accessHandle: FileSystemSyncAccessHandle): string {
     // Read the path and digest of the path from the file.
     const corpus = new Uint8Array(HEADER_CORPUS_SIZE)
-    Opfs.Opfs.syncRead(accessHandle, corpus, { at: 0 }).pipe(Runtime.runSync(this.#runtime))
+    accessHandle.read(corpus, { at: 0 })
 
     // Delete files not expected to be present.
     const dataView = new DataView(corpus.buffer, corpus.byteOffset)
@@ -408,7 +390,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
     }
 
     const fileDigest = new Uint32Array(HEADER_DIGEST_SIZE / 4)
-    Opfs.Opfs.syncRead(accessHandle, fileDigest, { at: HEADER_OFFSET_DIGEST }).pipe(Runtime.runSync(this.#runtime))
+    accessHandle.read(fileDigest, { at: HEADER_OFFSET_DIGEST })
 
     // Verify the digest.
     const computedDigest = this.#computeDigest(corpus)
@@ -420,7 +402,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
         // truncated in #setAssociatedPath after the header is written. If
         // an interruption occurs right before the truncation then garbage
         // may remain in the file.
-        Opfs.Opfs.syncTruncate(accessHandle, HEADER_OFFSET_DATA).pipe(Runtime.runSync(this.#runtime))
+        accessHandle.truncate(HEADER_OFFSET_DATA)
       }
       return new TextDecoder().decode(corpus.subarray(0, pathBytes))
     } else {
@@ -448,9 +430,9 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
     // Write the OPFS file header, including the digest.
     const digest = this.#computeDigest(corpus)
-    Opfs.Opfs.syncWrite(accessHandle, corpus, { at: 0 }).pipe(Runtime.runSync(this.#runtime))
-    Opfs.Opfs.syncWrite(accessHandle, digest, { at: HEADER_OFFSET_DIGEST }).pipe(Runtime.runSync(this.#runtime))
-    Opfs.Opfs.syncFlush(accessHandle).pipe(Runtime.runSync(this.#runtime))
+    accessHandle.write(corpus, { at: 0 })
+    accessHandle.write(digest, { at: HEADER_OFFSET_DIGEST })
+    accessHandle.flush()
 
     if (path) {
       this.#mapPathToAccessHandle.set(path, accessHandle)
@@ -458,7 +440,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
     } else {
       // This OPFS file doesn't represent any SQLite file so it doesn't
       // need to keep any data.
-      Opfs.Opfs.syncTruncate(accessHandle, HEADER_OFFSET_DATA).pipe(Runtime.runSync(this.#runtime))
+      accessHandle.truncate(HEADER_OFFSET_DATA)
       this.#availableAccessHandles.add(accessHandle)
     }
   }

package/src/browser/opfs/index.ts

@@ -1,4 +1,4 @@
-import { Effect, type Opfs, type Scope } from '@livestore/utils/effect'
+import { Effect } from '@livestore/utils/effect'
 import type * as WaSqlite from '@livestore/wa-sqlite'
 
 import { AccessHandlePoolVFS } from './AccessHandlePoolVFS.ts'
@@ -14,7 +14,7 @@ export const makeOpfsDb = ({
   sqlite3: WaSqlite.SQLiteAPI
   directory: string
   fileName: string
-}): Effect.Effect<{ dbPointer: number; vfs: AccessHandlePoolVFS }, never, Opfs.Opfs | Scope.Scope> =>
+}) =>
   Effect.gen(function* () {
     // Replace all special characters with underscores
     const safePath = directory.replaceAll(/["*/:<>?\\|]/g, '_')
@@ -22,7 +22,7 @@ export const makeOpfsDb = ({
     const vfsName = `opfs${pathSegment}`
 
     if (sqlite3.vfs_registered.has(vfsName) === false) {
-      const vfs = yield* AccessHandlePoolVFS.create(vfsName, directory, (sqlite3 as any).module)
+      const vfs = yield* Effect.promise(() => AccessHandlePoolVFS.create(vfsName, directory, (sqlite3 as any).module))
 
       sqlite3.vfs_register(vfs, false)
       opfsVfsMap.set(vfsName, vfs)

package/src/browser/opfs/opfs-sah-pool.ts

@@ -14,7 +14,7 @@ const PERSISTENT_FILE_TYPES =
 
 const textDecoder = new TextDecoder()
 
-export const decodeAccessHandlePoolFilename = async (file: File): Promise<string> => {
+export const decodeSAHPoolFilename = async (file: File): Promise<string> => {
   // Read the path and digest of the path from the file.
   const corpus = new Uint8Array(await file.slice(0, HEADER_CORPUS_SIZE).arrayBuffer())