@livestore/adapter-web 0.3.0-dev.33 → 0.3.0-dev.36

package/src/web-worker/common/persisted-sqlite.ts

@@ -19,55 +19,53 @@ export const readPersistedAppDbFromClientSession = ({
   storeId: string
   schema: LiveStoreSchema
 }) =>
-  Effect.gen(function* () {
-    return yield* Effect.promise(async () => {
-      const directory = sanitizeOpfsDir(storageOptions.directory, storeId)
-      const sahPoolOpaqueDir = await OpfsUtils.getDirHandle(directory).catch(() => undefined)
+  Effect.promise(async () => {
+    const directory = sanitizeOpfsDir(storageOptions.directory, storeId)
+    const sahPoolOpaqueDir = await OpfsUtils.getDirHandle(directory).catch(() => undefined)
 
-      if (sahPoolOpaqueDir === undefined) {
-        return undefined
-      }
+    if (sahPoolOpaqueDir === undefined) {
+      return undefined
+    }
 
-      const tryGetDbFile = async (fileHandle: FileSystemFileHandle) => {
-        const file = await fileHandle.getFile()
-        const fileName = await decodeSAHPoolFilename(file)
-        return fileName ? { fileName, file } : undefined
-      }
+    const tryGetDbFile = async (fileHandle: FileSystemFileHandle) => {
+      const file = await fileHandle.getFile()
+      const fileName = await decodeSAHPoolFilename(file)
+      return fileName ? { fileName, file } : undefined
+    }
 
-      const getAllFiles = async (asyncIterator: AsyncIterable<FileSystemHandle>): Promise<FileSystemFileHandle[]> => {
-        const results: FileSystemFileHandle[] = []
-        for await (const value of asyncIterator) {
-          if (value.kind === 'file') {
-            results.push(value as FileSystemFileHandle)
-          }
+    const getAllFiles = async (asyncIterator: AsyncIterable<FileSystemHandle>): Promise<FileSystemFileHandle[]> => {
+      const results: FileSystemFileHandle[] = []
+      for await (const value of asyncIterator) {
+        if (value.kind === 'file') {
+          results.push(value as FileSystemFileHandle)
         }
-        return results
       }
+      return results
+    }
 
-      const files = await getAllFiles(sahPoolOpaqueDir.values())
-
-      const fileResults = await Promise.all(files.map(tryGetDbFile))
+    const files = await getAllFiles(sahPoolOpaqueDir.values())
 
-      const appDbFileName = '/' + getAppDbFileName(schema)
+    const fileResults = await Promise.all(files.map(tryGetDbFile))
 
-      const dbFileRes = fileResults.find((_) => _?.fileName === appDbFileName)
-      // console.debug('fileResults', fileResults, 'dbFileRes', dbFileRes)
+    const appDbFileName = '/' + getStateDbFileName(schema)
 
-      if (dbFileRes !== undefined) {
-        const data = await dbFileRes.file.slice(HEADER_OFFSET_DATA).arrayBuffer()
-        // console.debug('readPersistedAppDbFromClientSession', data.byteLength, data)
+    const dbFileRes = fileResults.find((_) => _?.fileName === appDbFileName)
+    // console.debug('fileResults', fileResults, 'dbFileRes', dbFileRes)
 
-        // Given the SAH pool always eagerly creates files with empty non-header data,
-        // we want to return undefined if the file exists but is empty
-        if (data.byteLength === 0) {
-          return undefined
-        }
+    if (dbFileRes !== undefined) {
+      const data = await dbFileRes.file.slice(HEADER_OFFSET_DATA).arrayBuffer()
+      // console.debug('readPersistedAppDbFromClientSession', data.byteLength, data)
 
-        return new Uint8Array(data)
+      // Given the SAH pool always eagerly creates files with empty non-header data,
+      // we want to return undefined if the file exists but is empty
+      if (data.byteLength === 0) {
+        return undefined
       }
 
-      return undefined
-    })
+      return new Uint8Array(data)
+    }
+
+    return undefined
   }).pipe(
     Effect.logWarnIfTakesLongerThan({
       duration: 1000,
@@ -138,7 +136,8 @@ export const sanitizeOpfsDir = (directory: string | undefined, storeId: string)
   return `${directory}@${liveStoreStorageFormatVersion}`
 }
 
-export const getAppDbFileName = (schema: LiveStoreSchema) => {
-  const schemaHashSuffix = schema.migrationOptions.strategy === 'manual' ? 'fixed' : schema.hash.toString()
-  return `app${schemaHashSuffix}.db`
+export const getStateDbFileName = (schema: LiveStoreSchema) => {
+  const schemaHashSuffix =
+    schema.state.sqlite.migrations.strategy === 'manual' ? 'fixed' : schema.state.sqlite.hash.toString()
+  return `state${schemaHashSuffix}.db`
 }

package/src/web-worker/leader-worker/make-leader-worker.ts

@@ -27,7 +27,7 @@ import {
 import type * as otel from '@opentelemetry/api'
 
 import * as OpfsUtils from '../../opfs-utils.js'
-import { getAppDbFileName, sanitizeOpfsDir } from '../common/persisted-sqlite.js'
+import { getStateDbFileName, sanitizeOpfsDir } from '../common/persisted-sqlite.js'
 import { makeShutdownChannel } from '../common/shutdown-channel.js'
 import * as WorkerSchema from '../common/worker-schema.js'
 
@@ -108,11 +108,11 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
         const makeSqliteDb = sqliteDbFactory({ sqlite3 })
         const runtime = yield* Effect.runtime<never>()
 
-        const makeDb = (kind: 'app' | 'eventlog') =>
+        const makeDb = (kind: 'state' | 'eventlog') =>
           makeSqliteDb({
             _tag: 'opfs',
             opfsDirectory: sanitizeOpfsDir(storageOptions.directory, storeId),
-            fileName: kind === 'app' ? getAppDbFileName(schema) : 'eventlog.db',
+            fileName: kind === 'state' ? getStateDbFileName(schema) : 'eventlog.db',
             configureDb: (db) =>
               configureConnection(db, {
                 //  The persisted databases use the AccessHandlePoolVFS which always uses a single database connection.
@@ -125,11 +125,11 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
           }).pipe(Effect.acquireRelease((db) => Effect.try(() => db.close()).pipe(Effect.ignoreLogged)))
 
         // Might involve some async work, so we're running them concurrently
-        const [dbReadModel, dbEventlog] = yield* Effect.all([makeDb('app'), makeDb('eventlog')], {
+        const [dbState, dbEventlog] = yield* Effect.all([makeDb('state'), makeDb('eventlog')], {
           concurrency: 2,
         })
 
-        const devtoolsOptions = yield* makeDevtoolsOptions({ devtoolsEnabled, dbReadModel, dbEventlog })
+        const devtoolsOptions = yield* makeDevtoolsOptions({ devtoolsEnabled, dbState, dbEventlog })
         const shutdownChannel = yield* makeShutdownChannel(storeId)
 
         return makeLeaderThreadLayer({
@@ -138,7 +138,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
           clientId,
           makeSqliteDb,
           syncOptions,
-          dbReadModel,
+          dbState,
           dbEventlog,
           devtoolsOptions,
           shutdownChannel,
@@ -162,7 +162,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
 
         // return cachedSnapshot ?? workerCtx.db.export()
 
-        const snapshot = workerCtx.dbReadModel.export()
+        const snapshot = workerCtx.dbState.export()
         return { snapshot, migrationsReport: workerCtx.initialState.migrationsReport }
       }).pipe(
         UnexpectedError.mapToUnexpectedError,
@@ -186,7 +186,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
         ),
       ).pipe(Effect.uninterruptible, Effect.withSpan('@livestore/adapter-web:worker:PushToLeader')),
     Export: () =>
-      Effect.andThen(LeaderThreadCtx, (_) => _.dbReadModel.export()).pipe(
+      Effect.andThen(LeaderThreadCtx, (_) => _.dbState.export()).pipe(
         UnexpectedError.mapToUnexpectedError,
         Effect.withSpan('@livestore/adapter-web:worker:Export'),
       ),
@@ -228,11 +228,11 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
 
 const makeDevtoolsOptions = ({
   devtoolsEnabled,
-  dbReadModel,
+  dbState,
   dbEventlog,
 }: {
   devtoolsEnabled: boolean
-  dbReadModel: SqliteDb
+  dbState: SqliteDb
   dbEventlog: SqliteDb
 }): Effect.Effect<DevtoolsOptions, UnexpectedError, Scope.Scope | WebmeshWorker.CacheService> =>
   Effect.gen(function* () {
@@ -251,7 +251,7 @@ const makeDevtoolsOptions = ({
             schema: { listen: Devtools.Leader.MessageToApp, send: Devtools.Leader.MessageFromApp },
           }),
           persistenceInfo: {
-            readModel: dbReadModel.metadata.persistenceInfo,
+            state: dbState.metadata.persistenceInfo,
             eventlog: dbEventlog.metadata.persistenceInfo,
           },
         }

package/.eslintrc.cjs

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['../.eslintrc.cjs'],
-  rules: {
-    'unicorn/prefer-global-this': 'off',
-  },
-}

package/tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "resolveJsonModule": true,
-    "tsBuildInfoFile": "./dist/.tsbuildinfo"
-  },
-  "include": ["./src"],
-  "references": [
-    { "path": "../common" },
-    { "path": "../utils" },
-    { "path": "../sqlite-wasm" },
-    { "path": "../webmesh" },
-    { "path": "../devtools-web-common" },
-  ]
-}