pmcf 1.52.1 → 1.52.3

package/bin/pmcf-host-defs

@@ -1,10 +1,14 @@
 #!/usr/bin/env node
 
-import { writeFile, mkdir, copyFile, glob, chmod } from "node:fs/promises";
 import { join } from "node:path";
 import { types } from "pmcf";
-import { writeLines, sectionLines } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
+import {
+  generateNetworkDefs,
+  generateMachineInfo,
+  copySshKeys,
+  generateKnownHosts
+} from "../src/host-utils.mjs";
 
 const { root, args, options } = await prepare();
 
@@ -25,157 +29,3 @@ console.log("depends", `location-${host.location.name}`, ...host.depends);
 console.log("replaces", `mf-${host.hostName}`, ...host.replaces);
 console.log("description", `host definitions for ${host.domainName}`);
 console.log("backup", "root/.ssh/known_hosts");
-
-async function generateMachineInfo(host, dir) {
-  const etcDir = join(dir, "etc");
-  await writeLines(
-    etcDir,
-    "machine-info",
-    Object.entries({
-      CHASSIS: host.chassis,
-      DEPLOYMENT: host.deployment,
-      LOCATION: host.location.name,
-      HARDWARE_VENDOR: host.vendor,
-      HARDWARE_MODEL: host.modelName
-    }).map(([k, v]) => `${k}=${v}`)
-  );
-
-  await writeLines(etcDir, "machine-id", host["machine-id"]);
-  await writeLines(etcDir, "hostname", host.hostName);
-}
-
-async function generateNetworkDefs(host, dir) {
-  const networkDir = join(dir, "etc/systemd/network");
-
-  for (const ni of host.networkInterfaces.values()) {
-    if (ni.name !== "eth0" && ni.hwaddr) {
-      await writeLines(networkDir, `${ni.name}.link`, [
-        sectionLines("Match", { MACAddress: ni.hwaddr }),
-        "",
-        sectionLines("Link", { Name: ni.name })
-      ]);
-    }
-
-    const networkSections = [sectionLines("Match", { Name: ni.name })];
-
-    for (const Address of ni.cidrAddresses) {
-      networkSections.push(
-        "",
-        sectionLines("Address", {
-          Address
-        })
-      );
-    }
-
-    switch (ni.kind) {
-      case "ethernet":
-      case "wifi":
-        const routeSectionExtra = ni.destination
-          ? { Destination: ni.destination }
-          : { Gateway: ni.gatewayAddress };
-
-        const networkSectionExtra = ni.arpbridge
-          ? {
-              IPForward: "yes",
-              IPv4ProxyARP: "yes"
-            }
-          : {};
-
-        networkSections.push(
-          "",
-          sectionLines("Network", {
-            ...networkSectionExtra,
-            DHCP: "no",
-            DHCPServer: "no",
-            MulticastDNS: "yes",
-            LinkLocalAddressing: "ipv6",
-            IPv6LinkLocalAddressGenerationMode: "stable-privacy"
-          }),
-          "",
-          sectionLines("Route", {
-            ...routeSectionExtra,
-            Scope: ni.scope,
-            Metric: ni.metric,
-            InitialCongestionWindow: 20,
-            InitialAdvertisedReceiveWindow: 20
-          }),
-          "",
-          sectionLines("IPv6AcceptRA", {
-            UseAutonomousPrefix: "true",
-            UseOnLinkPrefix: "true",
-            DHCPv6Client: "false",
-            Token: "eui64"
-          })
-        );
-
-        if (ni.arpbridge) {
-          networkSections.push(
-            "",
-            sectionLines("Link", { Promiscuous: "yes" })
-          );
-        }
-    }
-
-    await writeLines(networkDir, `${ni.name}.network`, networkSections);
-
-    switch (ni?.kind) {
-      case "wireguard":
-        {
-        }
-        break;
-      case "wifi": {
-        const d = join(dir, "etc/wpa_supplicant");
-        await mkdir(d, { recursive: true });
-        writeFile(
-          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="${ni.ssid}"
-  psk=${ni.psk}
-  scan_ssid=1
-}`,
-          "utf8"
-        );
-
-        host.postinstall.push(
-          `systemctl enable wpa_supplicant@${ni.name}.service`
-        );
-      }
-    }
-  }
-}
-
-async function copySshKeys(host, dir) {
-  const sshDir = join(dir, "etc", "ssh");
-
-  await mkdir(sshDir, { recursive: true });
-
-  for await (const file of glob("ssh_host_*", { cwd: host.directory })) {
-    const destinationFileName = join(sshDir, file);
-    await copyFile(join(host.directory, file), destinationFileName);
-    await chmod(
-      destinationFileName,
-      destinationFileName.endsWith(".pub") ? 0o0644 : 0o0600
-    );
-  }
-}
-
-async function generateKnownHosts(hosts, dir) {
-  const keys = [];
-  for await (const host of hosts) {
-    try {
-      const [alg, key, desc] = (await host.publicKey("ed25519")).split(/\s+/);
-
-      keys.push(`${host.domainName} ${alg} ${key}`);
-
-      for await (const addr of host.networkAddresses()) {
-        keys.push(`${addr.address} ${alg} ${key}`);
-      }
-    } catch {}
-  }
-
-  await writeLines(dir, "known_hosts", keys);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.52.1",
+  "version": "1.52.3",
   "publishConfig": {
     "access": "public"
   },
@@ -40,6 +40,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
+    "npm-pkgbuild": "^16.0.1",
     "pacc": "^3.3.0"
   },
   "devDependencies": {
@@ -48,7 +49,7 @@
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "semantic-release": "^24.2.3",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "engines": {
     "node": ">=22.14.0"

package/src/host-utils.mjs

@@ -0,0 +1,157 @@
+import { writeFile, mkdir, copyFile, glob, chmod } from "node:fs/promises";
+import { join } from "node:path";
+import { writeLines, sectionLines } from "../src/utils.mjs";
+
+export async function generateMachineInfo(host, dir) {
+  const etcDir = join(dir, "etc");
+  await writeLines(
+    etcDir,
+    "machine-info",
+    Object.entries({
+      CHASSIS: host.chassis,
+      DEPLOYMENT: host.deployment,
+      LOCATION: host.location.name,
+      HARDWARE_VENDOR: host.vendor,
+      HARDWARE_MODEL: host.modelName
+    }).map(([k, v]) => `${k}=${v}`)
+  );
+
+  await writeLines(etcDir, "machine-id", host["machine-id"]);
+  await writeLines(etcDir, "hostname", host.hostName);
+}
+
+export async function generateNetworkDefs(host, dir) {
+  const networkDir = join(dir, "etc/systemd/network");
+
+  for (const ni of host.networkInterfaces.values()) {
+    if (ni.name !== "eth0" && ni.hwaddr) {
+      await writeLines(networkDir, `${ni.name}.link`, [
+        sectionLines("Match", { MACAddress: ni.hwaddr }),
+        "",
+        sectionLines("Link", { Name: ni.name })
+      ]);
+    }
+
+    const networkSections = [sectionLines("Match", { Name: ni.name })];
+
+    for (const Address of ni.cidrAddresses) {
+      networkSections.push(
+        "",
+        sectionLines("Address", {
+          Address
+        })
+      );
+    }
+
+    switch (ni.kind) {
+      case "ethernet":
+      case "wifi":
+        const routeSectionExtra = ni.destination
+          ? { Destination: ni.destination }
+          : { Gateway: ni.gatewayAddress };
+
+        const networkSectionExtra = ni.arpbridge
+          ? {
+              IPForward: "yes",
+              IPv4ProxyARP: "yes"
+            }
+          : {};
+
+        networkSections.push(
+          "",
+          sectionLines("Network", {
+            ...networkSectionExtra,
+            DHCP: "no",
+            DHCPServer: "no",
+            MulticastDNS: "yes",
+            LinkLocalAddressing: "ipv6",
+            IPv6LinkLocalAddressGenerationMode: "stable-privacy"
+          }),
+          "",
+          sectionLines("Route", {
+            ...routeSectionExtra,
+            Scope: ni.scope,
+            Metric: ni.metric,
+            InitialCongestionWindow: 20,
+            InitialAdvertisedReceiveWindow: 20
+          }),
+          "",
+          sectionLines("IPv6AcceptRA", {
+            UseAutonomousPrefix: "true",
+            UseOnLinkPrefix: "true",
+            DHCPv6Client: "false",
+            Token: "eui64"
+          })
+        );
+
+        if (ni.arpbridge) {
+          networkSections.push(
+            "",
+            sectionLines("Link", { Promiscuous: "yes" })
+          );
+        }
+    }
+
+    await writeLines(networkDir, `${ni.name}.network`, networkSections);
+
+    switch (ni?.kind) {
+      case "wireguard":
+        {
+        }
+        break;
+      case "wifi": {
+        const d = join(dir, "etc/wpa_supplicant");
+        await mkdir(d, { recursive: true });
+        writeFile(
+          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="${ni.ssid}"
+  psk=${ni.psk}
+  scan_ssid=1
+}`,
+          "utf8"
+        );
+
+        host.postinstall.push(
+          `systemctl enable wpa_supplicant@${ni.name}.service`
+        );
+      }
+    }
+  }
+}
+
+export async function copySshKeys(host, dir) {
+  const sshDir = join(dir, "etc", "ssh");
+
+  await mkdir(sshDir, { recursive: true });
+
+  for await (const file of glob("ssh_host_*", { cwd: host.directory })) {
+    const destinationFileName = join(sshDir, file);
+    await copyFile(join(host.directory, file), destinationFileName);
+    await chmod(
+      destinationFileName,
+      destinationFileName.endsWith(".pub") ? 0o0644 : 0o0600
+    );
+  }
+}
+
+export async function generateKnownHosts(hosts, dir) {
+  const keys = [];
+  for await (const host of hosts) {
+    try {
+      const [alg, key, desc] = (await host.publicKey("ed25519")).split(/\s+/);
+
+      keys.push(`${host.domainName} ${alg} ${key}`);
+
+      for await (const addr of host.networkAddresses()) {
+        keys.push(`${addr.address} ${alg} ${key}`);
+      }
+    } catch {}
+  }
+
+  await writeLines(dir, "known_hosts", keys);
+}

package/src/host.mjs

@@ -89,9 +89,11 @@ export class Host extends Base {
           }
         }
 
-        this.#depends = this.expand(this.depends);
-        this.#provides = this.expand(this.provides);
-        this.#replaces = this.expand(this.replaces);
+        if (!this.isTemplate) {
+          this.#depends = this.expand(this.depends);
+          this.#provides = this.expand(this.provides);
+          this.#replaces = this.expand(this.replaces);
+        }
       });
     }
   }

package/types/host-utils.d.mts

@@ -0,0 +1,4 @@
+export function generateMachineInfo(host: any, dir: any): Promise<void>;
+export function generateNetworkDefs(host: any, dir: any): Promise<void>;
+export function copySshKeys(host: any, dir: any): Promise<void>;
+export function generateKnownHosts(hosts: any, dir: any): Promise<void>;