miniflare 0.0.0-e4fe35cc5 → 0.0.0-e5ebdb143

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

@@ -10,7 +10,11 @@ var assets_kv_worker_default = {
     if (entry === void 0)
       return new Response("Not Found", { status: 404 });
     let { filePath, contentType } = entry, response = await env[SharedBindings.MAYBE_SERVICE_BLOBS].fetch(
-      new URL(filePath, "http://placeholder")
+      new URL(
+        // somewhere in blobservice I think this is being decoded again
+        filePath.split("/").map((x) => encodeURIComponent(x)).join("/"),
+        "http://placeholder"
+      )
     ), newResponse = new Response(response.body, response);
     return newResponse.headers.append(
       "cf-kv-metadata",

package/dist/src/workers/assets/assets-kv.worker.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/workers/assets/assets-kv.worker.ts"],
-  "mappings": ";AAAA,SAAS,sBAAsB;AAW/B,IAAO,2BAA8B;AAAA,EACpC,MAAM,MAAM,SAAS,KAAK;AAEzB,QAAI,QAAQ,WAAW,OAAO;AAC7B,UAAM,UAAU,UAAU,QAAQ,OAAO,YAAY;AACrD,aAAO,IAAI,SAAS,SAAS,EAAE,QAAQ,KAAK,YAAY,QAAQ,CAAC;AAAA;AAGlE,QAAM,WAAW,IAAI,IAAI,QAAQ,GAAG,EAAE,SAAS,UAAU,CAAC,GACpD,QAAQ,IAAI,mBAAmB,QAAQ;AAC7C,QAAI,UAAU;AACb,aAAO,IAAI,SAAS,aAAa,EAAE,QAAQ,IAAI,CAAC;AAGjD,QAAM,EAAE,UAAU,YAAY,IAAI,OAE5B,WAAW,MADI,IAAI,eAAe,mBAAmB,EACvB;AAAA,MACnC,IAAI,IAAI,UAAU,oBAAoB;AAAA,IACvC,GACM,cAAc,IAAI,SAAS,SAAS,MAAM,QAAQ;AAExD,uBAAY,QAAQ;AAAA,MACnB;AAAA,MACA,oBAAoB;AAAA,IACrB,GACO;AAAA,EACR;AACD;",
+  "mappings": ";AAAA,SAAS,sBAAsB;AAW/B,IAAO,2BAA8B;AAAA,EACpC,MAAM,MAAM,SAAS,KAAK;AAEzB,QAAI,QAAQ,WAAW,OAAO;AAC7B,UAAM,UAAU,UAAU,QAAQ,OAAO,YAAY;AACrD,aAAO,IAAI,SAAS,SAAS,EAAE,QAAQ,KAAK,YAAY,QAAQ,CAAC;AAAA;AAGlE,QAAM,WAAW,IAAI,IAAI,QAAQ,GAAG,EAAE,SAAS,UAAU,CAAC,GACpD,QAAQ,IAAI,mBAAmB,QAAQ;AAC7C,QAAI,UAAU;AACb,aAAO,IAAI,SAAS,aAAa,EAAE,QAAQ,IAAI,CAAC;AAGjD,QAAM,EAAE,UAAU,YAAY,IAAI,OAE5B,WAAW,MADI,IAAI,eAAe,mBAAmB,EACvB;AAAA,MACnC,IAAI;AAAA;AAAA,QAEH,SACE,MAAM,GAAG,EACT,IAAI,CAAC,MAAM,mBAAmB,CAAC,CAAC,EAChC,KAAK,GAAG;AAAA,QACV;AAAA,MACD;AAAA,IACD,GACM,cAAc,IAAI,SAAS,SAAS,MAAM,QAAQ;AAExD,uBAAY,QAAQ;AAAA,MACnB;AAAA,MACA,oBAAoB;AAAA,IACrB,GACO;AAAA,EACR;AACD;",
   "names": []
 }

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

@@ -8622,6 +8622,17 @@ var require_index_cjs = __commonJS({
 // ../workers-shared/asset-worker/src/index.ts
 import { WorkerEntrypoint } from "cloudflare:workers";
 
+// ../workers-shared/utils/performance.ts
+var PerformanceTimer = class {
+  performanceTimer;
+  constructor(performanceTimer) {
+    this.performanceTimer = performanceTimer;
+  }
+  now() {
+    return this.performanceTimer ? this.performanceTimer.timeOrigin + this.performanceTimer.now() : Date.now();
+  }
+};
+
 // ../workers-shared/utils/sentry.ts
 var import_toucan_js = __toESM(require_index_cjs());
 function setupSentry(request, context, dsn, clientId, clientSecret) {
@@ -8657,6 +8668,55 @@ function setupSentry(request, context, dsn, clientId, clientSecret) {
   return sentry.setUser({ userAgent, colo }), sentry;
 }
 
+// ../workers-shared/asset-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() {
+    this.readyAnalytics && this.readyAnalytics.logEvent({
+      version: 1,
+      accountId: 0,
+      // TODO: need to plumb through
+      indexId: this.data.hostname?.substring(0, 96),
+      doubles: [
+        this.data.requestTime ?? -1,
+        // double1
+        this.data.coloId ?? -1,
+        // double2
+        this.data.metalId ?? -1,
+        // double3
+        this.data.coloTier ?? -1
+        // double4
+      ],
+      blobs: [
+        this.data.hostname?.substring(0, 256),
+        // blob1 - trim to 256 bytes
+        this.data.userAgent?.substring(0, 256),
+        // blob2 - trim to 256 bytes
+        this.data.htmlHandling,
+        // blob3
+        this.data.notFoundHandling,
+        // blob4
+        this.data.error?.substring(0, 256),
+        // blob5 - trim to 256 bytes
+        this.data.version,
+        // blob6
+        this.data.coloRegion
+        // blob7
+      ]
+    });
+  }
+};
+
 // ../workers-shared/asset-worker/src/assets-manifest.ts
 var AssetsManifest = class {
   data;
@@ -8716,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
@@ -8788,18 +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), intent = await getIntent(pathname, 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();
-  if (intent.redirect)
-    return new TemporaryRedirectResponse(intent.redirect + search);
+  let decodedDestination = intent.redirect ?? decodedPathname, encodedDestination = encodePath(decodedDestination);
+  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;
@@ -8839,7 +8907,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
   if (pathname.endsWith("/index")) {
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname}.html`,
       pathname.slice(0, -5),
@@ -8875,7 +8946,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       return redirectResult;
   } else if (pathname.endsWith("/")) {
     if (eTagResult = await exists(`${pathname}index.html`))
-      return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: eTagResult, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -1)}.html`,
       pathname.slice(0, -1),
@@ -8902,7 +8976,13 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
   }
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : (eTagResult = await exists(`${pathname}.html`)) ? { asset: { eTag: eTagResult, status: 200 }, redirect: null } : (redirectResult = await safeRedirect(
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : (eTagResult = await exists(`${pathname}.html`)) ? {
+    asset: { eTag: eTagResult, status: 200 },
+    redirect: null
+  } : (redirectResult = await safeRedirect(
     `${pathname}/index.html`,
     `${pathname}/`,
     configuration,
@@ -8913,7 +8993,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
   if (pathname.endsWith("/index")) {
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname}.html`,
       pathname.slice(0, -5),
@@ -8949,9 +9032,15 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       return redirectResult;
   } else if (pathname.endsWith("/")) {
     if (eTagResult = await exists(`${pathname}index.html`))
-      return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: eTagResult, status: 200 },
+        redirect: null
+      };
     if (eTagResult = await exists(`${pathname.slice(0, -1)}.html`))
-      return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: eTagResult, status: 200 },
+        redirect: null
+      };
   } else if (pathname.endsWith(".html")) {
     if (redirectResult = await safeRedirect(
       pathname,
@@ -8962,7 +9051,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -5)}/index.html`,
       `${pathname.slice(0, -5)}/`,
@@ -8972,7 +9064,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
   }
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : (redirectResult = await safeRedirect(
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : (redirectResult = await safeRedirect(
     `${pathname}.html`,
     `${pathname}/`,
     configuration,
@@ -8989,7 +9084,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
   if (pathname.endsWith("/index")) {
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (pathname === "/index") {
       if (redirectResult = await safeRedirect(
         "/index.html",
@@ -9037,7 +9135,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       ))
         return redirectResult;
       if (exactETag)
-        return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+        return {
+          asset: { eTag: exactETag, status: 200 },
+          redirect: null
+        };
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -11)}.html`,
         pathname.slice(0, -11),
@@ -9050,7 +9151,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   else if (pathname.endsWith("/"))
     if (pathname === "/") {
       if (eTagResult = await exists("/index.html"))
-        return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+        return {
+          asset: { eTag: eTagResult, status: 200 },
+          redirect: null
+        };
     } else {
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -1)}.html`,
@@ -9087,15 +9191,30 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
   }
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : (eTagResult = await exists(`${pathname}.html`)) ? { asset: { eTag: eTagResult, status: 200 }, redirect: null } : (eTagResult = await exists(`${pathname}/index.html`)) ? { asset: { eTag: eTagResult, status: 200 }, redirect: null } : notFound(pathname, configuration, exists);
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : (eTagResult = await exists(`${pathname}.html`)) ? {
+    asset: { eTag: eTagResult, status: 200 },
+    redirect: null
+  } : (eTagResult = await exists(`${pathname}/index.html`)) ? {
+    asset: { eTag: eTagResult, status: 200 },
+    redirect: null
+  } : notFound(pathname, configuration, exists);
 }, htmlHandlingNone = async (pathname, configuration, exists) => {
   let exactETag = await exists(pathname);
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : notFound(pathname, configuration, exists);
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : notFound(pathname, configuration, exists);
 }, notFound = async (pathname, configuration, exists) => {
   switch (configuration.not_found_handling) {
     case "single-page-application": {
       let eTag = await exists("/index.html");
-      return eTag ? { asset: { eTag, status: 200 }, redirect: null } : null;
+      return eTag ? {
+        asset: { eTag, status: 200 },
+        redirect: null
+      } : null;
     }
     case "404-page": {
       let cwd = pathname;
@@ -9103,7 +9222,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
         cwd = cwd.slice(0, cwd.lastIndexOf("/"));
         let eTag = await exists(`${cwd}/404.html`);
         if (eTag)
-          return { asset: { eTag, status: 404 }, redirect: null };
+          return {
+            asset: { eTag, status: 404 },
+            redirect: null
+          };
       }
       return null;
     }
@@ -9123,18 +9245,46 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       };
   }
   return null;
-};
+}, 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(
@@ -9146,38 +9296,105 @@ 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;
+    let sentry, analytics = new Analytics(this.env.ANALYTICS), performance = new PerformanceTimer(this.env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
     try {
-      return 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
-      ), handleRequest(
+      );
+      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 });
+      }
+      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,
-        applyConfigurationDefaults(this.env.CONFIG),
+        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), response;
+      return sentry && sentry.captureException(err), err instanceof Error && analytics.setData({ error: err.message }), response;
+    } 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(), intent = await getIntent(
-      url.pathname,
+    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(