fix: preserve Drafts when cleanup fails (Closes #625)

frontend/unfiled-captures.js

@@ -57,20 +57,36 @@ function createUnfiledCaptures({
       savedAt:Number(now()), ...(prepared.hasAttachment ? {hasAttachment:true} : {}),
     };
     const items = [item, ...existing.filter(candidate => candidate.id !== item.id)];
-    const finish = () => {
+    const writeItems = () => {
       try { write(items); }
       catch (error) {
         if (prepared.hasAttachment) Promise.resolve(attachmentStore.delete(item.id)).catch(() => {});
         throw error;
       }
-      if (removed?.hasAttachment) return Promise.resolve(attachmentStore?.delete(removed.id)).then(() => item);
       return item;
     };
-    if (!prepared.hasAttachment) return finish();
-    return Promise.resolve(attachmentStore.put(item.id, {
-      filename:String(prepared.attachment.filename).slice(0, 255),
-      contentType:String(prepared.attachment.contentType), blob:prepared.attachment.blob,
-    })).then(finish);
+    const stage = prepared.hasAttachment
+      ? Promise.resolve(attachmentStore.put(item.id, {
+        filename:String(prepared.attachment.filename).slice(0, 255),
+        contentType:String(prepared.attachment.contentType), blob:prepared.attachment.blob,
+      }))
+      : null;
+    if (!stage && !removed?.hasAttachment) return writeItems();
+    return Promise.resolve(stage).then(async () => {
+      if (!removed?.hasAttachment) return writeItems();
+      const removedAttachment = await attachmentStore.get(removed.id);
+      try {
+        await attachmentStore.delete(removed.id);
+      } catch (error) {
+        if (prepared.hasAttachment) await Promise.resolve(attachmentStore.delete(item.id)).catch(() => {});
+        throw error;
+      }
+      try { return writeItems(); }
+      catch (error) {
+        if (removedAttachment) await Promise.resolve(attachmentStore.put(removed.id, removedAttachment)).catch(() => {});
+        throw error;
+      }
+    });
   }
 
   function save(note) {
@@ -94,10 +110,21 @@ function createUnfiledCaptures({
     const items = read();
     const remaining = items.filter(item => item.id !== id);
     if (remaining.length === items.length) return false;
-    write(remaining);
     const removed = items.find(item => item.id === id);
-    if (!removed?.hasAttachment) return true;
-    return Promise.resolve(attachmentStore?.delete(id)).then(() => true);
+    if (!removed?.hasAttachment) {
+      write(remaining);
+      return true;
+    }
+    return Promise.resolve(attachmentStore?.get(id)).then(removedAttachment =>
+      Promise.resolve(attachmentStore?.delete(id)).then(async () => {
+        try { write(remaining); }
+        catch (error) {
+          if (removedAttachment) await Promise.resolve(attachmentStore?.put(id, removedAttachment)).catch(() => {});
+          throw error;
+        }
+        return true;
+      })
+    );
   }
 
   function resume(id, confirmedLogin) {