pmcf 1.22.0 → 1.23.1

package/bin/pmcf-host-defs

@@ -43,42 +43,34 @@ async function generateMachineInfo(host, dir) {
 async function generateNetworkDefs(host, dir) {
   const networkDir = join(dir, "etc/systemd/network");
 
-  for (const [name, network] of Object.entries(
-    host.networkInterfaces || { [host.interface || "eth0"]: host }
-  )) {
-    if (name !== "eth0" && network.hwaddr) {
-      await writeLines(networkDir, `${name}.link`, [
-        sectionLines("Match", { MACAddress: network.hwaddr }),
+  for (const ni of Object.values(host.networkInterfaces)) {
+    if (ni.name !== "eth0" && ni.hwaddr) {
+      await writeLines(networkDir, `${ni.name}.link`, [
+        sectionLines("Match", { MACAddress: ni.hwaddr }),
         "",
-        sectionLines("Link", { Name: name })
+        sectionLines("Link", { Name: ni.name })
       ]);
     }
 
-    const networkSections = [
-      sectionLines("Match", { Name: name }),
-      "",
-      sectionLines("Address", {
-        Address: network.ipv4 + "/" + network.network.ipv4_netmask
-      })
-    ];
+    const networkSections = [sectionLines("Match", { Name: ni.name })];
 
-    if (network["link-local-ipv6"]) {
+    for (const Address of ni.ipAddressesWithNetmask) {
       networkSections.push(
         "",
         sectionLines("Address", {
-          Address: network["link-local-ipv6"]
+          Address
         })
       );
     }
 
-    switch (network?.network?.kind) {
+    switch (ni.kind) {
       case "ethernet":
       case "wifi":
-        const routeSectionExtra = network?.destination
-          ? { Destination: network.destination }
+        const routeSectionExtra = ni.destination
+          ? { Destination: ni.destination }
           : { Gateway: host.location.gateway_ipv4 };
 
-        const networkSectionExtra = network.arpbridge
+        const networkSectionExtra = ni.arpbridge
           ? {
               IPForward: "yes",
               IPv4ProxyARP: "yes"
@@ -98,8 +90,8 @@ async function generateNetworkDefs(host, dir) {
           "",
           sectionLines("Route", {
             ...routeSectionExtra,
-            Scope: network.scope,
-            Metric: network.metric,
+            Scope: ni.scope,
+            Metric: ni.metric,
             InitialCongestionWindow: 20,
             InitialAdvertisedReceiveWindow: 20
           }),
@@ -112,7 +104,7 @@ async function generateNetworkDefs(host, dir) {
           })
         );
 
-        if (network.arpbridge) {
+        if (ni.arpbridge) {
           networkSections.push(
             "",
             sectionLines("Link", { Promiscuous: "yes" })
@@ -120,9 +112,9 @@ async function generateNetworkDefs(host, dir) {
         }
     }
 
-    await writeLines(networkDir, `${name}.network`, networkSections);
+    await writeLines(networkDir, `${ni.name}.network`, networkSections);
 
-    switch (network?.network?.kind) {
+    switch (ni?.kind) {
       case "wireguard":
         {
         }
@@ -131,21 +123,21 @@ async function generateNetworkDefs(host, dir) {
         const d = join(dir, "etc/wpa_supplicant");
         await mkdir(d, { recursive: true });
         writeFile(
-          join(d, `wpa_supplicant-${name}.conf`),
+          join(d, `wpa_supplicant-${ni.name}.conf`),
           `country=${host.location.country}
 ctrl_interface=DIR=/run/wpa_supplicant GROUP=netdev
 update_config=1
 p2p_disabled=1
 network={
-  ssid="${network.ssid}"
-  psk=${network.psk}
+  ssid="${ni.ssid}"
+  psk=${ni.psk}
   scan_ssid=1
 }`,
           "utf8"
         );
 
         host.postinstall.push(
-          `systemctl enable wpa_supplicant@${name}.service`
+          `systemctl enable wpa_supplicant@${ni.name}.service`
         );
       }
     }

package/package.json

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

package/src/base.mjs

@@ -158,7 +158,7 @@ export function extractFrom(object, propertyNames) {
     const value = object[p];
 
     if (value !== undefined) {
-      if (value instanceof Base && value.name) {
+      if (value instanceof Base && value.name !== undefined) {
         json[p] = { name: value.name };
       } else {
         json[p] = value;

package/src/model.mjs

@@ -1,6 +1,11 @@
 import { readFile, glob } from "node:fs/promises";
 import { join } from "node:path";
-import { asArray, bridgeToJSON, isIPv4Address, isIPv6Address} from "./utils.mjs";
+import {
+  asArray,
+  bridgeToJSON,
+  isIPv4Address,
+  isIPv6Address
+} from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";
 
@@ -696,6 +701,7 @@ export class NetworkInterface extends Base {
   #ssid;
   #psk;
   #network;
+  #kind;
   arpbridge;
   hwaddr;
 
@@ -707,11 +713,6 @@ export class NetworkInterface extends Base {
       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;
@@ -736,7 +737,11 @@ export class NetworkInterface extends Base {
     }
     if (data.metric) {
       this.#metric = data.metric;
-      delete data.psmetric;
+      delete data.metric;
+    }
+    if (data.kind) {
+      this.#kind = data.kind;
+      delete data.kind;
     }
 
     if (data.network) {
@@ -765,13 +770,17 @@ export class NetworkInterface extends Base {
     return this.#ipAddresses;
   }
 
-  get ipv4Addresses()
-  {
+  get ipAddressesWithNetmask() {
+    return this.#ipAddresses.map(a =>
+      isIPv4Address(a) ? `${a}/${this.network.ipv4_netmask}` : a
+    );
+  }
+
+  get ipv4Addresses() {
     return this.#ipAddresses.filter(a => isIPv4Address(a));
   }
 
-  get ipv6Addresses()
-  {
+  get ipv6Addresses() {
     return this.#ipAddresses.filter(a => isIPv6Address(a));
   }
 
@@ -814,6 +823,10 @@ export class NetworkInterface extends Base {
     return this.#psk || this.network?.psk;
   }
 
+  get kind() {
+    return this.#kind || this.network?.kind;
+  }
+
   get propertyNames() {
     return [
       ...super.propertyNames,
@@ -824,7 +837,8 @@ export class NetworkInterface extends Base {
       "psk",
       "scope",
       "metric",
-      "ipAddresses"
+      "ipAddresses",
+      "kind"
     ];
   }
 }
@@ -941,6 +955,10 @@ export class Service extends Base {
     return this.#ipAddresses || this.owner.ipAddresses;
   }
 
+  get addresses() {
+    return this.ipAddresses.map(a => `${a}:${this.port}`);
+  }
+
   get port() {
     return this.#port || ServiceTypes[this.type]?.port;
   }

package/types/model.d.mts

@@ -101,12 +101,14 @@ export class NetworkInterface extends Base {
     set network(networkOrName: any);
     get network(): any;
     get ipAddresses(): any[];
+    get ipAddressesWithNetmask(): any[];
     get ipv4Addresses(): any[];
     get ipv6Addresses(): any[];
     get scope(): any;
     get metric(): any;
     get ssid(): any;
     get psk(): any;
+    get kind(): any;
     #private;
 }
 export class Subnet extends Base {
@@ -118,6 +120,7 @@ export class Service extends Base {
     get protocol(): any;
     get srvPrefix(): string;
     get ipAddresses(): any;
+    get addresses(): any;
     get port(): any;
     get priority(): any;
     get weight(): any;