@edgestore/server 0.1.5-alpha.4 → 0.1.5-alpha.5

package/dist/{shared-30b7a2ab.mjs → shared-b14a84ee.mjs}

@@ -2,22 +2,7 @@ import { hkdf } from '@panva/hkdf';
 import { serialize } from 'cookie';
 import { EncryptJWT, jwtDecrypt } from 'jose';
 import { v4 } from 'uuid';
-import { _ } from '@swc/helpers/_/_define_property';
-
-const EDGE_STORE_ERROR_CODES = {
-    BAD_REQUEST: 400,
-    UNAUTHORIZED: 401
-};
-class EdgeStoreError extends Error {
-    constructor(opts){
-        super(opts.message);
-        _(this, "cause", void 0);
-        _(this, "code", void 0);
-        this.name = 'EdgeStoreError';
-        this.code = opts.code;
-        this.cause = opts.cause;
-    }
-}
+import { E as EdgeStoreError } from './index-7cb3a3f3.mjs';
 
 const IMAGE_MIME_TYPES = [
     'image/jpeg',
@@ -69,7 +54,10 @@ async function requestUpload(params) {
     const ctx = await getContext(ctxToken);
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
     if (bucket._def.beforeUpload) {
         const canUpload = await bucket._def.beforeUpload?.({
@@ -85,22 +73,33 @@ async function requestUpload(params) {
             }
         });
         if (!canUpload) {
-            throw new Error('Upload not allowed');
+            throw new EdgeStoreError({
+                message: 'Upload not allowed for the current context',
+                code: 'UPLOAD_NOT_ALLOWED'
+            });
         }
     }
     if (bucket._def.type === 'IMAGE') {
         if (!IMAGE_MIME_TYPES.includes(fileInfo.type)) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
-                message: 'Only images are allowed in this bucket'
+                code: 'MIME_TYPE_NOT_ALLOWED',
+                message: 'Only images are allowed in this bucket',
+                details: {
+                    allowedMimeTypes: IMAGE_MIME_TYPES,
+                    mimeType: fileInfo.type
+                }
             });
         }
     }
     if (bucket._def.bucketConfig?.maxSize) {
         if (fileInfo.size > bucket._def.bucketConfig.maxSize) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
-                message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`
+                code: 'FILE_TOO_LARGE',
+                message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`,
+                details: {
+                    maxFileSize: bucket._def.bucketConfig.maxSize,
+                    fileSize: fileInfo.size
+                }
             });
         }
     }
@@ -121,8 +120,12 @@ async function requestUpload(params) {
         }
         if (!accepted) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
-                message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`
+                code: 'MIME_TYPE_NOT_ALLOWED',
+                message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`,
+                details: {
+                    allowedMimeTypes: accept,
+                    mimeType: fileInfo.type
+                }
             });
         }
     }
@@ -160,7 +163,7 @@ async function requestUpload(params) {
     };
 }
 async function requestUploadParts(params) {
-    const { provider, router, ctxToken, body: { multipart, path } } = params;
+    const { provider, ctxToken, body: { multipart, path } } = params;
     if (!ctxToken) {
         throw new EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
@@ -168,10 +171,6 @@ async function requestUploadParts(params) {
         });
     }
     await getContext(ctxToken); // just to check if the token is valid
-    const bucket = router.buckets[multipart.uploadId];
-    if (!bucket) {
-        throw new Error(`Bucket ${multipart.uploadId} not found`);
-    }
     return await provider.requestUploadParts({
         multipart,
         path
@@ -188,7 +187,10 @@ async function completeMultipartUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
     return await provider.completeMultipartUpload({
         uploadId,
@@ -207,7 +209,10 @@ async function confirmUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
     return await provider.confirmUpload({
         bucket,
@@ -225,10 +230,16 @@ async function deleteFile(params) {
     const ctx = await getContext(ctxToken);
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
     if (!bucket._def.beforeDelete) {
-        throw new Error('You need to define beforeDelete if you want to delete files directly from the frontend.');
+        throw new EdgeStoreError({
+            message: 'You need to define beforeDelete if you want to delete files directly from the frontend.',
+            code: 'SERVER_ERROR'
+        });
     }
     const fileInfo = await provider.getFile({
         url
@@ -238,7 +249,10 @@ async function deleteFile(params) {
         fileInfo
     });
     if (!canDelete) {
-        throw new Error('Delete not allowed');
+        throw new EdgeStoreError({
+            message: 'Delete not allowed for the current context',
+            code: 'DELETE_NOT_ALLOWED'
+        });
     }
     return await provider.deleteFile({
         bucket,
@@ -248,7 +262,10 @@ async function deleteFile(params) {
 async function encryptJWT(ctx) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new Error('EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined');
+        throw new EdgeStoreError({
+            message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
+            code: 'SERVER_ERROR'
+        });
     }
     const encryptionSecret = await getDerivedEncryptionKey(secret);
     return await new EncryptJWT(ctx).setProtectedHeader({
@@ -259,7 +276,10 @@ async function encryptJWT(ctx) {
 async function decryptJWT(token) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new Error('EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not set');
+        throw new EdgeStoreError({
+            message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
+            code: 'SERVER_ERROR'
+        });
     }
     const encryptionSecret = await getDerivedEncryptionKey(secret);
     const { payload } = await jwtDecrypt(token, encryptionSecret, {
@@ -276,13 +296,19 @@ function buildPath(params) {
     const path = pathParams.map((param)=>{
         const paramEntries = Object.entries(param);
         if (paramEntries[0] === undefined) {
-            throw new Error('Missing path param');
+            throw new EdgeStoreError({
+                message: `Empty path param found in: ${JSON.stringify(pathParams)}`,
+                code: 'SERVER_ERROR'
+            });
         }
         const [key, value] = paramEntries[0];
         // this is a string like: "ctx.xxx" or "input.yyy.zzz"
         const currParamVal = value().split('.').reduce((acc2, key)=>{
             if (acc2[key] === undefined) {
-                throw new Error(`Missing key ${key} in ${JSON.stringify(acc2)}`);
+                throw new EdgeStoreError({
+                    message: `Missing key ${key} in ${JSON.stringify(acc2)}`,
+                    code: 'BAD_REQUEST'
+                });
             }
             return acc2[key];
         }, params.pathAttrs);
@@ -305,9 +331,6 @@ function parsePath(path) {
     };
 }
 async function getContext(token) {
-    if (!token) {
-        throw new Error('No token');
-    }
     return await decryptJWT(token);
 }
 /**
@@ -327,4 +350,4 @@ async function getContext(token) {
     return url;
 }
 
-export { EdgeStoreError as E, requestUploadParts as a, buildPath as b, completeMultipartUpload as c, confirmUpload as d, deleteFile as e, EDGE_STORE_ERROR_CODES as f, init as i, parsePath as p, requestUpload as r };
+export { requestUploadParts as a, buildPath as b, completeMultipartUpload as c, confirmUpload as d, deleteFile as e, init as i, parsePath as p, requestUpload as r };

package/dist/{shared-88655ba7.js → shared-f8ddbf7c.js}

@@ -2,19 +2,7 @@ import { hkdf } from '@panva/hkdf';
 import { serialize } from 'cookie';
 import { EncryptJWT, jwtDecrypt } from 'jose';
 import { v4 } from 'uuid';
-
-const EDGE_STORE_ERROR_CODES = {
-    BAD_REQUEST: 400,
-    UNAUTHORIZED: 401,
-};
-class EdgeStoreError extends Error {
-    constructor(opts) {
-        super(opts.message);
-        this.name = 'EdgeStoreError';
-        this.code = opts.code;
-        this.cause = opts.cause;
-    }
-}
+import { E as EdgeStoreError } from './index-9eb6248c.js';
 
 const IMAGE_MIME_TYPES = [
     'image/jpeg',
@@ -66,7 +54,10 @@ async function requestUpload(params) {
     const ctx = await getContext(ctxToken);
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST',
+        });
     }
     if (bucket._def.beforeUpload) {
         const canUpload = await bucket._def.beforeUpload?.({
@@ -82,22 +73,33 @@ async function requestUpload(params) {
             },
         });
         if (!canUpload) {
-            throw new Error('Upload not allowed');
+            throw new EdgeStoreError({
+                message: 'Upload not allowed for the current context',
+                code: 'UPLOAD_NOT_ALLOWED',
+            });
         }
     }
     if (bucket._def.type === 'IMAGE') {
         if (!IMAGE_MIME_TYPES.includes(fileInfo.type)) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
+                code: 'MIME_TYPE_NOT_ALLOWED',
                 message: 'Only images are allowed in this bucket',
+                details: {
+                    allowedMimeTypes: IMAGE_MIME_TYPES,
+                    mimeType: fileInfo.type,
+                },
             });
         }
     }
     if (bucket._def.bucketConfig?.maxSize) {
         if (fileInfo.size > bucket._def.bucketConfig.maxSize) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
+                code: 'FILE_TOO_LARGE',
                 message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`,
+                details: {
+                    maxFileSize: bucket._def.bucketConfig.maxSize,
+                    fileSize: fileInfo.size,
+                },
             });
         }
     }
@@ -119,8 +121,12 @@ async function requestUpload(params) {
         }
         if (!accepted) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
+                code: 'MIME_TYPE_NOT_ALLOWED',
                 message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`,
+                details: {
+                    allowedMimeTypes: accept,
+                    mimeType: fileInfo.type,
+                },
             });
         }
     }
@@ -152,7 +158,7 @@ async function requestUpload(params) {
     };
 }
 async function requestUploadParts(params) {
-    const { provider, router, ctxToken, body: { multipart, path }, } = params;
+    const { provider, ctxToken, body: { multipart, path }, } = params;
     if (!ctxToken) {
         throw new EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
@@ -160,10 +166,6 @@ async function requestUploadParts(params) {
         });
     }
     await getContext(ctxToken); // just to check if the token is valid
-    const bucket = router.buckets[multipart.uploadId];
-    if (!bucket) {
-        throw new Error(`Bucket ${multipart.uploadId} not found`);
-    }
     return await provider.requestUploadParts({
         multipart,
         path,
@@ -180,7 +182,10 @@ async function completeMultipartUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST',
+        });
     }
     return await provider.completeMultipartUpload({
         uploadId,
@@ -199,7 +204,10 @@ async function confirmUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST',
+        });
     }
     return await provider.confirmUpload({
         bucket,
@@ -217,10 +225,16 @@ async function deleteFile(params) {
     const ctx = await getContext(ctxToken);
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST',
+        });
     }
     if (!bucket._def.beforeDelete) {
-        throw new Error('You need to define beforeDelete if you want to delete files directly from the frontend.');
+        throw new EdgeStoreError({
+            message: 'You need to define beforeDelete if you want to delete files directly from the frontend.',
+            code: 'SERVER_ERROR',
+        });
     }
     const fileInfo = await provider.getFile({
         url,
@@ -230,7 +244,10 @@ async function deleteFile(params) {
         fileInfo,
     });
     if (!canDelete) {
-        throw new Error('Delete not allowed');
+        throw new EdgeStoreError({
+            message: 'Delete not allowed for the current context',
+            code: 'DELETE_NOT_ALLOWED',
+        });
     }
     return await provider.deleteFile({
         bucket,
@@ -240,7 +257,10 @@ async function deleteFile(params) {
 async function encryptJWT(ctx) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new Error('EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined');
+        throw new EdgeStoreError({
+            message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
+            code: 'SERVER_ERROR',
+        });
     }
     const encryptionSecret = await getDerivedEncryptionKey(secret);
     return await new EncryptJWT(ctx)
@@ -253,7 +273,10 @@ async function encryptJWT(ctx) {
 async function decryptJWT(token) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new Error('EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not set');
+        throw new EdgeStoreError({
+            message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
+            code: 'SERVER_ERROR',
+        });
     }
     const encryptionSecret = await getDerivedEncryptionKey(secret);
     const { payload } = await jwtDecrypt(token, encryptionSecret, {
@@ -270,7 +293,10 @@ function buildPath(params) {
     const path = pathParams.map((param) => {
         const paramEntries = Object.entries(param);
         if (paramEntries[0] === undefined) {
-            throw new Error('Missing path param');
+            throw new EdgeStoreError({
+                message: `Empty path param found in: ${JSON.stringify(pathParams)}`,
+                code: 'SERVER_ERROR',
+            });
         }
         const [key, value] = paramEntries[0];
         // this is a string like: "ctx.xxx" or "input.yyy.zzz"
@@ -278,7 +304,10 @@ function buildPath(params) {
             .split('.')
             .reduce((acc2, key) => {
             if (acc2[key] === undefined) {
-                throw new Error(`Missing key ${key} in ${JSON.stringify(acc2)}`);
+                throw new EdgeStoreError({
+                    message: `Missing key ${key} in ${JSON.stringify(acc2)}`,
+                    code: 'BAD_REQUEST',
+                });
             }
             return acc2[key];
         }, params.pathAttrs);
@@ -301,9 +330,6 @@ function parsePath(path) {
     };
 }
 async function getContext(token) {
-    if (!token) {
-        throw new Error('No token');
-    }
     return await decryptJWT(token);
 }
 /**
@@ -324,4 +350,4 @@ function unproxyUrl(url) {
     return url;
 }
 
-export { EdgeStoreError as E, requestUploadParts as a, buildPath as b, completeMultipartUpload as c, confirmUpload as d, deleteFile as e, EDGE_STORE_ERROR_CODES as f, init as i, parsePath as p, requestUpload as r };
+export { requestUploadParts as a, buildPath as b, completeMultipartUpload as c, confirmUpload as d, deleteFile as e, init as i, parsePath as p, requestUpload as r };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/server",
-  "version": "0.1.5-alpha.4",
+  "version": "0.1.5-alpha.5",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -127,5 +127,5 @@
     "typescript": "^5.1.6",
     "zod": "^3.21.4"
   },
-  "gitHead": "ae79c8b36dd3969ae3c0c3d5b8294961faf9e497"
+  "gitHead": "eb9944bf86d040a4bcbe8753cb428be5cf3e0cf7"
 }

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

@@ -1,8 +1,11 @@
+/* eslint-disable @typescript-eslint/ban-types */
 import { type NextRequest } from 'next/server';
 import { type EdgeStoreRouter } from '../../../core/internals/bucketBuilder';
 import EdgeStoreError, {
   EDGE_STORE_ERROR_CODES,
+  type EdgeStoreErrorCodeKey,
 } from '../../../libs/errors/EdgeStoreError';
+import Logger, { type LogLevel } from '../../../libs/logger';
 import { EdgeStoreProvider } from '../../../providers/edgestore';
 import { type Provider } from '../../../providers/types';
 import { type MaybePromise } from '../../../types';
@@ -24,26 +27,43 @@ export type CreateContextOptions = {
   req: NextRequest;
 };
 
-export type Config<TCtx> = TCtx extends Record<string, never>
-  ? {
-      provider?: Provider;
-      router: EdgeStoreRouter<TCtx>;
-    }
+export type Config<TCtx> = {
+  provider?: Provider;
+  router: EdgeStoreRouter<TCtx>;
+  logLevel?: LogLevel;
+} & (TCtx extends Record<string, never>
+  ? {}
   : {
       provider?: Provider;
       router: EdgeStoreRouter<TCtx>;
       createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
-    };
+    });
 
 export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
   const { provider = EdgeStoreProvider() } = config;
+  const log = new Logger(config.logLevel);
   return async (req: NextRequest) => {
     try {
+      if (!('nextUrl' in req))
+        throw new EdgeStoreError({
+          message:
+            'Error running the app adapter. Make sure you are importing the correct adapter in your router configuration',
+          code: 'SERVER_ERROR',
+        });
       if (req.nextUrl.pathname.endsWith('/init')) {
-        const ctx =
-          'createContext' in config
-            ? await config.createContext({ req })
-            : ({} as TCtx);
+        let ctx = {} as TCtx;
+        try {
+          ctx =
+            'createContext' in config
+              ? await config.createContext({ req })
+              : ({} as TCtx);
+        } catch (err) {
+          throw new EdgeStoreError({
+            message: 'Error creating context',
+            code: 'CREATE_CONTEXT_ERROR',
+            cause: err instanceof Error ? err : undefined,
+          });
+        }
         const { newCookies, token, baseUrl } = await init({
           ctx,
           provider,
@@ -157,17 +177,30 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
       }
     } catch (err) {
       if (err instanceof EdgeStoreError) {
-        return new Response(err.message, {
-          status: EDGE_STORE_ERROR_CODES[err.code],
-        });
-      } else if (err instanceof Error) {
-        return new Response(err.message, {
-          status: 500,
+        log[err.level](err.formattedMessage());
+        if (err.cause) log[err.level](err.cause);
+        return new Response(JSON.stringify(err.formattedJson()), {
+          status: EDGE_STORE_ERROR_CODES[err.code as EdgeStoreErrorCodeKey],
+          headers: {
+            'Content-Type': 'application/json',
+          },
         });
       }
-      return new Response('Internal server error', {
-        status: 500,
-      });
+      log.error(err);
+      return new Response(
+        JSON.stringify(
+          new EdgeStoreError({
+            message: 'Internal server error',
+            code: 'SERVER_ERROR',
+          }).formattedJson(),
+        ),
+        {
+          status: 500,
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        },
+      );
     }
   };
 }

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

@@ -1,8 +1,11 @@
+/* eslint-disable @typescript-eslint/ban-types */
 import { type NextApiRequest, type NextApiResponse } from 'next/types';
 import { type EdgeStoreRouter } from '../../../core/internals/bucketBuilder';
 import EdgeStoreError, {
   EDGE_STORE_ERROR_CODES,
+  type EdgeStoreErrorCodeKey,
 } from '../../../libs/errors/EdgeStoreError';
+import Logger, { type LogLevel } from '../../../libs/logger';
 import { EdgeStoreProvider } from '../../../providers/edgestore';
 import { type Provider } from '../../../providers/types';
 import { type MaybePromise } from '../../../types';
@@ -25,26 +28,43 @@ export type CreateContextOptions = {
   res: NextApiResponse;
 };
 
-export type Config<TCtx> = TCtx extends Record<string, never>
-  ? {
-      provider?: Provider;
-      router: EdgeStoreRouter<TCtx>;
-    }
+export type Config<TCtx> = {
+  provider?: Provider;
+  router: EdgeStoreRouter<TCtx>;
+  logLevel?: LogLevel;
+} & (TCtx extends Record<string, never>
+  ? {}
   : {
       provider?: Provider;
       router: EdgeStoreRouter<TCtx>;
       createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
-    };
+    });
 
 export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
   const { provider = EdgeStoreProvider() } = config;
+  const log = new Logger(config.logLevel);
   return async (req: NextApiRequest, res: NextApiResponse) => {
     try {
+      if (!('json' in res))
+        throw new EdgeStoreError({
+          message:
+            'Error running the pages adapter. Make sure you are importing the correct adapter in your router configuration',
+          code: 'SERVER_ERROR',
+        });
       if (req.url?.includes?.('/init')) {
-        const ctx =
-          'createContext' in config
-            ? await config.createContext({ req, res })
-            : ({} as TCtx);
+        let ctx = {} as TCtx;
+        try {
+          ctx =
+            'createContext' in config
+              ? await config.createContext({ req, res })
+              : ({} as TCtx);
+        } catch (err) {
+          throw new EdgeStoreError({
+            message: 'Error creating context',
+            code: 'CREATE_CONTEXT_ERROR',
+            cause: err instanceof Error ? err : undefined,
+          });
+        }
         const { newCookies, token, baseUrl } = await init({
           ctx,
           provider,
@@ -123,11 +143,20 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
       }
     } catch (err) {
       if (err instanceof EdgeStoreError) {
-        res.status(EDGE_STORE_ERROR_CODES[err.code]).send(err.message);
-      } else if (err instanceof Error) {
-        res.status(500).send(err.message);
+        log[err.level](err.formattedMessage());
+        if (err.cause) log[err.level](err.cause);
+        res
+          .status(EDGE_STORE_ERROR_CODES[err.code as EdgeStoreErrorCodeKey])
+          .json(err.formattedJson());
+      } else {
+        log.error(err);
+        res.status(500).send(
+          new EdgeStoreError({
+            message: 'Internal Server Error',
+            code: 'SERVER_ERROR',
+          }).formattedJson(),
+        );
       }
-      res.status(500).send('Internal server error');
     }
   };
 }