Merge pull request #80 from xmtp/rygine/fix-db-version

Prevent DB versioning when DB is already open
xmtp · Sep 5, 2023 · 3301cf7 · 3301cf7
2 parents ce66361 + 450a6b9
commit 3301cf7
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 36 deletions.
diff --git a/.changeset/friendly-coins-confess.md b/.changeset/friendly-coins-confess.md
@@ -0,0 +1,5 @@
+---
+"@xmtp/react-sdk": patch
+---
+
+- Prevent DB versioning when DB is already open
diff --git a/packages/react-sdk/src/helpers/caching/db.ts b/packages/react-sdk/src/helpers/caching/db.ts
@@ -75,42 +75,45 @@ export type GetDBInstanceOptions = {
 export const getDbInstance = (options?: GetDBInstanceOptions) => {
   const db = options?.db ?? new Dexie("__XMTP__");
 
-  // note that duplicate keys will be overwritten
-  const customSchema = options?.contentTypeConfigs?.reduce(
-    (result, { schema }) => ({
-      ...result,
-      ...schema,
-    }),
-    {} as Record<string, string>,
-  );
-
-  const version = options?.version ?? 1;
-
-  db.version(version).stores({
-    ...customSchema,
-    conversations: `
-      ++id,
-      [topic+walletAddress],
-      createdAt,
-      peerAddress,
-      topic,
-      updatedAt,
-      walletAddress
-    `,
-    messages: `
-      ++id,
-      [conversationTopic+walletAddress],
-      contentFallback,
-      contentType,
-      conversationTopic,
-      senderAddress,
-      sentAt,
-      status,
-      uuid,
-      walletAddress,
-      xmtpID
-    `,
-  });
+  // do not attempt to version the db if it is already open
+  if (!db.isOpen()) {
+    // note that duplicate keys will be overwritten
+    const customSchema = options?.contentTypeConfigs?.reduce(
+      (result, { schema }) => ({
+        ...result,
+        ...schema,
+      }),
+      {} as Record<string, string>,
+    );
+
+    const version = options?.version ?? 1;
+
+    db.version(version).stores({
+      ...customSchema,
+      conversations: `
+        ++id,
+        [topic+walletAddress],
+        createdAt,
+        peerAddress,
+        topic,
+        updatedAt,
+        walletAddress
+      `,
+      messages: `
+        ++id,
+        [conversationTopic+walletAddress],
+        contentFallback,
+        contentType,
+        conversationTopic,
+        senderAddress,
+        sentAt,
+        status,
+        uuid,
+        walletAddress,
+        xmtpID
+      `,
+    });
+  }
 
   return db;
 };