@lowdefy/server-dev 4.0.0-alpha.24 → 4.0.0-alpha.27

package/manager/getContext.mjs

@@ -13,13 +13,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-/* eslint-disable no-console */
 
 import path from 'path';
 
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
+import createLogger from './utils/createLogger.mjs';
 import initialBuild from './processes/initialBuild.mjs';
 import installPlugins from './processes/installPlugins.mjs';
 import lowdefyBuild from './processes/lowdefyBuild.mjs';
@@ -46,6 +46,7 @@ async function getContext() {
       config: path.resolve(argv.configDirectory || env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()),
       server: process.cwd(),
     },
+    logger: createLogger({ level: env.LOWDEFY_LOG_LEVEL }),
     options: {
       port: argv.port || env.PORT || 3000,
       refResolver: argv.refResolver || env.LOWDEFY_BUILD_REF_RESOLVER,
@@ -55,8 +56,6 @@ async function getContext() {
         argv.watchIgnore || env.LOWDEFY_SERVER_DEV_WATCH_IGNORE
           ? JSON.parse(env.LOWDEFY_SERVER_DEV_WATCH_IGNORE)
           : [],
-      // TODO: read option from env
-      verbose: argv.verbose || false,
     },
     packageManager: argv.packageManager || env.LOWDEFY_PACKAGE_MANAGER || 'npm',
     version: env.npm_package_version,

package/manager/processes/installPlugins.mjs

@@ -21,15 +21,15 @@ const args = {
   yarn: ['install'],
 };
 
-function installPlugins({ packageManager, packageManagerCmd, options }) {
+function installPlugins({ logger, packageManager, packageManagerCmd }) {
   return async () => {
-    console.log('Installing plugins...');
+    logger.info({ print: 'spin' }, 'Installing plugins...');
     await spawnProcess({
-      logger: console,
       command: packageManagerCmd,
       args: args[packageManager],
-      silent: !options.verbose,
+      stdOutLineHandler: (line) => logger.debug(line),
     });
+    logger.info({ print: 'log' }, 'Installed plugins.');
   };
 }
 

package/manager/processes/lowdefyBuild.mjs

@@ -17,16 +17,17 @@
 import build from '@lowdefy/build';
 import createCustomPluginTypesMap from '../utils/createCustomPluginTypesMap.mjs';
 
-function lowdefyBuild({ directories, options }) {
+function lowdefyBuild({ directories, logger, options }) {
   return async () => {
     const customTypesMap = await createCustomPluginTypesMap({ directories });
     await build({
       customTypesMap,
       directories,
-      logger: console,
+      logger,
       refResolver: options.refResolver,
       stage: 'dev',
     });
+    logger.info({ print: 'log' }, 'Built config.');
   };
 }
 

package/manager/processes/nextBuild.mjs

@@ -16,15 +16,15 @@
 
 import { spawnProcess } from '@lowdefy/node-utils';
 
-function nextBuild({ bin, options }) {
+function nextBuild({ bin, logger }) {
   return async () => {
-    console.log('Building app...');
+    logger.info({ print: 'spin' }, 'Building app...');
     await spawnProcess({
-      logger: console,
       command: 'node',
       args: [bin.next, 'build'],
-      silent: !options.verbose,
+      stdOutLineHandler: (line) => logger.debug(line),
     });
+    logger.info({ print: 'log' }, 'Built app.');
   };
 }
 

package/manager/processes/restartServer.mjs

@@ -14,13 +14,14 @@
   limitations under the License.
 */
 
-import startNextServer from './startNextServer.mjs';
+import startServer from './startServer.mjs';
 
 function restartServer(context) {
   return () => {
-    context.shutdownServer(); // Is this needed here?
-    console.log('Restarting server...');
-    startNextServer(context);
+    context.shutdownServer();
+    context.logger.info({ print: 'spin' }, 'Restarting server...');
+    startServer(context);
+    context.logger.info({ print: 'succeed' }, 'Restarted server.');
   };
 }
 

package/manager/processes/shutdownServer.mjs

@@ -17,15 +17,15 @@
 function shutdownServer(context) {
   return () => {
     if (context.nextServer) {
-      // console.log(
-      //   `Existing server ${context.nextServer.pid}, killed: ${context.nextServer.killed}`
-      // );
+      context.logger.debug(
+        `Existing next server with pid ${context.nextServer.pid}, killed: ${context.nextServer.killed}`
+      );
       if (!context.nextServer.killed) {
-        console.log('Shutting down server...');
+        context.logger.info({ print: 'spin' }, 'Shutting down server...');
         context.nextServer.kill();
-        // console.log(
-        //   `Killed server ${context.nextServer.pid}, killed: ${context.nextServer.killed}`
-        // );
+        context.logger.debug(
+          `Killed next server with pid ${context.nextServer.pid}, killed: ${context.nextServer.killed}`
+        );
       }
       context.nextServer = null;
     }

package/manager/processes/startServer.mjs

@@ -13,19 +13,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-/* eslint-disable no-console */
 
-import startNextServer from './startNextServer.mjs';
+import { spawnProcess } from '@lowdefy/node-utils';
 
-async function startServer(context) {
-  return new Promise((resolve, reject) => {
-    try {
-      startNextServer(context);
-    } catch (error) {
-      console.log(error);
-      reject(error);
-    }
+function startServer(context) {
+  context.shutdownServer();
+
+  const nextServer = spawnProcess({
+    stdOutLineHandler: (line) => context.logger.info({ print: 'log' }, line),
+    stdErrLineHandler: (line) => context.logger.error(line),
+    command: 'node',
+    args: [context.bin.next, 'start'],
+    processOptions: {
+      env: {
+        ...process.env,
+        PORT: context.options.port,
+      },
+    },
+    returnProcess: true,
+  });
+  context.logger.debug(`Started next server with pid ${nextServer.pid}.`);
+  nextServer.on('exit', (code, signal) => {
+    context.logger.debug(`nextServer exit ${nextServer.pid}, signal: ${signal}, code: ${code}`);
+  });
+  nextServer.on('error', (error) => {
+    context.logger.error(error);
   });
+  context.nextServer = nextServer;
 }
 
 export default startServer;

package/manager/run.mjs

@@ -73,23 +73,34 @@ The run script does the following:
   pinging the /api/ping route, until it detects a new server has started, and then reloads the window.
  */
 
-async function run() {
-  const context = await getContext();
-  await context.initialBuild();
-  await context.startWatchers();
+/* TODO:
+Not killing server on errors properly
+when:
+- initial build fails
+*/
+
+const context = await getContext();
+
+try {
   try {
-    const serverPromise = startServer(context);
-    await wait(800);
-    if (process.env.LOWDEFY_SERVER_DEV_OPEN_BROWSER === 'true') {
-      // TODO: Wait 1 sec for a ping and don't open if a ping is seen
-      opener(`http://localhost:${context.options.port}`);
-    }
-    await serverPromise;
+    await context.initialBuild();
   } catch (error) {
-    console.log(error);
-    context.shutdownServer();
-    throw error;
+    context.logger.error(error);
   }
-}
 
-run();
+  // We are not waiting for the startWatchers promise to resolve (all watchers have fired the ready event)
+  // because chokidar sometimes doesn't fire this event, and it seems like there isn't an issue with not waiting.
+  context.startWatchers();
+
+  startServer(context);
+  await wait(800);
+  if (process.env.LOWDEFY_SERVER_DEV_OPEN_BROWSER === 'true') {
+    // TODO: Wait 1 sec for a ping and don't open if a ping is seen
+    opener(`http://localhost:${context.options.port}`);
+  }
+  await new Promise(() => {});
+} catch (error) {
+  context.logger.error(error);
+  context.shutdownServer();
+  process.exit();
+}

package/manager/utils/BatchChanges.mjs

@@ -13,24 +13,22 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-/* eslint-disable no-console */
 
 import { type } from '@lowdefy/helpers';
 
 class BatchChanges {
-  constructor({ fn, minDelay }) {
+  constructor({ context, fn, delay }) {
+    this.context = context;
     this._call = this._call.bind(this);
     this.args = [];
-    this.delay = minDelay || 500;
+    this.delay = delay || 500;
     this.fn = fn;
-    this.minDelay = minDelay || 500;
     this.repeat = false;
     this.running = false;
   }
 
   newChange(...args) {
     this.args.push(args.filter((arg) => type.isString(arg))); // filter for string paths since chokidar also returns an stats object on windows.
-    this.delay = this.minDelay;
     this._startTimer();
   }
 
@@ -58,10 +56,7 @@ class BatchChanges {
       }
     } catch (error) {
       this.running = false;
-      console.error(error);
-      this.delay *= 2;
-      console.warn(`Retrying in ${this.delay / 1000}s.`);
-      this._startTimer();
+      this.context.logger.error(error?.message ?? error);
     }
   }
 }

package/manager/utils/createLogger.mjs

@@ -0,0 +1,34 @@
+/*
+  Copyright 2020-2022 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';
+
+function createLogger({ level = 'info' }) {
+  const logger = pino({
+    name: 'lowdefy build',
+    level,
+    base: { pid: undefined, hostname: undefined },
+    // TODO: Add log as custom level
+    mixin: (context, level) => {
+      return {
+        ...context,
+        print: context.print ?? logger.levels.labels[level],
+      };
+    },
+  });
+  return logger;
+}
+
+export default createLogger;

package/manager/utils/setupWatcher.mjs

@@ -19,16 +19,17 @@ import BatchChanges from './BatchChanges.mjs';
 
 function setupWatcher({
   callback,
+  context,
   watchDotfiles = false,
   ignorePaths = [],
   watchPaths,
-  minDelay = 500,
+  delay = 500,
 }) {
   return new Promise((resolve) => {
     // const { watch = [], watchIgnore = [] } = context.options;
     // const resolvedWatchPaths = watch.map((pathName) => path.resolve(pathName));
 
-    const batchChanges = new BatchChanges({ fn: callback, minDelay });
+    const batchChanges = new BatchChanges({ context, fn: callback, delay });
     const defaultIgnorePaths = watchDotfiles
       ? []
       : [

package/manager/watchers/envWatcher.mjs

@@ -13,20 +13,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-/* eslint-disable no-console */
 
 import path from 'path';
 import setupWatcher from '../utils/setupWatcher.mjs';
 
 function envWatcher(context) {
   const callback = async () => {
-    console.warn('.env file changed.');
+    context.logger.warn('.env file changed.');
     context.readDotEnv();
     await context.lowdefyBuild();
     context.restartServer();
   };
   return setupWatcher({
     callback,
+    context,
     watchDotfiles: true,
     watchPaths: [path.join(context.directories.config, '.env')],
   });

package/manager/watchers/lowdefyBuildWatcher.mjs

@@ -13,7 +13,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-/* eslint-disable no-console */
 
 import getLowdefyVersion from '../utils/getLowdefyVersion.mjs';
 import setupWatcher from '../utils/setupWatcher.mjs';
@@ -27,7 +26,7 @@ function lowdefyBuildWatcher(context) {
       const lowdefyVersion = await getLowdefyVersion(context);
       if (lowdefyVersion !== context.version && lowdefyVersion !== 'local') {
         context.shutdownServer();
-        console.warn('Lowdefy version changed. You should restart your development server.');
+        context.logger.warn('Lowdefy version changed. You should restart your development server.');
         process.exit();
       }
     }
@@ -37,7 +36,8 @@ function lowdefyBuildWatcher(context) {
   };
   return setupWatcher({
     callback,
-    ignorePaths: context.options.watchIgnore,
+    context,
+    ignorePaths: ['**/node_modules/**', ...context.options.watchIgnore],
     watchPaths: [context.directories.config, ...context.options.watch],
   });
 }

package/manager/watchers/nextBuildWatcher.mjs

@@ -13,7 +13,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-/* eslint-disable no-console */
 
 import crypto from 'crypto';
 import path from 'path';
@@ -76,6 +75,7 @@ async function nextBuildWatcher(context) {
     );
 
     if (!build) {
+      context.logger.info({ print: 'succeed' }, 'Reloaded app.');
       return;
     }
 
@@ -89,6 +89,7 @@ async function nextBuildWatcher(context) {
 
   return setupWatcher({
     callback,
+    context,
     watchDotfiles: true,
     watchPaths: watchedFiles.map((filePath) => path.join(context.directories.server, filePath)),
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-alpha.24",
+  "version": "4.0.0-alpha.27",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -39,34 +39,36 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-alpha.24",
-    "@lowdefy/api": "4.0.0-alpha.24",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.24",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.24",
-    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.24",
-    "@lowdefy/blocks-echarts": "4.0.0-alpha.24",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.24",
-    "@lowdefy/blocks-markdown": "4.0.0-alpha.24",
-    "@lowdefy/build": "4.0.0-alpha.24",
-    "@lowdefy/client": "4.0.0-alpha.24",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.24",
-    "@lowdefy/engine": "4.0.0-alpha.24",
-    "@lowdefy/helpers": "4.0.0-alpha.24",
-    "@lowdefy/layout": "4.0.0-alpha.24",
-    "@lowdefy/node-utils": "4.0.0-alpha.24",
-    "@lowdefy/operators-change-case": "4.0.0-alpha.24",
-    "@lowdefy/operators-diff": "4.0.0-alpha.24",
-    "@lowdefy/operators-js": "4.0.0-alpha.24",
-    "@lowdefy/operators-mql": "4.0.0-alpha.24",
-    "@lowdefy/operators-nunjucks": "4.0.0-alpha.24",
-    "@lowdefy/operators-uuid": "4.0.0-alpha.24",
-    "@lowdefy/operators-yaml": "4.0.0-alpha.24",
-    "@lowdefy/plugin-next-auth": "4.0.0-alpha.24",
+    "@lowdefy/actions-core": "4.0.0-alpha.27",
+    "@lowdefy/api": "4.0.0-alpha.27",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.27",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.27",
+    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.27",
+    "@lowdefy/blocks-echarts": "4.0.0-alpha.27",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.27",
+    "@lowdefy/blocks-markdown": "4.0.0-alpha.27",
+    "@lowdefy/blocks-qr": "4.0.0-alpha.27",
+    "@lowdefy/build": "4.0.0-alpha.27",
+    "@lowdefy/client": "4.0.0-alpha.27",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.27",
+    "@lowdefy/engine": "4.0.0-alpha.27",
+    "@lowdefy/helpers": "4.0.0-alpha.27",
+    "@lowdefy/layout": "4.0.0-alpha.27",
+    "@lowdefy/node-utils": "4.0.0-alpha.27",
+    "@lowdefy/operators-change-case": "4.0.0-alpha.27",
+    "@lowdefy/operators-diff": "4.0.0-alpha.27",
+    "@lowdefy/operators-js": "4.0.0-alpha.27",
+    "@lowdefy/operators-mql": "4.0.0-alpha.27",
+    "@lowdefy/operators-nunjucks": "4.0.0-alpha.27",
+    "@lowdefy/operators-uuid": "4.0.0-alpha.27",
+    "@lowdefy/operators-yaml": "4.0.0-alpha.27",
+    "@lowdefy/plugin-next-auth": "4.0.0-alpha.27",
     "chokidar": "3.5.3",
     "dotenv": "16.0.1",
     "next": "12.1.6",
     "next-auth": "4.10.3",
     "opener": "1.5.2",
+    "pino": "8.1.0",
     "process": "0.11.10",
     "react": "18.1.0",
     "react-dom": "18.1.0",
@@ -84,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7ae69eeb9a93964e2fb0bf08b7a21bee2636a630"
+  "gitHead": "02010edcce0f218c54cdbd08f28a60a08c36edfa"
 }

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

@@ -26,15 +26,11 @@ import providers from '../../../build/plugins/auth/providers.js';
 export const authOptions = getNextAuthConfig(
   { logger: console }, // TODO: make createApiContext synchronous
   { authJson, plugins: { adapters, callbacks, events, providers } }
-)
+);
 
-export default async function auth({ req, res }) {
+export default async function auth(req, res) {
   if (authJson.configured === true) {
-    return await NextAuth(
-      req,
-      res,
-      authOptions
-    );
+    return await NextAuth(req, res, authOptions);
   }
 
   return res.status(404).json({

package/manager/processes/startNextServer.mjs

@@ -1,44 +0,0 @@
-/*
-  Copyright 2020-2022 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 spawnProcess from '../utils/spawnProcess.mjs';
-
-function startServerProcess(context) {
-  context.shutdownServer();
-
-  const nextServer = spawnProcess({
-    logger: console,
-    command: 'node',
-    args: [context.bin.next, 'start'],
-    silent: false,
-    processOptions: {
-      env: {
-        ...process.env,
-        PORT: context.options.port,
-      },
-    },
-  });
-  // console.log(`Started server ${nextServer.pid}.`);
-  // nextServer.on('exit', (code, signal) => {
-  //   console.log(`nextServer exit ${nextServer.pid}, signal: ${signal}, code: ${code}`);
-  // });
-  nextServer.on('error', (error) => {
-    console.log(error);
-  });
-  context.nextServer = nextServer;
-}
-
-export default startServerProcess;

package/manager/utils/spawnProcess.mjs

@@ -1,55 +0,0 @@
-/*
-  Copyright 2020-2022 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 { spawn } from 'child_process';
-
-function spawnProcess({ logger, command, args, processOptions, silent }) {
-  const process = spawn(command, args, processOptions);
-
-  process.stdout.on('data', (data) => {
-    if (!silent) {
-      data
-        .toString('utf8')
-        .split('\n')
-        .forEach((line) => {
-          if (line) {
-            logger.log(line);
-          }
-        });
-    }
-  });
-
-  process.stderr.on('data', (data) => {
-    if (!silent) {
-      data
-        .toString('utf8')
-        .split('\n')
-        .forEach((line) => {
-          if (line) {
-            logger.warn(line);
-          }
-        });
-    }
-  });
-
-  process.on('error', (error) => {
-    throw error;
-  });
-
-  return process;
-}
-
-export default spawnProcess;