@naviedu/room-platform-react 0.0.80 → 0.0.81

package/index.esm.js

@@ -25944,24 +25944,6 @@ function createChatClient(config) {
                     });
                 })();
             },
-            completeAttachments: function completeAttachments(input) {
-                return _async_to_generator$9(function() {
-                    var _input_idempotencyKey;
-                    return _ts_generator$9(this, function(_state) {
-                        state.getRoom(roomId);
-                        return [
-                            2,
-                            request("/chat/rooms/".concat(encodeURIComponent(roomId), "/attachments/complete"), {
-                                body: JSON.stringify({
-                                    idempotencyKey: (_input_idempotencyKey = input.idempotencyKey) !== null && _input_idempotencyKey !== void 0 ? _input_idempotencyKey : idGenerator(),
-                                    attachmentIds: input.attachmentIds
-                                }),
-                                method: 'POST'
-                            })
-                        ];
-                    });
-                })();
-            },
             renewAttachmentUploadUrl: function renewAttachmentUploadUrl(input) {
                 return _async_to_generator$9(function() {
                     var _input_idempotencyKey;
@@ -58312,12 +58294,10 @@ function MessageComposer(param) {
     }), 2), selection = _useState5[0], setSelection = _useState5[1];
     var _useState6 = _sliced_to_array$b(useState(), 2), pendingCaret = _useState6[0], setPendingCaret = _useState6[1];
     var filesRef = useRef(files);
-    var completedAttachmentIdsRef = useRef(new Set());
     var isSubmittingRef = useRef(false);
     var generationRef = useRef(0);
     var presignOperationByBatchRef = useRef(new Map());
     var presignOperationByClientRef = useRef(new Map());
-    var completeOperationRef = useRef(undefined);
     var sendOperationRef = useRef(undefined);
     var renewOperationByAttachmentRef = useRef(new Map());
     var uploadOperationByClientRef = useRef(new Map());
@@ -58437,10 +58417,6 @@ function MessageComposer(param) {
         });
     };
     var removeFile = function(clientId) {
-        var removedFile = filesRef.current.find(function(item) {
-            return item.clientId === clientId;
-        });
-        if (removedFile === null || removedFile === void 0 ? void 0 : removedFile.upload) completedAttachmentIdsRef.current.delete(removedFile.upload.attachmentId);
         uploadOperationByClientRef.current.delete(clientId);
         updateFiles(function(current) {
             return current.filter(function(item) {
@@ -58577,7 +58553,6 @@ function MessageComposer(param) {
                     case 6:
                         renewError = _state.sent();
                         if (!hasChatErrorCode(renewError, 'CHAT_MESSAGE_ATTACHMENT_UPLOAD_EXPIRED')) throw renewError;
-                        completedAttachmentIdsRef.current.delete(upload.attachmentId);
                         updateFiles(function(current) {
                             return current.map(function(candidate) {
                                 return candidate.clientId === item.clientId ? _object_spread_props$6(_object_spread$8({}, candidate), {
@@ -58898,7 +58873,7 @@ function MessageComposer(param) {
     };
     var uploadAndSend = function(messageText, generation) {
         return _async_to_generator$8(function() {
-            var pendingItems, newItems, pendingOperations, incompleteFile, attachmentIds, attachmentIdsToComplete, completePayload, completed, completedIds, sendPayload, sendKey, uploadError;
+            var pendingItems, newItems, pendingOperations, incompleteFile, attachmentIds, sendPayload, sendKey, uploadError;
             return _ts_generator$8(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -58913,9 +58888,9 @@ function MessageComposer(param) {
                     case 1:
                         _state.trys.push([
                             1,
-                            6,
+                            4,
                             ,
-                            7
+                            5
                         ]);
                         pendingItems = filesRef.current.filter(function(item) {
                             return item.status !== 'completed';
@@ -58945,38 +58920,6 @@ function MessageComposer(param) {
                             return Boolean(attachmentId);
                         });
                         if (attachmentIds.length !== filesRef.current.length) throw new Error('Ảnh chưa sẵn sàng để gửi.');
-                        attachmentIdsToComplete = attachmentIds.filter(function(attachmentId) {
-                            return !completedAttachmentIdsRef.current.has(attachmentId);
-                        });
-                        if (!attachmentIdsToComplete.length) return [
-                            3,
-                            4
-                        ];
-                        completePayload = JSON.stringify({
-                            attachmentIds: attachmentIdsToComplete
-                        });
-                        return [
-                            4,
-                            roomClient.completeAttachments({
-                                attachmentIds: attachmentIdsToComplete,
-                                idempotencyKey: getOperationKey(completeOperationRef, 'complete', completePayload)
-                            })
-                        ];
-                    case 3:
-                        completed = _state.sent();
-                        assertCurrentGeneration(generation);
-                        completedIds = new Set(completed.attachmentIds);
-                        if (attachmentIdsToComplete.some(function(attachmentId) {
-                            return !completedIds.has(attachmentId);
-                        })) {
-                            throw new Error('Máy chủ chưa hoàn tất tất cả ảnh.');
-                        }
-                        attachmentIdsToComplete.forEach(function(attachmentId) {
-                            return completedAttachmentIdsRef.current.add(attachmentId);
-                        });
-                        completeOperationRef.current = undefined;
-                        _state.label = 4;
-                    case 4:
                         sendPayload = JSON.stringify({
                             attachmentIds: attachmentIds,
                             text: messageText
@@ -58990,21 +58933,20 @@ function MessageComposer(param) {
                                 text: messageText
                             }, sendKey)
                         ];
-                    case 5:
+                    case 3:
                         _state.sent();
                         assertCurrentGeneration(generation);
                         updateFiles(function() {
                             return [];
                         });
-                        completedAttachmentIdsRef.current.clear();
                         sendOperationRef.current = undefined;
                         setText('');
                         setError(undefined);
                         return [
                             3,
-                            7
+                            5
                         ];
-                    case 6:
+                    case 4:
                         uploadError = _state.sent();
                         if (_instanceof$2(uploadError, StaleComposerOperationError)) return [
                             2
@@ -59012,9 +58954,9 @@ function MessageComposer(param) {
                         setError(_instanceof$2(uploadError, Error) ? uploadError.message : 'Không thể gửi ảnh.');
                         return [
                             3,
-                            7
+                            5
                         ];
-                    case 7:
+                    case 5:
                         return [
                             2
                         ];
@@ -60060,21 +60002,17 @@ function MessageAttachmentGallery(param) {
                             className: "navi-chat__attachment-state navi-chat__attachment-state--failed",
                             role: "alert",
                             children: [
-                                /*#__PURE__*/ jsxs("span", {
-                                    children: [
-                                        "Kh\xf4ng thể xử l\xfd ",
-                                        attachment.fileName,
-                                        "."
-                                    ]
+                                /*#__PURE__*/ jsx("span", {
+                                    children: attachment.state === 'rejected' ? "Kh\xf4ng thể sử dụng ".concat(attachment.fileName, ".") : "Kh\xf4ng thể xử l\xfd ".concat(attachment.fileName, ".")
                                 }),
-                                /*#__PURE__*/ jsx("button", {
+                                attachment.retryable ? /*#__PURE__*/ jsx("button", {
                                     disabled: !onRetryAttachment || retryingIds.has(attachment.id),
                                     onClick: function() {
                                         return void retryAttachment(attachment.id);
                                     },
                                     type: "button",
                                     children: retryingIds.has(attachment.id) ? 'Đang thử lại...' : "Thử lại ".concat(attachment.fileName)
-                                }),
+                                }) : null,
                                 retryErrors[attachment.id] ? /*#__PURE__*/ jsx("span", {
                                     role: "status",
                                     children: retryErrors[attachment.id]
@@ -62062,7 +62000,7 @@ var mergeAttachment = function(current, incoming) {
 };
 var getAttachmentRank = function(attachment) {
     if ('previewUrl' in attachment) return 2;
-    if (attachment.state === 'failed') return 1;
+    if (attachment.state === 'failed' || attachment.state === 'rejected') return 1;
     return 0;
 };
 var markFailedAttachments = function(messagesByRoom, failureBuffer, retryStates) {
@@ -62132,9 +62070,10 @@ var applyBufferedFailuresToMessage = function(message, failureBuffer, retryState
         });
         if (!failure) return attachment;
         changed = true;
-        if ('previewUrl' in attachment || attachment.state === 'failed') return attachment;
+        if ('previewUrl' in attachment) return attachment;
         return _object_spread_props$4(_object_spread$6({}, attachment), {
-            state: 'failed'
+            state: failure.state,
+            retryable: failure.retryable
         });
     });
     return changed ? _object_spread_props$4(_object_spread$6({}, message), {
@@ -62147,8 +62086,9 @@ var markAttachmentProcessing = function(messagesByRoom, roomId, attachmentId) {
         var _message_attachments;
         return _object_spread_props$4(_object_spread$6({}, message), {
             attachments: ((_message_attachments = message.attachments) !== null && _message_attachments !== void 0 ? _message_attachments : []).map(function(attachment) {
-                return attachment.id === attachmentId && !('previewUrl' in attachment) && attachment.state === 'failed' ? _object_spread_props$4(_object_spread$6({}, attachment), {
-                    state: 'processing'
+                return attachment.id === attachmentId && !('previewUrl' in attachment) && attachment.state === 'failed' && attachment.retryable ? _object_spread_props$4(_object_spread$6({}, attachment), {
+                    state: 'processing',
+                    retryable: false
                 }) : attachment;
             })
         });
@@ -62161,7 +62101,8 @@ var markAttachmentFailed = function(messagesByRoom, roomId, attachmentId) {
         return _object_spread_props$4(_object_spread$6({}, message), {
             attachments: ((_message_attachments = message.attachments) !== null && _message_attachments !== void 0 ? _message_attachments : []).map(function(attachment) {
                 return attachment.id === attachmentId && !('previewUrl' in attachment) && attachment.state === 'processing' ? _object_spread_props$4(_object_spread$6({}, attachment), {
-                    state: 'failed'
+                    state: 'failed',
+                    retryable: true
                 }) : attachment;
             })
         });
@@ -62204,7 +62145,7 @@ var parseChatMessageAttachmentsFailedEvent = function(event) {
     var candidate = event;
     if (typeof candidate.appId !== 'string' || typeof candidate.roomId !== 'string' || typeof candidate.messageId !== 'string' || !Array.isArray(candidate.attachmentIds) || !candidate.attachmentIds.every(function(attachmentId) {
         return typeof attachmentId === 'string';
-    }) || typeof candidate.attemptId !== 'string' || candidate.attemptId.length === 0) {
+    }) || typeof candidate.attemptId !== 'string' || candidate.attemptId.length === 0 || candidate.state !== 'failed' && candidate.state !== 'rejected' || typeof candidate.retryable !== 'boolean' || candidate.state === 'rejected' && candidate.retryable) {
         return undefined;
     }
     return {
@@ -62212,7 +62153,9 @@ var parseChatMessageAttachmentsFailedEvent = function(event) {
         attachmentIds: candidate.attachmentIds,
         messageId: candidate.messageId,
         roomId: candidate.roomId,
-        attemptId: candidate.attemptId
+        attemptId: candidate.attemptId,
+        state: candidate.state,
+        retryable: candidate.retryable
     };
 };
 var subjectFromToken = function(token) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naviedu/room-platform-react",
-  "version": "0.0.80",
+  "version": "0.0.81",
   "type": "module",
   "main": "./index.esm.js",
   "module": "./index.esm.js",