feat: add waitForPendingAttachments method to attachmentManager

Author: szuperaz

src/messageComposer/attachmentManager.ts

@@ -208,6 +208,28 @@ export class AttachmentManager {
     );
   }
 
+  /**
+   * Resolves when no attachment is still in `pending` or `uploading` (each in-flight upload has
+   * reached `finished`, `failed`, or `blocked`). Resolves immediately if there is nothing to wait for.
+   */
+  waitForPendingAttachments = (): Promise<void> => {
+    const hasPendingOrUploading = () =>
+      this.pendingUploadsCount > 0 || this.uploadsInProgressCount > 0;
+
+    if (!hasPendingOrUploading()) {
+      return Promise.resolve();
+    }
+
+    return new Promise((resolve) => {
+      const unsubscribe = this.state.subscribe(() => {
+        if (!hasPendingOrUploading()) {
+          unsubscribe();
+          resolve();
+        }
+      });
+    });
+  };
+
   initState = ({ message }: { message?: DraftMessage | LocalMessage } = {}) => {
     this.state.next(initState({ message }));
   };

test/unit/MessageComposer/attachmentManager.test.ts

@@ -1002,6 +1002,73 @@ describe('AttachmentManager', () => {
     });
   });
 
+  describe('waitForPendingAttachments', () => {
+    it('resolves immediately when there are no pending or uploading attachments', async () => {
+      const {
+        messageComposer: { attachmentManager },
+      } = setup();
+
+      await expect(
+        attachmentManager.waitForPendingAttachments(),
+      ).resolves.toBeUndefined();
+    });
+
+    it('resolves when in-flight uploads finish', async () => {
+      const {
+        messageComposer: { attachmentManager },
+        mockChannel,
+      } = setup();
+
+      let resolveUpload!: (value: { file: string; thumb_url?: string }) => void;
+      const uploadPromise = new Promise<{ file: string; thumb_url?: string }>(
+        (resolve) => {
+          resolveUpload = resolve;
+        },
+      );
+      mockChannel.sendImage.mockImplementation(() => uploadPromise);
+
+      const file = new File([''], 'test.jpg', { type: 'image/jpeg' });
+      const local = await attachmentManager.fileToLocalUploadAttachment(file);
+      void attachmentManager.uploadAttachment(local);
+
+      await vi.waitFor(() => {
+        expect(attachmentManager.uploadsInProgressCount).toBe(1);
+      });
+
+      const settled = attachmentManager.waitForPendingAttachments();
+      resolveUpload({ file: 'done-url' });
+      await expect(settled).resolves.toBeUndefined();
+      expect(attachmentManager.successfulUploadsCount).toBe(1);
+    });
+
+    it('resolves when in-flight uploads fail', async () => {
+      const {
+        messageComposer: { attachmentManager },
+        mockChannel,
+      } = setup();
+
+      let rejectUpload!: (err: Error) => void;
+      const uploadPromise = new Promise<never>((_, reject) => {
+        rejectUpload = reject;
+      });
+      mockChannel.sendImage.mockImplementation(() => uploadPromise);
+
+      const file = new File([''], 'test.jpg', { type: 'image/jpeg' });
+      const local = await attachmentManager.fileToLocalUploadAttachment(file);
+      const uploadWork = attachmentManager.uploadAttachment(local);
+
+      await vi.waitFor(() => {
+        expect(attachmentManager.uploadsInProgressCount).toBe(1);
+      });
+
+      const settled = attachmentManager.waitForPendingAttachments();
+      rejectUpload(new Error('upload failed'));
+      await expect(settled).resolves.toBeUndefined();
+      await uploadWork;
+      expect(attachmentManager.failedUploadsCount).toBe(1);
+    });
+  });
+
   describe('uploadAttachment', () => {
     it('should upload files successfully', async () => {
       const {