pmcf 2.35.1 → 2.35.3

package/package.json

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

package/src/host.mjs

@@ -1,8 +1,8 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { ServiceOwner, Base } from "pmcf";
-import { networkAddressProperties, addresses } from "./network-support.mjs";
+import { ServiceOwner, Base, addresses } from "pmcf";
+import { networkAddressProperties } from "./network-support.mjs";
 import {
   domainFromDominName,
   domainName,

package/src/network-address.mjs

@@ -31,3 +31,17 @@ export class NetworkAddress {
     return `${this.networkInterface.fullName} ${decodeIP(this.address)}`;
   }
 }
+
+export function addresses(networkAddresses) {
+  return [
+    ...new Set(
+      [...networkAddresses].map(object =>
+        /*object?.name ||*/ decodeIP(object.address)
+      )
+    )
+  ];
+}
+
+export function cidrAddresses(networkAddresses) {
+  return [...networkAddresses].map(na => na.cidrAddress);
+}

package/src/network-interfaces/network-interface.mjs

@@ -1,13 +1,12 @@
 import { join } from "node:path";
 import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
-import { Base } from "pmcf";
+import { Base, cidrAddresses } from "pmcf";
 import {
   networkProperties,
   networkAddressProperties
 } from "../network-support.mjs";
 import { asArray, writeLines, sectionLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
-import { cidrAddresses } from "../network-support.mjs";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 
 export const NetworkInterfaceTypeDefinition = {

package/src/network-interfaces/skeleton.mjs

@@ -1,8 +1,7 @@
 import { join } from "node:path";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { NetworkAddress, Host } from "pmcf";
+import { NetworkAddress, Host, cidrAddresses } from "pmcf";
 import { ServiceOwner } from "../service-owner.mjs";
-import { cidrAddresses } from "../network-support.mjs";
 
 export class SkeletonNetworkInterface extends ServiceOwner {
   _extends = [];

package/src/network-support.mjs

@@ -38,11 +38,3 @@ export const networkAddressProperties = {
   addresses: { type: "string", collection: true, writeable: false },
   address: { type: "string", collection: false, writeable: false }
 };
-
-export function addresses(networkAddresses) {
-  return [...networkAddresses].map(na => na.address);
-}
-
-export function cidrAddresses(networkAddresses) {
-  return [...networkAddresses].map(na => na.cidrAddress);
-}

package/src/service.mjs

@@ -106,7 +106,6 @@ export const ServiceTypeDefinition = {
   properties: {
     ...networkAddressProperties,
     ...endpointProperties,
-    ipAddresses: { type: "string", collection: true, writeable: true },
     alias: { type: "string", collection: false, writeable: true },
     weight: { type: "number", collection: false, writeable: true, default: 1 },
     systemd: { type: "string", collection: true, writeable: true }
@@ -118,7 +117,6 @@ export class Service extends Base {
   _weight;
   _type;
   _port;
-  _ipAddresses;
   _systemd;
   _extends = [];
 
@@ -165,18 +163,6 @@ export class Service extends Base {
     return this.address ?? this.domainName;
   }
 
-  get addresses() {
-    return this._ipAddresses ?? this.owner.addresses;
-  }
-
-  get address() {
-    return this._ipAddresses?.[0] ?? this.host.address;
-  }
-
-  set ipAddresses(value) {
-    this._ipAddresses = value;
-  }
-
   get networks() {
     return this.host.networks;
   }

package/src/services/dns.mjs

@@ -1,19 +1,23 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isLinkLocal, reverseArpa, decodeIP } from "ip-utilties";
-import { writeLines } from "../utils.mjs";
+import { isLinkLocal, reverseArpa } from "ip-utilties";
+import { writeLines, asArray } from "../utils.mjs";
 import {
   DNSRecord,
   dnsFullName,
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
-import { ExtraSourceService, Endpoint, serviceEndpoints } from "pmcf";
+import {
+  ExtraSourceService,
+  Endpoint,
+  serviceEndpoints,
+  addresses
+} from "pmcf";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
-import { addresses } from "../network-support.mjs";
 import { addHook } from "../hooks.mjs";
 
 const address_types = ["network", "host", "network_interface"];
@@ -87,23 +91,8 @@ const statisticsEndpoint = {
   tls: false
 };
 
-function addressList(objects) {
-  return Array.from(objects).map(object => {
-    switch (typeof object) {
-      case "string":
-        return object;
-      case "object":
-        if (object.name) {
-          return object.name;
-        }
-
-        return decodeIP(object);
-    }
-  });
-}
-
 function addressesStatement(prefix, objects, generateEmpty = false) {
-  const body = addressList(objects).map(name => `  ${name};`);
+  const body = asArray(objects).map(name => `  ${name};`);
 
   if (body.length || generateEmpty) {
     return [`${prefix} {`, body, "};"];
@@ -235,8 +224,11 @@ export class DNSService extends ExtraSourceService {
 
     const acls = [
       addressesStatement("acl trusted", addresses(this.trusted)),
-      addressesStatement("acl protected", addresses(this.protected)),
-      addressesStatement("acl open", addresses(this.open), true)
+      addressesStatement("acl open", addresses(this.open), true),
+      addressesStatement("acl protected", [
+        ...addresses(this.protected),
+        "!open"
+      ])
     ].flat();
 
     if (acls.length) {

package/types/extra-source-service.d.mts

@@ -69,11 +69,6 @@ export class ExtraSourceService extends Service {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;

package/types/network-address.d.mts

@@ -1,3 +1,5 @@
+export function addresses(networkAddresses: any): any[];
+export function cidrAddresses(networkAddresses: any): any[];
 /**
  *
  */

package/types/network-support.d.mts

@@ -1,5 +1,3 @@
-export function addresses(networkAddresses: any): any[];
-export function cidrAddresses(networkAddresses: any): any[];
 export namespace networkProperties {
     export namespace scope {
         export let type: string;

package/types/service.d.mts

@@ -100,11 +100,6 @@ export namespace ServiceTypeDefinition {
     export { specializations_1 as specializations };
     export function factoryFor(owner: any, value: any): any;
     export let properties: {
-        ipAddresses: {
-            type: string;
-            collection: boolean;
-            writeable: boolean;
-        };
         alias: {
             type: string;
             collection: boolean;
@@ -225,11 +220,6 @@ export class Service extends Base {
         specializations: {};
         factoryFor(owner: any, value: any): any;
         properties: {
-            ipAddresses: {
-                type: string;
-                collection: boolean;
-                writeable: boolean;
-            };
             alias: {
                 type: string;
                 collection: boolean;
@@ -299,7 +289,6 @@ export class Service extends Base {
     _weight: any;
     _type: any;
     _port: any;
-    _ipAddresses: any;
     _systemd: any;
     _extends: any[];
     set extends(value: any[]);
@@ -308,9 +297,6 @@ export class Service extends Base {
     hosts(): Generator<any, void, any>;
     get domainName(): any;
     get ipAddressOrDomainName(): any;
-    get addresses(): any;
-    get address(): any;
-    set ipAddresses(value: any);
     get networks(): Set<any>;
     endpoints(filter: any): any[];
     set alias(value: any);

package/types/services/dhcp.d.mts

@@ -55,11 +55,6 @@ export class DHCPService extends Service {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;
@@ -180,11 +175,6 @@ export class DHCPService extends Service {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;

package/types/services/dns.d.mts

@@ -55,11 +55,6 @@ export class DNSService extends ExtraSourceService {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;
@@ -183,11 +178,6 @@ export class DNSService extends ExtraSourceService {
                 specializations: {};
                 factoryFor(owner: any, value: any): any;
                 properties: {
-                    ipAddresses: {
-                        type: string;
-                        collection: boolean;
-                        writeable: boolean;
-                    };
                     alias: {
                         type: string;
                         collection: boolean;

package/types/services/ntp.d.mts

@@ -55,11 +55,6 @@ export class NTPService extends ExtraSourceService {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;
@@ -183,11 +178,6 @@ export class NTPService extends ExtraSourceService {
                 specializations: {};
                 factoryFor(owner: any, value: any): any;
                 properties: {
-                    ipAddresses: {
-                        type: string;
-                        collection: boolean;
-                        writeable: boolean;
-                    };
                     alias: {
                         type: string;
                         collection: boolean;

package/types/services/systemd-journal.d.mts

@@ -55,11 +55,6 @@ export class SystemdJournalService extends Service {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;
@@ -180,11 +175,6 @@ export class SystemdJournalService extends Service {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;

package/types/services/systemd-resolved.d.mts

@@ -55,11 +55,6 @@ export class SystemdResolvedService extends ExtraSourceService {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;
@@ -180,11 +175,6 @@ export class SystemdResolvedService extends ExtraSourceService {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;

package/types/services/systemd-timesyncd.d.mts

@@ -55,11 +55,6 @@ export class SystemdTimesyncdService extends ExtraSourceService {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;
@@ -180,11 +175,6 @@ export class SystemdTimesyncdService extends ExtraSourceService {
             specializations: {};
             factoryFor(owner: any, value: any): any;
             properties: {
-                ipAddresses: {
-                    type: string;
-                    collection: boolean;
-                    writeable: boolean;
-                };
                 alias: {
                     type: string;
                     collection: boolean;