fix(abortMiddleware): handle early abort error where userMessage.conv…

…ersationId is undefined. In this case, the userId will be used as the abortKey
bsu3338 · Aug 18, 2023 · 3c7f67f · 3c7f67f
1 parent c74c68a
commit 3c7f67f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/api/server/middleware/abortMiddleware.js b/api/server/middleware/abortMiddleware.js
@@ -30,10 +30,11 @@ const createAbortController = (res, req, endpointOption, getAbortData) => {
   const abortController = new AbortController();
   const onStart = (userMessage) => {
     sendMessage(res, { message: userMessage, created: true });
-    abortControllers.set(userMessage.conversationId, { abortController, ...endpointOption });
+    const abortKey = userMessage?.conversationId ?? req.user.id;
+    abortControllers.set(abortKey, { abortController, ...endpointOption });
 
     res.on('finish', function () {
-      abortControllers.delete(userMessage.conversationId);
+      abortControllers.delete(abortKey);
     });
   };