miniflare 0.0.0-e1d2fd668 → 0.0.0-e2b3306e1

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

@@ -8633,9 +8633,62 @@ var PerformanceTimer = class {
   }
 };
 
+// ../workers-shared/utils/responses.ts
+var OkResponse = class extends Response {
+  constructor(body, init) {
+    super(body, {
+      ...init,
+      status: 200
+    });
+  }
+}, NotFoundResponse = class extends Response {
+  constructor(...[body, init]) {
+    super(body, {
+      ...init,
+      status: 404,
+      statusText: "Not Found"
+    });
+  }
+}, MethodNotAllowedResponse = class extends Response {
+  constructor(...[body, init]) {
+    super(body, {
+      ...init,
+      status: 405,
+      statusText: "Method Not Allowed"
+    });
+  }
+}, InternalServerErrorResponse = class extends Response {
+  constructor(err, init) {
+    super(null, {
+      ...init,
+      status: 500
+    });
+  }
+}, NotModifiedResponse = class extends Response {
+  constructor(...[_body, init]) {
+    super(null, {
+      ...init,
+      status: 304,
+      statusText: "Not Modified"
+    });
+  }
+}, TemporaryRedirectResponse = class extends Response {
+  constructor(location, init) {
+    super(null, {
+      ...init,
+      status: 307,
+      statusText: "Temporary Redirect",
+      headers: {
+        ...init?.headers,
+        Location: location
+      }
+    });
+  }
+};
+
 // ../workers-shared/utils/sentry.ts
 var import_toucan_js = __toESM(require_index_cjs());
-function setupSentry(request, context, dsn, clientId, clientSecret) {
+function setupSentry(request, context, dsn, clientId, clientSecret, coloMetadata, accountId, scriptId) {
   if (!(dsn && clientId && clientSecret))
     return;
   let sentry = new import_toucan_js.Toucan({
@@ -8662,10 +8715,37 @@ function setupSentry(request, context, dsn, clientId, clientSecret) {
         "CF-Access-Client-Secret": clientSecret
       }
     }
-  }), colo = request.cf?.colo ?? "UNKNOWN";
-  sentry.setTag("colo", colo);
-  let userAgent = request.headers.get("user-agent") ?? "UA UNKNOWN";
-  return sentry.setUser({ userAgent, colo }), sentry;
+  });
+  return coloMetadata && (sentry.setTag("colo", coloMetadata.coloId), sentry.setTag("metal", coloMetadata.metalId)), accountId && scriptId && (sentry.setTag("accountId", accountId), sentry.setTag("scriptId", scriptId)), sentry.setUser({ id: accountId?.toString() }), sentry;
+}
+
+// ../workers-shared/utils/tracing.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/analytics.ts
@@ -8681,12 +8761,11 @@ var Analytics = class {
   getData(key) {
     return this.data[key];
   }
-  write(hostname) {
+  write() {
     this.readyAnalytics && this.readyAnalytics.logEvent({
       version: 1,
-      accountId: 0,
-      // TODO: need to plumb through
-      indexId: hostname,
+      accountId: this.data.accountId,
+      indexId: this.data.scriptId?.toString(),
       doubles: [
         this.data.requestTime ?? -1,
         // double1
@@ -8731,7 +8810,10 @@ var AssetsManifest = class {
     return entry ? contentHashToKey(entry) : null;
   }
 }, hashPath = async (path) => {
-  let data = new TextEncoder().encode(path), hashBuffer = await crypto.subtle.digest("SHA-256", data.buffer);
+  let data = new TextEncoder().encode(path), hashBuffer = await crypto.subtle.digest(
+    "SHA-256",
+    data.buffer
+  );
   return new Uint8Array(hashBuffer, 0, 16);
 }, binarySearch = (arr, searchValue) => {
   if (arr.byteLength === 0)
@@ -8774,62 +8856,14 @@ var AssetsManifest = class {
 )].map((b) => b.toString(16).padStart(2, "0")).join("");
 
 // ../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"
-});
-
-// ../workers-shared/asset-worker/src/responses.ts
-var OkResponse = class extends Response {
-  constructor(body, init) {
-    super(body, {
-      ...init,
-      status: 200
-    });
-  }
-}, NotFoundResponse = class extends Response {
-  constructor(...[body, init]) {
-    super(body, {
-      ...init,
-      status: 404,
-      statusText: "Not Found"
-    });
-  }
-}, MethodNotAllowedResponse = class extends Response {
-  constructor(...[body, init]) {
-    super(body, {
-      ...init,
-      status: 405,
-      statusText: "Method Not Allowed"
-    });
-  }
-}, InternalServerErrorResponse = class extends Response {
-  constructor(err, init) {
-    super(null, {
-      ...init,
-      status: 500
-    });
-  }
-}, NotModifiedResponse = class extends Response {
-  constructor(...[_body, init]) {
-    super(null, {
-      ...init,
-      status: 304,
-      statusText: "Not Modified"
-    });
-  }
-}, TemporaryRedirectResponse = class extends Response {
-  constructor(location, init) {
-    super(null, {
-      ...init,
-      status: 307,
-      statusText: "Temporary Redirect",
-      headers: {
-        ...init?.headers,
-        Location: location
-      }
-    });
-  }
+var applyConfigurationDefaults = (configuration) => {
+  let runWorkerFirst;
+  return configuration?.run_worker_first !== void 0 ? runWorkerFirst = configuration?.run_worker_first : configuration?.serve_directly !== void 0 ? runWorkerFirst = !configuration.serve_directly : runWorkerFirst = !1, {
+    html_handling: configuration?.html_handling ?? "auto-trailing-slash",
+    not_found_handling: configuration?.not_found_handling ?? "none",
+    run_worker_first: runWorkerFirst,
+    serve_directly: !runWorkerFirst
+  };
 };
 
 // ../workers-shared/asset-worker/src/constants.ts
@@ -8848,28 +8882,56 @@ 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();
+    return env.JAEGER.enterSpan("no_intent", (span) => (span.setTags({
+      decodedPathname,
+      configuration: JSON.stringify(configuration),
+      status: 404
+    }), new NotFoundResponse()));
   let method = request.method.toUpperCase();
   if (!["GET", "HEAD"].includes(method))
-    return new MethodNotAllowedResponse();
+    return env.JAEGER.enterSpan("method_not_allowed", (span) => (span.setTags({
+      method,
+      status: 405
+    }), new MethodNotAllowedResponse()));
   let decodedDestination = intent.redirect ?? decodedPathname, encodedDestination = encodePath(decodedDestination);
-  if (encodedDestination !== pathname || intent.redirect)
-    return new TemporaryRedirectResponse(encodedDestination + search);
+  if (encodedDestination !== pathname && intent.asset || intent.redirect)
+    return env.JAEGER.enterSpan("redirect", (span) => (span.setTags({
+      originalPath: pathname,
+      location: encodedDestination !== pathname ? encodedDestination : intent.redirect ?? "<unknown>",
+      status: 307
+    }), 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") || "";
-  if ([weakETag, strongETag].includes(ifNoneMatch))
-    return new NotModifiedResponse(null, { headers });
-  let body = method === "HEAD" ? null : asset.readableStream;
-  switch (intent.asset.status) {
-    case 404:
-      return new NotFoundResponse(body, { headers });
-    case 200:
-      return new OkResponse(body, { headers });
-  }
+    return env.JAEGER.enterSpan("unknown_action", (span) => (span.setTags({
+      pathname,
+      status: 500
+    }), new InternalServerErrorResponse(new Error("Unknown action"))));
+  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") || "";
+  return [weakETag, strongETag].includes(ifNoneMatch) ? env.JAEGER.enterSpan("matched_etag", (span) => (span.setTags({
+    matchedEtag: ifNoneMatch,
+    status: 304
+  }), new NotModifiedResponse(null, { headers }))) : env.JAEGER.enterSpan("response", (span) => {
+    span.setTags({
+      etag: intent.asset.eTag,
+      status: intent.asset.status,
+      head: method === "HEAD"
+    });
+    let body = method === "HEAD" ? null : asset.readableStream;
+    switch (intent.asset.status) {
+      case 404:
+        return new NotFoundResponse(body, { headers });
+      case 200:
+        return new OkResponse(body, { headers });
+    }
+  });
 }, getIntent = async (pathname, configuration, exists, skipRedirects = !1) => {
   switch (configuration.html_handling) {
     case "auto-trailing-slash":
@@ -9238,18 +9300,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(
@@ -9266,55 +9356,72 @@ 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,
         this.env.SENTRY_ACCESS_CLIENT_ID,
-        this.env.SENTRY_ACCESS_CLIENT_SECRET
+        this.env.SENTRY_ACCESS_CLIENT_SECRET,
+        this.env.COLO_METADATA,
+        this.env.CONFIG?.account_id,
+        this.env.CONFIG?.script_id
       );
-      let config = applyConfigurationDefaults(this.env.CONFIG), userAgent = request.headers.get("user-agent") ?? "UA UNKNOWN";
-      if (sentry) {
-        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 config = applyConfigurationDefaults(this.env.CONFIG), userAgent = request.headers.get("user-agent") ?? "UA UNKNOWN", url = new URL(request.url);
+      return this.env.COLO_METADATA && this.env.VERSION_METADATA && this.env.CONFIG && analytics.setData({
+        accountId: this.env.CONFIG.account_id,
+        scriptId: this.env.CONFIG.script_id,
+        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
+      }), await 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) {
+      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);
     }
   }
+  // TODO: Trace unstable methods
   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(