@edgestore/server 0.5.2 → 0.5.3-alpha.0

package/src/adapters/remix/index.ts

@@ -13,11 +13,13 @@ import {
   completeMultipartUpload,
   confirmUpload,
   deleteFile,
+  getCookieConfig,
   init,
   requestUpload,
   requestUploadParts,
   type CompleteMultipartUploadBody,
   type ConfirmUploadBody,
+  type CookieConfig,
   type DeleteFileBody,
   type RequestUploadBody,
   type RequestUploadPartsParams,
@@ -31,12 +33,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: {
@@ -60,11 +64,13 @@ function getCookie(req: Request, name: string): string | undefined {
 }
 
 export function createEdgeStoreRemixHandler<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 Remix handler');
 
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   return async ({ request: req }: { request: Request }) => {
     try {
       const url = new URL(req.url);
@@ -90,6 +96,7 @@ export function createEdgeStoreRemixHandler<TCtx>(config: Config<TCtx>) {
           ctx,
           provider,
           router: config.router,
+          cookieConfig,
         });
 
         // Create response with cookies and token
@@ -114,7 +121,7 @@ export function createEdgeStoreRemixHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/request-upload-parts')) {
@@ -124,7 +131,7 @@ export function createEdgeStoreRemixHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/complete-multipart-upload')) {
@@ -133,7 +140,7 @@ export function createEdgeStoreRemixHandler<TCtx>(config: Config<TCtx>) {
           provider,
           router: config.router,
           body,
-          ctxToken: getCookie(req, 'edgestore-ctx'),
+          ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
         });
         return new Response(null, { status: 200 });
       } else if (matchPath(pathname, '/confirm-upload')) {
@@ -143,7 +150,7 @@ export function createEdgeStoreRemixHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/delete-file')) {
@@ -153,7 +160,7 @@ export function createEdgeStoreRemixHandler<TCtx>(config: Config<TCtx>) {
             provider,
             router: config.router,
             body,
-            ctxToken: getCookie(req, 'edgestore-ctx'),
+            ctxToken: getCookie(req, resolvedCookieConfig.ctx.name),
           }),
         );
       } else if (matchPath(pathname, '/proxy-file')) {

package/src/adapters/shared.ts

@@ -22,31 +22,147 @@ declare const globalThis: {
   _EDGE_STORE_LOGGER: Logger;
 };
 
+export type CookieOptions = {
+  /**
+   * Cookie path
+   * @default "/"
+   */
+  path?: string;
+  /**
+   * Cookie max age in seconds
+   * @default 2592000 (30 days)
+   */
+  maxAge?: number;
+  /**
+   * Cookie domain
+   */
+  domain?: string;
+  /**
+   * Cookie same site policy
+   */
+  sameSite?: 'strict' | 'lax' | 'none';
+  /**
+   * Cookie secure flag
+   */
+  secure?: boolean;
+  /**
+   * Cookie http only flag
+   */
+  httpOnly?: boolean;
+};
+
+export type CookieConfig = {
+  /**
+   * Context cookie configuration
+   */
+  ctx?: {
+    /**
+     * Name of the context cookie
+     * @default "edgestore-ctx"
+     */
+    name?: string;
+    /**
+     * Cookie options for context cookie
+     */
+    options?: CookieOptions;
+  };
+  /**
+   * Token cookie configuration
+   */
+  token?: {
+    /**
+     * Name of the token cookie
+     * @default "edgestore-token"
+     */
+    name?: string;
+    /**
+     * Cookie options for token cookie
+     */
+    options?: CookieOptions;
+  };
+};
+
+type ResolvedCookieConfig = {
+  ctx: {
+    name: string;
+    options: CookieOptions;
+  };
+  token: {
+    name: string;
+    options: CookieOptions;
+  };
+};
+
+/**
+ * Merges the provided cookie configuration with default values
+ */
+export function getCookieConfig(
+  cookieConfig?: CookieConfig,
+): ResolvedCookieConfig {
+  const defaultOptions: CookieOptions = {
+    path: '/',
+    maxAge: DEFAULT_MAX_AGE,
+  };
+
+  // Helper function to merge options, filtering out undefined values
+  const mergeOptions = (configOptions?: CookieOptions): CookieOptions => {
+    const merged = { ...defaultOptions };
+
+    if (configOptions) {
+      Object.keys(configOptions).forEach((key) => {
+        const value = configOptions[key as keyof CookieOptions];
+        if (value !== undefined) {
+          (merged as any)[key] = value;
+        }
+      });
+    }
+
+    return merged;
+  };
+
+  return {
+    ctx: {
+      name: cookieConfig?.ctx?.name ?? 'edgestore-ctx',
+      options: mergeOptions(cookieConfig?.ctx?.options),
+    },
+    token: {
+      name: cookieConfig?.token?.name ?? 'edgestore-token',
+      options: mergeOptions(cookieConfig?.token?.options),
+    },
+  };
+}
+
 export async function init<TCtx>(params: {
   provider: Provider;
   router: EdgeStoreRouter<TCtx>;
   ctx: TCtx;
+  cookieConfig?: CookieConfig;
 }): Promise<SharedInitRes> {
   const log = globalThis._EDGE_STORE_LOGGER;
-  const { ctx, provider, router } = params;
+  const { ctx, provider, router, cookieConfig } = params;
   log.debug('Running [init]', { ctx });
+
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   const ctxToken = await encryptJWT(ctx);
   const { token } = await provider.init({
     ctx,
     router: router,
   });
   const newCookies = [
-    serialize('edgestore-ctx', ctxToken, {
-      path: '/',
-      maxAge: DEFAULT_MAX_AGE,
-    }),
+    serialize(
+      resolvedCookieConfig.ctx.name,
+      ctxToken,
+      resolvedCookieConfig.ctx.options,
+    ),
   ];
   if (token) {
     newCookies.push(
-      serialize('edgestore-token', token, {
-        path: '/',
-        maxAge: DEFAULT_MAX_AGE,
-      }),
+      serialize(
+        resolvedCookieConfig.token.name,
+        token,
+        resolvedCookieConfig.token.options,
+      ),
     );
   }
   const baseUrl = await provider.getBaseUrl();

package/src/adapters/start/index.ts

@@ -13,11 +13,13 @@ import {
   completeMultipartUpload,
   confirmUpload,
   deleteFile,
+  getCookieConfig,
   init,
   requestUpload,
   requestUploadParts,
   type CompleteMultipartUploadBody,
   type ConfirmUploadBody,
+  type CookieConfig,
   type DeleteFileBody,
   type RequestUploadBody,
   type RequestUploadPartsParams,
@@ -31,12 +33,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: {
@@ -60,11 +64,13 @@ function getCookie(req: Request, cookieName: string): string | undefined {
 }
 
 export function createEdgeStoreStartHandler<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 TanStack Start handler');
 
+  const resolvedCookieConfig = getCookieConfig(cookieConfig);
+
   return async ({ request }: { request: Request }) => {
     try {
       const { pathname } = new URL(request.url);
@@ -88,9 +94,12 @@ export function createEdgeStoreStartHandler<TCtx>(config: Config<TCtx>) {
           ctx,
           provider,
           router: config.router,
+          cookieConfig,
         });
         const headers = new Headers();
-        newCookies.forEach((cookie) => headers.append('Set-Cookie', cookie));
+        newCookies.forEach((cookie) => {
+          headers.append('Set-Cookie', cookie);
+        });
         headers.set('Content-Type', 'application/json');
         return new Response(JSON.stringify({ token, baseUrl }), {
           status: 200,
@@ -98,7 +107,7 @@ export function createEdgeStoreStartHandler<TCtx>(config: Config<TCtx>) {
         });
       } else if (matchPath(pathname, '/request-upload')) {
         const body = await request.json();
-        const ctxToken = getCookie(request, 'edgestore-ctx');
+        const ctxToken = getCookie(request, resolvedCookieConfig.ctx.name);
         const result = await requestUpload({
           provider,
           router: config.router,
@@ -111,7 +120,7 @@ export function createEdgeStoreStartHandler<TCtx>(config: Config<TCtx>) {
         });
       } else if (matchPath(pathname, '/request-upload-parts')) {
         const body = await request.json();
-        const ctxToken = getCookie(request, 'edgestore-ctx');
+        const ctxToken = getCookie(request, resolvedCookieConfig.ctx.name);
         const result = await requestUploadParts({
           provider,
           router: config.router,
@@ -124,7 +133,7 @@ export function createEdgeStoreStartHandler<TCtx>(config: Config<TCtx>) {
         });
       } else if (matchPath(pathname, '/complete-multipart-upload')) {
         const body = await request.json();
-        const ctxToken = getCookie(request, 'edgestore-ctx');
+        const ctxToken = getCookie(request, resolvedCookieConfig.ctx.name);
         await completeMultipartUpload({
           provider,
           router: config.router,
@@ -134,7 +143,7 @@ export function createEdgeStoreStartHandler<TCtx>(config: Config<TCtx>) {
         return new Response(null, { status: 200 });
       } else if (matchPath(pathname, '/confirm-upload')) {
         const body = await request.json();
-        const ctxToken = getCookie(request, 'edgestore-ctx');
+        const ctxToken = getCookie(request, resolvedCookieConfig.ctx.name);
         const result = await confirmUpload({
           provider,
           router: config.router,
@@ -147,7 +156,7 @@ export function createEdgeStoreStartHandler<TCtx>(config: Config<TCtx>) {
         });
       } else if (matchPath(pathname, '/delete-file')) {
         const body = await request.json();
-        const ctxToken = getCookie(request, 'edgestore-ctx');
+        const ctxToken = getCookie(request, resolvedCookieConfig.ctx.name);
         const result = await deleteFile({
           provider,
           router: config.router,