fix: error handling

Author: openscript

examples/react-counter/package.json

@@ -16,6 +16,8 @@
     "@automerge/automerge-repo-react-hooks": "^1.0.19",
     "@automerge/automerge-repo-storage-indexeddb": "^1.0.19",
     "@automerge/automerge-wasm": "^0.9.0",
+    "@openscript-ch/automerge-repo-storage-opfs": "workspace:*",
+    "@types/react": "^18.2.47",
     "@vitejs/plugin-react": "^4.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/react-counter/src/main.tsx

@@ -3,7 +3,8 @@ import ReactDOM from "react-dom/client"
 import { App } from "./App.js"
 import { Repo } from "@automerge/automerge-repo"
 import { MessageChannelNetworkAdapter } from "@automerge/automerge-repo-network-messagechannel"
-import { IndexedDBStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb"
+// import { IndexedDBStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb"
+import { OPFSStorageAdapter } from '@openscript-ch/automerge-repo-storage-opfs'
 import { RepoContext } from "@automerge/automerge-repo-react-hooks"
 
 // We run the network & storage in a separate file and the tabs themselves are stateless and lightweight.
@@ -24,7 +25,8 @@ const sharedWorker = new SharedWorker(
 /* Create a repo and share any documents we create with our local in-browser storage worker. */
 const repo = new Repo({
   network: [new MessageChannelNetworkAdapter(sharedWorker.port)],
-  storage: new IndexedDBStorageAdapter("automerge-repo-demo-counter"),
+  //storage: new IndexedDBStorageAdapter("automerge-repo-demo-counter"),
+  storage: new OPFSStorageAdapter("automerge-repo-demo-counter"),
   sharePolicy: async peerId => peerId.includes("shared-worker"),
 })
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "automerge-repo-storage-opfs",
+  "name": "@openscript-ch/automerge-repo-storage-opfs",
   "version": "0.0.1",
   "description": "OPFS storage adapter for Automerge Repo",
   "repository": "https://github.com/openscript-ch/automerge-repo-storage-opfs",

pnpm-lock.yaml

@@ -3,16 +3,15 @@ import { Chunk, StorageAdapter, StorageKey } from '@automerge/automerge-repo';
 export class OPFSStorageAdapter extends StorageAdapter {
   private baseDirectory: string;
   private baseDirectoryHandle: FileSystemDirectoryHandle;
-  private root: FileSystemDirectoryHandle;
 
   constructor(baseDirectory: string = "automerge-repo-data") {
     super();
     this.baseDirectory = baseDirectory;
-    this.initialize();
   }
 
   async load(key: StorageKey): Promise<Uint8Array | undefined> {
     const fileName = getKey(key);
+    await this.initialize();
 
     try {
       const fileHandle = await this.baseDirectoryHandle.getFileHandle(fileName);
@@ -21,13 +20,14 @@ export class OPFSStorageAdapter extends StorageAdapter {
       return new Uint8Array(arrayBuffer);
     } catch (error) {
       // don't throw if file not found
-      if (error.code === "NotFoundError") return undefined
+      if (error.name === "NotFoundError") return undefined
       throw error;
     }
   }
 
   async save(key: StorageKey, data: Uint8Array): Promise<void> {
     const fileName = getKey(key);
+    await this.initialize();
 
     const fileHandle = await this.baseDirectoryHandle.getFileHandle(fileName, { create: true });
     const fileWritable = await fileHandle.createWritable();
@@ -37,19 +37,21 @@ export class OPFSStorageAdapter extends StorageAdapter {
 
   async remove(key: StorageKey): Promise<void> {
     const fileName = getKey(key);
+    await this.initialize();
 
     try {
       return this.baseDirectoryHandle.removeEntry(fileName);
     } catch (error) {
       // don't throw if file not found
-      if (error.code === "NotFoundError") return undefined
+      if (error.name === "NotFoundError") return undefined
       throw error;
     }
   }
 
   async loadRange(keyPrefix: StorageKey): Promise<Chunk[]> {
     const chunks: Chunk[] = [];
     const prefix = getKey(keyPrefix);
+    await this.initialize();
 
     for await (const [name] of this.baseDirectoryHandle) {
         if (name.startsWith(prefix)) {
@@ -65,6 +67,7 @@ export class OPFSStorageAdapter extends StorageAdapter {
 
   async removeRange(keyPrefix: StorageKey): Promise<void> {
     const prefix = getKey(keyPrefix);
+    await this.initialize();
 
     for await (const [name] of this.baseDirectoryHandle) {
         if (name.startsWith(prefix)) {
@@ -74,8 +77,10 @@ export class OPFSStorageAdapter extends StorageAdapter {
   }
 
   private async initialize() {
-    this.root = await navigator.storage.getDirectory();
-    this.baseDirectoryHandle = await this.root.getDirectoryHandle(this.baseDirectory, { create: true });
+    if(!this.baseDirectoryHandle) {
+      const root = await navigator.storage.getDirectory();
+      this.baseDirectoryHandle = await root.getDirectoryHandle(this.baseDirectory, { create: true });
+    }
   }
 
 }