@zimic/interceptor 0.15.0-canary.0 → 0.15.0-canary.1

package/dist/server.d.ts

@@ -29,31 +29,36 @@ interface InterceptorServerOptions {
  */
 interface InterceptorServer {
     /**
-     * @returns The hostname of the server.
+     * The hostname of the server.
+     *
      * @see {@link https://github.com/zimicjs/zimic/wiki/cli‐zimic‐server#zimic-server `zimic-interceptor server` API reference}
      */
-    hostname: () => string;
+    hostname: string;
     /**
-     * @returns The port of the server.
+     * The port of the server.
+     *
      * @see {@link https://github.com/zimicjs/zimic/wiki/cli‐zimic‐server#zimic-server `zimic-interceptor server` API reference}
      */
-    port: () => number | undefined;
+    port: number | undefined;
     /**
+     * Whether to log warnings about unhandled requests to the console.
+     *
      * @default true
-     * @returns Whether to log warnings about unhandled requests to the console.
      * @see {@link https://github.com/zimicjs/zimic/wiki/cli‐zimic‐server#zimic-server `zimic-interceptor server` API reference}
      */
-    logUnhandledRequests: () => boolean;
+    logUnhandledRequests: boolean;
     /**
-     * @returns The HTTP URL of the server.
+     * The HTTP URL of the server.
+     *
      * @see {@link https://github.com/zimicjs/zimic/wiki/cli‐zimic‐server#zimic-server `zimic-interceptor server` API reference}
      */
-    httpURL: () => string | undefined;
+    httpURL: string | undefined;
     /**
-     * @returns Whether the server is running.
+     * Whether the server is running.
+     *
      * @see {@link https://github.com/zimicjs/zimic/wiki/cli‐zimic‐server#zimic-server `zimic-interceptor server` API reference}
      */
-    isRunning: () => boolean;
+    isRunning: boolean;
     /**
      * Starts the server.
      *

package/dist/server.js

@@ -1,25 +1,25 @@
 'use strict';
 
-var chunkL6Y4EV6T_js = require('./chunk-L6Y4EV6T.js');
+var chunkCWBDZYUG_js = require('./chunk-CWBDZYUG.js');
 require('./chunk-WCQVDF3K.js');
 
 
 
 Object.defineProperty(exports, "DEFAULT_ACCESS_CONTROL_HEADERS", {
   enumerable: true,
-  get: function () { return chunkL6Y4EV6T_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
+  get: function () { return chunkCWBDZYUG_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
 });
 Object.defineProperty(exports, "DEFAULT_PREFLIGHT_STATUS_CODE", {
   enumerable: true,
-  get: function () { return chunkL6Y4EV6T_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
+  get: function () { return chunkCWBDZYUG_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
 });
 Object.defineProperty(exports, "NotStartedInterceptorServerError", {
   enumerable: true,
-  get: function () { return chunkL6Y4EV6T_js.NotStartedInterceptorServerError_default; }
+  get: function () { return chunkCWBDZYUG_js.NotStartedInterceptorServerError_default; }
 });
 Object.defineProperty(exports, "interceptorServer", {
   enumerable: true,
-  get: function () { return chunkL6Y4EV6T_js.interceptorServer; }
+  get: function () { return chunkCWBDZYUG_js.interceptorServer; }
 });
 //# sourceMappingURL=server.js.map
 //# sourceMappingURL=server.js.map

package/dist/server.mjs

@@ -1,4 +1,4 @@
-export { DEFAULT_ACCESS_CONTROL_HEADERS, DEFAULT_PREFLIGHT_STATUS_CODE, NotStartedInterceptorServerError_default as NotStartedInterceptorServerError, interceptorServer } from './chunk-YGJD3JT6.mjs';
+export { DEFAULT_ACCESS_CONTROL_HEADERS, DEFAULT_PREFLIGHT_STATUS_CODE, NotStartedInterceptorServerError_default as NotStartedInterceptorServerError, interceptorServer } from './chunk-3O3YPVEG.mjs';
 import './chunk-CGILA3WO.mjs';
 //# sourceMappingURL=server.mjs.map
 //# sourceMappingURL=server.mjs.map

package/package.json

@@ -14,7 +14,7 @@
     "api",
     "static"
   ],
-  "version": "0.15.0-canary.0",
+  "version": "0.15.0-canary.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/zimicjs/zimic.git",
@@ -98,8 +98,8 @@
     "typescript": "^5.8.2",
     "vitest": "^3.0.7",
     "@zimic/eslint-config-node": "0.0.0",
-    "@zimic/tsconfig": "0.0.0",
     "@zimic/lint-staged-config": "0.0.0",
+    "@zimic/tsconfig": "0.0.0",
     "@zimic/utils": "0.0.0"
   },
   "peerDependencies": {

package/src/cli/server/start.ts

@@ -59,7 +59,7 @@ async function startInterceptorServer({
 
   await server.start();
 
-  logWithPrefix(`${ephemeral ? 'Ephemeral s' : 'S'}erver is running on ${server.httpURL()}`);
+  logWithPrefix(`${ephemeral ? 'Ephemeral s' : 'S'}erver is running on ${server.httpURL}`);
 
   if (onReady) {
     try {

package/src/http/interceptor/HttpInterceptorClient.ts

@@ -31,10 +31,11 @@ class HttpInterceptorClient<
 > {
   private worker: HttpInterceptorWorker;
   private store: HttpInterceptorStore;
+
   private _baseURL: URL;
-  private _isRunning = false;
-  private _onUnhandledRequest?: UnhandledRequestStrategy;
-  private _shouldSaveRequests = false;
+  isRunning = false;
+  onUnhandledRequest?: UnhandledRequestStrategy;
+  shouldSaveRequests = false;
 
   private Handler: HandlerConstructor;
 
@@ -62,34 +63,22 @@ class HttpInterceptorClient<
     this.store = options.store;
     this._baseURL = options.baseURL;
     this.Handler = options.Handler;
-    this._onUnhandledRequest = options.onUnhandledRequest;
-    this._shouldSaveRequests = options.saveRequests ?? false;
+    this.onUnhandledRequest = options.onUnhandledRequest;
+    this.shouldSaveRequests = options.saveRequests ?? false;
   }
 
-  baseURL() {
+  get baseURLAsString() {
     const baseURL = this._baseURL;
 
     if (baseURL.href === `${baseURL.origin}/`) {
       return baseURL.origin;
     }
 
-    return baseURL.toString();
-  }
-
-  platform() {
-    return this.worker.platform();
-  }
-
-  onUnhandledRequest() {
-    return this._onUnhandledRequest;
-  }
-
-  isRunning() {
-    return this.worker.isRunning() && this._isRunning;
+    return baseURL.href;
   }
 
-  shouldSaveRequests() {
-    return this._shouldSaveRequests;
+  get platform() {
+    return this.worker.platform;
   }
 
   async start() {
@@ -115,12 +104,12 @@ class HttpInterceptorClient<
     } else {
       this.store.markRemoteInterceptorAsRunning(this, isRunning, this._baseURL);
     }
-    this._isRunning = isRunning;
+    this.isRunning = isRunning;
   }
 
   private numberOfRunningInterceptors() {
     if (this.worker instanceof LocalHttpInterceptorWorker) {
-      return this.store.numberOfRunningLocalInterceptors();
+      return this.store.numberOfRunningLocalInterceptors;
     } else {
       return this.store.numberOfRunningRemoteInterceptors(this._baseURL);
     }
@@ -158,7 +147,7 @@ class HttpInterceptorClient<
     Method extends HttpSchemaMethod<Schema>,
     Path extends HttpSchemaPath<Schema, Method>,
   >(method: Method, path: Path): HttpRequestHandler<Schema, Method, Path> {
-    if (!this.isRunning()) {
+    if (!this.isRunning) {
       throw new NotStartedHttpInterceptorError();
     }
 
@@ -173,30 +162,30 @@ class HttpInterceptorClient<
     Path extends HttpSchemaPath<Schema, Method>,
     StatusCode extends HttpStatusCode = never,
   >(handler: InternalHttpRequestHandler<Schema, Method, Path, StatusCode>) {
-    const handlerClients = this.handlerClientsByMethod[handler.method()].get(handler.path()) ?? [];
+    const handlerClients = this.handlerClientsByMethod[handler.method].get(handler.path) ?? [];
 
-    const isAlreadyRegistered = handlerClients.includes(handler.client());
+    const isAlreadyRegistered = handlerClients.includes(handler.client);
     if (isAlreadyRegistered) {
       return;
     }
 
-    handlerClients.push(handler.client());
+    handlerClients.push(handler.client);
 
     const isFirstHandlerForMethodPath = handlerClients.length === 1;
     if (!isFirstHandlerForMethodPath) {
       return;
     }
 
-    this.handlerClientsByMethod[handler.method()].set(handler.path(), handlerClients);
+    this.handlerClientsByMethod[handler.method].set(handler.path, handlerClients);
 
-    const url = joinURL(this.baseURL(), handler.path());
+    const url = joinURL(this.baseURLAsString, handler.path);
     const urlRegex = createRegExpFromURL(url);
 
-    const registrationResult = this.worker.use(this, handler.method(), url, async (context) => {
+    const registrationResult = this.worker.use(this, handler.method, url, async (context) => {
       const response = await this.handleInterceptedRequest(
         urlRegex,
-        handler.method(),
-        handler.path(),
+        handler.method,
+        handler.path,
         context as HttpInterceptorRequestContext<Schema, Method, Path>,
       );
       return response;
@@ -225,7 +214,7 @@ class HttpInterceptorClient<
     const responseDeclaration = await matchedHandler.applyResponseDeclaration(parsedRequest);
     const response = HttpInterceptorWorker.createResponseFromDeclaration(request, responseDeclaration);
 
-    if (this.shouldSaveRequests()) {
+    if (this.shouldSaveRequests) {
       const responseClone = response.clone();
 
       const parsedResponse = await HttpInterceptorWorker.parseRawResponse<
@@ -275,7 +264,7 @@ class HttpInterceptorClient<
   }
 
   clear(options: { onCommitSuccess?: () => void; onCommitError?: () => void } = {}) {
-    if (!this.isRunning()) {
+    if (!this.isRunning) {
       throw new NotStartedHttpInterceptorError();
     }
 

package/src/http/interceptor/HttpInterceptorStore.ts

@@ -16,7 +16,7 @@ class HttpInterceptorStore {
 
   private class = HttpInterceptorStore;
 
-  localWorker() {
+  get localWorker() {
     return this.class._localWorker;
   }
 
@@ -24,7 +24,7 @@ class HttpInterceptorStore {
     return this.class.remoteWorkers.get(baseURL.origin);
   }
 
-  numberOfRunningLocalInterceptors() {
+  get numberOfRunningLocalInterceptors() {
     return this.class.runningLocalInterceptors.size;
   }
 

package/src/http/interceptor/LocalHttpInterceptor.ts

@@ -13,7 +13,8 @@ class LocalHttpInterceptor<Schema extends HttpSchema> implements PublicLocalHttp
   readonly type: 'local';
 
   private store = new HttpInterceptorStore();
-  private _client: HttpInterceptorClient<Schema>;
+
+  client: HttpInterceptorClient<Schema>;
 
   constructor(options: LocalHttpInterceptorOptions) {
     this.type = options.type;
@@ -24,7 +25,7 @@ class LocalHttpInterceptor<Schema extends HttpSchema> implements PublicLocalHttp
 
     const worker = this.store.getOrCreateLocalWorker({});
 
-    this._client = new HttpInterceptorClient<Schema>({
+    this.client = new HttpInterceptorClient<Schema>({
       worker,
       store: this.store,
       baseURL,
@@ -34,73 +35,69 @@ class LocalHttpInterceptor<Schema extends HttpSchema> implements PublicLocalHttp
     });
   }
 
-  client() {
-    return this._client;
-  }
-
-  baseURL() {
-    return this._client.baseURL();
+  get baseURL() {
+    return this.client.baseURLAsString;
   }
 
-  platform() {
-    return this._client.platform();
+  get platform() {
+    return this.client.platform;
   }
 
-  isRunning() {
-    return this._client.isRunning();
+  get isRunning() {
+    return this.client.isRunning;
   }
 
   async start() {
-    if (this.isRunning()) {
+    if (this.isRunning) {
       return;
     }
 
-    await this._client.start();
+    await this.client.start();
   }
 
   async stop() {
-    if (!this.isRunning()) {
+    if (!this.isRunning) {
       return;
     }
 
     this.clear();
-    await this._client.stop();
+    await this.client.stop();
   }
 
   get = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.get(path);
+    return this.client.get(path);
   }) as unknown as SyncHttpInterceptorMethodHandler<Schema, 'GET'>;
 
   post = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.post(path);
+    return this.client.post(path);
   }) as unknown as SyncHttpInterceptorMethodHandler<Schema, 'POST'>;
 
   patch = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.patch(path);
+    return this.client.patch(path);
   }) as unknown as SyncHttpInterceptorMethodHandler<Schema, 'PATCH'>;
 
   put = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.put(path);
+    return this.client.put(path);
   }) as unknown as SyncHttpInterceptorMethodHandler<Schema, 'PUT'>;
 
   delete = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.delete(path);
+    return this.client.delete(path);
   }) as unknown as SyncHttpInterceptorMethodHandler<Schema, 'DELETE'>;
 
   head = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.head(path);
+    return this.client.head(path);
   }) as unknown as SyncHttpInterceptorMethodHandler<Schema, 'HEAD'>;
 
   options = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.options(path);
+    return this.client.options(path);
   }) as unknown as SyncHttpInterceptorMethodHandler<Schema, 'OPTIONS'>;
 
   checkTimes() {
-    this._client.checkTimes();
+    this.client.checkTimes();
   }
 
   clear() {
-    this._client.clear();
+    this.client.clear();
   }
 }
 

package/src/http/interceptor/RemoteHttpInterceptor.ts

@@ -13,7 +13,8 @@ class RemoteHttpInterceptor<Schema extends HttpSchema> implements PublicRemoteHt
   readonly type: 'remote';
 
   private store = new HttpInterceptorStore();
-  private _client: HttpInterceptorClient<Schema, typeof RemoteHttpRequestHandler>;
+
+  client: HttpInterceptorClient<Schema, typeof RemoteHttpRequestHandler>;
 
   constructor(options: RemoteHttpInterceptorOptions) {
     this.type = options.type;
@@ -26,7 +27,7 @@ class RemoteHttpInterceptor<Schema extends HttpSchema> implements PublicRemoteHt
 
     const worker = this.store.getOrCreateRemoteWorker({ serverURL });
 
-    this._client = new HttpInterceptorClient<Schema, typeof RemoteHttpRequestHandler>({
+    this.client = new HttpInterceptorClient<Schema, typeof RemoteHttpRequestHandler>({
       worker,
       store: this.store,
       baseURL,
@@ -36,71 +37,67 @@ class RemoteHttpInterceptor<Schema extends HttpSchema> implements PublicRemoteHt
     });
   }
 
-  client() {
-    return this._client;
-  }
-
-  baseURL() {
-    return this._client.baseURL();
+  get baseURL() {
+    return this.client.baseURLAsString;
   }
 
-  platform() {
-    return this._client.platform();
+  get platform() {
+    return this.client.platform;
   }
 
-  isRunning() {
-    return this._client.isRunning();
+  get isRunning() {
+    return this.client.isRunning;
   }
 
   async start() {
-    if (this.isRunning()) {
+    if (this.isRunning) {
       return;
     }
 
-    await this._client.start();
+    await this.client.start();
   }
 
   async stop() {
-    if (!this.isRunning()) {
+    if (!this.isRunning) {
       return;
     }
 
     await this.clear();
-    await this._client.stop();
+    await this.client.stop();
   }
 
   get = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.get(path);
+    return this.client.get(path);
   }) as unknown as AsyncHttpInterceptorMethodHandler<Schema, 'GET'>;
 
   post = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.post(path);
+    return this.client.post(path);
   }) as unknown as AsyncHttpInterceptorMethodHandler<Schema, 'POST'>;
 
   patch = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.patch(path);
+    return this.client.patch(path);
   }) as unknown as AsyncHttpInterceptorMethodHandler<Schema, 'PATCH'>;
 
   put = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.put(path);
+    return this.client.put(path);
   }) as unknown as AsyncHttpInterceptorMethodHandler<Schema, 'PUT'>;
 
   delete = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.delete(path);
+    return this.client.delete(path);
   }) as unknown as AsyncHttpInterceptorMethodHandler<Schema, 'DELETE'>;
 
   head = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.head(path);
+    return this.client.head(path);
   }) as unknown as AsyncHttpInterceptorMethodHandler<Schema, 'HEAD'>;
 
   options = ((path: HttpSchemaPath<Schema, HttpSchemaMethod<Schema>>) => {
-    return this._client.options(path);
+    return this.client.options(path);
   }) as unknown as AsyncHttpInterceptorMethodHandler<Schema, 'OPTIONS'>;
 
   checkTimes() {
     return new Promise<void>((resolve, reject) => {
       try {
-        this._client.checkTimes();
+        this.client.checkTimes();
         resolve();
       } catch (error) {
         reject(error);
@@ -110,7 +107,7 @@ class RemoteHttpInterceptor<Schema extends HttpSchema> implements PublicRemoteHt
 
   async clear() {
     await new Promise<void>((resolve, reject) => {
-      this._client.clear({
+      this.client.clear({
         onCommitSuccess: resolve,
         onCommitError: reject,
       });

package/src/http/interceptor/errors/NotStartedHttpInterceptorError.ts

@@ -3,7 +3,7 @@
  *
  * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorstart `interceptor.start()` API reference}
  * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorstop `interceptor.stop()` API reference}
- * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorisrunning `interceptor.isRunning()` API reference}
+ * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorisrunning `interceptor.isRunning` API reference}
  */
 class NotStartedHttpInterceptorError extends Error {
   constructor() {

package/src/http/interceptor/errors/UnknownHttpInterceptorPlatformError.ts

@@ -2,7 +2,7 @@
  * An error thrown when an unknown interceptor platform is detected. Currently, the platforms `node` and `browser` are
  * supported.
  *
- * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorplatform `interceptor.platform()` API reference}
+ * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorplatform `interceptor.platform` API reference}
  */
 class UnknownHttpInterceptorPlatformError extends Error {
   /* istanbul ignore next -- @preserve

package/src/http/interceptor/types/options.ts

@@ -12,7 +12,7 @@ export type HttpInterceptorType = 'local' | 'remote';
 /**
  * The platform where an HTTP interceptor is running.
  *
- * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorplatform `interceptor.platform()` API reference}
+ * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorplatform `interceptor.platform` API reference}
  */
 export type HttpInterceptorPlatform = 'node' | 'browser';
 
@@ -121,9 +121,9 @@ export interface SharedHttpInterceptorOptions {
   /**
    * Whether {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#httprequesthandler request handlers}
    * should save their intercepted requests in memory and make them accessible through
-   * {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-handlerrequests `handler.requests()`}.
+   * {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-handlerrequests `handler.requests`}.
    *
-   * **IMPORTANT**: Saving the intercepted requests will lead to a memory leak if not accompanied by clearing of the
+   * **Important**: Saving the intercepted requests will lead to a memory leak if not accompanied by clearing of the
    * interceptor or disposal of the handlers (i.e. garbage collection). If you plan on accessing those requests, such as
    * to assert them in your tests, set this option to `true` and make sure to regularly clear the interceptor. A common
    * practice is to call

package/src/http/interceptor/types/public.ts

@@ -13,22 +13,25 @@ import { HttpInterceptorPlatform } from './options';
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export interface HttpInterceptor<_Schema extends HttpSchema> {
   /**
-   * @returns The base URL used by the interceptor.
-   * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorbaseurl `interceptor.baseURL()` API reference}
+   * The base URL used by the interceptor.
+   *
+   * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorbaseurl `interceptor.baseURL` API reference}
    */
-  baseURL: () => string;
+  baseURL: string;
 
   /**
-   * @returns The platform the interceptor is running on.
-   * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorplatform `interceptor.platform()` API reference}
+   * The platform the interceptor is running on.
+   *
+   * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorplatform `interceptor.platform` API reference}
    */
-  platform: () => HttpInterceptorPlatform | null;
+  platform: HttpInterceptorPlatform | null;
 
   /**
-   * @returns Whether the interceptor is currently running and ready to use.
-   * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorisrunning `interceptor.isRunning()` API reference}
+   * Whether the interceptor is currently running and ready to use.
+   *
+   * @see {@link https://github.com/zimicjs/zimic/wiki/api‐zimic‐interceptor‐http#http-interceptorisrunning `interceptor.isRunning` API reference}
    */
-  isRunning: () => boolean;
+  isRunning: boolean;
 
   /**
    * Starts the interceptor, allowing it to intercept HTTP requests.

package/src/http/interceptorWorker/HttpInterceptorWorker.ts

@@ -41,8 +41,9 @@ import { HttpResponseFactory } from './types/requests';
 abstract class HttpInterceptorWorker {
   abstract readonly type: 'local' | 'remote';
 
-  private _platform: HttpInterceptorPlatform | null = null;
-  private _isRunning = false;
+  platform: HttpInterceptorPlatform | null = null;
+  isRunning = false;
+
   private startingPromise?: Promise<void>;
   private stoppingPromise?: Promise<void>;
 
@@ -50,26 +51,10 @@ abstract class HttpInterceptorWorker {
 
   private runningInterceptors: AnyHttpInterceptorClient[] = [];
 
-  platform() {
-    return this._platform;
-  }
-
-  protected setPlatform(platform: HttpInterceptorPlatform) {
-    this._platform = platform;
-  }
-
-  isRunning() {
-    return this._isRunning;
-  }
-
-  protected setIsRunning(isRunning: boolean) {
-    this._isRunning = isRunning;
-  }
-
   abstract start(): Promise<void>;
 
   protected async sharedStart(internalStart: () => Promise<void>) {
-    if (this.isRunning()) {
+    if (this.isRunning) {
       return;
     }
 
@@ -98,7 +83,7 @@ abstract class HttpInterceptorWorker {
   abstract stop(): Promise<void>;
 
   protected async sharedStop(internalStop: () => PossiblePromise<void>) {
-    if (!this.isRunning()) {
+    if (!this.isRunning) {
       return;
     }
     if (this.stoppingPromise) {
@@ -194,8 +179,7 @@ abstract class HttpInterceptorWorker {
 
   private findInterceptorByRequestBaseURL(request: Request) {
     const interceptor = this.runningInterceptors.findLast((interceptor) => {
-      const baseURL = interceptor.baseURL();
-      return request.url.startsWith(baseURL);
+      return request.url.startsWith(interceptor.baseURLAsString);
     });
 
     return interceptor;
@@ -217,14 +201,12 @@ abstract class HttpInterceptorWorker {
   }
 
   private async getInterceptorUnhandledRequestStrategy(request: Request, interceptor: AnyHttpInterceptorClient) {
-    const interceptorStrategyOrFactory = interceptor.onUnhandledRequest();
-
-    if (typeof interceptorStrategyOrFactory === 'function') {
+    if (typeof interceptor.onUnhandledRequest === 'function') {
       const parsedRequest = await HttpInterceptorWorker.parseRawUnhandledRequest(request);
-      return interceptorStrategyOrFactory(parsedRequest);
+      return interceptor.onUnhandledRequest(parsedRequest);
     }
 
-    return interceptorStrategyOrFactory;
+    return interceptor.onUnhandledRequest;
   }
 
   abstract clearHandlers(): PossiblePromise<void>;
@@ -233,7 +215,7 @@ abstract class HttpInterceptorWorker {
     interceptor: HttpInterceptorClient<Schema>,
   ): PossiblePromise<void>;
 
-  abstract interceptorsWithHandlers(): AnyHttpInterceptorClient[];
+  abstract get interceptorsWithHandlers(): AnyHttpInterceptorClient[];
 
   static createResponseFromDeclaration(
     request: Request,