pmcf 1.11.0 → 1.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.11.0",
+  "version": "1.13.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

@@ -430,7 +430,7 @@ 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);
     }
@@ -481,7 +481,6 @@ export class Location extends Owner {
     return this.#dns;
   }
 
-
   async *networkAddresses() {
     for await (const host of this.hosts()) {
       for (const networkAddresses of host.networkAddresses()) {
@@ -592,7 +591,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;
@@ -863,15 +864,15 @@ export class Subnet extends Base {
 }
 
 const ServiceTypes = {
-  dns: { srvPrefix: "_dns._udp", port: 53 },
-  ldap: { srvPrefix: "_ldap._tcp", port: 389 },
-  http: { srvPrefix: "_http._tcp", port: 80 },
-  https: { srvPrefix: "_http._tcp", port: 443 },
-  rtsp: { srvPrefix: "_rtsp._tcp", port: 554 },
-  smtp: { srvPrefix: "_smtp._tcp", port: 25 },
-  ssh: { srvPrefix: "_ssh._tcp", port: 22 },
-  imap: { srvPrefix: "_imap._tcp", port: 143 },
-  imaps: { srvPrefix: "_imaps._tcp", port: 993 },
+  dns: { protocol: "udp", port: 53 },
+  ldap: { protocol: "tcp", port: 389 },
+  http: { protocol: "tcp", port: 80 },
+  https: { protocol: "tcp", port: 443 },
+  rtsp: { protocol: "tcp", port: 554 },
+  smtp: { protocol: "tcp", port: 25 },
+  ssh: { protocol: "tcp", port: 22 },
+  imap: { protocol: "tcp", port: 143 },
+  imaps: { protocol: "tcp", port: 993 },
   dhcp: {}
 };
 
@@ -941,8 +942,15 @@ export class Service extends Base {
     return this;
   }
 
+  get protocol() {
+    return ServiceTypes[this.type]?.protocol;
+  }
+
   get srvPrefix() {
-    return ServiceTypes[this.type]?.srvPrefix;
+    const st = ServiceTypes[this.type];
+    if (st) {
+      return `_${this.type}._${st.protocol}`;
+    }
   }
 
   get ipAddress() {
@@ -973,6 +981,8 @@ export class Service extends Base {
     return [
       ...super.propertyNames,
       "ipAddress",
+      "port",
+      "protocol",
       "alias",
       "type",
       "master",

package/types/model.d.mts

@@ -135,7 +135,8 @@ export class Subnet extends Base {
 }
 export class Service extends Base {
     alias: any;
-    get srvPrefix(): any;
+    get protocol(): any;
+    get srvPrefix(): string;
     get ipAddress(): any;
     get port(): any;
     get priority(): any;