pmcf 2.3.1 → 2.4.0

package/package.json

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

package/src/base.mjs

@@ -121,6 +121,16 @@ export class Base {
               break;
           }
         } else {
+          if (property.values) {
+            if (property.values.indexOf(value) < 0) {
+              this.error(
+                property.name,
+                "unknown value",
+                value,
+                property.values
+              );
+            }
+          }
           this[property.name] = value;
         }
       }
@@ -412,7 +422,7 @@ export class Base {
     switch (typeof object) {
       case "string":
         return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
-          return getAttribute(this, m1) || "${" + m1 + "}";
+          return getAttribute(this, m1) ?? "${" + m1 + "}";
         });
 
       case "object":

package/src/host.mjs

@@ -40,15 +40,30 @@ const HostTypeDefinition = {
     },
     services: { type: "service", collection: true, writeable: true },
     aliases: { type: "string", collection: true, writeable: true },
-    os: { type: "string", collection: false, writeable: true },
+    os: {
+      type: "string",
+      collection: false,
+      writeable: true,
+      values: ["osx", "windows", "linux"]
+    },
     "machine-id": { type: "string", collection: false, writeable: true },
     distribution: { type: "string", collection: false, writeable: true },
-    deployment: { type: "string", collection: false, writeable: true },
+    deployment: {
+      type: "string",
+      collection: false,
+      writeable: true,
+      values: ["production", "development"]
+    },
     weight: { type: "number", collection: false, writeable: true },
     serial: { type: "string", collection: false, writeable: true },
     vendor: { type: "string", collection: false, writeable: true },
     chassis: { type: "string", collection: false, writeable: true },
-    architecture: { type: "string", collection: false, writeable: true },
+    architecture: {
+      type: "string",
+      collection: false,
+      writeable: true,
+      values: ["x86", "aarch64", "armv7"]
+    },
     replaces: { type: "string", collection: true, writeable: true },
     depends: { type: "string", collection: true, writeable: true },
     provides: { type: "string", collection: true, writeable: true },
@@ -106,8 +121,7 @@ export class Host extends Base {
 
     for (const [name, ni] of host.networkInterfaces) {
       if (ni.isTemplate) {
-      }
-      else {
+      } else {
         let present = this._networkInterfaces.get(name);
         if (!present) {
           present = ni.forOwner(this);
@@ -499,8 +513,8 @@ export class NetworkInterface extends Base {
   }
 
   matches(other) {
-    if(this.isTemplate) {
-      const name = this.name.replace('*','');
+    if (this.isTemplate) {
+      const name = this.name.replace("*", "");
       return name.length === 0 || other.name.indexOf(name) >= 0;
     }
 

package/src/network-support.mjs

@@ -1,6 +1,16 @@
 export const networkProperties = {
-  scope: { type: "string", collection: false, writeable: true },
-  kind: { type: "string", collection: false, writeable: true },
+  scope: {
+    type: "string",
+    collection: false,
+    writeable: true,
+    values: ["global", "site", "link", "local"]
+  },
+  kind: {
+    type: "string",
+    collection: false,
+    writeable: true,
+    values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
+  },
   ssid: { type: "string", collection: false, writeable: true },
   psk: { type: "string", collection: false, writeable: true },
   metric: { type: "number", collection: false, writeable: true },

package/src/owner.mjs

@@ -314,7 +314,7 @@ export class Owner extends Base {
   }
 
   get country() {
-    return this._country || this.owner?.country;
+    return this._country ?? this.owner?.country;
   }
 
   _locales = new Set();
@@ -341,7 +341,7 @@ export class Owner extends Base {
   }
 
   get timezone() {
-    return this._timezone || this.owner?.timezone;
+    return this._timezone ?? this.owner?.timezone;
   }
 
   _administratorEmail;
@@ -369,7 +369,7 @@ export class Owner extends Base {
   }
 
   get domain() {
-    return this._domain || this.owner?.domain;
+    return this._domain ?? this.owner?.domain;
   }
 
   get domains() {

package/src/service.mjs

@@ -66,7 +66,7 @@ export const ServiceTypeDefinition = {
   priority: 0.4,
   extends: Base.typeDefinition,
   factoryFor(value) {
-    const type = value.type || value.name;
+    const type = value.type ?? value.name;
 
     if (type === "dns") {
       delete value.type;
@@ -87,7 +87,12 @@ export const ServiceTypeDefinition = {
     ...networkAddressProperties,
     ipAddresses: { type: "string", collection: true, writeable: true },
     port: { type: "number", collection: false, writeable: true },
-    protocol: { type: "string", collection: false, writeable: true },
+    protocol: {
+      type: "string",
+      collection: false,
+      writeable: true,
+      values: ["tcp", "udp"]
+    },
     alias: { type: "string", collection: false, writeable: true },
     type: { type: "string", collection: false, writeable: true },
     weight: { type: "number", collection: false, writeable: true },
@@ -130,15 +135,15 @@ export class Service extends Base {
   }
 
   get ipAddressOrDomainName() {
-    return this.rawAddress || this.domainName;
+    return this.rawAddress ?? this.domainName;
   }
 
   get rawAddresses() {
-    return this._ipAddresses || this.owner.rawAddresses;
+    return this._ipAddresses ?? this.owner.rawAddresses;
   }
 
   get rawAddress() {
-    return this._ipAddresses?.[0] || this.server.rawAddress;
+    return this._ipAddresses?.[0] ?? this.server.rawAddress;
   }
 
   set ipAddresses(value) {
@@ -180,7 +185,7 @@ export class Service extends Base {
   }
 
   get type() {
-    return this._type || this.name;
+    return this._type ?? this.name;
   }
 
   get protocol() {
@@ -188,7 +193,7 @@ export class Service extends Base {
   }
 
   get tls() {
-    return ServiceTypes[this.type]?.tls || false;
+    return ServiceTypes[this.type]?.tls ?? false;
   }
 
   get systemdServices() {
@@ -206,7 +211,7 @@ export class Service extends Base {
         records.push(
           DNSRecord(
             dnsFullName(
-              `_${ServiceTypes[this.type]?.type || this.type}._${
+              `_${ServiceTypes[this.type]?.type ?? this.type}._${
                 ep.protocol
               }.${domainName}`
             ),

package/src/services/dhcp.mjs

@@ -36,23 +36,24 @@ export class DHCPService extends Service {
 
   async *preparePackages(dir) {
     const network = this.network;
-    const name = this.owner.owner.name;
+    const host = this.server;
+    const name = host.name;
     const packageData = {
       dir,
       sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
       outputs: this.outputs,
       properties: {
         name: `kea-${name}`,
-        description: `kea definitions for ${this.fullName}`,
+        description: `kea definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["kea"],
-        replaces: ["kea-sw"] // TODO remove
+        replaces: ["kea-SW"] // TODO remove
       }
     };
 
     const commonConfig = {
       "interfaces-config": {
-        interfaces: ["end0"]
+        interfaces: [...host.networkInterfaces.values()].filter(ni=>ni.kind !== 'loopback').map(ni => ni.name)
       },
       "lease-database": {
         type: "memfile",

package/types/cluster.d.mts

@@ -205,6 +205,7 @@ export class Cluster extends Host {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
+                    values: string[];
                 };
                 "machine-id": {
                     type: string;
@@ -220,6 +221,7 @@ export class Cluster extends Host {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
+                    values: string[];
                 };
                 weight: {
                     type: string;
@@ -245,6 +247,7 @@ export class Cluster extends Host {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
+                    values: string[];
                 };
                 replaces: {
                     type: string;

package/types/extra-source-service.d.mts

@@ -82,6 +82,7 @@ export class ExtraSourceService extends Service {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
+                    values: string[];
                 };
                 alias: {
                     type: string;

package/types/host.d.mts

@@ -70,6 +70,7 @@ export class Host extends Base {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             "machine-id": {
                 type: string;
@@ -85,6 +86,7 @@ export class Host extends Base {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             weight: {
                 type: string;
@@ -110,6 +112,7 @@ export class Host extends Base {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             replaces: {
                 type: string;
@@ -360,11 +363,13 @@ export class NetworkInterface extends Base {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             kind: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             ssid: {
                 type: string;

package/types/network-support.d.mts

@@ -3,6 +3,7 @@ export namespace networkProperties {
         let type: string;
         let collection: boolean;
         let writeable: boolean;
+        let values: string[];
     }
     namespace kind {
         let type_1: string;
@@ -11,6 +12,8 @@ export namespace networkProperties {
         export { collection_1 as collection };
         let writeable_1: boolean;
         export { writeable_1 as writeable };
+        let values_1: string[];
+        export { values_1 as values };
     }
     namespace ssid {
         let type_2: string;

package/types/network.d.mts

@@ -150,11 +150,13 @@ export class Network extends Owner {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             kind: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             ssid: {
                 type: string;

package/types/service.d.mts

@@ -67,6 +67,7 @@ export namespace ServiceTypeDefinition {
             type: string;
             collection: boolean;
             writeable: boolean;
+            values: string[];
         };
         alias: {
             type: string;
@@ -188,6 +189,7 @@ export class Service extends Base {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
+                values: string[];
             };
             alias: {
                 type: string;

package/types/services/dhcp.d.mts

@@ -69,6 +69,7 @@ export class DHCPService extends Service {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
+                    values: string[];
                 };
                 alias: {
                     type: string;

package/types/services/dns.d.mts

@@ -74,6 +74,7 @@ export class DNSService extends ExtraSourceService {
                         type: string;
                         collection: boolean;
                         writeable: boolean;
+                        values: string[];
                     };
                     alias: {
                         type: string;

package/types/services/ntp.d.mts

@@ -72,6 +72,7 @@ export class NTPService extends ExtraSourceService {
                         type: string;
                         collection: boolean;
                         writeable: boolean;
+                        values: string[];
                     };
                     alias: {
                         type: string;