pmcf 6.65.5 → 6.66.1

package/package.json

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

package/src/constants.mjs

@@ -7,4 +7,5 @@ export const PROTOCOL_QUIC = "quic";
 export const FAMILY_UNIX = "unix";
 export const FAMILY_DNS = "dns";
 export const FAMILY_IPV4_IPV6 = new Set([FAMILY_IPV4, FAMILY_IPV6]);
+export const FAMILY_DNS_IPV4_IPV6 = new Set([FAMILY_DNS, FAMILY_IPV4, FAMILY_IPV6]);
 

package/src/core-service.mjs

@@ -145,6 +145,8 @@ export class CoreService extends base {
       filter = undefined;
     }
 
+    const seen = new Set();
+
     for (const e of data) {
       if (type && e.type.name !== type) {
         continue;
@@ -172,7 +174,11 @@ export class CoreService extends base {
             }
 
             if (e.scheme || e.pathname) {
-              result.push(new HTTPEndpoint(this, na, options));
+              const he = new HTTPEndpoint(this, na, options);
+              if (!seen.has(he.url.toString())) {
+                seen.add(he.url.toString());
+                result.push(he);
+              }
             } else {
               result.push(new Endpoint(this, na, options));
             }

package/src/endpoint.mjs

@@ -169,12 +169,13 @@ export class DomainNameEndpoint extends PortEndpoint {
 }
 
 /**
- * Endpoint based on http
+ * Endpoint based on url
  */
 export class HTTPEndpoint extends BaseEndpoint {
   static name = "url_endpoint";
   static attributes = {
-    url: url_attribute
+    url: url_attribute,
+    addressType: { ...string_attribute, name: "addressType" }
   };
 
   static {
@@ -199,21 +200,22 @@ export class HTTPEndpoint extends BaseEndpoint {
     } else if (address instanceof URL) {
       this.url = address;
     } else {
+      this.networkAddress = address;
       this.family = data.family ?? address.family;
 
-      const scheme = data.scheme ?
-        `${data.scheme}://` :
-        (data.tls ? "https://" : "http://");
-
-      this.url = new URL(scheme +
-          (data.family === FAMILY_IPV6
-            ? "[" + address.address + "]"
-            : address.address) +
-          ":" +
-          data.port +
-          (data.pathname ?? "/")
+      const scheme = data.scheme ? data.scheme : data.tls ? "https" : "http";
+
+      const domainName = [...address.domainNames][0];
+      const hostname =
+        domainName ??
+        (data.family === FAMILY_IPV6
+          ? "[" + address.address + "]"
+          : address.address);
+
+      this.url = new URL(
+        `${scheme}://${hostname}:${data.port}` + (data.pathname ?? "/")
       );
-      this.hostname = address.address;
+      this.hostname = domainName ?? address.address;
     }
   }
 
@@ -240,6 +242,10 @@ export class HTTPEndpoint extends BaseEndpoint {
     return PROTOCOL_TCP;
   }
 
+  get addressType() {
+    return this.networkAddress?.type;
+  }
+
   get tls() {
     return this.url.toString().startsWith("https:");
   }