Merge branch 'develop' into 'master'

Develop

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

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v1.13.6](https://github.com/prey/prey-node-client/tree/v1.13.6) (2024-11-22)
+[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.5..v1.13.6)
+
+- Fix: Better handling Prey software shutdown cases. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+
+- Fix: Fix error when getting device status exceeded 3 minutes. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+
 ## [v1.13.5](https://github.com/prey/prey-node-client/tree/v1.13.5) (2024-11-21)
 [Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.4..v1.13.5)
 

lib/agent/cli.js

@@ -52,7 +52,7 @@ function shutdown(code, wait) {
 
   // we should only remove the pidfile if the agent is really running
   // otherwise a second instance would remove the pidfile of the first one
-  if (agent.running()) {
+  if (typeof agent.running === 'function' && agent.running()) {
     logger.info(`Gracefully shutting down. Will self-destruct in ${wait / 1000} secs.`);
 
     const timer = setTimeout(die, wait);
@@ -131,40 +131,40 @@ function trap_signals() {
       warn('\nLooks like there\'s no config file yet. Glad to see you\'re getting started. :)');
       return warn('To finish setting up Prey, please run `prey config hooks post_install` as root.\n', 1);
     }
-  
+
     trap_signals();
-  
+
     if (process.argv[2] == 'console') program.mode = 'console';
-  
+
     if (program.allowOther || program.run || program.mode == 'console') {
       return agent.run();
     }
-  
+
     // if running in console mode, or using -a or -r, pidfile won't
     // be available for them to remove on process.exit().
     pidfile = common.pid_file;
-  
+
     pid.store(pidfile, (err, running) => {
       if (err) {
         const msg = err.code == 'EPERM' ? `No write access to pidfile: ${pidfile}` : err.message;
         return warn(`Cannot continue: ${msg}`, 1);
       }
-  
+
       if (!running) return agent.run();
-  
+
       if (process.stdout.writable) {
         warn('\n The Prey agent is running. Good job!');
-  
+
         if (running.stat && running.stat.ctime) {
           const run_time = (new Date() - running.stat.ctime) / (60 * 1000);
           const run_time_str = run_time.toString().substring(0, 5);
           warn(` It has been live for ${run_time_str} minutes, under process ID ${running.pid}.`);
         }
-  
+
         warn(' To trigger actions or retrieve information, log in to your Prey account at https://preyproject.com');
         warn(' For additional configuration options, please run `prey config`.\n');
       }
-  
+
       process.exit(10);
     });
   });

lib/agent/triggers/status/index.js

@@ -67,8 +67,10 @@ exports.get_status = (cb, nameCallBack = '') => {
       exports.statusCallbacks = [];
 
       if (callbacksList.length >= 1) {
-        callbacksList.forEach((fn) => {
-          fn(null, null);
+        callbacksList.forEach((element) => {
+          if (element && element.cb && element.cb === 'function') {
+            element.cb(null, null);
+          }
         });
       }
     }, exports.timeoutGetStatusMs);
@@ -88,8 +90,10 @@ exports.get_status = (cb, nameCallBack = '') => {
     exports.statusCallbacks = [];
 
     if (callbacksList.length >= 1) {
-      callbacksList.forEach((fn) => {
-        fn.cb(err, exports.status);
+      callbacksList.forEach((element) => {
+        if (element && element.cb && element.cb === 'function') {
+          element.cb(err, exports.status);
+        }
       });
     }
   });

package.json

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