pmcf 6.28.0 → 6.28.2

package/package.json

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

package/src/common-attributes.mjs

@@ -8,7 +8,9 @@ import {
   string_attribute,
   integer_attribute_writable,
   hostname_attribute as hostname_attribute_base,
-  boolean_attribute_writable
+  boolean_attribute_writable,
+  boolean_attribute_false,
+  port_attribute_writable
 } from "pacc";
 
 export const networkAddressType = "network|host|network_interface";
@@ -83,6 +85,12 @@ export const subnets_attribute = {
   backpointer: owner_attribute
 };
 
+export const subnet_attribute = {
+  ...default_attribute_writable,
+  name: "subnet",
+  type: "subnet"
+};
+
 export const bridges_attribute = {
   ...networks_attribute,
   name: "bridges",
@@ -142,3 +150,16 @@ export const networkAddressAttributes = {
   addresses: { ...string_collection_attribute_writable, name: "addresses" },
   address: { ...string_attribute_writable, name: "address" }
 };
+
+export const endpointAttributes = {
+  port: port_attribute_writable,
+  protocol: {
+    ...string_attribute_writable,
+    name: "protocol",
+    values: new Set(["tcp", "udp", "quic"])
+  },
+  types: { ...string_set_attribute_writable, name: "types" },
+  tls: { ...boolean_attribute_false, name: "tls" },
+  address: { ...string_attribute, name: "address" }
+};
+

package/src/core-service.mjs

@@ -1,11 +1,7 @@
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
-  string_attribute,
   string_attribute_writable,
   number_attribute_writable,
-  string_set_attribute_writable,
-  boolean_attribute_false,
-  port_attribute_writable,
   priority_attribute
 } from "pacc";
 import {
@@ -14,7 +10,7 @@ import {
   Endpoint,
   DomainNameEndpoint,
   HTTPEndpoint,
-  UnixEndpoint,
+  unix_endpoint,
   addType,
   FAMILY_UNIX,
   FAMILY_DNS
@@ -22,7 +18,8 @@ import {
 import { asArray } from "./utils.mjs";
 import {
   networkAddressAttributes,
-  extends_attribute
+  extends_attribute,
+  endpointAttributes
 } from "./common-attributes.mjs";
 import {
   serviceTypeEndpoints,
@@ -37,18 +34,6 @@ import {
   dnsPriority
 } from "./dns-utils.mjs";
 
-export const endpointAttributes = {
-  port: port_attribute_writable,
-  protocol: {
-    ...string_attribute_writable,
-    name: "protocol",
-    values: new Set(["tcp", "udp", "quic"])
-  },
-  types: { ...string_set_attribute_writable, name: "types" },
-  tls: { ...boolean_attribute_false, name: "tls" },
-  address: { ...string_attribute, name: "address" }
-};
-
 export class CoreService extends Base {
   static name = "core-service";
   static priority = 1.1;
@@ -137,7 +122,7 @@ export class CoreService extends Base {
     for (const e of data) {
       switch (e.family) {
         case FAMILY_UNIX:
-          result.push(new UnixEndpoint(this, e.path, e));
+          result.push(new unix_endpoint(this, e.path, e));
           break;
 
         case undefined:

package/src/endpoint.mjs

@@ -1,8 +1,8 @@
 import { getAttribute, string_attribute, url_attribute } from "pacc";
 import { FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "pmcf";
-import { endpointAttributes, CoreService } from "./core-service.mjs";
-import { family_attribute } from "./common-attributes.mjs";
+import { CoreService } from "./core-service.mjs";
+import { family_attribute, endpointAttributes } from "./common-attributes.mjs";
 
 export const FAMILY_UNIX = "unix";
 export const FAMILY_DNS = "dns";
@@ -240,8 +240,7 @@ export class HTTPEndpoint extends BaseEndpoint {
   }
 }
 
-export class UnixEndpoint extends BaseEndpoint {
-  static name = "unix_endpoint";
+export class unix_endpoint extends BaseEndpoint {
   static attributes = {
     url: url_attribute
   };

package/src/network-address.mjs

@@ -1,7 +1,6 @@
 import {
   default_attribute,
   string_attribute,
-  name_attribute,
   type_attribute,
   getAttribute
 } from "pacc";
@@ -9,7 +8,7 @@ import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 import { Owner, addType } from "pmcf";
 import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
-import { family_attribute } from "./common-attributes.mjs";
+import { family_attribute, subnet_attribute } from "./common-attributes.mjs";
 
 /**
  *
@@ -19,7 +18,7 @@ export class NetworkAddress {
   static priority = 1;
   static key = "address";
   static attributes = {
-    address: { ...name_attribute, name: "address" },
+    address: { ...string_attribute, name: "address" },
     type: type_attribute,
     cidrAddress: { ...string_attribute, name: "cidrAddress" },
     networkInterface: {
@@ -27,7 +26,8 @@ export class NetworkAddress {
       name: "networkInterface",
       type: "network_interface"
     },
-    family: family_attribute
+    family: family_attribute,
+    subnet: subnet_attribute
   };
 
   static {

package/src/services/bind.mjs

@@ -369,11 +369,7 @@ class bind_group extends Base {
         const address = na.address;
         const host = na.host;
 
-        if (host === undefined) {
-          console.log("NO HOST", na);
-        }
-
-        if (!addresses.has(address)) {
+        if (host && !addresses.has(address)) {
           addresses.add(address);
 
           const locationName = host.owner.name;
@@ -403,7 +399,7 @@ class bind_group extends Base {
                   )
               );
 
-            if (host && !hosts.has(host)) {
+            if (!hosts.has(host)) {
               hosts.add(host);
 
               for (let foreignDomain of host.foreignDomainNames) {