piral-cli 1.5.0-beta.6446 → 1.5.0-beta.6454

package/lib/external/index.js

@@ -60548,6 +60548,24 @@ var require_follow_redirects = __commonJS({
     var Writable = require("stream").Writable;
     var assert = require("assert");
     var debug = require_debug2();
+    var useNativeURL = false;
+    try {
+      assert(new URL2());
+    } catch (error) {
+      useNativeURL = error.code === "ERR_INVALID_URL";
+    }
+    var preservedUrlFields = [
+      "auth",
+      "host",
+      "hostname",
+      "href",
+      "path",
+      "pathname",
+      "port",
+      "protocol",
+      "query",
+      "search"
+    ];
     var events = ["abort", "aborted", "connect", "error", "socket", "timeout"];
     var eventHandlers = Object.create(null);
     events.forEach(function(event) {
@@ -60557,7 +60575,7 @@ var require_follow_redirects = __commonJS({
     });
     var InvalidUrlError = createErrorType("ERR_INVALID_URL", "Invalid URL", TypeError);
     var RedirectionError = createErrorType("ERR_FR_REDIRECTION_FAILURE", "Redirected request failed");
-    var TooManyRedirectsError = createErrorType("ERR_FR_TOO_MANY_REDIRECTS", "Maximum number of redirects exceeded");
+    var TooManyRedirectsError = createErrorType("ERR_FR_TOO_MANY_REDIRECTS", "Maximum number of redirects exceeded", RedirectionError);
     var MaxBodyLengthExceededError = createErrorType("ERR_FR_MAX_BODY_LENGTH_EXCEEDED", "Request body larger than maxBodyLength limit");
     var WriteAfterEndError = createErrorType("ERR_STREAM_WRITE_AFTER_END", "write after end");
     var destroy = Writable.prototype.destroy || noop;
@@ -60576,7 +60594,11 @@ var require_follow_redirects = __commonJS({
       }
       var self2 = this;
       this._onNativeResponse = function(response) {
-        self2._processResponse(response);
+        try {
+          self2._processResponse(response);
+        } catch (cause) {
+          self2.emit("error", cause instanceof RedirectionError ? cause : new RedirectionError({ cause }));
+        }
       };
       this._performRequest();
     }
@@ -60735,8 +60757,7 @@ var require_follow_redirects = __commonJS({
       var protocol = this._options.protocol;
       var nativeProtocol = this._options.nativeProtocols[protocol];
       if (!nativeProtocol) {
-        this.emit("error", new TypeError("Unsupported protocol " + protocol));
-        return;
+        throw new TypeError("Unsupported protocol " + protocol);
       }
       if (this._options.agents) {
         var scheme = protocol.slice(0, -1);
@@ -60788,8 +60809,7 @@ var require_follow_redirects = __commonJS({
       destroyRequest(this._currentRequest);
       response.destroy();
       if (++this._redirectCount > this._options.maxRedirects) {
-        this.emit("error", new TooManyRedirectsError());
-        return;
+        throw new TooManyRedirectsError();
       }
       var requestHeaders;
       var beforeRedirect = this._options.beforeRedirect;
@@ -60805,21 +60825,14 @@ var require_follow_redirects = __commonJS({
         removeMatchingHeaders(/^content-/i, this._options.headers);
       }
       var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
-      var currentUrlParts = url.parse(this._currentUrl);
+      var currentUrlParts = parseUrl(this._currentUrl);
       var currentHost = currentHostHeader || currentUrlParts.host;
       var currentUrl = /^\w+:/.test(location) ? this._currentUrl : url.format(Object.assign(currentUrlParts, { host: currentHost }));
-      var redirectUrl;
-      try {
-        redirectUrl = url.resolve(currentUrl, location);
-      } catch (cause) {
-        this.emit("error", new RedirectionError({ cause }));
-        return;
-      }
-      debug("redirecting to", redirectUrl);
+      var redirectUrl = resolveUrl(location, currentUrl);
+      debug("redirecting to", redirectUrl.href);
       this._isRedirect = true;
-      var redirectUrlParts = url.parse(redirectUrl);
-      Object.assign(this._options, redirectUrlParts);
-      if (redirectUrlParts.protocol !== currentUrlParts.protocol && redirectUrlParts.protocol !== "https:" || redirectUrlParts.host !== currentHost && !isSubdomain(redirectUrlParts.host, currentHost)) {
+      spreadUrlObject(redirectUrl, this._options);
+      if (redirectUrl.protocol !== currentUrlParts.protocol && redirectUrl.protocol !== "https:" || redirectUrl.host !== currentHost && !isSubdomain(redirectUrl.host, currentHost)) {
         removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
       }
       if (isFunction(beforeRedirect)) {
@@ -60832,19 +60845,10 @@ var require_follow_redirects = __commonJS({
           method,
           headers: requestHeaders
         };
-        try {
-          beforeRedirect(this._options, responseDetails, requestDetails);
-        } catch (err) {
-          this.emit("error", err);
-          return;
-        }
+        beforeRedirect(this._options, responseDetails, requestDetails);
         this._sanitizeOptions(this._options);
       }
-      try {
-        this._performRequest();
-      } catch (cause) {
-        this.emit("error", new RedirectionError({ cause }));
-      }
+      this._performRequest();
     };
     function wrap(protocols) {
       var exports2 = {
@@ -60857,22 +60861,13 @@ var require_follow_redirects = __commonJS({
         var nativeProtocol = nativeProtocols[protocol] = protocols[scheme];
         var wrappedProtocol = exports2[scheme] = Object.create(nativeProtocol);
         function request(input, options, callback) {
-          if (isString(input)) {
-            var parsed;
-            try {
-              parsed = urlToOptions(new URL2(input));
-            } catch (err) {
-              parsed = url.parse(input);
-            }
-            if (!isString(parsed.protocol)) {
-              throw new InvalidUrlError({ input });
-            }
-            input = parsed;
-          } else if (URL2 && input instanceof URL2) {
-            input = urlToOptions(input);
+          if (isURL(input)) {
+            input = spreadUrlObject(input);
+          } else if (isString(input)) {
+            input = spreadUrlObject(parseUrl(input));
           } else {
             callback = options;
-            options = input;
+            options = validateUrl(input);
             input = { protocol };
           }
           if (isFunction(options)) {
@@ -60905,20 +60900,43 @@ var require_follow_redirects = __commonJS({
     }
     function noop() {
     }
-    function urlToOptions(urlObject) {
-      var options = {
-        protocol: urlObject.protocol,
-        hostname: urlObject.hostname.startsWith("[") ? urlObject.hostname.slice(1, -1) : urlObject.hostname,
-        hash: urlObject.hash,
-        search: urlObject.search,
-        pathname: urlObject.pathname,
-        path: urlObject.pathname + urlObject.search,
-        href: urlObject.href
-      };
-      if (urlObject.port !== "") {
-        options.port = Number(urlObject.port);
+    function parseUrl(input) {
+      var parsed;
+      if (useNativeURL) {
+        parsed = new URL2(input);
+      } else {
+        parsed = validateUrl(url.parse(input));
+        if (!isString(parsed.protocol)) {
+          throw new InvalidUrlError({ input });
+        }
       }
-      return options;
+      return parsed;
+    }
+    function resolveUrl(relative, base) {
+      return useNativeURL ? new URL2(relative, base) : parseUrl(url.resolve(base, relative));
+    }
+    function validateUrl(input) {
+      if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
+        throw new InvalidUrlError({ input: input.href || input });
+      }
+      if (/^\[/.test(input.host) && !/^\[[:0-9a-f]+\](:\d+)?$/i.test(input.host)) {
+        throw new InvalidUrlError({ input: input.href || input });
+      }
+      return input;
+    }
+    function spreadUrlObject(urlObject, target) {
+      var spread = target || {};
+      for (var key of preservedUrlFields) {
+        spread[key] = urlObject[key];
+      }
+      if (spread.hostname.startsWith("[")) {
+        spread.hostname = spread.hostname.slice(1, -1);
+      }
+      if (spread.port !== "") {
+        spread.port = Number(spread.port);
+      }
+      spread.path = spread.search ? spread.pathname + spread.search : spread.pathname;
+      return spread;
     }
     function removeMatchingHeaders(regex2, headers) {
       var lastValue;
@@ -60938,8 +60956,16 @@ var require_follow_redirects = __commonJS({
         this.message = this.cause ? message + ": " + this.cause.message : message;
       }
       CustomError.prototype = new (baseClass || Error)();
-      CustomError.prototype.constructor = CustomError;
-      CustomError.prototype.name = "Error [" + code + "]";
+      Object.defineProperties(CustomError.prototype, {
+        constructor: {
+          value: CustomError,
+          enumerable: false
+        },
+        name: {
+          value: "Error [" + code + "]",
+          enumerable: false
+        }
+      });
       return CustomError;
     }
     function destroyRequest(request, error) {
@@ -60963,6 +60989,9 @@ var require_follow_redirects = __commonJS({
     function isBuffer(value) {
       return typeof value === "object" && "length" in value;
     }
+    function isURL(value) {
+      return URL2 && value instanceof URL2;
+    }
     module2.exports = wrap({ http, https });
     module2.exports.wrap = wrap;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "1.5.0-beta.6446",
+  "version": "1.5.0-beta.6454",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -81,5 +81,5 @@
     "typescript": "^5.0.0",
     "yargs": "^15.0.0"
   },
-  "gitHead": "9920a2eee24366aac7a52b779735f9e19820cef3"
+  "gitHead": "e38bc99bbc8c4287cf14ee07e890ee962ba58387"
 }