Merge pull request #2195 from florkbr/use-module-interceptors

feat(config-utils): use the module interceptor when using local proxy

Author: Hyperkid123

packages/config-utils/src/feo/check-outgoing-requests.ts

@@ -10,7 +10,11 @@ export function matchServiceTilesRequest(url: string): boolean {
   return !!url.match(/\/api\/chrome-service\/v1\/static\/service-tiles-generated\.json/);
 }
 
+export function matchModulesRequest(url: string): boolean {
+  return !!url.match(/\/api\/chrome-service\/v1\/static\/fed-modules-generated\.json/);
+}
+
 export function isInterceptAbleRequest(url: string): boolean {
-  const checks = [matchNavigationRequest, matchSearchIndexRequest, matchServiceTilesRequest];
+  const checks = [matchNavigationRequest, matchSearchIndexRequest, matchServiceTilesRequest, matchModulesRequest];
   return checks.some((check) => check(url));
 }

packages/config-utils/src/feo/modify-response.ts

@@ -1,31 +1,39 @@
 import fecLogger, { LogType } from '../fec-logger';
-import { matchNavigationRequest, matchSearchIndexRequest, matchServiceTilesRequest } from './check-outgoing-requests';
-import { ChromeStaticSearchEntry, FrontendCRD, GeneratedBundles, ServicesTilesResponseEntry } from './feo-types';
+import { matchNavigationRequest, matchSearchIndexRequest, matchServiceTilesRequest, matchModulesRequest} from './check-outgoing-requests';
+import { ChromeModuleRegistry, ChromeStaticSearchEntry, FrontendCRD, GeneratedBundles, ServicesTilesResponseEntry } from './feo-types';
+import moduleInterceptor from './module-interceptor';
 import navigationInterceptor from './navigation-interceptor';
 import searchInterceptor from './search-interceptor';
 import serviceTilesInterceptor from './service-tiles-interceptor';
 
 function isGeneratedBundles(
-  body: GeneratedBundles | ChromeStaticSearchEntry[] | ServicesTilesResponseEntry[],
+  body: GeneratedBundles | ChromeStaticSearchEntry[] | ServicesTilesResponseEntry[] | ChromeModuleRegistry,
   url: string
 ): body is GeneratedBundles {
   return matchNavigationRequest(url);
 }
 
 function isSearchIndex(
-  body: GeneratedBundles | ChromeStaticSearchEntry[] | ServicesTilesResponseEntry[],
+  body: GeneratedBundles | ChromeStaticSearchEntry[] | ServicesTilesResponseEntry[] | ChromeModuleRegistry,
   url: string
 ): body is ChromeStaticSearchEntry[] {
   return matchSearchIndexRequest(url);
 }
 
 function isServiceTiles(
-  body: GeneratedBundles | ChromeStaticSearchEntry[] | ServicesTilesResponseEntry[],
+  body: GeneratedBundles | ChromeStaticSearchEntry[] | ServicesTilesResponseEntry[] | ChromeModuleRegistry,
   url: string
 ): body is ServicesTilesResponseEntry[] {
   return matchServiceTilesRequest(url);
 }
 
+function isModules(
+  body: GeneratedBundles | ChromeStaticSearchEntry[] | ServicesTilesResponseEntry[] | ChromeModuleRegistry,
+  url: string
+): body is ChromeModuleRegistry {
+  return matchModulesRequest(url);
+}
+
 export function modifyRequest(body: string, url: string, frontendCrd: FrontendCRD): string {
   // intentionally let the parse throw an error to parent to handle unfinished request chunks
   const objectToModify = JSON.parse(body);
@@ -47,6 +55,10 @@ export function modifyRequest(body: string, url: string, frontendCrd: FrontendCR
       const staticServicesTiles = objectToModify as ServicesTilesResponseEntry[];
       const result = serviceTilesInterceptor(staticServicesTiles, frontendCrd);
       payload = JSON.stringify(result);
+    } else if (isModules(objectToModify, url)) {
+      const modules = objectToModify as ChromeModuleRegistry;
+      const result = moduleInterceptor(modules, frontendCrd);
+      payload = JSON.stringify(result);
     }
     return payload;
   } catch (error) {