pmcf 1.97.0 → 1.98.0

package/package.json

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

package/src/dhcp.mjs

@@ -95,7 +95,7 @@ export class DHCPService extends Base {
     };
 
     // console.log(this.owner.name,this.owner.networks());
-/*
+    /*
     const subnets = new Set();
 
     for (const network of this.owner.networks()) {
@@ -106,7 +106,8 @@ export class DHCPService extends Base {
 
     console.log([...subnets].map(s => s.address));
 */
-    const reservations = [];
+
+    const hwmap = new Map();
 
     for await (const {
       networkInterface,
@@ -115,13 +116,18 @@ export class DHCPService extends Base {
       domainNames
     } of this.owner.networkAddresses()) {
       if (networkInterface.hwaddr) {
-        reservations.push({
-          "hw-address": networkInterface.hwaddr,
-          "ip-address": networkInterface.rawAddress,
-        });
+        hwmap.set(networkInterface.hwaddr, networkInterface);
       }
     }
 
+    const reservations = [...hwmap].map(([k, networkInterface]) => {
+      return {
+        "hw-address": k,
+        "ip-address": networkInterface.rawAddress,
+        hostname: networkInterface.hostName
+      };
+    });
+
     const dhcp4 = {
       Dhcp4: {
         "interfaces-config": {
@@ -175,10 +181,6 @@ export class DHCPService extends Base {
               }
             ],
             reservations /*: [
-              {
-                "hw-address": "1a:1b:1c:1d:1e:1f",
-                "ip-address": "192.168.1.199"
-              },
               {
                 "client-id": "01:11:22:33:44:55:66",
                 "ip-address": "192.168.1.198",

package/src/host.mjs

@@ -481,9 +481,9 @@ export class NetworkInterface extends Base {
   #psk;
   #network;
   #kind;
+  #hostName;
   arpbridge;
   hwaddr;
-  hostName;
 
   constructor(owner, data) {
     super(owner, data);
@@ -562,6 +562,14 @@ export class NetworkInterface extends Base {
     }
   }
 
+  get hostName() {
+    return this.#hostName || this.host.hostName;
+  }
+
+  set hostName(value) {
+    this.#hostName = value;
+  }
+
   get domainNames() {
     return this.hostName
       ? new Set([[this.hostName, this.host.domain].join(".")])

package/src/network-support.mjs

@@ -9,6 +9,7 @@ export const networkProperties = {
 };
 
 export const networkAddressProperties = {
+  hostName: { type: "string", collection: false, writeable: true },
   cidrAddresses: { type: "string", collection: true, writeable: false },
   cidrAddress: { type: "string", collection: false, writeable: false },
   rawAddresses: { type: "string", collection: true, writeable: false },

package/types/cluster.d.mts

@@ -383,6 +383,11 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
+                hostName: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 cidrAddresses: {
                     type: string;
                     collection: boolean;

package/types/host.d.mts

@@ -141,6 +141,11 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            hostName: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             cidrAddresses: {
                 type: string;
                 collection: boolean;
@@ -374,7 +379,6 @@ export class NetworkInterface extends Base {
     };
     arpbridge: any;
     hwaddr: any;
-    hostName: any;
     addSubnet(address: any): any;
     set ipAddresses(value: Map<any, any>);
     get ipAddresses(): Map<any, any>;
@@ -387,6 +391,8 @@ export class NetworkInterface extends Base {
     subnetForAddress(address: any): any;
     get gateway(): any;
     get gatewayAddress(): any;
+    set hostName(value: any);
+    get hostName(): any;
     get domainNames(): any;
     get network_interface(): this;
     set network(network: any);

package/types/network-support.d.mts

@@ -54,7 +54,7 @@ export namespace networkProperties {
     }
 }
 export namespace networkAddressProperties {
-    namespace cidrAddresses {
+    namespace hostName {
         let type_7: string;
         export { type_7 as type };
         let collection_7: boolean;
@@ -62,7 +62,7 @@ export namespace networkAddressProperties {
         let writeable_7: boolean;
         export { writeable_7 as writeable };
     }
-    namespace cidrAddress {
+    namespace cidrAddresses {
         let type_8: string;
         export { type_8 as type };
         let collection_8: boolean;
@@ -70,7 +70,7 @@ export namespace networkAddressProperties {
         let writeable_8: boolean;
         export { writeable_8 as writeable };
     }
-    namespace rawAddresses {
+    namespace cidrAddress {
         let type_9: string;
         export { type_9 as type };
         let collection_9: boolean;
@@ -78,7 +78,7 @@ export namespace networkAddressProperties {
         let writeable_9: boolean;
         export { writeable_9 as writeable };
     }
-    namespace rawAddress {
+    namespace rawAddresses {
         let type_10: string;
         export { type_10 as type };
         let collection_10: boolean;
@@ -86,4 +86,12 @@ export namespace networkAddressProperties {
         let writeable_10: boolean;
         export { writeable_10 as writeable };
     }
+    namespace rawAddress {
+        let type_11: string;
+        export { type_11 as type };
+        let collection_11: boolean;
+        export { collection_11 as collection };
+        let writeable_11: boolean;
+        export { writeable_11 as writeable };
+    }
 }

package/types/service.d.mts

@@ -102,6 +102,11 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            hostName: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             cidrAddresses: {
                 type: string;
                 collection: boolean;