pmcf 2.30.0 → 2.31.0

package/README.md

@@ -20,14 +20,21 @@
 
 ### Table of Contents
 
-*   [NetworkAddress](#networkaddress)
+*   [networkAddresses](#networkaddresses)
     *   [Parameters](#parameters)
-    *   [Properties](#properties)
+*   [NetworkAddress](#networkaddress)
+    *   [Parameters](#parameters-1)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
-*   [networkAddresses](#networkaddresses)
-    *   [Parameters](#parameters-1)
+
+## networkAddresses
+
+### Parameters
+
+*   `filter` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
 
 ## NetworkAddress
 
@@ -37,14 +44,6 @@
 *   `address` &#x20;
 *   `subnet` &#x20;
 
-### Properties
-
-*   `networkInterface` **NetworkInterface**&#x20;
-*   `address` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Uint8Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array) | [Uint16Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint16Array))**&#x20;
-*   `family` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
-*   `subnet` **Subnet**&#x20;
-*   `domainNames` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
-
 ### subnet
 
 Type: Subnet
@@ -57,14 +56,6 @@ Type: NetworkInterface
 
 Type: ([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Uint8Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array) | [Uint16Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint16Array))
 
-## networkAddresses
-
-### Parameters
-
-*   `filter` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 # install
 
 With [npm](http://npmjs.org) do:

package/package.json

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

package/src/base.mjs

@@ -190,7 +190,7 @@ export class Base {
             assign(property, value);
           } else {
             const factory =
-              property.type.factoryFor?.(this,value) || property.type.clazz;
+              property.type.factoryFor?.(this, value) || property.type.clazz;
 
             assign(
               property,

package/src/host.mjs

@@ -447,6 +447,12 @@ export class Host extends Base {
     return addresses(this.networkAddresses());
   }
 
+  *subnets() {
+    for (const networkInterface of this.networkInterfaces.values()) {
+      yield* networkInterface.subnets;
+    }
+  }
+
   async publicKey(type = "ed25519") {
     return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
   }

package/src/network-interfaces/skeleton.mjs

@@ -56,6 +56,11 @@ export class SkeletonNetworkInterface extends Base {
     this._network = network;
   }
 
+  *subnets ()
+  {
+    yield *this.ipAddresses.values();
+  }
+
   get ipAddresses() {
     return new Map();
   }

package/src/services/dns.mjs

@@ -207,7 +207,7 @@ export class DNSService extends ExtraSourceService {
           ...DNS_SERVICE_FILTER,
           priority: ">=10"
         }).join(" "),
-        Domains: [...this.domains].join(" "),
+        Domains: [...this.localDomains].join(" "),
         DNSSEC: "no",
         MulticastDNS: this.network.multicastDNS ? "yes" : "no",
         LLMNR: "no"

package/src/subnet.mjs

@@ -98,8 +98,8 @@ export const SUBNET_LOCALHOST_IPV6 = new Subnet(_owner, "::1/128");
 export function subnets(sources) {
   const all = new Set();
 
-  for (const owner of sources) {
-    for (const subnet of owner.subnets()) {
+  for (const source of sources) {
+    for (const subnet of source.subnets()) {
       all.add(subnet);
     }
   }

package/types/host.d.mts

@@ -237,6 +237,7 @@ export class Host extends Base {
     networkAddresses(filter: any): Generator<any, void, any>;
     get address(): any;
     get addresses(): any[];
+    subnets(): Generator<any, void, any>;
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;

package/types/network-interfaces/skeleton.d.mts

@@ -9,6 +9,7 @@ export class SkeletonNetworkInterface extends Base {
     matches(other: any): boolean;
     set network(network: any);
     get network(): any;
+    subnets(): Generator<any, void, unknown>;
     get ipAddresses(): Map<any, any>;
     /**
      *