@aidalinfo/aegis-agent 0.2.0 → 0.2.2

package/dist/bin.js

@@ -7,14 +7,25 @@ import { execSync as execSync2 } from "child_process";
 // src/config.ts
 import { z } from "zod";
 import { readFileSync } from "fs";
+import { join } from "path";
 import { hostname } from "os";
 var ConfigSchema = z.object({
   interval: z.coerce.number().int().min(5).default(30),
   endpoint: z.string().url(),
   apiKey: z.string().min(1),
   mode: z.enum(["core", "full"]).default("core"),
-  hostname: z.string().default(hostname())
+  hostname: z.string().min(1)
 });
+function resolveHostname() {
+  const hostRoot = process.env.AEGIS_HOST_ROOT;
+  if (hostRoot) {
+    try {
+      return readFileSync(join(hostRoot, "/etc/hostname"), "utf8").trim();
+    } catch {
+    }
+  }
+  return hostname();
+}
 function loadConfig(configPath = "/etc/aegis-agent/config.json") {
   let fileConfig = {};
   try {
@@ -27,24 +38,24 @@ function loadConfig(configPath = "/etc/aegis-agent/config.json") {
     ...process.env.AEGIS_ENDPOINT !== void 0 && { endpoint: process.env.AEGIS_ENDPOINT },
     ...process.env.AEGIS_API_KEY !== void 0 && { apiKey: process.env.AEGIS_API_KEY },
     ...process.env.AEGIS_MODE !== void 0 && { mode: process.env.AEGIS_MODE },
-    ...process.env.AEGIS_HOSTNAME !== void 0 && { hostname: process.env.AEGIS_HOSTNAME }
+    hostname: process.env.AEGIS_HOSTNAME ?? fileConfig.hostname ?? resolveHostname()
   });
 }
 
 // src/metrics/hostpaths.ts
 import { readFile, statfs } from "fs/promises";
-import { join } from "path";
+import { join as join2 } from "path";
 var HOST_PROC = process.env.AEGIS_HOST_PROC || "/proc";
 var HOST_SYS = process.env.AEGIS_HOST_SYS || "/sys";
 var HOST_ROOT = process.env.AEGIS_HOST_ROOT || "";
 function readProc(rel) {
-  return readFile(join(HOST_PROC, rel), "utf8");
+  return readFile(join2(HOST_PROC, rel), "utf8");
 }
 function readHostFile(absPath) {
-  return readFile(HOST_ROOT ? join(HOST_ROOT, absPath) : absPath, "utf8");
+  return readFile(HOST_ROOT ? join2(HOST_ROOT, absPath) : absPath, "utf8");
 }
 function statHostFs(mount) {
-  return statfs(HOST_ROOT ? join(HOST_ROOT, mount) : mount);
+  return statfs(HOST_ROOT ? join2(HOST_ROOT, mount) : mount);
 }
 
 // src/metrics/proc-parse.ts
@@ -146,6 +157,7 @@ var PSEUDO_FS = /* @__PURE__ */ new Set([
   "binfmt_misc",
   "efivarfs"
 ]);
+var DOCKER_FILE_MOUNTS = /* @__PURE__ */ new Set(["/etc/hostname", "/etc/resolv.conf", "/etc/hosts"]);
 function parseMounts(content) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
@@ -154,6 +166,7 @@ function parseMounts(content) {
     if (parts.length < 3) continue;
     const [, mount, fstype] = parts;
     if (PSEUDO_FS.has(fstype)) continue;
+    if (DOCKER_FILE_MOUNTS.has(mount)) continue;
     if (seen.has(mount)) continue;
     seen.add(mount);
     out.push(mount);
@@ -185,7 +198,15 @@ function diskIoRates(prev3, cur, dtSec) {
 var prev = null;
 async function collectCpu() {
   const cur = parseProcStat(await readProc("stat"));
-  const usagePercent = prev ? cpuPercent(prev, cur) : 0;
+  if (!prev) {
+    prev = cur;
+    await new Promise((r) => setTimeout(r, 300));
+    const warm = parseProcStat(await readProc("stat"));
+    const usagePercent2 = cpuPercent(prev, warm);
+    prev = warm;
+    return { usagePercent: usagePercent2 };
+  }
+  const usagePercent = cpuPercent(prev, cur);
   prev = cur;
   return { usagePercent };
 }
@@ -268,7 +289,13 @@ async function collectSwap() {
 
 // src/metrics/processes.ts
 import si from "systeminformation";
+var initialized = false;
 async function collectProcesses() {
+  if (!initialized) {
+    await si.processes();
+    await new Promise((r) => setTimeout(r, 500));
+    initialized = true;
+  }
   const { list } = await si.processes();
   return list.sort((a, b) => b.cpu - a.cpu).slice(0, 5).map((p) => ({
     pid: p.pid,

package/dist/index.d.ts

@@ -5,7 +5,7 @@ declare const ConfigSchema: z.ZodObject<{
     endpoint: z.ZodString;
     apiKey: z.ZodString;
     mode: z.ZodDefault<z.ZodEnum<["core", "full"]>>;
-    hostname: z.ZodDefault<z.ZodString>;
+    hostname: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     interval: number;
     endpoint: string;
@@ -15,9 +15,9 @@ declare const ConfigSchema: z.ZodObject<{
 }, {
     endpoint: string;
     apiKey: string;
+    hostname: string;
     interval?: number | undefined;
     mode?: "core" | "full" | undefined;
-    hostname?: string | undefined;
 }>;
 type Config = z.infer<typeof ConfigSchema>;
 declare function loadConfig(configPath?: string): Config;

package/dist/index.js

@@ -113,6 +113,7 @@ var PSEUDO_FS = /* @__PURE__ */ new Set([
   "binfmt_misc",
   "efivarfs"
 ]);
+var DOCKER_FILE_MOUNTS = /* @__PURE__ */ new Set(["/etc/hostname", "/etc/resolv.conf", "/etc/hosts"]);
 function parseMounts(content) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
@@ -121,6 +122,7 @@ function parseMounts(content) {
     if (parts.length < 3) continue;
     const [, mount, fstype] = parts;
     if (PSEUDO_FS.has(fstype)) continue;
+    if (DOCKER_FILE_MOUNTS.has(mount)) continue;
     if (seen.has(mount)) continue;
     seen.add(mount);
     out.push(mount);
@@ -152,7 +154,15 @@ function diskIoRates(prev3, cur, dtSec) {
 var prev = null;
 async function collectCpu() {
   const cur = parseProcStat(await readProc("stat"));
-  const usagePercent = prev ? cpuPercent(prev, cur) : 0;
+  if (!prev) {
+    prev = cur;
+    await new Promise((r) => setTimeout(r, 300));
+    const warm = parseProcStat(await readProc("stat"));
+    const usagePercent2 = cpuPercent(prev, warm);
+    prev = warm;
+    return { usagePercent: usagePercent2 };
+  }
+  const usagePercent = cpuPercent(prev, cur);
   prev = cur;
   return { usagePercent };
 }
@@ -235,7 +245,13 @@ async function collectSwap() {
 
 // src/metrics/processes.ts
 import si from "systeminformation";
+var initialized = false;
 async function collectProcesses() {
+  if (!initialized) {
+    await si.processes();
+    await new Promise((r) => setTimeout(r, 500));
+    initialized = true;
+  }
   const { list } = await si.processes();
   return list.sort((a, b) => b.cpu - a.cpu).slice(0, 5).map((p) => ({
     pid: p.pid,
@@ -303,14 +319,25 @@ async function collectMetrics(config) {
 // src/config.ts
 import { z } from "zod";
 import { readFileSync } from "fs";
+import { join as join2 } from "path";
 import { hostname } from "os";
 var ConfigSchema = z.object({
   interval: z.coerce.number().int().min(5).default(30),
   endpoint: z.string().url(),
   apiKey: z.string().min(1),
   mode: z.enum(["core", "full"]).default("core"),
-  hostname: z.string().default(hostname())
+  hostname: z.string().min(1)
 });
+function resolveHostname() {
+  const hostRoot = process.env.AEGIS_HOST_ROOT;
+  if (hostRoot) {
+    try {
+      return readFileSync(join2(hostRoot, "/etc/hostname"), "utf8").trim();
+    } catch {
+    }
+  }
+  return hostname();
+}
 function loadConfig(configPath = "/etc/aegis-agent/config.json") {
   let fileConfig = {};
   try {
@@ -323,7 +350,7 @@ function loadConfig(configPath = "/etc/aegis-agent/config.json") {
     ...process.env.AEGIS_ENDPOINT !== void 0 && { endpoint: process.env.AEGIS_ENDPOINT },
     ...process.env.AEGIS_API_KEY !== void 0 && { apiKey: process.env.AEGIS_API_KEY },
     ...process.env.AEGIS_MODE !== void 0 && { mode: process.env.AEGIS_MODE },
-    ...process.env.AEGIS_HOSTNAME !== void 0 && { hostname: process.env.AEGIS_HOSTNAME }
+    hostname: process.env.AEGIS_HOSTNAME ?? fileConfig.hostname ?? resolveHostname()
   });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aidalinfo/aegis-agent",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Lightweight monitoring agent for Linux machines — pushes system metrics to Aegis",
   "license": "MIT",
   "type": "module",