pmcf 2.32.2 → 2.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.32.2",
+  "version": "2.33.0",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "ip-utilties": "^1.3.1",
-    "npm-pkgbuild": "^18.0.1",
+    "npm-pkgbuild": "^18.1.0",
     "pacc": "^3.4.0",
     "pkg-dir": "^8.0.0"
   },

package/src/base.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
 import { getAttribute } from "pacc";
-import { addType, primitives } from "./types.mjs";
+import { addType, primitives, typeFactory } from "./types.mjs";
 
 const BaseTypeDefinition = {
   name: "base",
@@ -201,12 +201,13 @@ export class Base {
           if (value instanceof property.type[0].clazz) {
             assign(property, value);
           } else {
-            const factory =
-              property.type[0].factoryFor?.(this, value) || property.type[0].clazz;
-
             assign(
               property,
-              new factory(this.ownerFor(property, value), value)
+              typeFactory(
+                property.type[0],
+                this.ownerFor(property, value),
+                value
+              )
             );
           }
           break;

package/src/host.mjs

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { Base } from "./base.mjs";
+import { ServiceOwner, Base } from "pmcf";
 import { networkAddressProperties, addresses } from "./network-support.mjs";
 import { domainFromDominName, domainName } from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
@@ -75,8 +75,7 @@ const HostTypeDefinition = {
   }
 };
 
-export class Host extends Base {
-  _services = [];
+export class Host extends ServiceOwner {
   _extends = [];
   _aliases = new Set();
   _networkInterfaces = new Map();
@@ -143,10 +142,6 @@ export class Host extends Base {
       for (const ni of this.networkInterfaces.values()) {
         ni._traverse(...args);
       }
-      for (const service of this._services) {
-        service._traverse(...args);
-      }
-
       return true;
     }
     return false;
@@ -208,7 +203,6 @@ export class Host extends Base {
     return this.extends.find(h => h.isModel);
   }
 
-
   set aliases(value) {
     if (value instanceof Set) {
       this._aliases = this._aliases.union(value);
@@ -359,22 +353,6 @@ export class Host extends Base {
     yield this;
   }
 
-  get services() {
-    return this._services;
-  }
-
-  set services(service) {
-    const present = this._services.find(s => s.name === service.name);
-
-    if (!present) {
-      this._services.push(service);
-    }
-  }
-
-  *findServices(filter) {
-    yield* objectFilter(types.service, this._services, filter);
-  }
-
   typeNamed(typeName, name) {
     if (typeName === NetworkInterfaceTypeDefinition.name) {
       const ni = this._networkInterfaces.get(name);
@@ -382,13 +360,6 @@ export class Host extends Base {
         return ni;
       }
     }
-    if (typeName === "service") {
-      const service = this.services.find(s => s.name === name);
-      if (service) {
-        return service;
-      }
-    }
-
     return super.typeNamed(typeName, name);
   }
 
@@ -397,10 +368,8 @@ export class Host extends Base {
     if (ni) {
       return ni;
     }
-    const service = this.services.find(s => s.name === name);
-    if (service) {
-      return service;
-    }
+
+    return super.named(name);
   }
 
   get network() {

package/src/module.mjs

@@ -4,6 +4,7 @@ export * from "./owner.mjs";
 export * from "./location.mjs";
 export * from "./root.mjs";
 export * from "./subnet.mjs";
+export * from "./service-owner.mjs";
 export * from "./network.mjs";
 export * from "./network-address.mjs";
 export * from "./network-support.mjs";

package/src/network-interfaces/loopback.mjs

@@ -26,6 +26,11 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     return LoopbackNetworkInterfaceTypeDefinition;
   }
 
+  constructor(owner, data) {
+    super(owner, data);
+    this.read(data, NetworkInterfaceTypeDefinition);
+  }
+
   get kind() {
     return LoopbackNetworkInterfaceTypeDefinition.name;
   }

package/src/network-interfaces/network-interface.mjs

@@ -34,6 +34,8 @@ export const NetworkInterfaceTypeDefinition = {
   properties: {
     ...networkProperties,
     ...networkAddressProperties,
+
+    services: { type: "service", collection: true, writeable: true },
     hostName: { type: "string", collection: false, writeable: true },
     ipAddresses: { type: "string", collection: true, writeable: true },
 

package/src/network-interfaces/skeleton.mjs

@@ -1,9 +1,10 @@
 import { join } from "node:path";
-import { NetworkAddress, Base } from "pmcf";
 import { writeLines, sectionLines } from "../utils.mjs";
+import { NetworkAddress } from "pmcf";
+import { ServiceOwner } from "../service-owner.mjs";
 import { cidrAddresses } from "../network-support.mjs";
 
-export class SkeletonNetworkInterface extends Base {
+export class SkeletonNetworkInterface extends ServiceOwner {
   _extends = [];
   _network;
 
@@ -31,6 +32,10 @@ export class SkeletonNetworkInterface extends Base {
     return this.owner;
   }
 
+  *hosts() {
+    yield* this.owner.hosts();
+  }
+
   get network_interface() {
     return this;
   }
@@ -56,9 +61,8 @@ export class SkeletonNetworkInterface extends Base {
     this._network = network;
   }
 
-  *subnets ()
-  {
-    yield *this.ipAddresses.values();
+  *subnets() {
+    yield* this.ipAddresses.values();
   }
 
   get ipAddresses() {

package/src/root.mjs

@@ -1,7 +1,7 @@
 import { readFile, glob } from "node:fs/promises";
 import { join } from "node:path";
 import { Location } from "./location.mjs";
-import { addType, types, resolveTypeLinks } from "./types.mjs";
+import { addType, types, resolveTypeLinks, typeFactory } from "./types.mjs";
 
 const RootTypeDefinition = {
   name: "root",
@@ -49,8 +49,7 @@ export class Root extends Location {
     const fullName = this.fullName + "/" + name;
     data.name = fullName.substring(owner.fullName.length + 1);
 
-    const object = new type.clazz(owner, data);
-
+    const object = typeFactory(type, owner, data);
     this.addTypeObject(type.clazz.typeName, name, object);
     return object;
   }

package/src/service-owner.mjs

@@ -0,0 +1,53 @@
+import { Base } from "pmcf";
+import { objectFilter } from "./filter.mjs";
+import { types } from "./types.mjs";
+
+export class ServiceOwner extends Base {
+  _services = [];
+
+  get services() {
+    return this._services;
+  }
+
+  set services(service) {
+    const present = this._services.find(s => s.name === service.name);
+
+   // console.log("SET SERVICE", service.name);
+    if (!present) {
+      this._services.push(service);
+    }
+  }
+
+  *findServices(filter) {
+    yield* objectFilter(types.service, this._services, filter);
+  }
+
+  _traverse(...args) {
+    if (super._traverse(...args)) {
+      for (const service of this._services) {
+        service._traverse(...args);
+      }
+
+      return true;
+    }
+    return false;
+  }
+
+  typeNamed(typeName, name) {
+    if (typeName === "service") {
+      const service = this.services.find(s => s.name === name);
+      if (service) {
+        return service;
+      }
+    }
+
+    return super.typeNamed(typeName, name);
+  }
+
+  named(name) {
+    const service = this.services.find(s => s.name === name);
+    if (service) {
+      return service;
+    }
+  }
+}

package/src/service.mjs

@@ -81,7 +81,7 @@ export const endpointProperties = {
 
 export const EndpointTypeDefinition = {
   name: "endpoint",
-  owners: ["service"],
+  owners: ["service", "network-interface"],
   priority: 0.4,
   specializations: {},
   properties: endpointProperties
@@ -152,6 +152,10 @@ export class Service extends Base {
     return this.owner;
   }
 
+  *hosts() {
+    yield* this.owner.hosts();
+  }
+
   get domainName() {
     return this.host.domainName;
   }

package/src/services/dns.mjs

@@ -367,7 +367,9 @@ async function generateZoneDefs(dns, location, packageData) {
     );
   }
 
-  for (const domain of dns.localDomains) {
+  console.log("LOCAL DOMAINS", location.localDomains, location.domain, location.toString());
+
+  for (const domain of location.localDomains) {
     const locationName = location.name;
     const reverseZones = new Map();
 
@@ -408,6 +410,7 @@ async function generateZoneDefs(dns, location, packageData) {
     const hosts = new Set();
     const addresses = new Set();
 
+    console.log("LIST", location.toString());
     for await (const {
       address,
       subnet,
@@ -415,6 +418,8 @@ async function generateZoneDefs(dns, location, packageData) {
       domainNames,
       family
     } of location.networkAddresses()) {
+      console.log("ADDRESS",address);
+
       if (
         !dns.exclude.has(networkInterface.network) &&
         !dns.excludeInterfaceKinds.has(networkInterface.kind)

package/src/types.mjs

@@ -83,3 +83,8 @@ export function resolveTypeLinks() {
     }
   }
 }
+
+export function typeFactory(type, owner, data) {
+  const factory = type.factoryFor?.(owner, data) || type.clazz;
+  return new factory(owner, data);
+}

package/types/host.d.mts

@@ -1,4 +1,4 @@
-export class Host extends Base {
+export class Host extends ServiceOwner {
     static get typeDefinition(): {
         name: string;
         priority: number;
@@ -172,7 +172,6 @@ export class Host extends Base {
             };
         };
     };
-    _services: any[];
     _extends: any[];
     _aliases: Set<any>;
     _networkInterfaces: Map<any, any>;
@@ -187,9 +186,6 @@ export class Host extends Base {
     _architecture: any;
     _serial: any;
     _applyExtends(host: any): void;
-    set services(service: any[]);
-    get services(): any[];
-    _traverse(...args: any[]): boolean;
     set serial(value: any);
     get serial(): any;
     set deployment(value: any);
@@ -229,7 +225,6 @@ export class Host extends Base {
     get clusters(): Set<any>;
     get host(): this;
     hosts(): Generator<this, void, unknown>;
-    named(name: any): any;
     get networks(): Set<any>;
     findNetworkInterfaces(filter: any): Generator<any, void, any>;
     findNetworkInterface(filter: any): any;
@@ -256,5 +251,5 @@ export class Host extends Base {
         };
     }, void, unknown>;
 }
-import { Base } from "./base.mjs";
+import { ServiceOwner } from "pmcf";
 import { FileContentProvider } from "npm-pkgbuild";

package/types/module.d.mts

@@ -4,6 +4,7 @@ export * from "./owner.mjs";
 export * from "./location.mjs";
 export * from "./root.mjs";
 export * from "./subnet.mjs";
+export * from "./service-owner.mjs";
 export * from "./network.mjs";
 export * from "./network-address.mjs";
 export * from "./network-support.mjs";

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

@@ -69,6 +69,11 @@ export class EthernetNetworkInterface extends NetworkInterface {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
+                services: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 hostName: {
                     type: string;
                     collection: boolean;
@@ -223,6 +228,11 @@ export class EthernetNetworkInterface extends NetworkInterface {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
+                services: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 hostName: {
                     type: string;
                     collection: boolean;

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

@@ -55,6 +55,11 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
+                services: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 hostName: {
                     type: string;
                     collection: boolean;
@@ -209,6 +214,11 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
+                services: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 hostName: {
                     type: string;
                     collection: boolean;

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

@@ -53,6 +53,11 @@ export namespace NetworkInterfaceTypeDefinition {
     export let specializations: {};
     export function factoryFor(owner: any, value: any): any;
     export let properties: {
+        services: {
+            type: string;
+            collection: boolean;
+            writeable: boolean;
+        };
         hostName: {
             type: string;
             collection: boolean;
@@ -207,6 +212,11 @@ export class NetworkInterface extends SkeletonNetworkInterface {
         specializations: {};
         factoryFor(owner: any, value: any): any;
         properties: {
+            services: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             hostName: {
                 type: string;
                 collection: boolean;

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

@@ -1,9 +1,10 @@
-export class SkeletonNetworkInterface extends Base {
+export class SkeletonNetworkInterface extends ServiceOwner {
     _extends: any[];
     _network: any;
     get typeName(): string;
     set extends(value: any[]);
     get extends(): any[];
+    hosts(): Generator<any, void, any>;
     get network_interface(): this;
     get domainNames(): Set<any>;
     matches(other: any): boolean;
@@ -22,5 +23,5 @@ export class SkeletonNetworkInterface extends Base {
     get addresses(): any[];
     systemdDefinitions(packageData: any): Promise<void>;
 }
-import { Base } from "pmcf";
+import { ServiceOwner } from "../service-owner.mjs";
 import { NetworkAddress } from "pmcf";

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

@@ -55,6 +55,11 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
+                services: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 hostName: {
                     type: string;
                     collection: boolean;
@@ -209,6 +214,11 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
+                services: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 hostName: {
                     type: string;
                     collection: boolean;

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

@@ -55,6 +55,11 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
+                services: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 hostName: {
                     type: string;
                     collection: boolean;
@@ -211,6 +216,11 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                 specializations: {};
                 factoryFor(owner: any, value: any): any;
                 properties: {
+                    services: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     hostName: {
                         type: string;
                         collection: boolean;
@@ -365,6 +375,11 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                 specializations: {};
                 factoryFor(owner: any, value: any): any;
                 properties: {
+                    services: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     hostName: {
                         type: string;
                         collection: boolean;

package/types/root.d.mts

@@ -283,7 +283,7 @@ export class Root extends Location {
     constructor(directory: any);
     get fullName(): string;
     get root(): this;
-    _load(name: any, type: any): any;
+    _load(name: any, type: any): Promise<any>;
     load(name: any, options: any): any;
     loadAll(): Promise<void>;
 }

package/types/service-owner.d.mts

@@ -0,0 +1,8 @@
+export class ServiceOwner extends Base {
+    _services: any[];
+    set services(service: any[]);
+    get services(): any[];
+    _traverse(...args: any[]): boolean;
+    named(name: any): any;
+}
+import { Base } from "pmcf";

package/types/service.d.mts

@@ -305,6 +305,7 @@ export class Service extends Base {
     _extends: any[];
     set extends(value: any[]);
     get extends(): any[];
+    hosts(): Generator<any, void, any>;
     get domainName(): any;
     get ipAddressOrDomainName(): any;
     get addresses(): any;

package/types/types.d.mts

@@ -1,4 +1,5 @@
 export function addType(clazz: any): void;
 export function resolveTypeLinks(): void;
+export function typeFactory(type: any, owner: any, data: any): any;
 export const types: {};
 export const primitives: Set<string>;