@lowdefy/server-e2e 0.0.0-experimental-20260720072521 → 0.0.0-experimental-20260720135014

package/package.original.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-e2e",
-  "version": "0.0.0-experimental-20260720072521",
+  "version": "0.0.0-experimental-20260720135014",
   "license": "Apache-2.0",
   "description": "Lowdefy e2e testing server with cookie-based user injection",
   "homepage": "https://lowdefy.com",
@@ -30,81 +30,77 @@
   "files": [
     "lib/*",
     "lowdefy/*",
+    "pages/*",
     "public_default/*",
+    "next.config.js",
     "package.original.json",
     ".eslintrc.yaml",
-    ".npmrc",
-    "src/*",
-    "client/*",
-    "vite.config.js",
-    "postcss.config.cjs"
+    ".npmrc"
   ],
   "scripts": {
     "build": "cp package.json package.original.json || copy package.json package.original.json",
-    "build:client": "vite build",
     "build:lowdefy": "node lowdefy/build.mjs",
-    "prepublishOnly": "pnpm build",
-    "start": "node src/index.js",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+    "build:next": "next build",
+    "dev": "next dev",
+    "start": "next start",
+    "lint": "next lint",
+    "next": "next",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "prepublishOnly": "pnpm build"
   },
   "dependencies": {
     "@ant-design/cssinjs": "2.1.2",
-    "@ant-design/x": "2.7.0",
-    "@hono/node-server": "2.0.4",
-    "@lowdefy/actions-core": "0.0.0-experimental-20260720072521",
-    "@lowdefy/api": "0.0.0-experimental-20260720072521",
-    "@lowdefy/block-utils": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-aggrid": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-antd": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-antd-x": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-basic": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-captcha": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-echarts": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-loaders": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-markdown": "0.0.0-experimental-20260720072521",
-    "@lowdefy/blocks-tiptap": "0.0.0-experimental-20260720072521",
-    "@lowdefy/client": "0.0.0-experimental-20260720072521",
-    "@lowdefy/connection-axios-http": "0.0.0-experimental-20260720072521",
-    "@lowdefy/connection-mongodb": "0.0.0-experimental-20260720072521",
-    "@lowdefy/errors": "0.0.0-experimental-20260720072521",
-    "@lowdefy/helpers": "0.0.0-experimental-20260720072521",
-    "@lowdefy/layout": "0.0.0-experimental-20260720072521",
-    "@lowdefy/logger": "0.0.0-experimental-20260720072521",
-    "@lowdefy/node-utils": "0.0.0-experimental-20260720072521",
-    "@lowdefy/operators-js": "0.0.0-experimental-20260720072521",
-    "@lowdefy/operators-nunjucks": "0.0.0-experimental-20260720072521",
-    "@lowdefy/operators-uuid": "0.0.0-experimental-20260720072521",
-    "@lowdefy/websockets-core": "0.0.0-experimental-20260720072521",
-    "@tailwindcss/postcss": "4.3.1",
-    "@vitejs/plugin-react": "6.0.2",
+    "@lowdefy/actions-core": "0.0.0-experimental-20260720135014",
+    "@lowdefy/api": "0.0.0-experimental-20260720135014",
+    "@lowdefy/block-utils": "0.0.0-experimental-20260720135014",
+    "@lowdefy/blocks-antd": "0.0.0-experimental-20260720135014",
+    "@lowdefy/blocks-antd-x": "0.0.0-experimental-20260720135014",
+    "@lowdefy/blocks-basic": "0.0.0-experimental-20260720135014",
+    "@lowdefy/blocks-loaders": "0.0.0-experimental-20260720135014",
+    "@lowdefy/blocks-markdown": "0.0.0-experimental-20260720135014",
+    "@lowdefy/blocks-tiptap": "0.0.0-experimental-20260720135014",
+    "@lowdefy/client": "0.0.0-experimental-20260720135014",
+    "@lowdefy/connection-axios-http": "0.0.0-experimental-20260720135014",
+    "@lowdefy/connection-mongodb": "0.0.0-experimental-20260720135014",
+    "@lowdefy/errors": "0.0.0-experimental-20260720135014",
+    "@lowdefy/helpers": "0.0.0-experimental-20260720135014",
+    "@lowdefy/layout": "0.0.0-experimental-20260720135014",
+    "@lowdefy/logger": "0.0.0-experimental-20260720135014",
+    "@lowdefy/node-utils": "0.0.0-experimental-20260720135014",
+    "@lowdefy/operators-js": "0.0.0-experimental-20260720135014",
+    "@lowdefy/operators-nunjucks": "0.0.0-experimental-20260720135014",
+    "@lowdefy/operators-uuid": "0.0.0-experimental-20260720135014",
+    "@tailwindcss/postcss": "4.2.1",
     "antd": "6.3.1",
-    "dayjs": "1.11.20",
-    "hono": "4.12.25",
-    "pino": "10.3.1",
+    "dayjs": "1.11.19",
+    "next": "16.1.6",
+    "pino": "8.16.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-icons": "5.6.0",
-    "tailwindcss": "4.3.1",
-    "uuid": "14.0.0",
-    "vite": "8.0.16",
-    "ws": "8.18.0"
+    "tailwindcss": "4.2.1",
+    "uuid": "13.0.0"
   },
   "devDependencies": {
     "@jest/globals": "28.1.3",
-    "@lowdefy/build": "0.0.0-experimental-20260720072521",
+    "@lowdefy/build": "0.0.0-experimental-20260720135014",
     "@next/eslint-plugin-next": "16.1.6",
-    "@tailwindcss/postcss": "4.3.1",
+    "@tailwindcss/postcss": "4.2.1",
     "jest": "28.1.3",
-    "tailwindcss": "4.3.1",
+    "tailwindcss": "4.2.1",
     "webpack": "5.94.0",
-    "yaml": "2.9.0",
-    "yargs": "18.0.0"
+    "yaml": "2.3.4",
+    "yargs": "17.7.2"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=18"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "better-sqlite3"
+    ]
   },
   "publishConfig": {
     "access": "public"
-  },
-  "type": "module"
+  }
 }

package/pages/404.js

@@ -0,0 +1,49 @@
+/*
+  Copyright 2020-2026 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import path from 'path';
+import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
+
+import appMeta from '../lib/build/appMeta.js';
+import config from '../lib/build/config.js';
+import fileCache from '../lib/server/fileCache.js';
+import Page from '../lib/client/Page.js';
+
+export async function getStaticProps() {
+  // Important to give absolute path so Next can trace build files
+  const context = {
+    appMeta,
+    buildDirectory: path.join(process.cwd(), 'build'),
+    config,
+    fileCache,
+    logger: console, // TODO: pino or console or 🤷‍♂️?
+  };
+  createApiContext(context);
+
+  const [rootConfig, pageConfig] = await Promise.all([
+    getRootConfig(context),
+    getPageConfig(context, { pageId: '404' }),
+  ]);
+
+  return {
+    props: {
+      pageConfig,
+      rootConfig,
+    },
+  };
+}
+
+export default Page;

package/pages/[[...pageId]].js

@@ -0,0 +1,85 @@
+/*
+  Copyright 2020-2026 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import { getPageConfig, getRootConfig } from '@lowdefy/api';
+
+import serverSidePropsWrapper from '../lib/server/serverSidePropsWrapper.js';
+import Page from '../lib/client/Page.js';
+
+async function getServerSidePropsHandler({ context, nextContext }) {
+  const segments = nextContext.params.pageId ?? [];
+  const pageId = segments.join('/');
+  const { logger, session } = context;
+
+  if (!pageId) {
+    const rootConfig = await getRootConfig(context);
+    const { home } = rootConfig;
+    if (home.configured === false) {
+      logger.info({ event: 'redirect_to_homepage', pageId: home.pageId });
+      return {
+        redirect: {
+          destination: `/${home.pageId}`,
+          permanent: false,
+        },
+      };
+    }
+    const pageConfig = await getPageConfig(context, { pageId: home.pageId });
+    if (!pageConfig) {
+      logger.info({ event: 'redirect_page_not_found', pageId: home.pageId });
+      return {
+        redirect: {
+          destination: '/404',
+          permanent: false,
+        },
+      };
+    }
+    logger.info({ event: 'page_view', pageId: home.pageId });
+    return {
+      props: {
+        pageConfig,
+        rootConfig,
+        session,
+      },
+    };
+  }
+
+  const [rootConfig, pageConfig] = await Promise.all([
+    getRootConfig(context),
+    getPageConfig(context, { pageId }),
+  ]);
+
+  if (!pageConfig) {
+    logger.info({ event: 'redirect_page_not_found', pageId });
+    return {
+      redirect: {
+        destination: '/404',
+        permanent: false,
+      },
+    };
+  }
+  logger.info({ event: 'page_view', pageId });
+  return {
+    props: {
+      pageConfig,
+      rootConfig,
+      session,
+    },
+  };
+}
+
+export const getServerSideProps = serverSidePropsWrapper(getServerSidePropsHandler);
+
+export default Page;

package/{client/App.jsx → pages/_app.js}

@@ -14,20 +14,24 @@
   limitations under the License.
 */
 
+// CSS layer order — MUST be the first CSS import. Next.js treats this as critical
+// CSS that loads before hydration, locking the cascade priority (antd > base/preflight)
+// before antd's StyleProvider injects @layer antd {} at runtime.
+import '../build/layer-order.css';
+
 import React, { useCallback, useRef } from 'react';
+import dynamic from 'next/dynamic';
 
 import { ErrorBoundary } from '@lowdefy/block-utils';
-import { useDarkMode, useLocale } from '@lowdefy/client';
+import { useDarkMode } from '@lowdefy/client';
 import { StyleProvider } from '@ant-design/cssinjs';
-import { App as AntdApp, theme as antdTheme } from 'antd';
-import { XProvider } from '@ant-design/x';
+import { App as AntdApp, ConfigProvider, theme as antdTheme } from 'antd';
 
-import antdLocaleLoaders from '../build/i18n/antdLocales.js';
-import antdXLocaleLoaders from '../build/i18n/antdXLocales.js';
-import dayjsLocaleMap from '../build/i18n/dayjsLocales.js';
-import Auth from '../lib/client/auth/Auth.jsx';
+import Auth from '../lib/client/auth/Auth.js';
 import createLogUsage from '../lib/client/createLogUsage.js';
-import Page from './Page.jsx';
+
+// Must be in _app due to next specifications.
+import '../build/globals.css';
 
 function ThemeTokenResolver({ lowdefyRef, children }) {
   const { token } = antdTheme.useToken();
@@ -38,9 +42,7 @@ function ThemeTokenResolver({ lowdefyRef, children }) {
   return children;
 }
 
-function App({ config }) {
-  const { rootConfig, user } = config;
-
+function App({ Component, pageProps: { session, rootConfig, pageConfig } }) {
   const usageDataRef = useRef({});
   const lowdefyRef = useRef({ eventCallback: createLogUsage({ usageDataRef }) });
   if (rootConfig?.theme) {
@@ -52,21 +54,6 @@ function App({ config }) {
     configDarkMode: lowdefyRef.current.theme?.darkMode,
   });
 
-  const {
-    active: activeLocale,
-    antdLocale,
-    antdXLocale,
-  } = useLocale({
-    i18n: rootConfig?.i18n,
-    antdLocaleLoaders,
-    antdXLocaleLoaders,
-    dayjsLocaleMap,
-  });
-
-  if (rootConfig?.i18n?.defaultLocale) {
-    lowdefyRef.current.i18n = { ...rootConfig.i18n, active: activeLocale };
-  }
-
   const {
     lightToken: _lightToken,
     darkToken: _darkToken,
@@ -83,22 +70,9 @@ function App({ config }) {
     }
   }, []);
 
-  // XProvider extends antd's ConfigProvider; merging antd + antd-X locale packs
-  // gives X components (Bubble, Sender, Conversations, ...) their built-in strings
-  // alongside antd's. antd X ships only en_US + zh_CN; other locales fall back
-  // to en_US for X-native strings.
-  const mergedLocale =
-    antdLocale || antdXLocale ? { ...(antdLocale ?? {}), ...(antdXLocale ?? {}) } : undefined;
-
   return (
     <StyleProvider layer>
-      <XProvider
-        locale={mergedLocale}
-        form={
-          antdLocale?.Form?.defaultValidateMessages
-            ? { validateMessages: antdLocale.Form.defaultValidateMessages }
-            : undefined
-        }
+      <ConfigProvider
         theme={{
           ...antdConfig,
           token,
@@ -111,18 +85,29 @@ function App({ config }) {
         <AntdApp>
           <ThemeTokenResolver lowdefyRef={lowdefyRef}>
             <ErrorBoundary fullPage onError={handleError}>
-              <Auth user={user}>
+              <Auth session={session}>
                 {(auth) => {
-                  usageDataRef.current.user = auth.user?.id;
-                  return <Page auth={auth} config={config} lowdefy={lowdefyRef.current} />;
+                  usageDataRef.current.user = auth.session?.hashed_id;
+                  return (
+                    <Component
+                      auth={auth}
+                      lowdefy={lowdefyRef.current}
+                      rootConfig={rootConfig}
+                      pageConfig={pageConfig}
+                    />
+                  );
                 }}
               </Auth>
             </ErrorBoundary>
           </ThemeTokenResolver>
         </AntdApp>
-      </XProvider>
+      </ConfigProvider>
     </StyleProvider>
   );
 }
 
-export default App;
+const DynamicApp = dynamic(() => Promise.resolve(App), {
+  ssr: false,
+});
+
+export default DynamicApp;

package/pages/_document.js

@@ -0,0 +1,106 @@
+/*
+  Copyright 2020-2026 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import React from 'react';
+import Document, { Html, Head, Main, NextScript } from 'next/document';
+
+import appJson from '../lib/build/app.js';
+import lowdefyConfig from '../lib/build/config.js';
+import themeConfig from '../lib/build/theme.js';
+
+const basePath = lowdefyConfig.basePath ?? '';
+const VALID_COLOR_MODES = ['system', 'light', 'dark'];
+const configColorMode = VALID_COLOR_MODES.includes(themeConfig.darkMode)
+  ? themeConfig.darkMode
+  : 'system';
+const darkBg = themeConfig?.antd?.darkToken?.colorBgLayout ?? '#000';
+const lightBg = themeConfig?.antd?.lightToken?.colorBgLayout ?? '';
+
+// Escape characters that could break out of the enclosing <script> tag or
+// terminate a JS string literal. Used to defuse the js/bad-code-sanitization
+// class of injection for values embedded into the pre-hydration inline script.
+const SCRIPT_ESCAPES = {
+  '<': '\\u003C',
+  '>': '\\u003E',
+  '\b': '\\b',
+  '\f': '\\f',
+  '\n': '\\n',
+  '\r': '\\r',
+  '\t': '\\t',
+  '\0': '\\0',
+  '\u2028': '\\u2028',
+  '\u2029': '\\u2029',
+};
+function safeScriptJson(value) {
+  return JSON.stringify(value).replace(/[<>\b\f\n\r\t\0\u2028\u2029]/g, (c) => SCRIPT_ESCAPES[c]);
+}
+
+class LowdefyDocument extends Document {
+  render() {
+    return (
+      <Html className="lowdefy">
+        <Head>
+          {/* Synchronous script that creates the @layer order declaration and keeps
+              it as the first child of <head> via MutationObserver. antd's CSS-in-JS
+              uses prependQueue to inject <style> tags at the top of <head>, which
+              would otherwise make @layer antd the first (lowest priority) layer.
+              MutationObserver fires before paint, so the browser never sees the
+              wrong cascade order. */}
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `(function(){var s=document.createElement("style");s.id="__lf-layer-order";s.textContent="@layer theme, base, antd, components, utilities;";document.head.prepend(s);new MutationObserver(function(){if(document.head.firstChild!==s)document.head.prepend(s)}).observe(document.head,{childList:true})})();`,
+            }}
+          />
+          {/* Synchronous pre-hydration background script — prevents mode-mismatch
+              flash on page navigation. Mirrors useDarkMode.js resolution order:
+              configDarkMode → localStorage → prefers-color-scheme. Uses the user's
+              configured colorBgLayout tokens when present (theme.antd.darkToken and
+              theme.antd.lightToken), falling back to #000 in dark and no inline style
+              in light so default behavior is unchanged. */}
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `(function(){var c=${safeScriptJson(configColorMode)};var db=${safeScriptJson(
+                darkBg
+              )};var lb=${safeScriptJson(
+                lightBg
+              )};var d;if(c==="dark")d=true;else if(c==="light")d=false;else{try{var p=localStorage.getItem("lowdefy_darkMode");if(p==="dark")d=true;else if(p==="light")d=false;else d=window.matchMedia("(prefers-color-scheme:dark)").matches}catch(e){d=window.matchMedia("(prefers-color-scheme:dark)").matches}}var bg=d?db:lb;if(bg)document.documentElement.style.backgroundColor=bg})();`,
+            }}
+          />
+          <link rel="manifest" href={`${basePath}/manifest.webmanifest`} />
+          <link rel="icon" type="image/svg+xml" href={`${basePath}/icon.svg`} />
+          <link rel="apple-touch-icon" href={`${basePath}/apple-touch-icon.png`} />
+          <meta name="viewport" content="width=device-width, initial-scale=1" />
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `/* start of Lowdefy append head */</script>${appJson.html.appendHead}<script>/* end of Lowdefy append head */`,
+            }}
+          />
+        </Head>
+        <body>
+          <Main />
+          <NextScript />
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `/* start of Lowdefy append body */</script>${appJson.html.appendBody}<script>/* end of Lowdefy append body */`,
+            }}
+          />
+        </body>
+      </Html>
+    );
+  }
+}
+
+export default LowdefyDocument;

package/{src/routes/sessionMock.js → pages/api/auth/session.js}

@@ -14,12 +14,10 @@
   limitations under the License.
 */
 
-async function sessionMockHandler(c) {
-  const context = c.get('lowdefyContext');
-  if (!context.user) {
-    return c.json(null);
-  }
-  return c.json({ session: { id: 'e2e' }, user: context.user });
+import apiWrapper from '../../../lib/server/apiWrapper.js';
+
+async function handler({ context, req, res }) {
+  return res.status(200).json(context.session ?? {});
 }
 
-export default sessionMockHandler;
+export default apiWrapper(handler);

package/{src/routes/clientError.js → pages/api/client-error.js}

@@ -16,32 +16,36 @@
 
 import { logClientError } from '@lowdefy/api';
 
-async function clientErrorHandler(c) {
-  if (c.req.method !== 'POST') {
+import apiWrapper from '../../lib/server/apiWrapper.js';
+
+async function handler({ context, req, res }) {
+  if (req.method !== 'POST') {
     throw new Error('Only POST requests are supported.');
   }
-  const context = c.get('lowdefyContext');
 
-  const origin = c.req.header('origin');
+  const origin = req.headers.origin;
   if (!origin) {
-    return c.json({ error: 'Forbidden' }, 403);
+    res.status(403).json({ error: 'Forbidden' });
+    return;
   }
   try {
-    if (new URL(origin).host !== c.req.header('host')) {
-      return c.json({ error: 'Forbidden' }, 403);
+    if (new URL(origin).host !== req.headers.host) {
+      res.status(403).json({ error: 'Forbidden' });
+      return;
     }
   } catch {
-    return c.json({ error: 'Forbidden' }, 403);
+    res.status(403).json({ error: 'Forbidden' });
+    return;
   }
 
-  const body = await c.req.json();
   // Strip received from payload — prod doesn't need it for schema validation
-  if (body?.['~e']) {
-    delete body['~e'].received;
+  if (req.body?.['~e']) {
+    delete req.body['~e'].received;
   }
-  await logClientError(context, body);
+  // eslint-disable-next-line no-unused-vars
+  const { error, ...response } = await logClientError(context, req.body);
 
-  return c.json({ success: true });
+  res.status(200).json({ success: true });
 }
 
-export default clientErrorHandler;
+export default apiWrapper(handler);

package/{src/routes/endpoints.js → pages/api/endpoints/[...endpointId].js}

@@ -16,18 +16,17 @@
 
 import { callEndpoint } from '@lowdefy/api';
 
-import getPathSegments from '../lib/getPathSegments.js';
+import apiWrapper from '../../../lib/server/apiWrapper.js';
 
-async function endpointsHandler(c) {
-  if (c.req.method !== 'POST') {
+async function handler({ context, req, res }) {
+  if (req.method !== 'POST') {
     throw new Error('Only POST requests are supported.');
   }
-  const context = c.get('lowdefyContext');
-  const endpointId = getPathSegments(c, '/api/endpoints/').join('/');
-  const { blockId, payload, pageId } = await c.req.json();
+  const endpointId = req.query.endpointId.join('/');
+  const { blockId, payload, pageId } = req.body;
   context.logger.info({ event: 'call_api_endpoint', blockId, endpointId, pageId });
   const response = await callEndpoint(context, { blockId, endpointId, pageId, payload });
-  return c.json(response);
+  res.status(200).json(response);
 }
 
-export default endpointsHandler;
+export default apiWrapper(handler);

package/{src/routes/request.js → pages/api/request/[...path].js}

@@ -16,23 +16,23 @@
 
 import { callRequest } from '@lowdefy/api';
 
-import getPathSegments from '../lib/getPathSegments.js';
+import apiWrapper from '../../../lib/server/apiWrapper.js';
 
-async function requestHandler(c) {
-  if (c.req.method !== 'POST') {
+async function handler({ context, req, res }) {
+  if (req.method !== 'POST') {
     throw new Error('Only POST requests are supported.');
   }
-  const context = c.get('lowdefyContext');
-  const segments = getPathSegments(c, '/api/request/');
-  if (segments.length < 2) {
-    return c.json({ error: 'Invalid request path' }, 400);
+  const segments = req.query.path;
+  if (!Array.isArray(segments) || segments.length < 2) {
+    res.status(400).json({ error: 'Invalid request path' });
+    return;
   }
   const requestId = segments[segments.length - 1];
   const pageId = segments.slice(0, -1).join('/');
-  const { actionId, blockId, payload } = await c.req.json();
+  const { actionId, blockId, payload } = req.body;
   context.logger.info({ event: 'call_request', pageId, requestId, blockId, actionId });
   const response = await callRequest(context, { blockId, pageId, payload, requestId });
-  return c.json(response);
+  res.status(200).json(response);
 }
 
-export default requestHandler;
+export default apiWrapper(handler);