pmcf 6.65.4 → 6.66.0

package/package.json

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

package/src/core-service.mjs

@@ -171,7 +171,7 @@ export class CoreService extends base {
               continue;
             }
 
-            if (e.pathname) {
+            if (e.scheme || e.pathname) {
               result.push(new HTTPEndpoint(this, na, options));
             } else {
               result.push(new Endpoint(this, na, options));

package/src/endpoint.mjs

@@ -174,7 +174,8 @@ export class DomainNameEndpoint extends PortEndpoint {
 export class HTTPEndpoint extends BaseEndpoint {
   static name = "url_endpoint";
   static attributes = {
-    url: url_attribute
+    url: url_attribute,
+    addressType: { ...string_attribute, name: "addressType" }
   };
 
   static {
@@ -186,6 +187,7 @@ export class HTTPEndpoint extends BaseEndpoint {
    * @param {Service} service
    * @param {string|URL} address
    * @param {object} data
+   * @param {string} data.scheme
    * @param {number} data.port
    * @param {string} data.pathname
    * @param {string} data.family
@@ -198,18 +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";
+
+      const domainName = [...address.domainNames][0];
+      const hostname =
+        domainName ??
+        (data.family === FAMILY_IPV6
+          ? "[" + address.address + "]"
+          : address.address);
+
       this.url = new URL(
-        (data.tls ? "https://" : "http://") +
-          (data.family === FAMILY_IPV6
-            ? "[" + address.address + "]"
-            : address.address) +
-          ":" +
-          data.port +
-          (data.pathname ?? "/")
+        `${scheme}://${hostname}:${data.port}` + (data.pathname ?? "/")
       );
-      this.hostname = address.address;
+      this.hostname = domainName ?? address.address;
     }
   }
 
@@ -236,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:");
   }

package/src/services/openldap.mjs

@@ -10,7 +10,7 @@ export class openldap extends CoreService {
     systemdService: "slapd.service",
     systemUserName: "ldap",
     systemGroupName: "ldap",
-    extends: ["ldap", "ldapi"]
+    extends: ["ldap", "ldaps", "ldapi"]
   };
 
   static {