mockttp - npm Package Compare versions

Comparing version 0.14.4 to 0.14.5

dist/rules/handlers.js

@@ -351,2 +351,3 @@ "use strict";
                 clientReq.body.rawStream.once('error', () => serverReq.abort());
+                clientReq.once('abort', () => serverReq.abort());
                 clientRes.once('close', () => serverReq.abort());
@@ -353,0 +354,0 @@ serverReq.once('error', (e) => {

dist/server/mockttp-server.js

@@ -188,8 +188,7 @@ "use strict";
             let result = null;
-            response.once('close', () => {
-                // Aborted is only defined in new node. We use it where it's explicitly false though.
-                if (result === null && (request.aborted !== false)) {
+            request.once('aborted', () => {
+                if (result === null) {
+                    result = 'aborted';
                     request.timingEvents.abortedTimestamp = now();
                     this.announceAbortAsync(request);
-                    result = 'aborted';
                 }
@@ -196,0 +195,0 @@ });

dist/types.d.ts

@@ -7,2 +7,3 @@ /**
 import express = require("express");
+import { EventEmitter } from 'events';
 export declare const DEFAULT_STANDALONE_PORT = 45456;
@@ -38,3 +39,3 @@ export declare enum Method {
 }
-export interface OngoingRequest extends Request {
+export interface OngoingRequest extends Request, EventEmitter {
     id: string;
@@ -41,0 +42,0 @@ originalUrl: string;

package.json

 {
   "name": "mockttp",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "description": "Mock HTTP server for testing HTTP clients and stubbing webservices",
@@ -5,0 +5,0 @@ "main": "dist/main.js",

src/rules/handlers.ts

@@ -481,2 +481,3 @@ /**
                 clientReq.body.rawStream.once('error', () => serverReq.abort());
+                clientReq.once('abort', () => serverReq.abort());
                 clientRes.once('close', () => serverReq.abort());
@@ -483,0 +484,0 @@

src/server/mockttp-server.ts

@@ -213,8 +213,7 @@ /**
         let result: 'responded' | 'aborted' | null = null;
-        response.once('close', () => {
-            // Aborted is only defined in new node. We use it where it's explicitly false though.
-            if (result === null && ((request as any).aborted !== false)) {
+        request.once('aborted', () => {
+            if (result === null) {
+                result = 'aborted';
                 request.timingEvents.abortedTimestamp = now();
                 this.announceAbortAsync(request);
-                result = 'aborted';
             }
@@ -221,0 +220,0 @@ });

src/types.ts

@@ -7,2 +7,3 @@ /**
 import express = require("express");
+import { EventEmitter } from 'events';
 
@@ -51,3 +52,3 @@ export const DEFAULT_STANDALONE_PORT = 45456;
 
-export interface OngoingRequest extends Request {
+export interface OngoingRequest extends Request, EventEmitter {
     id: string;
@@ -54,0 +55,0 @@ originalUrl: string;

No alert changes

Improved metrics

Total package byte prevSize

3404000

increased by1.4%

Lines of code

9118

increased by0.02%

No dependency changes