pmcf 1.21.1 → 1.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.21.1",
+  "version": "1.22.0",
   "publishConfig": {
     "access": "public"
   },
@@ -39,6 +39,9 @@
     "lint:docs": "documentation lint ./src**/*.mjs",
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
+  "dependencies": {
+    "pacc": "^3.1.9"
+  },
   "devDependencies": {
     "@types/node": "^22.10.10",
     "ava": "^6.2.0",
@@ -64,8 +67,5 @@
       "arlac77/template-node-app",
       "arlac77/template-typescript"
     ]
-  },
-  "dependencies": {
-    "pacc": "^3.1.9"
   }
 }

package/src/model.mjs

@@ -1,6 +1,6 @@
 import { readFile, glob } from "node:fs/promises";
 import { join } from "node:path";
-import { asArray, bridgeToJSON } from "./utils.mjs";
+import { asArray, bridgeToJSON, isIPv4Address, isIPv6Address} from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";
 
@@ -639,10 +639,8 @@ export class Host extends Base {
 
   *networkAddresses() {
     for (const networkInterface of Object.values(this.networkInterfaces)) {
-      for (const attribute of ["ipv4", "ipv6", "link-local-ipv6"]) {
-        if (networkInterface[attribute]) {
-          yield { address: networkInterface[attribute], networkInterface };
-        }
+      for (const address of networkInterface.ipAddresses) {
+        yield { address, networkInterface };
       }
     }
   }
@@ -692,6 +690,7 @@ export class NetworkInterface extends Base {
     return "network_interface";
   }
 
+  #ipAddresses = [];
   #scope;
   #metric;
   #ssid;
@@ -703,6 +702,26 @@ export class NetworkInterface extends Base {
   constructor(owner, data) {
     super(owner, data);
 
+    if (data.ipv4) {
+      this.#ipAddresses.push(...asArray(data.ipv4));
+      delete data.ipv4;
+    }
+
+    if (data["link-local-ipv6"]) {
+      this.#ipAddresses.push(...asArray(data["link-local-ipv6"]));
+      delete data["link-local-ipv6"];
+    }
+
+    if (data.ipv6) {
+      this.#ipAddresses.push(...asArray(data.ipv6));
+      delete data.ipv6;
+    }
+
+    if (data.ipAddresses) {
+      this.#ipAddresses.push(...asArray(data.ipAddresses));
+      delete data.ipAddresses;
+    }
+
     if (data.ssid) {
       this.#ssid = data.ssid;
       delete data.ssid;
@@ -742,6 +761,20 @@ export class NetworkInterface extends Base {
     //this.arpbridge = owner.addARPBridge(this, data.arpbridge);
   }
 
+  get ipAddresses() {
+    return this.#ipAddresses;
+  }
+
+  get ipv4Addresses()
+  {
+    return this.#ipAddresses.filter(a => isIPv4Address(a));
+  }
+
+  get ipv6Addresses()
+  {
+    return this.#ipAddresses.filter(a => isIPv6Address(a));
+  }
+
   get network() {
     return this.#network;
   }
@@ -790,7 +823,8 @@ export class NetworkInterface extends Base {
       "ssid",
       "psk",
       "scope",
-      "metric"
+      "metric",
+      "ipAddresses"
     ];
   }
 }
@@ -865,8 +899,6 @@ export class Service extends Base {
 
     Object.assign(this, data);
 
-    this.owner = owner;
-
     owner.addService(this);
   }
 
@@ -914,7 +946,7 @@ export class Service extends Base {
   }
 
   get priority() {
-    return /*this.#priority || */ this.owner.priority || 99;
+    return this.#priority || this.owner.priority || 99;
   }
 
   get weight() {

package/types/model.d.mts

@@ -100,6 +100,9 @@ export class NetworkInterface extends Base {
     hwaddr: any;
     set network(networkOrName: any);
     get network(): any;
+    get ipAddresses(): any[];
+    get ipv4Addresses(): any[];
+    get ipv6Addresses(): any[];
     get scope(): any;
     get metric(): any;
     get ssid(): any;