miniflare 0.0.0-eec2a7074 → 0.0.0-eef649c82

package/dist/src/workers/assets/router.worker.js

@@ -8668,18 +8668,22 @@ function setupSentry(request, context, dsn, clientId, clientSecret) {
 // ../workers-shared/router-worker/src/analytics.ts
 var Analytics = class {
   data = {};
+  readyAnalytics;
+  constructor(readyAnalytics) {
+    this.readyAnalytics = readyAnalytics;
+  }
   setData(newData) {
     this.data = { ...this.data, ...newData };
   }
   getData(key) {
     return this.data[key];
   }
-  write(env, readyAnalytics, hostname) {
-    readyAnalytics && readyAnalytics.logEvent({
+  write() {
+    this.readyAnalytics && this.readyAnalytics.logEvent({
       version: 1,
       accountId: 0,
       // TODO: need to plumb through
-      indexId: hostname,
+      indexId: this.data.hostname?.substring(0, 96),
       doubles: [
         this.data.requestTime ?? -1,
         // double1
@@ -8687,8 +8691,9 @@ var Analytics = class {
         // double2
         this.data.metalId ?? -1,
         // double3
-        this.data.coloTier ?? -1
+        this.data.coloTier ?? -1,
         // double4
+        this.data.userWorkerAhead === void 0 ? -1 : Number(this.data.userWorkerAhead)
       ],
       blobs: [
         this.data.hostname?.substring(0, 256),
@@ -8709,7 +8714,7 @@ var Analytics = class {
 // ../workers-shared/router-worker/src/index.ts
 var src_default = {
   async fetch(request, env, ctx) {
-    let sentry, analytics = new Analytics(), performance = new PerformanceTimer(env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
+    let sentry, analytics = new Analytics(env.ANALYTICS), performance = new PerformanceTimer(env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
     try {
       sentry = setupSentry(
         request,
@@ -8719,20 +8724,28 @@ var src_default = {
         env.SENTRY_ACCESS_CLIENT_SECRET
       );
       let url = new URL(request.url);
-      sentry && (sentry.setUser({ username: url.hostname }), sentry.setTag("colo", env.COLO_METADATA.coloId), sentry.setTag("metal", env.COLO_METADATA.metalId)), env.COLO_METADATA && env.VERSION_METADATA && analytics.setData({
+      sentry && (sentry.setUser({ username: url.hostname }), sentry.setTag("colo", env.COLO_METADATA.coloId), sentry.setTag("metal", env.COLO_METADATA.metalId)), env.COLO_METADATA && env.VERSION_METADATA && env.CONFIG && analytics.setData({
         coloId: env.COLO_METADATA.coloId,
         metalId: env.COLO_METADATA.metalId,
         coloTier: env.COLO_METADATA.coloTier,
         coloRegion: env.COLO_METADATA.coloRegion,
         hostname: url.hostname,
-        version: env.VERSION_METADATA.id
+        version: env.VERSION_METADATA.id,
+        userWorkerAhead: env.CONFIG.invoke_user_worker_ahead_of_assets
       });
       let maybeSecondRequest = request.clone();
-      return env.CONFIG.has_user_worker ? await env.ASSET_WORKER.unstable_canFetch(request) ? (analytics.setData({ dispatchtype: "asset" /* ASSETS */ }), await env.ASSET_WORKER.fetch(maybeSecondRequest)) : (analytics.setData({ dispatchtype: "worker" /* WORKER */ }), env.USER_WORKER.fetch(maybeSecondRequest)) : (analytics.setData({ dispatchtype: "asset" /* ASSETS */ }), await env.ASSET_WORKER.fetch(request));
+      if (env.CONFIG.invoke_user_worker_ahead_of_assets) {
+        if (!env.CONFIG.has_user_worker)
+          throw new Error(
+            "Fetch for user worker without having a user worker binding"
+          );
+        return env.USER_WORKER.fetch(maybeSecondRequest);
+      }
+      return env.CONFIG.has_user_worker ? await env.ASSET_WORKER.unstable_canFetch(request) ? (analytics.setData({ dispatchtype: "asset" /* ASSETS */ }), env.ASSET_WORKER.fetch(maybeSecondRequest)) : (analytics.setData({ dispatchtype: "worker" /* WORKER */ }), env.USER_WORKER.fetch(maybeSecondRequest)) : (analytics.setData({ dispatchtype: "asset" /* ASSETS */ }), env.ASSET_WORKER.fetch(request));
     } catch (err) {
       throw err instanceof Error && analytics.setData({ error: err.message }), sentry && sentry.captureException(err), err;
     } finally {
-      analytics.setData({ requestTime: performance.now() - startTimeMs }), analytics.write(env.ENVIRONMENT, env.ANALYTICS);
+      analytics.setData({ requestTime: performance.now() - startTimeMs }), analytics.write();
     }
   }
 };