get media filename from request

Author: maxakuru

src/index.js

@@ -15,7 +15,7 @@ import { resolveConfig } from './utils/config.js';
 import handlers from './routes/index.js';
 
 /**
- * @param {Request} req
+ * @param {import("@cloudflare/workers-types/experimental").Request} req
  */
 async function parseData(req) {
   if (['GET', 'HEAD', 'OPTIONS'].includes(req.method)) {
@@ -41,7 +41,7 @@ async function parseData(req) {
 
 /**
  * @param {import("@cloudflare/workers-types/experimental").ExecutionContext} pctx
- * @param {Request} req
+ * @param {import("@cloudflare/workers-types/experimental").Request} req
  * @param {Env} env
  * @returns {Promise<Context>}
  */
@@ -51,6 +51,8 @@ export async function makeContext(pctx, req, env) {
   const ctx = pctx;
   // @ts-ignore
   ctx.attributes = {};
+  // @ts-ignore
+  ctx.request = req;
   ctx.env = env;
   ctx.url = new URL(req.url);
   ctx.log = console;
@@ -69,7 +71,7 @@ export async function makeContext(pctx, req, env) {
 
 export default {
   /**
-   * @param {Request} request
+   * @param {import("@cloudflare/workers-types/experimental").Request} request
    * @param {Env} env
    * @param {import("@cloudflare/workers-types/experimental").ExecutionContext} pctx
    * @returns {Promise<Response>}

src/routes/content/media.js

@@ -22,9 +22,9 @@ export default async function handler(ctx) {
     log,
     config: { org, site },
   } = ctx;
-  log.debug('handling media: ', url.pathname);
+  log.debug('handling media: ', url.pathname, ctx.request.url);
 
-  const filename = url.pathname.split('/').pop();
+  const filename = ctx.request.url.split('/').pop();
   const key = `${org}/${site}/media/${filename}`;
   log.debug('fetching media: ', key, filename);
   const resp = await env.CATALOG_BUCKET.get(key);

src/routes/index.js

@@ -16,7 +16,13 @@ import config from './config/handler.js';
 import auth from './auth/handler.js';
 
 /**
- * @type {Record<string, (ctx: Context, request: Request) => Promise<Response>>}
+ * @type {Record<
+ *  string,
+ *  (
+ *    ctx: Context,
+ *    request: import("@cloudflare/workers-types/experimental").Request
+ *  ) => Promise<Response>
+ * >}
  */
 export default {
   content,

src/types.d.ts

@@ -247,6 +247,7 @@ declare global {
     env: Env;
     log: Console;
     config: Config;
+    request: Request;
     /** parsed from body or query params */
     data: any;
     info: {