@lowdefy/server-dev 4.0.0-rc.1 → 4.0.0-rc.11

package/lib/{App.js → client/App.js}

@@ -26,12 +26,12 @@ import Page from './Page.js';
 import setPageId from './setPageId.js';
 import useRootConfig from './utils/useRootConfig.js';
 
-import actions from '../build/plugins/actions.js';
-import blocks from '../build/plugins/blocks.js';
-import icons from '../build/plugins/icons.js';
-import operators from '../build/plugins/operators/client.js';
+import actions from '../../build/plugins/actions.js';
+import blocks from '../../build/plugins/blocks.js';
+import icons from '../../build/plugins/icons.js';
+import operators from '../../build/plugins/operators/client.js';
 
-const App = ({ auth }) => {
+const App = ({ auth, lowdefy }) => {
   const router = useRouter();
   const { data: rootConfig } = useRootConfig(router.basePath);
 
@@ -41,7 +41,7 @@ const App = ({ auth }) => {
     return '';
   }
   return (
-    <Reload basePath={router.basePath}>
+    <Reload basePath={router.basePath} lowdefy={lowdefy}>
       {(resetContext) => (
         <Page
           auth={auth}
@@ -49,6 +49,7 @@ const App = ({ auth }) => {
           config={{
             rootConfig,
           }}
+          lowdefy={lowdefy}
           pageId={pageId}
           resetContext={resetContext}
           router={router}

package/lib/{Page.js → client/Page.js}

@@ -20,7 +20,7 @@ import Client from '@lowdefy/client';
 import RestartingPage from './RestartingPage.js';
 import usePageConfig from './utils/usePageConfig.js';
 
-const Page = ({ auth, Components, config, pageId, resetContext, router, types }) => {
+const Page = ({ auth, Components, config, lowdefy, pageId, resetContext, router, types }) => {
   const { data: pageConfig } = usePageConfig(pageId, router.basePath);
 
   if (!pageConfig) {
@@ -38,6 +38,7 @@ const Page = ({ auth, Components, config, pageId, resetContext, router, types })
         ...config,
         pageConfig,
       }}
+      lowdefy={lowdefy}
       resetContext={resetContext}
       router={router}
       stage="dev"

package/lib/{Reload.js → client/Reload.js}

@@ -19,7 +19,7 @@ import React, { useEffect, useState } from 'react';
 import useMutateCache from './utils/useMutateCache.js';
 import waitForRestartedServer from './utils/waitForRestartedServer.js';
 
-const Reload = ({ children, basePath }) => {
+const Reload = ({ children, basePath, lowdefy }) => {
   const [reset, setReset] = useState(false);
   const [restarting, setRestarting] = useState(false);
   const mutateCache = useMutateCache(basePath);
@@ -31,6 +31,9 @@ const Reload = ({ children, basePath }) => {
       // TODO: We need to pass a flag when a rebuild will happen so that client does not trigger render.
       setTimeout(async () => {
         await mutateCache();
+        if (lowdefy._internal?.initialised) {
+          lowdefy._internal.initialised = false;
+        }
         setReset(true);
         console.log('Reloaded config.');
       }, 600);

package/lib/{auth → client/auth}/Auth.js

@@ -19,12 +19,12 @@ import React from 'react';
 import AuthConfigured from './AuthConfigured.js';
 import AuthNotConfigured from './AuthNotConfigured.js';
 
-import authConfig from '../../build/auth.json';
+import authConfig from '../../../build/auth.json';
 
 function Auth({ children, session }) {
   if (authConfig.configured === true) {
     return (
-      <AuthConfigured session={session} authConfig={authConfig}>
+      <AuthConfigured serverSession={session} authConfig={authConfig}>
         {(auth) => children(auth)}
       </AuthConfigured>
     );

package/lib/{auth → client/auth}/AuthConfigured.js

@@ -15,11 +15,22 @@
 */
 /* eslint-disable react/jsx-props-no-spreading */
 
-import React from 'react';
-import { SessionProvider, signIn, signOut, useSession } from 'next-auth/react';
+import React, { useEffect, useRef } from 'react';
+import { getSession, SessionProvider, signIn, signOut, useSession } from 'next-auth/react';
+
+import lowdefyConfig from '../../../build/config.json';
 
 function Session({ children }) {
+  const wasAuthenticated = useRef(false);
   const { data: session, status } = useSession();
+  wasAuthenticated.current = wasAuthenticated.current || status === 'authenticated';
+
+  useEffect(() => {
+    if (wasAuthenticated.current && status === 'unauthenticated') {
+      window.location.reload();
+    }
+  }, [status]);
+
   // If session is passed to SessionProvider from getServerSideProps
   // we won't have a loading state here.
   // But 404 uses getStaticProps so we have this for 404.
@@ -30,10 +41,13 @@ function Session({ children }) {
 }
 
 function AuthConfigured({ authConfig, children, serverSession }) {
-  const auth = { signIn, signOut, authConfig };
-
+  const auth = { authConfig, getSession, signIn, signOut };
+  let basePath = lowdefyConfig.basePath;
+  if (basePath) {
+    basePath = `${basePath}/api/auth`;
+  }
   return (
-    <SessionProvider session={serverSession}>
+    <SessionProvider session={serverSession} basePath={basePath}>
       <Session>
         {(session) => {
           auth.session = session;

package/lib/{auth → client/auth}/AuthNotConfigured.js

@@ -22,6 +22,7 @@ function authNotConfigured() {
 function AuthNotConfigured({ authConfig, children }) {
   const auth = {
     authConfig,
+    getSession: authNotConfigured,
     signIn: authNotConfigured,
     signOut: authNotConfigured,
   };

package/lib/server/apiWrapper.js

@@ -0,0 +1,64 @@
+/*
+  Copyright 2020-2023 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 crypto from 'crypto';
+import { createApiContext } from '@lowdefy/api';
+import { getSecretsFromEnv } from '@lowdefy/node-utils';
+
+import config from '../../build/config.json';
+import connections from '../../build/plugins/connections.js';
+import createLogger from './log/createLogger.js';
+import fileCache from './fileCache.js';
+import getServerSession from './auth/getServerSession.js';
+import logRequest from './log/logRequest.js';
+import logError from './log/logError.js';
+import operators from '../../build/plugins/operators/server.js';
+import getAuthOptions from './auth/getAuthOptions.js';
+
+function apiWrapper(handler) {
+  return async function wrappedHandler(req, res) {
+    const context = {
+      // Important to give absolute path so Next can trace build files
+      rid: crypto.randomUUID(),
+      buildDirectory: path.join(process.cwd(), 'build'),
+      config,
+      connections,
+      fileCache,
+      headers: req?.headers,
+      logger: console,
+      operators,
+      req,
+      res,
+    };
+    try {
+      context.logger = createLogger({ rid: context.rid });
+      context.authOptions = getAuthOptions(context);
+      context.session = await getServerSession(context);
+      context.secrets = getSecretsFromEnv();
+      createApiContext(context);
+      logRequest({ context });
+      // Await here so that if handler throws it is caught.
+      const response = await handler({ context, req, res });
+      // TODO: Log response time?
+      return response;
+    } catch (error) {
+      logError({ error, context });
+      res.status(500).json({ name: error.name, message: error.message });
+    }
+  };
+}
+
+export default apiWrapper;

package/lib/server/auth/getAuthOptions.js

@@ -0,0 +1,35 @@
+/*
+  Copyright 2020-2023 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 { getNextAuthConfig } from '@lowdefy/api';
+import { getSecretsFromEnv } from '@lowdefy/node-utils';
+
+import adapters from '../../../build/plugins/auth/adapters.js';
+import authJson from '../../../build/auth.json';
+import callbacks from '../../../build/plugins/auth/callbacks.js';
+import events from '../../../build/plugins/auth/events.js';
+import providers from '../../../build/plugins/auth/providers.js';
+
+function getAuthOptions({ logger }) {
+  return getNextAuthConfig({
+    authJson,
+    logger,
+    plugins: { adapters, callbacks, events, providers },
+    secrets: getSecretsFromEnv(),
+  });
+}
+
+export default getAuthOptions;

package/lib/{auth → server/auth}/getServerSession.js

@@ -14,13 +14,13 @@
   limitations under the License.
 */
 
-import { unstable_getServerSession } from 'next-auth/next';
-import { authOptions } from '../../pages/api/auth/[...nextauth].js';
-import authJson from '../../build/auth.json';
+import { getServerSession as getNextAuthServerSession } from 'next-auth/next';
 
-async function getServerSession({ req, res }) {
+import authJson from '../../../build/auth.json';
+
+function getServerSession({ authOptions, req, res }) {
   if (authJson.configured === true) {
-    return await unstable_getServerSession(req, res, authOptions);
+    return getNextAuthServerSession(req, res, authOptions);
   }
   return undefined;
 }

package/lib/server/log/createLogger.js

@@ -0,0 +1,29 @@
+/*
+  Copyright 2020-2023 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 pino from 'pino';
+
+const logger = pino({
+  name: 'lowdefy_server',
+  level: process.env.LOWDEFY_LOG_LEVEL ?? 'info',
+  base: { pid: undefined, hostname: undefined },
+});
+
+function createLogger(metadata = {}) {
+  return logger.child(metadata);
+}
+
+export default createLogger;

package/lib/server/log/logError.js

@@ -0,0 +1,40 @@
+/*
+  Copyright 2020-2023 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.
+*/
+
+function logError({ context, error }) {
+  try {
+    const { user = {} } = context;
+
+    context.logger.error({
+      err: error,
+      user: {
+        id: user.id,
+        roles: user.roles,
+        sub: user.sub,
+        session_id: user.session_id,
+      },
+      url: context.req.url,
+      method: context.req.method,
+      resolvedUrl: context.nextContext?.resolvedUrl,
+    });
+  } catch (e) {
+    console.error(error);
+    console.error('An error occurred while logging the error.');
+    console.error(e);
+  }
+}
+
+export default logError;

package/lib/server/log/logRequest.js

@@ -0,0 +1,33 @@
+/*
+  Copyright 2020-2023 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.
+*/
+
+// TODO: Better name needed here maybe?
+function logRequest({ context }) {
+  const { user = {} } = context;
+  context.logger.debug({
+    user: {
+      id: user.id,
+      roles: user.roles,
+      sub: user.sub,
+      session_id: user.session_id,
+    },
+    url: context.req.url,
+    method: context.req.method,
+    resolvedUrl: context.nextContext?.resolvedUrl,
+  });
+}
+
+export default logRequest;

package/manager/processes/lowdefyBuild.mjs

@@ -19,6 +19,7 @@ import createCustomPluginTypesMap from '../utils/createCustomPluginTypesMap.mjs'
 
 function lowdefyBuild({ directories, logger, options }) {
   return async () => {
+    logger.info({ print: 'spin' }, 'Building config...');
     const customTypesMap = await createCustomPluginTypesMap({ directories, logger });
     await build({
       customTypesMap,

package/manager/processes/startServer.mjs

@@ -15,12 +15,13 @@
 */
 
 import { spawnProcess } from '@lowdefy/node-utils';
+import createStdOutLineHandler from '../utils/createStdOutLineHandler.mjs';
 
 function startServer(context) {
   context.shutdownServer();
 
   const nextServer = spawnProcess({
-    stdOutLineHandler: (line) => context.logger.info({ print: 'log' }, line),
+    stdOutLineHandler: createStdOutLineHandler({ context }),
     stdErrLineHandler: (line) => context.logger.error(line),
     command: 'node',
     args: [context.bin.next, 'start'],

package/manager/utils/createCustomPluginTypesMap.mjs

@@ -61,6 +61,7 @@ async function createCustomPluginTypesMap({ directories, logger }) {
       types = (await import(`${plugin.name}/types`)).default;
     } catch (e) {
       logger.error(`Failed to import plugin "${plugin.name}".`);
+      logger.debug(e);
       logger.info('If the plugin was added while the server was running, restart the server.');
       throw new Error(`Failed to import plugin "${plugin.name}".`);
     }

package/manager/utils/createLogger.mjs

@@ -20,7 +20,6 @@ function createLogger({ level = 'info' }) {
     name: 'lowdefy build',
     level,
     base: { pid: undefined, hostname: undefined },
-    // TODO: Add log as custom level
     mixin: (context, level) => {
       return {
         ...context,

package/manager/utils/createStdOutLineHandler.mjs

@@ -0,0 +1,33 @@
+/*
+  Copyright 2020-2023 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.
+*/
+
+function createStdOutLineHandler({ context }) {
+  const { logger } = context;
+  function stdOutLineHandler(line) {
+    try {
+      const { level, name, time, rid, ...msgObj } = JSON.parse(line);
+      if (level) {
+        const print = level === 30 ? 'log' : logger.levels.labels[level];
+        logger[logger.levels.labels[level]]({ print }, JSON.stringify(msgObj));
+      }
+    } catch (error) {
+      logger.info({ print: 'log' }, line);
+    }
+  }
+  return stdOutLineHandler;
+}
+
+export default createStdOutLineHandler;

package/manager/watchers/nextBuildWatcher.mjs

@@ -17,11 +17,12 @@
 import crypto from 'crypto';
 import path from 'path';
 import { readFile } from '@lowdefy/node-utils';
+import { type } from '@lowdefy/helpers';
 import setupWatcher from '../utils/setupWatcher.mjs';
 
 const hashes = {};
 
-const watchedFiles = [
+const trackedFiles = [
   'build/app.json',
   'build/auth.json',
   'build/config.json',
@@ -41,7 +42,16 @@ const watchedFiles = [
 ];
 
 async function sha1(filePath) {
-  const content = await readFile(filePath);
+  let content = await readFile(filePath);
+  if (filePath.endsWith('.json')) {
+    content = JSON.stringify(
+      JSON.parse(content, (_, value) => {
+        if (!type.isObject(value)) return value;
+        delete value['~k'];
+        return value;
+      })
+    );
+  }
   return crypto
     .createHash('sha1')
     .update(content || '')
@@ -52,17 +62,16 @@ async function nextBuildWatcher(context) {
   // Initialize hashes so that app does not rebuild the first time
   // Lowdefy build is run.
   await Promise.all(
-    watchedFiles.map(async (filePath) => {
-      const fullPath = path.resolve(context.directories.server, filePath);
-      hashes[fullPath] = await sha1(fullPath);
+    trackedFiles.map(async (filePath) => {
+      hashes[filePath] = await sha1(filePath);
     })
   );
 
-  const callback = async (filePaths) => {
+  const callback = async () => {
     let install = false;
     let build = false;
     await Promise.all(
-      filePaths.flat().map(async (filePath) => {
+      trackedFiles.map(async (filePath) => {
         const hash = await sha1(filePath);
         if (hashes[filePath] === hash) {
           return;
@@ -74,7 +83,6 @@ async function nextBuildWatcher(context) {
         hashes[filePath] = hash;
       })
     );
-
     if (!build) {
       context.logger.info({ print: 'succeed' }, 'Reloaded app.');
       return;
@@ -82,6 +90,7 @@ async function nextBuildWatcher(context) {
 
     context.shutdownServer();
     if (install) {
+      context.logger.warn('Plugin dependencies have changed and will be reinstalled.');
       await context.installPlugins();
     }
     await context.nextBuild();
@@ -92,7 +101,7 @@ async function nextBuildWatcher(context) {
     callback,
     context,
     watchDotfiles: true,
-    watchPaths: watchedFiles.map((filePath) => path.join(context.directories.server, filePath)),
+    watchPaths: [path.join(context.directories.server, 'package.json')],
   });
 }
 

package/next.config.js

@@ -2,7 +2,7 @@ const withLess = require('next-with-less');
 const lowdefyConfig = require('./build/config.json');
 
 module.exports = withLess({
-  basePath: process.env.LOWDEFY_BASE_PATH || lowdefyConfig.basePath,
+  basePath: lowdefyConfig.basePath,
   // reactStrictMode: true,
   webpack: (config, { isServer }) => {
     if (!isServer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.11",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -29,7 +29,7 @@
     "lib/*",
     "manager/*",
     "pages/*",
-    "public/*",
+    "public_default/*",
     "next.config.js",
     "package.original.json",
     ".eslintrc.yaml",
@@ -42,54 +42,56 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-rc.1",
-    "@lowdefy/api": "4.0.0-rc.1",
-    "@lowdefy/blocks-antd": "4.0.0-rc.1",
-    "@lowdefy/blocks-basic": "4.0.0-rc.1",
-    "@lowdefy/blocks-color-selectors": "4.0.0-rc.1",
-    "@lowdefy/blocks-echarts": "4.0.0-rc.1",
-    "@lowdefy/blocks-loaders": "4.0.0-rc.1",
-    "@lowdefy/blocks-markdown": "4.0.0-rc.1",
-    "@lowdefy/blocks-qr": "4.0.0-rc.1",
-    "@lowdefy/build": "4.0.0-rc.1",
-    "@lowdefy/client": "4.0.0-rc.1",
-    "@lowdefy/connection-axios-http": "4.0.0-rc.1",
-    "@lowdefy/engine": "4.0.0-rc.1",
-    "@lowdefy/helpers": "4.0.0-rc.1",
-    "@lowdefy/layout": "4.0.0-rc.1",
-    "@lowdefy/node-utils": "4.0.0-rc.1",
-    "@lowdefy/operators-change-case": "4.0.0-rc.1",
-    "@lowdefy/operators-diff": "4.0.0-rc.1",
-    "@lowdefy/operators-js": "4.0.0-rc.1",
-    "@lowdefy/operators-mql": "4.0.0-rc.1",
-    "@lowdefy/operators-nunjucks": "4.0.0-rc.1",
-    "@lowdefy/operators-uuid": "4.0.0-rc.1",
-    "@lowdefy/operators-yaml": "4.0.0-rc.1",
-    "@lowdefy/plugin-next-auth": "4.0.0-rc.1",
+    "@lowdefy/actions-core": "4.0.0-rc.11",
+    "@lowdefy/api": "4.0.0-rc.11",
+    "@lowdefy/blocks-antd": "4.0.0-rc.11",
+    "@lowdefy/blocks-basic": "4.0.0-rc.11",
+    "@lowdefy/blocks-color-selectors": "4.0.0-rc.11",
+    "@lowdefy/blocks-echarts": "4.0.0-rc.11",
+    "@lowdefy/blocks-loaders": "4.0.0-rc.11",
+    "@lowdefy/blocks-markdown": "4.0.0-rc.11",
+    "@lowdefy/blocks-qr": "4.0.0-rc.11",
+    "@lowdefy/build": "4.0.0-rc.11",
+    "@lowdefy/client": "4.0.0-rc.11",
+    "@lowdefy/connection-axios-http": "4.0.0-rc.11",
+    "@lowdefy/engine": "4.0.0-rc.11",
+    "@lowdefy/helpers": "4.0.0-rc.11",
+    "@lowdefy/layout": "4.0.0-rc.11",
+    "@lowdefy/node-utils": "4.0.0-rc.11",
+    "@lowdefy/operators-change-case": "4.0.0-rc.11",
+    "@lowdefy/operators-diff": "4.0.0-rc.11",
+    "@lowdefy/operators-js": "4.0.0-rc.11",
+    "@lowdefy/operators-mql": "4.0.0-rc.11",
+    "@lowdefy/operators-nunjucks": "4.0.0-rc.11",
+    "@lowdefy/operators-uuid": "4.0.0-rc.11",
+    "@lowdefy/operators-yaml": "4.0.0-rc.11",
+    "@lowdefy/plugin-next-auth": "4.0.0-rc.11",
     "chokidar": "3.5.3",
-    "dotenv": "16.0.3",
-    "next": "12.3.1",
-    "next-auth": "4.18.8",
+    "dotenv": "16.3.1",
+    "next": "13.5.4",
+    "next-auth": "4.23.2",
     "opener": "1.5.2",
-    "pino": "8.8.0",
+    "pino": "8.15.6",
     "process": "0.11.10",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-icons": "4.7.1",
-    "swr": "2.0.0",
-    "yaml": "2.2.1",
-    "yargs": "17.6.2"
+    "react-icons": "4.11.0",
+    "swr": "2.2.4",
+    "yaml": "2.3.2",
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "12.1.6",
-    "less": "4.1.3",
-    "less-loader": "11.1.0",
-    "next-with-less": "2.0.5",
-    "webpack": "5.75.0"
+    "@next/eslint-plugin-next": "13.5.4",
+    "less": "4.2.0",
+    "less-loader": "11.1.3",
+    "next-with-less": "3.0.1",
+    "webpack": "5.88.2"
+  },
+  "engines": {
+    "node": ">=18"
   },
-  "packageManager": "pnpm@7.11.0",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ecc4f16c19eede929eda177db524cf13a8053379"
+  "gitHead": "dbc49d3688a6d2f44de25cc3f4bc071627f7ebfa"
 }

package/package.original.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.11",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -29,7 +29,7 @@
     "lib/*",
     "manager/*",
     "pages/*",
-    "public/*",
+    "public_default/*",
     "next.config.js",
     "package.original.json",
     ".eslintrc.yaml",
@@ -42,53 +42,56 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-rc.1",
-    "@lowdefy/api": "4.0.0-rc.1",
-    "@lowdefy/blocks-antd": "4.0.0-rc.1",
-    "@lowdefy/blocks-basic": "4.0.0-rc.1",
-    "@lowdefy/blocks-color-selectors": "4.0.0-rc.1",
-    "@lowdefy/blocks-echarts": "4.0.0-rc.1",
-    "@lowdefy/blocks-loaders": "4.0.0-rc.1",
-    "@lowdefy/blocks-markdown": "4.0.0-rc.1",
-    "@lowdefy/blocks-qr": "4.0.0-rc.1",
-    "@lowdefy/build": "4.0.0-rc.1",
-    "@lowdefy/client": "4.0.0-rc.1",
-    "@lowdefy/connection-axios-http": "4.0.0-rc.1",
-    "@lowdefy/engine": "4.0.0-rc.1",
-    "@lowdefy/helpers": "4.0.0-rc.1",
-    "@lowdefy/layout": "4.0.0-rc.1",
-    "@lowdefy/node-utils": "4.0.0-rc.1",
-    "@lowdefy/operators-change-case": "4.0.0-rc.1",
-    "@lowdefy/operators-diff": "4.0.0-rc.1",
-    "@lowdefy/operators-js": "4.0.0-rc.1",
-    "@lowdefy/operators-mql": "4.0.0-rc.1",
-    "@lowdefy/operators-nunjucks": "4.0.0-rc.1",
-    "@lowdefy/operators-uuid": "4.0.0-rc.1",
-    "@lowdefy/operators-yaml": "4.0.0-rc.1",
-    "@lowdefy/plugin-next-auth": "4.0.0-rc.1",
+    "@lowdefy/actions-core": "4.0.0-rc.11",
+    "@lowdefy/api": "4.0.0-rc.11",
+    "@lowdefy/blocks-antd": "4.0.0-rc.11",
+    "@lowdefy/blocks-basic": "4.0.0-rc.11",
+    "@lowdefy/blocks-color-selectors": "4.0.0-rc.11",
+    "@lowdefy/blocks-echarts": "4.0.0-rc.11",
+    "@lowdefy/blocks-loaders": "4.0.0-rc.11",
+    "@lowdefy/blocks-markdown": "4.0.0-rc.11",
+    "@lowdefy/blocks-qr": "4.0.0-rc.11",
+    "@lowdefy/build": "4.0.0-rc.11",
+    "@lowdefy/client": "4.0.0-rc.11",
+    "@lowdefy/connection-axios-http": "4.0.0-rc.11",
+    "@lowdefy/engine": "4.0.0-rc.11",
+    "@lowdefy/helpers": "4.0.0-rc.11",
+    "@lowdefy/layout": "4.0.0-rc.11",
+    "@lowdefy/node-utils": "4.0.0-rc.11",
+    "@lowdefy/operators-change-case": "4.0.0-rc.11",
+    "@lowdefy/operators-diff": "4.0.0-rc.11",
+    "@lowdefy/operators-js": "4.0.0-rc.11",
+    "@lowdefy/operators-mql": "4.0.0-rc.11",
+    "@lowdefy/operators-nunjucks": "4.0.0-rc.11",
+    "@lowdefy/operators-uuid": "4.0.0-rc.11",
+    "@lowdefy/operators-yaml": "4.0.0-rc.11",
+    "@lowdefy/plugin-next-auth": "4.0.0-rc.11",
     "chokidar": "3.5.3",
-    "dotenv": "16.0.3",
-    "next": "12.3.1",
-    "next-auth": "4.18.8",
+    "dotenv": "16.3.1",
+    "next": "13.5.4",
+    "next-auth": "4.23.2",
     "opener": "1.5.2",
-    "pino": "8.8.0",
+    "pino": "8.15.6",
     "process": "0.11.10",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-icons": "4.7.1",
-    "swr": "2.0.0",
-    "yaml": "2.2.1",
-    "yargs": "17.6.2"
+    "react-icons": "4.11.0",
+    "swr": "2.2.4",
+    "yaml": "2.3.2",
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "12.1.6",
-    "less": "4.1.3",
-    "less-loader": "11.1.0",
-    "next-with-less": "2.0.5",
-    "webpack": "5.75.0"
+    "@next/eslint-plugin-next": "13.5.4",
+    "less": "4.2.0",
+    "less-loader": "11.1.3",
+    "next-with-less": "3.0.1",
+    "webpack": "5.88.2"
+  },
+  "engines": {
+    "node": ">=18"
   },
-  "packageManager": "pnpm@7.11.0",
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "dbc49d3688a6d2f44de25cc3f4bc071627f7ebfa"
 }

package/pages/404.js

@@ -14,6 +14,6 @@
   limitations under the License.
 */
 
-import App from '../lib/App.js';
+import App from '../lib/client/App.js';
 
 export default App;

package/pages/[pageId].js

@@ -14,6 +14,6 @@
   limitations under the License.
 */
 
-import App from '../lib/App.js';
+import App from '../lib/client/App.js';
 
 export default App;

package/pages/_app.js

@@ -14,18 +14,19 @@
   limitations under the License.
 */
 
-import React, { Suspense } from 'react';
+import React, { Suspense, useRef } from 'react';
 import dynamic from 'next/dynamic';
 
-import Auth from '../lib/auth/Auth.js';
+import Auth from '../lib/client/auth/Auth.js';
 
 // Must be in _app due to next specifications.
 import '../build/plugins/styles.less';
 
 function App({ Component }) {
+  const lowdefyRef = useRef({});
   return (
     <Suspense fallback="">
-      <Auth>{(auth) => <Component auth={auth} />}</Auth>
+      <Auth>{(auth) => <Component auth={auth} lowdefy={lowdefyRef.current} />}</Auth>
     </Suspense>
   );
 }

package/pages/_document.js

@@ -16,16 +16,20 @@
 
 import React from 'react';
 import Document, { Html, Head, Main, NextScript } from 'next/document';
+
 import appJson from '../build/app.json';
+import lowdefyConfig from '../build/config.json';
+
+const basePath = lowdefyConfig.basePath ?? '';
 
 class LowdefyDocument extends Document {
   render() {
     return (
       <Html>
         <Head>
-          <link rel="manifest" href="/manifest.webmanifest" />
-          <link rel="icon" type="image/svg+xml" href="/icon.svg" />
-          <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+          <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={{

package/pages/api/auth/[...nextauth].js

@@ -15,31 +15,23 @@
 */
 
 import NextAuth from 'next-auth';
-import { createApiContext, getNextAuthConfig } from '@lowdefy/api';
 
+import apiWrapper from '../../../lib/server/apiWrapper.js';
 import authJson from '../../../build/auth.json';
-import config from '../../../build/config.json';
-import adapters from '../../../build/plugins/auth/adapters.js';
-import callbacks from '../../../build/plugins/auth/callbacks.js';
-import events from '../../../build/plugins/auth/events.js';
-import fileCache from '../../../lib/fileCache.js';
-import providers from '../../../build/plugins/auth/providers.js';
-
-export const authOptions = getNextAuthConfig(
-  createApiContext({
-    config,
-    fileCache,
-    logger: console,
-  }),
-  { authJson, plugins: { adapters, callbacks, events, providers } }
-);
-
-export default async function auth(req, res) {
+
+async function handler({ context, req, res }) {
   if (authJson.configured === true) {
-    return await NextAuth(req, res, authOptions);
+    // Required for emails in corporate networks, see:
+    // https://next-auth.js.org/tutorials/avoid-corporate-link-checking-email-provider
+    if (req.method === 'HEAD') {
+      return res.status(200).end();
+    }
+    return await NextAuth(req, res, context.authOptions);
   }
 
   return res.status(404).json({
     message: 'Auth not configured',
   });
 }
+
+export default apiWrapper(handler);

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

@@ -14,27 +14,19 @@
   limitations under the License.
 */
 
-import { createApiContext, getPageConfig } from '@lowdefy/api';
+import { getPageConfig } from '@lowdefy/api';
 
-import config from '../../../build/config.json';
-import fileCache from '../../../lib/fileCache.js';
-import getServerSession from '../../../lib/auth/getServerSession.js';
-
-export default async function handler(req, res) {
-  const session = await getServerSession({ req, res });
-  const apiContext = createApiContext({
-    buildDirectory: './build',
-    config,
-    fileCache,
-    logger: console,
-    session,
-  });
+import apiWrapper from '../../../lib/server/apiWrapper.js';
 
+async function handler({ context, req, res }) {
   const { pageId } = req.query;
-  const pageConfig = await getPageConfig(apiContext, { pageId });
+  const pageConfig = await getPageConfig(context, { pageId });
+  // TODO: Do we log here?
   if (pageConfig === null) {
     res.status(404).send('Page not found.');
   } else {
     res.status(200).json(pageConfig);
   }
 }
+
+export default apiWrapper(handler);

package/pages/api/request/[pageId]/[requestId].js

@@ -14,37 +14,19 @@
   limitations under the License.
 */
 
-import { callRequest, createApiContext } from '@lowdefy/api';
-import { getSecretsFromEnv } from '@lowdefy/node-utils';
+import { callRequest } from '@lowdefy/api';
 
-import config from '../../../../build/config.json';
-import connections from '../../../../build/plugins/connections.js';
-import fileCache from '../../../../lib/fileCache.js';
-import getServerSession from '../../../../lib/auth/getServerSession.js';
-import operators from '../../../../build/plugins/operators/server.js';
+import apiWrapper from '../../../../lib/server/apiWrapper.js';
 
-export default async function handler(req, res) {
-  try {
-    if (req.method !== 'POST') {
-      throw new Error('Only POST requests are supported.');
-    }
-    const session = await getServerSession({ req, res });
-    const apiContext = createApiContext({
-      buildDirectory: './build',
-      config,
-      connections,
-      fileCache,
-      logger: console,
-      operators,
-      secrets: getSecretsFromEnv(),
-      session,
-    });
-
-    const { blockId, pageId, requestId } = req.query;
-    const { payload } = req.body;
-    const response = await callRequest(apiContext, { blockId, pageId, payload, requestId });
-    res.status(200).json(response);
-  } catch (error) {
-    res.status(500).json({ name: error.name, message: error.message });
+async function handler({ context, req, res }) {
+  if (req.method !== 'POST') {
+    throw new Error('Only POST requests are supported.');
   }
+  const { pageId, requestId } = req.query;
+  const { blockId, payload } = req.body;
+  context.logger.info({ event: 'call_request', pageId, requestId, blockId });
+  const response = await callRequest(context, { blockId, pageId, payload, requestId });
+  res.status(200).json(response);
 }
+
+export default apiWrapper(handler);

package/pages/api/root.js

@@ -14,22 +14,12 @@
   limitations under the License.
 */
 
-import { createApiContext, getRootConfig } from '@lowdefy/api';
-
-import config from '../../build/config.json';
-import fileCache from '../../lib/fileCache.js';
-import getServerSession from '../../lib/auth/getServerSession.js';
-
-export default async function handler(req, res) {
-  const session = await getServerSession({ req, res });
-  const apiContext = createApiContext({
-    buildDirectory: './build',
-    config,
-    fileCache,
-    logger: console,
-    session,
-  });
-  const rootConfig = await getRootConfig(apiContext);
+import { getRootConfig } from '@lowdefy/api';
+import apiWrapper from '../../lib/server/apiWrapper.js';
 
+async function handler({ context, res }) {
+  const rootConfig = await getRootConfig(context);
   res.status(200).json(rootConfig);
 }
+
+export default apiWrapper(handler);

package/pages/index.js

@@ -14,6 +14,6 @@
   limitations under the License.
 */
 
-import App from '../lib/App.js';
+import App from '../lib/client/App.js';
 
 export default App;

package/public_default/icon.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 94 94" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,-979.672,-59.6924)">
+        <g transform="matrix(1,0,0,1.03297,-38.3284,-294.615)">
+            <g transform="matrix(1,0,0,1,952,232)">
+                <path d="M160,129.634C160,119.35 151.375,111 140.751,111L85.249,111C74.625,111 66,119.35 66,129.634L66,183.366C66,193.65 74.625,202 85.249,202L140.751,202C151.375,202 160,193.65 160,183.366L160,129.634Z"/>
+            </g>
+            <g transform="matrix(0.872141,0,0,1,1002.6,346)">
+                <rect x="36" y="12" width="36" height="59" style="fill:white;"/>
+            </g>
+            <g transform="matrix(0.78125,0,0,0.862069,1010.84,356.663)">
+                <rect x="77" y="41" width="32" height="29" style="fill:rgb(24,144,255);"/>
+            </g>
+        </g>
+    </g>
+</svg>

package/public_default/manifest.webmanifest

@@ -0,0 +1,16 @@
+{
+  "short_name": "Lowdefy App",
+  "name": "Lowdefy App",
+  "description": "Lowdefy App",
+  "icons": [
+    {
+      "src": "/public/icon-512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": "/",
+  "background_color": "#FFFFFF",
+  "display": "browser",
+  "scope": "/"
+}