Merge branch 'develop' into 'master'

Develop

See merge request prey/js/prey-node-client!1230

Author: Javier Acuna

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [v1.13.15](https://github.com/prey/prey-node-client/tree/v1.13.14) (2025-05-28)
+[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.13..v1.13.14)
+
+- Fix: Fixes error on empty file for log retrieval action. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+
+
 ## [v1.13.14](https://github.com/prey/prey-node-client/tree/v1.13.14) (2025-05-23)
 [Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.13..v1.13.14)
 

lib/agent/actions/logretrieval/index.js

@@ -82,19 +82,28 @@ exports.collectFiles = (outputFile, cb) => {
       return;
     }
     array.push((callback) => {
-      let fileData;
+      let fileData = '';
       const rs = fs.createReadStream(file.path);
       rs.on('error', () => {
         callback();
       });
 
       rs.on('data', (data) => {
-        if (fileData) fileData = fileData.toString().concat(data);
-        else fileData = data;
+        try {
+          if (!data) logger.info(`There was an error reading file ${file.name}: no data`);
+          if (fileData) fileData = fileData.toString().concat(data);
+          else fileData = data;
+        } catch (error) {
+          logger.info(`There was an error reading file ${file.name}: ${error}`);
+        }
       });
 
       rs.on('close', () => {
-        archive.append(fileData, { name: file.name });
+        try {
+          archive.append(fileData || '', { name: file.name });
+        } catch (error) {
+          logger.info(`There was an error appending file ${file.name} to archive: ${error}`);
+        }
         callback();
       });
     });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "prey",
-  "version": "1.13.14",
+  "version": "1.13.15",
   "author": "Engineering <[email protected]>",
   "keywords": [
     "prey",