bug fixes, and performance improvements, and drawer

server/utils/renames.ts

@@ -1,31 +1,21 @@
-interface PendingRename {
-    topicId: string;
-    abortController: AbortController;
-}
+const pendingRenames = new Map<string, { attemptId: string; controller: AbortController }>();
 
-const pendingRenames: Map<string, AbortController> = new Map();
-
-export const cancelPendingRename = (topicId: string) => {
-    const pendingRename = pendingRenames.get(topicId);
-    if (pendingRename) {
-        pendingRename.abort();
-        pendingRenames.delete(topicId);
-        return true;
-    }
-
-    return false;
-};
-
-export const completeRename = (topicId: string) => {
-    const controller = pendingRenames.get(topicId);
-    if (controller) {
+export const cancelPendingRename = (topicId: string, attemptId?: string | null) => {
+    const pending = pendingRenames.get(topicId);
+    if (pending && pending.attemptId === attemptId) {
+        pending.controller.abort();
         pendingRenames.delete(topicId);
     }
 };
 
-export const addPendingRename = (topicId: string) => {
-    const abortController = new AbortController();
+export const completeRename = (topicId: string, attemptId: string) => {
+    if (pendingRenames.get(topicId)?.attemptId === attemptId) {
+        pendingRenames.delete(topicId);
+    }
+};
 
-    pendingRenames.set(topicId, abortController);
-    return abortController;
-};
+export const addPendingRename = (topicId: string, attemptId: string) => {
+    const controller = new AbortController();
+    pendingRenames.set(topicId, { attemptId, controller });
+    return controller;
+};