mockrtc 0.4.0 → 0.5.1

package/src/handling/handler-step-definitions.ts

@@ -6,6 +6,7 @@
 import * as PluggableAdmin from 'mockttp/dist/pluggable-admin-api/pluggable-admin.browser';
 
 import { MockRTCSessionDescription } from '../mockrtc';
+import type { RTCConnection } from '../webrtc/rtc-connection';
 
 export type Serializable = PluggableAdmin.Serialization.Serializable;
 export const { Serializable } = PluggableAdmin.Serialization;
@@ -15,9 +16,10 @@ export interface HandlerStepDefinition extends Serializable {
     readonly type: keyof typeof StepDefinitionLookup;
 }
 
-export class WaitForDurationStepDefinition extends Serializable implements HandlerStepDefinition {
+export class WaitForDurationStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'wait-for-duration';
+    static readonly isFinal = false;
 
     constructor(
         public readonly durationMs: number
@@ -31,9 +33,10 @@ export class WaitForDurationStepDefinition extends Serializable implements Handl
 
 }
 
-export class WaitForChannelStepDefinition extends Serializable implements HandlerStepDefinition {
+export class WaitForChannelStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'wait-for-rtc-data-channel';
+    static readonly isFinal = false;
 
     constructor(
         public readonly channelLabel?: string
@@ -47,9 +50,10 @@ export class WaitForChannelStepDefinition extends Serializable implements Handle
 
 }
 
-export class WaitForMessageStepDefinition extends Serializable implements HandlerStepDefinition {
+export class WaitForMessageStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'wait-for-rtc-message';
+    static readonly isFinal = false;
 
     constructor(
         public readonly channelLabel?: string
@@ -63,9 +67,10 @@ export class WaitForMessageStepDefinition extends Serializable implements Handle
 
 }
 
-export class WaitForTrackStepDefinition extends Serializable implements HandlerStepDefinition {
+export class WaitForTrackStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'wait-for-rtc-track';
+    static readonly isFinal = false;
 
     explain() {
         return `wait for an RTC track`;
@@ -73,9 +78,10 @@ export class WaitForTrackStepDefinition extends Serializable implements HandlerS
 
 }
 
-export class WaitForMediaStepDefinition extends Serializable implements HandlerStepDefinition {
+export class WaitForMediaStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'wait-for-rtc-media';
+    static readonly isFinal = false;
 
     explain() {
         return `wait for RTC media data`;
@@ -83,9 +89,10 @@ export class WaitForMediaStepDefinition extends Serializable implements HandlerS
 
 }
 
-export class CreateChannelStepDefinition extends Serializable implements HandlerStepDefinition {
+export class CreateChannelStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'create-rtc-data-channel';
+    static readonly isFinal = false;
 
     constructor(
         public readonly channelLabel: string
@@ -99,9 +106,10 @@ export class CreateChannelStepDefinition extends Serializable implements Handler
 
 }
 
-export class SendStepDefinition extends Serializable implements HandlerStepDefinition {
+export class SendStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'send-rtc-data-message';
+    static readonly isFinal = false;
 
     constructor(
         public readonly channelLabel: string | undefined,
@@ -116,9 +124,10 @@ export class SendStepDefinition extends Serializable implements HandlerStepDefin
 
 }
 
-export class CloseStepDefinition extends Serializable implements HandlerStepDefinition {
+export class CloseStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'close-rtc-connection';
+    static readonly isFinal = true;
 
     explain() {
         return `close the RTC connection`;
@@ -126,9 +135,10 @@ export class CloseStepDefinition extends Serializable implements HandlerStepDefi
 
 }
 
-export class EchoStepDefinition extends Serializable implements HandlerStepDefinition {
+export class EchoStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'echo-rtc';
+    static readonly isFinal = true;
 
     explain() {
         return `echo all RTC media & data`;
@@ -136,9 +146,12 @@ export class EchoStepDefinition extends Serializable implements HandlerStepDefin
 
 }
 
-export class PeerProxyStepDefinition extends Serializable implements HandlerStepDefinition {
+export class PeerProxyStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'rtc-peer-proxy';
+    static readonly isFinal = true;
+
+    protected externalConnections: RTCConnection[] = []; // Set here so it can be used in impl subclass
 
     protected getAnswer: (offer: MockRTCSessionDescription) => Promise<RTCSessionDescriptionInit>;
 
@@ -177,9 +190,12 @@ export class PeerProxyStepDefinition extends Serializable implements HandlerStep
 
 }
 
-export class DynamicProxyStepDefinition extends Serializable implements HandlerStepDefinition {
+export class DynamicProxyStep extends Serializable implements HandlerStepDefinition {
 
     readonly type = 'rtc-dynamic-proxy';
+    static readonly isFinal = true;
+
+    protected externalConnections: RTCConnection[] = []; // Set here so it can be used in impl subclass
 
     explain() {
         return `proxy the RTC connection to a remote peer`;
@@ -188,15 +204,15 @@ export class DynamicProxyStepDefinition extends Serializable implements HandlerS
 }
 
 export const StepDefinitionLookup = {
-    'wait-for-duration': WaitForDurationStepDefinition,
-    'wait-for-rtc-data-channel': WaitForChannelStepDefinition,
-    'wait-for-rtc-track': WaitForTrackStepDefinition,
-    'wait-for-rtc-media': WaitForMediaStepDefinition,
-    'wait-for-rtc-message': WaitForMessageStepDefinition,
-    'create-rtc-data-channel': CreateChannelStepDefinition,
-    'send-rtc-data-message': SendStepDefinition,
-    'close-rtc-connection': CloseStepDefinition,
-    'echo-rtc': EchoStepDefinition,
-    'rtc-peer-proxy': PeerProxyStepDefinition,
-    'rtc-dynamic-proxy': DynamicProxyStepDefinition
+    'wait-for-duration': WaitForDurationStep,
+    'wait-for-rtc-data-channel': WaitForChannelStep,
+    'wait-for-rtc-track': WaitForTrackStep,
+    'wait-for-rtc-media': WaitForMediaStep,
+    'wait-for-rtc-message': WaitForMessageStep,
+    'create-rtc-data-channel': CreateChannelStep,
+    'send-rtc-data-message': SendStep,
+    'close-rtc-connection': CloseStep,
+    'echo-rtc': EchoStep,
+    'rtc-peer-proxy': PeerProxyStep,
+    'rtc-dynamic-proxy': DynamicProxyStep
 };

package/src/handling/{handler-steps.ts → handler-step-impls.ts}

@@ -12,27 +12,27 @@ import type { MockRTCConnection } from '../webrtc/mockrtc-connection';
 import { RTCConnection } from '../webrtc/rtc-connection';
 import {
     StepDefinitionLookup,
-    CloseStepDefinition,
-    DynamicProxyStepDefinition,
-    EchoStepDefinition,
+    CloseStep,
+    DynamicProxyStep,
+    EchoStep,
     HandlerStepDefinition,
-    PeerProxyStepDefinition,
-    CreateChannelStepDefinition,
-    SendStepDefinition,
-    WaitForChannelStepDefinition,
-    WaitForDurationStepDefinition,
-    WaitForMediaStepDefinition,
-    WaitForMessageStepDefinition,
-    WaitForTrackStepDefinition
+    PeerProxyStep,
+    CreateChannelStep,
+    SendStep,
+    WaitForChannelStep,
+    WaitForDurationStep,
+    WaitForMediaStep,
+    WaitForMessageStep,
+    WaitForTrackStep
 } from './handler-step-definitions';
 
 type ClientServerChannel = PluggableAdmin.Serialization.ClientServerChannel;
 
-export interface HandlerStep extends HandlerStepDefinition {
+export interface HandlerStepImpl extends HandlerStepDefinition {
     handle(connection: MockRTCConnection): Promise<void>;
 }
 
-export class WaitForDurationStep extends WaitForDurationStepDefinition {
+export class WaitForDurationStepImpl extends WaitForDurationStep {
 
     async handle(): Promise<void> {
         return new Promise<void>((resolve) => setTimeout(resolve, this.durationMs));
@@ -40,7 +40,7 @@ export class WaitForDurationStep extends WaitForDurationStepDefinition {
 
 }
 
-export class WaitForChannelStep extends WaitForChannelStepDefinition {
+export class WaitForChannelStepImpl extends WaitForChannelStep {
 
     private matchesChannel(channel: DataChannelStream) {
         return this.channelLabel === undefined || this.channelLabel === channel.label;
@@ -62,7 +62,7 @@ export class WaitForChannelStep extends WaitForChannelStepDefinition {
 
 }
 
-export class WaitForMessageStep extends WaitForMessageStepDefinition {
+export class WaitForMessageStepImpl extends WaitForMessageStep {
 
     private matchesChannel(channel: DataChannelStream) {
         return this.channelLabel === undefined || this.channelLabel === channel.label;
@@ -93,7 +93,7 @@ export class WaitForMessageStep extends WaitForMessageStepDefinition {
 
 }
 
-export class WaitForTrackStep extends WaitForTrackStepDefinition {
+export class WaitForTrackStepImpl extends WaitForTrackStep {
 
     async handle(connection: MockRTCConnection): Promise<void> {
         await new Promise<void>((resolve) => {
@@ -104,7 +104,7 @@ export class WaitForTrackStep extends WaitForTrackStepDefinition {
 
 }
 
-export class WaitForMediaStep extends WaitForMediaStepDefinition {
+export class WaitForMediaStepImpl extends WaitForMediaStep {
 
     async handle(connection: MockRTCConnection): Promise<void> {
         return new Promise<void>((resolve) => {
@@ -129,7 +129,7 @@ export class WaitForMediaStep extends WaitForMediaStepDefinition {
 
 }
 
-export class CreateChannelStep extends CreateChannelStepDefinition {
+export class CreateChannelStepImpl extends CreateChannelStep {
 
     async handle(conn: MockRTCConnection): Promise<void> {
         const channel = conn.createDataChannel(this.channelLabel);
@@ -140,7 +140,7 @@ export class CreateChannelStep extends CreateChannelStepDefinition {
 
 }
 
-export class SendStep extends SendStepDefinition {
+export class SendStepImpl extends SendStep {
 
     private matchesChannel(channel: DataChannelStream) {
         return this.channelLabel === undefined || this.channelLabel === channel.label;
@@ -177,7 +177,7 @@ export class SendStep extends SendStepDefinition {
 
 }
 
-export class CloseStep extends CloseStepDefinition {
+export class CloseStepImpl extends CloseStep {
 
     async handle(connection: MockRTCConnection): Promise<void> {
         await connection.close();
@@ -185,7 +185,7 @@ export class CloseStep extends CloseStepDefinition {
 
 }
 
-export class EchoStep extends EchoStepDefinition {
+export class EchoStepImpl extends EchoStep {
 
     async handle(connection: MockRTCConnection): Promise<void> {
         const echoContent = (stream: DataChannelStream | MediaTrackStream) => {
@@ -203,9 +203,7 @@ export class EchoStep extends EchoStepDefinition {
 
 }
 
-export class PeerProxyStep extends PeerProxyStepDefinition {
-
-    private externalConnections: RTCConnection[] = [];
+export class PeerProxyStepImpl extends PeerProxyStep {
 
     async handle(connection: MockRTCConnection) {
         const externalConn = new RTCConnection();
@@ -250,12 +248,11 @@ export class PeerProxyStep extends PeerProxyStepDefinition {
 
 }
 
-export class DynamicProxyStep extends DynamicProxyStepDefinition {
-
-    private externalConnections: RTCConnection[] = [];
+export class DynamicProxyStepImpl extends DynamicProxyStep {
 
     async handle(connection: MockRTCConnection) {
-        await connection.proxyTrafficToExternalConnection();
+        const externalConn = await connection.proxyTrafficToExternalConnection();
+        this.externalConnections.push(externalConn);
 
         // This step keeps running indefinitely, until the connection closes
         return new Promise<void>((resolve) => connection.on('connection-closed', resolve));
@@ -268,15 +265,15 @@ export class DynamicProxyStep extends DynamicProxyStepDefinition {
 }
 
 export const StepLookup: typeof StepDefinitionLookup = {
-    'wait-for-duration': WaitForDurationStep,
-    'wait-for-rtc-data-channel': WaitForChannelStep,
-    'wait-for-rtc-track': WaitForTrackStep,
-    'wait-for-rtc-media': WaitForMediaStep,
-    'wait-for-rtc-message': WaitForMessageStep,
-    'create-rtc-data-channel': CreateChannelStep,
-    'send-rtc-data-message': SendStep,
-    'close-rtc-connection': CloseStep,
-    'echo-rtc': EchoStep,
-    'rtc-peer-proxy': PeerProxyStep,
-    'rtc-dynamic-proxy': DynamicProxyStep
+    'wait-for-duration': WaitForDurationStepImpl,
+    'wait-for-rtc-data-channel': WaitForChannelStepImpl,
+    'wait-for-rtc-track': WaitForTrackStepImpl,
+    'wait-for-rtc-media': WaitForMediaStepImpl,
+    'wait-for-rtc-message': WaitForMessageStepImpl,
+    'create-rtc-data-channel': CreateChannelStepImpl,
+    'send-rtc-data-message': SendStepImpl,
+    'close-rtc-connection': CloseStepImpl,
+    'echo-rtc': EchoStepImpl,
+    'rtc-peer-proxy': PeerProxyStepImpl,
+    'rtc-dynamic-proxy': DynamicProxyStepImpl
 };

package/src/main-browser.ts

@@ -10,8 +10,8 @@ import type {
 import { MockRTCClient, MockRTCClientOptions } from "./client/mockrtc-client";
 
 // Export the required structures to remotely build and send rules to the admin API:
-export * as HandlerStepDefinitions from "./handling/handler-step-definitions";
-export * as MatcherDefinitions from "./matching/matcher-definitions";
+export * as steps from "./handling/handler-step-definitions";
+export * as matchers from "./matching/matcher-definitions";
 export { MockRTCAdminRequestBuilder } from "./client/mockrtc-admin-request-builder";
 
 export type {

package/src/main.ts

@@ -22,12 +22,12 @@ export { MockRTCAdminPlugin } from "./server/mockrtc-admin-plugin";
 import { MockRTCClient, MockRTCClientOptions } from "./client/mockrtc-client";
 
 // Export the required structures to remotely build and send rules to the admin API:
-export * as HandlerStepDefinitions from "./handling/handler-step-definitions";
-export * as MatcherDefinitions from "./matching/matcher-definitions";
+export * as steps from "./handling/handler-step-definitions";
+export * as matchers from "./matching/matcher-definitions";
 export { MockRTCAdminRequestBuilder } from "./client/mockrtc-admin-request-builder";
 
 // Re-export lots of types are used in various APIs (mostly to make TypeDoc happy):
-export type { HandlerStep } from "./handling/handler-steps";
+export type { HandlerStepImpl as HandlerStep } from "./handling/handler-step-impls";
 export type { MockRTCHandlerBuilder } from "./handling/handler-builder";
 export type { MockRTCRuleBuilder, RuleHandlerBuilder } from "./rule-builder";
 

package/src/matching/matcher-definitions.ts

@@ -12,7 +12,7 @@ export interface MatcherDefinition extends Serializable {
     readonly type: keyof typeof MatcherDefinitionLookup;
 }
 
-export class HasDataChannelMatcherDefinition extends Serializable implements MatcherDefinition {
+export class HasDataChannelMatcher extends Serializable implements MatcherDefinition {
     readonly type = 'has-rtc-data-channel';
 
     explain() {
@@ -20,7 +20,7 @@ export class HasDataChannelMatcherDefinition extends Serializable implements Mat
     }
 }
 
-export class HasVideoTrackMatcherDefinition extends Serializable implements MatcherDefinition {
+export class HasVideoTrackMatcher extends Serializable implements MatcherDefinition {
     readonly type = 'has-rtc-video-track';
 
     explain() {
@@ -28,7 +28,7 @@ export class HasVideoTrackMatcherDefinition extends Serializable implements Matc
     }
 }
 
-export class HasAudioTrackMatcherDefinition extends Serializable implements MatcherDefinition {
+export class HasAudioTrackMatcher extends Serializable implements MatcherDefinition {
     readonly type = 'has-rtc-audio-track';
 
     explain() {
@@ -36,7 +36,7 @@ export class HasAudioTrackMatcherDefinition extends Serializable implements Matc
     }
 }
 
-export class HasMediaTrackMatcherDefinition extends Serializable implements MatcherDefinition {
+export class HasMediaTrackMatcher extends Serializable implements MatcherDefinition {
     readonly type = 'has-rtc-media-track';
 
     explain() {
@@ -44,7 +44,7 @@ export class HasMediaTrackMatcherDefinition extends Serializable implements Matc
     }
 }
 
-export class HostnameMatcherDefinition extends Serializable implements MatcherDefinition {
+export class HostnameMatcher extends Serializable implements MatcherDefinition {
 
     readonly type = 'rtc-page-hostname';
 
@@ -60,7 +60,7 @@ export class HostnameMatcherDefinition extends Serializable implements MatcherDe
 
 }
 
-export class UrlRegexMatcherDefinition extends Serializable implements MatcherDefinition {
+export class UrlRegexMatcher extends Serializable implements MatcherDefinition {
 
     readonly type = 'rtc-page-regex';
 
@@ -79,7 +79,7 @@ export class UrlRegexMatcherDefinition extends Serializable implements MatcherDe
 
 }
 
-export class UserAgentRegexMatcherDefinition  extends Serializable implements MatcherDefinition {
+export class UserAgentRegexMatcher  extends Serializable implements MatcherDefinition {
 
     readonly type = 'rtc-user-agent-regex';
 
@@ -99,11 +99,11 @@ export class UserAgentRegexMatcherDefinition  extends Serializable implements Ma
 }
 
 export const MatcherDefinitionLookup = {
-    'has-rtc-data-channel': HasDataChannelMatcherDefinition,
-    'has-rtc-video-track': HasVideoTrackMatcherDefinition,
-    'has-rtc-audio-track': HasAudioTrackMatcherDefinition,
-    'has-rtc-media-track': HasMediaTrackMatcherDefinition,
-    'rtc-page-hostname': HostnameMatcherDefinition,
-    'rtc-page-regex': UrlRegexMatcherDefinition,
-    'rtc-user-agent-regex': UserAgentRegexMatcherDefinition
+    'has-rtc-data-channel': HasDataChannelMatcher,
+    'has-rtc-video-track': HasVideoTrackMatcher,
+    'has-rtc-audio-track': HasAudioTrackMatcher,
+    'has-rtc-media-track': HasMediaTrackMatcher,
+    'rtc-page-hostname': HostnameMatcher,
+    'rtc-page-regex': UrlRegexMatcher,
+    'rtc-user-agent-regex': UserAgentRegexMatcher
 };

package/src/matching/{matchers.ts → matcher-impls.ts}

@@ -7,20 +7,20 @@ import { RTCConnection } from "../webrtc/rtc-connection";
 import {
     MatcherDefinition,
     MatcherDefinitionLookup,
-    HasAudioTrackMatcherDefinition,
-    HasDataChannelMatcherDefinition,
-    HasMediaTrackMatcherDefinition,
-    HasVideoTrackMatcherDefinition,
-    HostnameMatcherDefinition,
-    UrlRegexMatcherDefinition,
-    UserAgentRegexMatcherDefinition
+    HasAudioTrackMatcher,
+    HasDataChannelMatcher,
+    HasMediaTrackMatcher,
+    HasVideoTrackMatcher,
+    HostnameMatcher,
+    UrlRegexMatcher,
+    UserAgentRegexMatcher
 } from "./matcher-definitions";
 
-export interface Matcher extends MatcherDefinition {
+export interface MatcherImpl extends MatcherDefinition {
     matches(connection: RTCConnection): boolean;
 }
 
-export class HasDataChannelMatcher extends HasDataChannelMatcherDefinition {
+export class HasDataChannelMatcherImpl extends HasDataChannelMatcher {
 
     matches(connection: RTCConnection): boolean {
         return [
@@ -31,7 +31,7 @@ export class HasDataChannelMatcher extends HasDataChannelMatcherDefinition {
 
 }
 
-export class HasVideoTrackMatcher extends HasVideoTrackMatcherDefinition {
+export class HasVideoTrackMatcherImpl extends HasVideoTrackMatcher {
 
     matches(connection: RTCConnection): boolean {
         return [
@@ -42,7 +42,7 @@ export class HasVideoTrackMatcher extends HasVideoTrackMatcherDefinition {
 
 }
 
-export class HasAudioTrackMatcher extends HasAudioTrackMatcherDefinition {
+export class HasAudioTrackMatcherImpl extends HasAudioTrackMatcher {
 
     matches(connection: RTCConnection): boolean {
         return [
@@ -53,7 +53,7 @@ export class HasAudioTrackMatcher extends HasAudioTrackMatcherDefinition {
 
 }
 
-export class HasMediaTrackMatcher extends HasMediaTrackMatcherDefinition {
+export class HasMediaTrackMatcherImpl extends HasMediaTrackMatcher {
 
     matches(connection: RTCConnection): boolean {
         return [
@@ -76,7 +76,7 @@ const getConnectionSourceURL = (connection: RTCConnection): URL | undefined => {
     }
 };
 
-export class HostnameMatcher extends HostnameMatcherDefinition {
+export class HostnameMatcherImpl extends HostnameMatcher {
 
     matches(connection: RTCConnection): boolean {
         const url = getConnectionSourceURL(connection);
@@ -85,7 +85,7 @@ export class HostnameMatcher extends HostnameMatcherDefinition {
 
 }
 
-export class UrlRegexMatcher extends UrlRegexMatcherDefinition {
+export class UrlRegexMatcherImpl extends UrlRegexMatcher {
 
     matches(connection: RTCConnection): boolean {
         const url = getConnectionSourceURL(connection);
@@ -96,7 +96,7 @@ export class UrlRegexMatcher extends UrlRegexMatcherDefinition {
 
 }
 
-export class UserAgentRegexMatcher extends UserAgentRegexMatcherDefinition {
+export class UserAgentRegexMatcherImpl extends UserAgentRegexMatcher {
 
     matches(connection: RTCConnection): boolean {
         const userAgent = connection.metadata.userAgent;
@@ -108,11 +108,11 @@ export class UserAgentRegexMatcher extends UserAgentRegexMatcherDefinition {
 }
 
 export const MatcherLookup: typeof MatcherDefinitionLookup = {
-    'has-rtc-data-channel': HasDataChannelMatcher,
-    'has-rtc-video-track': HasVideoTrackMatcher,
-    'has-rtc-audio-track': HasAudioTrackMatcher,
-    'has-rtc-media-track': HasMediaTrackMatcher,
-    'rtc-page-hostname': HostnameMatcher,
-    'rtc-page-regex': UrlRegexMatcher,
-    'rtc-user-agent-regex': UserAgentRegexMatcher
+    'has-rtc-data-channel': HasDataChannelMatcherImpl,
+    'has-rtc-video-track': HasVideoTrackMatcherImpl,
+    'has-rtc-audio-track': HasAudioTrackMatcherImpl,
+    'has-rtc-media-track': HasMediaTrackMatcherImpl,
+    'rtc-page-hostname': HostnameMatcherImpl,
+    'rtc-page-regex': UrlRegexMatcherImpl,
+    'rtc-user-agent-regex': UserAgentRegexMatcherImpl
 };

package/src/rule-builder.ts

@@ -7,13 +7,13 @@ import { MockRTCHandlerBuilder } from "./handling/handler-builder";
 import { HandlerStepDefinition } from "./handling/handler-step-definitions";
 import {
     MatcherDefinition,
-    HostnameMatcherDefinition,
-    UrlRegexMatcherDefinition,
-    UserAgentRegexMatcherDefinition,
-    HasAudioTrackMatcherDefinition,
-    HasVideoTrackMatcherDefinition,
-    HasMediaTrackMatcherDefinition,
-    HasDataChannelMatcherDefinition
+    HostnameMatcher,
+    UrlRegexMatcher,
+    UserAgentRegexMatcher,
+    HasAudioTrackMatcher,
+    HasVideoTrackMatcher,
+    HasMediaTrackMatcher,
+    HasDataChannelMatcher
 } from "./matching/matcher-definitions";
 
 export type RuleHandlerBuilder = MockRTCHandlerBuilder<void>;
@@ -38,7 +38,7 @@ export class MockRTCRuleBuilder implements Omit<RuleHandlerBuilder, 'handlerStep
      * Match RTC connections whose initial negotiation includes a data channel.
      */
     withDataChannels() {
-        this.matchers.push(new HasDataChannelMatcherDefinition());
+        this.matchers.push(new HasDataChannelMatcher());
         return this;
     }
 
@@ -47,7 +47,7 @@ export class MockRTCRuleBuilder implements Omit<RuleHandlerBuilder, 'handlerStep
      * media track.
      */
     withMedia() {
-        this.matchers.push(new HasMediaTrackMatcherDefinition());
+        this.matchers.push(new HasMediaTrackMatcher());
         return this;
     }
 
@@ -55,7 +55,7 @@ export class MockRTCRuleBuilder implements Omit<RuleHandlerBuilder, 'handlerStep
      * Match RTC connections whose initial negotiation includes a video media track
      */
     withVideo() {
-        this.matchers.push(new HasVideoTrackMatcherDefinition());
+        this.matchers.push(new HasVideoTrackMatcher());
         return this;
     }
 
@@ -63,7 +63,7 @@ export class MockRTCRuleBuilder implements Omit<RuleHandlerBuilder, 'handlerStep
      * Match RTC connections whose initial negotiation includes an audio media track
      */
     withAudio() {
-        this.matchers.push(new HasAudioTrackMatcherDefinition());
+        this.matchers.push(new HasAudioTrackMatcher());
         return this;
     }
 
@@ -78,7 +78,7 @@ export class MockRTCRuleBuilder implements Omit<RuleHandlerBuilder, 'handlerStep
      * @category Matcher
      */
     fromPageHostname(hostname: string): this {
-        this.matchers.push(new HostnameMatcherDefinition(hostname));
+        this.matchers.push(new HostnameMatcher(hostname));
         return this;
     }
 
@@ -93,7 +93,7 @@ export class MockRTCRuleBuilder implements Omit<RuleHandlerBuilder, 'handlerStep
      * @category Matcher
      */
     fromPageUrlMatching(urlRegex: RegExp): this {
-        this.matchers.push(new UrlRegexMatcherDefinition(urlRegex));
+        this.matchers.push(new UrlRegexMatcher(urlRegex));
         return this;
     }
 
@@ -109,7 +109,7 @@ export class MockRTCRuleBuilder implements Omit<RuleHandlerBuilder, 'handlerStep
      * @category Matcher
      */
     fromUserAgentMatching(userAgentRegEx: RegExp): this {
-        this.matchers.push(new UserAgentRegexMatcherDefinition(userAgentRegEx));
+        this.matchers.push(new UserAgentRegexMatcher(userAgentRegEx));
         return this;
     }