pmcf 2.14.0 → 2.14.1

package/package.json

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

package/src/service.mjs

@@ -166,28 +166,26 @@ export class Service extends Base {
   }
 
   get endpoints() {
-    const nis = [...this.server.networkInterfaces.values()];
-
-    if (!ServiceTypes[this.type]) {
-      return nis.map(
-        networkInterface =>
-          new Endpoint(this, networkInterface, {
-            rawAddress: this.rawAddress,
-            port: this._port,
-            tls: false
-          })
-      );
-    }
+    const local = this._port === undefined ? {} : { port: this._port };
 
-    return nis.map(networkInterface =>
-      ServiceTypes[this.type].endpoints.map(
-        e =>
-          new Endpoint(this, networkInterface, {
-            rawAddress: this.rawAddress,
-            ...e
-          })
+    const data = ServiceTypes[this.type]?.endpoints || [
+      {
+        tls: false
+      }
+    ];
+
+    return [...this.server.networkAddresses()]
+      .map(sa =>
+        data.map(
+          d =>
+            new Endpoint(this, sa.networkInterface, {
+              ...d,
+              rawAddress: sa.address,
+              ...local
+            })
+        )
       )
-    ).flat();
+      .flat();
   }
 
   set alias(value) {
@@ -241,7 +239,9 @@ export class Service extends Base {
     }
 
     if (hasSVRRecords) {
-      for (const ep of this.endpoints.filter(e => e.protocol)) {
+      for (const ep of this.endpoints.filter(
+        e => e.protocol && e.networkInterface.scope !== "host" // TODO how to identify related interfaces
+      )) {
         records.push(
           DNSRecord(
             dnsFullName(
@@ -300,6 +300,24 @@ export class Endpoint {
     this.networkInterface = networkInterface;
     Object.assign(this, data);
   }
+
+  toString() {
+    return `${this.rawAddress}[${this.port}]`;
+  }
+
+  get hostName() {
+    return this.networkInterface.hostName;
+  }
+
+  #rawAddress;
+
+  get rawAddress() {
+    return this.#rawAddress ?? this.networkInterface.rawAddress;
+  }
+
+  set rawAddress(value) {
+    this.#rawAddress = value;
+  }
 }
 
 export const sortByPriority = (a, b) => a.priority - b.priority;

package/types/service.d.mts

@@ -288,6 +288,11 @@ export class Endpoint {
     constructor(service: any, networkInterface: any, data: any);
     service: any;
     networkInterface: any;
+    toString(): string;
+    get hostName(): any;
+    set rawAddress(value: any);
+    get rawAddress(): any;
+    #private;
 }
 export function sortByPriority(a: any, b: any): number;
 import { Base } from "./base.mjs";