Rename wait for request body step class & expose on WS too

Author: pimterry

src/rules/requests/request-step-impls.ts

@@ -1411,7 +1411,7 @@ export class DelayStepImpl extends DelayStep {
     }
 }
 
-export class WaitForRequestBodyImpl extends WaitForRequestBodyStep {
+export class WaitForRequestBodyStepImpl extends WaitForRequestBodyStep {
     async handle(request: OngoingRequest): Promise<{ continue: true }> {
         await request.body.asBuffer();
         return { continue: true };
@@ -1510,6 +1510,6 @@ export const StepLookup: typeof StepDefinitionLookup = {
     'timeout': TimeoutStepImpl,
     'json-rpc-response': JsonRpcResponseStepImpl,
     'delay': DelayStepImpl,
-    'wait-for-request-body': WaitForRequestBodyImpl,
+    'wait-for-request-body': WaitForRequestBodyStepImpl,
     'webhook': WebhookStepImpl
 }

src/rules/websockets/websocket-step-definitions.ts

@@ -1,6 +1,5 @@
 import * as _ from 'lodash';
-import * as url from 'url';
-import { stripIndent } from 'common-tags';
+import { joinAnd } from '@httptoolkit/util';
 
 import {
     ClientServerChannel,
@@ -24,10 +23,12 @@ import {
     CloseConnectionStep,
     DelayStep,
     ResetConnectionStep,
-    TimeoutStep
+    TimeoutStep,
+    WaitForRequestBodyStep,
 } from '../requests/request-step-definitions';
 import { Replace } from '../../util/type-utils';
 import { SerializedMatchReplacePairs, serializeMatchReplaceConfiguration } from '../match-replace';
+import { isAbsoluteUrl } from '../../util/url';
 
 /*
 This file defines websocket step *definitions*, which includes everything necessary to define
@@ -54,9 +55,7 @@ export interface WebSocketStepDefinition extends Explainable, Serializable {
 }
 
 export interface PassThroughWebSocketStepOptions extends PassThroughStepConnectionOptions {
-
     transformRequest?: WebSocketRequestTransform;
-
 }
 
 export interface WebSocketRequestTransform extends PassThroughInitialTransforms {
@@ -259,7 +258,8 @@ export {
     CloseConnectionStep,
     ResetConnectionStep,
     TimeoutStep,
-    DelayStep
+    DelayStep,
+    WaitForRequestBodyStep
 };
 
 export const WsStepDefinitionLookup = {
@@ -270,5 +270,6 @@ export const WsStepDefinitionLookup = {
     'close-connection': CloseConnectionStep,
     'reset-connection': ResetConnectionStep,
     'timeout': TimeoutStep,
-    'delay': DelayStep
+    'delay': DelayStep,
+    'wait-for-request-body': WaitForRequestBodyStep,
 };

src/rules/websockets/websocket-step-impls.ts

@@ -22,7 +22,8 @@ import {
     CloseConnectionStepImpl,
     DelayStepImpl,
     ResetConnectionStepImpl,
-    TimeoutStepImpl
+    TimeoutStepImpl,
+    WaitForRequestBodyStepImpl
 } from '../requests/request-step-impls';
 import { getDefaultPort, getEffectivePort } from '../../util/url';
 import { resetOrDestroy } from '../../util/socket-util';
@@ -582,5 +583,6 @@ export const WsStepLookup: typeof WsStepDefinitionLookup = {
     'close-connection': CloseConnectionStepImpl,
     'reset-connection': ResetConnectionStepImpl,
     'timeout': TimeoutStepImpl,
-    'delay': DelayStepImpl
+    'delay': DelayStepImpl,
+    'wait-for-request-body': WaitForRequestBodyStepImpl
 };