refactor user management: consolidate user fetching logic and add toggle/delete endpoints

Author: KaivanKeren

index.js

@@ -49,83 +49,6 @@ async function connectMikroTik() {
   }
 }
 
-async function getAllUsers() {
-  try {
-    await connectMikroTik();
-    const users = await connection.write("/ip/hotspot/user/print");
-    return users.map((user) => ({
-      username: user.name,
-      profile: user.profile,
-      uptime: user.uptime,
-      bytesIn: user["bytes-in"],
-      bytesOut: user["bytes-out"],
-      disabled: user.disabled === "true",
-      comment: user.comment || "",
-      limitBytesIn: user["limit-bytes-in"],
-      limitBytesOut: user["limit-bytes-out"],
-    }));
-  } catch (error) {
-    console.error("Error fetching users:", error);
-    return [];
-  }
-}
-
-// Get user details by username
-async function getUserDetails(username) {
-  try {
-    await connectMikroTik();
-    const user = await connection.write("/ip/hotspot/user/print", [
-      "=.proplist=name,profile,uptime,bytes-in,bytes-out,disabled,comment,limit-bytes-in,limit-bytes-out,last-logged-out",
-      "?name=" + username,
-    ]);
-
-    if (user.length === 0) {
-      return null;
-    }
-
-    // Get active sessions for the user
-    const activeSessions = await connection.write("/ip/hotspot/active/print", [
-      "?user=" + username,
-    ]);
-
-    // Get user's connection history
-    const history = await connection.write("/ip/hotspot/host/print", [
-      "?user=" + username,
-    ]);
-
-    return {
-      basicInfo: {
-        username: user[0].name,
-        profile: user[0].profile,
-        uptime: user[0].uptime,
-        bytesIn: user[0]["bytes-in"],
-        bytesOut: user[0]["bytes-out"],
-        disabled: user[0].disabled === "true",
-        comment: user[0].comment || "",
-        limitBytesIn: user[0]["limit-bytes-in"],
-        limitBytesOut: user[0]["limit-bytes-out"],
-        lastLoggedOut: user[0]["last-logged-out"],
-      },
-      activeSessions: activeSessions.map((session) => ({
-        ipAddress: session.address,
-        macAddress: session["mac-address"],
-        loginTime: session["login-by"],
-        uptime: session.uptime,
-        sessionId: session[".id"],
-      })),
-      connectionHistory: history.map((entry) => ({
-        ipAddress: entry.address,
-        macAddress: entry["mac-address"],
-        lastSeen: entry["last-seen"],
-        status: entry.status,
-      })),
-    };
-  } catch (error) {
-    console.error("Error fetching user details:", error);
-    return null;
-  }
-}
-
 // Get active IP addresses
 async function getActiveIPs() {
   try {
@@ -234,28 +157,201 @@ app.get("/api/logs/all", async (req, res) => {
   }
 });
 
+function formatUptime(uptime) {
+  if (!uptime) return 0;
+  // Convert RouterOS uptime format to seconds
+  const parts = uptime.split(/[whms]/);
+  const units = uptime.match(/[whms]/g);
+  let seconds = 0;
+
+  if (!parts || !units) return 0;
+
+  parts.forEach((part, i) => {
+    if (!part) return;
+    switch (units[i]) {
+      case "w":
+        seconds += parseInt(part) * 7 * 24 * 3600;
+        break;
+      case "h":
+        seconds += parseInt(part) * 3600;
+        break;
+      case "m":
+        seconds += parseInt(part) * 60;
+        break;
+      case "s":
+        seconds += parseInt(part);
+        break;
+    }
+  });
+
+  return seconds;
+}
+
+function formatBytes(bytes) {
+  if (!bytes) return '0';
+  return parseInt(bytes);
+}
+
 app.get("/api/users", async (req, res) => {
   try {
-    const users = await getAllUsers();
-    res.json(users);
+    await connectMikroTik();
+
+    // Get all users
+    const users = await connection.write("/ip/hotspot/user/print");
+
+    // Get active sessions for correlation
+    const activeSessions = await connection.write("/ip/hotspot/active/print");
+
+    const formattedUsers = users.map((user) => {
+      // Find active sessions for this user
+      const userSessions = activeSessions.filter(
+        (session) => session.user === user.name
+      );
+
+      return {
+        username: user.name,
+        profile: user.profile,
+        uptime: formatUptime(user.uptime),
+        bytesIn: formatBytes(user["bytes-in"]),
+        bytesOut: formatBytes(user["bytes-out"]),
+        disabled: user.disabled === "true",
+        comment: user.comment || "",
+        limitBytesIn: formatBytes(user["limit-bytes-in"]),
+        limitBytesOut: formatBytes(user["limit-bytes-out"]),
+        isOnline: userSessions.length > 0,
+        activeSessions: userSessions.length,
+      };
+    });
+
+    res.json(formattedUsers);
   } catch (error) {
+    console.error("Error fetching users:", error);
     res.status(500).json({ error: "Failed to fetch users" });
   }
 });
 
+// Get user details
 app.get("/api/users/:username", async (req, res) => {
   try {
-    const userDetails = await getUserDetails(req.params.username);
-    if (!userDetails) {
+    await connectMikroTik();
+    const username = req.params.username;
+
+    // Get user basic info
+    const user = await connection.write("/ip/hotspot/user/print", [
+      "=.proplist=name,profile,uptime,bytes-in,bytes-out,disabled,comment,limit-bytes-in,limit-bytes-out,last-logged-out",
+      "?name=" + username,
+    ]);
+
+    if (user.length === 0) {
       res.status(404).json({ error: "User not found" });
       return;
     }
+
+    // Get active sessions
+    const activeSessions = await connection.write("/ip/hotspot/active/print", [
+      "?user=" + username,
+    ]);
+
+    // Get connection history
+    const history = await connection.write("/ip/hotspot/host/print", [
+      "?user=" + username,
+    ]);
+
+    const userDetails = {
+      basicInfo: {
+        username: user[0].name,
+        profile: user[0].profile,
+        uptime: formatUptime(user[0].uptime),
+        bytesIn: formatBytes(user[0]["bytes-in"]),
+        bytesOut: formatBytes(user[0]["bytes-out"]),
+        disabled: user[0].disabled === "true",
+        comment: user[0].comment || "",
+        limitBytesIn: formatBytes(user[0]["limit-bytes-in"]),
+        limitBytesOut: formatBytes(user[0]["limit-bytes-out"]),
+        lastLoggedOut: user[0]["last-logged-out"] || null,
+      },
+      activeSessions: activeSessions.map((session) => ({
+        ipAddress: session.address,
+        macAddress: session["mac-address"],
+        loginTime: session["login-by"],
+        uptime: formatUptime(session.uptime),
+        sessionId: session[".id"],
+        bytesIn: formatBytes(session["bytes-in"]),
+        bytesOut: formatBytes(session["bytes-out"]),
+      })),
+      connectionHistory: history.map((entry) => ({
+        ipAddress: entry.address,
+        macAddress: entry["mac-address"],
+        lastSeen: entry["last-seen"],
+        status: entry.status,
+        host: entry.host,
+        bytesIn: formatBytes(entry["bytes-in"]),
+        bytesOut: formatBytes(entry["bytes-out"]),
+      })),
+    };
+
     res.json(userDetails);
   } catch (error) {
+    console.error("Error fetching user details:", error);
     res.status(500).json({ error: "Failed to fetch user details" });
   }
 });
 
+// User management endpoints
+// Enable/Disable user
+app.post("/api/users/:username/toggle", async (req, res) => {
+  try {
+    await connectMikroTik();
+    const username = req.params.username;
+
+    const user = await connection.write("/ip/hotspot/user/print", [
+      "?name=" + username,
+    ]);
+
+    if (user.length === 0) {
+      res.status(404).json({ error: "User not found" });
+      return;
+    }
+
+    const currentState = user[0].disabled === "true";
+    await connection.write("/ip/hotspot/user/set", [
+      "=.id=" + user[0][".id"],
+      "=disabled=" + !currentState,
+    ]);
+
+    res.json({ success: true, disabled: !currentState });
+  } catch (error) {
+    console.error("Error toggling user state:", error);
+    res.status(500).json({ error: "Failed to toggle user state" });
+  }
+});
+
+// Delete user
+app.delete("/api/users/:username", async (req, res) => {
+  try {
+    await connectMikroTik();
+    const username = req.params.username;
+
+    const user = await connection.write("/ip/hotspot/user/print", [
+      "?name=" + username,
+    ]);
+
+    if (user.length === 0) {
+      res.status(404).json({ error: "User not found" });
+      return;
+    }
+
+    await connection.write("/ip/hotspot/user/remove", [
+      "=.id=" + user[0][".id"],
+    ]);
+
+    res.json({ success: true });
+  } catch (error) {
+    console.error("Error deleting user:", error);
+    res.status(500).json({ error: "Failed to delete user" });
+  }
+});
+
 // REST endpoint for initial data
 app.get("/api/network-data", async (req, res) => {
   try {