pmcf 3.14.2 → 3.14.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.14.2",
+  "version": "3.14.3",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "ip-utilties": "^1.4.12",
-    "npm-pkgbuild": "^19.0.2",
+    "npm-pkgbuild": "^19.0.3",
     "pacc": "^4.41.1",
     "package-directory": "^8.1.0"
   },

package/src/endpoint.mjs

@@ -23,6 +23,9 @@ class BaseEndpoint {
   }
 }
 
+/**
+ * Endpoint with an ip port
+ */
 class PortEndpoint extends BaseEndpoint {
   _port;
   constructor(service, data) {
@@ -108,6 +111,9 @@ export class DomainNameEndpoint extends PortEndpoint {
   }
 }
 
+/**
+ * Endpoint based on http
+ */
 export class HTTPEndpoint extends BaseEndpoint {
   constructor(service, address, data) {
     super(service, data);

package/src/network-address.mjs

@@ -1,6 +1,7 @@
 import { familyIP, formatCIDR, decodeIP } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 import { Owner } from "pmcf";
+import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
 
 /**
  *
@@ -10,6 +11,12 @@ export class NetworkAddress {
   /** @type {NetworkInterface} */ networkInterface;
   /** @type {string|Uint8Array|Uint16Array} */ address;
 
+  /**
+   * 
+   * @param {NetworkInterface} networkInterface 
+   * @param {string|Uint8Array|Uint16Array} address 
+   * @param {Subnet} subnet 
+   */
   constructor(networkInterface, address, subnet) {
     this.networkInterface = networkInterface;
     this.address = address;
@@ -34,9 +41,9 @@ export class NetworkAddress {
 }
 
 /**
- * 
- * @param {Iterable<Owner|string>} sources 
- * @param {Object} options 
+ *
+ * @param {Iterable<Owner|string>} sources
+ * @param {Object} options
  * @param {boolean} options.aggregate
  * @param {Object} options.filter
  * @returns {Iterable<string>} addresses
@@ -46,7 +53,7 @@ export function addresses(sources, options) {
     ...new Set(
       [...sources]
         .map(s => {
-          if(typeof s === "string") {
+          if (typeof s === "string") {
             return s;
           }
           if (options?.aggregate && s instanceof Owner && s.subnets) {
@@ -58,11 +65,18 @@ export function addresses(sources, options) {
             : s;
         })
         .flat()
-        .map(object => typeof object === "string" ? object : decodeIP(object.address))
+        .map(object =>
+          typeof object === "string" ? object : decodeIP(object.address)
+        )
     )
   ];
 }
 
+/**
+ * 
+ * @param {Array<NetworkAddress>} networkAddresses 
+ * @returns {Array<string>}
+ */
 export function cidrAddresses(networkAddresses) {
   return [...networkAddresses].map(na => na.cidrAddress);
 }

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

@@ -134,7 +134,9 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
   get domainNames() {
     return this.hostName
-      ? new Set([[this.hostName, this.host.domain].join(".")])
+      ? this.host.directDomainNames.union(
+          new Set([[this.hostName, this.host.domain].join(".")])
+        )
       : this.host.directDomainNames;
   }
 

package/src/services/bind.mjs

@@ -468,21 +468,23 @@ export class BindService extends ExtraSourceService {
               }
 
               for (const domainName of domainNames) {
-                zone.records.add(
-                  DNSRecord(
-                    dnsFullName(domainName),
-                    dnsRecordTypeForAddressFamily(family),
-                    address
-                  )
-                );
-
-                reverseZone.records.add(
-                  DNSRecord(
-                    dnsFullName(reverseArpa(address)),
-                    "PTR",
-                    dnsFullName(domainName)
-                  )
-                );
+                if (domainName[0] != "*") {
+                  zone.records.add(
+                    DNSRecord(
+                      dnsFullName(domainName),
+                      dnsRecordTypeForAddressFamily(family),
+                      address
+                    )
+                  );
+
+                  reverseZone.records.add(
+                    DNSRecord(
+                      dnsFullName(reverseArpa(address)),
+                      "PTR",
+                      dnsFullName(domainName)
+                    )
+                  );
+                }
               }
             }
 

package/src/utils.mjs

@@ -45,6 +45,12 @@ export async function writeLines(dir, name, lines) {
   return writeFile(join(dir, name), data, "utf8");
 }
 
+/**
+ * 
+ * @param {string} sectionName 
+ * @param {Object} values 
+ * @returns {Array<string>}
+ */
 export function sectionLines(sectionName, values) {
   const lines = [`[${sectionName}]`];
 
@@ -59,10 +65,18 @@ export function bridgeToJSON(bridge) {
   return [...bridge].map(n => n.fullName || `(${n})`).sort();
 }
 
+/**
+ * @param {any} value 
+ * @returns {Array<any>}
+ */
 export function asArray(value) {
   return Array.isArray(value) ? value : value === undefined ? [] : [value];
 }
 
+/**
+ * @param {any} value 
+ * @returns {Iterable<any>}
+ */
 export function asIterator(value) {
   switch (typeof value) {
     case "undefined":

package/types/endpoint.d.mts

@@ -15,6 +15,9 @@ export class DomainNameEndpoint extends PortEndpoint {
     get address(): any;
     get isPool(): boolean;
 }
+/**
+ * Endpoint based on http
+ */
 export class HTTPEndpoint extends BaseEndpoint {
     constructor(service: any, address: any, data: any);
     url: URL;
@@ -36,6 +39,9 @@ export class UnixEndpoint extends BaseEndpoint {
     get host(): any;
     get address(): any;
 }
+/**
+ * Endpoint with an ip port
+ */
 declare class PortEndpoint extends BaseEndpoint {
     _port: any;
     protocol: any;

package/types/network-address.d.mts

@@ -10,20 +10,32 @@ export function addresses(sources: Iterable<Owner | string>, options: {
     aggregate: boolean;
     filter: any;
 }): Iterable<string>;
-export function cidrAddresses(networkAddresses: any): any[];
+/**
+ *
+ * @param {Array<NetworkAddress>} networkAddresses
+ * @returns {Array<string>}
+ */
+export function cidrAddresses(networkAddresses: Array<NetworkAddress>): Array<string>;
 export function sortByFamilyAndAddress(a: any, b: any): any;
 /**
  *
  */
 export class NetworkAddress {
-    constructor(networkInterface: any, address: any, subnet: any);
+    /**
+     *
+     * @param {NetworkInterface} networkInterface
+     * @param {string|Uint8Array|Uint16Array} address
+     * @param {Subnet} subnet
+     */
+    constructor(networkInterface: NetworkInterface, address: string | Uint8Array | Uint16Array, subnet: Subnet);
     /** @type {Subnet} */ subnet: Subnet;
     /** @type {NetworkInterface} */ networkInterface: NetworkInterface;
     /** @type {string|Uint8Array|Uint16Array} */ address: string | Uint8Array | Uint16Array;
-    get domainNames(): any;
+    get domainNames(): Set<any>;
     get family(): any;
     get cidrAddress(): any;
     toString(): string;
 }
 import { Owner } from "pmcf";
 import { Subnet } from "./subnet.mjs";
+import { NetworkInterface } from "./network-interfaces/network-interface.mjs";

package/types/utils.d.mts

@@ -1,7 +1,21 @@
 export function domainName(name: any, defaultDomain: any): any;
 export function domainFromDominName(domainName: any, defaultDomain: any): any;
 export function writeLines(dir: any, name: any, lines: any): Promise<void>;
-export function sectionLines(sectionName: any, values: any): string[];
+/**
+ *
+ * @param {string} sectionName
+ * @param {Object} values
+ * @returns {Array<string>}
+ */
+export function sectionLines(sectionName: string, values: any): Array<string>;
 export function bridgeToJSON(bridge: any): any[];
-export function asArray(value: any): any[];
-export function asIterator(value: any): any;
+/**
+ * @param {any} value
+ * @returns {Array<any>}
+ */
+export function asArray(value: any): Array<any>;
+/**
+ * @param {any} value
+ * @returns {Iterable<any>}
+ */
+export function asIterator(value: any): Iterable<any>;