Move to netmask package instead

bstudios · Feb 27, 2024 · ccaeb63 · ccaeb63
1 parent ae2291b
commit ccaeb63
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 195 deletions.
diff --git a/client/src/Devices/Scan/DiscoveredDeviceCard.tsx b/client/src/Devices/Scan/DiscoveredDeviceCard.tsx
diff --git a/client/src/Devices/Scan/ScanModal.tsx b/client/src/Devices/Scan/ScanModal.tsx
diff --git a/client/src/Operate/Operate.tsx b/client/src/Operate/Operate.tsx
@@ -12,7 +12,7 @@ const DeviceChannelDisplay = (props: { device: Device, status: number | false, d
   return (
     <Card>
       <Text fw={500} ta="center" mb="md">
-        {props.device.name} {props.device.ip}
+        {props.device.name}
       </Text>
       {props.status === false ? (
         <Alert variant="transparent" title="Device Disconnected" icon={<IconPlugConnectedX />} mb="md">

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -19,11 +19,12 @@
     "@types/cors": "^2.8.17",
     "@types/ip": "^1.1.3",
     "@types/node-osc": "^6.0.3",
+    "@types/netmask": "^2.0.5",
     "better-sqlite3": "^9.4.1",
     "cors": "^2.8.5",
     "drizzle-orm": "^0.29.3",
     "electron-squirrel-startup": "^1.0.0",
-    "get-ip-range": "^4.0.1",
+    "netmask": "^2.0.2",
     "ip": "^2.0.1",
     "node-osc": "^9.1.0",
     "portfinder": "^1.0.32",

diff --git a/server/src/utils/scanForDevices.ts b/server/src/utils/scanForDevices.ts
@@ -1,9 +1,13 @@
 import ip from "ip";
-import { getIPRange } from "get-ip-range";
+import { Netmask } from "netmask";
 
 export const scanForDevices = () => {
   const thisIp = ip.address();
-  const ips = getIPRange(thisIp + "/24");
+  if (!thisIp || thisIp === null)
+    throw new Error("Unable to get the local IP address");
+  const ips: string[] = [];
+  const block = new Netmask(thisIp, "255.255.255.0");
+  block.forEach((ip: string) => ips.push(ip));
   console.log("Scanning for devices on the network");
   return Promise.allSettled(
     ips.map((ip) => {