@edgestore/server 0.5.2 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/server",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -109,7 +109,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@edgestore/shared": "0.5.2",
+    "@edgestore/shared": "0.5.3",
     "@panva/hkdf": "^1.0.4",
     "cookie": "^0.5.0",
     "jose": "^4.13.1",
@@ -145,11 +145,11 @@
     "astro": "^5.7.12",
     "fastify": "^5.3.2",
     "hono": "^4.7.9",
-    "next": "^15.2.4",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "next": "15.3.1",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "typescript": "^5",
-    "zod": "3.21.4"
+    "zod": "3.25.42"
   },
-  "gitHead": "97cb861d3f56e4e04c83acc6808d56771433df29"
+  "gitHead": "fb6625eb48bf5565acc01fe765dcc949f8641e84"
 }

package/src/adapters/astro/index.ts

@@ -14,11 +14,13 @@ import {
   completeMultipartUpload,
   confirmUpload,
   deleteFile,
+  getCookieConfig,
   init,
   requestUpload,
   requestUploadParts,
   type CompleteMultipartUploadBody,
   type ConfirmUploadBody,
+  type CookieConfig,
   type DeleteFileBody,
   type RequestUploadBody,
   type RequestUploadPartsParams,
@@ -28,12 +30,14 @@ export type Config<TCtx> = {
   provider?: Provider;
   router: EdgeStoreRouter<TCtx>;
   logLevel?: LogLevel;
+  cookieConfig?: CookieConfig;
 } & (TCtx extends Record<string, never>
   ? object
   : {
       provider?: Provider;
       router: EdgeStoreRouter<TCtx>;
       createContext: (opts: APIContext) => MaybePromise<TCtx>;
+      cookieConfig?: CookieConfig;
     });
 
 declare const globalThis: {
@@ -57,11 +61,13 @@ function getCookie(request: Request, name: string): string | undefined {
 }
 
 export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
-  const { provider = EdgeStoreProvider() } = config;
+  const { provider = EdgeStoreProvider(), cookieConfig } = config;
   const log = new Logger(config.logLevel);
   globalThis._EDGE_STORE_LOGGER = log;
   log.debug('Creating EdgeStore Astro handler');
 
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   return async (context: APIContext) => {
     try {
       const { request } = context;
@@ -87,6 +93,7 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
           ctx,
           provider,
           router: config.router,
+          cookieConfig,
         });
 
         const headers = new Headers();
@@ -114,7 +121,7 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body,
-          ctxToken: getCookie(request, 'edgestore-ctx'),
+          ctxToken: getCookie(request, resolvedCookieConfig.ctx.name),
         });
 
         return new Response(JSON.stringify(result), {
@@ -126,7 +133,7 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body,
-          ctxToken: getCookie(request, 'edgestore-ctx'),
+          ctxToken: getCookie(request, resolvedCookieConfig.ctx.name),
         });
 
         return new Response(JSON.stringify(result), {
@@ -138,7 +145,7 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body,
-          ctxToken: getCookie(request, 'edgestore-ctx'),
+          ctxToken: getCookie(request, resolvedCookieConfig.ctx.name),
         });
 
         return new Response(null, { status: 200 });
@@ -148,7 +155,7 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body,
-          ctxToken: getCookie(request, 'edgestore-ctx'),
+          ctxToken: getCookie(request, resolvedCookieConfig.ctx.name),
         });
 
         return new Response(JSON.stringify(result), {
@@ -160,7 +167,7 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body,
-          ctxToken: getCookie(request, 'edgestore-ctx'),
+          ctxToken: getCookie(request, resolvedCookieConfig.ctx.name),
         });
 
         return new Response(JSON.stringify(result), {
@@ -199,11 +206,12 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
 
         return new Response(JSON.stringify(err.formattedJson()), {
           status: EDGE_STORE_ERROR_CODES[err.code as EdgeStoreErrorCodeKey],
-          headers: { 'Content-Type': 'application/json' },
+          headers: {
+            'Content-Type': 'application/json',
+          },
         });
       } else {
         log.error(err);
-
         return new Response(
           JSON.stringify(
             new EdgeStoreError({
@@ -213,7 +221,9 @@ export function createEdgeStoreAstroHandler<TCtx>(config: Config<TCtx>) {
           ),
           {
             status: 500,
-            headers: { 'Content-Type': 'application/json' },
+            headers: {
+              'Content-Type': 'application/json',
+            },
           },
         );
       }

package/src/adapters/express/index.ts

@@ -14,11 +14,13 @@ import {
   completeMultipartUpload,
   confirmUpload,
   deleteFile,
+  getCookieConfig,
   init,
   requestUpload,
   requestUploadParts,
   type CompleteMultipartUploadBody,
   type ConfirmUploadBody,
+  type CookieConfig,
   type DeleteFileBody,
   type RequestUploadBody,
   type RequestUploadPartsParams,
@@ -33,12 +35,14 @@ export type Config<TCtx> = {
   provider?: Provider;
   router: EdgeStoreRouter<TCtx>;
   logLevel?: LogLevel;
+  cookieConfig?: CookieConfig;
 } & (TCtx extends Record<string, never>
   ? object
   : {
       provider?: Provider;
       router: EdgeStoreRouter<TCtx>;
       createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
+      cookieConfig?: CookieConfig;
     });
 
 declare const globalThis: {
@@ -46,11 +50,13 @@ declare const globalThis: {
 };
 
 export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
-  const { provider = EdgeStoreProvider() } = config;
+  const { provider = EdgeStoreProvider(), cookieConfig } = config;
   const log = new Logger(config.logLevel);
   globalThis._EDGE_STORE_LOGGER = log;
   log.debug('Creating EdgeStore Express handler');
 
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   return async (req: Request, res: Response) => {
     try {
       const pathname = req.url ?? '';
@@ -74,6 +80,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
           ctx,
           provider,
           router: config.router,
+          cookieConfig,
         });
         res.setHeader('Set-Cookie', newCookies);
         res.json({
@@ -86,7 +93,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as RequestUploadBody,
-            ctxToken: req.cookies['edgestore-ctx'],
+            ctxToken: req.cookies[resolvedCookieConfig.ctx.name],
           }),
         );
       } else if (matchPath(pathname, '/request-upload-parts')) {
@@ -95,7 +102,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as RequestUploadPartsParams,
-            ctxToken: req.cookies['edgestore-ctx'],
+            ctxToken: req.cookies[resolvedCookieConfig.ctx.name],
           }),
         );
       } else if (matchPath(pathname, '/complete-multipart-upload')) {
@@ -103,7 +110,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body: req.body as CompleteMultipartUploadBody,
-          ctxToken: req.cookies['edgestore-ctx'],
+          ctxToken: req.cookies[resolvedCookieConfig.ctx.name],
         });
         res.status(200).end();
       } else if (matchPath(pathname, '/confirm-upload')) {
@@ -112,7 +119,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as ConfirmUploadBody,
-            ctxToken: req.cookies['edgestore-ctx'],
+            ctxToken: req.cookies[resolvedCookieConfig.ctx.name],
           }),
         );
       } else if (matchPath(pathname, '/delete-file')) {
@@ -121,7 +128,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as DeleteFileBody,
-            ctxToken: req.cookies['edgestore-ctx'],
+            ctxToken: req.cookies[resolvedCookieConfig.ctx.name],
           }),
         );
       } else if (matchPath(pathname, '/proxy-file')) {

package/src/adapters/fastify/index.ts

@@ -6,7 +6,7 @@ import {
   type MaybePromise,
   type Provider,
 } from '@edgestore/shared';
-import { type FastifyRequest, type FastifyReply } from 'fastify';
+import { type FastifyReply, type FastifyRequest } from 'fastify';
 import Logger, { type LogLevel } from '../../libs/logger';
 import { matchPath } from '../../libs/utils';
 import { EdgeStoreProvider } from '../../providers/edgestore';
@@ -14,11 +14,13 @@ import {
   completeMultipartUpload,
   confirmUpload,
   deleteFile,
+  getCookieConfig,
   init,
   requestUpload,
   requestUploadParts,
   type CompleteMultipartUploadBody,
   type ConfirmUploadBody,
+  type CookieConfig,
   type DeleteFileBody,
   type RequestUploadBody,
   type RequestUploadPartsParams,
@@ -33,12 +35,14 @@ export type Config<TCtx> = {
   provider?: Provider;
   router: EdgeStoreRouter<TCtx>;
   logLevel?: LogLevel;
+  cookieConfig?: CookieConfig;
 } & (TCtx extends Record<string, never>
   ? object
   : {
       provider?: Provider;
       router: EdgeStoreRouter<TCtx>;
       createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
+      cookieConfig?: CookieConfig;
     });
 
 declare const globalThis: {
@@ -52,31 +56,35 @@ function getCookie(req: FastifyRequest, name: string): string | undefined {
     // Type assertion for TypeScript
     return (req as any).cookies[name];
   }
-  
+
   // Fallback to parsing cookie header
   const cookieHeader = req.headers.cookie;
   if (!cookieHeader) return undefined;
-  
-  const cookies = cookieHeader.split(';').reduce<Record<string, string>>((acc, cookie) => {
-    const [key, value] = cookie.trim().split('=');
-    if (key && value) acc[key] = value;
-    return acc;
-  }, {});
-  
+
+  const cookies = cookieHeader
+    .split(';')
+    .reduce<Record<string, string>>((acc, cookie) => {
+      const [key, value] = cookie.trim().split('=');
+      if (key && value) acc[key] = value;
+      return acc;
+    }, {});
+
   return cookies[name];
 }
 
 export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
-  const { provider = EdgeStoreProvider() } = config;
+  const { provider = EdgeStoreProvider(), cookieConfig } = config;
   const log = new Logger(config.logLevel);
   globalThis._EDGE_STORE_LOGGER = log;
   log.debug('Creating EdgeStore Fastify handler');
 
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   return async (req: FastifyRequest, reply: FastifyReply) => {
     try {
       // Get the URL from the request - simplified approach
       const pathname = req.url;
-      
+
       if (matchPath(pathname, '/health')) {
         return reply.send('OK');
       } else if (matchPath(pathname, '/init')) {
@@ -97,8 +105,9 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
           ctx,
           provider,
           router: config.router,
+          cookieConfig,
         });
-        
+
         // Set cookies more efficiently - handling them using void operator
         // to explicitly mark these synchronous calls as intentionally not awaited
         if (Array.isArray(newCookies)) {
@@ -110,7 +119,7 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
           // If it's a single cookie string
           void reply.header('Set-Cookie', newCookies);
         }
-        
+
         return reply.send({
           token,
           baseUrl,
@@ -121,7 +130,7 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as RequestUploadBody,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/request-upload-parts')) {
@@ -130,7 +139,7 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as RequestUploadPartsParams,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/complete-multipart-upload')) {
@@ -138,7 +147,7 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body: req.body as CompleteMultipartUploadBody,
-          ctxToken: getCookie(req, 'edgestore-ctx'),
+          ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
         });
         return reply.status(200).send();
       } else if (matchPath(pathname, '/confirm-upload')) {
@@ -147,7 +156,7 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as ConfirmUploadBody,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/delete-file')) {
@@ -156,15 +165,17 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body: req.body as DeleteFileBody,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/proxy-file')) {
-        const url = req.query ? (req.query as Record<string, any>).url : undefined;
-        
+        const url = req.query
+          ? (req.query as Record<string, any>).url
+          : undefined;
+
         if (typeof url === 'string') {
           const cookieHeader = req.headers.cookie ?? '';
-          
+
           const proxyRes = await fetch(url, {
             headers: {
               cookie: cookieHeader,
@@ -202,4 +213,4 @@ export function createEdgeStoreFastifyHandler<TCtx>(config: Config<TCtx>) {
       }
     }
   };
-}
+}

package/src/adapters/hono/index.ts

@@ -14,11 +14,13 @@ import {
   completeMultipartUpload,
   confirmUpload,
   deleteFile,
+  getCookieConfig,
   init,
   requestUpload,
   requestUploadParts,
   type CompleteMultipartUploadBody,
   type ConfirmUploadBody,
+  type CookieConfig,
   type DeleteFileBody,
   type RequestUploadBody,
   type RequestUploadPartsParams,
@@ -32,12 +34,14 @@ export type Config<TCtx> = {
   provider?: Provider;
   router: EdgeStoreRouter<TCtx>;
   logLevel?: LogLevel;
+  cookieConfig?: CookieConfig;
 } & (TCtx extends Record<string, never>
   ? object
   : {
       provider?: Provider;
       router: EdgeStoreRouter<TCtx>;
       createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
+      cookieConfig?: CookieConfig;
     });
 
 declare const globalThis: {
@@ -54,11 +58,13 @@ function getCookie(c: Context, name: string): string | undefined {
 }
 
 export function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>) {
-  const { provider = EdgeStoreProvider() } = config;
+  const { provider = EdgeStoreProvider(), cookieConfig } = config;
   const log = new Logger(config.logLevel);
   globalThis._EDGE_STORE_LOGGER = log;
   log.debug('Creating EdgeStore Hono handler');
 
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   return async (c: Context) => {
     try {
       const pathname = new URL(c.req.url).pathname;
@@ -83,6 +89,7 @@ export function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>) {
           ctx,
           provider,
           router: config.router,
+          cookieConfig,
         });
 
         // Set cookies
@@ -105,7 +112,7 @@ export function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(c, 'edgestore-ctx'),
+            ctxToken: getCookie(c, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/request-upload-parts')) {
@@ -115,7 +122,7 @@ export function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(c, 'edgestore-ctx'),
+            ctxToken: getCookie(c, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/complete-multipart-upload')) {
@@ -124,7 +131,7 @@ export function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body,
-          ctxToken: getCookie(c, 'edgestore-ctx'),
+          ctxToken: getCookie(c, resolvedCookieConfig.ctx.name),
         });
         return c.body(null, 200);
       } else if (matchPath(pathname, '/confirm-upload')) {
@@ -134,7 +141,7 @@ export function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(c, 'edgestore-ctx'),
+            ctxToken: getCookie(c, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/delete-file')) {
@@ -144,7 +151,7 @@ export function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(c, 'edgestore-ctx'),
+            ctxToken: getCookie(c, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/proxy-file')) {

package/src/adapters/next/app/index.ts

@@ -14,11 +14,13 @@ import {
   completeMultipartUpload,
   confirmUpload,
   deleteFile,
+  getCookieConfig,
   init,
   requestUpload,
   requestUploadParts,
   type CompleteMultipartUploadBody,
   type ConfirmUploadBody,
+  type CookieConfig,
   type DeleteFileBody,
   type RequestUploadBody,
   type RequestUploadPartsParams,
@@ -32,12 +34,14 @@ export type Config<TCtx> = {
   provider?: Provider;
   router: EdgeStoreRouter<TCtx>;
   logLevel?: LogLevel;
+  cookieConfig?: CookieConfig;
 } & (TCtx extends Record<string, never>
   ? object
   : {
       provider?: Provider;
       router: EdgeStoreRouter<TCtx>;
       createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
+      cookieConfig?: CookieConfig;
     });
 
 declare const globalThis: {
@@ -45,11 +49,13 @@ declare const globalThis: {
 };
 
 export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
-  const { provider = EdgeStoreProvider() } = config;
+  const { provider = EdgeStoreProvider(), cookieConfig } = config;
   const log = new Logger(config.logLevel);
   globalThis._EDGE_STORE_LOGGER = log;
   log.debug('Creating EdgeStore Next handler (app adapter)');
 
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   return async (req: NextRequest) => {
     try {
       if (!('nextUrl' in req))
@@ -83,6 +89,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           ctx,
           provider,
           router: config.router,
+          cookieConfig,
         });
         const res = new Response(
           JSON.stringify({
@@ -105,7 +112,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body: (await req.json()) as RequestUploadBody,
-          ctxToken: req.cookies.get('edgestore-ctx')?.value,
+          ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value,
         });
         return new Response(JSON.stringify(res), {
           status: 200,
@@ -118,7 +125,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body: (await req.json()) as RequestUploadPartsParams,
-          ctxToken: req.cookies.get('edgestore-ctx')?.value,
+          ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value,
         });
         return new Response(JSON.stringify(res), {
           status: 200,
@@ -131,7 +138,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body: (await req.json()) as CompleteMultipartUploadBody,
-          ctxToken: req.cookies.get('edgestore-ctx')?.value,
+          ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value,
         });
         return new Response(null, {
           status: 200,
@@ -141,7 +148,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body: (await req.json()) as ConfirmUploadBody,
-          ctxToken: req.cookies.get('edgestore-ctx')?.value,
+          ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value,
         });
         return new Response(JSON.stringify(res), {
           status: 200,
@@ -154,7 +161,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body: (await req.json()) as DeleteFileBody,
-          ctxToken: req.cookies.get('edgestore-ctx')?.value,
+          ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value,
         });
         return new Response(JSON.stringify(res), {
           status: 200,