Merge pull request #56 from xmtp/rygine/performance-update

Greatly improve performance by removing mutexes
xmtp · Aug 18, 2023 · b509a6b · b509a6b
2 parents dd41eab + 83735a8
commit b509a6b
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 176 deletions.
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
@@ -77,7 +77,6 @@
     "@xmtp/content-type-remote-attachment": "^1.0.7",
     "@xmtp/content-type-reply": "^1.0.0",
     "@xmtp/xmtp-js": "^10.2.0",
-    "async-mutex": "^0.4.0",
     "date-fns": "^2.30.0",
     "dexie": "^3.2.4",
     "dexie-react-hooks": "^1.1.6",

diff --git a/packages/react-sdk/src/helpers/caching/conversations.ts b/packages/react-sdk/src/helpers/caching/conversations.ts
@@ -1,7 +1,6 @@
 import type { Conversation, Client, InvitationContext } from "@xmtp/xmtp-js";
 import type { Table } from "dexie";
 import type Dexie from "dexie";
-import { Mutex } from "async-mutex";
 import type { CachedMetadata, CachedMetadataValues } from "./db";
 
 export type CachedConversation<M = CachedMetadata> = {
@@ -93,8 +92,6 @@ export const getConversationByTopic = async (
   return conversation;
 };
 
-const updateConversationMutex = new Mutex();
-
 /**
  * Update properties of a cached conversation
  */
@@ -104,19 +101,18 @@ export const updateConversation = async (
     Pick<CachedConversation, "updatedAt" | "isReady" | "metadata">
   >,
   db: Dexie,
-) =>
-  updateConversationMutex.runExclusive(async () => {
-    const conversationsTable = db.table(
-      "conversations",
-    ) as CachedConversationsTable;
-    const existing = await conversationsTable
-      .where("topic")
-      .equals(topic)
-      .first();
-    if (existing) {
-      await conversationsTable.update(existing, update);
-    }
-  });
+) => {
+  const conversationsTable = db.table(
+    "conversations",
+  ) as CachedConversationsTable;
+  const existing = await conversationsTable
+    .where("topic")
+    .equals(topic)
+    .first();
+  if (existing) {
+    await conversationsTable.update(existing, update);
+  }
+};
 
 /**
  * Update metadata of a cached conversation using the specified namespace
@@ -174,8 +170,6 @@ export const toCachedConversation = (
   walletAddress,
 });
 
-const saveConversationMutex = new Mutex();
-
 /**
  * Save a conversation to the cache
  *
@@ -184,21 +178,20 @@ const saveConversationMutex = new Mutex();
 export const saveConversation = async (
   conversation: CachedConversation,
   db: Dexie,
-) =>
-  saveConversationMutex.runExclusive(async () => {
-    const conversations = db.table("conversations") as CachedConversationsTable;
+) => {
+  const conversations = db.table("conversations") as CachedConversationsTable;
 
-    const existing = await conversations
-      .where("topic")
-      .equals(conversation.topic)
-      .first();
+  const existing = await conversations
+    .where("topic")
+    .equals(conversation.topic)
+    .first();
 
-    if (existing) {
-      return existing as CachedConversationWithId;
-    }
+  if (existing) {
+    return existing as CachedConversationWithId;
+  }
 
-    // eslint-disable-next-line no-param-reassign
-    conversation.id = await conversations.add(conversation);
+  // eslint-disable-next-line no-param-reassign
+  conversation.id = await conversations.add(conversation);
 
-    return conversation as CachedConversationWithId;
-  });
+  return conversation as CachedConversationWithId;
+};