Add support for non-HTTP rules in the rule model

Author: pimterry

src/components/intercept/config/android-device-config.tsx

@@ -17,7 +17,7 @@ import { EventsStore } from '../../../model/events/events-store';
 import {
     MethodMatchers,
     StaticResponseHandler
-} from '../../../model/rules/rule-definitions';
+} from '../../../model/rules/definitions/http-rule-definitions';
 import { RulesStore } from '../../../model/rules/rules-store';
 
 const ConfigContainer = styled.div`
@@ -80,6 +80,7 @@ export function setUpAndroidCertificateRule(
 ) {
     rulesStore.ensureRuleExists({
         id: 'default-android-certificate',
+        type: 'http',
         activated: true,
         matchers: [
             new MethodMatchers.GET(),

src/components/mock/handler-config.tsx

@@ -26,7 +26,10 @@ import {
     TimeoutHandler,
     CloseConnectionHandler,
     FromFileResponseHandler
-} from '../../model/rules/rule-definitions';
+} from '../../model/rules/definitions/http-rule-definitions';
+import {
+    WebSocketPassThroughHandler
+} from '../../model/rules/definitions/websocket-rule-definitions';
 import { HEADER_NAME_REGEX } from '../../model/http/http-docs';
 import { MethodName, MethodNames } from '../../model/http/methods';
 import {
@@ -85,7 +88,10 @@ export function HandlerConfiguration(props: {
         return <FromFileResponseHandlerConfig {...configProps} />;
     } else if (handler instanceof ForwardToHostHandler) {
         return <ForwardToHostHandlerConfig {...configProps} />;
-    } else if (handler instanceof PassThroughHandler) {
+    } else if (
+        handler instanceof PassThroughHandler ||
+        handler instanceof WebSocketPassThroughHandler
+    ) {
         return <PassThroughHandlerConfig {...configProps} />;
     } else if (handler instanceof TransformingHandler) {
         return <TransformingHandlerConfig {...configProps} />;

src/components/mock/handler-selection.tsx

@@ -26,7 +26,7 @@ import {
     TimeoutHandler,
     CloseConnectionHandler,
     FromFileResponseHandler
-} from '../../model/rules/rule-definitions';
+} from '../../model/rules/definitions/http-rule-definitions';
 
 import { Select } from '../common/inputs';
 import {

src/components/mock/matcher-selection.tsx

@@ -31,10 +31,12 @@ import {
 
 import { MatcherConfiguration } from './matcher-config';
 
-const getMatcherKey = (m: MatcherClass | Matcher | undefined) =>
-    m === undefined
-        ? ''
-        : MatcherKeys.get(m as any) || MatcherKeys.get(m.constructor as any);
+const getMatcherKey = (m: MatcherClass | Matcher | undefined) => {
+    if (m === undefined) return '';
+
+    return MatcherKeys.get(m as any) ||
+        MatcherKeys.get(m.constructor as any);
+};
 const getMatcherClassByKey = (k: MatcherClassKey) => MatcherLookup[k];
 
 const MatcherRow = styled.li`

src/components/mock/mock-page.tsx

@@ -12,7 +12,7 @@ import { uploadFile, saveFile } from '../../util/ui';
 
 import { RulesStore } from '../../model/rules/rules-store';
 import { AccountStore } from '../../model/account/account-store';
-import { getNewRule } from '../../model/rules/rule-definitions';
+import { getNewRule } from '../../model/rules/rule-creation';
 import {
     cloneItem,
     getItemAtPath,

src/components/mock/mock-rule-list.tsx

@@ -8,7 +8,6 @@ import { styled } from '../../styles';
 
 import {
     areItemsEqual,
-    HtkMockRule,
     HtkMockRuleGroup,
     ItemPath,
     findItemPath,
@@ -19,6 +18,7 @@ import {
     getItemAtPath,
     findItem,
 } from '../../model/rules/rules-structure';
+import { HtkMockRule } from '../../model/rules/rules';
 
 import { GroupHeader, GroupTail } from './mock-rule-group';
 import { AddRuleRow, RuleRow } from './mock-rule-row';

src/components/mock/mock-rule-row.tsx

@@ -10,8 +10,8 @@ import { styled, css } from '../../styles';
 import { Icon } from '../../icons';
 
 import { getMethodColor } from '../../model/events/categorization';
-import { Matcher, Handler, isPaidHandler } from '../../model/rules/rules';
-import { HtkMockRule, ItemPath } from '../../model/rules/rules-structure';
+import { HtkMockRule, Matcher, Handler, isPaidHandler } from '../../model/rules/rules';
+import { ItemPath } from '../../model/rules/rules-structure';
 import {
     summarizeMatcher,
     summarizeHandler
@@ -290,6 +290,9 @@ export class RuleRow extends React.Component<{
             getPro
         } = this.props.accountStore!;
 
+        // Hide non-HTTP rules (...for now)
+        if (rule.type !== 'http') return null;
+
         const initialMatcher = rule.matchers.length ? rule.matchers[0] : undefined;
 
         let method: string | undefined;

src/components/view/http/http-details-footer.tsx

@@ -8,7 +8,7 @@ import { Ctrl } from '../../../util/ui';
 
 import { HttpExchange } from '../../../model/http/exchange';
 import { RulesStore } from '../../../model/rules/rules-store';
-import { buildRuleFromExchange } from '../../../model/rules/rule-definitions';
+import { buildRuleFromExchange } from '../../../model/rules/rule-creation';
 
 import { HEADER_FOOTER_HEIGHT } from '../view-event-list-footer';
 import { IconButton } from '../../common/icon-button';

src/components/view/http/http-details-pane.tsx

@@ -13,7 +13,7 @@ import { RulesStore } from '../../../model/rules/rules-store';
 import { AccountStore } from '../../../model/account/account-store';
 import { getStatusColor } from '../../../model/events/categorization';
 import { ApiExchange } from '../../../model/api/api-interfaces';
-import { buildRuleFromRequest } from '../../../model/rules/rule-definitions';
+import { buildRuleFromRequest } from '../../../model/rules/rule-creation';
 import { WebSocketStream } from '../../../model/websockets/websocket-stream';
 
 import { Pill } from '../../common/pill';