@livestore/sqlite-wasm 0.3.1 → 0.3.2-dev.1

package/src/browser/mod.ts

@@ -2,12 +2,12 @@ import type { MakeSqliteDb, PersistenceInfo, SqliteDb } from '@livestore/common'
 import { Effect, Hash } from '@livestore/utils/effect'
 import type { MemoryVFS } from '@livestore/wa-sqlite/src/examples/MemoryVFS.js'
 
-import { makeInMemoryDb } from '../in-memory-vfs.js'
-import { makeSqliteDb } from '../make-sqlite-db.js'
-import type { AccessHandlePoolVFS } from './opfs/AccessHandlePoolVFS.js'
-import { makeOpfsDb } from './opfs/index.js'
+import { makeInMemoryDb } from '../in-memory-vfs.ts'
+import { makeSqliteDb } from '../make-sqlite-db.ts'
+import type { AccessHandlePoolVFS } from './opfs/AccessHandlePoolVFS.ts'
+import { makeOpfsDb } from './opfs/index.ts'
 
-export * from './opfs/opfs-sah-pool.js'
+export * from './opfs/opfs-sah-pool.ts'
 
 export type WebDatabaseMetadataInMemory = {
   _tag: 'in-memory'

package/src/browser/opfs/AccessHandlePoolVFS.ts

@@ -1,9 +1,7 @@
-/* eslint-disable prefer-arrow/prefer-arrow-functions */
-
+import { Effect, Schedule, Schema } from '@livestore/utils/effect'
 // Based on https://github.com/rhashimoto/wa-sqlite/blob/master/src/examples/AccessHandlePoolVFS.js
 import * as VFS from '@livestore/wa-sqlite/src/VFS.js'
-
-import { FacadeVFS } from '../../FacadeVFS.js'
+import { FacadeVFS } from '../../FacadeVFS.ts'
 
 const SECTOR_SIZE = 4096
 
@@ -123,7 +121,9 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
   jRead(fileId: number, pData: Uint8Array, iOffset: number): number {
     const file = this.#mapIdToFile.get(fileId)!
-    const nBytes = file.accessHandle.read(pData.subarray(), { at: HEADER_OFFSET_DATA + iOffset })
+    const nBytes = file.accessHandle.read(pData.subarray(), {
+      at: HEADER_OFFSET_DATA + iOffset,
+    })
     if (nBytes < pData.byteLength) {
       pData.fill(0, nBytes, pData.byteLength)
       return VFS.SQLITE_IOERR_SHORT_READ
@@ -133,7 +133,9 @@ export class AccessHandlePoolVFS extends FacadeVFS {
 
   jWrite(fileId: number, pData: Uint8Array, iOffset: number): number {
     const file = this.#mapIdToFile.get(fileId)!
-    const nBytes = file.accessHandle.write(pData.subarray(), { at: HEADER_OFFSET_DATA + iOffset })
+    const nBytes = file.accessHandle.write(pData.subarray(), {
+      at: HEADER_OFFSET_DATA + iOffset,
+    })
     return nBytes === pData.byteLength ? VFS.SQLITE_OK : VFS.SQLITE_IOERR
   }
 
@@ -164,7 +166,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
     return VFS.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
   }
 
-  jAccess(zName: string, flags: number, pResOut: DataView): number {
+  jAccess(zName: string, _flags: number, pResOut: DataView): number {
     const path = this.#getPath(zName)
     pResOut.setInt32(0, this.#mapPathToAccessHandle.has(path) ? 1 : 0, true)
     return VFS.SQLITE_OK
@@ -219,8 +221,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 handle = await this.#directoryHandle!.getFileHandle(name, { create: true })
-      const accessHandle = await handle.createSyncAccessHandle()
+      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)
@@ -236,7 +244,7 @@ export class AccessHandlePoolVFS extends FacadeVFS {
   async removeCapacity(n: number): Promise<number> {
     let nRemoved = 0
     for (const accessHandle of Array.from(this.#availableAccessHandles)) {
-      if (nRemoved == n || this.getSize() === this.getCapacity()) return nRemoved
+      if (nRemoved === n || this.getSize() === this.getCapacity()) return nRemoved
 
       const name = this.#mapAccessHandleToName.get(accessHandle)!
       accessHandle.close()
@@ -260,7 +268,10 @@ export class AccessHandlePoolVFS extends FacadeVFS {
     // Open access handles in parallel, separating associated and unassociated.
     await Promise.all(
       files.map(async ([name, handle]) => {
-        const accessHandle = await handle.createSyncAccessHandle()
+        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) {
@@ -402,3 +413,8 @@ export class AccessHandlePoolVFS extends FacadeVFS {
     }
   }
 }
+
+export class OpfsError extends Schema.TaggedError<OpfsError>()('OpfsError', {
+  cause: Schema.Defect,
+  path: Schema.String,
+}) {}

package/src/browser/opfs/index.ts

@@ -1,7 +1,7 @@
 import { Effect } from '@livestore/utils/effect'
 import type * as WaSqlite from '@livestore/wa-sqlite'
 
-import { AccessHandlePoolVFS } from './AccessHandlePoolVFS.js'
+import { AccessHandlePoolVFS } from './AccessHandlePoolVFS.ts'
 
 const semaphore = Effect.makeSemaphore(1).pipe(Effect.runSync)
 const opfsVfsMap = new Map<string, AccessHandlePoolVFS>()

package/src/index.ts

@@ -1 +1 @@
-export * as WaSqlite from './index_.js'
+export * as WaSqlite from './index_.ts'

package/src/index_.ts

@@ -1,2 +1,2 @@
 export * from '@livestore/wa-sqlite'
-export * from './make-sqlite-db.js'
+export * from './make-sqlite-db.ts'

package/src/make-sqlite-db.ts

@@ -6,9 +6,9 @@ import type {
   SqliteDbChangeset,
 } from '@livestore/common'
 import { SqliteDbHelper, SqliteError } from '@livestore/common'
+import { EventSequenceNumber } from '@livestore/common/schema'
 import * as SqliteConstants from '@livestore/wa-sqlite/src/sqlite-constants.js'
-
-import { makeInMemoryDb } from './in-memory-vfs.js'
+import { makeInMemoryDb } from './in-memory-vfs.ts'
 
 export const makeSqliteDb = <
   TMetadata extends {
@@ -32,6 +32,10 @@ export const makeSqliteDb = <
   const sqliteDb: SqliteDb<TMetadata> = {
     _tag: 'SqliteDb',
     metadata,
+    debug: {
+      // Setting initially to root but will be set to correct value shortly after
+      head: EventSequenceNumber.ROOT,
+    },
     prepare: (queryStr) => {
       try {
         const stmts = sqlite3.statements(dbPointer, queryStr.trim(), { unscoped: true })
@@ -75,10 +79,9 @@ export const makeSqliteDb = <
 
             try {
               // NOTE `column_names` only works for `SELECT` statements, ignoring other statements for now
-              let columns = undefined
+              let columns: string[] | undefined
               try {
                 columns = sqlite3.column_names(stmt)
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
               } catch (_e) {}
 
               while (sqlite3.step(stmt) === SqliteConstants.SQLITE_ROW) {
@@ -209,7 +212,7 @@ export const makeSqliteDb = <
           try {
             sqlite3.changeset_apply(dbPointer, data)
             // @ts-expect-error data should be garbage collected after use
-            // biome-ignore lint/style/noParameterAssign:
+            // biome-ignore lint/style/noParameterAssign: ...
             data = undefined
           } catch (cause: any) {
             throw new SqliteError({

package/src/node/NodeFS.ts

@@ -1,13 +1,12 @@
 /// <reference types="node" />
 
-/* eslint-disable prefer-arrow/prefer-arrow-functions */
 import * as fs from 'node:fs'
 import path from 'node:path'
 
 import type * as WaSqlite from '@livestore/wa-sqlite'
 import * as VFS from '@livestore/wa-sqlite/src/VFS.js'
 
-import { FacadeVFS } from '../FacadeVFS.js'
+import { FacadeVFS } from '../FacadeVFS.ts'
 
 interface NodeFsFile {
   pathname: string

package/src/node/mod.ts

@@ -5,9 +5,9 @@ import { Effect, FileSystem } from '@livestore/utils/effect'
 import type * as WaSqlite from '@livestore/wa-sqlite'
 import type { MemoryVFS } from '@livestore/wa-sqlite/src/examples/MemoryVFS.js'
 
-import { makeInMemoryDb } from '../in-memory-vfs.js'
-import { makeSqliteDb } from '../make-sqlite-db.js'
-import { NodeFS } from './NodeFS.js'
+import { makeInMemoryDb } from '../in-memory-vfs.ts'
+import { makeSqliteDb } from '../make-sqlite-db.ts'
+import { NodeFS } from './NodeFS.ts'
 
 export type NodeDatabaseMetadataInMemory = {
   _tag: 'in-memory'