@lowdefy/server-dev 4.0.0-rc.9 → 4.0.1

package/manager/utils/getLowdefyVersion.mjs

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

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

@@ -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/manager/watchers/envWatcher.mjs

@@ -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/manager/watchers/lowdefyBuildWatcher.mjs

@@ -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/manager/watchers/nextBuildWatcher.mjs

@@ -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.
@@ -55,7 +55,7 @@ async function sha1(filePath) {
   return crypto
     .createHash('sha1')
     .update(content || '')
-    .digest('hex');
+    .digest('base64');
 }
 
 async function nextBuildWatcher(context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-rc.9",
+  "version": "4.0.1",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -35,61 +35,65 @@
     ".eslintrc.yaml",
     ".npmrc"
   ],
-  "scripts": {
-    "build": "cp package.json package.original.json || copy package.json package.original.json",
-    "start": "node manager/run.mjs",
-    "lint": "next lint",
-    "next": "next"
-  },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-rc.9",
-    "@lowdefy/api": "4.0.0-rc.9",
-    "@lowdefy/blocks-antd": "4.0.0-rc.9",
-    "@lowdefy/blocks-basic": "4.0.0-rc.9",
-    "@lowdefy/blocks-color-selectors": "4.0.0-rc.9",
-    "@lowdefy/blocks-echarts": "4.0.0-rc.9",
-    "@lowdefy/blocks-loaders": "4.0.0-rc.9",
-    "@lowdefy/blocks-markdown": "4.0.0-rc.9",
-    "@lowdefy/blocks-qr": "4.0.0-rc.9",
-    "@lowdefy/build": "4.0.0-rc.9",
-    "@lowdefy/client": "4.0.0-rc.9",
-    "@lowdefy/connection-axios-http": "4.0.0-rc.9",
-    "@lowdefy/engine": "4.0.0-rc.9",
-    "@lowdefy/helpers": "4.0.0-rc.9",
-    "@lowdefy/layout": "4.0.0-rc.9",
-    "@lowdefy/node-utils": "4.0.0-rc.9",
-    "@lowdefy/operators-change-case": "4.0.0-rc.9",
-    "@lowdefy/operators-diff": "4.0.0-rc.9",
-    "@lowdefy/operators-js": "4.0.0-rc.9",
-    "@lowdefy/operators-mql": "4.0.0-rc.9",
-    "@lowdefy/operators-nunjucks": "4.0.0-rc.9",
-    "@lowdefy/operators-uuid": "4.0.0-rc.9",
-    "@lowdefy/operators-yaml": "4.0.0-rc.9",
-    "@lowdefy/plugin-next-auth": "4.0.0-rc.9",
+    "@lowdefy/actions-core": "4.0.1",
+    "@lowdefy/api": "4.0.1",
+    "@lowdefy/block-utils": "4.0.1",
+    "@lowdefy/blocks-aggrid": "4.0.1",
+    "@lowdefy/blocks-antd": "4.0.1",
+    "@lowdefy/blocks-basic": "4.0.1",
+    "@lowdefy/blocks-color-selectors": "4.0.1",
+    "@lowdefy/blocks-echarts": "4.0.1",
+    "@lowdefy/blocks-loaders": "4.0.1",
+    "@lowdefy/blocks-markdown": "4.0.1",
+    "@lowdefy/blocks-qr": "4.0.1",
+    "@lowdefy/build": "4.0.1",
+    "@lowdefy/client": "4.0.1",
+    "@lowdefy/connection-axios-http": "4.0.1",
+    "@lowdefy/engine": "4.0.1",
+    "@lowdefy/helpers": "4.0.1",
+    "@lowdefy/layout": "4.0.1",
+    "@lowdefy/node-utils": "4.0.1",
+    "@lowdefy/operators-change-case": "4.0.1",
+    "@lowdefy/operators-diff": "4.0.1",
+    "@lowdefy/operators-js": "4.0.1",
+    "@lowdefy/operators-moment": "4.0.1",
+    "@lowdefy/operators-mql": "4.0.1",
+    "@lowdefy/operators-nunjucks": "4.0.1",
+    "@lowdefy/operators-uuid": "4.0.1",
+    "@lowdefy/operators-yaml": "4.0.1",
+    "@lowdefy/plugin-next-auth": "4.0.1",
     "chokidar": "3.5.3",
-    "dotenv": "16.0.3",
-    "next": "12.3.1",
-    "next-auth": "4.20.1",
+    "dotenv": "16.3.1",
+    "next": "13.5.4",
+    "next-auth": "4.24.5",
     "opener": "1.5.2",
-    "pino": "8.8.0",
+    "pino": "8.16.2",
     "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.2",
-    "yargs": "17.6.2"
+    "react-icons": "4.12.0",
+    "swr": "2.2.4",
+    "yaml": "2.3.4",
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "12.1.6",
+    "@next/eslint-plugin-next": "13.5.4",
     "less": "4.1.3",
-    "less-loader": "11.1.0",
-    "next-with-less": "2.0.5",
-    "webpack": "5.76.0"
+    "less-loader": "11.1.3",
+    "next-with-less": "3.0.1",
+    "webpack": "5.89.0"
+  },
+  "engines": {
+    "node": ">=18"
   },
-  "packageManager": "pnpm@7.11.0",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d20e6ac424643feca527a732dc2b0710713c8243"
-}
+  "scripts": {
+    "build": "cp package.json package.original.json || copy package.json package.original.json",
+    "start": "node manager/run.mjs",
+    "lint": "next lint",
+    "next": "next"
+  }
+}

package/package.original.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-rc.9",
+  "version": "4.0.1",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -42,52 +42,57 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-rc.9",
-    "@lowdefy/api": "4.0.0-rc.9",
-    "@lowdefy/blocks-antd": "4.0.0-rc.9",
-    "@lowdefy/blocks-basic": "4.0.0-rc.9",
-    "@lowdefy/blocks-color-selectors": "4.0.0-rc.9",
-    "@lowdefy/blocks-echarts": "4.0.0-rc.9",
-    "@lowdefy/blocks-loaders": "4.0.0-rc.9",
-    "@lowdefy/blocks-markdown": "4.0.0-rc.9",
-    "@lowdefy/blocks-qr": "4.0.0-rc.9",
-    "@lowdefy/build": "4.0.0-rc.9",
-    "@lowdefy/client": "4.0.0-rc.9",
-    "@lowdefy/connection-axios-http": "4.0.0-rc.9",
-    "@lowdefy/engine": "4.0.0-rc.9",
-    "@lowdefy/helpers": "4.0.0-rc.9",
-    "@lowdefy/layout": "4.0.0-rc.9",
-    "@lowdefy/node-utils": "4.0.0-rc.9",
-    "@lowdefy/operators-change-case": "4.0.0-rc.9",
-    "@lowdefy/operators-diff": "4.0.0-rc.9",
-    "@lowdefy/operators-js": "4.0.0-rc.9",
-    "@lowdefy/operators-mql": "4.0.0-rc.9",
-    "@lowdefy/operators-nunjucks": "4.0.0-rc.9",
-    "@lowdefy/operators-uuid": "4.0.0-rc.9",
-    "@lowdefy/operators-yaml": "4.0.0-rc.9",
-    "@lowdefy/plugin-next-auth": "4.0.0-rc.9",
+    "@lowdefy/actions-core": "4.0.1",
+    "@lowdefy/api": "4.0.1",
+    "@lowdefy/block-utils": "4.0.1",
+    "@lowdefy/blocks-aggrid": "4.0.1",
+    "@lowdefy/blocks-antd": "4.0.1",
+    "@lowdefy/blocks-basic": "4.0.1",
+    "@lowdefy/blocks-color-selectors": "4.0.1",
+    "@lowdefy/blocks-echarts": "4.0.1",
+    "@lowdefy/blocks-loaders": "4.0.1",
+    "@lowdefy/blocks-markdown": "4.0.1",
+    "@lowdefy/blocks-qr": "4.0.1",
+    "@lowdefy/build": "4.0.1",
+    "@lowdefy/client": "4.0.1",
+    "@lowdefy/connection-axios-http": "4.0.1",
+    "@lowdefy/engine": "4.0.1",
+    "@lowdefy/helpers": "4.0.1",
+    "@lowdefy/layout": "4.0.1",
+    "@lowdefy/node-utils": "4.0.1",
+    "@lowdefy/operators-change-case": "4.0.1",
+    "@lowdefy/operators-diff": "4.0.1",
+    "@lowdefy/operators-js": "4.0.1",
+    "@lowdefy/operators-moment": "4.0.1",
+    "@lowdefy/operators-mql": "4.0.1",
+    "@lowdefy/operators-nunjucks": "4.0.1",
+    "@lowdefy/operators-uuid": "4.0.1",
+    "@lowdefy/operators-yaml": "4.0.1",
+    "@lowdefy/plugin-next-auth": "4.0.1",
     "chokidar": "3.5.3",
-    "dotenv": "16.0.3",
-    "next": "12.3.1",
-    "next-auth": "4.20.1",
+    "dotenv": "16.3.1",
+    "next": "13.5.4",
+    "next-auth": "4.24.5",
     "opener": "1.5.2",
-    "pino": "8.8.0",
+    "pino": "8.16.2",
     "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.2",
-    "yargs": "17.6.2"
+    "react-icons": "4.12.0",
+    "swr": "2.2.4",
+    "yaml": "2.3.4",
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "12.1.6",
+    "@next/eslint-plugin-next": "13.5.4",
     "less": "4.1.3",
-    "less-loader": "11.1.0",
-    "next-with-less": "2.0.5",
-    "webpack": "5.76.0"
+    "less-loader": "11.1.3",
+    "next-with-less": "3.0.1",
+    "webpack": "5.89.0"
+  },
+  "engines": {
+    "node": ">=18"
   },
-  "packageManager": "pnpm@7.11.0",
   "publishConfig": {
     "access": "public"
   }

package/pages/404.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,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

@@ -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,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

@@ -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.
@@ -17,7 +17,9 @@
 import React, { Suspense, 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';
 
 // Must be in _app due to next specifications.
 import '../build/plugins/styles.less';
@@ -25,9 +27,11 @@ import '../build/plugins/styles.less';
 function App({ Component }) {
   const lowdefyRef = useRef({});
   return (
-    <Suspense fallback="">
-      <Auth>{(auth) => <Component auth={auth} lowdefy={lowdefyRef.current} />}</Auth>
-    </Suspense>
+    <ErrorBoundary fullPage>
+      <Suspense fallback="">
+        <Auth>{(auth) => <Component auth={auth} lowdefy={lowdefyRef.current} />}</Auth>
+      </Suspense>
+    </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 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) {
     // 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);
+    return await NextAuth(req, res, context.authOptions);
   }
 
   return res.status(404).json({
     message: 'Auth not configured',
   });
 }
+
+export default apiWrapper(handler);

package/pages/api/license.js

@@ -0,0 +1,22 @@
+/*
+  Copyright (C) 2023 Lowdefy, Inc
+  Use of this software is governed by the Business Source License included in the LICENSE file and at www.mariadb.com/bsl11.
+
+  Change Date: 2027-10-09
+
+  On the date above, in accordance with the Business Source License, use
+  of this software will be governed by the Apache License, Version 2.0.
+*/
+import apiWrapper from '../../lib/server/apiWrapper.js';
+import validateLicense from '../../lib/server/validateLicense.js';
+
+async function handler({ req, res }) {
+  if (req.method !== 'GET') {
+    throw new Error('Only GET requests are supported.');
+  }
+
+  const { code, entitlements } = await validateLicense();
+  return res.status(200).json({ code, entitlements });
+}
+
+export default apiWrapper(handler);

package/pages/api/page/[pageId].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,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/ping.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/reload.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/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,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

@@ -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,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

@@ -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,6 +14,6 @@
   limitations under the License.
 */
 
-import App from '../lib/App.js';
+import App from '../lib/client/App.js';
 
 export default App;