pmcf 2.33.0 → 2.33.2

package/package.json

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

package/src/cluster.mjs

@@ -147,7 +147,7 @@ export class Cluster extends Host {
           cfg.push(`  protocol ${service.protocol.toUpperCase()}`);
 
           for (const member of this.members) {
-            const memberService = member.findService({ type: service.type });
+            const memberService = member.findService({ type: service.type }) || member.host.findService({ type: service.type }); // TODO
 
             cfg.push(`  real_server ${member.address} ${memberService.port} {`);
             cfg.push(`    weight ${memberService.weight}`);

package/src/network-interfaces/skeleton.mjs

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { NetworkAddress } from "pmcf";
+import { NetworkAddress, Host } from "pmcf";
 import { ServiceOwner } from "../service-owner.mjs";
 import { cidrAddresses } from "../network-support.mjs";
 
@@ -29,7 +29,9 @@ export class SkeletonNetworkInterface extends ServiceOwner {
   }
 
   get host() {
-    return this.owner;
+    if(this.owner instanceof Host) {
+      return this.owner;
+    }
   }
 
   *hosts() {

package/src/service.mjs

@@ -1,5 +1,5 @@
 import { isLocalhost } from "ip-utilties";
-import { Base, Endpoint } from "pmcf";
+import { Base, Host, Endpoint } from "pmcf";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.mjs";
@@ -149,7 +149,9 @@ export class Service extends Base {
   }
 
   get host() {
-    return this.owner;
+    if(this.owner instanceof Host) {
+      return this.owner;
+    }
   }
 
   *hosts() {

package/types/network-interfaces/network-interface.d.mts

@@ -331,7 +331,6 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     get gatewayAddress(): any;
     set hostName(value: any);
     get hostName(): any;
-    get domainNames(): any;
     set scope(value: any);
     get scope(): any;
     set hwaddr(value: any);

package/types/network-interfaces/skeleton.d.mts

@@ -4,6 +4,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     get typeName(): string;
     set extends(value: any[]);
     get extends(): any[];
+    get host(): Host;
     hosts(): Generator<any, void, any>;
     get network_interface(): this;
     get domainNames(): Set<any>;
@@ -24,4 +25,5 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     systemdDefinitions(packageData: any): Promise<void>;
 }
 import { ServiceOwner } from "../service-owner.mjs";
+import { Host } from "pmcf";
 import { NetworkAddress } from "pmcf";

package/types/service.d.mts

@@ -305,13 +305,14 @@ export class Service extends Base {
     _extends: any[];
     set extends(value: any[]);
     get extends(): any[];
+    get host(): Host;
     hosts(): Generator<any, void, any>;
     get domainName(): any;
     get ipAddressOrDomainName(): any;
     get addresses(): any;
     get address(): any;
     set ipAddresses(value: any);
-    get networks(): any;
+    get networks(): Set<any>;
     endpoints(filter: any): any[];
     set alias(value: any);
     get alias(): any;
@@ -333,3 +334,4 @@ export class Service extends Base {
 }
 export function sortByPriority(a: any, b: any): number;
 import { Base } from "pmcf";
+import { Host } from "pmcf";