@sendsafely/sendsafely 2.0.2 → 2.0.3

package/lib/FileUtil.js

@@ -23,13 +23,9 @@ function FileUtil(param) {
     this.SEGMENT_SIZE = 2621440;
     this.filePath = param.filePath;
     this.callback = param.callback;
-    this.file = {size: 0, name: '', totalParts: 0};
-    this.readableStream = fs.createReadStream(myself.filePath);
-    this.reading = false;
     this.eof = false;
     this.data = [];
     this.tempSize = 0;
-    this.part = 1;
 
     this.init = function() {
         return new Promise(function(resolve) {
@@ -37,20 +33,9 @@ function FileUtil(param) {
                 if (err) {
                     throw new Error('FileUtil: File does not exist, ' + myself.filePath);
                 } else {
-                    myself.file.size = stats.size;
-                    myself.file.name =  path.basename(myself.filePath);
-
-                    if(myself.file.size > (myself.SEGMENT_SIZE/4)) {
-                        myself.file.totalParts = 1 + Math.ceil((myself.file.size-(myself.SEGMENT_SIZE/4))/myself.SEGMENT_SIZE);
-                    } else {
-                        myself.file.totalParts = 1;
-                    }
-
-                    resolve(myself.file);
-
-                    myself.readableStream.on('readable', function() {
-                        // keep reading chunk until it reaches SEGMENT_SIZE
-                        if(myself.reading && !myself.eof) {
+                    myself.readableStream = fs.createReadStream(myself.filePath);
+                    myself.readableStream.on('readable', function () {
+                        if (myself.waitingForRead) {
                             processChunk();
                         }
                     });
@@ -58,15 +43,19 @@ function FileUtil(param) {
                     myself.readableStream.on('end', function() {
                         // done reading file
                         myself.eof = true;
-                        if(myself.part === myself.file.totalParts) {
-                            callback(true);
-                        } else {
-                            // increment extra part if file size is less than segment/4
-                            // so that we callback with an empty array
-                            myself.part++;
-                            callback(false);
+                        if (myself.waitingForRead) {
+                            // Handle timing edge case where 'end' fires while a read is pending
+                            processChunk();
                         }
                     });
+
+                    const totalParts = stats.size === 0 ? 1 : Math.ceil(stats.size / myself.SEGMENT_SIZE);
+
+                    resolve({
+                        name: path.basename(myself.filePath),
+                        size: stats.size,
+                        totalParts: totalParts,
+                    });
                 }
             });
 
@@ -74,34 +63,36 @@ function FileUtil(param) {
     }
 
     this.read = function() {
-        if(!myself.reading && !myself.eof) {
-            myself.reading = true;
-            processChunk();
-        } else if(myself.part === myself.file.totalParts) {
-            //extra part padding with empty array if file size is less than segment/4
-            callback(true);
+        if (myself.eof && myself.tempSize === 0) {
+            return;
         }
+
+        myself.waitingForRead = true;
+        processChunk();
     }
 
     function processChunk() {
-        if(myself.tempSize === myself.SEGMENT_SIZE) {
-            myself.part++;
-            // callback when data size reaches SEGMENT_SIZE
-            callback(false);
-        } else {
-            let chunk = myself.readableStream.read();
-            if(chunk !== null) {
-                myself.data.push(new Uint8Array(chunk));
-                myself.tempSize += chunk.length;
-            }
+        let chunk;
+        while ((chunk = myself.readableStream.read()) !== null) { // Completely drain the stream's internal buffer
+            myself.data.push(new Uint8Array(chunk));
+            myself.tempSize += chunk.length;
         }
-    }
 
-    function callback(isComplete) {
-        myself.tempSize = 0;
-        myself.reading = false;
-        myself.callback({data: concatenate(myself.data), complete: isComplete});
-        myself.data = [];
+        if (myself.tempSize >= myself.SEGMENT_SIZE || myself.eof) {
+            if (myself.tempSize > 0) {
+                // We have a full segment
+                const buf = concatenate(myself.data);
+                const seg = buf.slice(0, myself.SEGMENT_SIZE);
+                const remainder = buf.slice(myself.SEGMENT_SIZE);
+                myself.data = remainder.length > 0 ? [remainder] : [];
+                myself.tempSize = remainder.length;
+                myself.callback({data: seg, complete: myself.eof && myself.tempSize === 0});
+            } else {
+                // Emit an empty final segment to signal completion & handles empty files
+                myself.callback({data: new Uint8Array(0), complete: true});
+            }
+            myself.waitingForRead = false;
+        }
     }
 
     function concatenate(arrays) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendsafely/sendsafely",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "main": "./lib/SendSafely.js",
   "engines": {
     "node": ">=18"