[mikrotik-dhcp] fix upgrade to 'oui' package

Author: geoffhouse

src/modules/mikrotik-dhcp/container/package-lock.json

@@ -24,7 +24,7 @@
         "morgan": "^1.10.0",
         "node-cache": "^5.1.2",
         "node-routeros-v2": "^1.6.12",
-        "oui": "^13.1.6",
+        "oui-data": "^1.0.0",
         "ping": "^0.4.1",
         "toad-scheduler": "^3.1.0",
         "wildcard-regex": "^3.0.2",

src/modules/mikrotik-dhcp/container/package.json

@@ -1,9 +1,11 @@
 "use strict";
 
 const mongoCollection = require("@core/mongo-collection");
-const oui = require("oui");
+const ouiData = require("oui-data");
 const logger = require("@core/logger")(module);
 
+const getOuiPrefix = (macAddress = "") => macAddress.replace(/[^a-fA-F0-9]/g, "").slice(0, 6).toUpperCase();
+
 module.exports = async (leaseId) => {
     try {
         const dbLeases = await mongoCollection("leases");
@@ -12,10 +14,10 @@ module.exports = async (leaseId) => {
         // set manufacturer
         lease["manufacturer"] = "";
         if (lease["mac-address"]) {
-            const manufacturerResult = oui(lease["mac-address"]);
+            const ouiPrefix = getOuiPrefix(lease["mac-address"]);
+            const manufacturerResult = ouiData[ouiPrefix];
             if (manufacturerResult) {
-                const resultArray = manufacturerResult.split("\n");
-                lease["manufacturer"] = resultArray[0];
+                lease["manufacturer"] = manufacturerResult.split("\n")[0];
             }
         }
 

src/modules/mikrotik-dhcp/container/services/lease-get.js

@@ -1,4 +1,6 @@
-jest.mock("oui", () => jest.fn(() => "Vendor"), { virtual: true });
+jest.mock("oui-data", () => ({
+    AABBCC: "Vendor\nAddress",
+}), { virtual: true });
 
 const service = require("./lease-get");
 

src/modules/mikrotik-dhcp/container/services/lease-get.test.js

@@ -1,10 +1,12 @@
 "use strict";
 
 const mongoCollection = require("@core/mongo-collection");
-const oui = require("oui");
+const ouiData = require("oui-data");
 const sortHandlers = require("@core/sort-handlers");
 const logger = require("@core/logger")(module);
 
+const getOuiPrefix = (macAddress = "") => macAddress.replace(/[^a-fA-F0-9]/g, "").slice(0, 6).toUpperCase();
+
 module.exports = async (sortField = null, sortDirection = "asc", filters = {}) => {
     try {
         const dbLeases = await mongoCollection("leases");
@@ -50,7 +52,8 @@ module.exports = async (sortField = null, sortDirection = "asc", filters = {}) =
             // set manufacturer
             eachLease["manufacturer"] = "";
             if (eachLease["mac-address"]) {
-                const manufacturerResult = oui(eachLease["mac-address"]);
+                const ouiPrefix = getOuiPrefix(eachLease["mac-address"]);
+                const manufacturerResult = ouiData[ouiPrefix];
                 if (manufacturerResult) {
                     const resultArray = manufacturerResult.split("\n");
                     eachLease["manufacturer"] = resultArray[0];

src/modules/mikrotik-dhcp/container/services/lease-list.js

@@ -1,4 +1,6 @@
-jest.mock("oui", () => jest.fn(() => "Vendor"), { virtual: true });
+jest.mock("oui-data", () => ({
+    AABBCC: "Vendor\nAddress",
+}), { virtual: true });
 
 const service = require("./lease-list");
 

src/modules/mikrotik-dhcp/container/services/lease-list.test.js

@@ -2,25 +2,16 @@
     "name": "mikrotik-dhcp",
     "longname": "Mikrotik DHCP",
     "description": "View and manage DHCP leases on Mikrotik routers",
-    "capabilities": [
-        "dhcp-server"
-    ],
+    "capabilities": ["dhcp-server"],
     "notes": "",
     "version": "1.1.24",
     "icon": "mdi-clipboard-list",
     "author": "Geoff House",
     "needsContainer": true,
     "license": "Apache-2.0",
     "status": "stable",
-    "devmounts": [
-        "api",
-        "services",
-        "workers",
-        "utils"
-    ],
-    "protectedRoutes": [
-        "config"
-    ],
+    "devmounts": ["api", "services", "workers"],
+    "protectedRoutes": ["config"],
     "memory": 500,
     "defaultconfig": {
         "id": "",
@@ -34,4 +25,4 @@
         "username": "bug",
         "password": ""
     }
-}
+}