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

package/lib/{App.js → client/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.
@@ -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}

@@ -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.
@@ -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}

@@ -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,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/{RestartingPage.js → client/RestartingPage.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/{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/{setPageId.js → client/setPageId.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/{utils → client/utils}/request.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/{utils → client/utils}/useMutateCache.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,18 +17,9 @@
 import { useSWRConfig } from 'swr';
 
 function useMutateCache(basePath) {
-  const { cache, mutate } = useSWRConfig();
-  return () => {
-    const keys = [`${basePath}/api/root`];
-
-    for (const key of cache.keys()) {
-      if (key.startsWith(`${basePath}/api/page`)) {
-        keys.push(key);
-      }
-    }
-    const mutations = keys.map((key) => mutate(key));
-    return Promise.all(mutations);
-  };
+  const { mutate } = useSWRConfig();
+  return () =>
+    mutate((key) => key.startsWith(`${basePath}/api/page`) || key === `${basePath}/api/root`);
 }
 
 export default useMutateCache;

package/lib/{utils → client/utils}/usePageConfig.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.
   You may obtain a copy of the License at

package/lib/{utils → client/utils}/useRootConfig.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.
   You may obtain a copy of the License at

package/lib/{utils → client/utils}/waitForRestartedServer.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/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

@@ -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,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/getContext.mjs

@@ -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/manager/processes/initialBuild.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/manager/processes/installPlugins.mjs

@@ -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/manager/processes/lowdefyBuild.mjs

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

package/manager/processes/nextBuild.mjs

@@ -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/manager/processes/readDotEnv.mjs

@@ -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/manager/processes/reloadClients.mjs

@@ -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/manager/processes/restartServer.mjs

@@ -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/manager/processes/shutdownServer.mjs

@@ -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/manager/processes/startServer.mjs

@@ -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/manager/processes/startWatchers.mjs

@@ -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/manager/run.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/manager/utils/BatchChanges.mjs

@@ -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/manager/utils/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.
@@ -30,7 +30,7 @@ async function getPluginDefinitions({ directories }) {
   return get(lowdefy, 'plugins', { default: [] });
 }
 
-async function createCustomPluginTypesMap({ directories }) {
+async function createCustomPluginTypesMap({ directories, logger }) {
   const customTypesMap = {
     actions: {},
     auth: {
@@ -56,7 +56,14 @@ async function createCustomPluginTypesMap({ directories }) {
   const pluginDefinitions = await getPluginDefinitions({ directories });
 
   for (const plugin of pluginDefinitions) {
-    const { default: types } = await import(`${plugin.name}/types`);
+    let types;
+    try {
+      types = (await import(`${plugin.name}/types`)).default;
+    } catch (e) {
+      logger.error(`Failed to import plugin "${plugin.name}".`);
+      logger.info('If the plugin was added while the server was running, restart the server.');
+      throw new Error(`Failed to import plugin "${plugin.name}".`);
+    }
     createPluginTypesMap({
       packageTypes: types,
       typesMap: customTypesMap,