Merge branch 'develop' into 'master'

fix: Refactor ack.js for improved readability and robustness, and update...

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

Author: Claudio

CHANGELOG.md

@@ -1,12 +1,21 @@
 # Change Log
 
-## [v1.13.10](https://github.com/prey/prey-node-client/tree/v1.13.10) (2024-2-3)
+## [v1.13.11](https://github.com/prey/prey-node-client/tree/v1.13.11) (2025-2-24)
+[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.10..v1.13.11)
+
+- Fix: Remove unused libraries to fix vulnerabilities. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+- Fix: Fixes error on ack_id undefined on websocket comunication. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+- Fix: Added valid signatures to files with expired signatures for Windows binaries. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+- Fix: Fixes an issue where Prey Lock would start when the user was locked out on Windows. This causes a problem when writing out the password to log in again.. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+- Feat: New Fenix version. It fixes an issue when trying to read device key from current installation. It also improves issue when deleting Prey service. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
+
+## [v1.13.10](https://github.com/prey/prey-node-client/tree/v1.13.10) (2025-2-3)
 [Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.9..v1.13.10)
 
 - Fix: Improve the updater logic for the first-time update. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
 - Feat: Replace all WMIC instances in the project; we are now using native WMI through PowerShell. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))
 
-## [v1.13.9](https://github.com/prey/prey-node-client/tree/v1.13.9) (2024-1-20)
+## [v1.13.9](https://github.com/prey/prey-node-client/tree/v1.13.9) (2025-1-20)
 [Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.8..v1.13.9)
 
 - Feat: Remove wmic from file retrieval functionality. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))

bin/fenix.exe

@@ -1,30 +1,17 @@
 const ackType = 'ack';
 
-const existKeyAckInJson = (json) => {
-  // eslint-disable-next-line no-prototype-builtins
-  if (json.hasOwnProperty('ack_id')) {
-    return true;
-  }
-  return false;
-};
-const existKeyIdInJson = (json) => {
-  // eslint-disable-next-line no-prototype-builtins
-  if (json.hasOwnProperty('id')) {
-    return true;
-  }
-  return false;
-};
+const existKeyAckInJson = (json) => Object.hasOwn(json, 'ack_id');
 
 exports.processAck = (json, cb) => {
-  if (!existKeyAckInJson(json)) {
-    return cb(new Error('there is no key ack_id in the json'));
-  }
+  if (!existKeyAckInJson(json)) return cb(new Error('there is no key ack_id in the json'));
+
+  const { ack_id: ackId, id = '' } = json;
+
   return cb(null, {
-    ack_id: json.ack_id,
+    ack_id: ackId,
     type: ackType,
-    id: existKeyIdInJson(json) ? json.id : '',
+    id,
   });
 };
 
 exports.existKeyAckInJson = existKeyAckInJson;
-exports.existKeyIdInJson = existKeyIdInJson;

bin/updater.exe

@@ -1,30 +1,38 @@
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable consistent-return */
 const { join } = require('path');
 const logger = require('./common').logger.prefix('actions');
 const hooks = require('./hooks');
 
 const actions = {};
 const running = {};
 
-const load_action = (type, name) => {
+const loadAction = (type, name) => {
   const file = join(__dirname, `${type}s`, name);
   try {
+    // eslint-disable-next-line global-require
     return require(file);
   } catch (e) {
     hooks.trigger('error', e);
   }
 };
 
-const watch_action_events = (events, emitter) => {
+const watchActionEvents = (events, emitter) => {
   events.forEach((eventName) => {
     emitter.on(eventName, (data) => {
       hooks.trigger('event', eventName, data);
       hooks.trigger(eventName, data);
     });
   });
 };
-// type can be 'action' or 'trigger'
-const action_running = (type, id, action, name, opts, emitter) => {
+
+const actionStopped = (id) => {
+  delete running[id];
+};
+
+const actionRunning = (type, id, action, name, opts, emitter) => {
   logger.info(`Running: ${name} ${id}`);
+  if (!action || !name) logger.info(`Error on actionRunning: ${name} -> ${action}`);
   running[id] = { name, action };
 
   emitter.once('end', (idEmitter, err, out) => {
@@ -33,8 +41,8 @@ const action_running = (type, id, action, name, opts, emitter) => {
       logger.info(`Error: ${JSON.stringify(err)}`);
     }
 
-    logger.info(`Stopped: ${name}`);
-    action_stopped(idEmitter);
+    logger.info(`Stopped ${type}: ${name} ${id}`);
+    actionStopped(idEmitter);
 
     setTimeout(() => {
       hooks.trigger(type, 'stopped', idEmitter, name, opts, err, out);
@@ -44,39 +52,34 @@ const action_running = (type, id, action, name, opts, emitter) => {
   });
 
   if (!action.events) return;
-  watch_action_events(action.events, emitter);
-};
-
-const action_stopped = (id) => {
-  delete running[id];
+  watchActionEvents(action.events, emitter);
 };
 
-const start = function (type, id, name, opts, cb) {
+const start = (type, id, name, opts, cb) => {
   // Action with same id is not executed
   if (running[id]) {
     const err = new Error(`Already running: ${running[id].name} with id: ${id}`);
     hooks.emit('error', err);
-
-    return cb && cb(err);
+    return cb?.(err);
   }
 
   if (Object.values(running).filter((x) => x.name === name).length > 0) {
-    const err = new Error(`Already running: ${name}`);
+    const err = new Error(`Already running: ${name} ${id}`);
     hooks.emit('error', err);
-    return cb && cb(err);
+    return cb?.(err);
   }
 
-  logger.info(`Starting ${type}: ${name}`);
+  logger.info(`Starting ${type}: ${name} ${id}`);
 
-  const action = load_action(type, name);
-  if (!action) return; // load_action will emit trigger
+  const action = loadAction(type, name);
+  if (!action) return;
 
   action.type = type;
   action.options = typeof opts === 'function' ? {} : opts;
 
   // eslint-disable-next-line consistent-return
   action.start(id, opts, (err, emitter) => {
-    cb && cb(err);
+    if (cb) cb(err);
 
     if (err) {
       logger.info(`Failed: ${name} -> ${err.message}`);
@@ -95,7 +98,7 @@ const start = function (type, id, name, opts, cb) {
       }, 500);
     }
     if (emitter) {
-      action_running(type, id, action, name, options, emitter);
+      actionRunning(type, id, action, name, options, emitter);
     } else {
       // no emitter was returned, so we have no way of knowing when
       // this action will stop. given that the command watcher needs to know
@@ -113,31 +116,36 @@ actions.start = (id, name, opts, cb) => {
   start('action', id, name, opts, cb);
 };
 
-// TODO: agregar lo del opts para el response
 actions.stop = (id, name, opts) => {
-  if (!running[id]) {
+  if (!Object.hasOwn(running, id)) {
     hooks.trigger('action', 'stopped', id, name, opts);
     return;
   }
 
   const { action } = running[id];
 
-  if (!action) {
-    logger.warn('Action not running!');
-    hooks.trigger('action', 'stopped', id, name, opts);
-  } else if (!action.stop) {
-    logger.warn('Action not stoppable!');
-  } else {
-    logger.info(`Stopping: ${running[id].name}, with id: ${id}`);
-    action.stop();
-    action_stopped(id);
+  try {
+    if (!action) {
+      logger.info(`Action ${running[id].name}, with id: ${id} not running!`);
+      hooks.trigger('action', 'stopped', id, name, opts);
+    } else if (!action.stop) {
+      logger.info(`Action ${running[id].name}, with id: ${id} not stoppable!`);
+    } else {
+      logger.info(`Stopping: ${running[id].name}, with id: ${id}`);
+      action.stop();
+      actionStopped(id);
+    }
+  } catch (err) {
+    logger.error(`Error stopping action ${id}: ${err}`);
   }
 };
 
-actions.stop_all = function () {
-  for (const id in running) {
-    actions.stop(id);
-  };
+actions.stop_all = () => {
+  Object.keys(running).forEach((id) => {
+    if (Object.hasOwn(running, id)) {
+      actions.stop(id);
+    }
+  });
 };
 
 module.exports = actions;