chore: pass executor fetch

packages/playback/src/lib/network/networkManager.ts

@@ -16,19 +16,22 @@ export interface NetworkManagerDependencies {
   networkInterceptorsProvider: INetworkInterceptorsProvider;
   eventEmitter: IEventEmitter<NetworkEventMap>;
   configuration: PlayerNetworkConfiguration;
+  executor: (request: Request) => Promise<Response>;
 }
 
 export class NetworkManager implements INetworkManager {
   private readonly logger_: ILogger;
   private readonly networkInterceptorsProvider_: INetworkInterceptorsProvider;
   private readonly eventEmitter_: IEventEmitter<NetworkEventMap>;
+  private readonly executor_: (request: Request) => Promise<Response>;
   private configuration_: PlayerNetworkConfiguration;
 
   public constructor(dependencies: NetworkManagerDependencies) {
     this.logger_ = dependencies.logger;
     this.networkInterceptorsProvider_ = dependencies.networkInterceptorsProvider;
     this.eventEmitter_ = dependencies.eventEmitter;
     this.configuration_ = dependencies.configuration;
+    this.executor_ = dependencies.executor;
   }
 
   public updateConfiguration(configuration: PlayerNetworkConfiguration): void {
@@ -61,6 +64,7 @@ export class NetworkManager implements INetworkManager {
       networkInterceptorsProvider: this.networkInterceptorsProvider_,
       eventEmitter: this.eventEmitter_,
       configuration: { ...this.configuration_[payload.requestType] },
+      executor: (request) => this.sendRequest_(request),
     });
   }
 
@@ -70,6 +74,11 @@ export class NetworkManager implements INetworkManager {
       networkInterceptorsProvider: this.networkInterceptorsProvider_,
       eventEmitter: this.eventEmitter_,
       configuration: { ...this.configuration_[payload.requestType] },
+      executor: (request) => this.sendRequest_(request),
     });
   }
+
+  protected sendRequest_(request: Request): Promise<Response> {
+    return this.executor_(request);
+  }
 }

packages/playback/src/lib/network/networkRequest.ts

@@ -30,6 +30,7 @@ interface NetworkRequestDependencies {
   networkInterceptorsProvider: INetworkInterceptorsProvider;
   eventEmitter: IEventEmitter<NetworkEventMap>;
   configuration: NetworkConfiguration;
+  executor: (request: Request) => Promise<Response>;
 }
 
 abstract class NetworkRequest<T> implements INetworkRequest<T> {
@@ -40,6 +41,7 @@ abstract class NetworkRequest<T> implements INetworkRequest<T> {
   protected readonly networkInterceptorsProvider_: INetworkInterceptorsProvider;
   protected readonly eventEmitter_: IEventEmitter<NetworkEventMap>;
   protected readonly wrappedSendRequest_: () => Promise<Response>;
+  protected readonly executor_: (request: Request) => Promise<Response>;
 
   public abstract readonly done: Promise<T>;
 
@@ -59,11 +61,12 @@ abstract class NetworkRequest<T> implements INetworkRequest<T> {
     this.networkInterceptorsProvider_ = networkInterceptorsProvider;
     this.eventEmitter_ = eventEmitter;
     this.abortController_ = new AbortController();
+    this.executor_ = dependencies.executor;
     this.requestType = requestType;
     this.configuration = configuration;
 
     const retryWrapper = new RetryWrapper(configuration);
-    const request = new Request(url, requestInit);
+    const request = new Request(url, { ...requestInit, signal: this.abortController_.signal });
 
     this.wrappedSendRequest_ = retryWrapper.wrap<Response>({
       target: () => this.sendRequest_(request, timeout),
@@ -137,7 +140,7 @@ abstract class NetworkRequest<T> implements INetworkRequest<T> {
         };
 
         this.eventEmitter_.emitEvent(new NetworkRequestStartedEvent(requestInfo));
-        return fetch(finalRequest).then(onCompleted, onFailed);
+        return this.executor_(finalRequest).then(onCompleted, onFailed);
       });
     });
   }

packages/playback/src/lib/serviceLocator.ts

@@ -29,7 +29,7 @@ export class ServiceLocator {
   public readonly networkManager: INetworkManager;
 
   public constructor() {
-    const { console } = window;
+    const { console, fetch } = window;
 
     this.configurationManager = this.createConfigurationManager_();
 
@@ -44,6 +44,7 @@ export class ServiceLocator {
       logger: this.logger.createSubLogger('NetworkManager'),
       eventEmitter: this.eventEmitter,
       configuration: configuration.network,
+      executor: (request) => fetch(request),
       networkInterceptorsProvider: {
         getNetworkRequestInterceptors: (): Set<InterceptorTypeToInterceptorMap[InterceptorType.NetworkRequest]> =>
           this.interceptorsStorage.getInterceptorsSet(InterceptorType.NetworkRequest),