Merge branch 'develop' into 'master'

Javier Acuna · Javier Acuna · commit c9dca93e5f02 · 2025-06-05T15:33:58.000Z
Develop

See merge request prey/js/prey-node-client!1238
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 
-## [v1.13.15](https://github.com/prey/prey-node-client/tree/v1.13.14) (2025-05-28)
+## [v1.13.16](https://github.com/prey/prey-node-client/tree/v1.13.16) (2025-05-30)
+[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.15..v1.13.16)
+
+- Fix: Fixes a bug killing Prey services when calling directly to updater.exe in order to mantain wpxsvc up to date. ([SoraKenji](https://github.com/SoraKenji))
+
+- Fix: Fixes a case when trying to send a new location for location aware tracking and it didn't added "force" parameter. ([SoraKenji](https://github.com/SoraKenji))
+
+## [v1.13.15](https://github.com/prey/prey-node-client/tree/v1.13.15) (2025-05-29)
 [Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.14..v1.13.15)
 
 - Fix: Fixes error on empty file for log retrieval action. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
diff --git a/lib/agent/triggers/location/index.js b/lib/agent/triggers/location/index.js
@@ -2,7 +2,6 @@
 /* eslint-disable max-len */
 const { join } = require('path');
 const Emitter = require('events').EventEmitter;
-const https = require('https');
 
 const basePath = join(__dirname, '..', '..');
 // eslint-disable-next-line import/no-dynamic-require
@@ -22,37 +21,6 @@ let checking = false;
 const accuracyThreshold = 50;
 const timeToWaitForSecond = 60 * 1000;
 
-const getCurrentTime = (cb) => {
-  const options = {
-    hostname: 'timeapi.io',
-    path: '/api/time/current/zone?timeZone=GMT',
-    method: 'GET',
-    headers: {
-      Accept: 'application/json',
-    },
-  };
-
-  const req = https.request(options, (res) => {
-    let data = '';
-    res.on('data', (chunk) => {
-      data += chunk;
-    });
-    res.on('end', () => {
-      try {
-        cb(JSON.parse(data));
-      } catch (e) {
-        cb(null, e);
-      }
-    });
-  });
-
-  req.on('error', (error) => {
-    cb(null, error);
-  });
-
-  req.end();
-};
-
 const storeForceData = (type, query, cb) => {
   storage.do(type, query, (errSet) => {
     if (errSet) {
@@ -63,35 +31,35 @@ const storeForceData = (type, query, cb) => {
   });
 };
 
-const dateDifference = (date, secondDate) => {
-  const timeDiff = date.getTime() - secondDate.getTime();
-  const diffHours = timeDiff / (1000 * 3600);
-  return diffHours;
-};
-
-const check24TimeLoop = (time, timeStoraged, cb) => {
-  const dateTime = new Date(time);
-  const dateTimeStoraged = new Date(timeStoraged);
-  const diff = dateDifference(dateTime, dateTimeStoraged);
-  logger.debug(`Diff: ${diff}`);
-  if (diff > 24) {
-    cb(true);
-  } else cb(false);
+const checkOneDayDifference = (time, timeStoraged, cb) => {
+  let timeDate;
+  let timeStoragedDate;
+  try {
+    timeDate = new Date(time);
+    timeStoragedDate = new Date(timeStoraged);
+  } catch (ex) {
+    return cb(false);
+  }
+  if (timeDate > timeStoragedDate) {
+    if (timeDate.getDate() !== timeStoragedDate.getDate()) {
+      return cb(true);
+    }
+  }
+  cb(false);
 };
 
-const writeStorage = (external, local, cb) => {
+const writeStorage = (local, cb) => {
   storage.do('query', { type: 'keys', column: 'id', data: 'last_force_datetime' }, (err, stored) => {
-    if (err) logger.error('Error getting the last force location datetime');
+    if (err) {
+      logger.error('Error getting the last force location datetime');
+      return cb(false, err);
+    }
     if (stored && stored.length > 0) {
       const data = JSON.parse(stored[0].value);
       logger.debug(`Last force location datetime: ${JSON.stringify(data)}`);
-      if ((external === null || data.externalDateTime === 'null')) {
-        check24TimeLoop(local, data.localDateTime, cb);
-      } else {
-        check24TimeLoop(external, data.externalDateTime, cb);
-      }
+      checkOneDayDifference(local, data.localDateTime, cb);
     } else {
-      const dataToStore = { value: JSON.stringify({ localDateTime: local, externalDateTime: external }) };
+      const dataToStore = { value: JSON.stringify({ localDateTime: local }) };
       storeForceData('set', { type: 'keys', id: 'last_force_datetime', data: dataToStore }, (errStoreSet) => {
         if (errStoreSet) return cb(null, new Error('Unable to set db keys last force location values'));
         cb(true);
@@ -160,7 +128,7 @@ const fetchLocation = (typeFetch, callback) => {
   let callBackStored = null;
   if (typeFetch === 'force') callBackStored = { callback };
   if (callback && typeFetch !== 'force' && typeof callback === 'function') locCallbacks.push(callback);
-  if (checking) return;
+  if (checking && typeFetch !== 'force') return;
 
   const fireCallbacks = (err, coords) => {
     if (callBackStored && (err || !coords)) callBackStored.callback(err, coords);
@@ -236,23 +204,19 @@ const fetchLocation = (typeFetch, callback) => {
 };
 
 const forceLocation = () => {
-  getCurrentTime((res, error) => {
-    let externalTime = '';
-    if (res && !error) externalTime = `${res.dateTime}Z`;
-    const dataToUpdate = { externalDateTime: externalTime, localDateTime: new Date().toISOString() };
-    writeStorage(dataToUpdate.externalDateTime, dataToUpdate.localDateTime, (respWrite) => {
-      if (!respWrite) return;
-      fetchLocation('force', (err) => {
-        if (err) return;
-        storeForceData('update', {
-          type: 'keys', id: 'last_force_datetime', columns: ['value'], values: [JSON.stringify(dataToUpdate)],
-        }, (errStoredUpdate) => {
-          if (errStoredUpdate) {
-            logger.error('Unable to update db  keys last force location values');
-            return;
-          }
-          logger.info('Updated db keys last force location values');
-        });
+  const dataToUpdate = { localDateTime: new Date().toISOString() };
+  writeStorage(dataToUpdate.localDateTime, (respWrite) => {
+    if (!respWrite) return;
+    fetchLocation('force', (err) => {
+      if (err) return;
+      storeForceData('update', {
+        type: 'keys', id: 'last_force_datetime', columns: ['value'], values: [JSON.stringify(dataToUpdate)],
+      }, (errStoredUpdate) => {
+        if (errStoredUpdate) {
+          logger.error('Unable to update db  keys last force location values');
+          return;
+        }
+        logger.info('Updated db keys last force location values');
       });
     });
   });
@@ -291,3 +255,5 @@ exports.events = [];
 exports.current = current;
 exports.send_location = sendLocation;
 exports.post_it = postIt;
+exports.checkOneDayDifference = checkOneDayDifference;
+exports.writeStorage = writeStorage;
diff --git a/lib/agent/updater.js b/lib/agent/updater.js
@@ -1,14 +1,18 @@
-const { eq } = require('semver');
-const { join } = require('path');
+const path = require('path');
+
 const exists = require('fs').existsSync;
 
 const needle = require('needle');
 const os = require('os');
 const childProcess = require('child_process');
+const { greaterOrEqual } = require('./helpers');
 const common = require('./common');
 
 const logger = common.logger.prefix('updater');
 const { system } = common;
+const { join } = path;
+
+const nodeBin = join(system.paths.current, 'bin', 'node');
 
 const { exec } = childProcess;
 
@@ -89,9 +93,9 @@ const update_client = function (new_version, cb) {
       if (line.match('YOUARENOTMYFATHER')) {
         // Keep the process alive for a while in the case we get an error.
         setTimeout(() => {
-            logger.warn('Upgrade successful! See you in another lifetime, young one.');
-            exports.upgrading = false;
-            let_the_child_go();
+          logger.warn('Upgrade successful! See you in another lifetime, young one.');
+          exports.upgrading = false;
+          let_the_child_go();
         }, timeout);
       } else if (line.includes('Error')) {
         logger.warn(line);
@@ -134,11 +138,10 @@ exports.check_for_update_winsvc = (cb) => {
   /** Skip this block if OS is not windows. */
   if (os.platform() != 'win32') { return cb(new Error('Action only allowed on Windows')); }
 
-  const updater_path = join(system.paths.package, 'bin', 'updater.exe');
-  const sys_win = require('../system/windows');
+  const sysWin = require('../system/windows');
   /** Get the current version of winsvc running on the device. */
   // eslint-disable-next-line consistent-return
-  sys_win.get_winsvc_version((err, current_service_version) => {
+  sysWin.get_winsvc_version((err, current_service_version) => {
     if (!patternMajorMinorPatch.test(current_service_version)) return cb(new Error('WinSVC version doesnt have the correct format'));
     if (err) return cb(new Error('Error to get winsvc version'));
 
@@ -152,18 +155,16 @@ exports.check_for_update_winsvc = (cb) => {
       if (!patternMajorMinorPatch.test(service_version_stable)) return cb(new Error('WinSVC stable version doesnt have the correct format'));
       if (err) return cb(new Error('Error to get stable version'));
 
-      logger.notice(`New version found winsvc: ${service_version_stable}`);
+      logger.notice(`Version found winsvc: ${service_version_stable}`);
 
       /** check if device is running the latest version. */
-      if (service_version_stable && eq(current_service_version, service_version_stable)) {
-        logger.notice(`Nothing to do. latest version already installed. ${service_version_stable}`);
+      if (service_version_stable && greaterOrEqual(current_service_version, service_version_stable)) {
+        logger.notice(`Nothing to do. latest version already installed. ${current_service_version}`);
         return cb(null, true);
       }
 
-      /** Perform the update. */
-      exports.update_winsvc(`${updater_path} -v=${current_service_version}`, (err_update) => {
-        if (err_update) { return cb(new Error(`error to update winsvc,${err_update.message}`)); }
-
+      system.updateAsAdminUser('winsvc', (errUpdate) => {
+        if (errUpdate) { return cb(new Error('error to update winsvc')); }
         return cb(null, true);
       });
     });
@@ -179,25 +180,26 @@ const check_for_update = function (cb) {
 
     exports.check_enabled = false;
 
-    const versions_path = system.paths.versions;
+    const versionsPath = system.paths.versions;
     const branch = config.getData('download_edge') == true ? 'edge' : 'stable';
 
-    common.package.new_version_available(branch, common.version, (err, new_version, downloads_url) => {
-      logger.debug(`Checking for updates on ${branch} branch... and on url: ${downloads_url}`);
-      if (err || !new_version) {
-        common.package.check_update_success(common.version, versions_path, (err) => cb && cb(err || new Error('Theres no new version available')));
+    common.package.new_version_available(branch, common.version, (err, newVersion, downloadsUrl) => {
+      logger.debug(`Checking for updates on ${branch} branch... and on url: ${downloadsUrl}`);
+      if (err || !newVersion) {
+        common.package.check_update_success(common.version, versionsPath, (errCheck) => cb && cb(errCheck || new Error('Theres no new version available')));
       } else {
         needle.put(updatingHost, null, { timeout: 4500 }, () => {
-          logger.notice(`New Agent version found: ${new_version}`);
-          update_client(new_version, cb);
+          logger.notice(`New Agent version found: ${newVersion}`);
+          update_client(newVersion, cb);
         });
       }
     });
-
-    exports.check_for_update_winsvc((err, is_updated) => {
-      if (err) logger.info(err.message);
-      if (is_updated) logger.info('winsvc updated ');
-    });
+    setTimeout(() => {
+      exports.check_for_update_winsvc((err, isUpdated) => {
+        if (err) logger.info(err.message);
+        if (isUpdated) logger.info('winsvc called to verify correctly.');
+      });
+    }, 60 * 1000);
   });
 };
 
diff --git a/lib/system/index.js b/lib/system/index.js
@@ -82,6 +82,7 @@ system.get_current_hostname = system.get_current_hostname;
 if (system.os_name == 'windows') {
   system.get_os_edition = system.get_os_edition;
   system.get_winsvc_version = system.get_winsvc_version;
+  system.updateAsAdminUser = system.updateAsAdminUser;
   system.get_as_admin = system.get_as_admin;
   system.run_as_admin = system.run_as_admin;
   system.check_service = system.check_service;
@@ -139,6 +140,14 @@ system.spawn_as_logged_user = function (command, args, opts, cb) {
   as('logged_user', 'spawn', command, args, opts, cb);
 };
 
+system.updateAsAdminUser = (what, cb) => {
+  system.check_service(what, (err, data) => {
+    if (err) return cb(err);
+
+    system.updateAsAdmin(data, cb);
+  });
+};
+
 system.get_as_admin_user = function (what, cb) {
   system.check_service(what, (err, data) => {
     if (err) return cb(err);
diff --git a/lib/system/windows/index.js b/lib/system/windows/index.js
@@ -20,6 +20,7 @@ const osName = os.platform().replace('win32', 'windows');
 
 const LOCALHOST_ACTION = 'http://127.0.0.1:7739/action';
 const LOCALHOST_PROVIDER = 'http://127.0.0.1:7739/provider';
+const LOCALHOST_UPDATE = 'http://127.0.0.1:7739/update';
 
 exports.monitoring_service_go = false;
 // add windows bin path to env
@@ -155,6 +156,22 @@ exports.check_service = (data, cb) => {
     return cb(null, data);
   });
 };
+
+exports.updateAsAdmin = (data, cb) => {
+  const opts = {
+    timeout: 90000,
+    json: true,
+  };
+  needle.post(`${LOCALHOST_UPDATE}?target=${data}`, null, opts, (err, resp) => {
+    if (err) {
+      if (typeof cb !== 'function') return;
+      return cb(err);
+    }
+    if (resp?.statusCode !== 200) return cb(new Error('Unable to update provider'));
+    cb();
+  });
+};
+
 exports.get_as_admin = function (provider, cb) {
   const body = {
     provider,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prey",
-  "version": "1.13.15",
+  "version": "1.13.16",
   "author": "Engineering <tec@preyhq.com>",
   "keywords": [
     "prey",
diff --git a/test/lib/agent/triggers/location/locationindex.test.js b/test/lib/agent/triggers/location/locationindex.test.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "prey",`
`3`		`- "version": "1.13.15",`
	`3`	`+ "version": "1.13.16",`
`4`	`4`	`"author": "Engineering <[email protected]>",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"prey",`