@ceon-oy/monitor-sdk 1.4.0 → 1.5.0

package/dist/index.d.mts

@@ -306,6 +306,12 @@ declare class MonitorClient {
      * Fetch with timeout to prevent hanging requests
      */
     private fetchWithTimeout;
+    /**
+     * Perform an HTTPS request with TLS certificate verification disabled.
+     * Used for health checks on servers with self-signed certificates.
+     * Uses Node.js built-in `https` module — works reliably in bundled environments.
+     */
+    private fetchInsecureHttps;
     private sendSingle;
     private sendBatch;
     private startFlushTimer;
@@ -499,15 +505,22 @@ declare class MonitorClient {
      * Collect system metrics (CPU, RAM, disk) using built-in Node.js modules
      * and submit to the monitoring server.
      *
-     * Uses: os.cpus(), os.totalmem(), os.freemem(), os.hostname(), fs.statfs()
+     * Uses: os.cpus(), os.totalmem(), /proc/meminfo (or os.freemem()), os.hostname(), fs.statfs()
      * Zero dependencies — all built-in Node.js 18.15+
      */
     private collectAndSubmitMetrics;
     /**
-     * Measure CPU utilization by sampling cpus() twice with a 500ms gap.
-     * Returns a percentage (0–100).
+     * Measure CPU utilization by sampling cpus() twice with a 3s gap.
+     * The cumulative counters make this the average utilization over the
+     * window, across all cores of the host. Returns a percentage (0–100).
      */
     private measureCpuPercent;
+    /**
+     * Get reclaimable memory in bytes. On Linux, reads MemAvailable from
+     * /proc/meminfo so buffers/cache are not counted as used; falls back to
+     * os.freemem() (MemFree) on other platforms or if parsing fails.
+     */
+    private getAvailableMemoryBytes;
     /**
      * Collect disk usage for each configured path using fs.statfs() (Node 18.15+).
      */

package/dist/index.d.ts

@@ -306,6 +306,12 @@ declare class MonitorClient {
      * Fetch with timeout to prevent hanging requests
      */
     private fetchWithTimeout;
+    /**
+     * Perform an HTTPS request with TLS certificate verification disabled.
+     * Used for health checks on servers with self-signed certificates.
+     * Uses Node.js built-in `https` module — works reliably in bundled environments.
+     */
+    private fetchInsecureHttps;
     private sendSingle;
     private sendBatch;
     private startFlushTimer;
@@ -499,15 +505,22 @@ declare class MonitorClient {
      * Collect system metrics (CPU, RAM, disk) using built-in Node.js modules
      * and submit to the monitoring server.
      *
-     * Uses: os.cpus(), os.totalmem(), os.freemem(), os.hostname(), fs.statfs()
+     * Uses: os.cpus(), os.totalmem(), /proc/meminfo (or os.freemem()), os.hostname(), fs.statfs()
      * Zero dependencies — all built-in Node.js 18.15+
      */
     private collectAndSubmitMetrics;
     /**
-     * Measure CPU utilization by sampling cpus() twice with a 500ms gap.
-     * Returns a percentage (0–100).
+     * Measure CPU utilization by sampling cpus() twice with a 3s gap.
+     * The cumulative counters make this the average utilization over the
+     * window, across all cores of the host. Returns a percentage (0–100).
      */
     private measureCpuPercent;
+    /**
+     * Get reclaimable memory in bytes. On Linux, reads MemAvailable from
+     * /proc/meminfo so buffers/cache are not counted as used; falls back to
+     * os.freemem() (MemFree) on other platforms or if parsing fails.
+     */
+    private getAvailableMemoryBytes;
     /**
      * Collect disk usage for each configured path using fs.statfs() (Node 18.15+).
      */

package/dist/index.js

@@ -544,6 +544,45 @@ var MonitorClient = class {
       clearTimeout(timeoutId);
     }
   }
+  /**
+   * Perform an HTTPS request with TLS certificate verification disabled.
+   * Used for health checks on servers with self-signed certificates.
+   * Uses Node.js built-in `https` module — works reliably in bundled environments.
+   */
+  async fetchInsecureHttps(url, options, timeoutMs) {
+    const https = await import("https");
+    const parsed = new URL(url);
+    return new Promise((resolve, reject) => {
+      let req;
+      const timeoutId = setTimeout(() => {
+        req?.destroy();
+        reject(new Error(`Request timeout after ${timeoutMs}ms`));
+      }, timeoutMs);
+      req = https.request(
+        {
+          hostname: parsed.hostname,
+          port: parsed.port || 443,
+          path: parsed.pathname + parsed.search,
+          method: options.method || "GET",
+          headers: options.headers,
+          rejectUnauthorized: false
+        },
+        (res) => {
+          clearTimeout(timeoutId);
+          res.resume();
+          resolve({ status: res.statusCode || 0 });
+        }
+      );
+      req.on("error", (err) => {
+        clearTimeout(timeoutId);
+        reject(err);
+      });
+      if (options.body) {
+        req.write(options.body);
+      }
+      req.end();
+    });
+  }
   async sendSingle(error) {
     const response = await this.fetchWithTimeout(`${this.endpoint}/api/v1/errors`, {
       method: "POST",
@@ -1348,24 +1387,7 @@ var MonitorClient = class {
           "Content-Type": "application/json"
         };
       }
-      if (endpoint.allowInsecureTls) {
-        try {
-          const undici = await import(
-            /* webpackIgnore: true */
-            "undici"
-          );
-          const Agent = undici.Agent;
-          requestOptions.dispatcher = new Agent({
-            connect: { rejectUnauthorized: false }
-          });
-        } catch {
-        }
-      }
-      const response = await this.fetchWithTimeout(
-        endpoint.url,
-        requestOptions,
-        endpoint.timeoutMs
-      );
+      const response = endpoint.allowInsecureTls && endpoint.url.startsWith("https") ? await this.fetchInsecureHttps(endpoint.url, requestOptions, endpoint.timeoutMs) : await this.fetchWithTimeout(endpoint.url, requestOptions, endpoint.timeoutMs);
       const responseTimeMs = Date.now() - startTime;
       const statusCode = response.status;
       let status;
@@ -1546,7 +1568,7 @@ var MonitorClient = class {
    * Collect system metrics (CPU, RAM, disk) using built-in Node.js modules
    * and submit to the monitoring server.
    *
-   * Uses: os.cpus(), os.totalmem(), os.freemem(), os.hostname(), fs.statfs()
+   * Uses: os.cpus(), os.totalmem(), /proc/meminfo (or os.freemem()), os.hostname(), fs.statfs()
    * Zero dependencies — all built-in Node.js 18.15+
    */
   async collectAndSubmitMetrics(diskPaths) {
@@ -1574,8 +1596,8 @@ var MonitorClient = class {
       const hostname = os.hostname();
       const cpuPercent = await this.measureCpuPercent(os);
       const memoryTotal = os.totalmem();
-      const memoryFree = os.freemem();
-      const memoryUsed = memoryTotal - memoryFree;
+      const memoryAvailable = await this.getAvailableMemoryBytes(os, fs);
+      const memoryUsed = memoryTotal - memoryAvailable;
       const memoryPercent = memoryTotal > 0 ? memoryUsed / memoryTotal * 100 : 0;
       const disks = await this.collectDiskMetrics(diskPaths, fs);
       await this.submitSystemMetric({
@@ -1591,12 +1613,13 @@ var MonitorClient = class {
     }
   }
   /**
-   * Measure CPU utilization by sampling cpus() twice with a 500ms gap.
-   * Returns a percentage (0–100).
+   * Measure CPU utilization by sampling cpus() twice with a 3s gap.
+   * The cumulative counters make this the average utilization over the
+   * window, across all cores of the host. Returns a percentage (0–100).
    */
   async measureCpuPercent(os) {
     const sample1 = os.cpus();
-    await new Promise((resolve) => setTimeout(resolve, 500));
+    await new Promise((resolve) => setTimeout(resolve, 3e3));
     const sample2 = os.cpus();
     let totalIdle = 0;
     let totalTick = 0;
@@ -1608,9 +1631,30 @@ var MonitorClient = class {
       totalTick += currTotal - prevTotal;
       totalIdle += curr.times.idle - prev.times.idle;
     }
-    const idlePercent = totalTick > 0 ? totalIdle / totalTick * 100 : 0;
+    if (totalTick <= 0) {
+      return 0;
+    }
+    const idlePercent = totalIdle / totalTick * 100;
     return Math.max(0, Math.min(100, 100 - idlePercent));
   }
+  /**
+   * Get reclaimable memory in bytes. On Linux, reads MemAvailable from
+   * /proc/meminfo so buffers/cache are not counted as used; falls back to
+   * os.freemem() (MemFree) on other platforms or if parsing fails.
+   */
+  async getAvailableMemoryBytes(os, fs) {
+    if (os.platform() === "linux") {
+      try {
+        const meminfo = await fs.readFile("/proc/meminfo", "utf8");
+        const match = meminfo.match(/^MemAvailable:\s+(\d+)\s*kB$/m);
+        if (match) {
+          return Number(match[1]) * 1024;
+        }
+      } catch {
+      }
+    }
+    return os.freemem();
+  }
   /**
    * Collect disk usage for each configured path using fs.statfs() (Node 18.15+).
    */

package/dist/index.mjs

@@ -508,6 +508,45 @@ var MonitorClient = class {
       clearTimeout(timeoutId);
     }
   }
+  /**
+   * Perform an HTTPS request with TLS certificate verification disabled.
+   * Used for health checks on servers with self-signed certificates.
+   * Uses Node.js built-in `https` module — works reliably in bundled environments.
+   */
+  async fetchInsecureHttps(url, options, timeoutMs) {
+    const https = await import("https");
+    const parsed = new URL(url);
+    return new Promise((resolve, reject) => {
+      let req;
+      const timeoutId = setTimeout(() => {
+        req?.destroy();
+        reject(new Error(`Request timeout after ${timeoutMs}ms`));
+      }, timeoutMs);
+      req = https.request(
+        {
+          hostname: parsed.hostname,
+          port: parsed.port || 443,
+          path: parsed.pathname + parsed.search,
+          method: options.method || "GET",
+          headers: options.headers,
+          rejectUnauthorized: false
+        },
+        (res) => {
+          clearTimeout(timeoutId);
+          res.resume();
+          resolve({ status: res.statusCode || 0 });
+        }
+      );
+      req.on("error", (err) => {
+        clearTimeout(timeoutId);
+        reject(err);
+      });
+      if (options.body) {
+        req.write(options.body);
+      }
+      req.end();
+    });
+  }
   async sendSingle(error) {
     const response = await this.fetchWithTimeout(`${this.endpoint}/api/v1/errors`, {
       method: "POST",
@@ -1312,24 +1351,7 @@ var MonitorClient = class {
           "Content-Type": "application/json"
         };
       }
-      if (endpoint.allowInsecureTls) {
-        try {
-          const undici = await import(
-            /* webpackIgnore: true */
-            "undici"
-          );
-          const Agent = undici.Agent;
-          requestOptions.dispatcher = new Agent({
-            connect: { rejectUnauthorized: false }
-          });
-        } catch {
-        }
-      }
-      const response = await this.fetchWithTimeout(
-        endpoint.url,
-        requestOptions,
-        endpoint.timeoutMs
-      );
+      const response = endpoint.allowInsecureTls && endpoint.url.startsWith("https") ? await this.fetchInsecureHttps(endpoint.url, requestOptions, endpoint.timeoutMs) : await this.fetchWithTimeout(endpoint.url, requestOptions, endpoint.timeoutMs);
       const responseTimeMs = Date.now() - startTime;
       const statusCode = response.status;
       let status;
@@ -1510,7 +1532,7 @@ var MonitorClient = class {
    * Collect system metrics (CPU, RAM, disk) using built-in Node.js modules
    * and submit to the monitoring server.
    *
-   * Uses: os.cpus(), os.totalmem(), os.freemem(), os.hostname(), fs.statfs()
+   * Uses: os.cpus(), os.totalmem(), /proc/meminfo (or os.freemem()), os.hostname(), fs.statfs()
    * Zero dependencies — all built-in Node.js 18.15+
    */
   async collectAndSubmitMetrics(diskPaths) {
@@ -1538,8 +1560,8 @@ var MonitorClient = class {
       const hostname = os.hostname();
       const cpuPercent = await this.measureCpuPercent(os);
       const memoryTotal = os.totalmem();
-      const memoryFree = os.freemem();
-      const memoryUsed = memoryTotal - memoryFree;
+      const memoryAvailable = await this.getAvailableMemoryBytes(os, fs);
+      const memoryUsed = memoryTotal - memoryAvailable;
       const memoryPercent = memoryTotal > 0 ? memoryUsed / memoryTotal * 100 : 0;
       const disks = await this.collectDiskMetrics(diskPaths, fs);
       await this.submitSystemMetric({
@@ -1555,12 +1577,13 @@ var MonitorClient = class {
     }
   }
   /**
-   * Measure CPU utilization by sampling cpus() twice with a 500ms gap.
-   * Returns a percentage (0–100).
+   * Measure CPU utilization by sampling cpus() twice with a 3s gap.
+   * The cumulative counters make this the average utilization over the
+   * window, across all cores of the host. Returns a percentage (0–100).
    */
   async measureCpuPercent(os) {
     const sample1 = os.cpus();
-    await new Promise((resolve) => setTimeout(resolve, 500));
+    await new Promise((resolve) => setTimeout(resolve, 3e3));
     const sample2 = os.cpus();
     let totalIdle = 0;
     let totalTick = 0;
@@ -1572,9 +1595,30 @@ var MonitorClient = class {
       totalTick += currTotal - prevTotal;
       totalIdle += curr.times.idle - prev.times.idle;
     }
-    const idlePercent = totalTick > 0 ? totalIdle / totalTick * 100 : 0;
+    if (totalTick <= 0) {
+      return 0;
+    }
+    const idlePercent = totalIdle / totalTick * 100;
     return Math.max(0, Math.min(100, 100 - idlePercent));
   }
+  /**
+   * Get reclaimable memory in bytes. On Linux, reads MemAvailable from
+   * /proc/meminfo so buffers/cache are not counted as used; falls back to
+   * os.freemem() (MemFree) on other platforms or if parsing fails.
+   */
+  async getAvailableMemoryBytes(os, fs) {
+    if (os.platform() === "linux") {
+      try {
+        const meminfo = await fs.readFile("/proc/meminfo", "utf8");
+        const match = meminfo.match(/^MemAvailable:\s+(\d+)\s*kB$/m);
+        if (match) {
+          return Number(match[1]) * 1024;
+        }
+      } catch {
+      }
+    }
+    return os.freemem();
+  }
   /**
    * Collect disk usage for each configured path using fs.statfs() (Node 18.15+).
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ceon-oy/monitor-sdk",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Client SDK for Ceon Monitor - Error tracking, health monitoring, security events, and vulnerability scanning",
   "author": "Ceon",
   "license": "MIT",