@contrast/core 1.53.0 → 1.54.0

package/lib/system-info/index.js

@@ -15,9 +15,11 @@
 // @ts-check
 'use strict';
 
-const fs = require('fs/promises');
-const os = require('os');
-const v8 = require('v8');
+const cp = require('node:child_process');
+const fs = require('node:fs/promises');
+const os = require('node:os');
+const util = require('node:util');
+const v8 = require('node:v8');
 const {
   primordials: { StringPrototypeMatch, StringPrototypeTrim },
 } = require('@contrast/common');
@@ -29,6 +31,8 @@ const MOUNTINFO_REGEX = /\/docker\/containers\/(.*?)\//;
 const CGROUP_REGEX = /:\/docker\/([^/]+)$/;
 const MAX_CGROUP_MEMORY_LIMIT = 2 ** 63 - 1; // Common "unlimited" value for cgroup limits
 
+const exec = util.promisify(cp.exec);
+
 /**
  * Asynchronously determines if the current environment is running inside a
  * Docker container.
@@ -134,6 +138,27 @@ async function getDockerMemoryLimit() {
   }
 }
 
+/**
+ * Retrieves macOS system information using the `sw_vers` command.
+ * Returns `null` if the command fails or is not available.
+ * @returns {Promise<{
+ *  productName: string;
+ *  productVersion: string;
+ *  buildVersion: string;
+ * } | null>}
+ */
+async function macOsInfo() {
+  try {
+    return {
+      productName: StringPrototypeTrim.call((await exec('sw_vers -productName')).stdout),
+      productVersion: StringPrototypeTrim.call((await exec('sw_vers -productVersion')).stdout),
+      buildVersion: StringPrototypeTrim.call((await exec('sw_vers -buildVersion')).stdout)
+    };
+  } catch {
+    return null;
+  }
+}
+
 /**
  * @param {import('..').Core & {
  *  _systemInfo: import('@contrast/common').SystemInfo | undefined;
@@ -149,11 +174,14 @@ module.exports = function (core) {
     if (core._systemInfo) return core._systemInfo;
 
     const cpus = os.cpus();
+    const totalmem = os.totalmem();
     const heapStats = v8.getHeapStatistics();
+    const free_heap_size = heapStats.heap_size_limit - heapStats.used_heap_size;
     const dockerMemoryLimit = await getDockerMemoryLimit();
 
     const osMemoryInfo = {
-      total: humanReadableBytes(os.totalmem()),
+      total: humanReadableBytes(totalmem),
+      totalBytes: totalmem,
     };
     const linuxOsInfo = await getLinuxOsInfo();
 
@@ -180,8 +208,11 @@ module.exports = function (core) {
         version: process.version,
         memory: {
           total: humanReadableBytes(heapStats.heap_size_limit),
+          totalBytes: heapStats.heap_size_limit,
           used: humanReadableBytes(heapStats.used_heap_size),
-          free: humanReadableBytes(heapStats.heap_size_limit - heapStats.used_heap_size),
+          usedBytes: heapStats.used_heap_size,
+          free: humanReadableBytes(free_heap_size),
+          freeBytes: free_heap_size,
         },
       },
       os: {
@@ -194,8 +225,8 @@ module.exports = function (core) {
           count: cpus.length,
         },
         memory: osMemoryInfo,
-        id: linuxOsInfo?.file ? linuxOsInfo.id : undefined,
-        versionId: linuxOsInfo?.file ? linuxOsInfo.version_id : undefined,
+        linuxInfo: linuxOsInfo?.file ? linuxOsInfo : null,
+        macOsInfo: await macOsInfo(),
       },
       host: {
         docker: await getDockerInfo(),
@@ -203,6 +234,7 @@ module.exports = function (core) {
         pm2: isUsingPM2(appInfo.pkg),
         memory: {
           total: dockerMemoryLimit ? humanReadableBytes(dockerMemoryLimit) : osMemoryInfo.total,
+          totalBytes: dockerMemoryLimit ?? osMemoryInfo.totalBytes,
         },
       },
       application: appInfo.pkg,

package/lib/system-info/linux-os-info.js

@@ -60,7 +60,7 @@ function addEtcAlpineReleaseToOutputData(data, outputData) {
 const defaultList = [
   { path: '/etc/os-release', parser: addOsReleaseToOutputData },
   { path: '/usr/lib/os-release', parser: addOsReleaseToOutputData },
-  { path: '/etc/alpine-release', parser: addEtcAlpineReleaseToOutputData }
+  { path: '/etc/alpine-release', parser: addEtcAlpineReleaseToOutputData },
 ];
 
 /**
@@ -68,11 +68,13 @@ const defaultList = [
  * or '/etc/alpine-release'. The information in that file is distribution-dependent.
  *
  * @returns {Promise<{
- *  file?: string;
- *  [key: string]: string;
- * }>} - where object is null if not Linux, or an object with
- * the a file property and the key-value pairs from the file. Any quotes around the
- * values are removed.
+ *   file: string;
+ *   [key: string]: string;
+ * } | {
+ *   file: undefined
+ *  } | null>} where object is null if not Linux, or an object with the a file
+ * property and the key-value pairs from the file. Any quotes around the values
+ * are removed.
  *
  * the file property in the info object will be filled in with one of:
  *   - the file path (above) used
@@ -95,7 +97,6 @@ async function linuxOsInfo(opts = {}) {
       list[i].parser(data, outputData);
 
       return outputData;
-
     } catch (e) {
       i += 1;
       continue;
@@ -106,7 +107,6 @@ async function linuxOsInfo(opts = {}) {
   return { file: undefined };
 }
 
-
 function addOsReleaseToOutputData(data, outputData) {
   const lines = data.split('\n');
 
@@ -134,4 +134,3 @@ function addOsReleaseToOutputData(data, outputData) {
 }
 
 module.exports = linuxOsInfo;
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/core",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "Preconfigured Contrast agent core services and models",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -19,12 +19,12 @@
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.33.0",
-    "@contrast/config": "1.48.0",
+    "@contrast/common": "1.34.0",
+    "@contrast/config": "1.49.0",
     "@contrast/find-package-json": "^1.1.0",
     "@contrast/fn-inspect": "^4.3.0",
-    "@contrast/logger": "1.26.0",
-    "@contrast/patcher": "1.25.0",
+    "@contrast/logger": "1.27.0",
+    "@contrast/patcher": "1.26.0",
     "@contrast/perf": "1.3.1",
     "@tsxper/crc32": "^2.1.3",
     "axios": "^1.7.4",