Merge branch 'main' of https://github.com/httptoolkit/httptoolkit-ui

Author: ceifa

package-lock.json

@@ -29,8 +29,8 @@
   "author": "Tim Perry <[email protected]>",
   "license": "AGPL-3.0-or-later",
   "runtimeDependencies": {
-    "httptoolkit-server": ">=1.0.0",
-    "httptoolkit-desktop": ">=1.1.0"
+    "httptoolkit-server": ">=1.9.0",
+    "httptoolkit-desktop": ">=1.7.0"
   },
   "dependencies": {
     "@ethersproject/abi": "^5.7.0",
@@ -107,8 +107,8 @@
     "mobx-react-lite": "^2.2.2",
     "mobx-shallow-undo": "^1.0.0",
     "mobx-utils": "^5.1.0",
-    "mockrtc": "^0.4.0",
-    "mockttp": "^3.17.1",
+    "mockrtc": "^0.5.0",
+    "mockttp": "^4.0.0",
     "monaco-editor": "^0.27.0",
     "node-forge": "^1.3.0",
     "openapi-directory": "^1.3.0",

package.json

@@ -18,7 +18,7 @@ import { EventsStore } from '../../../model/events/events-store';
 
 import {
     MethodMatchers,
-    StaticResponseHandler
+    StaticResponseStep
 } from '../../../model/rules/definitions/http-rule-definitions';
 import { RulesStore } from '../../../model/rules/rules-store';
 import { RulePriority } from '../../../model/rules/rules';
@@ -89,16 +89,16 @@ export function setUpAndroidCertificateRule(
         priority: RulePriority.OVERRIDE,
         matchers: [
             new MethodMatchers.GET(),
-            new matchers.SimplePathMatcher(
+            new matchers.FlexiblePathMatcher(
                 "http://android.httptoolkit.tech/config"
             )
         ],
         completionChecker: new completionCheckers.Always(),
-        handler: new StaticResponseHandler(200, undefined, JSON.stringify({
+        steps: [new StaticResponseStep(200, undefined, JSON.stringify({
             certificate: certContent
         }), {
             'content-type': 'application/json'
-        })
+        })]
     });
 
     // When the next Android config request comes in:

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

@@ -45,10 +45,10 @@ import {
     IpfsArgDescription
 } from '../../model/rules/definitions/ipfs-rule-definitions';
 import {
-    HasDataChannelMatcherDefinition,
-    HasVideoTrackMatcherDefinition,
-    HasAudioTrackMatcherDefinition,
-    HasMediaTrackMatcherDefinition
+    HasDataChannelMatcher,
+    HasVideoTrackMatcher,
+    HasAudioTrackMatcher,
+    HasMediaTrackMatcher
 } from '../../model/rules/definitions/rtc-rule-definitions';
 
 import { Select, TextInput } from '../common/inputs';
@@ -154,7 +154,7 @@ export function AdditionalMatcherConfiguration(props:
         case 'host':
             return <HostMatcherConfig {...configProps} />;
         case 'simple-path':
-            return <SimplePathMatcherConfig {...configProps} />;
+            return <FlexiblePathMatcherConfig {...configProps} />;
         case 'regex-path':
             return <RegexPathMatcherConfig {...configProps} />;
         case 'query':
@@ -447,7 +447,7 @@ class HostMatcherConfig extends MatcherConfig<matchers.HostMatcher> {
 }
 
 @observer
-class SimplePathMatcherConfig extends MatcherConfig<matchers.SimplePathMatcher> {
+class FlexiblePathMatcherConfig extends MatcherConfig<matchers.FlexiblePathMatcher> {
 
     private fieldId = _.uniqueId();
 
@@ -511,7 +511,7 @@ class SimplePathMatcherConfig extends MatcherConfig<matchers.SimplePathMatcher>
             new URL(this.url);
         }
 
-        // We leave the rest of the parsing to the SimplePathMatcher itself
+        // We leave the rest of the parsing to the FlexiblePathMatcher itself
     }
 
     @action.bound
@@ -524,12 +524,12 @@ class SimplePathMatcherConfig extends MatcherConfig<matchers.SimplePathMatcher>
             const [baseUrl, query] = this.url.split('?');
 
             if (query === undefined) {
-                this.props.onChange(new matchers.SimplePathMatcher(baseUrl));
+                this.props.onChange(new matchers.FlexiblePathMatcher(baseUrl));
             } else {
                 if (this.props.matcherIndex !== undefined) this.url = baseUrl;
 
                 this.props.onChange(
-                    new matchers.SimplePathMatcher(baseUrl),
+                    new matchers.FlexiblePathMatcher(baseUrl),
                     new matchers.ExactQueryMatcher('?' + query)
                 );
             }
@@ -1133,10 +1133,10 @@ class EthParamsMatcherConfig extends MatcherConfig<EthereumParamsMatcher> {
 
 @observer
 class RTCContentMatcherConfig<T extends
-    | typeof HasDataChannelMatcherDefinition
-    | typeof HasVideoTrackMatcherDefinition
-    | typeof HasAudioTrackMatcherDefinition
-    | typeof HasMediaTrackMatcherDefinition
+    | typeof HasDataChannelMatcher
+    | typeof HasVideoTrackMatcher
+    | typeof HasAudioTrackMatcher
+    | typeof HasMediaTrackMatcher
 > extends MatcherConfig<InstanceType<T>, { matcherClass?: T, matcherKey: InstanceType<T>['type'] }> {
 
     componentDidMount() {

src/components/modify/handler-selection.tsx

@@ -14,7 +14,7 @@ import { RulesStore } from '../../model/rules/rules-store';
 import { AccountStore } from '../../model/account/account-store';
 
 import { RuleType } from '../../model/rules/rules';
-import { getNewRule, getRuleDefaultHandler } from '../../model/rules/rule-creation';
+import { getNewRule, getRuleDefaultStep } from '../../model/rules/rule-creation';
 import {
     cloneItem,
     getItemAtPath,
@@ -222,7 +222,7 @@ class ModifyPage extends React.Component<ModifyPageProps> {
                     deleteItem={deleteDraftItem}
                     toggleRuleCollapsed={this.toggleRuleCollapsed}
                     updateGroupTitle={updateGroupTitle}
-                    getRuleDefaultHandler={this.getRuleDefaultHandler}
+                    getRuleDefaultStep={this.getRuleDefaultStep}
 
                     moveRule={moveDraftRule}
                     combineRulesAsGroup={combineDraftRulesAsGroup}
@@ -316,8 +316,8 @@ class ModifyPage extends React.Component<ModifyPageProps> {
         this.collapsedRulesMap[ruleId] = !this.collapsedRulesMap[ruleId];
     }
 
-    getRuleDefaultHandler = (type: RuleType) => {
-        return getRuleDefaultHandler(type, this.props.rulesStore);
+    getRuleDefaultStep = (type: RuleType) => {
+        return getRuleDefaultStep(type, this.props.rulesStore);
     };
 
     readonly importRules = async () => {