Refactor how we track paid/non-paid step types

Author: pimterry

src/model/rules/rules.ts

@@ -12,27 +12,23 @@ import {
 } from '../../services/service-versions';
 
 import {
-    StaticResponseStep,
-    ForwardToHostStep,
-    TimeoutStep,
-    CloseConnectionStep,
-    ResetConnectionStep,
-    FromFileResponseStep,
-    TransformingStep,
     HttpMatcherLookup,
     HttpStepLookup,
     HttpRule,
-    HttpInitialMatcherClasses
+    HttpInitialMatcherClasses,
+    RequestBreakpointStep,
+    ResponseBreakpointStep,
+    RequestAndResponseBreakpointStep,
+    PassThroughStep
 } from './definitions/http-rule-definitions';
 
 import {
     WebSocketMatcherLookup,
     WebSocketStepLookup,
     WebSocketRule,
     WebSocketInitialMatcherClasses,
-    EchoWebSocketStep,
-    RejectWebSocketStep,
-    ListenWebSocketStep
+    WebSocketForwardToHostStep,
+    WebSocketPassThroughStep
 } from './definitions/websocket-rule-definitions';
 
 import {
@@ -385,33 +381,32 @@ export const isFinalStep = (step: Step) => {
     return StepLookup[step.type].isFinal === true;
 }
 
-const PaidStepClasses: StepClass[] = [
-    StaticResponseStep,
-    FromFileResponseStep,
-    ForwardToHostStep,
-    TransformingStep,
-    TimeoutStep,
-    CloseConnectionStep,
-    ResetConnectionStep,
-    EchoWebSocketStep,
-    RejectWebSocketStep,
-    ListenWebSocketStep
+const NonPaidStepClasses: StepClass[] = [
+    // HTTP:
+    RequestBreakpointStep,
+    ResponseBreakpointStep,
+    RequestAndResponseBreakpointStep,
+    PassThroughStep,
+    // WS:
+    WebSocketPassThroughStep,
+    WebSocketForwardToHostStep,
+    // All non-HTTP/WS are free
 ];
 
 export const isPaidStep = (
     ruleType: RuleType,
     step: Step
 ) => {
     if (ruleType !== 'http' && ruleType !== 'websocket') return false;
-    return _.some(PaidStepClasses, (cls) => step instanceof cls);
+    return !_.some(NonPaidStepClasses, (cls) => step instanceof cls);
 }
 
 export const isPaidStepClass = (
     ruleType: RuleType,
     stepClass: StepClass
 ) => {
     if (ruleType !== 'http' && ruleType !== 'websocket') return false;
-    return PaidStepClasses.includes(stepClass);
+    return !NonPaidStepClasses.includes(stepClass);
 }
 
 /// --- Rules ---