@cloudflare/vite-plugin 1.5.0 → 1.6.0

package/dist/asset-workers/asset-worker.js

@@ -4728,6 +4728,7 @@ var normalizeConfiguration = (configuration) => {
       version: 2,
       rules: {}
     },
+    has_static_routing: configuration?.has_static_routing ?? false,
     account_id: configuration?.account_id ?? -1,
     script_id: configuration?.script_id ?? -1,
     debug: configuration?.debug ?? false
@@ -4906,24 +4907,27 @@ var replacer = (str, replacements) => {
   }
   return str;
 };
+var generateRuleRegExp = (rule) => {
+  rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
+  const host_matches = rule.matchAll(HOST_PLACEHOLDER_REGEX);
+  for (const host_match of host_matches) {
+    rule = rule.split(host_match[0]).join(`(?<${host_match[1]}>[^/.]+)`);
+  }
+  const path_matches = rule.matchAll(PLACEHOLDER_REGEX);
+  for (const path_match of path_matches) {
+    rule = rule.split(path_match[0]).join(`(?<${path_match[1]}>[^/]+)`);
+  }
+  rule = "^" + rule + "$";
+  return RegExp(rule);
+};
 var generateRulesMatcher = (rules, replacerFn = (match) => match) => {
   if (!rules) {
     return () => [];
   }
   const compiledRules = Object.entries(rules).map(([rule, match]) => {
     const crossHost = rule.startsWith("https://");
-    rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
-    const host_matches = rule.matchAll(HOST_PLACEHOLDER_REGEX);
-    for (const host_match of host_matches) {
-      rule = rule.split(host_match[0]).join(`(?<${host_match[1]}>[^/.]+)`);
-    }
-    const path_matches = rule.matchAll(PLACEHOLDER_REGEX);
-    for (const path_match of path_matches) {
-      rule = rule.split(path_match[0]).join(`(?<${path_match[1]}>[^/]+)`);
-    }
-    rule = "^" + rule + "$";
     try {
-      const regExp = new RegExp(rule);
+      const regExp = generateRuleRegExp(rule);
       return [{ crossHost, regExp }, match];
     } catch {
     }
@@ -5140,10 +5144,11 @@ var resolveAssetIntentToResponse = async (assetIntent, request, env, configurati
   });
 };
 var canFetch = async (request, env, configuration, exists) => {
-  if (!(flagIsEnabled(
+  const shouldKeepNotFoundHandling = configuration.has_static_routing || flagIsEnabled(
     configuration,
     SEC_FETCH_MODE_NAVIGATE_HEADER_PREFERS_ASSET_SERVING
-  ) && request.headers.get("Sec-Fetch-Mode") === "navigate")) {
+  ) && request.headers.get("Sec-Fetch-Mode") === "navigate";
+  if (!shouldKeepNotFoundHandling) {
     configuration = {
       ...configuration,
       not_found_handling: "none"

package/dist/asset-workers/router-worker.js

@@ -1,3 +1,60 @@
+// ../workers-shared/utils/tracing.ts
+function mockJaegerBindingSpan() {
+  return {
+    addLogs: () => {
+    },
+    setTags: () => {
+    },
+    end: () => {
+    },
+    isRecording: true
+  };
+}
+function mockJaegerBinding() {
+  return {
+    enterSpan: (_, span, ...args) => {
+      return span(mockJaegerBindingSpan(), ...args);
+    },
+    getSpanContext: () => ({
+      traceId: "test-trace",
+      spanId: "test-span",
+      parentSpanId: "test-parent-span",
+      traceFlags: 0
+    }),
+    runWithSpanContext: (_, callback, ...args) => {
+      return callback(...args);
+    },
+    traceId: "test-trace",
+    spanId: "test-span",
+    parentSpanId: "test-parent-span",
+    cfTraceIdHeader: "test-trace:test-span:0"
+  };
+}
+
+// ../workers-shared/asset-worker/src/utils/rules-engine.ts
+var ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
+var escapeRegex = (str) => {
+  return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
+};
+var generateGlobOnlyRuleRegExp = (rule) => {
+  rule = rule.split("*").map(escapeRegex).join(".*");
+  rule = "^" + rule + "$";
+  return RegExp(rule);
+};
+var generateStaticRoutingRuleMatcher = (rules) => ({ request }) => {
+  const { pathname } = new URL(request.url);
+  for (const rule of rules) {
+    try {
+      const regExp = generateGlobOnlyRuleRegExp(rule);
+      if (regExp.test(pathname)) {
+        return true;
+      }
+    } catch {
+    }
+  }
+  return false;
+};
+
 // ../workers-shared/utils/performance.ts
 var PerformanceTimer = class {
   performanceTimer;
@@ -4483,39 +4540,6 @@ function setupSentry(request, context, dsn, clientId, clientSecret, coloMetadata
   return sentry;
 }
 
-// ../workers-shared/utils/tracing.ts
-function mockJaegerBindingSpan() {
-  return {
-    addLogs: () => {
-    },
-    setTags: () => {
-    },
-    end: () => {
-    },
-    isRecording: true
-  };
-}
-function mockJaegerBinding() {
-  return {
-    enterSpan: (_, span, ...args) => {
-      return span(mockJaegerBindingSpan(), ...args);
-    },
-    getSpanContext: () => ({
-      traceId: "test-trace",
-      spanId: "test-span",
-      parentSpanId: "test-parent-span",
-      traceFlags: 0
-    }),
-    runWithSpanContext: (_, callback, ...args) => {
-      return callback(...args);
-    },
-    traceId: "test-trace",
-    spanId: "test-span",
-    parentSpanId: "test-parent-span",
-    cfTraceIdHeader: "test-trace:test-span:0"
-  };
-}
-
 // ../workers-shared/router-worker/src/analytics.ts
 var VERSION = 1;
 var Analytics = class {
@@ -4551,7 +4575,9 @@ var Analytics = class {
         // double3
         this.data.coloTier ?? -1,
         // double4
-        this.data.userWorkerAhead === void 0 ? -1 : Number(this.data.userWorkerAhead)
+        this.data.userWorkerAhead === void 0 ? -1 : Number(this.data.userWorkerAhead),
+        this.data.staticRoutingDecision ?? 0 /* NOT_PROVIDED */
+        // double6
       ],
       blobs: [
         this.data.hostname?.substring(0, 256),
@@ -4576,7 +4602,10 @@ var applyConfigurationDefaults = (configuration) => {
     has_user_worker: configuration?.has_user_worker ?? false,
     account_id: configuration?.account_id ?? -1,
     script_id: configuration?.script_id ?? -1,
-    debug: configuration?.debug ?? false
+    debug: configuration?.debug ?? false,
+    static_routing: configuration?.static_routing ?? {
+      user_worker: []
+    }
   };
 };
 
@@ -4603,6 +4632,7 @@ var worker_default = {
         env.CONFIG?.account_id,
         env.CONFIG?.script_id
       );
+      const hasStaticRouting = env.CONFIG.static_routing !== void 0;
       const config = applyConfigurationDefaults(env.CONFIG);
       const url = new URL(request.url);
       if (env.COLO_METADATA && env.VERSION_METADATA && env.CONFIG) {
@@ -4619,6 +4649,55 @@ var worker_default = {
         });
       }
       const maybeSecondRequest = request.clone();
+      if (config.static_routing) {
+        const excludeRulesMatcher = generateStaticRoutingRuleMatcher(
+          config.static_routing.asset_worker ?? []
+        );
+        if (excludeRulesMatcher({
+          request
+        })) {
+          analytics.setData({
+            dispatchtype: "asset" /* ASSETS */,
+            staticRoutingDecision: 2 /* ROUTED */
+          });
+          return await env.JAEGER.enterSpan("dispatch_assets", async (span) => {
+            span.setTags({
+              hasUserWorker: config.has_user_worker,
+              asset: "static_routing",
+              dispatchType: "asset" /* ASSETS */
+            });
+            return env.ASSET_WORKER.fetch(maybeSecondRequest);
+          });
+        }
+        const includeRulesMatcher = generateStaticRoutingRuleMatcher(
+          config.static_routing.user_worker
+        );
+        if (includeRulesMatcher({
+          request
+        })) {
+          if (!config.has_user_worker) {
+            throw new Error(
+              "Fetch for user worker without having a user worker binding"
+            );
+          }
+          analytics.setData({
+            dispatchtype: "worker" /* WORKER */,
+            staticRoutingDecision: 2 /* ROUTED */
+          });
+          return await env.JAEGER.enterSpan("dispatch_worker", async (span) => {
+            span.setTags({
+              hasUserWorker: true,
+              asset: "static_routing",
+              dispatchType: "worker" /* WORKER */
+            });
+            userWorkerInvocation = true;
+            return env.USER_WORKER.fetch(maybeSecondRequest);
+          });
+        }
+        analytics.setData({
+          staticRoutingDecision: hasStaticRouting ? 1 /* NOT_ROUTED */ : 0 /* NOT_PROVIDED */
+        });
+      }
       if (config.invoke_user_worker_ahead_of_assets) {
         if (!config.has_user_worker) {
           throw new Error(