refactor if statements

Author: NickOvt

lib/attachments/gridstore-storage.js

@@ -366,33 +366,23 @@ class GridstoreStorage {
                 }
             }
 
-            if (streamOptions.start && streamOptions.start > attachmentData.length) {
-                streamOptions.start = attachmentData.length;
-            }
+            streamOptions.start = Math.min(
+                streamOptions.start ?? 0, // Default to 0 if undefined/null
+                attachmentData.length
+            );
 
-            if (streamOptions.end && streamOptions.end > attachmentData.length) {
-                streamOptions.end = attachmentData.length;
-            }
+            streamOptions.end = Math.min(
+                streamOptions.end ?? attachmentData.length, // Default to length if undefined/null
+                attachmentData.length
+            );
 
-            // Handle case where start equals or exceeds end
-            if (streamOptions.start && streamOptions.end && streamOptions.start >= streamOptions.end) {
+            if (streamOptions.start >= attachmentData.length) {
+                // If start is at or beyond EOF, set both to EOF
                 streamOptions.start = attachmentData.length;
                 streamOptions.end = attachmentData.length;
-            }
-
-            // Handle case where start equals file length (EOF scenario)
-            if (streamOptions.start === attachmentData.length && !streamOptions.end) {
-                streamOptions.end = attachmentData.length;
-            }
-
-            if (streamOptions.end === null || streamOptions.end === undefined) {
-                // still no stream end, default to length
-                streamOptions.end = attachmentData.length;
-            }
-
-            if (streamOptions.start > streamOptions.end) {
-                // Ensure in any case that start is never bigger than end
-                streamOptions.start = streamOptions.end;
+            } else if (streamOptions.start >= streamOptions.end) {
+                // If start >= end, clamp start to end (but not beyond file length)
+                streamOptions.start = Math.min(streamOptions.end, attachmentData.length);
             }
         }