pmcf 2.13.2 → 2.14.1

package/package.json

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

package/src/service.mjs

@@ -166,19 +166,26 @@ export class Service extends Base {
   }
 
   get endpoints() {
-    if (!ServiceTypes[this.type]) {
-      return [
-        new Endpoint(this, {
-          rawAddress: this.rawAddress,
-          port: this._port,
-          tls: false
-        })
-      ];
-    }
+    const local = this._port === undefined ? {} : { port: this._port };
 
-    return ServiceTypes[this.type].endpoints.map(
-      e => new Endpoint(this, { 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();
   }
 
   set alias(value) {
@@ -232,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(
@@ -286,10 +295,29 @@ export class Service extends Base {
 }
 
 export class Endpoint {
-  constructor(service, data) {
+  constructor(service, networkInterface, data) {
     this.service = service;
+    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

@@ -267,7 +267,7 @@ export class Service extends Base {
     set ipAddresses(value: any);
     get addresses(): any;
     get networks(): any;
-    get endpoints(): any;
+    get endpoints(): any[];
     set alias(value: any);
     get alias(): any;
     set port(value: any);
@@ -285,8 +285,14 @@ export class Service extends Base {
     }[];
 }
 export class Endpoint {
-    constructor(service: any, data: any);
+    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";