Merge pull request #226 from reportportal/feature/EPMRPP-100018-remove-microseconds

EPMRPP-100018 || Revert time format back to milliseconds

Author: AmsterGet

CHANGELOG.md

@@ -1,3 +1,8 @@
+### Changed
+- Revert time format back to milliseconds (based on [#217](https://github.com/reportportal/client-javascript/issues/217#issuecomment-2659843471)).
+  This is also fixing the issue with agent installation on ARM processors.
+### Security
+- Updated versions of vulnerable packages (axios).
 
 ## [5.3.1] - 2025-01-31
 ### Fixed

__tests__/helpers.spec.js

@@ -1,7 +1,6 @@
 const os = require('os');
 const fs = require('fs');
 const glob = require('glob');
-const microtime = require('microtime');
 const helpers = require('../lib/helpers');
 const pjson = require('../package.json');
 
@@ -21,38 +20,9 @@ describe('Helpers', () => {
     });
   });
 
-  describe('formatMicrosecondsToISOString', () => {
-    test('converts microseconds to ISO string with microseconds precision', () => {
-      const input = 1726842755304456;
-      const expected = '2024-09-20T14:32:35.304456Z';
-      const result = helpers.formatMicrosecondsToISOString(input);
-      expect(result).toBe(expected);
-    });
-
-    test('handles microseconds at the start of the epoch', () => {
-      const input = 654321;
-      const expected = '1970-01-01T00:00:00.654321Z';
-      const result = helpers.formatMicrosecondsToISOString(input);
-      expect(result).toBe(expected);
-    });
-
-    test('handles rounding down of microseconds correctly', () => {
-      const input = 1000001;
-      const expected = '1970-01-01T00:00:01.000001Z';
-      const result = helpers.formatMicrosecondsToISOString(input);
-      expect(result).toBe(expected);
-    });
-  });
-
   describe('now', () => {
-    it('should return the current timestamp with microseconds precision in ISO string format', () => {
-      const spyMicrotime = jest.spyOn(microtime, 'now').mockReturnValue(1726842755304456);
-      const expectedISOString = '2024-09-20T14:32:35.304456Z';
-
-      const result = helpers.now();
-
-      expect(spyMicrotime).toHaveBeenCalled();
-      expect(result).toBe(expectedISOString);
+    it('returns milliseconds from unix time', () => {
+      expect(new Date() - helpers.now()).toBeLessThan(100); // less than 100 miliseconds difference
     });
   });
 

lib/helpers.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const glob = require('glob');
 const os = require('os');
-const microtime = require('microtime');
 const RestClient = require('./rest');
 const pjson = require('../package.json');
 
@@ -18,16 +17,8 @@ const formatName = (name) => {
   return (len < MIN ? name + new Array(MIN - len + 1).join('.') : name).slice(-MAX);
 };
 
-const formatMicrosecondsToISOString = (timestampInMicroseconds) => {
-  const milliseconds = Math.floor(timestampInMicroseconds / 1000);
-  const microseconds = String(timestampInMicroseconds).slice(-3);
-  const isoDate = new Date(milliseconds).toISOString();
-
-  return isoDate.replace('Z', `${microseconds}Z`);
-};
-
 const now = () => {
-  return formatMicrosecondsToISOString(microtime.now());
+  return new Date().valueOf();
 };
 
 // TODO: deprecate and remove
@@ -110,7 +101,6 @@ const saveLaunchUuidToFile = (launchUuid) => {
 
 module.exports = {
   formatName,
-  formatMicrosecondsToISOString,
   now,
   getServerResult,
   readLaunchesFromFile,

package-lock.json

@@ -24,13 +24,12 @@
     "node": ">=14.x"
   },
   "dependencies": {
-    "axios": "^1.7.7",
+    "axios": "^1.8.4",
     "axios-retry": "^4.1.0",
     "glob": "^8.1.0",
     "ini": "^2.0.0",
     "uniqid": "^5.4.0",
-    "uuid": "^9.0.1",
-    "microtime": "^3.1.1"
+    "uuid": "^9.0.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {

package.json

@@ -1 +1 @@
-patch
+minor