pmcf 1.12.0 → 1.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "publishConfig": {
     "access": "public"
   },
@@ -48,7 +48,7 @@
     "typescript": "^5.7.3"
   },
   "engines": {
-    "node": ">=22.13.0"
+    "node": ">=22.13.1"
   },
   "repository": {
     "type": "git",

package/src/model.mjs

@@ -413,15 +413,13 @@ export class World extends Owner {
   }
 }
 
-class DNSService {
-  owner;
-
+class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
   forwardsTo = [];
 
   constructor(owner, data) {
-    this.owner = owner;
+    super(owner, data);
     Object.assign(this, data);
   }
 
@@ -430,11 +428,15 @@ class DNSService {
 
     yield* this.owner.services(filter);
 
-    for (const s of this.forwardsTo) {
+    for (const s of asArray(this.forwardsTo)) {
       const owner = await this.owner.world.load(s);
       yield* owner.services(filter);
     }
   }
+
+  get propertyNames() {
+    return ["recordTTL", "forwardsTo", "allowedUpdates"];
+  }
 }
 
 export class Location extends Owner {
@@ -481,7 +483,6 @@ export class Location extends Owner {
     return this.#dns;
   }
 
-
   async *networkAddresses() {
     for await (const host of this.hosts()) {
       for (const networkAddresses of host.networkAddresses()) {
@@ -495,7 +496,7 @@ export class Location extends Owner {
   }
 
   get propertyNames() {
-    return [...super.propertyNames, "domain" /*, "hosts"*/];
+    return [...super.propertyNames, "domain", "administratorEmail", "dns"];
   }
 }
 
@@ -592,7 +593,9 @@ export class Host extends Base {
     }
 
     if (data.extends) {
-      data.extends = await Promise.all(data.extends.map(e => world.host(e)));
+      data.extends = await Promise.all(
+        asArray(data.extends).map(e => world.host(e))
+      );
     }
 
     return this;
@@ -779,6 +782,10 @@ export class Host extends Base {
     }
   }
 
+  get ipAddresses() {
+    return [...this.networkAddresses()].map(na => na.address);
+  }
+
   get ipAddress() {
     for (const a of this.networkAddresses()) {
       return a.address;
@@ -881,7 +888,7 @@ export class Service extends Base {
   #priority;
   #type;
   #port;
-  #ipAddress;
+  #ipAddresses;
 
   static get typeName() {
     return "service";
@@ -905,9 +912,9 @@ export class Service extends Base {
       this.#port = data.port;
       delete data.port;
     }
-    if (data.ipAddress) {
-      this.#ipAddress = data.ipAddress;
-      delete data.ipAddress;
+    if (data.ipAddresses) {
+      this.#ipAddresses = data.ipAddresses;
+      delete data.ipAddresses;
     }
 
     Object.assign(this, data);
@@ -932,8 +939,8 @@ export class Service extends Base {
       if (this.#port) {
         data.port = this.#port;
       }
-      if (this.#ipAddress) {
-        data.ipAddress = this.#ipAddress;
+      if (this.#ipAddresses) {
+        data.ipAddresses = this.#ipAddresses;
       }
       return new this.constructor(owner, data);
     }
@@ -941,20 +948,19 @@ export class Service extends Base {
     return this;
   }
 
-  get protocol()
-  {
+  get protocol() {
     return ServiceTypes[this.type]?.protocol;
   }
-  
+
   get srvPrefix() {
     const st = ServiceTypes[this.type];
-    if(st) {
+    if (st) {
       return `_${this.type}._${st.protocol}`;
     }
   }
 
-  get ipAddress() {
-    return this.#ipAddress || this.owner.ipAddress;
+  get ipAddresses() {
+    return this.#ipAddresses || this.owner.ipAddresses;
   }
 
   get port() {
@@ -980,7 +986,7 @@ export class Service extends Base {
   get propertyNames() {
     return [
       ...super.propertyNames,
-      "ipAddress",
+      "ipAddresses",
       "port",
       "protocol",
       "alias",

package/types/model.d.mts

@@ -119,6 +119,7 @@ export class Host extends Base {
         address: any;
         networkInterface: any;
     }, void, unknown>;
+    get ipAddresses(): any[];
     get ipAddress(): any;
     publicKey(type?: string): Promise<string>;
     toJSON(): {
@@ -137,7 +138,7 @@ export class Service extends Base {
     alias: any;
     get protocol(): any;
     get srvPrefix(): string;
-    get ipAddress(): any;
+    get ipAddresses(): any;
     get port(): any;
     get priority(): any;
     get weight(): any;
@@ -145,9 +146,7 @@ export class Service extends Base {
     get type(): any;
     #private;
 }
-declare class DNSService {
-    constructor(owner: any, data: any);
-    owner: any;
+declare class DNSService extends Base {
     allowedUpdates: any[];
     recordTTL: string;
     forwardsTo: any[];