@irsyadulibad/servermon 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@irsyadulibad/servermon",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Lightweight server monitoring daemon — collects system metrics and sends structured reports to Telegram. Built with Bun + TypeScript.",
   "module": "index.ts",
   "type": "module",

package/src/cli/index.ts

@@ -4,7 +4,6 @@ import {
   loadConfig,
   saveConfig,
   configPath,
-  configFile,
   listServers,
   deleteConfig,
 } from "../config";
@@ -19,7 +18,7 @@ import pkg from "../../package.json";
 async function interactiveSetup(name?: string): Promise<void> {
   const tag = name ? ` [${name}]` : "";
   console.log(`🖥  Server Monitor — First Time Setup${tag}`);
-  console.log(`   Config will be saved to: ${configFile(name)}\n`);
+  console.log(`   Config will be saved to: ${configPath()}\n`);
 
   const token = prompt("🔑 Telegram Bot Token: ")?.trim();
   if (!token) {
@@ -65,7 +64,7 @@ async function interactiveSetup(name?: string): Promise<void> {
 
   await saveConfig({ token, interval, name });
   console.log(`\n✅ Config saved!`);
-  console.log(`   📁 ${configFile(name)}`);
+  console.log(`   📁 ${configPath()}`);
   console.log(`   ⏱  Interval: ${interval}s (${label})`);
   const serverTag = name ? ` --name ${name}` : "";
   console.log(
@@ -120,12 +119,12 @@ export function createApp(): Crust {
             process.env["TELEGRAM_BOT_TOKEN"] = config.token;
             process.env["MONITOR_INTERVAL"] = String(config.interval);
             if (config.chatId) process.env["TELEGRAM_CHAT_ID"] = config.chatId;
-            if (config.name) process.env["SERVER_NAME"] = config.name;
+            if (name) process.env["SERVER_NAME"] = name;
 
-            console.log(`📁 Config: ${configPath(config.name)}`);
+            console.log(`📁 Config: ${configPath()}`);
             console.log(`📡 Bot:    ...${config.token.slice(-8)}`);
             if (config.chatId) console.log(`💬 Chat:   ${config.chatId}`);
-            if (config.name) console.log(`🏷  Name:   ${config.name}`);
+            if (name) console.log(`🏷  Name:   ${name}`);
             console.log();
 
             const { start } = await import("../daemon");
@@ -162,7 +161,7 @@ export function createApp(): Crust {
           console.log(`📡 Bot: ...${config.token.slice(-8)}  💬 ${config.chatId}\n`);
 
           const { sendReport } = await import("../reporter");
-          const ok = await sendReport(config.token, config.chatId, config.name);
+          const ok = await sendReport(config.token, config.chatId, name ?? undefined);
           console.log(ok ? "✅ Report sent!" : "❌ Failed to send report");
         })
     )
@@ -179,10 +178,9 @@ export function createApp(): Crust {
         console.log("📋 Configured Servers:");
         for (const s of servers) {
           const cfg = await loadConfig(s === "default" ? undefined : s);
-          const nameTag = cfg?.name ? ` (--name ${cfg.name})` : "";
           const interval = cfg?.interval ?? "?";
           const chatLabel = cfg?.chatId ? `  💬 ${cfg.chatId}` : "  ❌ not yet paired";
-          console.log(`   • ${s}${nameTag}`);
+          console.log(`   • ${s}`);
           console.log(`     ⏱ ${interval}s  ${chatLabel}`);
         }
       })
@@ -216,7 +214,7 @@ export function createApp(): Crust {
           }
 
           console.log(`⚠️  You are about to delete server config: "${rawName}"`);
-          console.log(`   📁 ${configFile(name)}`);
+          console.log(`   📁 ${configPath()}`);
           console.log(`   🤖 Bot: ...${cfg.token.slice(-8)}`);
           if (cfg.chatId) console.log(`   💬 Chat: ${cfg.chatId}`);
           console.log("\n   This action cannot be undone.\n");

package/src/cli/service.ts

@@ -1,5 +1,5 @@
 import type { Crust } from "@crustjs/core";
-import { loadConfig, configPath } from "../config";
+import { listServers, configPath } from "../config";
 
 const HOME = process.env.HOME ?? "~";
 const SYSTEMD_DIR = `${HOME}/.config/systemd/user`;
@@ -54,9 +54,9 @@ function getServiceStatus(): string {
 /* ------------------------------------------------------------------ */
 
 async function cmdInstall(): Promise<void> {
-  const config = await loadConfig();
-  if (!config) {
-    console.error("❌ No config found. Run `servermon setup` first.");
+  const servers = await listServers();
+  if (servers.length === 0) {
+    console.error("❌ No servers configured. Run `servermon setup` or `servermon setup --name <name>` first.");
     process.exit(1);
   }
 
@@ -74,25 +74,12 @@ async function cmdInstall(): Promise<void> {
 
   console.log(`🔍 bun:       ${bunPath}`);
   console.log(`🔍 servermon: ${servermonPath}`);
-  console.log(`📁 Config:    ${configPath()}\n`);
+  console.log(`📁 Config:    ${configPath()}`);
+  console.log(`📋 Servers:   ${servers.join(", ")}\n`);
 
   await ensureSystemdDir();
 
-  const serviceContent = `[Unit]
-Description=Server Monitor — Telegram system health reports
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-ExecStart=${servermonPath} start
-Restart=always
-RestartSec=30
-Environment=NODE_ENV=production
-
-[Install]
-WantedBy=default.target
-`;
+  const serviceContent = `[Unit]\nDescription=Server Monitor — Telegram system health reports\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nType=simple\nExecStart=${servermonPath} start\nRestart=always\nRestartSec=30\nEnvironment=NODE_ENV=production\n\n[Install]\nWantedBy=default.target\n`;
 
   await Bun.write(SERVICE_PATH, serviceContent);
   console.log(`📄 Written: ${SERVICE_PATH}`);

package/src/config/index.ts

@@ -1,8 +1,8 @@
 import { homedir } from "os";
 import { join } from "path";
-import { mkdir, readdir, unlink } from "fs/promises";
+import { mkdir, unlink } from "fs/promises";
 import { existsSync } from "fs";
-import type { ServerMonConfig } from "../types";
+import type { ServerMonConfig, ServerEntry } from "../types";
 
 const CONFIG_DIR = join(homedir(), ".irsyadulibad", "servermon");
 const CONFIG_FILE = join(CONFIG_DIR, "config.json");
@@ -11,12 +11,8 @@ const CONFIG_FILE = join(CONFIG_DIR, "config.json");
 /*  Helpers                                                            */
 /* ------------------------------------------------------------------ */
 
-export function configFile(name?: string): string {
-  return name ? join(CONFIG_DIR, `config-${name}.json`) : CONFIG_FILE;
-}
-
-export function configPath(name?: string): string {
-  return configFile(name);
+export function configPath(): string {
+  return CONFIG_FILE;
 }
 
 export function configDir(): string {
@@ -24,61 +20,72 @@ export function configDir(): string {
 }
 
 /* ------------------------------------------------------------------ */
-/*  CRUD                                                               */
+/*  Internal helpers                                                   */
 /* ------------------------------------------------------------------ */
 
-export async function ensureConfigDir(): Promise<void> {
-  await mkdir(CONFIG_DIR, { recursive: true });
-}
-
-export async function loadConfig(name?: string): Promise<ServerMonConfig | null> {
+async function readConfig(): Promise<ServerMonConfig | null> {
   try {
-    const file = Bun.file(configFile(name));
+    const file = Bun.file(CONFIG_FILE);
     if (!(await file.exists())) return null;
-    const data = await file.json();
-    if (!data?.token) return null;
-    return {
-      token: String(data.token),
-      interval: Math.max(30, parseInt(String(data.interval)) || 300),
-      chatId: data.chatId ? String(data.chatId) : undefined,
-      name: data.name ? String(data.name) : name,
-    };
+    const data = (await file.json()) as ServerMonConfig;
+    if (!data?.servers || typeof data.servers !== "object") return null;
+    return data;
   } catch {
     return null;
   }
 }
 
-export async function saveConfig(config: ServerMonConfig): Promise<void> {
-  await ensureConfigDir();
-  await Bun.write(configFile(config.name), JSON.stringify(config, null, 2));
-}
-
-export async function deleteConfig(name?: string): Promise<boolean> {
-  const file = configFile(name);
-  if (!existsSync(file)) return false;
-  try {
-    await unlink(file);
-    return true;
-  } catch {
-    return false;
-  }
+async function writeConfig(config: ServerMonConfig): Promise<void> {
+  await mkdir(CONFIG_DIR, { recursive: true });
+  await Bun.write(CONFIG_FILE, JSON.stringify(config, null, 2));
 }
 
 /* ------------------------------------------------------------------ */
-/*  Inventory                                                          */
+/*  CRUD                                                               */
 /* ------------------------------------------------------------------ */
 
+export async function ensureConfigDir(): Promise<void> {
+  await mkdir(CONFIG_DIR, { recursive: true });
+}
+
+export async function loadConfig(name?: string): Promise<ServerEntry | null> {
+  const cfg = await readConfig();
+  if (!cfg) return null;
+  const key = name ?? "default";
+  const entry = cfg.servers[key];
+  if (!entry?.token) return null;
+  return {
+    token: String(entry.token),
+    interval: Math.max(30, parseInt(String(entry.interval)) || 300),
+    chatId: entry.chatId ? String(entry.chatId) : undefined,
+  };
+}
+
+export async function saveConfig(
+  entry: ServerEntry & { name?: string },
+): Promise<void> {
+  const cfg = (await readConfig()) ?? { servers: {} };
+  const key = entry.name ?? "default";
+  cfg.servers[key] = {
+    token: entry.token,
+    interval: entry.interval,
+    chatId: entry.chatId,
+  };
+  await writeConfig(cfg);
+}
+
+export async function deleteConfig(name?: string): Promise<boolean> {
+  const cfg = await readConfig();
+  if (!cfg) return false;
+  const key = name ?? "default";
+  if (!cfg.servers[key]) return false;
+  delete cfg.servers[key];
+  await writeConfig(cfg);
+  return true;
+}
+
 export async function listServers(): Promise<string[]> {
-  const names: string[] = [];
-  try {
-    const entries = await readdir(CONFIG_DIR);
-    for (const entry of entries) {
-      const match = entry.match(/^config-(.+)\.json$/);
-      if (match) names.push(match[1]!);
-    }
-  } catch {
-    // dir may not exist yet
-  }
-  if (existsSync(CONFIG_FILE)) names.unshift("default");
-  return names;
+  const cfg = await readConfig();
+  if (!cfg) return [];
+  return Object.keys(cfg.servers).sort();
 }

package/src/daemon/index.ts

@@ -1,6 +1,6 @@
 import { sendReport } from "../reporter";
 import { saveConfig, loadConfig, listServers } from "../config";
-import type { NamedConfig } from "../types";
+import type { ServerEntry, NamedConfig } from "../types";
 
 /* ------------------------------------------------------------------ */
 /*  Environment variables (set by cli/)                                */
@@ -57,10 +57,10 @@ async function autoDetectChatId(token: string): Promise<string | null> {
 
 async function persistChatId(id: string, name?: string): Promise<void> {
   try {
-    const cfg = await loadConfig(name);
-    if (cfg) {
-      cfg.chatId = id;
-      await saveConfig(cfg);
+    const entry = await loadConfig(name);
+    if (entry) {
+      entry.chatId = id;
+      await saveConfig({ ...entry, name });
       console.log("💾 Chat ID saved to config");
     }
   } catch {
@@ -138,30 +138,30 @@ export async function startAll(): Promise<void> {
   console.log(`📋 Found ${servers.length} server(s) to monitor:\n`);
 
   const configs: NamedConfig[] = [];
-  for (const s of servers) {
-    const cfg = await loadConfig(s === "default" ? undefined : s);
-    if (!cfg) {
-      console.log(`   ⚠️  ${s}: config unreadable, skipping`);
+  for (const name of servers) {
+    const entry = await loadConfig(name);
+    if (!entry) {
+      console.log(`   ⚠️  ${name}: config unreadable, skipping`);
       continue;
     }
-    if (!cfg.chatId) {
+    if (!entry.chatId) {
       if (configs.length === 0) {
-        console.log(`🔍 ${s}: Chat ID not set — auto-detecting...`);
-        const detected = await autoDetectChatId(cfg.token);
+        console.log(`🔍 ${name}: Chat ID not set — auto-detecting...`);
+        const detected = await autoDetectChatId(entry.token);
         if (detected) {
-          cfg.chatId = detected;
-          await saveConfig({ ...cfg, chatId: detected });
-          console.log(`💾 ${s}: Chat ID ${detected} saved`);
+          entry.chatId = detected;
+          await saveConfig({ ...entry, name });
+          console.log(`💾 ${name}: Chat ID ${detected} saved`);
         } else {
-          console.log(`   ❌ ${s}: no chat ID yet. DM your bot first then restart.`);
+          console.log(`   ❌ ${name}: no chat ID yet. DM your bot first then restart.`);
           continue;
         }
       } else {
-        console.log(`   ❌ ${s}: no chat ID. Run 'servermon start --name ${s}' first.`);
+        console.log(`   ❌ ${name}: no chat ID. Run 'servermon start --name ${name}' first.`);
         continue;
       }
     }
-    configs.push({ name: s, cfg });
+    configs.push({ name, cfg: entry });
   }
 
   if (configs.length === 0) {

package/src/types/index.ts

@@ -56,16 +56,20 @@ export interface SystemMetrics {
   temperature: number | null; // celsius
 }
 
-/** ServerMon config persisted to disk */
-export interface ServerMonConfig {
+/** A single server entry in the config */
+export interface ServerEntry {
   token: string;
   interval: number;
   chatId?: string;
-  name?: string;
+}
+
+/** Top-level config persisted to disk — single file, multiple servers */
+export interface ServerMonConfig {
+  servers: Record<string, ServerEntry>;
 }
 
 /** A named config loaded at runtime — internal for multi-server loop */
 export interface NamedConfig {
   name: string;
-  cfg: ServerMonConfig;
+  cfg: ServerEntry;
 }