@lowdefy/server 4.0.0-rc.0 → 4.0.0-rc.10

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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -21,12 +21,12 @@ import Client from '@lowdefy/client';
 import Head from 'next/head';
 import Link from 'next/link';
 
-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 Page = ({ auth, pageConfig, rootConfig }) => {
+const Page = ({ auth, lowdefy, pageConfig, rootConfig }) => {
   const router = useRouter();
   return (
     <Client
@@ -36,6 +36,7 @@ const Page = ({ auth, pageConfig, rootConfig }) => {
         pageConfig,
         rootConfig,
       }}
+      lowdefy={lowdefy}
       router={router}
       types={{
         actions,

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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -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,63 @@
+/*
+  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 logError from './log/logError.js';
+import logRequest from './log/logRequest.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 });
+      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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -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/{fileCache.js → server/fileCache.js}

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.

package/lib/server/log/createLogger.js

@@ -0,0 +1,30 @@
+/*
+  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';
+
+// TODO: Pino does not serialize error.cause properties if the cause object is not an Error (or Error-like)
+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,72 @@
+/*
+  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 { headers = {}, user = {} } = context;
+
+    context.logger.error({
+      // TODO:
+      // app_name
+      // app_version
+      // lowdefy_version
+      // build_hash
+      // config_hash
+      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,
+      hostname: context.req.hostname,
+      headers: {
+        'accept-language': headers['accept-language'],
+        'sec-ch-ua-mobile': headers['sec-ch-ua-mobile'],
+        'sec-ch-ua-platform': headers['sec-ch-ua-platform'],
+        'sec-ch-ua': headers['sec-ch-ua'],
+        'user-agent': headers['user-agent'],
+        host: headers.host,
+        referer: headers.referer,
+        // Non localhost headers
+        'x-forward-for': headers['x-forward-for'],
+        // Vercel headers
+        'x-vercel-id': headers['x-vercel-id'],
+        'x-real-ip': headers['x-real-ip'],
+        'x-vercel-ip-country': headers['x-vercel-ip-country'],
+        'x-vercel-ip-country-region': headers['x-vercel-ip-country-region'],
+        'x-vercel-ip-city': headers['x-vercel-ip-city'],
+        'x-vercel-ip-latitude': headers['x-vercel-ip-latitude'],
+        'x-vercel-ip-longitude': headers['x-vercel-ip-longitude'],
+        'x-vercel-ip-timezone': headers['x-vercel-ip-timezone'],
+        // Cloudflare headers
+        'cf-connecting-ip': headers['cf-connecting-ip'],
+        'cf-ray': headers['cf-ray'],
+        'cf-ipcountry': headers['cf-ipcountry'],
+        'cf-visitor': headers['cf-visitor'],
+      },
+    });
+  } 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,66 @@
+/*
+  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 { headers = {}, user = {} } = context;
+  context.logger.info({
+    // TODO:
+    // app_name
+    // app_version
+    // lowdefy_version
+    // build_hash
+    // config_hash
+    user: {
+      id: user.id,
+      roles: user.roles,
+      sub: user.sub,
+      session_id: user.session_id, // TODO: Implement session id
+    },
+    url: context.req.url,
+    method: context.req.method,
+    resolvedUrl: context.nextContext?.resolvedUrl,
+    hostname: context.req.hostname,
+    headers: {
+      'accept-language': headers['accept-language'],
+      'sec-ch-ua-mobile': headers['sec-ch-ua-mobile'],
+      'sec-ch-ua-platform': headers['sec-ch-ua-platform'],
+      'sec-ch-ua': headers['sec-ch-ua'],
+      'user-agent': headers['user-agent'],
+      host: headers.host,
+      referer: headers.referer,
+      'x-forward-for': headers['x-forward-for'],
+      // Vercel headers
+      'x-vercel-id': headers['x-vercel-id'],
+      'x-real-ip': headers['x-real-ip'],
+      'x-vercel-ip-country': headers['x-vercel-ip-country'],
+      'x-vercel-ip-country-region': headers['x-vercel-ip-country-region'],
+      'x-vercel-ip-city': headers['x-vercel-ip-city'],
+      'x-vercel-ip-latitude': headers['x-vercel-ip-latitude'],
+      'x-vercel-ip-longitude': headers['x-vercel-ip-longitude'],
+      'x-vercel-ip-timezone': headers['x-vercel-ip-timezone'],
+      // Cloudflare headers
+      'cf-connecting-ip': headers['cf-connecting-ip'],
+      'cf-ray': headers['cf-ray'],
+      'cf-ipcountry': headers['cf-ipcountry'],
+      'cf-visitor': headers['cf-visitor'],
+    },
+  });
+  // TODO:
+  // Next local? nextContext.locale, nextContext.locales, nextContext.defaultLocale
+}
+
+export default logRequest;

package/lib/server/serverSidePropsWrapper.js

@@ -0,0 +1,59 @@
+/*
+  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 config from '../../build/config.json';
+import createLogger from './log/createLogger.js';
+import fileCache from './fileCache.js';
+import getServerSession from './auth/getServerSession.js';
+import logError from './log/logError.js';
+import logRequest from './log/logRequest.js';
+import getAuthOptions from './auth/getAuthOptions.js';
+
+// TODO: Merge serverSidePropsWrapper and apiWrapper?
+function serverSidePropsWrapper(handler) {
+  return async function wrappedHandler(nextContext) {
+    const context = {
+      // Important to give absolute path so Next can trace build files
+      rid: crypto.randomUUID(),
+      buildDirectory: path.join(process.cwd(), 'build'),
+      config,
+      fileCache,
+      headers: nextContext?.req?.headers,
+      logger: console,
+      nextContext,
+      req: nextContext?.req,
+      res: nextContext?.res,
+    };
+    try {
+      context.logger = createLogger({ rid: context.rid });
+      context.authOptions = getAuthOptions(context);
+      context.session = await getServerSession(context);
+      createApiContext(context);
+      logRequest({ context });
+      // Await here so that if handler throws it is caught.
+      const response = await handler({ context, nextContext });
+      return response;
+    } catch (error) {
+      logError({ error, context });
+      throw error;
+    }
+  };
+}
+
+export default serverSidePropsWrapper;

package/lowdefy/build.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -16,6 +16,7 @@
 */
 
 import path from 'path';
+import pino from 'pino';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
@@ -37,10 +38,23 @@ async function run() {
   };
 
   const customTypesMap = await createCustomPluginTypesMap({ directories });
+
+  const logger = pino({
+    name: 'lowdefy_build',
+    level: process.env.LOWDEFY_LOG_LEVEL ?? 'info',
+    base: { pid: undefined, hostname: undefined },
+    mixin: (context, level) => {
+      return {
+        ...context,
+        print: context.print ?? logger.levels.labels[level],
+      };
+    },
+  });
+
   await build({
     customTypesMap,
     directories,
-    logger: console,
+    logger,
     refResolver: argv.refResolver || process.env.LOWDEFY_BUILD_REF_RESOLVER,
   });
 }

package/lowdefy/createCustomPluginTypesMap.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.

package/next.config.js

@@ -1,9 +1,8 @@
 const withLess = require('next-with-less');
 const lowdefyConfig = require('./build/config.json');
 
-// TODO: Trace env and args from cli that is required on the server.
 module.exports = withLess({
-  basePath: process.env.LOWDEFY_BASE_PATH || lowdefyConfig.basePath,
+  basePath: lowdefyConfig.basePath,
   reactStrictMode: true,
   webpack: (config, { isServer }) => {
     if (!isServer) {
@@ -22,11 +21,7 @@ module.exports = withLess({
   },
   poweredByHeader: false,
   // productionBrowserSourceMaps: true
-  experimental: {
-    // TODO: Convert from experimental.outputStandalone to output: 'standalone' when upgrading to Next 13
-    outputStandalone: process.env.LOWDEFY_BUILD_OUTPUT_STANDALONE === '1' || false,
-    // concurrentFeatures: true,
-  },
+  output: process.env.LOWDEFY_BUILD_OUTPUT_STANDALONE === '1' ? 'standalone' : undefined,
   outputFileTracing: true,
   eslint: {
     ignoreDuringBuilds: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0-rc.10",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -29,12 +29,14 @@
     "lib/*",
     "lowdefy/*",
     "pages/*",
-    "public/*",
+    "public_default/*",
     "next.config.js",
+    "package.original.json",
     ".eslintrc.yaml",
     ".npmrc"
   ],
   "scripts": {
+    "build": "cp package.json package.original.json || copy package.json package.original.json",
     "build:lowdefy": "node lowdefy/build.mjs",
     "build:next": "next build",
     "dev": "next dev",
@@ -43,37 +45,38 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-rc.0",
-    "@lowdefy/api": "4.0.0-rc.0",
-    "@lowdefy/blocks-antd": "4.0.0-rc.0",
-    "@lowdefy/blocks-basic": "4.0.0-rc.0",
-    "@lowdefy/blocks-loaders": "4.0.0-rc.0",
-    "@lowdefy/client": "4.0.0-rc.0",
-    "@lowdefy/helpers": "4.0.0-rc.0",
-    "@lowdefy/layout": "4.0.0-rc.0",
-    "@lowdefy/node-utils": "4.0.0-rc.0",
-    "@lowdefy/operators-js": "4.0.0-rc.0",
-    "@lowdefy/plugin-next-auth": "4.0.0-rc.0",
-    "next": "12.3.1",
-    "next-auth": "4.10.3",
+    "@lowdefy/actions-core": "4.0.0-rc.10",
+    "@lowdefy/api": "4.0.0-rc.10",
+    "@lowdefy/blocks-antd": "4.0.0-rc.10",
+    "@lowdefy/blocks-basic": "4.0.0-rc.10",
+    "@lowdefy/blocks-loaders": "4.0.0-rc.10",
+    "@lowdefy/client": "4.0.0-rc.10",
+    "@lowdefy/helpers": "4.0.0-rc.10",
+    "@lowdefy/layout": "4.0.0-rc.10",
+    "@lowdefy/node-utils": "4.0.0-rc.10",
+    "@lowdefy/operators-js": "4.0.0-rc.10",
+    "@lowdefy/plugin-next-auth": "4.0.0-rc.10",
+    "next": "12.3.4",
+    "next-auth": "4.20.1",
+    "pino": "8.8.0",
     "process": "0.11.10",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-icons": "4.3.1"
+    "react-icons": "4.7.1"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-rc.0",
-    "@next/eslint-plugin-next": "12.1.6",
-    "less": "4.1.2",
-    "less-loader": "11.0.0",
+    "@lowdefy/build": "4.0.0-rc.10",
+    "@next/eslint-plugin-next": "12.3.4",
+    "less": "4.1.3",
+    "less-loader": "11.1.0",
     "next-with-less": "2.0.5",
-    "webpack": "5.74.0",
-    "yaml": "2.1.1",
-    "yargs": "17.5.1"
+    "webpack": "5.88.2",
+    "yaml": "2.2.2",
+    "yargs": "17.7.2"
   },
   "packageManager": "pnpm@7.11.0",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f6872d7ff6da421710096536fce7b2016ef8f35c"
+  "gitHead": "537af074f27770e32da9da8d48490f2eda94b406"
 }

package/package.original.json

@@ -0,0 +1,81 @@
+{
+  "name": "@lowdefy/server",
+  "version": "4.0.0-rc.10",
+  "license": "Apache-2.0",
+  "description": "",
+  "homepage": "https://lowdefy.com",
+  "keywords": [
+    "lowdefy",
+    "server"
+  ],
+  "bugs": {
+    "url": "https://github.com/lowdefy/lowdefy/issues"
+  },
+  "contributors": [
+    {
+      "name": "Sam Tolmay",
+      "url": "https://github.com/SamTolmay"
+    },
+    {
+      "name": "Gerrie van Wyk",
+      "url": "https://github.com/Gervwyk"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lowdefy/lowdefy.git"
+  },
+  "files": [
+    "lib/*",
+    "lowdefy/*",
+    "pages/*",
+    "public_default/*",
+    "next.config.js",
+    "package.original.json",
+    ".eslintrc.yaml",
+    ".npmrc"
+  ],
+  "scripts": {
+    "build": "cp package.json package.original.json || copy package.json package.original.json",
+    "build:lowdefy": "node lowdefy/build.mjs",
+    "build:next": "next build",
+    "dev": "next dev",
+    "start": "next start",
+    "lint": "next lint",
+    "next": "next"
+  },
+  "dependencies": {
+    "@lowdefy/actions-core": "4.0.0-rc.10",
+    "@lowdefy/api": "4.0.0-rc.10",
+    "@lowdefy/blocks-antd": "4.0.0-rc.10",
+    "@lowdefy/blocks-basic": "4.0.0-rc.10",
+    "@lowdefy/blocks-loaders": "4.0.0-rc.10",
+    "@lowdefy/client": "4.0.0-rc.10",
+    "@lowdefy/helpers": "4.0.0-rc.10",
+    "@lowdefy/layout": "4.0.0-rc.10",
+    "@lowdefy/node-utils": "4.0.0-rc.10",
+    "@lowdefy/operators-js": "4.0.0-rc.10",
+    "@lowdefy/plugin-next-auth": "4.0.0-rc.10",
+    "next": "12.3.4",
+    "next-auth": "4.20.1",
+    "pino": "8.8.0",
+    "process": "0.11.10",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-icons": "4.7.1"
+  },
+  "devDependencies": {
+    "@lowdefy/build": "4.0.0-rc.10",
+    "@next/eslint-plugin-next": "12.3.4",
+    "less": "4.1.3",
+    "less-loader": "11.1.0",
+    "next-with-less": "2.0.5",
+    "webpack": "5.88.2",
+    "yaml": "2.2.2",
+    "yargs": "17.7.2"
+  },
+  "packageManager": "pnpm@7.11.0",
+  "publishConfig": {
+    "access": "public"
+  }
+}

package/pages/404.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -17,21 +17,22 @@ import path from 'path';
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 
 import config from '../build/config.json';
-import fileCache from '../lib/fileCache.js';
-import Page from '../lib/Page.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 apiContext = createApiContext({
+  const context = {
     buildDirectory: path.join(process.cwd(), 'build'),
     config,
     fileCache,
-    logger: console,
-  });
+    logger: console, // TODO: pino or console or 🤷‍♂️?
+  };
+  createApiContext(context);
 
   const [rootConfig, pageConfig] = await Promise.all([
-    getRootConfig(apiContext),
-    getPageConfig(apiContext, { pageId: '404' }),
+    getRootConfig(context),
+    getPageConfig(context, { pageId: '404' }),
   ]);
 
   return {

package/pages/[pageId].js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -14,32 +14,21 @@
   limitations under the License.
 */
 
-import path from 'path';
-import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
-
-import config from '../build/config.json';
-import fileCache from '../lib/fileCache.js';
-import getServerSession from '../lib/auth/getServerSession.js';
-import Page from '../lib/Page.js';
-
-export async function getServerSideProps(context) {
-  const { pageId } = context.params;
-  const session = await getServerSession(context);
-  // Important to give absolute path so Next can trace build files
-  const apiContext = createApiContext({
-    buildDirectory: path.join(process.cwd(), 'build'),
-    config,
-    fileCache,
-    logger: console,
-    session,
-  });
+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 { pageId } = nextContext.params;
+  const { logger } = context;
   const [rootConfig, pageConfig] = await Promise.all([
-    getRootConfig(apiContext),
-    getPageConfig(apiContext, { pageId }),
+    getRootConfig(context),
+    getPageConfig(context, { pageId }),
   ]);
 
   if (!pageConfig) {
+    logger.info({ event: 'redirect_page_not_found', pageId });
     return {
       redirect: {
         destination: '/404',
@@ -47,14 +36,16 @@ export async function getServerSideProps(context) {
       },
     };
   }
-
+  logger.info({ event: 'page_view', pageId });
   return {
     props: {
       pageConfig,
       rootConfig,
-      session,
+      session: context.session,
     },
   };
 }
 
+export const getServerSideProps = serverSidePropsWrapper(getServerSidePropsHandler);
+
 export default Page;

package/pages/_app.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -15,18 +15,26 @@
 */
 /* eslint-disable react/jsx-props-no-spreading */
 
-import React from 'react';
+import React, { 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, pageProps: { session, rootConfig, pageConfig } }) {
+  const lowdefyRef = useRef({});
   return (
     <Auth session={session}>
-      {(auth) => <Component auth={auth} rootConfig={rootConfig} pageConfig={pageConfig} />}
+      {(auth) => (
+        <Component
+          auth={auth}
+          lowdefy={lowdefyRef.current}
+          rootConfig={rootConfig}
+          pageConfig={pageConfig}
+        />
+      )}
     </Auth>
   );
 }

package/pages/_document.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -15,31 +15,23 @@
 */
 
 import NextAuth from 'next-auth';
-import { createApiContext, getNextAuthConfig } from '@lowdefy/api';
 
-import adapters from '../../../build/plugins/auth/adapters.js';
+import apiWrapper from '../../../lib/server/apiWrapper.js';
 import authJson from '../../../build/auth.json';
-import callbacks from '../../../build/plugins/auth/callbacks.js';
-import config from '../../../build/config.json';
-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/request/[pageId]/[requestId].js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -14,40 +14,19 @@
   limitations under the License.
 */
 
-import path from 'path';
-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 getServerSession from '../../../../lib/auth/getServerSession.js';
-import operators from '../../../../build/plugins/operators/server.js';
-import fileCache from '../../../../lib/fileCache.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 });
-    // Important to give absolute path so Next can trace build files
-    const apiContext = createApiContext({
-      buildDirectory: path.join(process.cwd(), 'build'),
-      config,
-      connections,
-      fileCache,
-      // logger: console,
-      logger: { debug: () => {} },
-      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/index.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  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.
@@ -14,28 +14,17 @@
   limitations under the License.
 */
 
-import path from 'path';
-import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
+import { getPageConfig, getRootConfig } from '@lowdefy/api';
 
-import config from '../build/config.json';
-import fileCache from '../lib/fileCache.js';
-import getServerSession from '../lib/auth/getServerSession.js';
-import Page from '../lib/Page.js';
+import serverSidePropsWrapper from '../lib/server/serverSidePropsWrapper.js';
+import Page from '../lib/client/Page.js';
 
-export async function getServerSideProps(context) {
-  const session = await getServerSession(context);
-
-  // Important to give absolute path so Next can trace build files
-  const apiContext = createApiContext({
-    buildDirectory: path.join(process.cwd(), 'build'),
-    config,
-    fileCache,
-    logger: console,
-    session,
-  });
-  const rootConfig = await getRootConfig(apiContext);
+async function getServerSidePropsHandler({ context }) {
+  const rootConfig = await getRootConfig(context);
   const { home } = rootConfig;
+  const { logger } = context;
   if (home.configured === false) {
+    logger.info({ event: 'redirect_to_homepage', pageId: home.pageId });
     return {
       redirect: {
         destination: `/${home.pageId}`,
@@ -43,8 +32,9 @@ export async function getServerSideProps(context) {
       },
     };
   }
-  const pageConfig = await getPageConfig(apiContext, { pageId: home.pageId });
+  const pageConfig = await getPageConfig(context, { pageId: home.pageId });
   if (!pageConfig) {
+    logger.info({ event: 'redirect_page_not_found', pageId: home.pageId });
     return {
       redirect: {
         destination: '/404',
@@ -52,13 +42,16 @@ export async function getServerSideProps(context) {
       },
     };
   }
+  logger.info({ event: 'page_view', pageId: home.pageId });
   return {
     props: {
       pageConfig,
       rootConfig,
-      session,
+      session: context.session,
     },
   };
 }
 
+export const getServerSideProps = serverSidePropsWrapper(getServerSidePropsHandler);
+
 export default Page;