pmcf 2.6.6 → 2.6.8

package/package.json

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

package/src/host.mjs

@@ -107,6 +107,9 @@ export class Host extends Base {
     if (data.extends) {
       this.finalize(() => {
         for (const host of this.extends) {
+          if(host === this) {
+            this.error("Cant extend myself");
+          }
           host.execFinalize();
           this._applyExtends(host);
         }
@@ -123,6 +126,7 @@ export class Host extends Base {
       if (ni.isTemplate) {
       } else {
         let present = this._networkInterfaces.get(name);
+
         if (!present) {
           present = ni.forOwner(this);
           this._networkInterfaces.set(name, present);
@@ -517,9 +521,9 @@ export class NetworkInterface extends Base {
   _network;
   _kind;
   _hostName;
+  _hwaddr;
   extends = [];
   arpbridge;
-  hwaddr;
 
   constructor(owner, data) {
     super(owner, data);
@@ -634,7 +638,11 @@ export class NetworkInterface extends Base {
   }
 
   get network() {
-    return this._network ?? this.host.network;
+    return (
+      this._network ??
+      this.extends.find(i => i.network)?.network ??
+      this.host.network
+    );
   }
 
   set network(network) {
@@ -646,7 +654,20 @@ export class NetworkInterface extends Base {
   }
 
   get scope() {
-    return this._scope ?? this.network?.scope ?? "global";
+    return (
+      this._scope ??
+      this.extends.find(i => i.scope)?.scope ??
+      this.network?.scope ??
+      "global"
+    );
+  }
+
+  set hwaddr(value) {
+    this._hwaddr = value;
+  }
+
+  get hwaddr() {
+    return this._hwaddr ?? this.extends.find(i => i._hwaddr)?._hwaddr;
   }
 
   set metric(value) {
@@ -662,7 +683,9 @@ export class NetworkInterface extends Base {
   }
 
   get ssid() {
-    return this._ssid ?? this.network?.ssid;
+    return (
+      this._ssid ?? this.extends.find(i => i.ssid)?.ssid ?? this.network?.ssid
+    );
   }
 
   set psk(value) {
@@ -670,7 +693,7 @@ export class NetworkInterface extends Base {
   }
 
   get psk() {
-    return this._psk ?? this.network?.psk;
+    return this._psk ?? this.extends.find(i => i.psk)?.psk ?? this.network?.psk;
   }
 
   set kind(value) {
@@ -678,6 +701,8 @@ export class NetworkInterface extends Base {
   }
 
   get kind() {
-    return this._kind ?? this.network?.kind;
+    return (
+      this._kind ?? this.extends.find(i => i.kind)?.kind ?? this.network?.kind
+    );
   }
 }

package/src/service.mjs

@@ -8,7 +8,6 @@ import {
   dnsFormatParameters,
   dnsMergeParameters
 } from "./dns-utils.mjs";
-import { DHCPService, DNSService, NTPService } from "./module.mjs";
 
 const ServiceTypes = {
   ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
@@ -47,7 +46,7 @@ const ServiceTypes = {
   smb: { endpoints: [{ protocol: "tcp", port: 445, tls: false }] },
   timemachine: {
     type: "adisk",
-    endpoints: [{ protocol: "tcp", tls: false }],
+    endpoints: [{ protocol: "tcp", port: 445, tls: false }],
     dnsRecord: {
       type: "TXT",
       parameters: {
@@ -149,13 +148,13 @@ export class Service extends Base {
   }
 
   get endpoints() {
-    if (this._port !== undefined) {
+    if (!ServiceTypes[this.type]) {
       return [
-        { protocol: this.protocol, address: this.rawAddress, port: this._port }
+        { address: this.rawAddress, port: this._port, tls: false }
       ];
     }
 
-    return ServiceTypes[this.type]?.endpoints || [];
+    return ServiceTypes[this.type].endpoints;
   }
 
   set port(value) {
@@ -163,7 +162,15 @@ export class Service extends Base {
   }
 
   get port() {
-    return this._port ?? ServiceTypes[this.type]?.endpoints[0].port;
+    return this.endpoints[0].port;
+  }
+
+  get protocol() {
+    return this.endpoints[0].protocol;
+  }
+
+  get tls() {
+    return this.endpoints[0].tls;
   }
 
   set weight(value) {
@@ -182,14 +189,6 @@ export class Service extends Base {
     return this._type ?? this.name;
   }
 
-  get protocol() {
-    return ServiceTypes[this.type]?.endpoints[0].protocol;
-  }
-
-  get tls() {
-    return ServiceTypes[this.type]?.tls ?? false;
-  }
-
   get systemdServices() {
     return this._systemd;
   }

package/types/host.d.mts

@@ -412,9 +412,9 @@ export class NetworkInterface extends Base {
     _network: any;
     _kind: any;
     _hostName: any;
+    _hwaddr: any;
     extends: any[];
     arpbridge: any;
-    hwaddr: any;
     matches(other: any): boolean;
     addSubnet(address: any): any;
     set ipAddresses(value: Map<any, any>);
@@ -436,6 +436,8 @@ export class NetworkInterface extends Base {
     get network(): any;
     set scope(value: any);
     get scope(): any;
+    set hwaddr(value: any);
+    get hwaddr(): any;
     set metric(value: any);
     get metric(): any;
     set ssid(value: any);

package/types/service.d.mts

@@ -261,12 +261,12 @@ export class Service extends Base {
     get endpoints(): any;
     set port(value: any);
     get port(): any;
+    get protocol(): any;
+    get tls(): any;
     set weight(value: any);
     get weight(): any;
     set type(value: any);
     get type(): any;
-    get protocol(): any;
-    get tls(): any;
     get systemdServices(): any;
     dnsRecordsForDomainName(domainName: any, hasSVRRecords: any): {
         key: any;