@itd2902/auggw 1.1.5 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itd2902/auggw",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "CLI tool for rotating Augment session accounts",
   "main": "src/index.js",
   "bin": {

package/src/utils/api.js

@@ -1,74 +1,124 @@
-const os = require("os");
-const { loadToken } = require("./token");
-
-const DEFAULT_API_URL = "https://auggw.quangit.site";
-// const DEFAULT_API_URL = "http://localhost:3000";
-
-function getBaseURL() {
-  return process.env.auggw_API_URL || DEFAULT_API_URL;
-}
-
-function getLocalIP() {
-  const interfaces = os.networkInterfaces();
-  // Skip virtual/VPN adapters — prefer real Ethernet/Wi-Fi
-  const skipPatterns =
-    /tailscale|vpn|virtual|vethernet|bluetooth|loopback|docker|vbox|vmware|wsl/i;
-
-  // First pass: find IP from real adapters (Ethernet, Wi-Fi)
-  for (const [name, addrs] of Object.entries(interfaces)) {
-    if (skipPatterns.test(name)) continue;
-    for (const iface of addrs) {
-      if (iface.family === "IPv4" && !iface.internal) {
-        return iface.address;
-      }
-    }
-  }
-  // Fallback: any non-internal IPv4
-  for (const addrs of Object.values(interfaces)) {
-    for (const iface of addrs) {
-      if (iface.family === "IPv4" && !iface.internal) {
-        return iface.address;
-      }
-    }
-  }
-  return "127.0.0.1";
-}
-
-async function apiRequest(method, path, body = null) {
-  const url = `${getBaseURL()}${path}`;
-  const token = loadToken();
-
-  const headers = {
-    "Content-Type": "application/json",
-    "X-Client-IP": getLocalIP(),
-    "X-Client-Hostname": os.hostname(),
-  };
-  if (token) {
-    headers["Authorization"] = `Bearer ${token}`;
-  }
-
-  const options = { method, headers };
-  if (body) {
-    options.body = JSON.stringify(body);
-  }
-
-  try {
-    const res = await fetch(url, options);
-    const data = await res.json();
-
-    if (!res.ok) {
-      const err = new Error(data.error || `HTTP ${res.status}`);
-      err.status = res.status;
-      throw err;
-    }
-
-    return data;
-  } catch (err) {
-    if (err.cause && err.cause.code === "ECONNREFUSED") {
-      throw new Error(`Could not connect to server at ${getBaseURL()}`);
-    }
-    throw err;
-  }
-}
-
-module.exports = { apiRequest, getBaseURL };
+const os = require("os");
+const { execSync } = require("child_process");
+const { loadToken } = require("./token");
+
+const DEFAULT_API_URL = "https://auggw.quangit.site";
+// const DEFAULT_API_URL = "http://localhost:3000";
+
+function getBaseURL() {
+  return process.env.auggw_API_URL || DEFAULT_API_URL;
+}
+
+function getIPv4FromInterface(interfaceName) {
+  const interfaces = os.networkInterfaces();
+  const addrs = interfaces[interfaceName] || [];
+
+  for (const iface of addrs) {
+    if ((iface.family === "IPv4" || iface.family === 4) && !iface.internal) {
+      return iface.address;
+    }
+  }
+
+  return null;
+}
+
+function getDefaultInterfaceWindows() {
+  try {
+    const cmd = `powershell -NoProfile -Command "Get-NetRoute -DestinationPrefix '0.0.0.0/0' | Sort-Object RouteMetric, InterfaceMetric | Select-Object -First 1 -ExpandProperty InterfaceAlias"`;
+    return execSync(cmd, { encoding: "utf8" }).trim();
+  } catch {
+    return null;
+  }
+}
+
+function getDefaultInterfaceMac() {
+  try {
+    const output = execSync("route -n get default", { encoding: "utf8" });
+    const match = output.match(/interface:\s+(.+)/);
+    return match ? match[1].trim() : null;
+  } catch {
+    return null;
+  }
+}
+
+function getLocalIP() {
+  const platform = process.platform;
+
+  // Try default interface first (most accurate)
+  let defaultInterface = null;
+  if (platform === "win32") {
+    defaultInterface = getDefaultInterfaceWindows();
+  } else if (platform === "darwin") {
+    defaultInterface = getDefaultInterfaceMac();
+  }
+
+  if (defaultInterface) {
+    const ip = getIPv4FromInterface(defaultInterface);
+    if (ip) return ip;
+  }
+
+  // Fallback: skip virtual/VPN adapters, prefer real Ethernet/Wi-Fi
+  const skipPatterns =
+    /tailscale|vpn|virtual|vethernet|bluetooth|loopback|docker|vbox|vmware|wsl/i;
+
+  const interfaces = os.networkInterfaces();
+
+  for (const [name, addrs] of Object.entries(interfaces)) {
+    if (skipPatterns.test(name)) continue;
+    for (const iface of addrs) {
+      if ((iface.family === "IPv4" || iface.family === 4) && !iface.internal) {
+        return iface.address;
+      }
+    }
+  }
+
+  // Last resort: any non-internal IPv4
+  for (const addrs of Object.values(interfaces)) {
+    for (const iface of addrs) {
+      if ((iface.family === "IPv4" || iface.family === 4) && !iface.internal) {
+        return iface.address;
+      }
+    }
+  }
+
+  return "127.0.0.1";
+}
+
+async function apiRequest(method, path, body = null) {
+  const url = `${getBaseURL()}${path}`;
+  const token = loadToken();
+
+  const headers = {
+    "Content-Type": "application/json",
+    "X-Client-IP": getLocalIP(),
+    "X-Client-Hostname": os.hostname(),
+  };
+  if (token) {
+    headers["Authorization"] = `Bearer ${token}`;
+  }
+
+  const options = { method, headers };
+  if (body) {
+    options.body = JSON.stringify(body);
+  }
+
+  try {
+    const res = await fetch(url, options);
+    const data = await res.json();
+
+    if (!res.ok) {
+      const err = new Error(data.error || `HTTP ${res.status}`);
+      err.status = res.status;
+      throw err;
+    }
+
+    return data;
+  } catch (err) {
+    if (err.cause && err.cause.code === "ECONNREFUSED") {
+      throw new Error(`Could not connect to server at ${getBaseURL()}`);
+    }
+    throw err;
+  }
+}
+
+module.exports = { apiRequest, getBaseURL };