pmcf 1.4.0 → 1.5.0

package/bin/pmcf-host-defs

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 
 import { writeFile, mkdir, copyFile, glob } from "node:fs/promises";
-import { cwd, argv } from "node:process";
 import { join } from "node:path";
-import { World, writeLines, sectionLines } from "../src/model.mjs";
+import { writeLines, sectionLines } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-const world = new World(argv[2] || cwd());
+const { world, args } = prepare();
 
-const hostName = argv[3];
+const hostName = args[0];
 
 const host = await world.host(hostName);
 
-const targetDir = argv[4] || `pkg/host-${host.hostName}`;
+const targetDir = args[1] || `pkg/host-${host.hostName}`;
 
 await generateNetworkDefs(host, targetDir);
 await generateMachineInfo(host, targetDir);

package/bin/pmcf-info

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
-import { cwd, argv } from "node:process";
-import { World } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
+const { world, args } = prepare();
 
-const world = new World(argv[2] || cwd());
-
-const objectName = argv[3];
+const objectName = args[0];
 
 if (objectName) {
   const object = await world.named(objectName);

package/bin/pmcf-location-defs

@@ -1,17 +1,23 @@
 #!/usr/bin/env node
 
-import { cwd, argv } from "node:process";
 import { mkdir, copyFile } from "node:fs/promises";
 import { join } from "node:path";
-import { World, writeLines, sectionLines } from "../src/model.mjs";
+import { writeLines, sectionLines } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-const world = new World(argv[2] || cwd());
-const location = await world.location(argv[3] || "SW");
-const targetDir = argv[4];
+const { world, args } = prepare();
+
+const location = await world.location(args[0] || "SW");
+const targetDir = args[1];
 
 await generateLocationDefs(location, targetDir);
 
-console.log("provides", "location", "mf-location", `mf-location-${location.name}`);
+console.log(
+  "provides",
+  "location",
+  "mf-location",
+  `mf-location-${location.name}`
+);
 console.log("replaces", `mf-location-${location.name}`);
 console.log("description", `location definitions for ${location.name}`);
 
@@ -57,7 +63,7 @@ async function generateLocationDefs(location, dir) {
   await mkdir(locationDir, { recursive: true });
 
   copyFile(
-    join(location.directory, "location.json"),
+    join(world.directory, location.directory, "location.json"),
     join(locationDir, "location.json")
   );
 }

package/bin/pmcf-named-defs

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
-import { cwd, argv } from "node:process";
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
+import { writeLines } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-import { World, writeLines } from "../src/model.mjs";
+const { world, args } = prepare();
 
-const world = new World(argv[2] || cwd());
-const location = await world.location(argv[3] || "SW");
-const targetDir = argv[4] || `pkg/mf-named-${location.name}`;
+const location = await world.location(args[0] || "SW");
+const targetDir = args[1] || `pkg/mf-named-${location.name}`;
 const ttl = location.dnsRecordTTL;
 const updates = [
   Math.ceil(Date.now() / 1000),
@@ -38,7 +38,7 @@ async function generateNamedDefs(location, targetDir) {
     const records = new Set();
 
     const nameserver = (await location.service({ type: "dns" }))?.owner;
-    const rname = location.administratorEmail.replace(/@/,'.');
+    const rname = location.administratorEmail.replace(/@/, ".");
 
     for await (const mail of location.services({ type: "smtp" })) {
       records.add(
@@ -48,12 +48,7 @@ async function generateNamedDefs(location, targetDir) {
       );
     }
 
-    console.log(
-      location.name,
-      location.domain,
-      nameserver?.hostName,
-      rname
-    );
+    console.log(location.name, location.domain, nameserver?.hostName, rname);
 
     const catalogZone = {
       id: `catalog.${domain}`,
@@ -63,7 +58,7 @@ async function generateNamedDefs(location, targetDir) {
           nameserver.domainName
         }. ${rname}. (${updates})`,
         `${"@".padEnd(NAME_LEN, " ")} ${ttl} IN NS    ${nameserver.ipAddress}.`,
-        `${("version."+domain+'.').padEnd(NAME_LEN, " ")}    IN TXT   "2"`
+        `${("version." + domain + ".").padEnd(NAME_LEN, " ")}    IN TXT   "2"`
       ])
     };
 
@@ -152,9 +147,11 @@ async function generateNamedDefs(location, targetDir) {
     zones.push(catalogZone);
 
     for (const zone of zones) {
-      if(zone !== catalogZone) {
+      if (zone !== catalogZone) {
         const hash = createHmac("md5", zone.id).digest("hex");
-        catalogZone.records.add(`${hash}.zones.${domain}. IN PTR   ${zone.id}.`);
+        catalogZone.records.add(
+          `${hash}.zones.${domain}. IN PTR   ${zone.id}.`
+        );
       }
 
       zoneConfig.push(`zone \"${zone.id}\" {`);
@@ -162,7 +159,9 @@ async function generateNamedDefs(location, targetDir) {
       zoneConfig.push(`  file \"${zone.file}\";`);
 
       const u = location.dnsAllowedUpdates;
-      zoneConfig.push(`  allow-update { ${u.length ? u.join(';') : "none" }; };`);
+      zoneConfig.push(
+        `  allow-update { ${u.length ? u.join(";") : "none"}; };`
+      );
       zoneConfig.push(`  notify yes;`);
       zoneConfig.push(`};`);
       zoneConfig.push("");

package/bin/pmcf-network

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 
-import { cwd, argv } from "node:process";
-import { World } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-const world = new World(argv[2] || cwd());
-const location = await world.location(argv[3] || "SW");
+const { world, args } = prepare();
+
+const location = await world.location(args[0] || "SW");
 
 function q(str) {
   return str.match(/^\w+$/) ? str : `"${str}"`;
 }
 function id(str) {
-  return str.replaceAll(/-/g,'');
+  return str.replaceAll(/-/g, "");
 }
 
 console.log("graph G {");
@@ -26,7 +26,11 @@ for await (const host of location.hosts()) {
 }
 
 for await (const network of location.networks()) {
-  console.log(`  ${id(network.name)} [label="${network.name}\\n${network.ipv4}" shape=circle];`);
+  console.log(
+    `  ${id(network.name)} [label="${network.name}\\n${
+      network.ipv4
+    }" shape=circle];`
+  );
 
   for await (const host of network.hosts()) {
     for (const [n, i] of Object.entries(host.networkInterfaces)) {

package/package.json

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

package/src/cmd.mjs

@@ -0,0 +1,26 @@
+import { parseArgs } from "node:util";
+import { argv, cwd, env } from "node:process";
+import { World } from "./model.mjs";
+
+export function prepare() {
+  const { values, positionals } = parseArgs({
+    args: argv.slice(2),
+    options: {
+      world: {
+        type: "string",
+        short: "w",
+        default: env.PMCF_WORLD || cwd()
+      },
+      output: {
+        type: "string",
+        short: "o",
+        default: cwd()
+      }
+    },
+    allowPositionals: true
+  });
+
+  const world = new World(values.world);
+
+  return { world, options: values, args: positionals };
+}

package/types/cmd.d.mts

@@ -0,0 +1,9 @@
+export function prepare(): {
+    world: World;
+    options: {
+        world: string;
+        output: string;
+    };
+    args: string[];
+};
+import { World } from "./model.mjs";