miniflare 0.0.0-e2e6912bc → 0.0.0-e2f5756c2

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

@@ -8776,7 +8776,8 @@ var AssetsManifest = class {
 // ../workers-shared/asset-worker/src/configuration.ts
 var applyConfigurationDefaults = (configuration) => ({
   html_handling: configuration?.html_handling ?? "auto-trailing-slash",
-  not_found_handling: configuration?.not_found_handling ?? "none"
+  not_found_handling: configuration?.not_found_handling ?? "none",
+  serve_directly: configuration?.serve_directly ?? !0
 });
 
 // ../workers-shared/asset-worker/src/responses.ts
@@ -8848,19 +8849,25 @@ function isCacheable(request) {
 }
 
 // ../workers-shared/asset-worker/src/handler.ts
-var handleRequest = async (request, configuration, exists, getByETag) => {
-  let { pathname, search } = new URL(request.url), decodedPathname = decodePath(pathname), intent = await getIntent(decodedPathname, configuration, exists);
+var handleRequest = async (request, env, configuration, exists, getByETag) => {
+  let { pathname, search } = new URL(request.url), decodedPathname = decodePath(pathname);
+  decodedPathname = decodedPathname.replace(/\/+/g, "/");
+  let intent = await getIntent(decodedPathname, configuration, exists);
   if (!intent)
     return new NotFoundResponse();
   let method = request.method.toUpperCase();
   if (!["GET", "HEAD"].includes(method))
     return new MethodNotAllowedResponse();
   let decodedDestination = intent.redirect ?? decodedPathname, encodedDestination = encodePath(decodedDestination);
-  if (encodedDestination !== pathname || intent.redirect)
+  if (encodedDestination !== pathname && intent.asset || intent.redirect)
     return new TemporaryRedirectResponse(encodedDestination + search);
   if (!intent.asset)
     return new InternalServerErrorResponse(new Error("Unknown action"));
-  let asset = await getByETag(intent.asset.eTag), headers = getHeaders(intent.asset.eTag, asset.contentType, request), strongETag = `"${intent.asset.eTag}"`, weakETag = `W/${strongETag}`, ifNoneMatch = request.headers.get("If-None-Match") || "";
+  let asset = await env.JAEGER.enterSpan("getByETag", async (span) => (span.setTags({
+    pathname,
+    eTag: intent.asset.eTag,
+    status: intent.asset.status
+  }), await getByETag(intent.asset.eTag))), headers = getHeaders(intent.asset.eTag, asset.contentType, request), strongETag = `"${intent.asset.eTag}"`, weakETag = `W/${strongETag}`, ifNoneMatch = request.headers.get("If-None-Match") || "";
   if ([weakETag, strongETag].includes(ifNoneMatch))
     return new NotModifiedResponse(null, { headers });
   let body = method === "HEAD" ? null : asset.readableStream;
@@ -9238,18 +9245,46 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       };
   }
   return null;
-}, decodePath = (pathname) => pathname.split("/").map((x) => decodeURIComponent(x)).join("/"), encodePath = (pathname) => pathname.split("/").map((x) => encodeURIComponent(x)).join("/");
+}, decodePath = (pathname) => pathname.split("/").map((x) => {
+  try {
+    return decodeURIComponent(x);
+  } catch {
+    return x;
+  }
+}).join("/"), encodePath = (pathname) => pathname.split("/").map((x) => {
+  try {
+    return encodeURIComponent(x);
+  } catch {
+    return x;
+  }
+}).join("/");
 
 // ../workers-shared/asset-worker/src/utils/kv.ts
-async function getAssetWithMetadataFromKV(assetsKVNamespace, assetKey, retries = 1) {
+async function getAssetWithMetadataFromKV(assetsKVNamespace, assetKey, sentry, retries = 1) {
   let attempts = 0;
   for (; attempts <= retries; )
     try {
-      return await assetsKVNamespace.getWithMetadata(assetKey, {
-        type: "stream",
-        cacheTtl: 31536e3
-        // 1 year
-      });
+      let asset = await assetsKVNamespace.getWithMetadata(
+        assetKey,
+        {
+          type: "stream",
+          cacheTtl: 31536e3
+          // 1 year
+        }
+      );
+      if (asset.value === null) {
+        let retriedAsset = await assetsKVNamespace.getWithMetadata(assetKey, {
+          type: "stream",
+          cacheTtl: 60
+          // Minimum value allowed
+        });
+        return retriedAsset.value !== null && sentry && sentry.captureException(
+          new Error(
+            `Initial request for asset ${assetKey} failed, but subsequent request succeeded.`
+          )
+        ), retriedAsset;
+      }
+      return asset;
     } catch {
       if (attempts >= retries)
         throw new Error(
@@ -9261,12 +9296,41 @@ async function getAssetWithMetadataFromKV(assetsKVNamespace, assetKey, retries =
     }
 }
 
+// ../workers-shared/asset-worker/src/utils/mocks.ts
+function mockJaegerBindingSpan() {
+  return {
+    addLogs: () => {
+    },
+    setTags: () => {
+    },
+    end: () => {
+    },
+    isRecording: !0
+  };
+}
+function mockJaegerBinding() {
+  return {
+    enterSpan: (_, span, ...args) => span(mockJaegerBindingSpan(), ...args),
+    getSpanContext: () => ({
+      traceId: "test-trace",
+      spanId: "test-span",
+      parentSpanId: "test-parent-span",
+      traceFlags: 0
+    }),
+    runWithSpanContext: (_, callback, ...args) => callback(...args),
+    traceId: "test-trace",
+    spanId: "test-span",
+    parentSpanId: "test-parent-span",
+    cfTraceIdHeader: "test-trace:test-span:0"
+  };
+}
+
 // ../workers-shared/asset-worker/src/index.ts
 var src_default = class extends WorkerEntrypoint {
   async fetch(request) {
     let sentry, analytics = new Analytics(this.env.ANALYTICS), performance = new PerformanceTimer(this.env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
     try {
-      sentry = setupSentry(
+      this.env.JAEGER || (this.env.JAEGER = mockJaegerBinding()), sentry = setupSentry(
         request,
         this.ctx,
         this.env.SENTRY_DSN,
@@ -9278,43 +9342,59 @@ var src_default = class extends WorkerEntrypoint {
         let colo = this.env.COLO_METADATA.coloId;
         sentry.setTag("colo", this.env.COLO_METADATA.coloId), sentry.setTag("metal", this.env.COLO_METADATA.metalId), sentry.setUser({ userAgent, colo });
       }
-      if (this.env.COLO_METADATA && this.env.VERSION_METADATA) {
-        let url = new URL(request.url);
-        analytics.setData({
-          coloId: this.env.COLO_METADATA.coloId,
-          metalId: this.env.COLO_METADATA.metalId,
-          coloTier: this.env.COLO_METADATA.coloTier,
-          coloRegion: this.env.COLO_METADATA.coloRegion,
-          version: this.env.VERSION_METADATA.id,
-          hostname: url.hostname,
-          htmlHandling: config.html_handling,
-          notFoundHandling: config.not_found_handling,
-          userAgent
-        });
-      }
-      return handleRequest(
+      let url = new URL(request.url);
+      return this.env.COLO_METADATA && this.env.VERSION_METADATA && analytics.setData({
+        coloId: this.env.COLO_METADATA.coloId,
+        metalId: this.env.COLO_METADATA.metalId,
+        coloTier: this.env.COLO_METADATA.coloTier,
+        coloRegion: this.env.COLO_METADATA.coloRegion,
+        version: this.env.VERSION_METADATA.id,
+        hostname: url.hostname,
+        htmlHandling: config.html_handling,
+        notFoundHandling: config.not_found_handling,
+        userAgent
+      }), this.env.JAEGER.enterSpan("handleRequest", async (span) => (span.setTags({
+        hostname: url.hostname,
+        eyeballPath: url.pathname,
+        env: this.env.ENVIRONMENT,
+        version: this.env.VERSION_METADATA?.id
+      }), handleRequest(
         request,
+        this.env,
         config,
         this.unstable_exists.bind(this),
         this.unstable_getByETag.bind(this)
-      );
+      ))).catch((err) => this.handleError(sentry, analytics, err)).finally(() => this.submitMetrics(analytics, performance, startTimeMs));
     } catch (err) {
+      let errorResponse = this.handleError(sentry, analytics, err);
+      return this.submitMetrics(analytics, performance, startTimeMs), errorResponse;
+    }
+  }
+  handleError(sentry, analytics, err) {
+    try {
       let response = new InternalServerErrorResponse(err);
       return sentry && sentry.captureException(err), err instanceof Error && analytics.setData({ error: err.message }), response;
-    } finally {
+    } catch (e) {
+      return console.error("Error handling error", e), new InternalServerErrorResponse(e);
+    }
+  }
+  submitMetrics(analytics, performance, startTimeMs) {
+    try {
       analytics.setData({ requestTime: performance.now() - startTimeMs }), analytics.write();
+    } catch (e) {
+      console.error("Error submitting metrics", e);
     }
   }
   async unstable_canFetch(request) {
-    let url = new URL(request.url), method = request.method.toUpperCase(), decodedPathname = decodePath(url.pathname), intent = await getIntent(
+    let url = new URL(request.url), decodedPathname = decodePath(url.pathname);
+    return await getIntent(
       decodedPathname,
       {
         ...applyConfigurationDefaults(this.env.CONFIG),
         not_found_handling: "none"
       },
       this.unstable_exists.bind(this)
-    );
-    return intent && ["GET", "HEAD"].includes(method) ? new MethodNotAllowedResponse() : intent !== null;
+    ) !== null;
   }
   async unstable_getByETag(eTag) {
     let asset = await getAssetWithMetadataFromKV(