@@ -3,9 +3,13 @@ import { PerformanceTimer } from "../../utils/performance";
33import { setupSentry } from "../../utils/sentry" ;
44import { mockJaegerBinding } from "../../utils/tracing" ;
55import { Analytics , DISPATCH_TYPE , STATIC_ROUTING_DECISION } from "./analytics" ;
6- import { applyConfigurationDefaults } from "./configuration" ;
6+ import {
7+ applyEyeballConfigDefaults ,
8+ applyRouterConfigDefaults ,
9+ } from "./configuration" ;
710import type AssetWorker from "../../asset-worker" ;
811import type {
12+ EyeballRouterConfig ,
913 JaegerTracing ,
1014 RouterConfig ,
1115 UnsafePerformanceTimer ,
@@ -16,6 +20,7 @@ export interface Env {
1620 ASSET_WORKER : Service < AssetWorker > ;
1721 USER_WORKER : Fetcher ;
1822 CONFIG : RouterConfig ;
23+ EYEBALL_CONFIG : EyeballRouterConfig ;
1924
2025 SENTRY_DSN : string ;
2126 ENVIRONMENT : Environment ;
@@ -55,7 +60,8 @@ export default {
5560 ) ;
5661
5762 const hasStaticRouting = env . CONFIG . static_routing !== undefined ;
58- const config = applyConfigurationDefaults ( env . CONFIG ) ;
63+ const config = applyRouterConfigDefaults ( env . CONFIG ) ;
64+ const eyeballConfig = applyEyeballConfigDefaults ( env . EYEBALL_CONFIG ) ;
5965
6066 const url = new URL ( request . url ) ;
6167
@@ -77,7 +83,11 @@ export default {
7783
7884 const maybeSecondRequest = request . clone ( ) ;
7985
80- const routeToUserWorker = async ( { asset } : { asset : "static_routing" | "none" } ) => {
86+ const routeToUserWorker = async ( {
87+ asset,
88+ } : {
89+ asset : "static_routing" | "none" ;
90+ } ) => {
8191 if ( ! config . has_user_worker ) {
8292 throw new Error (
8393 "Fetch for user worker without having a user worker binding"
@@ -95,7 +105,11 @@ export default {
95105 } ) ;
96106 } ;
97107
98- const routeToAssets = async ( { asset } : { asset : "static_routing" | "found" | "none" } ) => {
108+ const routeToAssets = async ( {
109+ asset,
110+ } : {
111+ asset : "static_routing" | "found" | "none" ;
112+ } ) => {
99113 analytics . setData ( { dispatchtype : DISPATCH_TYPE . ASSETS } ) ;
100114 return await env . JAEGER . enterSpan ( "dispatch_assets" , async ( span ) => {
101115 span . setTags ( {
0 commit comments