ocean-brain 0.12.3 → 0.13.1

package/server/dist/features/search/http/handlers.js

@@ -70,33 +70,33 @@ const parseBaseUrl = (value) => {
   return baseUrl;
 };
 const createSearchAdminStatusHandler = (manager = getDefaultSemanticSearchManager()) => {
-  return async (_req, res) => {
-    res.status(200).json(await manager.getStatus()).end();
+  return async (_req, reply) => {
+    return reply.status(200).send(await manager.getStatus());
   };
 };
 const createSearchAdminSaveConfigHandler = (manager = getDefaultSemanticSearchManager()) => {
-  return async (req, res) => {
+  return async (req, reply) => {
     const status = await manager.saveConfig(parseConfig(req.body), parseApiKeyInput(req.body));
-    res.status(200).json(status).end();
+    return reply.status(200).send(status);
   };
 };
 const createSearchAdminTestConnectionHandler = (manager = getDefaultSemanticSearchManager()) => {
-  return async (req, res) => {
+  return async (req, reply) => {
     const config = parseConfig({ ...req.body, enabled: true });
     const result = await manager.testConnection(config, parseApiKeyInput(req.body));
-    res.status(200).json(result).end();
+    return reply.status(200).send(result);
   };
 };
 const createSearchAdminListModelsHandler = (listModels = (baseUrl, apiKeyInput) => getDefaultSemanticSearchManager().listModels(baseUrl, apiKeyInput)) => {
-  return async (req, res) => {
+  return async (req, reply) => {
     const models = await listModels(parseBaseUrl(req.body), parseApiKeyInput(req.body));
-    res.status(200).json({ models }).end();
+    return reply.status(200).send({ models });
   };
 };
 const createSearchAdminReindexHandler = (manager = getDefaultSemanticSearchManager()) => {
-  return async (_req, res) => {
+  return async (_req, reply) => {
     const result = await manager.startReindex();
-    res.status(result.started ? 202 : 200).json(result).end();
+    return reply.status(result.started ? 202 : 200).send(result);
   };
 };
 export {

package/server/dist/features/search/search-manager.js

@@ -355,6 +355,21 @@ class SemanticSearchManager {
       this.noteSyncReconciliationTimer = null;
     }
   }
+  async close() {
+    this.stopBackgroundSync();
+    const activeOperations = [];
+    if (this.activeReindex) {
+      activeOperations.push(this.activeReindex);
+    }
+    if (this.activeNoteSync) {
+      activeOperations.push(this.activeNoteSync);
+    }
+    if (this.activeReconciliation) {
+      activeOperations.push(this.activeReconciliation);
+    }
+    await Promise.allSettled(activeOperations);
+    await this.dependencies.vectorIndex.close?.();
+  }
   async trySearch(query, limit) {
     const status = await this.getStatus();
     if (!status.available) {
@@ -389,6 +404,7 @@ class SemanticSearchManager {
   }
 }
 let defaultSemanticSearchManager = null;
+let defaultSemanticSearchUnsubscribers = [];
 const getDefaultSemanticSearchManager = () => {
   if (!defaultSemanticSearchManager) {
     defaultSemanticSearchManager = new SemanticSearchManager({
@@ -415,17 +431,29 @@ const getDefaultSemanticSearchManager = () => {
       }),
       apiKeyStore: new FileEmbeddingApiKeyStore(paths.embeddingApiKey)
     });
-    subscribeServerEvents((event) => {
-      void defaultSemanticSearchManager?.scheduleNoteSync(Number(event.noteId)).catch(() => void 0);
-    });
-    subscribeSemanticSearchNoteChanges((noteId) => {
-      void defaultSemanticSearchManager?.scheduleNoteSync(noteId).catch(() => void 0);
-    });
+    defaultSemanticSearchUnsubscribers = [
+      subscribeServerEvents((event) => {
+        void defaultSemanticSearchManager?.scheduleNoteSync(Number(event.noteId)).catch(() => void 0);
+      }),
+      subscribeSemanticSearchNoteChanges((noteId) => {
+        void defaultSemanticSearchManager?.scheduleNoteSync(noteId).catch(() => void 0);
+      })
+    ];
     defaultSemanticSearchManager.startBackgroundSync();
   }
   return defaultSemanticSearchManager;
 };
+const closeDefaultSemanticSearchManager = async () => {
+  const manager = defaultSemanticSearchManager;
+  defaultSemanticSearchManager = null;
+  for (const unsubscribe of defaultSemanticSearchUnsubscribers) {
+    unsubscribe();
+  }
+  defaultSemanticSearchUnsubscribers = [];
+  await manager?.close();
+};
 export {
   SemanticSearchManager,
+  closeDefaultSemanticSearchManager,
   getDefaultSemanticSearchManager
 };

package/server/dist/features/tag/http/mcp.js

@@ -1,14 +1,14 @@
 import { ensureTagByName, InvalidTagNameError } from "../../../features/tag/services/organization.js";
 import { createAppError } from "../../../modules/error-handler.js";
 const createMcpCreateTagHandler = (ensureTag = ensureTagByName) => {
-  return async (req, res) => {
+  return async (req, reply) => {
     const name = req.body?.name;
     if (typeof name !== "string") {
       throw createAppError(400, "INVALID_TAG_NAME", "A tag name is required.");
     }
     try {
       const result = await ensureTag(name);
-      res.status(200).json(result).end();
+      return reply.status(200).send(result);
     } catch (error) {
       if (error instanceof InvalidTagNameError) {
         throw createAppError(400, "INVALID_TAG_NAME", error.message);

package/server/dist/features/view/graphql/view.query.resolver.js

@@ -4,6 +4,7 @@ import {
   getNotesByProperties,
   getViewSectionBoardColumn,
   getViewSectionById,
+  getViewSectionCalendarNotes,
   getViewSectionNotes,
   getViewWorkspace
 } from "../../../features/view/services/workspace.js";
@@ -11,6 +12,7 @@ const createViewQueryResolvers = (deps = {
   getNotesByProperties,
   getViewSectionBoardColumn,
   getViewSectionById,
+  getViewSectionCalendarNotes,
   getViewSectionNotes,
   getViewWorkspace
 }) => ({
@@ -42,6 +44,24 @@ const createViewQueryResolvers = (deps = {
     }
     return sectionNotes;
   },
+  viewSectionCalendarNotes: async (_, { id, dateRange }) => {
+    try {
+      const notes = await deps.getViewSectionCalendarNotes(id, dateRange);
+      if (!notes) {
+        throw "NOT FOUND";
+      }
+      return notes;
+    } catch (error) {
+      if (error instanceof InvalidNotePropertyInputError) {
+        throw new GraphQLError(error.message, {
+          extensions: {
+            code: "INVALID_NOTE_PROPERTY_INPUT"
+          }
+        });
+      }
+      throw error;
+    }
+  },
   viewSectionBoardColumn: async (_, {
     id,
     optionValue = null,

package/server/dist/features/view/graphql/view.type-defs.js

@@ -39,6 +39,8 @@ const viewType = gql`
         tableColumns: [ViewTableColumn!]!
         tablePropertyKeys: [String!]!
         boardGroupByPropertyKey: String
+        calendarDateField: ViewCalendarDateField!
+        calendarDatePropertyKey: String
     }
 
     type ViewBoardNote {
@@ -52,6 +54,12 @@ const viewType = gql`
         notes: [ViewBoardNote!]!
     }
 
+    type ViewCalendarNote {
+        id: ID!
+        title: String!
+        calendarDate: String!
+    }
+
     enum ViewDisplayType {
         list
         table
@@ -67,6 +75,12 @@ const viewType = gql`
         updatedAt
     }
 
+    enum ViewCalendarDateField {
+        createdAt
+        updatedAt
+        property
+    }
+
     enum ViewPropertyFilterOperator {
         equals
         notEquals
@@ -100,6 +114,8 @@ const viewType = gql`
         tableColumns: [ViewTableColumn!]
         tablePropertyKeys: [String!]
         boardGroupByPropertyKey: String
+        calendarDateField: ViewCalendarDateField
+        calendarDatePropertyKey: String
     }
 
     input ViewSectionInput {
@@ -132,6 +148,7 @@ const viewQuery = gql`
             sortBy: ViewSortBy
             sortOrder: ViewSortOrder
         ): Notes!
+        viewSectionCalendarNotes(id: ID!, dateRange: DateRangeInput!): [ViewCalendarNote!]!
         viewSectionBoardColumn(id: ID!, optionValue: String, pagination: PaginationInput): ViewBoardColumnNotes!
         notesByProperties(input: NotesByPropertiesInput!, pagination: PaginationInput): Notes!
     }

package/server/dist/features/view/services/workspace.js

@@ -13,10 +13,12 @@ const DEFAULT_VIEW_NOTES_QUERY_LIMIT = 20;
 const MAX_VIEW_NOTES_QUERY_LIMIT = 50;
 const MAX_VIEW_PROPERTY_FILTERS = 10;
 const MAX_VIEW_TABLE_PROPERTY_COLUMNS = 6;
+const MAX_VIEW_CALENDAR_RANGE_MS = 32 * 24 * 60 * 60 * 1e3;
 const DEFAULT_VIEW_DISPLAY_TYPE = "list";
 const DEFAULT_VIEW_SORT_BY = "updatedAt";
 const DEFAULT_VIEW_SORT_ORDER = "desc";
 const DEFAULT_VIEW_TABLE_COLUMNS = ["title", "tags", "properties", "createdAt", "updatedAt"];
+const DEFAULT_VIEW_CALENDAR_DATE_FIELD = "createdAt";
 const orderedViewSectionTagsInclude = {
   tags: {
     orderBy: [{ order: "asc" }, { createdAt: "asc" }]
@@ -75,11 +77,15 @@ const normalizeViewTableColumns = (columns) => {
   return uniqueColumns.includes("title") ? uniqueColumns : ["title", ...uniqueColumns];
 };
 const normalizeViewTablePropertyKeys = (keys) => Array.from(new Set((keys ?? []).map(normalizePropertyKey))).slice(0, MAX_VIEW_TABLE_PROPERTY_COLUMNS);
+const normalizeViewCalendarDateField = (value) => value === "updatedAt" || value === "property" ? value : DEFAULT_VIEW_CALENDAR_DATE_FIELD;
 const normalizeViewDisplayOptions = (options) => {
+  const calendarDateField = normalizeViewCalendarDateField(options?.calendarDateField);
   return {
     tableColumns: normalizeViewTableColumns(options?.tableColumns),
     tablePropertyKeys: normalizeViewTablePropertyKeys(options?.tablePropertyKeys),
-    boardGroupByPropertyKey: options?.boardGroupByPropertyKey ? normalizePropertyKey(options.boardGroupByPropertyKey) : null
+    boardGroupByPropertyKey: options?.boardGroupByPropertyKey ? normalizePropertyKey(options.boardGroupByPropertyKey) : null,
+    calendarDateField,
+    calendarDatePropertyKey: calendarDateField === "property" && options?.calendarDatePropertyKey ? normalizePropertyKey(options.calendarDatePropertyKey) : null
   };
 };
 const normalizeFilterValue = ({
@@ -218,6 +224,9 @@ const normalizeViewSectionInput = (input) => {
   if (displayType === "board" && propertyFilters.some((filter) => filter.key === displayOptions.boardGroupByPropertyKey)) {
     throw new InvalidNotePropertyInputError("A board grouping property cannot also be used as a section filter.");
   }
+  if (displayType === "calendar" && displayOptions.calendarDateField === "property" && !displayOptions.calendarDatePropertyKey) {
+    throw new InvalidNotePropertyInputError("Calendar sections require a date property.");
+  }
   return {
     title: trimmedTitle || buildDefaultSectionTitle(tagNames, propertyFilters),
     displayType,
@@ -386,6 +395,19 @@ const buildStoredViewQuery = async (db, section) => {
       throw new InvalidNotePropertyInputError("Board grouping properties require at least one option.");
     }
   }
+  if (section.displayType === "calendar" && section.displayOptions.calendarDateField === "property") {
+    const calendarDatePropertyKey = section.displayOptions.calendarDatePropertyKey ?? "";
+    const calendarDateProperty = await db.propertyDefinition.findUnique({
+      where: { key: calendarDatePropertyKey },
+      select: { valueType: true }
+    });
+    if (!calendarDateProperty) {
+      throw new InvalidNotePropertyInputError(`Property ${calendarDatePropertyKey} is not defined.`);
+    }
+    if (calendarDateProperty.valueType !== "date") {
+      throw new InvalidNotePropertyInputError("Calendar sections can only use a date property.");
+    }
+  }
   return serializeStoredViewQuery({
     propertyFilters,
     sortBy: section.sortBy,
@@ -549,6 +571,38 @@ const buildViewNotesWhere = (query) => {
 const buildViewSectionWhere = (section) => {
   return buildViewNotesWhere(section);
 };
+const normalizeViewCalendarDateRange = (dateRange) => {
+  const start = new Date(dateRange.start);
+  const end = new Date(dateRange.end);
+  const duration = end.getTime() - start.getTime();
+  if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime()) || duration <= 0 || duration > MAX_VIEW_CALENDAR_RANGE_MS) {
+    throw new InvalidNotePropertyInputError("Calendar date range must be valid and cover no more than 32 days.");
+  }
+  return { start, end };
+};
+const buildViewSectionCalendarWhere = (section, dateRange, propertyDefinitionId) => {
+  const sectionWhere = buildViewSectionWhere(section);
+  if (section.displayOptions.calendarDateField === "property" && propertyDefinitionId === void 0) {
+    throw new InvalidNotePropertyInputError("Calendar date property definition is required.");
+  }
+  const dateWhere = section.displayOptions.calendarDateField === "property" ? {
+    properties: {
+      some: {
+        propertyDefinitionId,
+        dateValue: {
+          gte: dateRange.start,
+          lt: dateRange.end
+        }
+      }
+    }
+  } : {
+    [section.displayOptions.calendarDateField]: {
+      gte: dateRange.start,
+      lt: dateRange.end
+    }
+  };
+  return Object.keys(sectionWhere).length === 0 ? dateWhere : { AND: [sectionWhere, dateWhere] };
+};
 const buildViewBoardColumnWhere = (section, propertyDefinitionId, optionId) => {
   const sectionWhere = buildViewSectionWhere(section);
   const columnWhere = optionId === null ? {
@@ -596,6 +650,63 @@ const getViewSectionNotes = async (id, pagination, sort = {}) => {
     notes
   };
 };
+const getViewSectionCalendarNotes = async (id, dateRangeInput) => {
+  const section = await models.viewSection.findUnique({
+    where: { id: parseViewId(id) },
+    include: orderedViewSectionTagsInclude
+  });
+  if (!section) {
+    return null;
+  }
+  const serializedSection = serializeViewSection(section);
+  if (serializedSection.displayType !== "calendar") {
+    throw new InvalidNotePropertyInputError("This section is not configured as a calendar.");
+  }
+  const dateRange = normalizeViewCalendarDateRange(dateRangeInput);
+  const dateField = serializedSection.displayOptions.calendarDateField;
+  if (dateField === "property") {
+    const propertyKey = serializedSection.displayOptions.calendarDatePropertyKey;
+    const propertyDefinition = propertyKey ? await models.propertyDefinition.findUnique({
+      where: { key: propertyKey },
+      select: { id: true, valueType: true }
+    }) : null;
+    if (!propertyDefinition || propertyDefinition.valueType !== "date") {
+      throw new InvalidNotePropertyInputError("The calendar date property is unavailable.");
+    }
+    const notes2 = await models.note.findMany({
+      orderBy: [{ id: "asc" }],
+      where: buildViewSectionCalendarWhere(serializedSection, dateRange, propertyDefinition.id),
+      select: {
+        id: true,
+        title: true,
+        properties: {
+          where: { propertyDefinitionId: propertyDefinition.id },
+          select: { dateValue: true },
+          take: 1
+        }
+      }
+    });
+    return notes2.flatMap((note) => {
+      const dateValue = note.properties[0]?.dateValue;
+      return dateValue ? [{ id: note.id, title: note.title, calendarDate: dateValue.toISOString().slice(0, 10) }] : [];
+    }).sort((left, right) => left.calendarDate.localeCompare(right.calendarDate) || left.id - right.id);
+  }
+  const notes = await models.note.findMany({
+    orderBy: [{ [dateField]: "asc" }, { id: "asc" }],
+    where: buildViewSectionCalendarWhere(serializedSection, dateRange),
+    select: {
+      id: true,
+      title: true,
+      createdAt: true,
+      updatedAt: true
+    }
+  });
+  return notes.map((note) => ({
+    id: note.id,
+    title: note.title,
+    calendarDate: note[dateField].toISOString()
+  }));
+};
 const getViewSectionBoardColumn = async (id, optionValue, pagination) => {
   const section = await models.viewSection.findUnique({
     where: { id: parseViewId(id) },
@@ -888,6 +999,7 @@ export {
   buildPropertyFilterWhere,
   buildViewBoardColumnWhere,
   buildViewNotesWhere,
+  buildViewSectionCalendarWhere,
   buildViewSectionWhere,
   clampViewSectionLimit,
   createViewSection,
@@ -898,9 +1010,12 @@ export {
   getNotesByPropertiesWithDb,
   getViewSectionBoardColumn,
   getViewSectionById,
+  getViewSectionCalendarNotes,
   getViewSectionNotes,
   getViewWorkspace,
   hydratePropertyFilters,
+  normalizeViewCalendarDateField,
+  normalizeViewCalendarDateRange,
   normalizeViewDisplayOptions,
   normalizeViewNotesPagination,
   normalizeViewNotesQueryInput,

package/server/dist/modules/auth-guard.js

@@ -1,76 +1,57 @@
 import { buildUnauthorizedGraphqlPayload, buildUnauthorizedPayload } from "@baejino/auth";
-import session from "express-session";
 import { GraphQLError } from "graphql";
-import lusca from "lusca";
 import { sanitizeRedirectPath } from "./auth-redirect.js";
-import { AUTH_SESSION_IDLE_TIMEOUT_MS, createSessionStore } from "./session-store.js";
 const JSON_HEADERS = { "Content-Type": "application/json" };
-const isAuthenticatedRequest = (req) => Boolean(req.session?.authenticated);
-const createSessionMiddleware = (authConfig) => {
+const CSRF_COOKIE_NAME = "XSRF-TOKEN";
+const isAuthenticatedRequest = (request) => Boolean(request.session?.authenticated);
+const issueCsrfToken = (authConfig, reply) => {
   if (authConfig.mode !== "password") {
-    return (_req, _res, next) => next();
+    return void 0;
   }
-  return session({
-    secret: authConfig.sessionSecret,
-    name: authConfig.cookieName,
-    store: createSessionStore(),
-    resave: false,
-    saveUninitialized: false,
-    rolling: true,
-    cookie: {
-      maxAge: AUTH_SESSION_IDLE_TIMEOUT_MS,
-      httpOnly: true,
-      sameSite: "lax",
-      secure: process.env.NODE_ENV === "production",
-      path: "/"
-    }
+  const token = reply.generateCsrf();
+  reply.setCookie(CSRF_COOKIE_NAME, token, {
+    httpOnly: false,
+    path: "/",
+    sameSite: "lax",
+    secure: process.env.NODE_ENV === "production"
   });
+  return token;
 };
 const createCsrfProtection = (authConfig) => {
   if (authConfig.mode !== "password") {
-    return (_req, _res, next) => next();
+    return (_request, _reply, done) => done();
   }
-  return lusca.csrf({
-    angular: true,
-    cookie: {
-      options: {
-        path: "/",
-        sameSite: "lax",
-        secure: process.env.NODE_ENV === "production"
-      }
-    }
-  });
-};
-const isCsrfTokenError = (error) => error instanceof Error && error.message.startsWith("CSRF token ");
-const buildLoginRedirectPath = (req) => {
-  const nextPath = sanitizeRedirectPath(req.body?.next);
-  return `/login?next=${encodeURIComponent(nextPath)}`;
-};
-const createLoginCsrfFailureHandler = (authConfig) => {
-  return (error, req, res, next) => {
-    if (authConfig.mode !== "password" || !isCsrfTokenError(error) || req.method !== "POST" || req.path !== "/login" || isAuthenticatedRequest(req)) {
-      next(error);
+  return (request, reply, done) => {
+    if (request.method === "GET" || request.method === "HEAD" || request.method === "OPTIONS") {
+      done();
       return;
     }
-    res.redirect(303, buildLoginRedirectPath(req));
+    request.server.csrfProtection(request, reply, done);
   };
 };
+const isCsrfTokenError = (error) => error instanceof Error && ("code" in error ? error.code === "FST_CSRF_INVALID_TOKEN" || error.code === "FST_CSRF_MISSING_SECRET" : error.message.toLowerCase().includes("csrf"));
+const buildLoginCsrfRedirectPath = (request) => {
+  const body = request.body;
+  const nextPath = sanitizeRedirectPath(body?.next);
+  return `/login?next=${encodeURIComponent(nextPath)}`;
+};
+const shouldRedirectLoginCsrfFailure = (error, request, authConfig) => authConfig.mode === "password" && isCsrfTokenError(error) && request.method === "POST" && request.url.split("?")[0] === "/login" && !isAuthenticatedRequest(request);
 const requireSessionForWrite = (authConfig) => {
-  return (req, res, next) => {
-    if (authConfig.mode === "open" || isAuthenticatedRequest(req)) {
-      next();
+  return (request, reply, done) => {
+    if (authConfig.mode === "open" || isAuthenticatedRequest(request)) {
+      done();
       return;
     }
-    res.status(401).set(JSON_HEADERS).json(buildUnauthorizedPayload()).end();
+    void reply.code(401).headers(JSON_HEADERS).send(buildUnauthorizedPayload());
   };
 };
 const requireSessionForGraphql = (authConfig) => {
-  return (req, res, next) => {
-    if (authConfig.mode === "open" || isAuthenticatedRequest(req)) {
-      next();
+  return (request, reply, done) => {
+    if (authConfig.mode === "open" || isAuthenticatedRequest(request)) {
+      done();
       return;
     }
-    res.status(401).set(JSON_HEADERS).json(buildUnauthorizedGraphqlPayload()).end();
+    void reply.code(401).headers(JSON_HEADERS).send(buildUnauthorizedGraphqlPayload());
   };
 };
 const createMutationAuthValidationRule = () => {
@@ -94,11 +75,13 @@ const createMutationAuthValidationRule = () => {
   };
 };
 export {
+  buildLoginCsrfRedirectPath,
   createCsrfProtection,
-  createLoginCsrfFailureHandler,
   createMutationAuthValidationRule,
-  createSessionMiddleware,
   isAuthenticatedRequest,
+  isCsrfTokenError,
+  issueCsrfToken,
   requireSessionForGraphql,
-  requireSessionForWrite
+  requireSessionForWrite,
+  shouldRedirectLoginCsrfFailure
 };

package/server/dist/modules/blocknote.js

@@ -83,10 +83,12 @@ function mapBlockContent(content, mapInline) {
     ...content,
     rows: content.rows?.map((row) => ({
       ...row,
-      cells: row.cells?.map((cell) => ({
-        ...cell,
-        content: cell.content?.map(mapInline)
-      }))
+      cells: row.cells?.map(
+        (cell) => Array.isArray(cell) ? cell.map(mapInline) : {
+          ...cell,
+          content: cell.content?.map(mapInline)
+        }
+      )
     }))
   };
 }
@@ -103,10 +105,15 @@ async function mapBlockContentAsync(content, mapInline) {
       (content.rows ?? []).map(async (row) => ({
         ...row,
         cells: await Promise.all(
-          (row.cells ?? []).map(async (cell) => ({
-            ...cell,
-            content: cell.content ? (await Promise.all(cell.content.map(mapInline))).flat() : cell.content
-          }))
+          (row.cells ?? []).map(async (cell) => {
+            if (Array.isArray(cell)) {
+              return (await Promise.all(cell.map(mapInline))).flat();
+            }
+            return {
+              ...cell,
+              content: cell.content ? (await Promise.all(cell.content.map(mapInline))).flat() : cell.content
+            };
+          })
         )
       }))
     )
@@ -124,7 +131,7 @@ function visitBlockContent(content, visitInline) {
   }
   for (const row of content.rows ?? []) {
     for (const cell of row.cells ?? []) {
-      for (const inline of cell.content ?? []) {
+      for (const inline of Array.isArray(cell) ? cell : cell.content ?? []) {
         visitInline(inline);
       }
     }

package/server/dist/modules/error-handler.js

@@ -1,3 +1,4 @@
+import { buildLoginCsrfRedirectPath, isCsrfTokenError, shouldRedirectLoginCsrfFailure } from "./auth-guard.js";
 class AppError extends Error {
   code;
   status;
@@ -13,42 +14,38 @@ class AppError extends Error {
 const createAppError = (status, code, message, details) => {
   return new AppError(status, code, message, details);
 };
-const hasErrorType = (error, type) => error instanceof Error && "type" in error && error.type === type;
-const createErrorHandler = () => {
-  return (error, _req, res, next) => {
-    if (res.headersSent) {
-      next(error);
+const createErrorHandler = (authConfig) => {
+  return (error, request, reply) => {
+    if (reply.sent) {
+      request.log.error({ error }, "Error occurred after the response was sent");
+      return;
+    }
+    if (shouldRedirectLoginCsrfFailure(error, request, authConfig)) {
+      void reply.redirect(buildLoginCsrfRedirectPath(request), 303);
       return;
     }
     if (error instanceof AppError) {
-      res.status(error.status).json({
+      void reply.status(error.status).send({
         code: error.code,
         message: error.message,
         ...error.details ? { details: error.details } : {}
-      }).end();
-      return;
-    }
-    if (hasErrorType(error, "encoding.unsupported")) {
-      res.status(415).json({
-        code: "UNSUPPORTED_CONTENT_ENCODING",
-        message: "Compressed request bodies are not supported."
-      }).end();
+      });
       return;
     }
-    if (error instanceof Error && error.message.startsWith("CSRF token ")) {
-      res.status(403).json({
+    if (isCsrfTokenError(error)) {
+      void reply.status(403).send({
         code: "CSRF_TOKEN_INVALID",
-        message: error.message
-      }).end();
+        message: error instanceof Error ? error.message : "Invalid CSRF token"
+      });
       return;
     }
     const message = error instanceof Error ? error.stack || error.message : String(error);
     process.stderr.write(`[error] ${message}
 `);
-    res.status(500).json({
+    void reply.status(500).send({
       code: "INTERNAL_SERVER_ERROR",
       message: "Internal Server Error"
-    }).end();
+    });
   };
 };
 export {