pmcf 1.57.2 → 1.59.0

package/bin/pmcf-package

@@ -20,40 +20,43 @@ const publishingDetails = createPublishingDetails(options.publish, process.env);
 for (const name of args) {
   const object = await root.load(name);
   const stagingDir = join(options.output, object.fullName);
-  const { properties, outputs } = await object.preparePackage(stagingDir);
 
-  for (const outputFactory of outputs) {
-    properties.version = pkg.version;
-    properties.license = pkg.license;
-    properties.maintainer = pkg.contributors.map(
-      c => c.name + (c.email ? ` <${c.email}>` : "")
-    );
-
-    if (properties.verbose) {
-      console.log(properties);
+  for await (const { properties, outputs } of object.preparePackages(
+    stagingDir
+  )) {
+    for (const outputFactory of outputs) {
+      properties.version = pkg.version;
+      properties.license = pkg.license;
+      properties.maintainer = pkg.contributors.map(
+        c => c.name + (c.email ? ` <${c.email}>` : "")
+      );
+
+      if (properties.verbose) {
+        console.log(properties);
+      }
+
+      const sources = [
+        new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
+      ];
+
+      const output = new outputFactory(properties);
+
+      const artifact = await output.create(
+        sources,
+        [],
+        publishingDetails,
+        options
+      );
+
+      if (properties.verbose) {
+        console.log(artifact);
+      }
+
+      await Promise.all(
+        publishingDetails.map(publishDetail =>
+          output.publish(artifact, publishDetail)
+        )
+      );
     }
-
-    const sources = [
-      new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
-    ];
-
-    const output = new outputFactory(properties);
-
-    const artifact = await output.create(
-      sources,
-      [],
-      publishingDetails,
-      options
-    );
-
-    if (properties.verbose) {
-      console.log(artifact);
-    }
-
-    await Promise.all(
-      publishingDetails.map(publishDetail =>
-        output.publish(artifact, publishDetail)
-      )
-    );
   }
 }

package/package.json

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

package/src/base.mjs

@@ -204,7 +204,7 @@ export class Base {
   }
 
   typeNamed(typeName, name) {
-    return this.owner.typeNamed(typeName, name);
+    return this.owner?.typeNamed(typeName, name);
   }
 
   addObject(object) {
@@ -271,6 +271,23 @@ export class Base {
     return this.owner?.timezone;
   }
 
+  findService(filter) {
+    let best;
+    for (const service of this.findServices(filter)) {
+      if (!best || service.priority < best.priority) {
+        best = service;
+      }
+    }
+
+    return best;
+  }
+
+  *findServices(filter) {
+    if (this.owner) {
+      yield* this.owner?.findServices(filter);
+    }
+  }
+
   #directory;
   set directory(directory) {
     this.#directory = directory;
@@ -314,8 +331,8 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
-  async preparePackage(stagingDir) {
-    return {
+  async *preparePackages(stagingDir) {
+    yield {
       outputs: this.outputs,
       properties: {
         name: this.packageName,

package/src/cluster.mjs

@@ -1,14 +1,16 @@
+import { join } from "node:path";
 import { Owner } from "./owner.mjs";
 import { addType } from "./types.mjs";
+import { writeLines } from "./utils.mjs";
 
 const ClusterTypeDefinition = {
   name: "cluster",
-  owners: [Owner.typeDefinition, "network", "root"],
+  owners: [Owner.typeDefinition, "network", "location", "root"],
   priority: 0.7,
   extends: Owner.typeDefinition,
   properties: {
-    masters: { type: "host", collection: true, writeable: true },
-    backups: { type: "host", collection: true, writeable: true }
+    masters: { type: "network_interface", collection: true, writeable: true },
+    backups: { type: "network_interface", collection: true, writeable: true }
   }
 };
 
@@ -33,30 +35,38 @@ export class Cluster extends Owner {
     return `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}`;
   }
 
-  async preparePackage(stagingDir) {
-    const result = await super.preparePackage(stagingDir);
-
-    const cfg = [
-      "vrrp_instance VI_1 {",
-      "  state MASTER",
-      "  interface end0",
-      "  virtual_router_id 101",
-      "  priority 255",
-      "  advert_int 1",
-      "  authentication {",
-      "    auth_type PASS",
-      "    auth_pass pass1234",
-      "  }",
-      "  virtual_ipaddress {",
-      "    192.168.1.250",
-      "  }",
-      "}"
-    ];
-
-    await writeLines(join(targetDir, "etc/keepalived"), "keepalived.conf", cfg);
-
-    result.properties.dependencies = ["keepalived"];
-
-    return result;
+  async *preparePackages(stagingDir) {
+    for await (const result of super.preparePackages(stagingDir)) {
+      for (const ni of this.masters.union(this.backups)) {
+
+        const cfg = [
+          `vrrp_instance ${this.name} {`,
+          `  state ${this.masters.has(ni) ? "MASTER" : "BACKUP"}`,
+          `  interface ${ni.name}`,
+          "  virtual_router_id 101",
+          "  priority 255",
+          "  advert_int 1",
+          "  authentication {",
+          "    auth_type PASS",
+          "    auth_pass pass1234",
+          "  }",
+          "  virtual_ipaddress {",
+          "    192.168.1.250",
+          "  }",
+          "}"
+        ];
+
+        await writeLines(
+          join(stagingDir, "etc/keepalived"),
+          "keepalived.conf",
+          cfg
+        );
+
+        result.properties.name = `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}-${ni.host.name}`;
+        result.properties.dependencies = ["keepalived"];
+
+        yield result;
+      }
+    }
   }
 }

package/src/dns.mjs

@@ -22,6 +22,8 @@ const DNSServiceTypeDefinition = {
   }
 };
 
+const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
+
 export class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
@@ -65,9 +67,7 @@ export class DNSService extends Base {
     return this.#forwardsTo;
   }
 
-  async *findServices() {
-    const filter = { type: DNSServiceTypeDefinition.name };
-
+  *findServices(filter) {
     yield* this.owner.findServices(filter);
 
     for (const s of this.forwardsTo) {
@@ -80,17 +80,17 @@ export class DNSService extends Base {
   }
 
   async resolvedConfig() {
-    const dnsServices = (await Array.fromAsync(this.findServices())).sort(
+    const dnsServices = Array.from(this.findServices(DNS_SERVICE_FILTER)).sort(
       (a, b) => a.priority - b.priority
     );
 
     const master = dnsServices
       .filter(s => s.priority < 10)
-      .map(s => s.ipAddresses)
+      .map(s => s.rawAddresses)
       .flat();
     const fallback = dnsServices
       .filter(s => s.priority >= 10)
-      .map(s => s.ipAddresses)
+      .map(s => s.rawAddresses)
       .flat();
 
     return {
@@ -107,15 +107,15 @@ export class DNSService extends Base {
     return `named-${this.owner.name}`;
   }
 
-  async preparePackage(stagingDir) {
-    const result = await super.preparePackage(stagingDir);
-
-    await generateNamedDefs(this, stagingDir);
+  async *preparePackages(stagingDir) {
+    for await (const result of super.preparePackages(stagingDir)) {
+      await generateNamedDefs(this, stagingDir);
 
-    result.properties.dependencies = ["mf-named"];
-    result.properties.replaces = ["mf-named-zones"];
+      result.properties.dependencies = ["mf-named"];
+      result.properties.replaces = ["mf-named-zones"];
 
-    return result;
+      yield result;
+    }
   }
 }
 
@@ -131,7 +131,7 @@ async function generateNamedDefs(dns, targetDir) {
     const zones = [];
     const records = new Set();
 
-    const nameserver = (await dns.owner.findService({ type: "dns" }))?.owner;
+    const nameService = dns.findService(DNS_SERVICE_FILTER);
     const rname = dns.administratorEmail.replace(/@/, ".");
 
     let maxKeyLength;
@@ -157,18 +157,18 @@ async function generateNamedDefs(dns, targetDir) {
       );
     }
 
-    console.log(dns.owner.fullName, domain, nameserver?.hostName, rname);
+    console.log(dns.owner.fullName, domain, nameService.domainName, rname);
     const reverseZones = new Map();
 
     const SOARecord = createRecord(
       "@",
       "SOA",
-      fullName(nameserver?.domainName),
+      fullName(nameService.domainName),
       fullName(rname),
       `(${updates})`
     );
 
-    const NSRecord = createRecord("@", "NS", fullName(nameserver?.rawAddress));
+    const NSRecord = createRecord("@", "NS", fullName(nameService.rawAddress));
 
     const catalogZone = {
       id: `catalog.${domain}`,
@@ -290,7 +290,11 @@ async function generateNamedDefs(dns, targetDir) {
         }
       }
 
-      await writeLines(join(targetDir, "var/lib/named"), zone.file, zone.records);
+      await writeLines(
+        join(targetDir, "var/lib/named"),
+        zone.file,
+        zone.records
+      );
     }
 
     await writeLines(

package/src/host.mjs

@@ -109,7 +109,7 @@ export class Host extends Base {
       for (const ni of this.networkInterfaces.values()) {
         ni._traverse(...args);
       }
-      for (const service of this.findServices()) {
+      for (const service of this.#services) {
         service._traverse(...args);
       }
 
@@ -287,6 +287,17 @@ export class Host extends Base {
     return super.typeNamed(typeName, name);
   }
 
+  named(name) {
+    const ni = this.#networkInterfaces.get(name);
+    if (ni) {
+      return ni;
+    }
+    const service = this.services.find(s => s.name === name);
+    if (service) {
+      return service;
+    }
+  }
+
   get networkInterfaces() {
     return this.#networkInterfaces;
   }
@@ -333,25 +344,26 @@ export class Host extends Base {
     return `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}`;
   }
 
-  async preparePackage(stagingDir) {
-    const result = await super.preparePackage(stagingDir);
-    await generateNetworkDefs(this, stagingDir);
-    await generateMachineInfo(this, stagingDir);
-    await copySshKeys(this, stagingDir);
-    await generateKnownHosts(
-      this.owner.hosts(),
-      join(stagingDir, "root", ".ssh")
-    );
+  async *preparePackages(stagingDir) {
+    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.dependencies = [
-      this.location.packageName,
-      ...this.depends
-    ];
-    result.properties.provides = [...this.provides];
-    result.properties.replaces = [`mf-${this.hostName}`, ...this.replaces];
-    result.properties.backup = "root/.ssh/known_hosts";
+      result.properties.dependencies = [
+        this.location.packageName,
+        ...this.depends
+      ];
+      result.properties.provides = [...this.provides];
+      result.properties.replaces = [`mf-${this.hostName}`, ...this.replaces];
+      result.properties.backup = "root/.ssh/known_hosts";
 
-    return result;
+      yield result;
+    }
   }
 }
 

package/src/location.mjs

@@ -45,52 +45,51 @@ export class Location extends Owner {
     return [...this.typeList("network")][0] || super.network;
   }
 
-  async preparePackage(stagingDir) {
-    const result = await super.preparePackage(stagingDir);
-
-    await writeLines(
-      join(stagingDir, "etc/systemd/resolved.conf.d"),
-      `${this.name}.conf`,
-      sectionLines("Resolve", await this.dns.resolvedConfig())
-    );
-
-    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("Time", {
-        NTP: this.ntp.servers.join(" "),
-        PollIntervalMinSec: 60,
-        SaveIntervalSec: 3600
-      })
-    );
-
-    const locationDir = join(stagingDir, "etc", "location");
-
-    await mkdir(locationDir, { recursive: true });
-
-    await copyFile(
-      join(this.directory, "location.json"),
-      join(locationDir, "location.json")
-    );
-
-    result.properties.provides = [
-      "location",
-      "mf-location",
-      `mf-location-${this.name}`
-    ];
-    result.properties.replaces = [`mf-location-${this.name}`];
-
-    /*
+  async *preparePackages(stagingDir) {
+    for await (const result of super.preparePackages(stagingDir)) {
+      await writeLines(
+        join(stagingDir, "etc/systemd/resolved.conf.d"),
+        `${this.name}.conf`,
+        sectionLines("Resolve", await this.dns.resolvedConfig())
+      );
+
+      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("Time", {
+          NTP: this.ntp.servers.join(" "),
+          PollIntervalMinSec: 60,
+          SaveIntervalSec: 3600
+        })
+      );
+
+      const locationDir = join(stagingDir, "etc", "location");
+
+      await mkdir(locationDir, { recursive: true });
+
+      await copyFile(
+        join(this.directory, "location.json"),
+        join(locationDir, "location.json")
+      );
+
+      result.properties.provides = [
+        "location",
+        "mf-location",
+        `mf-location-${this.name}`
+      ];
+      result.properties.replaces = [`mf-location-${this.name}`];
+
+      /*
     const install = "location.install";
 
     console.log(new URL(install, import.meta.url));
@@ -102,7 +101,8 @@ export class Location extends Owner {
 
     result.properties.install = install;
     */
-   
-    return result;
+
+      yield result;
+    }
   }
 }

package/src/owner.mjs

@@ -90,12 +90,17 @@ export class Owner extends Base {
   }
 
   typeNamed(typeName, name) {
-    if (name[0] === "/") {
-      name = name.substring(this.fullName.length + 1);
-    }
+    const localName = name[0] === "/" ? name.substring(this.fullName.length + 1) : name;
 
     const typeSlot = this.#membersByType.get(typeName);
-    return typeSlot?.get(name) || this.owner?.typeNamed(typeName, name);
+    if (typeSlot) {
+      const object = typeSlot.get(localName);
+      if (object) {
+        return object;
+      }
+    }
+
+    return super.typeNamed(typeName, localName); // TODO use name
   }
 
   typeObject(typeName) {
@@ -121,17 +126,6 @@ export class Owner extends Base {
     this.addTypeObject(object.typeName, object.name, object);
   }
 
-  findService(filter) {
-    let best;
-    for (const service of this.findServices(filter)) {
-      if (!best || service.priority < best.priority) {
-        best = service;
-      }
-    }
-
-    return best;
-  }
-
   *findServices(filter) {
     for (const host of this.hosts()) {
       for (const service of host.findServices(filter)) {

package/src/service.mjs

@@ -79,16 +79,31 @@ export class Service extends Base {
     return this;
   }
 
+  get server()
+  {
+    return this.owner;
+  }
+
+  get domainName()
+  {
+    return this.server.domainName;
+  }
+
+  get rawAddress()
+  {
+    return this.#ipAddresses?.[0] || this.server.rawAddress;
+  }
+
   set ipAddresses(value) {
     this.#ipAddresses = value;
   }
 
-  get ipAddresses() {
+  get rawAddresses() {
     return this.#ipAddresses || this.owner.rawAddresses;
   }
 
   get addresses() {
-    return this.ipAddresses.map(a => `${a}:${this.port}`);
+    return this.rawAddresses.map(a => `${a}:${this.port}`);
   }
 
   set port(value) {

package/types/base.d.mts

@@ -61,6 +61,8 @@ export class Base {
     get locales(): any;
     get country(): any;
     get timezone(): any;
+    findService(filter: any): any;
+    findServices(filter: any): Generator<any, void, any>;
     set directory(directory: any);
     get directory(): any;
     get fullName(): any;
@@ -69,14 +71,14 @@ export class Base {
     get packaging(): Set<any>;
     get derivedPackaging(): any;
     get outputs(): Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
-    preparePackage(stagingDir: any): Promise<{
+    preparePackages(stagingDir: any): AsyncGenerator<{
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
             description: string;
             access: string;
         };
-    }>;
+    }, void, unknown>;
     expand(object: any): any;
     finalize(action: any): void;
     execFinalize(): void;

package/types/dns.d.mts

@@ -70,7 +70,6 @@ export class DNSService extends Base {
     get soaUpdates(): number[];
     set forwardsTo(value: any[]);
     get forwardsTo(): any[];
-    findServices(): AsyncGenerator<any, void, any>;
     get domains(): any[];
     resolvedConfig(): Promise<{
         DNS: string;

package/types/host.d.mts

@@ -176,6 +176,7 @@ export class Host extends Base {
     get domainName(): string;
     get host(): this;
     findServices(filter: any): Generator<any, void, unknown>;
+    named(name: any): any;
     set networkInterfaces(networkInterface: Map<any, any>);
     get networkInterfaces(): Map<any, any>;
     networkAddresses(): Generator<{

package/types/owner.d.mts

@@ -184,7 +184,6 @@ export class Owner extends Base {
     typeList(typeName: any): any;
     addTypeObject(typeName: any, name: any, object: any): void;
     addObject(object: any): void;
-    findService(filter: any): any;
     findServices(filter: any): Generator<any, void, unknown>;
     locationNamed(name: any): any;
     locations(): any;

package/types/service.d.mts

@@ -89,8 +89,11 @@ export class Service extends Base {
         };
     };
     alias: any;
+    get server(): any;
+    get domainName(): any;
+    get rawAddress(): any;
     set ipAddresses(value: any);
-    get ipAddresses(): any;
+    get rawAddresses(): any;
     get addresses(): any;
     set port(value: any);
     get port(): any;