@zimic/interceptor 1.1.2 → 1.1.3-canary.1

package/dist/http.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var color2 = require('picocolors');
 var http = require('@zimic/http');
+var color2 = require('picocolors');
 var msw = require('msw');
 var mswBrowser = require('msw/browser');
 var mswNode = require('msw/node');
@@ -32,6 +32,8 @@ var mswBrowser__namespace = /*#__PURE__*/_interopNamespace(mswBrowser);
 var mswNode__namespace = /*#__PURE__*/_interopNamespace(mswNode);
 var ClientSocket__default = /*#__PURE__*/_interopDefault(ClientSocket);
 
+// src/http/index.ts
+
 // src/http/interceptor/errors/RunningHttpInterceptorError.ts
 var RunningHttpInterceptorError = class extends Error {
   constructor(additionalMessage) {
@@ -89,24 +91,6 @@ Learn more: https://zimic.dev/docs/interceptor/api/create-http-interceptor`
 };
 var RequestSavingSafeLimitExceededError_default = RequestSavingSafeLimitExceededError;
 
-// src/http/interceptorWorker/errors/InvalidFormDataError.ts
-var InvalidFormDataError = class extends SyntaxError {
-  constructor(value) {
-    super(`Failed to parse value as form data: ${value}`);
-    this.name = "InvalidFormDataError";
-  }
-};
-var InvalidFormDataError_default = InvalidFormDataError;
-
-// src/http/interceptorWorker/errors/InvalidJSONError.ts
-var InvalidJSONError = class extends SyntaxError {
-  constructor(value) {
-    super(`Failed to parse value as JSON: ${value}`);
-    this.name = "InvalidJSONError";
-  }
-};
-var InvalidJSONError_default = InvalidJSONError;
-
 // src/cli/browser/shared/constants.ts
 var SERVICE_WORKER_FILE_NAME = "mockServiceWorker.js";
 
@@ -955,15 +939,15 @@ function createRegexFromPath(path) {
 }
 var createRegexFromPath_default = createRegexFromPath;
 
-// ../zimic-utils/dist/url/excludeURLParams.mjs
-function excludeURLParams(url) {
+// ../zimic-utils/dist/url/excludeNonPathParams.mjs
+function excludeNonPathParams(url) {
   url.hash = "";
   url.search = "";
   url.username = "";
   url.password = "";
   return url;
 }
-var excludeURLParams_default = excludeURLParams;
+var excludeNonPathParams_default = excludeNonPathParams;
 
 // ../zimic-utils/dist/url/validateURLProtocol.mjs
 var UnsupportedURLProtocolError = class extends TypeError {
@@ -1139,7 +1123,7 @@ var HttpInterceptorWorker = class _HttpInterceptorWorker {
     if (!canHaveBody) {
       return new Response(null, { headers, status });
     }
-    if (typeof declaration.body === "string" || declaration.body === void 0 || declaration.body instanceof FormData || declaration.body instanceof URLSearchParams || declaration.body instanceof Blob || declaration.body instanceof ArrayBuffer || declaration.body instanceof ReadableStream) {
+    if (typeof declaration.body === "string" || declaration.body === null || declaration.body === void 0 || declaration.body instanceof FormData || declaration.body instanceof URLSearchParams || declaration.body instanceof Blob || declaration.body instanceof ArrayBuffer || declaration.body instanceof ReadableStream) {
       return new Response(declaration.body ?? null, { headers, status });
     }
     return Response.json(declaration.body, { headers, status });
@@ -1152,7 +1136,10 @@ var HttpInterceptorWorker = class _HttpInterceptorWorker {
   static async parseRawRequest(originalRawRequest, options) {
     const rawRequest = originalRawRequest.clone();
     const rawRequestClone = rawRequest.clone();
-    const parsedBody = await this.parseRawBody(rawRequest);
+    const parsedBody = await http.parseHttpBody(rawRequest).catch((error) => {
+      logger.error("Failed to parse request body:", error);
+      return null;
+    });
     const headers = new http.HttpHeaders(rawRequest.headers);
     const pathParams = this.parseRawPathParams(rawRequest, options);
     const parsedURL = new URL(rawRequest.url);
@@ -1209,7 +1196,10 @@ var HttpInterceptorWorker = class _HttpInterceptorWorker {
   static async parseRawResponse(originalRawResponse) {
     const rawResponse = originalRawResponse.clone();
     const rawResponseClone = rawResponse.clone();
-    const parsedBody = await this.parseRawBody(rawResponse);
+    const parsedBody = await http.parseHttpBody(rawResponse).catch((error) => {
+      logger.error("Failed to parse response body:", error);
+      return null;
+    });
     const headers = new http.HttpHeaders(rawResponse.headers);
     const parsedRequest = new Proxy(rawResponse, {
       has(target, property) {
@@ -1257,82 +1247,6 @@ var HttpInterceptorWorker = class _HttpInterceptorWorker {
     }
     return params;
   }
-  static async parseRawBody(resource) {
-    const contentType = resource.headers.get("content-type");
-    try {
-      if (contentType) {
-        if (contentType.startsWith("application/json")) {
-          return await this.parseRawBodyAsJSON(resource);
-        }
-        if (contentType.startsWith("multipart/form-data")) {
-          return await this.parseRawBodyAsFormData(resource);
-        }
-        if (contentType.startsWith("application/x-www-form-urlencoded")) {
-          return await this.parseRawBodyAsSearchParams(resource);
-        }
-        if (contentType.startsWith("text/") || contentType.startsWith("application/xml")) {
-          return await this.parseRawBodyAsText(resource);
-        }
-        if (contentType.startsWith("application/") || contentType.startsWith("image/") || contentType.startsWith("audio/") || contentType.startsWith("font/") || contentType.startsWith("video/") || contentType.startsWith("multipart/")) {
-          return await this.parseRawBodyAsBlob(resource);
-        }
-      }
-      const resourceClone = resource.clone();
-      try {
-        return await this.parseRawBodyAsJSON(resource);
-      } catch {
-        return await this.parseRawBodyAsBlob(resourceClone);
-      }
-    } catch (error) {
-      console.error(error);
-      return null;
-    }
-  }
-  static async parseRawBodyAsJSON(resource) {
-    const bodyAsText = await resource.text();
-    if (!bodyAsText.trim()) {
-      return null;
-    }
-    try {
-      const bodyAsJSON = JSON.parse(bodyAsText);
-      return bodyAsJSON;
-    } catch {
-      throw new InvalidJSONError_default(bodyAsText);
-    }
-  }
-  static async parseRawBodyAsSearchParams(resource) {
-    const bodyAsText = await resource.text();
-    if (!bodyAsText.trim()) {
-      return null;
-    }
-    const bodyAsSearchParams = new http.HttpSearchParams(bodyAsText);
-    return bodyAsSearchParams;
-  }
-  static async parseRawBodyAsFormData(resource) {
-    const resourceClone = resource.clone();
-    try {
-      const bodyAsRawFormData = await resource.formData();
-      const bodyAsFormData = new http.HttpFormData();
-      for (const [key, value] of bodyAsRawFormData) {
-        bodyAsFormData.append(key, value);
-      }
-      return bodyAsFormData;
-    } catch {
-      const bodyAsText = await resourceClone.text();
-      if (!bodyAsText.trim()) {
-        return null;
-      }
-      throw new InvalidFormDataError_default(bodyAsText);
-    }
-  }
-  static async parseRawBodyAsBlob(resource) {
-    const bodyAsBlob = await resource.blob();
-    return bodyAsBlob;
-  }
-  static async parseRawBodyAsText(resource) {
-    const bodyAsText = await resource.text();
-    return bodyAsText || null;
-  }
   static async logUnhandledRequestWarning(rawRequest, action) {
     const request = await this.parseRawRequest(rawRequest);
     const [formattedHeaders, formattedSearchParams, formattedBody] = await Promise.all([
@@ -1504,7 +1418,7 @@ var HttpInterceptorClient = class {
       );
     }
     validateURLProtocol_default(newBaseURL, SUPPORTED_BASE_URL_PROTOCOLS);
-    excludeURLParams_default(newBaseURL);
+    excludeNonPathParams_default(newBaseURL);
     this._baseURL = newBaseURL;
   }
   get baseURLAsString() {
@@ -1853,7 +1767,7 @@ var LocalHttpInterceptorWorker = class extends HttpInterceptorWorker_default {
   }
   async createResponseForRequest(request) {
     const methodHandlers = this.httpHandlersByMethod[request.method];
-    const requestURL = excludeURLParams_default(new URL(request.url));
+    const requestURL = excludeNonPathParams_default(new URL(request.url));
     const requestURLAsString = requestURL.href === `${requestURL.origin}/` ? requestURL.origin : requestURL.href;
     for (let handlerIndex = methodHandlers.length - 1; handlerIndex >= 0; handlerIndex--) {
       const handler = methodHandlers[handlerIndex];
@@ -2816,6 +2730,12 @@ function createHttpInterceptor(options) {
   }
   throw new UnknownHttpInterceptorTypeError_default(type);
 }
+
+// src/http/index.ts
+var InvalidFormDataError = class extends http.InvalidFormDataError {
+};
+var InvalidJSONError = class extends http.InvalidJSONError {
+};
 /* istanbul ignore next -- @preserve
  * Ignoring because there will always be a handler for the given method and path at this point. */
 /* istanbul ignore else -- @preserve */
@@ -2836,8 +2756,8 @@ function createHttpInterceptor(options) {
  * would reach a timeout and not be responded. The empty set serves as a fallback. */
 
 exports.DisabledRequestSavingError = DisabledRequestSavingError_default;
-exports.InvalidFormDataError = InvalidFormDataError_default;
-exports.InvalidJSONError = InvalidJSONError_default;
+exports.InvalidFormDataError = InvalidFormDataError;
+exports.InvalidJSONError = InvalidJSONError;
 exports.NotRunningHttpInterceptorError = NotRunningHttpInterceptorError_default;
 exports.RequestSavingSafeLimitExceededError = RequestSavingSafeLimitExceededError_default;
 exports.RunningHttpInterceptorError = RunningHttpInterceptorError_default;