@ceon-oy/monitor-sdk 1.5.0 → 1.5.2

package/dist/index.d.mts

@@ -217,6 +217,7 @@ declare class MonitorClient {
     private lastScanTime;
     private lastKnownScanRequestedAt;
     private lastKnownTechScanRequestedAt;
+    private currentAuditIntervalHours;
     private versionCheckEnabled;
     private auditTimeoutMs;
     private registryTimeoutMs;
@@ -269,6 +270,7 @@ declare class MonitorClient {
     private startSdkErrorFlushTimer;
     private stopSdkErrorFlushTimer;
     private flushSdkErrors;
+    private clearAuditIntervalTimer;
     private stopAuditIntervalTimer;
     /**
      * Fetch project settings from the monitoring server.
@@ -292,6 +294,12 @@ declare class MonitorClient {
      * Also sets up polling for on-demand scan requests from the server.
      */
     private setupAutoAudit;
+    /**
+     * (Re)configure the recurring audit timer for the given interval, replacing
+     * whichever timer is currently running (if any). intervalHours <= 0 leaves
+     * scanning disabled.
+     */
+    private setAuditInterval;
     /**
      * Run a vulnerability scan and track the time it was run.
      * Uses auditMultiplePaths() if auditPaths is configured, otherwise runs single audit.
@@ -512,7 +520,8 @@ declare class MonitorClient {
     /**
      * 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).
+     * window, across all cores of the host. Returns a percentage (0–100)
+     * plus the CPU model, read off the same samples at zero extra cost.
      */
     private measureCpuPercent;
     /**
@@ -531,6 +540,7 @@ declare class MonitorClient {
     submitSystemMetric(metric: {
         hostname: string;
         cpuPercent: number;
+        cpuModel?: string | null;
         memoryTotal: number;
         memoryUsed: number;
         memoryPercent: number;

package/dist/index.d.ts

@@ -217,6 +217,7 @@ declare class MonitorClient {
     private lastScanTime;
     private lastKnownScanRequestedAt;
     private lastKnownTechScanRequestedAt;
+    private currentAuditIntervalHours;
     private versionCheckEnabled;
     private auditTimeoutMs;
     private registryTimeoutMs;
@@ -269,6 +270,7 @@ declare class MonitorClient {
     private startSdkErrorFlushTimer;
     private stopSdkErrorFlushTimer;
     private flushSdkErrors;
+    private clearAuditIntervalTimer;
     private stopAuditIntervalTimer;
     /**
      * Fetch project settings from the monitoring server.
@@ -292,6 +294,12 @@ declare class MonitorClient {
      * Also sets up polling for on-demand scan requests from the server.
      */
     private setupAutoAudit;
+    /**
+     * (Re)configure the recurring audit timer for the given interval, replacing
+     * whichever timer is currently running (if any). intervalHours <= 0 leaves
+     * scanning disabled.
+     */
+    private setAuditInterval;
     /**
      * Run a vulnerability scan and track the time it was run.
      * Uses auditMultiplePaths() if auditPaths is configured, otherwise runs single audit.
@@ -512,7 +520,8 @@ declare class MonitorClient {
     /**
      * 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).
+     * window, across all cores of the host. Returns a percentage (0–100)
+     * plus the CPU model, read off the same samples at zero extra cost.
      */
     private measureCpuPercent;
     /**
@@ -531,6 +540,7 @@ declare class MonitorClient {
     submitSystemMetric(metric: {
         hostname: string;
         cpuPercent: number;
+        cpuModel?: string | null;
         memoryTotal: number;
         memoryUsed: number;
         memoryPercent: number;

package/dist/index.js

@@ -90,6 +90,9 @@ var MonitorClient = class {
     this.lastScanTime = null;
     this.lastKnownScanRequestedAt = null;
     this.lastKnownTechScanRequestedAt = null;
+    // Interval (in hours) the currently-running auditIntervalTimer was configured with,
+    // so checkForScanRequest() can detect server-side changes and reconfigure it.
+    this.currentAuditIntervalHours = null;
     this.healthCheckFetchTimer = null;
     this.healthCheckTimers = /* @__PURE__ */ new Map();
     this.healthCheckResultsQueue = [];
@@ -393,11 +396,14 @@ var MonitorClient = class {
       console.warn("[MonitorClient] Failed to flush SDK errors to server:", err instanceof Error ? err.message : String(err));
     }
   }
-  stopAuditIntervalTimer() {
+  clearAuditIntervalTimer() {
     if (this.auditIntervalTimer) {
       clearInterval(this.auditIntervalTimer);
       this.auditIntervalTimer = null;
     }
+  }
+  stopAuditIntervalTimer() {
+    this.clearAuditIntervalTimer();
     if (this.settingsPollingTimer) {
       clearInterval(this.settingsPollingTimer);
       this.settingsPollingTimer = null;
@@ -447,15 +453,11 @@ var MonitorClient = class {
     const intervalHours = settings.vulnerabilityScanIntervalHours;
     if (intervalHours <= 0) {
       console.log("[MonitorClient] Scheduled vulnerability scanning disabled by server configuration");
+      this.currentAuditIntervalHours = intervalHours;
     } else {
       console.log(`[MonitorClient] Auto vulnerability scanning enabled (every ${intervalHours} hours)`);
       await this.runScanAndTrackTime();
-      const intervalMs = intervalHours * 60 * 60 * 1e3;
-      this.auditIntervalTimer = setInterval(() => {
-        this.runScanAndTrackTime().catch((err) => {
-          this.reportError("AUDIT_SCAN", "Auto audit scan failed", err);
-        });
-      }, intervalMs);
+      this.setAuditInterval(intervalHours);
     }
     console.log("[MonitorClient] Polling for scan requests enabled (every 5 minutes)");
     this.settingsPollingTimer = setInterval(() => {
@@ -464,6 +466,24 @@ var MonitorClient = class {
       });
     }, CONFIG_LIMITS.SETTINGS_POLL_INTERVAL_MS);
   }
+  /**
+   * (Re)configure the recurring audit timer for the given interval, replacing
+   * whichever timer is currently running (if any). intervalHours <= 0 leaves
+   * scanning disabled.
+   */
+  setAuditInterval(intervalHours) {
+    this.clearAuditIntervalTimer();
+    this.currentAuditIntervalHours = intervalHours;
+    if (intervalHours <= 0) {
+      return;
+    }
+    const intervalMs = intervalHours * 60 * 60 * 1e3;
+    this.auditIntervalTimer = setInterval(() => {
+      this.runScanAndTrackTime().catch((err) => {
+        this.reportError("AUDIT_SCAN", "Auto audit scan failed", err);
+      });
+    }, intervalMs);
+  }
   /**
    * Run a vulnerability scan and track the time it was run.
    * Uses auditMultiplePaths() if auditPaths is configured, otherwise runs single audit.
@@ -507,6 +527,12 @@ var MonitorClient = class {
           await this.syncDependencies();
         }
       }
+      if (settings.vulnerabilityScanIntervalHours !== this.currentAuditIntervalHours) {
+        console.log(
+          `[MonitorClient] Auto scan interval changed (${this.currentAuditIntervalHours ?? "unset"} \u2192 ${settings.vulnerabilityScanIntervalHours} hours), reconfiguring`
+        );
+        this.setAuditInterval(settings.vulnerabilityScanIntervalHours);
+      }
     } catch (err) {
       this.reportError("SETTINGS_POLL", "Failed to check for scan request", err);
     }
@@ -959,7 +985,7 @@ var MonitorClient = class {
       "child_process"
     );
     const { spawn } = childProcess;
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       const proc = spawn(command, args, {
         cwd: options.cwd,
         stdio: ["pipe", "pipe", "pipe"],
@@ -968,10 +994,8 @@ var MonitorClient = class {
       let stdout = "";
       let stderr = "";
       let timedOut = false;
-      let killed = false;
       const timeoutId = setTimeout(() => {
         timedOut = true;
-        killed = true;
         proc.kill("SIGTERM");
         setTimeout(() => {
           if (!proc.killed) {
@@ -993,9 +1017,9 @@ var MonitorClient = class {
         clearTimeout(timeoutId);
         resolve({ stdout, timedOut });
       });
-      proc.on("error", () => {
+      proc.on("error", (err) => {
         clearTimeout(timeoutId);
-        resolve({ stdout, timedOut: killed });
+        reject(err);
       });
     });
   }
@@ -1594,7 +1618,7 @@ var MonitorClient = class {
     }
     try {
       const hostname = os.hostname();
-      const cpuPercent = await this.measureCpuPercent(os);
+      const { percent: cpuPercent, model: cpuModel } = await this.measureCpuPercent(os);
       const memoryTotal = os.totalmem();
       const memoryAvailable = await this.getAvailableMemoryBytes(os, fs);
       const memoryUsed = memoryTotal - memoryAvailable;
@@ -1603,6 +1627,7 @@ var MonitorClient = class {
       await this.submitSystemMetric({
         hostname,
         cpuPercent,
+        cpuModel,
         memoryTotal,
         memoryUsed,
         memoryPercent,
@@ -1615,12 +1640,14 @@ var MonitorClient = class {
   /**
    * 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).
+   * window, across all cores of the host. Returns a percentage (0–100)
+   * plus the CPU model, read off the same samples at zero extra cost.
    */
   async measureCpuPercent(os) {
     const sample1 = os.cpus();
     await new Promise((resolve) => setTimeout(resolve, 3e3));
     const sample2 = os.cpus();
+    const model = sample1[0]?.model ?? null;
     let totalIdle = 0;
     let totalTick = 0;
     for (let i = 0; i < sample2.length; i++) {
@@ -1632,10 +1659,10 @@ var MonitorClient = class {
       totalIdle += curr.times.idle - prev.times.idle;
     }
     if (totalTick <= 0) {
-      return 0;
+      return { percent: 0, model };
     }
     const idlePercent = totalIdle / totalTick * 100;
-    return Math.max(0, Math.min(100, 100 - idlePercent));
+    return { percent: Math.max(0, Math.min(100, 100 - idlePercent)), model };
   }
   /**
    * Get reclaimable memory in bytes. On Linux, reads MemAvailable from

package/dist/index.mjs

@@ -54,6 +54,9 @@ var MonitorClient = class {
     this.lastScanTime = null;
     this.lastKnownScanRequestedAt = null;
     this.lastKnownTechScanRequestedAt = null;
+    // Interval (in hours) the currently-running auditIntervalTimer was configured with,
+    // so checkForScanRequest() can detect server-side changes and reconfigure it.
+    this.currentAuditIntervalHours = null;
     this.healthCheckFetchTimer = null;
     this.healthCheckTimers = /* @__PURE__ */ new Map();
     this.healthCheckResultsQueue = [];
@@ -357,11 +360,14 @@ var MonitorClient = class {
       console.warn("[MonitorClient] Failed to flush SDK errors to server:", err instanceof Error ? err.message : String(err));
     }
   }
-  stopAuditIntervalTimer() {
+  clearAuditIntervalTimer() {
     if (this.auditIntervalTimer) {
       clearInterval(this.auditIntervalTimer);
       this.auditIntervalTimer = null;
     }
+  }
+  stopAuditIntervalTimer() {
+    this.clearAuditIntervalTimer();
     if (this.settingsPollingTimer) {
       clearInterval(this.settingsPollingTimer);
       this.settingsPollingTimer = null;
@@ -411,15 +417,11 @@ var MonitorClient = class {
     const intervalHours = settings.vulnerabilityScanIntervalHours;
     if (intervalHours <= 0) {
       console.log("[MonitorClient] Scheduled vulnerability scanning disabled by server configuration");
+      this.currentAuditIntervalHours = intervalHours;
     } else {
       console.log(`[MonitorClient] Auto vulnerability scanning enabled (every ${intervalHours} hours)`);
       await this.runScanAndTrackTime();
-      const intervalMs = intervalHours * 60 * 60 * 1e3;
-      this.auditIntervalTimer = setInterval(() => {
-        this.runScanAndTrackTime().catch((err) => {
-          this.reportError("AUDIT_SCAN", "Auto audit scan failed", err);
-        });
-      }, intervalMs);
+      this.setAuditInterval(intervalHours);
     }
     console.log("[MonitorClient] Polling for scan requests enabled (every 5 minutes)");
     this.settingsPollingTimer = setInterval(() => {
@@ -428,6 +430,24 @@ var MonitorClient = class {
       });
     }, CONFIG_LIMITS.SETTINGS_POLL_INTERVAL_MS);
   }
+  /**
+   * (Re)configure the recurring audit timer for the given interval, replacing
+   * whichever timer is currently running (if any). intervalHours <= 0 leaves
+   * scanning disabled.
+   */
+  setAuditInterval(intervalHours) {
+    this.clearAuditIntervalTimer();
+    this.currentAuditIntervalHours = intervalHours;
+    if (intervalHours <= 0) {
+      return;
+    }
+    const intervalMs = intervalHours * 60 * 60 * 1e3;
+    this.auditIntervalTimer = setInterval(() => {
+      this.runScanAndTrackTime().catch((err) => {
+        this.reportError("AUDIT_SCAN", "Auto audit scan failed", err);
+      });
+    }, intervalMs);
+  }
   /**
    * Run a vulnerability scan and track the time it was run.
    * Uses auditMultiplePaths() if auditPaths is configured, otherwise runs single audit.
@@ -471,6 +491,12 @@ var MonitorClient = class {
           await this.syncDependencies();
         }
       }
+      if (settings.vulnerabilityScanIntervalHours !== this.currentAuditIntervalHours) {
+        console.log(
+          `[MonitorClient] Auto scan interval changed (${this.currentAuditIntervalHours ?? "unset"} \u2192 ${settings.vulnerabilityScanIntervalHours} hours), reconfiguring`
+        );
+        this.setAuditInterval(settings.vulnerabilityScanIntervalHours);
+      }
     } catch (err) {
       this.reportError("SETTINGS_POLL", "Failed to check for scan request", err);
     }
@@ -923,7 +949,7 @@ var MonitorClient = class {
       "child_process"
     );
     const { spawn } = childProcess;
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       const proc = spawn(command, args, {
         cwd: options.cwd,
         stdio: ["pipe", "pipe", "pipe"],
@@ -932,10 +958,8 @@ var MonitorClient = class {
       let stdout = "";
       let stderr = "";
       let timedOut = false;
-      let killed = false;
       const timeoutId = setTimeout(() => {
         timedOut = true;
-        killed = true;
         proc.kill("SIGTERM");
         setTimeout(() => {
           if (!proc.killed) {
@@ -957,9 +981,9 @@ var MonitorClient = class {
         clearTimeout(timeoutId);
         resolve({ stdout, timedOut });
       });
-      proc.on("error", () => {
+      proc.on("error", (err) => {
         clearTimeout(timeoutId);
-        resolve({ stdout, timedOut: killed });
+        reject(err);
       });
     });
   }
@@ -1558,7 +1582,7 @@ var MonitorClient = class {
     }
     try {
       const hostname = os.hostname();
-      const cpuPercent = await this.measureCpuPercent(os);
+      const { percent: cpuPercent, model: cpuModel } = await this.measureCpuPercent(os);
       const memoryTotal = os.totalmem();
       const memoryAvailable = await this.getAvailableMemoryBytes(os, fs);
       const memoryUsed = memoryTotal - memoryAvailable;
@@ -1567,6 +1591,7 @@ var MonitorClient = class {
       await this.submitSystemMetric({
         hostname,
         cpuPercent,
+        cpuModel,
         memoryTotal,
         memoryUsed,
         memoryPercent,
@@ -1579,12 +1604,14 @@ var MonitorClient = class {
   /**
    * 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).
+   * window, across all cores of the host. Returns a percentage (0–100)
+   * plus the CPU model, read off the same samples at zero extra cost.
    */
   async measureCpuPercent(os) {
     const sample1 = os.cpus();
     await new Promise((resolve) => setTimeout(resolve, 3e3));
     const sample2 = os.cpus();
+    const model = sample1[0]?.model ?? null;
     let totalIdle = 0;
     let totalTick = 0;
     for (let i = 0; i < sample2.length; i++) {
@@ -1596,10 +1623,10 @@ var MonitorClient = class {
       totalIdle += curr.times.idle - prev.times.idle;
     }
     if (totalTick <= 0) {
-      return 0;
+      return { percent: 0, model };
     }
     const idlePercent = totalIdle / totalTick * 100;
-    return Math.max(0, Math.min(100, 100 - idlePercent));
+    return { percent: Math.max(0, Math.min(100, 100 - idlePercent)), model };
   }
   /**
    * Get reclaimable memory in bytes. On Linux, reads MemAvailable from

package/package.json

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