pmcf 2.11.3 → 2.11.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.11.3",
+  "version": "2.11.5",
   "publishConfig": {
     "access": "public"
   },

package/src/services/dhcp.mjs

@@ -172,13 +172,15 @@ export class DHCPService extends Service {
       }
     }
 
-    const reservations = [...hwmap].map(([k, networkInterface]) => {
-      return {
-        "hw-address": k,
-        "ip-address": networkInterface.rawAddress,
-        hostname: networkInterface.hostName
-      };
-    });
+    const reservations = [...hwmap]
+      .map(([k, networkInterface]) => {
+        return {
+          "hw-address": k,
+          "ip-address": networkInterface.rawIPv4Address,
+          hostname: networkInterface.hostName
+        };
+      })
+      .sort((a, b) => a.hostname.localeCompare(b.hostname));
 
     const dhcp4 = {
       Dhcp4: {

package/src/utils.mjs

@@ -87,12 +87,13 @@ export function isIPv4Address(address) {
   return false;
 }
 
-export function generateEU64(mac) {
-  //TODO
-}
-
 export function isIPv6Address(address) {
-  return address.indexOf(":") >= 0;
+  switch (typeof address) {
+    case "string":
+      return address.indexOf(":") >= 0;
+  }
+
+  return false;
 }
 
 export function isLinkLocal(address) {
@@ -107,6 +108,10 @@ export function isLinkLocal(address) {
   return false;
 }
 
+export function generateEU64(mac) {
+  //TODO
+}
+
 export function isLocalhost(address) {
   const eaddr = encodeIP(address);
   return eaddr === IPV4_LOCALHOST || eaddr === IPV6_LOCALHOST;

package/types/utils.d.mts

@@ -6,9 +6,9 @@ export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
 export function asIterator(value: any): any;
 export function isIPv4Address(address: any): boolean;
-export function generateEU64(mac: any): void;
 export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): boolean;
+export function generateEU64(mac: any): void;
 export function isLocalhost(address: any): boolean;
 export function normalizeIPAddress(address: any): any;
 export function addressWithPrefixLength(address: any, prefixLength: any): string;