pmcf 1.83.0 → 1.85.0

package/package.json

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

package/src/base.mjs

@@ -1,6 +1,5 @@
 import { join } from "node:path";
-import { createReadStream } from "node:fs";
-import { allOutputs, extractFunctions } from "npm-pkgbuild";
+import { allOutputs } from "npm-pkgbuild";
 import { getAttribute } from "pacc";
 import { addType, primitives } from "./types.mjs";
 
@@ -354,27 +353,6 @@ export class Base {
     return this.#packaging;
   }
 
-  #packageHooks = {};
-
-  get packageHooks() {
-    return this.#packageHooks;
-  }
-
-  async loadPackageHooks(file) {
-    for await (const f of extractFunctions(createReadStream(file, "utf8"))) {
-      this.addPackageHook(f.name, f.body);
-    }
-  }
-
-  addPackageHook(name, content) {
-    const hook = this.#packageHooks[name];
-    if (hook) {
-      content = hook + "\n" + content;
-    }
-
-    this.#packageHooks[name] = content;
-  }
-
   get outputs() {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }

package/src/dns.mjs

@@ -29,6 +29,7 @@ const DNSServiceTypeDefinition = {
     },
     notify: { type: "boolean", collection: false, writeable: true },
     recordTTL: { type: "string", collection: false, writeable: true },
+    serial: { type: "number", collection: false, writeable: true },
     refresh: { type: "string", collection: false, writeable: true },
     retry: { type: "string", collection: false, writeable: true },
     expire: { type: "string", collection: false, writeable: true },
@@ -49,6 +50,7 @@ export class DNSService extends Base {
   #source = [];
   #trusted = [];
 
+  serial = Math.ceil(Date.now() / 1000);
   refresh = 36000;
   retry = 72000;
   expire = 600000;
@@ -73,7 +75,7 @@ export class DNSService extends Base {
   }
 
   get soaUpdates() {
-    return [this.refresh, this.retry, this.expire, this.minimum];
+    return [this.serial, this.refresh, this.retry, this.expire, this.minimum];
   }
 
   set trusted(value) {
@@ -120,11 +122,11 @@ export class DNSService extends Base {
     ];
   }
 
-  async *preparePackages(stagingDir) {
+  async *preparePackages(dir) {
     const name = this.owner.name;
-    const p1 = join(stagingDir, "p1");
-
-    const result = {
+    const p1 = join(dir, "p1");
+    const packageData = {
+      dir: p1,
       sources: [new FileContentProvider(p1 + "/")[Symbol.asyncIterator]()],
       outputs: this.outputs,
       properties: {
@@ -139,7 +141,7 @@ export class DNSService extends Base {
       ...serviceAddresses(this.source, DNS_SERVICE_FILTER).map(a => `  ${a};`),
       "};"
     ];
-    await writeLines(join(p1, "etc/named.d/options"), `${name}.conf`, options);
+    await writeLines(join(p1, "etc/named/options"), `${name}.conf`, options);
 
     const category = [
       "acl trusted {",
@@ -148,18 +150,18 @@ export class DNSService extends Base {
     ];
 
     await writeLines(
-      join(p1, "etc/named.d/categories"),
+      join(p1, "etc/named"),
       `${name}.conf`,
       category
     );
 
     if (options.length > 2 || category.length > 2) {
-      yield result;
+      yield packageData;
     }
 
-    const p2 = join(stagingDir, "p2");
+    const p2 = (packageData.dir = join(dir, "p2"));
 
-    result.properties = {
+    packageData.properties = {
       name: `named-zones-${name}`,
       description: `zone definitions for ${this.fullName}`,
       dependencies: ["mf-named"],
@@ -167,31 +169,28 @@ export class DNSService extends Base {
       access: "private"
     };
 
-    result.sources = [
-      new FileContentProvider(
-        p2 + "/",
-        {
-          mode: 0o644,
-          owner: "named",
-          group: "named"
-        },
-        {
-          mode: 0o755,
-          owner: "named",
-          group: "named"
-        }
-      )[Symbol.asyncIterator]()
+    packageData.sources = [
+      new FileContentProvider(p2 + "/", {
+        mode: 0o644,
+        owner: "named",
+        group: "named"
+      }, {
+        mode: 0o755,
+        owner: "named",
+        group: "named"
+      })[
+        Symbol.asyncIterator
+      ]()
     ];
 
-    await generateZoneDefs(this, p2);
+    await generateZoneDefs(this, packageData);
 
-    yield result;
+    yield packageData;
   }
 }
 
-async function generateZoneDefs(dns, targetDir) {
+async function generateZoneDefs(dns, packageData) {
   const ttl = dns.recordTTL;
-  const updates = [Math.ceil(Date.now() / 1000), ...dns.soaUpdates].join(" ");
   const nameService = dns.findService(DNS_SERVICE_FILTER);
   const rname = dns.administratorEmail.replace(/@/, ".");
 
@@ -200,7 +199,7 @@ async function generateZoneDefs(dns, targetDir) {
     "SOA",
     dnsFullName(nameService.domainName),
     dnsFullName(rname),
-    `(${updates})`
+    `(${[...dns.soaUpdates].join(" ")})`
   );
 
   const NSRecord = DNSRecord(
@@ -380,14 +379,14 @@ async function generateZoneDefs(dns, targetDir) {
       }
 
       await writeLines(
-        join(targetDir, "var/lib/named"),
+        join(packageData.dir, "var/lib/named"),
         zone.file,
         [...zone.records].map(r => r.toString(maxKeyLength, ttl))
       );
     }
 
     await writeLines(
-      join(targetDir, "etc/named.d/zones"),
+      join(packageData.dir, "etc/named/zones"),
       config.name,
       content
     );

package/src/hooks.mjs

@@ -0,0 +1,21 @@
+import { createReadStream } from "node:fs";
+import { extractFunctions } from "npm-pkgbuild";
+
+export async function loadHooks(hooks, file) {
+  for await (const f of extractFunctions(createReadStream(file, "utf8"))) {
+    addHook(hooks, f.name, f.body);
+  }
+
+  return hooks;
+}
+
+export function addHook(hooks, name, content) {
+  const hook = hooks[name];
+  if (hook) {
+    content = hook + "\n" + content;
+  }
+
+  hooks[name] = content;
+
+  return hooks;
+}

package/src/host-utils.mjs

@@ -1,9 +1,10 @@
 import { writeFile, mkdir, copyFile, glob, chmod } from "node:fs/promises";
 import { join } from "node:path";
 import { writeLines, sectionLines } from "../src/utils.mjs";
+import { addHook } from "./hooks.mjs";
 
-export async function generateMachineInfo(host, dir) {
-  const etcDir = join(dir, "etc");
+export async function generateMachineInfo(host, packageData) {
+  const etcDir = join(packageData.dir, "etc");
   await writeLines(
     etcDir,
     "machine-info",
@@ -20,8 +21,8 @@ export async function generateMachineInfo(host, dir) {
   await writeLines(etcDir, "hostname", host.hostName);
 }
 
-export async function generateNetworkDefs(host, dir) {
-  const networkDir = join(dir, "etc/systemd/network");
+export async function generateNetworkDefs(host, packageData) {
+  const networkDir = join(packageData.dir, "etc/systemd/network");
 
   for (const ni of host.networkInterfaces.values()) {
     if (ni.name !== "eth0" && ni.hwaddr) {
@@ -100,7 +101,7 @@ export async function generateNetworkDefs(host, dir) {
         }
         break;
       case "wifi": {
-        const d = join(dir, "etc/wpa_supplicant");
+        const d = join(packageData.dir, "etc/wpa_supplicant");
         await mkdir(d, { recursive: true });
         writeFile(
           join(d, `wpa_supplicant-${ni.name}.conf`),
@@ -116,7 +117,8 @@ network={
           "utf8"
         );
 
-        host.addPackageHook(
+        addHook(
+          packageData.properties.hooks,
           "post_install",
           `systemctl enable wpa_supplicant@${ni.name}.service`
         );
@@ -125,8 +127,8 @@ network={
   }
 }
 
-export async function copySshKeys(host, dir) {
-  const sshDir = join(dir, "etc", "ssh");
+export async function copySshKeys(host, packageData) {
+  const sshDir = join(packageData.dir, "etc", "ssh");
 
   await mkdir(sshDir, { recursive: true });
 

package/src/host.mjs

@@ -18,6 +18,7 @@ import {
 } from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
 import { addType, types } from "./types.mjs";
+import { loadHooks } from "./hooks.mjs";
 import {
   generateNetworkDefs,
   generateMachineInfo,
@@ -156,7 +157,9 @@ export class Host extends Base {
   }
 
   get architecture() {
-    return this.#architecture || this.extends.find(e => e.architecture)?.architecture;
+    return (
+      this.#architecture || this.extends.find(e => e.architecture)?.architecture
+    );
   }
 
   get derivedPackaging() {
@@ -390,36 +393,39 @@ export class Host extends Base {
     return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
   }
 
-  async *preparePackages(stagingDir) {
-    await this.loadPackageHooks(
-      new URL("host.install", import.meta.url).pathname
+  async *preparePackages(dir) {
+    const packageData = {
+      dir,
+      sources: [
+        new FileContentProvider(dir + "/")[Symbol.asyncIterator]()
+      ],
+      outputs: this.outputs,
+      properties: {
+        name: `${this.typeName}-${this.owner.name}-${this.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}`,
+        access: "private",
+        dependencies: [
+          `${this.location.typeName}-${this.location.name}`,
+          ...this.depends
+        ],
+        provides: [...this.provides],
+        replaces: [`mf-${this.hostName}`, ...this.replaces],
+        backup: "root/.ssh/known_hosts",
+        hooks: await loadHooks({},
+          new URL("host.install", import.meta.url).pathname
+        )
+      }
+    };
+
+    await generateNetworkDefs(this, packageData);
+    await generateMachineInfo(this, packageData);
+    await copySshKeys(this, packageData);
+    await generateKnownHosts(
+      this.owner.hosts(),
+      join(dir, "root", ".ssh")
     );
 
-    for await (const result of super.preparePackages(stagingDir)) {
-      await generateNetworkDefs(this, stagingDir);
-      await generateMachineInfo(this, stagingDir);
-      await copySshKeys(this, stagingDir);
-      await generateKnownHosts(
-        this.owner.hosts(),
-        join(stagingDir, "root", ".ssh")
-      );
-
-      result.properties.name = `${this.typeName}-${this.owner.name}-${this.name}`;
-      result.properties.dependencies = [
-        `${this.location.typeName}-${this.location.name}`,
-        ...this.depends
-      ];
-      result.properties.provides = [...this.provides];
-      result.properties.replaces = [`mf-${this.hostName}`, ...this.replaces];
-      result.properties.backup = "root/.ssh/known_hosts";
-      result.properties.hooks = this.packageHooks;
-
-      result.sources.push(
-        new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
-      );
-
-      yield result;
-    }
+    yield packageData;
   }
 }
 

package/src/location.mjs

@@ -4,6 +4,7 @@ import { FileContentProvider } from "npm-pkgbuild";
 import { Owner } from "./owner.mjs";
 import { addType } from "./types.mjs";
 import { writeLines, sectionLines } from "./utils.mjs";
+import { loadHooks } from "./hooks.mjs";
 
 const LocationTypeDefinition = {
   name: "location",
@@ -45,56 +46,56 @@ export class Location extends Owner {
     return [...this.typeList("network")][0] || super.network;
   }
 
-  async *preparePackages(stagingDir) {
-    await this.loadPackageHooks(
-      new URL("location.install", import.meta.url).pathname
+  async *preparePackages(dir) {
+    const packageData = {
+      dir,
+      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
+      outputs: this.outputs,
+      properties: {
+        name: `${this.typeName}-${this.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}`,
+        access: "private",
+        dependencies: { jq: ">=1.6" },
+        provides: ["location", "mf-location"],
+        replaces: [`mf-location-${this.name}`],
+        hooks: await loadHooks(
+          {},
+          new URL("location.install", import.meta.url).pathname
+        )
+      }
+    };
+
+    await writeLines(
+      join(dir, "etc/systemd/resolved.conf.d"),
+      `${this.name}.conf`,
+      sectionLines(...this.dns.systemdConfig)
     );
 
-    for await (const result of super.preparePackages(stagingDir)) {
-      await writeLines(
-        join(stagingDir, "etc/systemd/resolved.conf.d"),
-        `${this.name}.conf`,
-        sectionLines(...this.dns.systemdConfig)
-      );
-
-      await writeLines(
-        join(stagingDir, "etc/systemd/journald.conf.d"),
-        `${this.name}.conf`,
-        sectionLines("Journal", {
-          Compress: "yes",
-          SystemMaxUse: "500M",
-          SyncIntervalSec: "15m"
-        })
-      );
-
-      await writeLines(
-        join(stagingDir, "etc/systemd/timesyncd.conf.d"),
-        `${this.name}.conf`,
-        sectionLines(...this.ntp.systemdConfig)
-      );
-
-      const locationDir = join(stagingDir, "etc", "location");
-
-      await mkdir(locationDir, { recursive: true });
-
-      await copyFile(
-        join(this.directory, "location.json"),
-        join(locationDir, "location.json")
-      );
+    await writeLines(
+      join(dir, "etc/systemd/journald.conf.d"),
+      `${this.name}.conf`,
+      sectionLines("Journal", {
+        Compress: "yes",
+        SystemMaxUse: "500M",
+        SyncIntervalSec: "15m"
+      })
+    );
 
-      result.properties.name = `${this.typeName}-${this.name}`;
+    await writeLines(
+      join(dir, "etc/systemd/timesyncd.conf.d"),
+      `${this.name}.conf`,
+      sectionLines(...this.ntp.systemdConfig)
+    );
 
-      result.properties.provides = ["location", "mf-location"];
-      result.properties.depends = { jq: ">=1.6" };
-      result.properties.replaces = [`mf-location-${this.name}`];
+    const locationDir = join(dir, "etc", "location");
 
-      result.sources.push(
-        new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
-      );
+    await mkdir(locationDir, { recursive: true });
 
-      result.properties.hooks = this.packageHooks;
+    await copyFile(
+      join(this.directory, "location.json"),
+      join(locationDir, "location.json")
+    );
 
-      yield result;
-    }
+    yield packageData;
   }
 }

package/types/base.d.mts

@@ -73,9 +73,6 @@ export class Base {
     set packaging(value: Set<any>);
     get packaging(): Set<any>;
     get derivedPackaging(): any;
-    get packageHooks(): {};
-    loadPackageHooks(file: any): Promise<void>;
-    addPackageHook(name: any, content: any): void;
     get outputs(): Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
     preparePackages(stagingDir: any): AsyncGenerator<{
         sources: any[];

package/types/cluster.d.mts

@@ -127,6 +127,11 @@ export class Cluster extends Host {
                                 collection: boolean;
                                 writeable: boolean;
                             };
+                            serial: {
+                                type: string;
+                                collection: boolean;
+                                writeable: boolean;
+                            };
                             refresh: {
                                 type: string;
                                 collection: boolean;

package/types/dns.d.mts

@@ -41,6 +41,11 @@ export class DNSService extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            serial: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             refresh: {
                 type: string;
                 collection: boolean;
@@ -74,6 +79,7 @@ export class DNSService extends Base {
     hasCatalog: boolean;
     hasLinkLocalAdresses: boolean;
     notify: boolean;
+    serial: number;
     refresh: number;
     retry: number;
     expire: number;
@@ -91,7 +97,8 @@ export class DNSService extends Base {
         MulticastDNS: string;
         LLMNR: string;
     })[];
-    preparePackages(stagingDir: any): AsyncGenerator<{
+    preparePackages(dir: any): AsyncGenerator<{
+        dir: string;
         sources: AsyncIterable<import("content-entry").ContentEntry>[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {

package/types/hooks.d.mts

@@ -0,0 +1,2 @@
+export function loadHooks(hooks: any, file: any): Promise<any>;
+export function addHook(hooks: any, name: any, content: any): any;

package/types/host-utils.d.mts

@@ -1,4 +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 generateMachineInfo(host: any, packageData: any): Promise<void>;
+export function generateNetworkDefs(host: any, packageData: any): Promise<void>;
+export function copySshKeys(host: any, packageData: any): Promise<void>;
 export function generateKnownHosts(hosts: any, dir: any): Promise<void>;

package/types/host.d.mts

@@ -212,6 +212,21 @@ export class Host extends Base {
     get cidrAddress(): any;
     get cidrAddresses(): any[];
     publicKey(type?: string): Promise<string>;
+    preparePackages(dir: any): AsyncGenerator<{
+        dir: any;
+        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
+        properties: {
+            name: string;
+            description: string;
+            access: string;
+            dependencies: any[];
+            provides: any[];
+            replaces: any[];
+            backup: string;
+            hooks: any;
+        };
+    }, void, unknown>;
     #private;
 }
 export class NetworkInterface extends Base {

package/types/location.d.mts

@@ -127,6 +127,11 @@ export class Location extends Owner {
                                 collection: boolean;
                                 writeable: boolean;
                             };
+                            serial: {
+                                type: string;
+                                collection: boolean;
+                                writeable: boolean;
+                            };
                             refresh: {
                                 type: string;
                                 collection: boolean;
@@ -337,6 +342,11 @@ export class Location extends Owner {
                                 collection: boolean;
                                 writeable: boolean;
                             };
+                            serial: {
+                                type: string;
+                                collection: boolean;
+                                writeable: boolean;
+                            };
                             refresh: {
                                 type: string;
                                 collection: boolean;
@@ -429,5 +439,21 @@ export class Location extends Owner {
         };
     };
     get location(): this;
+    preparePackages(dir: any): AsyncGenerator<{
+        dir: any;
+        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
+        properties: {
+            name: string;
+            description: string;
+            access: string;
+            dependencies: {
+                jq: string;
+            };
+            provides: string[];
+            replaces: string[];
+            hooks: any;
+        };
+    }, void, unknown>;
 }
 import { Owner } from "./owner.mjs";

package/types/network.d.mts

@@ -129,6 +129,11 @@ export class Network extends Owner {
                                 collection: boolean;
                                 writeable: boolean;
                             };
+                            serial: {
+                                type: string;
+                                collection: boolean;
+                                writeable: boolean;
+                            };
                             refresh: {
                                 type: string;
                                 collection: boolean;

package/types/owner.d.mts

@@ -125,6 +125,11 @@ export class Owner extends Base {
                             collection: boolean;
                             writeable: boolean;
                         };
+                        serial: {
+                            type: string;
+                            collection: boolean;
+                            writeable: boolean;
+                        };
                         refresh: {
                             type: string;
                             collection: boolean;

package/types/root.d.mts

@@ -131,6 +131,11 @@ export class Root extends Location {
                                     collection: boolean;
                                     writeable: boolean;
                                 };
+                                serial: {
+                                    type: string;
+                                    collection: boolean;
+                                    writeable: boolean;
+                                };
                                 refresh: {
                                     type: string;
                                     collection: boolean;
@@ -341,6 +346,11 @@ export class Root extends Location {
                                     collection: boolean;
                                     writeable: boolean;
                                 };
+                                serial: {
+                                    type: string;
+                                    collection: boolean;
+                                    writeable: boolean;
+                                };
                                 refresh: {
                                     type: string;
                                     collection: boolean;