node-opcua-pki 6.16.0 → 6.18.0

package/dist/index.js

@@ -210,32 +210,11 @@ var import_node_child_process = __toESM(require("child_process"));
 var import_node_fs2 = __toESM(require("fs"));
 var import_node_os = __toESM(require("os"));
 var import_node_path2 = __toESM(require("path"));
-var import_node_url = __toESM(require("url"));
+var import_promises = require("stream/promises");
 var import_byline = __toESM(require("byline"));
 var import_chalk2 = __toESM(require("chalk"));
-var import_progress = __toESM(require("progress"));
-var import_wget_improved_2 = __toESM(require("wget-improved-2"));
 var import_yauzl = __toESM(require("yauzl"));
 var doDebug2 = process.env.NODEOPCUAPKIDEBUG || false;
-function makeOptions() {
-  const proxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy || void 0;
-  if (proxy) {
-    const a = new import_node_url.default.URL(proxy);
-    const auth = a.username ? `${a.username}:${a.password}` : void 0;
-    const options = {
-      proxy: {
-        port: a.port ? parseInt(a.port, 10) : 80,
-        protocol: a.protocol.replace(":", ""),
-        host: a.hostname ?? "",
-        proxyAuth: auth
-      }
-    };
-    warningLog(import_chalk2.default.green("- using proxy "), proxy);
-    warningLog(options);
-    return options;
-  }
-  return {};
-}
 async function execute(cmd, cwd) {
   let output = "";
   const options = {
@@ -269,7 +248,7 @@ function quote2(str) {
   return `"${str.replace(/\\/g, "/")}"`;
 }
 function is_expected_openssl_version(strVersion) {
-  return !!strVersion.match(/OpenSSL 1|3/);
+  return !!strVersion.match(/OpenSSL \d/);
 }
 async function getopensslExecPath() {
   let result1;
@@ -348,6 +327,31 @@ async function install_and_check_win32_openssl_version() {
       };
     }
   }
+  async function find_system_openssl_win32() {
+    try {
+      const result = await execute("where openssl");
+      if (result.exitCode !== 0) {
+        return void 0;
+      }
+      const opensslPath2 = result.output.split(/\r?\n/)[0].trim();
+      if (!opensslPath2 || !import_node_fs2.default.existsSync(opensslPath2)) {
+        return void 0;
+      }
+      const q4 = quote2(opensslPath2);
+      const versionResult = await execute(`${q4} version`);
+      const version = versionResult.output.trim();
+      if (versionResult.exitCode === 0 && is_expected_openssl_version(version)) {
+        warningLog(
+          import_chalk2.default.green("Using system OpenSSL: ") + import_chalk2.default.cyan(version) + import_chalk2.default.green(" at ") + import_chalk2.default.cyan(opensslPath2)
+        );
+        return opensslPath2;
+      }
+      warningLog(import_chalk2.default.yellow("System OpenSSL found but version not accepted: ") + version);
+      return void 0;
+    } catch (_err) {
+      return void 0;
+    }
+  }
   function win32or64() {
     if (process.env.PROCESSOR_ARCHITECTURE === "x86" && process.env.PROCESSOR_ARCHITEW6432) {
       return 64;
@@ -361,37 +365,39 @@ async function install_and_check_win32_openssl_version() {
     return 32;
   }
   async function download_openssl() {
-    const url2 = win32or64() === 64 ? "https://github.com/node-opcua/node-opcua-pki/releases/download/2.14.2/openssl-1.0.2u-x64_86-win64.zip" : "https://github.com/node-opcua/node-opcua-pki/releases/download/2.14.2/openssl-1.0.2u-i386-win32.zip";
-    const outputFilename = import_node_path2.default.join(downloadFolder, import_node_path2.default.basename(url2));
-    warningLog(`downloading ${import_chalk2.default.yellow(url2)} to ${outputFilename}`);
+    const url = win32or64() === 64 ? "https://github.com/node-opcua/node-opcua-pki/releases/download/2.14.2/openssl-1.0.2u-x64_86-win64.zip" : "https://github.com/node-opcua/node-opcua-pki/releases/download/2.14.2/openssl-1.0.2u-i386-win32.zip";
+    const outputFilename = import_node_path2.default.join(downloadFolder, import_node_path2.default.basename(url));
+    warningLog(`downloading ${import_chalk2.default.yellow(url)} to ${outputFilename}`);
     if (import_node_fs2.default.existsSync(outputFilename)) {
       return { downloadedFile: outputFilename };
     }
-    const options = makeOptions();
-    const bar = new import_progress.default(import_chalk2.default.cyan("[:bar]") + import_chalk2.default.cyan(" :percent ") + import_chalk2.default.white(":etas"), {
-      complete: "=",
-      incomplete: " ",
-      total: 100,
-      width: 100
-    });
-    return await new Promise((resolve, reject) => {
-      const download = import_wget_improved_2.default.download(url2, outputFilename, options);
-      download.on("error", (err) => {
-        warningLog(err);
-        setImmediate(() => {
-          reject(err);
-        });
-      });
-      download.on("end", (output) => {
-        if (doDebug2) {
-          warningLog(output);
+    const response = await fetch(url, { redirect: "follow" });
+    if (!response.ok || !response.body) {
+      throw new Error(`Failed to download OpenSSL from ${url}: ${response.status} ${response.statusText}`);
+    }
+    const contentLength = parseInt(response.headers.get("content-length") || "0", 10);
+    let downloaded = 0;
+    let lastPercent = -1;
+    const fileStream = import_node_fs2.default.createWriteStream(outputFilename);
+    const body = response.body;
+    body.on("data", (chunk) => {
+      downloaded += chunk.length;
+      if (contentLength > 0) {
+        const percent = Math.floor(downloaded / contentLength * 100);
+        if (percent !== lastPercent && percent % 10 === 0) {
+          lastPercent = percent;
+          warningLog(`  download progress: ${percent}%`);
         }
-        resolve({ downloadedFile: outputFilename });
-      });
-      download.on("progress", (progress) => {
-        bar.update(progress);
-      });
+      }
     });
+    await (0, import_promises.pipeline)(body, fileStream);
+    const stat = import_node_fs2.default.statSync(outputFilename);
+    if (stat.size === 0) {
+      import_node_fs2.default.unlinkSync(outputFilename);
+      throw new Error(`Downloaded file is empty: ${outputFilename}`);
+    }
+    warningLog(import_chalk2.default.green("Download complete: ") + `${stat.size} bytes`);
+    return { downloadedFile: outputFilename };
   }
   async function unzip_openssl(zipFilename) {
     const opensslFolder2 = get_openssl_folder_win32();
@@ -440,6 +446,10 @@ async function install_and_check_win32_openssl_version() {
       });
     });
   }
+  const systemOpenssl = await find_system_openssl_win32();
+  if (systemOpenssl) {
+    return systemOpenssl;
+  }
   const opensslFolder = get_openssl_folder_win32();
   const opensslExecPath = get_openssl_exec_path_win32();
   if (!import_node_fs2.default.existsSync(opensslFolder)) {
@@ -1028,32 +1038,32 @@ function parseOpenSSLDate(dateStr) {
   const sec = raw.substring(10, 12);
   return `${year}-${month}-${day}T${hour}:${min}:${sec}Z`;
 }
-function validateRevocationUrl(url2, fieldName) {
-  if (url2 === void 0) {
+function validateRevocationUrl(url, fieldName) {
+  if (url === void 0) {
     return void 0;
   }
-  if (url2 === "") {
+  if (url === "") {
     throw new Error(`${fieldName} must not be empty \u2014 pass undefined to disable the extension`);
   }
   let parsed;
   try {
-    parsed = new URL(url2);
+    parsed = new URL(url);
   } catch {
-    throw new Error(`${fieldName} is not a valid URL: ${url2}`);
+    throw new Error(`${fieldName} is not a valid URL: ${url}`);
   }
   if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-    throw new Error(`${fieldName} must use http: or https: (got ${parsed.protocol} in ${url2})`);
+    throw new Error(`${fieldName} must use http: or https: (got ${parsed.protocol} in ${url})`);
   }
   if (!parsed.pathname || parsed.pathname === "/") {
-    throw new Error(`${fieldName} must include a path component (got ${url2})`);
+    throw new Error(`${fieldName} must include a path component (got ${url})`);
   }
   const isLoopback = parsed.hostname === "localhost" || parsed.hostname === "::1" || parsed.hostname.startsWith("127.");
   if (isLoopback) {
     console.warn(
-      `[node-opcua-pki] ${fieldName} points at loopback (${url2}) \u2014 certificates issued with this URL will be unreachable from any other host.`
+      `[node-opcua-pki] ${fieldName} points at loopback (${url}) \u2014 certificates issued with this URL will be unreachable from any other host.`
     );
   }
-  return url2;
+  return url;
 }
 var CertificateAuthority = class {
   /** RSA key size used when generating the CA private key. */
@@ -1115,8 +1125,8 @@ var CertificateAuthority = class {
    *
    * @see US-202
    */
-  setCrlDistributionUrl(url2) {
-    this._crlDistributionUrl = validateRevocationUrl(url2, "crlDistributionUrl");
+  setCrlDistributionUrl(url) {
+    this._crlDistributionUrl = validateRevocationUrl(url, "crlDistributionUrl");
   }
   /**
    * Configure the OCSP responder URL embedded as the `OCSP` leg of
@@ -1125,8 +1135,8 @@ var CertificateAuthority = class {
    *
    * @see US-202
    */
-  setOcspResponderUrl(url2) {
-    this._ocspResponderUrl = validateRevocationUrl(url2, "ocspResponderUrl");
+  setOcspResponderUrl(url) {
+    this._ocspResponderUrl = validateRevocationUrl(url, "ocspResponderUrl");
   }
   /**
    * Configure the caIssuers URL embedded as the `caIssuers` leg of
@@ -1135,8 +1145,8 @@ var CertificateAuthority = class {
    *
    * @see US-202
    */
-  setCaIssuersUrl(url2) {
-    this._caIssuersUrl = validateRevocationUrl(url2, "caIssuersUrl");
+  setCaIssuersUrl(url) {
+    this._caIssuersUrl = validateRevocationUrl(url, "caIssuersUrl");
   }
   /**
    * @internal