@mswjs/interceptors 0.25.9 → 0.25.10

package/lib/browser/{chunk-ECJJD4T6.js → chunk-5RW2GLTJ.js}

@@ -12,6 +12,18 @@ var _chunkG5ORGOKHjs = require('./chunk-G5ORGOKH.js');
 var _outvariant = require('outvariant');
 var _deferredpromise = require('@open-draft/deferred-promise');
 var _until = require('@open-draft/until');
+
+// src/utils/isPropertyAccessible.ts
+function isPropertyAccessible(obj, key) {
+  try {
+    obj[key];
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+// src/interceptors/fetch/index.ts
 var _FetchInterceptor = class extends _chunkG5ORGOKHjs.Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
@@ -80,7 +92,7 @@ var _FetchInterceptor = class extends _chunkG5ORGOKHjs.Interceptor {
       const mockedResponse = resolverResult.data;
       if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
         this.logger.info("received mocked response:", mockedResponse);
-        if (mockedResponse.type === "error") {
+        if (isPropertyAccessible(mockedResponse, "type") && mockedResponse.type === "error") {
           this.logger.info(
             "received a network error response, rejecting the request promise..."
           );

package/lib/browser/{chunk-XIF5PZER.mjs → chunk-KRADPSOF.mjs}

@@ -12,6 +12,18 @@ import {
 import { invariant } from "outvariant";
 import { DeferredPromise } from "@open-draft/deferred-promise";
 import { until } from "@open-draft/until";
+
+// src/utils/isPropertyAccessible.ts
+function isPropertyAccessible(obj, key) {
+  try {
+    obj[key];
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+// src/interceptors/fetch/index.ts
 var _FetchInterceptor = class extends Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
@@ -80,7 +92,7 @@ var _FetchInterceptor = class extends Interceptor {
       const mockedResponse = resolverResult.data;
       if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
         this.logger.info("received mocked response:", mockedResponse);
-        if (mockedResponse.type === "error") {
+        if (isPropertyAccessible(mockedResponse, "type") && mockedResponse.type === "error") {
           this.logger.info(
             "received a network error response, rejecting the request promise..."
           );

package/lib/browser/interceptors/fetch/index.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkECJJD4T6js = require('../../chunk-ECJJD4T6.js');
+var _chunk5RW2GLTJjs = require('../../chunk-5RW2GLTJ.js');
 require('../../chunk-X3NRJIZW.js');
 require('../../chunk-G5ORGOKH.js');
 
 
-exports.FetchInterceptor = _chunkECJJD4T6js.FetchInterceptor;
+exports.FetchInterceptor = _chunk5RW2GLTJjs.FetchInterceptor;

package/lib/browser/interceptors/fetch/index.mjs

@@ -1,6 +1,6 @@
 import {
   FetchInterceptor
-} from "../../chunk-XIF5PZER.mjs";
+} from "../../chunk-KRADPSOF.mjs";
 import "../../chunk-KK6APRON.mjs";
 import "../../chunk-S72SKXXQ.mjs";
 export {

package/lib/browser/presets/browser.js

@@ -4,13 +4,13 @@ var _chunkY4VZR7HZjs = require('../chunk-Y4VZR7HZ.js');
 require('../chunk-3LFH2WCF.js');
 
 
-var _chunkECJJD4T6js = require('../chunk-ECJJD4T6.js');
+var _chunk5RW2GLTJjs = require('../chunk-5RW2GLTJ.js');
 require('../chunk-X3NRJIZW.js');
 require('../chunk-G5ORGOKH.js');
 
 // src/presets/browser.ts
 var browser_default = [
-  new (0, _chunkECJJD4T6js.FetchInterceptor)(),
+  new (0, _chunk5RW2GLTJjs.FetchInterceptor)(),
   new (0, _chunkY4VZR7HZjs.XMLHttpRequestInterceptor)()
 ];
 

package/lib/browser/presets/browser.mjs

@@ -4,7 +4,7 @@ import {
 import "../chunk-7II4SWKS.mjs";
 import {
   FetchInterceptor
-} from "../chunk-XIF5PZER.mjs";
+} from "../chunk-KRADPSOF.mjs";
 import "../chunk-KK6APRON.mjs";
 import "../chunk-S72SKXXQ.mjs";
 

package/lib/node/RemoteHttpInterceptor.js

@@ -3,12 +3,13 @@
 var _chunkAA4NWHDYjs = require('./chunk-AA4NWHDY.js');
 
 
-var _chunkFWLJEVDWjs = require('./chunk-FWLJEVDW.js');
+var _chunkN65JTHKKjs = require('./chunk-N65JTHKK.js');
 
 
 var _chunkHNNMWWZ6js = require('./chunk-HNNMWWZ6.js');
 require('./chunk-3LFH2WCF.js');
 require('./chunk-OGN3ZR35.js');
+require('./chunk-35HEWOG7.js');
 require('./chunk-VQ4DZOBB.js');
 
 
@@ -24,7 +25,7 @@ var RemoteHttpInterceptor = class extends _chunkAA4NWHDYjs.BatchInterceptor {
     super({
       name: "remote-interceptor",
       interceptors: [
-        new (0, _chunkFWLJEVDWjs.ClientRequestInterceptor)(),
+        new (0, _chunkN65JTHKKjs.ClientRequestInterceptor)(),
         new (0, _chunkHNNMWWZ6js.XMLHttpRequestInterceptor)()
       ]
     });

package/lib/node/RemoteHttpInterceptor.mjs

@@ -3,12 +3,13 @@ import {
 } from "./chunk-LNYHQTKT.mjs";
 import {
   ClientRequestInterceptor
-} from "./chunk-P4CPJLJS.mjs";
+} from "./chunk-Z26AUTER.mjs";
 import {
   XMLHttpRequestInterceptor
 } from "./chunk-JX6GSWVV.mjs";
 import "./chunk-7II4SWKS.mjs";
 import "./chunk-3IYIKC3X.mjs";
+import "./chunk-MXSWCQAT.mjs";
 import "./chunk-GFH37L5D.mjs";
 import {
   emitAsync,

package/lib/node/chunk-35HEWOG7.js

@@ -0,0 +1,13 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/utils/isPropertyAccessible.ts
+function isPropertyAccessible(obj, key) {
+  try {
+    obj[key];
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+
+
+exports.isPropertyAccessible = isPropertyAccessible;

package/lib/node/chunk-MXSWCQAT.mjs

@@ -0,0 +1,13 @@
+// src/utils/isPropertyAccessible.ts
+function isPropertyAccessible(obj, key) {
+  try {
+    obj[key];
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+export {
+  isPropertyAccessible
+};

package/lib/node/{chunk-FWLJEVDW.js → chunk-N65JTHKK.js}

@@ -3,6 +3,9 @@
 var _chunkOGN3ZR35js = require('./chunk-OGN3ZR35.js');
 
 
+var _chunk35HEWOG7js = require('./chunk-35HEWOG7.js');
+
+
 
 
 var _chunk5PTPJLB7js = require('./chunk-5PTPJLB7.js');
@@ -321,7 +324,15 @@ var _NodeClientRequest = class extends _http.ClientRequest {
           mockedResponse.statusText
         );
         this.destroyed = false;
-        if (mockedResponse.type === "error") {
+        if (
+          /**
+           * @note Some environments, like Miniflare (Cloudflare) do not
+           * implement the "Response.type" property and throw on its access.
+           * Safely check if we can access "type" on "Response" before continuing.
+           * @see https://github.com/mswjs/msw/issues/1834
+           */
+          _chunk35HEWOG7js.isPropertyAccessible.call(void 0, mockedResponse, "type") && mockedResponse.type === "error"
+        ) {
           this.logger.info(
             "received network error response, aborting request..."
           );

package/lib/node/{chunk-P4CPJLJS.mjs → chunk-Z26AUTER.mjs}

@@ -1,6 +1,9 @@
 import {
   responseStatusCodesWithoutBody
 } from "./chunk-3IYIKC3X.mjs";
+import {
+  isPropertyAccessible
+} from "./chunk-MXSWCQAT.mjs";
 import {
   emitAsync,
   toInteractiveRequest,
@@ -321,7 +324,15 @@ var _NodeClientRequest = class extends ClientRequest {
           mockedResponse.statusText
         );
         this.destroyed = false;
-        if (mockedResponse.type === "error") {
+        if (
+          /**
+           * @note Some environments, like Miniflare (Cloudflare) do not
+           * implement the "Response.type" property and throw on its access.
+           * Safely check if we can access "type" on "Response" before continuing.
+           * @see https://github.com/mswjs/msw/issues/1834
+           */
+          isPropertyAccessible(mockedResponse, "type") && mockedResponse.type === "error"
+        ) {
           this.logger.info(
             "received network error response, aborting request..."
           );

package/lib/node/interceptors/ClientRequest/index.js

@@ -1,9 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkFWLJEVDWjs = require('../../chunk-FWLJEVDW.js');
+var _chunkN65JTHKKjs = require('../../chunk-N65JTHKK.js');
 require('../../chunk-OGN3ZR35.js');
+require('../../chunk-35HEWOG7.js');
 require('../../chunk-5PTPJLB7.js');
 require('../../chunk-UZM2Y7WJ.js');
 
 
-exports.ClientRequestInterceptor = _chunkFWLJEVDWjs.ClientRequestInterceptor;
+exports.ClientRequestInterceptor = _chunkN65JTHKKjs.ClientRequestInterceptor;

package/lib/node/interceptors/ClientRequest/index.mjs

@@ -1,7 +1,8 @@
 import {
   ClientRequestInterceptor
-} from "../../chunk-P4CPJLJS.mjs";
+} from "../../chunk-Z26AUTER.mjs";
 import "../../chunk-3IYIKC3X.mjs";
+import "../../chunk-MXSWCQAT.mjs";
 import "../../chunk-YQGTMMOZ.mjs";
 import "../../chunk-JAW6F2FR.mjs";
 export {

package/lib/node/interceptors/fetch/index.js

@@ -1,5 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
+var _chunk35HEWOG7js = require('../../chunk-35HEWOG7.js');
+
+
 var _chunkVQ4DZOBBjs = require('../../chunk-VQ4DZOBB.js');
 
 
@@ -82,7 +85,7 @@ var _FetchInterceptor = class extends _chunkUZM2Y7WJjs.Interceptor {
       const mockedResponse = resolverResult.data;
       if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
         this.logger.info("received mocked response:", mockedResponse);
-        if (mockedResponse.type === "error") {
+        if (_chunk35HEWOG7js.isPropertyAccessible.call(void 0, mockedResponse, "type") && mockedResponse.type === "error") {
           this.logger.info(
             "received a network error response, rejecting the request promise..."
           );

package/lib/node/interceptors/fetch/index.mjs

@@ -1,3 +1,6 @@
+import {
+  isPropertyAccessible
+} from "../../chunk-MXSWCQAT.mjs";
 import {
   IS_PATCHED_MODULE
 } from "../../chunk-GFH37L5D.mjs";
@@ -82,7 +85,7 @@ var _FetchInterceptor = class extends Interceptor {
       const mockedResponse = resolverResult.data;
       if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
         this.logger.info("received mocked response:", mockedResponse);
-        if (mockedResponse.type === "error") {
+        if (isPropertyAccessible(mockedResponse, "type") && mockedResponse.type === "error") {
           this.logger.info(
             "received a network error response, rejecting the request promise..."
           );

package/lib/node/presets/node.js

@@ -1,18 +1,19 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkFWLJEVDWjs = require('../chunk-FWLJEVDW.js');
+var _chunkN65JTHKKjs = require('../chunk-N65JTHKK.js');
 
 
 var _chunkHNNMWWZ6js = require('../chunk-HNNMWWZ6.js');
 require('../chunk-3LFH2WCF.js');
 require('../chunk-OGN3ZR35.js');
+require('../chunk-35HEWOG7.js');
 require('../chunk-VQ4DZOBB.js');
 require('../chunk-5PTPJLB7.js');
 require('../chunk-UZM2Y7WJ.js');
 
 // src/presets/node.ts
 var node_default = [
-  new (0, _chunkFWLJEVDWjs.ClientRequestInterceptor)(),
+  new (0, _chunkN65JTHKKjs.ClientRequestInterceptor)(),
   new (0, _chunkHNNMWWZ6js.XMLHttpRequestInterceptor)()
 ];
 

package/lib/node/presets/node.mjs

@@ -1,11 +1,12 @@
 import {
   ClientRequestInterceptor
-} from "../chunk-P4CPJLJS.mjs";
+} from "../chunk-Z26AUTER.mjs";
 import {
   XMLHttpRequestInterceptor
 } from "../chunk-JX6GSWVV.mjs";
 import "../chunk-7II4SWKS.mjs";
 import "../chunk-3IYIKC3X.mjs";
+import "../chunk-MXSWCQAT.mjs";
 import "../chunk-GFH37L5D.mjs";
 import "../chunk-YQGTMMOZ.mjs";
 import "../chunk-JAW6F2FR.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.25.9",
+  "version": "0.25.10",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",
@@ -119,6 +119,7 @@
     "tsup": "^6.5.0",
     "typescript": "^4.9.4",
     "vitest": "^0.28.5",
+    "vitest-environment-miniflare": "^2.14.1",
     "wait-for-expect": "^3.0.2",
     "web-encoding": "^1.1.5",
     "webpack-http-server": "^0.5.0"

package/src/interceptors/ClientRequest/NodeClientRequest.ts

@@ -20,6 +20,7 @@ import { toInteractiveRequest } from '../../utils/toInteractiveRequest'
 import { uuidv4 } from '../../utils/uuid'
 import { emitAsync } from '../../utils/emitAsync'
 import { getRawFetchHeaders } from '../../utils/getRawFetchHeaders'
+import { isPropertyAccessible } from '../../utils/isPropertyAccessible'
 
 export type Protocol = 'http' | 'https'
 
@@ -287,7 +288,16 @@ export class NodeClientRequest extends ClientRequest {
         this.destroyed = false
 
         // Handle mocked "Response.error" network error responses.
-        if (mockedResponse.type === 'error') {
+        if (
+          /**
+           * @note Some environments, like Miniflare (Cloudflare) do not
+           * implement the "Response.type" property and throw on its access.
+           * Safely check if we can access "type" on "Response" before continuing.
+           * @see https://github.com/mswjs/msw/issues/1834
+           */
+          isPropertyAccessible(mockedResponse, 'type') &&
+          mockedResponse.type === 'error'
+        ) {
           this.logger.info(
             'received network error response, aborting request...'
           )

package/src/interceptors/fetch/index.ts

@@ -6,6 +6,7 @@ import { Interceptor } from '../../Interceptor'
 import { uuidv4 } from '../../utils/uuid'
 import { toInteractiveRequest } from '../../utils/toInteractiveRequest'
 import { emitAsync } from '../../utils/emitAsync'
+import { isPropertyAccessible } from '../../utils/isPropertyAccessible'
 
 export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
   static symbol = Symbol('fetch')
@@ -103,7 +104,10 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
         this.logger.info('received mocked response:', mockedResponse)
 
         // Reject the request Promise on mocked "Response.error" responses.
-        if (mockedResponse.type === 'error') {
+        if (
+          isPropertyAccessible(mockedResponse, 'type') &&
+          mockedResponse.type === 'error'
+        ) {
           this.logger.info(
             'received a network error response, rejecting the request promise...'
           )

package/src/utils/isPropertyAccessible.ts

@@ -0,0 +1,19 @@
+/**
+ * A function that validates if property access is possible on an object
+ * without throwing. It returns `true` if the property access is possible
+ * and `false` otherwise.
+ *
+ * Environments like miniflare will throw on property access on certain objects
+ * like Request and Response, for unimplemented properties.
+ */
+export function isPropertyAccessible<Obj extends Record<string, any>>(
+  obj: Obj,
+  key: keyof Obj
+) {
+  try {
+    obj[key]
+    return true
+  } catch {
+    return false
+  }
+}