pmcf 1.23.1 → 1.23.3

package/bin/pmcf-host-defs

@@ -2,14 +2,15 @@
 
 import { writeFile, mkdir, copyFile, glob } from "node:fs/promises";
 import { join } from "node:path";
+import { Host } from "pmcf";
 import { writeLines, sectionLines } from "../src/utils.mjs";
-import { prepare } from "../src/cmd.mjs";
+import { prepare, } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();
 
 const hostName = args[0];
 
-const host = await world.host(hostName);
+const host = await world.load(hostName,{ type: Host });
 
 await generateNetworkDefs(host, options.output);
 await generateMachineInfo(host, options.output);

package/bin/pmcf-location-defs

@@ -2,12 +2,13 @@
 
 import { mkdir, copyFile } from "node:fs/promises";
 import { join } from "node:path";
+import { Location } from "pmcf";
 import { writeLines, sectionLines } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();
 
-const location = await world.location(args[0] || "SW");
+const location = await world.load(args[0], { type: Location });
 
 await generateLocationDefs(location, options.output);
 

package/bin/pmcf-named-defs

@@ -2,12 +2,13 @@
 
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
+import { Location } from "pmcf";
 import { writeLines, isIPv4Address } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();
 
-const location = await world.location(args[0] || "SW");
+const location = await world.load(args[0], { type: Location });
 const updates = [
   Math.ceil(Date.now() / 1000),
   36000,
@@ -30,10 +31,9 @@ console.log("description", `named defintions for ${location.name}`);
 
 async function generateNamedDefs(location, targetDir) {
   const dns = location.dns;
-  const domain = location.domain;
   const ttl = dns.recordTTL;
 
-  if (domain) {
+  for (const domain of dns.domains) {
     const zones = [];
     const records = new Set();
 
@@ -48,7 +48,7 @@ async function generateNamedDefs(location, targetDir) {
       );
     }
 
-    console.log(location.name, location.domain, nameserver?.hostName, rname);
+    console.log(location.name, domain, nameserver?.hostName, rname);
 
     const catalogZone = {
       id: `catalog.${domain}`,

package/bin/pmcf-network

@@ -4,7 +4,7 @@ import { prepare } from "../src/cmd.mjs";
 
 const { world, args } = prepare();
 
-const location = await world.location(args[0] || "SW");
+const location = await world.load(args[0]);
 
 function q(str) {
   return str.match(/^\w+$/) ? str : `"${str}"`;

package/package.json

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

package/src/base.mjs

@@ -58,15 +58,15 @@ export class Base {
   }
 
   get location() {
-    return this.owner.location;
+    return this.owner?.location;
   }
 
   get host() {
-    return this.owner.host;
+    return this.owner?.host;
   }
 
-  async network(name) {
-    return this.owner.network(name);
+  get network() {
+    return this.owner?.network;
   }
 
   #directory;

package/src/model.mjs

@@ -92,7 +92,7 @@ export class Owner extends Base {
     }
   }
 
-  network(name) {
+  networkNamed(name) {
     return this.#networks.get(name);
   }
 
@@ -128,7 +128,7 @@ export class Owner extends Base {
       }
 
       for (const name of asArray(destinationNetworks)) {
-        const other = this.network(name);
+        const other = this.networkNamed(name);
         if (other) {
           bridge.add(other);
           other.bridge = bridge;
@@ -147,13 +147,13 @@ export class Owner extends Base {
       this.info(bridgeToJSON(bridge));
       for (const network of bridge) {
         if (typeof network === "string") {
-          const other = this.network(network);
+          const other = this.networkNamed(network);
 
           if (other) {
             bridge.delete(network);
             bridge.add(other);
             other.bridge = bridge;
-            this.info("RESOLVE", network, other, bridgeToJSON(bridge));
+            //this.info("RESOLVE", network, other, bridgeToJSON(bridge));
           } else {
             this.error(`Unresolvabale bridge network`, network);
           }
@@ -326,14 +326,6 @@ export class World extends Owner {
       yield location.domain;
     }
   }
-
-  async location(name) {
-    return this.load(name, { type: Location });
-  }
-
-  async host(name) {
-    return this.load(name, { type: Host });
-  }
 }
 
 export class Location extends Owner {
@@ -443,12 +435,12 @@ export class Host extends Base {
 
   static async prepareData(world, data) {
     if (data.location) {
-      data.location = await world.location(data.location);
+      data.location = await world.load(data.location, { type: Location });
     }
 
     if (data.extends) {
       data.extends = await Promise.all(
-        asArray(data.extends).map(e => world.host(e))
+        asArray(data.extends).map(e => world.load(e, { type: Host }))
       );
     }
 
@@ -745,7 +737,7 @@ export class NetworkInterface extends Base {
     }
 
     if (data.network) {
-      let network = owner.owner.network(data.network);
+      let network = owner.owner.networkNamed(data.network);
 
       if (network) {
         this.network = network;
@@ -790,7 +782,7 @@ export class NetworkInterface extends Base {
 
   set network(networkOrName) {
     if (!(networkOrName instanceof Network)) {
-      let network = this.owner.owner.network(networkOrName);
+      let network = this.owner.owner.networkNamed(networkOrName);
 
       if (network) {
         this.#network = network;
@@ -983,6 +975,7 @@ export class Service extends Base {
     return [
       ...super.propertyNames,
       "ipAddresses",
+      "addresses",
       "port",
       "protocol",
       "alias",

package/types/base.d.mts

@@ -14,7 +14,7 @@ export class Base {
     get world(): any;
     get location(): any;
     get host(): any;
-    network(name: any): Promise<any>;
+    get network(): any;
     set directory(directory: any);
     get directory(): any;
     get fullName(): any;

package/types/model.d.mts

@@ -9,7 +9,7 @@ export class Owner extends Base {
     addHost(host: any): void;
     service(filter: any): Promise<any>;
     services(filter: any): AsyncGenerator<any, void, unknown>;
-    network(name: any): any;
+    networkNamed(name: any): any;
     networks(): AsyncGenerator<any, void, unknown>;
     addNetwork(network: any): void;
     addBridge(network: any, destinationNetworks: any): any;
@@ -40,8 +40,6 @@ export class World extends Owner {
     locations(): AsyncGenerator<Location, void, unknown>;
     hosts(): AsyncGenerator<Host, void, unknown>;
     domains(): AsyncGenerator<any, void, unknown>;
-    location(name: any): Promise<any>;
-    host(name: any): Promise<any>;
     #private;
 }
 export class Location extends Owner {