@jsenv/https-local 3.2.43 → 3.3.0

package/README.md

@@ -1,82 +1,77 @@
-# HTTPS Local [![npm package](https://img.shields.io/npm/v/@jsenv/https-local.svg?logo=npm&label=package)](https://www.npmjs.com/package/@jsenv/https-local)
-
-A programmatic way to generate locally trusted certificates for HTTPS development.
-
-🔒 Generate certificates trusted by your operating system and browsers  
-🌐 Perfect for local HTTPS development  
-🖥️ Works on macOS, Linux, and Windows  
-⚡ Simple API for certificate management
-
-## Table of Contents
-
-- [HTTPS Local ](#https-local-)
-  - [Table of Contents](#table-of-contents)
-  - [Quick Start](#quick-start)
-  - [How to Use](#how-to-use)
-    - [1. Install the Root Certificate](#1-install-the-root-certificate)
-    - [2. Request Certificate for Your Server](#2-request-certificate-for-your-server)
-    - [3. Start the Server](#3-start-the-server)
-  - [Certificate Expiration](#certificate-expiration)
-  - [JavaScript API](#javascript-api)
-    - [requestCertificate](#requestcertificate)
-    - [verifyHostsFile](#verifyhostsfile)
-      - [Auto Update Hosts](#auto-update-hosts)
-    - [installCertificateAuthority](#installcertificateauthority)
-      - [Auto Trust](#auto-trust)
-
-## Quick Start
+# https local [![npm package](https://img.shields.io/npm/v/@jsenv/https-local.svg?logo=npm&label=package)](https://www.npmjs.com/package/@jsenv/https-local)
 
-```console
-# Install the package
-npm install @jsenv/https-local
+MOVED TO https://github.com/jsenv/core/tree/main/packages/independent/https-local
+
+A programmatic way to generate locally trusted certificates.
+
+Generate certificate(s) trusted by your operating system and browsers.
+This certificate can be used to start your development server in HTTPS.
+Works on mac, linux and windows.
+
+# How to use
+
+1 - Install _@jsenv/https-local_
 
-# Install and trust the root certificate
-npx @jsenv/https-local install --trust
+```console
+npm install --save-dev @jsenv/https-local
 ```
 
+2 - Create _install_certificate_authority.mjs_
+
 ```js
-// In your server file
-import { createServer } from "node:https";
-import { requestCertificate } from "@jsenv/https-local";
+/*
+ * This file needs to be executed once.
+ * After that the root certificate is valid for 20 years.
+ * Re-executing this file will log the current root certificate validity and trust status.
+ * Re-executing this file 20 years later would reinstall a root certificate and re-trust it.
+ *
+ * Read more in https://github.com/jsenv/https-local#installCertificateAuthority
+ */
+
+import {
+  installCertificateAuthority,
+  verifyHostsFile,
+} from "@jsenv/https-local";
 
-const { certificate, privateKey } = requestCertificate();
-const server = createServer(
-  {
-    cert: certificate,
-    key: privateKey,
-  },
-  (request, response) => {
-    response.end("Hello HTTPS world!");
+await installCertificateAuthority({
+  tryToTrust: true,
+  NSSDynamicInstall: true,
+});
+await verifyHostsFile({
+  ipMappings: {
+    "127.0.0.1": ["localhost"],
   },
-).listen(8443, () => {
-  console.log("HTTPS server running at https://localhost:8443");
+  tryToUpdatesHostsFile: true,
 });
 ```
 
-## How to Use
-
-The following steps can be taken to start a local server in HTTPS:
-
-### 1. Install the Root Certificate
+3 - Run with node
 
 ```console
-npx @jsenv/https-local install --trust
+node ./install_certificate_authority.mjs
 ```
 
-This will install a root certificate valid for 20 years.
-
-- Re-executing this command will log the current root certificate validity and trust status
-- Re-executing this command 20 years later would reinstall a root certificate and re-trust it
-
-### 2. Request Certificate for Your Server
-
-_start_dev_server.mjs_
+4 - Create _start_dev_server.mjs_
 
 ```js
+/*
+ * This file uses "@jsenv/https-local" to obtain a certificate used to start a server in https.
+ * The certificate is valid for 1 year (396 days) and is issued by a certificate authority trusted on this machine.
+ * If the certificate authority was not installed before executing this file, an error is thrown
+ * explaining that certificate authority must be installed first.
+ *
+ * To install the certificate authority, you can use the following command
+ *
+ * > node ./install_certificate_authority.mjs
+ *
+ * Read more in https://github.com/jsenv/https-local#requestCertificate
+ */
+
 import { createServer } from "node:https";
 import { requestCertificate } from "@jsenv/https-local";
 
 const { certificate, privateKey } = requestCertificate();
+
 const server = createServer(
   {
     cert: certificate,
@@ -96,156 +91,31 @@ server.listen(8080);
 console.log(`Server listening at https://local.example:8080`);
 ```
 
-### 3. Start the Server
+5 - Start server with node
 
 ```console
 node ./start_dev_server.mjs
 ```
 
-At this stage you have a server running in HTTPS.
+At this stage you have a server running in https.
+The rest of this documentation goes into more details.
 
-## Certificate Expiration
+# Certificate expiration
 
 | Certificate | Expires after | How to renew?                        |
 | ----------- | ------------- | ------------------------------------ |
 | server      | 1 year        | Re-run _requestCertificate_          |
-| authority   | 20 years      | Re-run _installCertificateAuthority_ |
+| authority   | 20 year       | Re-run _installCertificateAuthority_ |
 
-The **server certificate** expires after one year, which is the maximum duration allowed by web browsers.
+The **server certificate** expires after one year which is the maximum duration allowed by web browsers.
 In the unlikely scenario where a local server is running for more than a year without interruption, restart it to re-run requestCertificate.
 
-The **authority root certificate** expires after 20 years, which is close to the maximum allowed duration.
-In the very unlikely scenario where you are using the same machine for more than 20 years, re-execute [installCertificateAuthority](#installcertificateauthority) to update certificate authority then restart your server.
-
-## JavaScript API
-
-### requestCertificate
-
-The `requestCertificate` function returns a certificate and private key that can be used to start a server in HTTPS.
-
-```js
-import { createServer } from "node:https";
-import { requestCertificate } from "@jsenv/https-local";
-
-const { certificate, privateKey } = requestCertificate({
-  altNames: ["localhost", "local.example"],
-});
-```
-
-[installCertificateAuthority](#installcertificateauthority) must be called before this function.
-
-### verifyHostsFile
-
-This function is not mandatory to obtain the HTTPS certificates, but it is useful to programmatically verify IP mappings that are important for your local server are present in hosts file.
-
-```js
-import { verifyHostsFile } from "@jsenv/https-local";
-
-await verifyHostsFile({
-  ipMappings: {
-    "127.0.0.1": ["localhost", "local.example"],
-  },
-});
-```
-
-Find below logs written in terminal when this function is executed:
-
-<details>
-  <summary>Mac and Linux output</summary>
-
-```console
-> node ./verify_hosts.mjs
-
-Check hosts file content...
-⚠ 1 mapping is missing in hosts file
---- hosts file path ---
-/etc/hosts
---- line(s) to add ---
-127.0.0.1 localhost local.example
-```
-
-</details>
-
-<details>
-  <summary>Windows output</summary>
-
-```console
-> node ./verify_hosts.mjs
-
-Check hosts file content...
-⚠ 1 mapping is missing in hosts file
---- hosts file path ---
-C:\\Windows\\System32\\Drivers\\etc\\hosts
---- line(s) to add ---
-127.0.0.1 localhost local.example
-```
-
-</details>
-
-#### Auto Update Hosts
-
-It's possible to update hosts file programmatically using `tryToUpdateHostsFile`:
-
-```js
-import { verifyHostsFile } from "@jsenv/https-local";
-
-await verifyHostsFile({
-  ipMappings: {
-    "127.0.0.1": ["localhost", "local.example"],
-  },
-  tryToUpdateHostsFile: true,
-});
-```
-
-<details>
-  <summary>Mac and Linux output</summary>
-
-```console
-Check hosts file content...
-ℹ 1 mapping is missing in hosts file
-Adding 1 mapping(s) in hosts file...
-❯ echo "127.0.0.1 local.example" | sudo tee -a /etc/hosts
-Password:
-✔ mappings added to hosts file
-```
-
-_Second execution logs_
-
-```console
-> node ./verify_hosts.mjs
-
-Check hosts file content...
-✔ all ip mappings found in hosts file
-```
-
-</details>
-
-<details>
-  <summary>Windows output</summary>
-
-```console
-Check hosts file content...
-ℹ 1 mapping is missing in hosts file
-Adding 1 mapping(s) in hosts file...
-❯ (echo 127.0.0.1 local.example) >> C:\\Windows\\System32\\Drivers\\etc\\hosts
-Password:
-✔ mappings added to hosts file
-```
-
-_Second execution logs_
+The **authority root certificate** expires after 20 years which is close to the maximum allowed duration.
+In the very unlikely scenario where you are using the same machine for more than 20 years, re-execute [installCertificateAuthority](#installCertificateAuthority) to update certificate authority then restart your server.
 
-```console
-> node ./verify_hosts.mjs
+# installCertificateAuthority
 
-Check hosts file content...
-✔ all ip mappings found in hosts file
-```
-
-</details>
-
-### installCertificateAuthority
-
-The `installCertificateAuthority` function generates a certificate authority valid for 20 years.
+_installCertificateAuthority_ function generates a certificate authority valid for 20 years.
 This certificate authority is needed to generate local certificates that will be trusted by the operating system and web browsers.
 
 ```js
@@ -254,10 +124,12 @@ import { installCertificateAuthority } from "@jsenv/https-local";
 await installCertificateAuthority();
 ```
 
-By default, trusting authority root certificate is a manual process. This manual process is documented in [BenMorel/dev-certificates#Import the CA in your browser](https://github.com/BenMorel/dev-certificates/tree/c10cd68945da772f31815b7a36721ddf848ff3a3#import-the-ca-in-your-browser). This process can be done programmatically as explained in [Auto Trust](#auto-trust).
+By default, trusting authority root certificate is a manual process. This manual process is documented in [BenMorel/dev-certificates#Import the CA in your browser](https://github.com/BenMorel/dev-certificates/tree/c10cd68945da772f31815b7a36721ddf848ff3a3#import-the-ca-in-your-browser). This process can be done programmatically as explained in [Auto trust](#Auto-trust).
+
+Find below logs written in terminal when this function is executed.
 
 <details>
-  <summary>macOS output</summary>
+  <summary>mac</summary>
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -269,7 +141,7 @@ Generating authority root certificate with a validity of 20 years...
 ℹ You should add root certificate to firefox
 ```
 
-_Second execution logs_
+_second execution logs_
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -288,7 +160,7 @@ Check if certificate is in firefox...
 </details>
 
 <details>
-  <summary>Linux output</summary>
+  <summary>linux</summary>
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -301,7 +173,7 @@ Generating authority root certificate with a validity of 20 years...
 ℹ You should add certificate to firefox
 ```
 
-_Second execution logs_
+_second execution logs_
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -322,7 +194,7 @@ Check if certificate is in firefox...
 </details>
 
 <details>
-  <summary>Windows output</summary>
+  <summary>windows</summary>
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -334,7 +206,7 @@ Generating authority root certificate with a validity of 20 years...
 ℹ You should add certificate to firefox
 ```
 
-_Second execution logs_
+_second execution logs_
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -352,9 +224,9 @@ Check if certificate is trusted by firefox...
 
 </details>
 
-#### Auto Trust
+## Auto trust
 
-It's possible to trust root certificate programmatically using `tryToTrust`:
+It's possible to trust root certificate programmatically using _tryToTrust_
 
 ```js
 import { installCertificateAuthority } from "@jsenv/https-local";
@@ -365,7 +237,7 @@ await installCertificateAuthority({
 ```
 
 <details>
-  <summary>macOS output</summary>
+  <summary>mac</summary>
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -381,7 +253,7 @@ Adding certificate to firefox...
 ✔ certificate added to Firefox
 ```
 
-_Second execution logs_
+_second execution logs_
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -400,7 +272,7 @@ Check if certificate is in Firefox...
 </details>
 
 <details>
-  <summary>Linux output</summary>
+  <summary>linux</summary>
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -427,7 +299,7 @@ Adding certificate to firefox...
 ✔ certificate added to firefox
 ```
 
-_Second execution logs_
+_second execution logs_
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -448,7 +320,7 @@ Check if certificate is in firefox...
 </details>
 
 <details>
-  <summary>Windows output</summary>
+  <summary>windows</summary>
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -467,7 +339,7 @@ Check if certificate is trusted by firefox...
 ℹ unable to detect if certificate is trusted by firefox (not implemented on windows)
 ```
 
-_Second execution logs_
+_second execution logs_
 
 ```console
 > node ./install_certificate_authority.mjs
@@ -484,3 +356,128 @@ Check if certificate is trusted by firefox...
 ```
 
 </details>
+
+# requestCertificate
+
+_requestCertificate_ function returns a certificate and private key that can be used to start a server in HTTPS.
+
+```js
+import { createServer } from "node:https";
+import { requestCertificate } from "@jsenv/https-local";
+
+const { certificate, privateKey } = requestCertificate({
+  altNames: ["localhost", "local.example"],
+});
+```
+
+[installCertificateAuthority](#installCertificateAuthority) must be called before this function.
+
+# verifyHostsFile
+
+This function is not mandatory to obtain the https certificates.
+But it is useful to programmatically verify ip mappings that are important for your local server are present in hosts file.
+
+```js
+import { verifyHostsFile } from "@jsenv/https-local";
+
+await verifyHostsFile({
+  ipMappings: {
+    "127.0.0.1": ["localhost", "local.example"],
+  },
+});
+```
+
+Find below logs written in terminal when this function is executed.
+
+<details>
+  <summary>mac and linux</summary>
+
+```console
+> node ./verify_hosts.mjs
+
+Check hosts file content...
+⚠ 1 mapping is missing in hosts file
+--- hosts file path ---
+/etc/hosts
+--- line(s) to add ---
+127.0.0.1 localhost local.example
+```
+
+</details>
+
+<details>
+  <summary>windows</summary>
+
+```console
+> node ./verify_hosts.mjs
+
+Check hosts file content...
+⚠ 1 mapping is missing in hosts file
+--- hosts file path ---
+C:\\Windows\\System32\\Drivers\\etc\\hosts
+--- line(s) to add ---
+127.0.0.1 localhost local.example
+```
+
+</details>
+
+## Auto update hosts
+
+It's possible to update hosts file programmatically using _tryToUpdateHostsFile_.
+
+```js
+import { verifyHostsFile } from "@jsenv/https-local";
+
+await verifyHostsFile({
+  ipMappings: {
+    "127.0.0.1": ["localhost", "local.example"],
+  },
+  tryToUpdateHostsFile: true,
+});
+```
+
+<details>
+  <summary>mac and linux</summary>
+
+```console
+Check hosts file content...
+ℹ 1 mapping is missing in hosts file
+Adding 1 mapping(s) in hosts file...
+❯ echo "127.0.0.1 local.example" | sudo tee -a /etc/hosts
+Password:
+✔ mappings added to hosts file
+```
+
+_Second execution logs_
+
+```console
+> node ./verify_hosts.mjs
+
+Check hosts file content...
+✔ all ip mappings found in hosts file
+```
+
+</details>
+
+<details>
+  <summary>windows</summary>
+
+```console
+Check hosts file content...
+ℹ 1 mapping is missing in hosts file
+Adding 1 mapping(s) in hosts file...
+❯ (echo 127.0.0.1 local.example) >> C:\\Windows\\System32\\Drivers\\etc\\hosts
+Password:
+✔ mappings added to hosts file
+```
+
+_Second execution logs_
+
+```console
+> node ./verify_hosts.mjs
+
+Check hosts file content...
+✔ all ip mappings found in hosts file
+```
+
+</details>

package/package.json

@@ -1,57 +1,75 @@
 {
   "name": "@jsenv/https-local",
-  "version": "3.2.43",
+  "version": "3.3.0",
+  "type": "module",
   "description": "A programmatic way to generate locally trusted certificates",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jsenv/core",
-    "directory": "packages/tooling/https-local"
+    "url": "https://github.com/jsenv/https-local"
+  },
+  "author": {
+    "name": "dmail",
+    "email": "dmaillard06@gmail.com"
   },
   "license": "MIT",
-  "type": "module",
+  "engines": {
+    "node": ">=25.0.0"
+  },
+  "main": "./src/main.js",
   "exports": {
     ".": {
       "import": "./src/main.js"
     },
     "./*": "./*"
   },
-  "main": "./src/main.js",
-  "bin": "./src/https_local_cli.mjs",
   "files": [
     "/src/"
   ],
   "scripts": {
+    "eslint": "npx eslint . --ext=.js,.mjs,.cjs",
+    "test": "node ./scripts/test/test.mjs",
+    "performance": "node --expose-gc ./scripts/performance/performance.mjs  --local --log",
+    "test:start-node-server": "node ./scripts/certificate/start_node_server.mjs",
     "ca:install": "node ./scripts/certificate/install_ca.mjs",
     "ca:log-trust": "node ./scripts/certificate/log_root_certificate_trust.mjs",
     "ca:trust": "node ./scripts/certificate/trust_root_certificate.mjs",
-    "ca:uninstall": "node ./scripts/certificate/uninstall_certificate_authority.mjs",
     "ca:untrust": "node ./scripts/certificate/untrust_root_certificate.mjs",
+    "ca:uninstall": "node ./scripts/certificate/uninstall_certificate_authority.mjs",
     "hosts:add-localhost-mappings": "node ./scripts/hosts/add_localhost_mappings.mjs",
-    "hosts:ensure-localhost-mappings": "node ./scripts/hosts/ensure_localhost_mappings.mjs",
     "hosts:remove-localhost-mappings": "node ./scripts/hosts/remove_localhost_mappings.mjs",
     "hosts:verify-localhost-mappings": "node ./scripts/hosts/verify_localhost_mappings.mjs",
-    "performance": "node --expose-gc ./scripts/performance/performance.mjs  --local --log",
-    "test:start-node-server": "node ./scripts/certificate/start_node_server.mjs"
+    "hosts:ensure-localhost-mappings": "node ./scripts/hosts/ensure_localhost_mappings.mjs",
+    "prettier": "prettier --write .",
+    "playwright:install": "npx playwright install-deps && npx playwright install"
   },
   "dependencies": {
-    "@jsenv/filesystem": "4.15.14",
-    "@jsenv/humanize": "1.7.5",
-    "@jsenv/urls": "2.9.7",
+    "@jsenv/filesystem": "4.15.15",
+    "@jsenv/log": "3.5.2",
+    "@jsenv/urls": "2.9.8",
     "command-exists": "1.2.9",
-    "node-forge": "1.3.3",
+    "node-forge": "1.4.0",
     "sudo-prompt": "9.2.1",
-    "which": "6.0.0"
+    "which": "6.0.1"
   },
   "devDependencies": {
-    "@jsenv/assert": "../assert",
-    "@jsenv/https-local": "./",
-    "@jsenv/performance-impact": "../performance-impact",
-    "playwright": "1.58.1"
-  },
-  "engines": {
-    "node": ">=20.0.0"
+    "@jsenv/assert": "4.5.6",
+    "@jsenv/eslint-config-relax": "1.8.5",
+    "@jsenv/github-release-package": "1.6.42",
+    "@jsenv/package-publish": "1.11.44",
+    "@jsenv/performance-impact": "4.4.42",
+    "@jsenv/test": "3.7.21",
+    "eslint": "9.39.2",
+    "playwright": "1.59.1",
+    "prettier": "3.8.3",
+    "prettier-plugin-embed": "0.5.1",
+    "prettier-plugin-organize-imports": "4.3.0",
+    "prettier-plugin-pkg": "0.22.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "volta": {
+    "node": "25.8.1",
+    "npm": "11.6.2"
   }
 }

package/src/certificate_authority.js

@@ -1,5 +1,6 @@
 import { readFile, removeEntry, writeFile } from "@jsenv/filesystem";
-import { UNICODE, createDetailedMessage, createLogger } from "@jsenv/humanize";
+import { UNICODE, createDetailedMessage, createLogger } from "@jsenv/log";
+
 import { getAuthorityFileInfos } from "./internal/authority_file_infos.js";
 import { attributeDescriptionFromAttributeArray } from "./internal/certificate_data_converter.js";
 import { createAuthorityRootCertificate } from "./internal/certificate_generator.js";
@@ -212,7 +213,7 @@ export const installCertificateAuthority = async ({
       certificateValidityDurationInMs,
     },
   );
-  if (rootCertificateDifferences.length) {
+  if (Object.keys(rootCertificateDifferences).length) {
     const paramNames = Object.keys(rootCertificateDifferences);
     logger.info(
       `${UNICODE.INFO} certificate attributes are outdated: ${paramNames}`,
@@ -326,13 +327,13 @@ export const uninstallCertificateAuthority = async ({
       const rootCertificateCommonName = attributeDescriptionFromAttributeArray(
         rootCertificateForgeObject.subject.attributes,
       ).commonName;
-      const platformMethods = await importPlatformMethods();
-      await platformMethods.executeTrustQuery({
+      const { removeCertificateFromTrustStores } =
+        await importPlatformMethods();
+      await removeCertificateFromTrustStores({
         logger,
-        certificateCommonName: rootCertificateCommonName,
-        certificateFileUrl: rootCertificateFileInfo.url,
         certificate: rootCertificate,
-        verb: "REMOVE_TRUST",
+        certificateFileUrl: rootCertificateFileInfo.url,
+        certificateCommonName: rootCertificateCommonName,
       });
     }
     filesToRemove.push(rootCertificateFileInfo.url);

package/src/certificate_request.js

@@ -1,6 +1,7 @@
 import { writeFileSync } from "@jsenv/filesystem";
-import { UNICODE, createDetailedMessage, createLogger } from "@jsenv/humanize";
+import { UNICODE, createDetailedMessage, createLogger } from "@jsenv/log";
 import { readFileSync } from "node:fs";
+
 import { getAuthorityFileInfos } from "./internal/authority_file_infos.js";
 import { requestCertificateFromAuthority } from "./internal/certificate_generator.js";
 import { forge } from "./internal/forge.js";
@@ -46,9 +47,7 @@ export const requestCertificate = ({
   } = getAuthorityFileInfos();
   if (!rootCertificateFileInfo.exists) {
     throw new Error(
-      `Certificate authority not found, "installCertificateAuthority" must be called before "requestServerCertificate".
---- Suggested command to run ---
-npx @jsenv/https-local install --trust`,
+      `Certificate authority not found, "installCertificateAuthority" must be called before "requestServerCertificate"`,
     );
   }
   if (!rootCertificatePrivateKeyFileInfo.exists) {
@@ -85,6 +84,7 @@ npx @jsenv/https-local install --trust`,
   logger.debug(`Generating server certificate...`);
   const { certificateForgeObject, certificatePrivateKeyForgeObject } =
     requestCertificateFromAuthority({
+      logger,
       authorityCertificateForgeObject: rootCertificateForgeObject,
       auhtorityCertificatePrivateKeyForgeObject:
         rootCertificatePrivateKeyForgeObject,

package/src/hosts_file_verif.js

@@ -1,4 +1,5 @@
-import { createDetailedMessage, createLogger, UNICODE } from "@jsenv/humanize";
+import { createDetailedMessage, createLogger, UNICODE } from "@jsenv/log";
+
 import {
   HOSTS_FILE_PATH,
   parseHosts,

package/src/internal/authority_file_infos.js

@@ -1,5 +1,6 @@
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+
 import { getCertificateAuthorityFileUrls } from "./certificate_authority_file_urls.js";
 
 export const getAuthorityFileInfos = () => {

package/src/internal/hosts/parse_hosts.js

@@ -8,8 +8,9 @@ export const parseHosts = (
   const lines = [];
   hosts.split(/\r?\n/).forEach((line) => {
     const lineWithoutComments = line.replace(/#.*/, "");
-    // eslint-disable-next-line regexp/no-super-linear-backtracking
-    const matches = /^\s*?(.+?)\s+(.+?)\s*$/.exec(lineWithoutComments);
+    const matches = /^\s*(\S+)\s+(\S+(?:\s+\S+)*)\s*$/.exec(
+      lineWithoutComments,
+    );
     if (matches && matches.length === 3) {
       const [, ip, host] = matches;
       const hostnames = host.split(" ");

package/src/internal/hosts/read_hosts.js

@@ -1,4 +1,5 @@
 import { readFile } from "@jsenv/filesystem";
+
 import { HOSTS_FILE_PATH } from "./hosts_utils.js";
 
 export const readHostsFile = async (hostsFilePath = HOSTS_FILE_PATH) => {

package/src/internal/hosts/write_hosts.js

@@ -1,5 +1,7 @@
 import { createRequire } from "node:module";
+
 import { exec } from "../exec.js";
+
 import { HOSTS_FILE_PATH } from "./hosts_utils.js";
 
 export const writeHostsFile = async (

package/src/internal/hosts/write_line_hosts.js

@@ -1,6 +1,8 @@
 import { readFile } from "@jsenv/filesystem";
 import { createRequire } from "node:module";
+
 import { exec } from "../exec.js";
+
 import { HOSTS_FILE_PATH } from "./hosts_utils.js";
 
 export const writeLineInHostsFile = async (

package/src/internal/linux/chrome_linux.js

@@ -1,6 +1,7 @@
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem";
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
 import { execSync } from "node:child_process";
+
 import { executeTrustQueryOnBrowserNSSDB } from "../nssdb_browser.js";
 import {
   detectIfNSSIsInstalled,

package/src/internal/linux/firefox_linux.js

@@ -1,6 +1,7 @@
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem";
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
 import { execSync } from "node:child_process";
+
 import { executeTrustQueryOnBrowserNSSDB } from "../nssdb_browser.js";
 import {
   detectIfNSSIsInstalled,

package/src/internal/linux/linux.js

@@ -13,6 +13,7 @@ export const executeTrustQuery = async ({
 }) => {
   const linuxTrustInfo = await executeTrustQueryOnLinux({
     logger,
+    certificateCommonName,
     certificateFileUrl,
     certificateIsNew,
     certificate,

package/src/internal/linux/linux_trust_store.js

@@ -3,9 +3,10 @@
  */
 
 import { readFile } from "@jsenv/filesystem";
-import { createDetailedMessage, UNICODE } from "@jsenv/humanize";
+import { createDetailedMessage, UNICODE } from "@jsenv/log";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+
 import { exec } from "../exec.js";
 import {
   VERB_ADD_TRUST,

package/src/internal/linux/nss_linux.js

@@ -1,6 +1,7 @@
 // https://github.com/FiloSottile/mkcert/issues/447
 
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
+
 import { exec } from "../exec.js";
 import { memoize } from "../memoize.js";
 

package/src/internal/mac/chrome_mac.js

@@ -1,5 +1,6 @@
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
 import { existsSync } from "node:fs";
+
 import { memoize } from "../memoize.js";
 
 const REASON_CHROME_NOT_DETECTED = `Chrome not detected`;

package/src/internal/mac/firefox_mac.js

@@ -1,6 +1,7 @@
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem";
-import { UNICODE, createTaskLog } from "@jsenv/humanize";
+import { UNICODE, createTaskLog } from "@jsenv/log";
 import { execSync } from "node:child_process";
+
 import { executeTrustQueryOnBrowserNSSDB } from "../nssdb_browser.js";
 import {
   detectIfNSSIsInstalled,

package/src/internal/mac/mac.js

@@ -44,6 +44,7 @@ export const executeTrustQuery = async ({
   });
 
   const safariTrustInfo = await executeTrustQueryOnSafari({
+    logger,
     // safari needs macTrustInfo because it uses OS trust store
     macTrustInfo,
   });

package/src/internal/mac/mac_keychain.js

@@ -1,7 +1,8 @@
 // https://ss64.com/osx/security.html
 
-import { createDetailedMessage, UNICODE } from "@jsenv/humanize";
+import { createDetailedMessage, UNICODE } from "@jsenv/log";
 import { fileURLToPath } from "node:url";
+
 import { exec } from "../exec.js";
 import { searchCertificateInCommandOutput } from "../search_certificate_in_command_output.js";
 import {

package/src/internal/mac/nss_mac.js

@@ -1,6 +1,7 @@
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem";
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
 import { fileURLToPath } from "node:url";
+
 import { commandExists } from "../command.js";
 import { exec } from "../exec.js";
 import { memoize } from "../memoize.js";

package/src/internal/nssdb_browser.js

@@ -7,10 +7,11 @@ import {
   assertAndNormalizeDirectoryUrl,
   collectFiles,
 } from "@jsenv/filesystem";
-import { createDetailedMessage, UNICODE } from "@jsenv/humanize";
+import { createDetailedMessage, UNICODE } from "@jsenv/log";
 import { urlToFilename } from "@jsenv/urls";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+
 import { detectBrowser } from "./browser_detection.js";
 import { exec } from "./exec.js";
 import { searchCertificateInCommandOutput } from "./search_certificate_in_command_output.js";

package/src/internal/unsupported_platform/unsupported_platform.js

@@ -1,4 +1,4 @@
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
 
 const platformTrustInfo = {
   status: "unknown",

package/src/internal/windows/chrome_windows.js

@@ -1,6 +1,7 @@
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
 import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
+
 import { memoize } from "../memoize.js";
 
 const require = createRequire(import.meta.url);

package/src/internal/windows/firefox_windows.js

@@ -3,9 +3,10 @@
  * - A way to install and use NSS command on windows to update firefox NSS dabatase file
  */
 
-import { UNICODE } from "@jsenv/humanize";
+import { UNICODE } from "@jsenv/log";
 import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
+
 import { memoize } from "../memoize.js";
 
 const require = createRequire(import.meta.url);

package/src/internal/windows/windows.js

@@ -14,6 +14,7 @@ export const executeTrustQuery = async ({
   certificateCommonName,
   certificateFileUrl,
   certificateIsNew,
+  certificate,
   verb,
 }) => {
   const windowsTrustInfo = await executeTrustQueryOnWindows({
@@ -21,6 +22,7 @@ export const executeTrustQuery = async ({
     certificateCommonName,
     certificateFileUrl,
     certificateIsNew,
+    certificate,
     verb,
   });
 

package/src/internal/windows/windows_certutil.js

@@ -3,8 +3,9 @@
  * https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/certutil
  */
 
-import { createDetailedMessage, UNICODE } from "@jsenv/humanize";
+import { createDetailedMessage, UNICODE } from "@jsenv/log";
 import { fileURLToPath } from "node:url";
+
 import { exec } from "../exec.js";
 import {
   VERB_ADD_TRUST,

package/src/main.js

@@ -12,9 +12,12 @@ export {
   installCertificateAuthority,
   uninstallCertificateAuthority,
 } from "./certificate_authority.js";
-export { requestCertificate } from "./certificate_request.js";
-export { verifyHostsFile } from "./hosts_file_verif.js";
+
 export {
   createValidityDurationOfXDays,
   createValidityDurationOfXYears,
 } from "./validity_duration.js";
+
+export { verifyHostsFile } from "./hosts_file_verif.js";
+
+export { requestCertificate } from "./certificate_request.js";

package/src/https_local_cli.mjs

@@ -1,89 +0,0 @@
-#!/usr/bin/env node
-
-import {
-  installCertificateAuthority,
-  uninstallCertificateAuthority,
-  verifyHostsFile,
-} from "@jsenv/https-local";
-import { parseArgs } from "node:util";
-
-const options = {
-  help: {
-    type: "boolean",
-  },
-  trust: {
-    type: "boolean",
-  },
-};
-const { values, positionals } = parseArgs({
-  options,
-  allowPositionals: true,
-});
-
-if (values.help || positionals.length === 0) {
-  console.log(`https-local: Generate https certificates to use on your machine.
-
-Usage: 
-
-npx @jsenv/https-local setup
-  Install root certificate, try to trust it and ensure localhost is mapped to 127.0.0.1
-
-npx @jsenv/https-local install --trust
-  Install root certificate on the filesystem
-  - trust: Try to add root certificate to os and browser trusted stores.
-
-npx @jsenv/https-local uninstall
-  Uninstall root certificate from the filesystem
-
-npx @jsenv/https-local localhost-mapping
-  Ensure localhost mapping to 127.0.0.1 is set on the filesystem
-
-https://github.com/jsenv/core/tree/main/packages/tooling/https-local
-
-`);
-
-  process.exit(0);
-}
-
-const commandHandlers = {
-  setup: async () => {
-    await installCertificateAuthority({
-      tryToTrust: true,
-      NSSDynamicInstall: true,
-    });
-    await verifyHostsFile({
-      ipMappings: {
-        "127.0.0.1": ["localhost"],
-      },
-      tryToUpdateHostsFile: true,
-    });
-  },
-  install: async ({ trust }) => {
-    await installCertificateAuthority({
-      tryToTrust: trust,
-      NSSDynamicInstall: trust,
-    });
-  },
-  uninstall: async () => {
-    await uninstallCertificateAuthority({
-      tryToUntrust: true,
-    });
-  },
-  ["localhost-mapping"]: async () => {
-    await verifyHostsFile({
-      ipMappings: {
-        "127.0.0.1": ["localhost"],
-      },
-      tryToUpdateHostsFile: true,
-    });
-  },
-};
-
-const [command] = positionals;
-const commandHandler = commandHandlers[command];
-if (!commandHandler) {
-  console.error(`Error: unknown command ${command}.`);
-  process.exit(1);
-}
-
-await commandHandler(values);