stream-chat 9.41.1 → 9.42.0

package/dist/esm/index.mjs

@@ -3110,11 +3110,11 @@ var _AttachmentManager = class _AttachmentManager {
           return attachments;
         }
       }
-      return null;
+      return stateAttachments;
     };
     this.updateAttachment = (attachmentToUpdate) => {
       const updatedAttachments = this.prepareAttachmentUpdate(attachmentToUpdate);
-      if (updatedAttachments) {
+      if (updatedAttachments && updatedAttachments !== this.attachments) {
         this.state.partialNext({ attachments: updatedAttachments });
       }
     };
@@ -3124,15 +3124,15 @@ var _AttachmentManager = class _AttachmentManager {
       let hasUpdates = false;
       attachmentsToUpsert.forEach((attachment) => {
         const updatedAttachments = this.prepareAttachmentUpdate(attachment);
-        if (updatedAttachments) {
-          attachments = updatedAttachments;
-          hasUpdates = true;
-        } else {
+        if (updatedAttachments === null) {
           const localAttachment = ensureIsLocalAttachment(attachment);
           if (localAttachment) {
             attachments.push(localAttachment);
             hasUpdates = true;
           }
+        } else if (updatedAttachments !== this.attachments) {
+          attachments = updatedAttachments;
+          hasUpdates = true;
         }
       });
       if (hasUpdates) {
@@ -3140,11 +3140,15 @@ var _AttachmentManager = class _AttachmentManager {
       }
     };
     this.removeAttachments = (localAttachmentIds) => {
+      if (!localAttachmentIds.length) return;
       this.state.partialNext({
         attachments: this.attachments.filter(
           (attachment) => !localAttachmentIds.includes(attachment.localMetadata?.id)
         )
       });
+      for (const id of localAttachmentIds) {
+        this.client.uploadManager.deleteUploadRecord(id);
+      }
     };
     this.getUploadConfigCheck = async (fileLike) => {
       const client = this.channel.getClient();
@@ -3233,13 +3237,17 @@ var _AttachmentManager = class _AttachmentManager {
         const percent = progressEvent.lengthComputable && progressEvent.total ? Math.round(progressEvent.loaded * 100 / progressEvent.total) : void 0;
         options.onProgress?.(percent);
       } : void 0;
+      const axiosUploadConfig = progressHandler || options?.abortSignal ? {
+        ...progressHandler ? { onUploadProgress: progressHandler } : {},
+        ...options?.abortSignal ? { signal: options.abortSignal } : {}
+      } : void 0;
       if (isFileReference(fileLike)) {
         return this.channel[isImageFile(fileLike) ? "sendImage" : "sendFile"](
           fileLike.uri,
           fileLike.name,
           fileLike.type,
           void 0,
-          progressHandler ? { onUploadProgress: progressHandler } : void 0
+          axiosUploadConfig
         );
       }
       const file = isFile(fileLike) ? fileLike : createFileFromBlobs({
@@ -3247,13 +3255,7 @@ var _AttachmentManager = class _AttachmentManager {
         fileName: generateFileName(fileLike.type),
         mimeType: fileLike.type
       });
-      const { duration, ...result } = await this.channel[isImageFile(fileLike) ? "sendImage" : "sendFile"](
-        file,
-        void 0,
-        void 0,
-        void 0,
-        progressHandler ? { onUploadProgress: progressHandler } : void 0
-      );
+      const { duration, ...result } = await this.channel[isImageFile(fileLike) ? "sendImage" : "sendFile"](file, void 0, void 0, void 0, axiosUploadConfig);
       return result;
     };
     /**
@@ -3288,33 +3290,9 @@ var _AttachmentManager = class _AttachmentManager {
         });
         return localAttachment;
       }
-      const shouldTrackProgress = this.config.trackUploadProgress;
-      const uploadingAttachment = {
-        ...attachment,
-        localMetadata: {
-          ...attachment.localMetadata,
-          uploadState: "uploading",
-          ...shouldTrackProgress && { uploadProgress: 0 }
-        }
-      };
-      this.upsertAttachments([uploadingAttachment]);
-      const uploadOptions = shouldTrackProgress ? {
-        onProgress: (percent) => {
-          this.updateAttachment({
-            ...uploadingAttachment,
-            localMetadata: {
-              ...uploadingAttachment.localMetadata,
-              uploadProgress: percent
-            }
-          });
-        }
-      } : void 0;
       let response;
       try {
-        response = await this.doUploadRequest(
-          localAttachment.localMetadata.file,
-          uploadOptions
-        );
+        response = await this.upload(attachment);
       } catch (error) {
         const reason = error instanceof Error ? error.message : "unknown error";
         const failedAttachment = {
@@ -3383,31 +3361,10 @@ var _AttachmentManager = class _AttachmentManager {
         this.upsertAttachments([attachment]);
         return preUpload.state.attachment;
       }
-      const shouldTrackProgress = this.config.trackUploadProgress;
-      attachment = {
-        ...attachment,
-        localMetadata: {
-          ...attachment.localMetadata,
-          uploadState: "uploading",
-          ...shouldTrackProgress && { uploadProgress: 0 }
-        }
-      };
-      this.upsertAttachments([attachment]);
-      const uploadOptions = shouldTrackProgress ? {
-        onProgress: (percent) => {
-          this.updateAttachment({
-            ...attachment,
-            localMetadata: {
-              ...attachment.localMetadata,
-              uploadProgress: percent
-            }
-          });
-        }
-      } : void 0;
       let response;
       let error;
       try {
-        response = await this.doUploadRequest(file, uploadOptions);
+        response = await this.upload(attachment);
       } catch (err) {
         error = err instanceof Error ? err : void 0;
       }
@@ -3534,6 +3491,40 @@ var _AttachmentManager = class _AttachmentManager {
       ({ localMetadata }) => localMetadata.uploadState === state
     );
   }
+  upload(attachment) {
+    const localId = attachment.localMetadata.id;
+    this.upsertAttachments([
+      {
+        ...attachment,
+        localMetadata: {
+          ...attachment.localMetadata,
+          uploadState: "uploading",
+          uploadProgress: this.config.trackUploadProgress ? 0 : void 0
+        }
+      }
+    ]);
+    const unsubscribe = this.client.uploadManager.state.subscribeWithSelector(
+      (s) => ({ upload: s.uploads[localId] }),
+      ({ upload: nextUpload }) => {
+        if (!nextUpload) return;
+        this.updateAttachment({
+          ...attachment,
+          localMetadata: {
+            ...attachment.localMetadata,
+            uploadState: "uploading",
+            uploadProgress: nextUpload.uploadProgress
+          }
+        });
+      }
+    );
+    return this.client.uploadManager.upload({
+      id: localId,
+      channelCid: this.channel.cid,
+      file: attachment.localMetadata.file
+    }).finally(() => {
+      unsubscribe();
+    });
+  }
 };
 _AttachmentManager.toLocalUploadAttachment = (fileLike) => {
   const file = isFileReference(fileLike) || isFile(fileLike) ? fileLike : createFileFromBlobs({
@@ -10410,6 +10401,131 @@ var StableWSConnection = class {
   }
 };
 
+// src/uploadManager.ts
+var initState7 = () => ({ uploads: {} });
+var upsertById = (uploads, record) => ({
+  ...uploads,
+  [record.id]: { ...uploads[record.id], ...record }
+});
+var updateById = (uploads, record) => {
+  if (!(record.id in uploads)) return null;
+  const current = uploads[record.id];
+  return { ...uploads, [record.id]: { ...current, ...record } };
+};
+var UploadManager = class {
+  constructor(client) {
+    this.client = client;
+    this.inFlightUploads = /* @__PURE__ */ new Map();
+    this.getUpload = (id) => this.uploads[id];
+    /**
+     * Clears all upload records.
+     * Invoked when the user disconnects so a later session does not inherit stale upload state.
+     * Aborts every in-flight upload request via its `UploadRequestOptions.abortSignal`.
+     */
+    this.reset = () => {
+      for (const { abortController } of this.inFlightUploads.values()) {
+        abortController.abort();
+      }
+      this.inFlightUploads.clear();
+      this.state.next(initState7());
+    };
+    /**
+     * Removes the upload record for `id` if present.
+     * If an upload is still in progress, aborts its `UploadRequestOptions.abortSignal`.
+     */
+    this.deleteUploadRecord = (id) => {
+      const flight = this.inFlightUploads.get(id);
+      if (flight) {
+        this.inFlightUploads.delete(id);
+        flight.abortController.abort();
+      }
+      this.state.next((current) => {
+        if (!(id in current.uploads)) return current;
+        const uploads = { ...current.uploads };
+        delete uploads[id];
+        return { ...current, uploads };
+      });
+    };
+    /**
+     * Starts an upload for `id`, or returns the existing in-flight promise if one is already running.
+     * Uses {@link StreamChat.channel}(`channelCid`) → `messageComposer.attachmentManager.doUploadRequest`.
+     * Resolves with that result; rejects if the upload rejects (the record is removed from state either way).
+     */
+    this.upload = ({
+      id,
+      channelCid,
+      file
+    }) => {
+      const existing = this.inFlightUploads.get(id);
+      if (existing) return existing.promise;
+      let resolvePromise;
+      let rejectPromise;
+      const promise = new Promise((resolve, reject) => {
+        resolvePromise = resolve;
+        rejectPromise = reject;
+      });
+      const abortController = new AbortController();
+      this.inFlightUploads.set(id, { promise, abortController });
+      void (async () => {
+        const attachmentManager = this.resolveAttachmentManager(channelCid);
+        const trackProgress = attachmentManager.config.trackUploadProgress;
+        try {
+          this.upsertUpload({
+            id,
+            uploadProgress: trackProgress ? 0 : void 0
+          });
+          const onProgress = trackProgress ? (progress) => {
+            this.updateUpload({
+              id,
+              uploadProgress: progress
+            });
+          } : void 0;
+          const uploadRequestOptions = {
+            abortSignal: abortController.signal,
+            ...onProgress ? { onProgress } : {}
+          };
+          const response = await attachmentManager.doUploadRequest(
+            file,
+            uploadRequestOptions
+          );
+          resolvePromise(response);
+        } catch (error) {
+          rejectPromise(error);
+        } finally {
+          this.inFlightUploads.delete(id);
+          this.deleteUploadRecord(id);
+        }
+      })();
+      return promise;
+    };
+    this.upsertUpload = (record) => {
+      this.state.partialNext({
+        uploads: upsertById(this.uploads, record)
+      });
+    };
+    this.updateUpload = (record) => {
+      this.state.next((current) => {
+        const nextUploads = updateById(current.uploads, record);
+        if (!nextUploads) return current;
+        return { ...current, uploads: nextUploads };
+      });
+    };
+    this.state = new StateStore(initState7());
+  }
+  resolveAttachmentManager(channelCid) {
+    const colon = channelCid.indexOf(":");
+    if (colon <= 0 || colon === channelCid.length - 1) {
+      throw new Error(`Invalid channelCid: ${channelCid}`);
+    }
+    const channelType = channelCid.slice(0, colon);
+    const channelId = channelCid.slice(colon + 1);
+    return this.client.channel(channelType, channelId).messageComposer.attachmentManager;
+  }
+  get uploads() {
+    return this.state.getLatestValue().uploads;
+  }
+};
+
 // src/signing.ts
 var import_jsonwebtoken = __toESM(require_jsonwebtoken());
 var import_crypto = __toESM(require_crypto());
@@ -12882,6 +12998,7 @@ var StreamChat = class _StreamChat {
       this.activeChannels = {};
       this.state = new ClientState({ client: this });
       this.threads.resetState();
+      this.uploadManager.reset();
       closePromise.finally(() => {
         this.tokenManager.reset();
       }).catch((err) => console.error(err));
@@ -13288,6 +13405,7 @@ var StreamChat = class _StreamChat {
     this.blockedUsers = new StateStore({ userIds: [] });
     this.moderation = new Moderation(this);
     this.notifications = options?.notifications ?? new NotificationManager();
+    this.uploadManager = new UploadManager(this);
     if (secretOrOptions && isString2(secretOrOptions)) {
       this.secret = secretOrOptions;
     }
@@ -15077,7 +15195,7 @@ var StreamChat = class _StreamChat {
     if (this.userAgent) {
       return this.userAgent;
     }
-    const version = "9.41.1";
+    const version = "9.42.0";
     const clientBundle = "browser-esm";
     let userAgentString = "";
     if (this.sdkIdentifier) {
@@ -17766,6 +17884,7 @@ export {
   ThreadManager,
   TokenManager,
   UPDATE_LIVE_LOCATION_REQUEST_MIN_THROTTLE_TIMEOUT,
+  UploadManager,
   UserFromToken,
   UserSearchSource,
   VALID_MAX_VOTES_VALUE_REGEX,