pmcf 2.33.7 → 2.34.0

package/package.json

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

package/src/host.mjs

@@ -3,7 +3,12 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { ServiceOwner, Base } from "pmcf";
 import { networkAddressProperties, addresses } from "./network-support.mjs";
-import { domainFromDominName, domainName } from "./utils.mjs";
+import {
+  domainFromDominName,
+  domainName,
+  writeLines,
+  sectionLines
+} from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
 import { addType, types } from "./types.mjs";
 import { loadHooks } from "./hooks.mjs";
@@ -484,6 +489,13 @@ export class Host extends ServiceOwner {
     await generateMachineInfo(this, packageData);
     await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 
+    for (const service of this.services) {
+      if (service.systemdConfig) {
+        const { name, content } = service.systemdConfig(this.name);
+        await writeLines(dir, name, sectionLines(...content));
+      }
+    }
+
     yield packageData;
   }
 }

package/src/location.mjs

@@ -1,7 +1,6 @@
 import { FileContentProvider } from "npm-pkgbuild";
-import { Owner } from "./owner.mjs";
+import { Owner } from "pmcf";
 import { addType } from "./types.mjs";
-import { writeLines, sectionLines } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
 
 const LocationTypeDefinition = {
@@ -69,21 +68,6 @@ export class Location extends Owner {
       }
     };
 
-    const configs = [
-      { type: "dns" },
-      { type: "systemd-timesyncd" },
-      { type: "systemd-journal" }
-    ];
-
-    for (const cfg of configs) {
-      const service = this.findService(cfg);
-
-      if (service) {
-        const { name, content } = service.systemdConfig(this.name);
-        await writeLines(dir, name, sectionLines(...content));
-      }
-    }
-
     yield packageData;
   }
 }

package/src/module.mjs

@@ -15,10 +15,12 @@ export * from "./network-interfaces/wlan.mjs";
 export * from "./network-interfaces/wireguard.mjs";
 export * from "./host.mjs";
 export * from "./service.mjs";
+export * from "./extra-source-service.mjs";
 export * from "./endpoint.mjs";
 export * from "./services/dns.mjs";
 export * from "./services/ntp.mjs";
 export * from "./services/dhcp.mjs";
 export * from "./services/systemd-journal.mjs";
 export * from "./services/systemd-timesyncd.mjs";
+export * from "./services/systemd-resolved.mjs";
 export * from "./types.mjs";

package/src/services/dns.mjs

@@ -9,13 +9,10 @@ import {
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
-import { Endpoint, serviceEndpoints } from "pmcf";
+import { ExtraSourceService, Endpoint, serviceEndpoints } from "pmcf";
 import { addType } from "../types.mjs";
-import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
-import {
-  ExtraSourceService,
-  ExtraSourceServiceTypeDefinition
-} from "../extra-source-service.mjs";
+import { ServiceTypeDefinition } from "../service.mjs";
+import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addresses } from "../network-support.mjs";
 import { addHook } from "../hooks.mjs";
 
@@ -210,29 +207,6 @@ export class DNSService extends ExtraSourceService {
     return this._excludeInterfaceKinds;
   }
 
-  systemdConfig(name) {
-    return {
-      name: `etc/systemd/resolved.conf.d/${name}.conf`,
-      content: [
-        "Resolve",
-        {
-          DNS: serviceAddresses(this, {
-            ...DNS_SERVICE_FILTER,
-            priority: "<10"
-          }).join(" "),
-          FallbackDNS: serviceAddresses(this, {
-            ...DNS_SERVICE_FILTER,
-            priority: ">=10"
-          }).join(" "),
-          Domains: [...this.localDomains].join(" "),
-          DNSSEC: "no",
-          MulticastDNS: this.network.multicastDNS ? "yes" : "no",
-          LLMNR: "no"
-        }
-      ]
-    };
-  }
-
   async *preparePackages(dir) {
     const location = this.owner.owner;
     const name = location.name;

package/src/services/systemd-resolved.mjs

@@ -0,0 +1,58 @@
+import { ExtraSourceService, ServiceTypeDefinition } from "pmcf";
+import { serviceAddresses } from "../service.mjs";
+import { addType } from "../types.mjs";
+
+const SystemdResolvedServiceTypeDefinition = {
+  name: "systemd-resolved",
+  specializationOf: ServiceTypeDefinition,
+  owners: ServiceTypeDefinition.owners,
+  extends: ServiceTypeDefinition,
+  priority: 0.1,
+  properties: {}
+};
+
+export class SystemdResolvedService extends ExtraSourceService {
+  static {
+    addType(this);
+  }
+
+  static get typeDefinition() {
+    return SystemdResolvedServiceTypeDefinition;
+  }
+
+  constructor(owner, data) {
+    super(owner, data);
+    this.read(data, SystemdResolvedServiceTypeDefinition);
+  }
+
+  get type() {
+    return SystemdResolvedServiceTypeDefinition.name;
+  }
+
+  get systemdServices() {
+    return SystemdResolvedServiceTypeDefinition.name;
+  }
+
+  systemdConfig(name) {
+    return {
+      name: `etc/systemd/resolved.conf.d/${name}.conf`,
+      content: [
+        "Resolve",
+        {
+          DNS: serviceAddresses(this, {
+            type: "dns",
+            priority: "<10"
+          }).join(" "),
+          FallbackDNS: serviceAddresses(this, {
+            type: "dns",
+            priority: ">=10"
+          }).join(" "),
+          Domains: [...this.localDomains].join(" "),
+          DNSSEC: "no",
+          MulticastDNS: this.network.multicastDNS ? "yes" : "no",
+          LLMNR: "no"
+        }
+      ]
+    };
+  }
+}

package/src/services/systemd-timesyncd.mjs

@@ -1,6 +1,5 @@
-import { Service, ServiceTypeDefinition } from "pmcf";
+import { ExtraSourceService, ServiceTypeDefinition } from "pmcf";
 import { serviceAddresses } from "../service.mjs";
-
 import { addType } from "../types.mjs";
 
 const SystemdTimesyncdServiceTypeDefinition = {
@@ -12,7 +11,7 @@ const SystemdTimesyncdServiceTypeDefinition = {
   properties: {}
 };
 
-export class SystemdTimesyncdService extends Service {
+export class SystemdTimesyncdService extends ExtraSourceService {
   static {
     addType(this);
   }

package/types/location.d.mts

@@ -292,5 +292,5 @@ export class Location extends Owner {
         };
     }, void, unknown>;
 }
-import { Owner } from "./owner.mjs";
+import { Owner } from "pmcf";
 import { FileContentProvider } from "npm-pkgbuild";

package/types/module.d.mts

@@ -15,10 +15,12 @@ export * from "./network-interfaces/wlan.mjs";
 export * from "./network-interfaces/wireguard.mjs";
 export * from "./host.mjs";
 export * from "./service.mjs";
+export * from "./extra-source-service.mjs";
 export * from "./endpoint.mjs";
 export * from "./services/dns.mjs";
 export * from "./services/ntp.mjs";
 export * from "./services/dhcp.mjs";
 export * from "./services/systemd-journal.mjs";
 export * from "./services/systemd-timesyncd.mjs";
+export * from "./services/systemd-resolved.mjs";
 export * from "./types.mjs";

package/types/services/dns.d.mts

@@ -377,17 +377,6 @@ export class DNSService extends ExtraSourceService {
     get exclude(): Set<any>;
     set excludeInterfaceKinds(value: Set<any>);
     get excludeInterfaceKinds(): Set<any>;
-    systemdConfig(name: any): {
-        name: string;
-        content: (string | {
-            DNS: string;
-            FallbackDNS: string;
-            Domains: string;
-            DNSSEC: string;
-            MulticastDNS: string;
-            LLMNR: string;
-        })[];
-    };
     preparePackages(dir: any): AsyncGenerator<{
         dir: string;
         sources: FileContentProvider[];
@@ -399,5 +388,5 @@ export class DNSService extends ExtraSourceService {
         };
     }, void, unknown>;
 }
-import { ExtraSourceService } from "../extra-source-service.mjs";
+import { ExtraSourceService } from "pmcf";
 import { FileContentProvider } from "npm-pkgbuild";

package/types/services/systemd-resolved.d.mts

@@ -0,0 +1,269 @@
+export class SystemdResolvedService extends ExtraSourceService {
+    static get typeDefinition(): {
+        name: string;
+        specializationOf: {
+            name: string;
+            owners: string[];
+            priority: number;
+            extends: {
+                name: string;
+                owners: any[];
+                properties: {
+                    owner: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    type: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    name: {
+                        type: string;
+                        collection: boolean;
+                        identifier: boolean;
+                        writeable: boolean;
+                    };
+                    description: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    priority: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    directory: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    packaging: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    tags: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                };
+            };
+            specializations: {};
+            factoryFor(owner: any, value: any): any;
+            properties: {
+                ipAddresses: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                alias: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                weight: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                    default: number;
+                };
+                systemd: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                port: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                protocol: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                    values: string[];
+                };
+                type: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                tls: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                    default: boolean;
+                };
+                hostName: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                cidrAddresses: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                cidrAddress: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                addresses: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                address: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+            };
+        };
+        owners: string[];
+        extends: {
+            name: string;
+            owners: string[];
+            priority: number;
+            extends: {
+                name: string;
+                owners: any[];
+                properties: {
+                    owner: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    type: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    name: {
+                        type: string;
+                        collection: boolean;
+                        identifier: boolean;
+                        writeable: boolean;
+                    };
+                    description: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    priority: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    directory: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    packaging: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                    tags: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
+                };
+            };
+            specializations: {};
+            factoryFor(owner: any, value: any): any;
+            properties: {
+                ipAddresses: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                alias: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                weight: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                    default: number;
+                };
+                systemd: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                port: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                protocol: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                    values: string[];
+                };
+                type: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                tls: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                    default: boolean;
+                };
+                hostName: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                cidrAddresses: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                cidrAddress: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                addresses: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                address: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+            };
+        };
+        priority: number;
+        properties: {};
+    };
+    get systemdServices(): string;
+    systemdConfig(name: any): {
+        name: string;
+        content: (string | {
+            DNS: string;
+            FallbackDNS: string;
+            Domains: string;
+            DNSSEC: string;
+            MulticastDNS: string;
+            LLMNR: string;
+        })[];
+    };
+}
+import { ExtraSourceService } from "pmcf";

package/types/services/systemd-timesyncd.d.mts

@@ -1,4 +1,4 @@
-export class SystemdTimesyncdService extends Service {
+export class SystemdTimesyncdService extends ExtraSourceService {
     static get typeDefinition(): {
         name: string;
         specializationOf: {
@@ -253,7 +253,6 @@ export class SystemdTimesyncdService extends Service {
         priority: number;
         properties: {};
     };
-    get type(): string;
     get systemdServices(): string;
     systemdConfig(name: any): {
         name: string;
@@ -262,4 +261,4 @@ export class SystemdTimesyncdService extends Service {
         })[];
     };
 }
-import { Service } from "pmcf";
+import { ExtraSourceService } from "pmcf";