@lowdefy/server 4.0.0-rc.9 → 4.5.1

package/pages/_app.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,29 +13,37 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-/* eslint-disable react/jsx-props-no-spreading */
 
 import React, { useRef } from 'react';
 import dynamic from 'next/dynamic';
 
-import Auth from '../lib/auth/Auth.js';
+import { ErrorBoundary } from '@lowdefy/block-utils';
+
+import Auth from '../lib/client/auth/Auth.js';
+import createLogUsage from '../lib/client/createLogUsage.js';
 
 // Must be in _app due to next specifications.
 import '../build/plugins/styles.less';
 
 function App({ Component, pageProps: { session, rootConfig, pageConfig } }) {
-  const lowdefyRef = useRef({});
+  const usageDataRef = useRef({});
+  const lowdefyRef = useRef({ eventCallback: createLogUsage({ usageDataRef }) });
   return (
-    <Auth session={session}>
-      {(auth) => (
-        <Component
-          auth={auth}
-          lowdefy={lowdefyRef.current}
-          rootConfig={rootConfig}
-          pageConfig={pageConfig}
-        />
-      )}
-    </Auth>
+    <ErrorBoundary fullPage>
+      <Auth session={session}>
+        {(auth) => {
+          usageDataRef.current.user = auth.session?.hashed_id;
+          return (
+            <Component
+              auth={auth}
+              lowdefy={lowdefyRef.current}
+              rootConfig={rootConfig}
+              pageConfig={pageConfig}
+            />
+          );
+        }}
+      </Auth>
+    </ErrorBoundary>
   );
 }
 

package/pages/_document.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 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/pages/api/auth/[...nextauth].js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 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,36 +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) {
-  if (authJson.configured === true) {
-    // 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, authOptions);
+
+async function handler({ context, req, res }) {
+  if (authJson.configured !== true) {
+    return res.status(404).json({
+      message: 'Auth not configured',
+    });
   }
 
-  return res.status(404).json({
-    message: 'Auth not configured',
-  });
+  // 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 NextAuth(req, res, context.authOptions);
 }
+
+export default apiWrapper(handler);

package/pages/api/endpoints/[endpointId].js

@@ -0,0 +1,32 @@
+/*
+  Copyright 2020-2024 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 { callEndpoint } from '@lowdefy/api';
+
+import apiWrapper from '../../../lib/server/apiWrapper.js';
+
+async function handler({ context, req, res }) {
+  if (req.method !== 'POST') {
+    throw new Error('Only POST requests are supported.');
+  }
+  const { endpointId } = req.query;
+  const { blockId, payload, pageId } = req.body;
+  context.logger.info({ event: 'call_api_endpoint', blockId, endpointId, pageId });
+  const response = await callEndpoint(context, { blockId, endpointId, pageId, payload });
+  res.status(200).json(response);
+}
+
+export default apiWrapper(handler);

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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 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/api/usage.js

@@ -0,0 +1,68 @@
+/*
+  Copyright 2020-2024 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
+// import crypto from 'crypto';
+
+import appJson from '../../build/app.json';
+import packageJson from '../../package.json';
+import apiWrapper from '../../lib/server/apiWrapper.js';
+// import validateLicense from '../../lib/server/validateLicense.js';
+
+async function handler({ context, req, res }) {
+  if (req.method !== 'POST') {
+    throw new Error('Only POST requests are supported.');
+  }
+  const { user, machine } = req.body;
+  const host = req.headers.host;
+  context.logger.info({ event: 'log_usage', user, machine });
+
+  // const license = await validateLicense();
+  // if (license.entitlements.includes['OFFLINE']) {
+  //   return res.status(200).json({ offline: true });
+  // }
+  const timestamp = Date.now();
+
+  // const data = [
+  //   `git_sha: ${appJson.git_sha}`,
+  //   `host: ${host}`,
+  //   `license_key: ${license.id}`,
+  //   `machine: ${machine}`,
+  //   `timestamp: ${timestamp}`,
+  //   `user: ${user}`,
+  //   `version: ${packageJson.version}`,
+  // ].join('\n');
+
+  // const hmac = crypto.createHmac('sha256', process.env.LOWDEFY_LICENSE_KEY ?? 'NO_LICENSE');
+  // hmac.update(data);
+  // const sig = hmac.digest('base64');
+
+  return res.status(200).json({
+    offline: false,
+    data: {
+      git_sha: appJson.git_sha,
+      host,
+      // license_key: license.id,
+      machine,
+      // sig,
+      timestamp,
+      user,
+      version: packageJson.version,
+    },
+  });
+}
+
+export default apiWrapper(handler);

package/pages/index.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 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, session } = 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,6 +42,7 @@ export async function getServerSideProps(context) {
       },
     };
   }
+  logger.info({ event: 'page_view', pageId: home.pageId });
   return {
     props: {
       pageConfig,
@@ -61,4 +52,6 @@ export async function getServerSideProps(context) {
   };
 }
 
+export const getServerSideProps = serverSidePropsWrapper(getServerSidePropsHandler);
+
 export default Page;