pmcf 6.54.2 → 6.54.4

package/package.json

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

package/src/core-service.mjs

@@ -97,7 +97,11 @@ export class CoreService extends base {
   }
 
   get network() {
-    return this.host.network;
+    return this.owner.network;
+  }
+
+  get networks() {
+    return this.owner.networks;
   }
 
   get host() {
@@ -112,12 +116,13 @@ export class CoreService extends base {
     return this.host?.domainName;
   }
 
-  get networks() {
-    return this.host.networks;
+  networkAddresses(filter)
+  {
+    return this.owner.networkAddresses(filter);
   }
 
   get subnets() {
-    return this.host.subnets;
+    return this.owner.subnets;
   }
 
   get url() {

package/src/interfaces/network-interface.mjs

@@ -96,6 +96,10 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     );
   }
 
+  get networks() {
+    return new Set([this.network]);
+  }
+
   get gateway() {
     return this.network?.gateway;
   }

package/src/network-address.mjs

@@ -1,7 +1,8 @@
 import { default_attribute, type_attribute, getAttribute, asArray } from "pacc";
 import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
-import { owner, addType } from "pmcf";
+import { owner } from "./owner.mjs";
+import { addType } from "./type.mjs";
 import { NetworkInterface } from "./interfaces/network-interface.mjs";
 import {
   family_attribute,

package/src/owner.mjs

@@ -18,7 +18,7 @@ import {
   subnets_attribute,
   networkInterfaces_attribute
 } from "./common-attributes.mjs";
-import { addType, assign } from "pmcf";
+import { addType, assign } from "./type.mjs";
 import { loadHooks } from "./hooks.mjs";
 
 export class owner extends ServiceOwner {
@@ -149,7 +149,7 @@ export class owner extends ServiceOwner {
       );
     }
 
-    this._subnets.set(subnet.name, subnet);
+    this._subnets.set(subnet.address, subnet);
     return subnet;
   }
 

package/src/services/bind.mjs

@@ -16,8 +16,7 @@ import {
   integer_attribute_writable,
   integer_attribute,
   secret_attribute_writable,
-  asArray,
-  leafValues
+  asArray
 } from "pacc";
 import {
   base,
@@ -859,8 +858,7 @@ export class bind extends CoreService {
   }
 
   async writeServers(outputControl) {
-
-    // TODO 
+    // TODO
     const all = new Map();
     for (const service of this.primaries) {
       for (const subnet of service.host.network.subnets.values()) {