A4 (#85)

* removed dayjs, debuggified winston, removed bundledDependencies

* this is a good commit

* bump to latest @lando/prepare-release-action@v3

* fix tests

* fix tests part 2

Author: pirog

.github/workflows/pr-core-tests.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Install dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile
       - name: Bundle Deps
-        uses: lando/prepare-release-action@v2
+        uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
           version: dev

.github/workflows/pr-plugin-tests.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Install dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile
       - name: Bundle Deps
-        uses: lando/prepare-release-action@v2
+        uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
           version: dev

.github/workflows/release.yml

@@ -17,6 +17,7 @@ jobs:
           - ubuntu-20.04
         node-version:
           - "18"
+
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -36,7 +37,7 @@ jobs:
       - name: Run unit tests
         run: npm run test:unit
       - name: Prepare Release
-        uses: lando/prepare-release-action@v2
+        uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
 

CHANGELOG.md

@@ -23,12 +23,15 @@
 ### Internal
 
 * Added `app.addMessage` for more granular and accessible post-start app status reporting
+* Changed `lando.log` and `app.log` to be more like `debug`
 * Bumped minimum `node` version to `18`
-* Bumped supported Docker Desktop version to `>4 <4.26`
+* Bumped supported Docker Desktop version to `>4 <4.27`
 * Removed lingering and dangling should-now-be-in-plugins code eg `_drupaly.js`
 * Reorganized core to be more like `@lando/core-next` (eg Lando 4)
 * Switched (fully, finally) from `github` to `@octokit/rest`
 * Switched plugin package manager to `npm`
+* Removed `bundledDependencies` from `package.json`, now handled by `@lando/prepare-release-action@v3`
+* Removed `dayjs` dependency
 * Removed `github` dependency
 * Removed `mkdirp` dependency
 

components/plugin.js

@@ -270,7 +270,7 @@ class Plugin {
   async check4Update() {
     // if plugin is not updateable then immediately return
     if (!this.isUpdateable) {
-      this.debug('%o is not updateable, update manually', this.name);
+      this.debug('is not updateable, update manually');
       return this;
     }
 
@@ -295,7 +295,7 @@ class Plugin {
 
       // if the hv is lte to what we have then no update is available
       if (semver.lte(hv, this.version)) {
-        this.debug('%o cannot be updated on channel %o (%o <= %o)', this.package, channel, hv, this.version);
+        this.debug('cannot be updated on channel %o (%o <= %o)', this.package, channel, hv, this.version);
         return this;
 
       // otherwise update is available
@@ -304,7 +304,7 @@ class Plugin {
         this.update = await Plugin.info(this.updateAvailable);
         this.update.channel = hc;
         this.debug(
-          '%o can be updated to %o on channel %o (%o > %o) ',
+          'can be updated to %o on channel %o (%o > %o) ',
           this.package,
           this.updateAvailable,
           channel,

examples/base/README.md

@@ -87,11 +87,12 @@ lando info -vv | grep VERBOSE || echo $? | grep 1
 lando info -vvv | grep DEBUG || echo $? | grep 1
 lando info -vvvv | grep SILLY || echo $? | grep 1
 
-# Should run with specified verbosity on stderr
-lando info -v 2>&1 | grep INFO
-lando info -vv 2>&1 | grep VERBOSE
-lando info -vvv 2>&1 | grep DEBUG
-lando info -vvvv 2>&1 | grep SILLY
+# Should run all log levels on stderr
+lando info -v 2>&1 | grep lando | grep + | grep ms
+lando info -vv 2>&1 | grep lando | grep + | grep ms
+lando info -vvv 2>&1 | grep lando | grep + | grep ms
+lando info -vvvv 2>&1 | grep lando | grep + | grep ms
+lando info --debug 2>&1 | grep lando | grep + | grep ms
 
 # Should run lando config without error
 lando config

hooks/app-check-for-updates.js

@@ -3,6 +3,11 @@
 module.exports = async (app, lando) => {
   if (lando.config.channel !== 'none' && !lando.cache.get('updates-2')) {
     lando.log.debug('checking for updates...');
+    // add the plugins and install dir
+    const dir = lando.config.pluginDirs.find(dir => dir.type === require('../utils/get-plugin-type')());
+    lando.updates.plugins = lando.config.plugins;
+    lando.updates.dir = dir ? dir.dir : undefined;
+
     const tasks = await lando.updates.getUpdateTasks();
     // next check in a day
     const expires = Date.now() + 60 * 60 * 24 * 1000;

index.js

@@ -86,10 +86,10 @@ module.exports = async lando => {
   lando.events.on('almost-ready', 2, async () => await require('./hooks/lando-get-compat')(lando));
 
   // throw error if engine/orchestrator is not available
-  lando.events.on('engine-autostart', 1, async () => await require('./hooks/lando-dep-check')(lando));
+  lando.events.once('pre-engine-autostart', async () => await require('./hooks/lando-dep-check')(lando));
 
   // autostart docker if we need to
-  lando.events.on('engine-autostart', 2, async () => await require('./hooks/lando-autostart-engine')(lando));
+  lando.events.once('engine-autostart', async () => await require('./hooks/lando-autostart-engine')(lando));
 
   // Make sure we have a host-exposed root ca if we don't already
   // NOTE: we don't run this on the caProject otherwise infinite loop happens!

lib/lando.js

@@ -89,11 +89,6 @@ const bootstrapConfig = async lando => {
   // log
   if (!_.isEmpty(removed)) lando.log.debug('removed duplicate plugin entries %o', removed);
 
-  // add the plugins and install dir
-  const dir = lando.config.pluginDirs.find(dir => dir.type === require('../utils/get-plugin-type')());
-  lando.updates.plugins = plugins;
-  lando.updates.dir = dir ? dir.dir : undefined;
-
   // he who remains
   return plugins;
 };

lib/logger.js

@@ -2,12 +2,11 @@
 
 // Modules
 const _ = require('lodash');
-const dayjs = require('dayjs');
 const fs = require('fs');
 const path = require('path');
 const serialize = require('winston/lib/winston/common').serialize;
-const util = require('util');
 const winston = require('winston');
+const util = require('util');
 
 // Constants
 const logLevels = {
@@ -28,12 +27,10 @@ const logColors = {
   timestamp: 'magenta',
   lando: 'cyan',
   app: 'green',
+  extra: 'dim',
 };
 const userLevels = ['warn', 'error'];
 
-// Maxsize
-let fcw = 0;
-
 // Rewriters
 const keySanitizer = sanitizeKey => (level, msg, meta) => {
   // start with a deep clone of meta so we dont mutate important underlying data
@@ -143,34 +140,44 @@ const keySanitizer = sanitizeKey => (level, msg, meta) => {
  * lando.log.warning('Something is up with app %s in directory %s', appName, dir);
  */
 module.exports = class Log extends winston.Logger {
-  constructor({logDir, logLevelConsole = 'warn', logLevel = 'debug', logName = 'lando'} = {}) {
+  constructor({logDir, extra, logLevelConsole = 'warn', logLevel = 'debug', logName = 'lando'} = {}) {
     // If loglevelconsole is numeric lets map it!
     if (_.isInteger(logLevelConsole)) logLevelConsole = logLevels[logLevelConsole];
 
     // The default console transport
     const transports = [
       new winston.transports.Console({
-        timestamp: () => dayjs().format('HH:mm:ss'),
+        timestamp: () => Date.now(),
         formatter: options => {
           // Get da prefixes
           const element = (logName === 'lando') ? 'lando' : logName;
           const elementColor = (logName === 'lando') ? 'lando' : 'app';
-          // Set the leftmost column width
-          fcw = _.max([fcw, _.size(element)]);
-          // Default output
-          const output = [
-            winston.config.colorize(elementColor, _.padEnd(element.toLowerCase(), fcw)),
-            winston.config.colorize('timestamp', options.timestamp()),
-            winston.config.colorize(options.level, options.level.toUpperCase()),
-            '==>',
-            util.format(options.message),
-            serialize(options.meta),
-          ];
-          // If this is a warning or error and we aren't verbose then omit prefixes
+
+          //  approximate debug mod timestamp
+          const curr = Number(new Date());
+          const ms = curr - (this.lasttime || curr);
+          this.lasttime = curr;
+
+          // build useful things first
+          const prefix = winston.config.colorize(elementColor, element.toLowerCase());
+          const level = winston.config.colorize(options.level, options.level.toUpperCase());
+          const msg = util.format(options.message);
+          const meta = serialize(options.meta);
+          const timestamp = winston.config.colorize(elementColor, `+${ms}ms`);
+
+          // If this is a warning or error and we aren't verbose then we have more "normal" output
           if (_.includes(userLevels, options.level) && _.includes(userLevels, logLevelConsole)) {
-            return _.drop(output, 2).join(' ');
+            return [level, '==>', msg].join(' ');
           }
-          return output.join(' ');
+
+          // debug output
+          const output = [prefix, msg, meta, timestamp];
+          // if we have extra stuff
+          if (typeof extra === 'string') output.splice(1, 0, winston.config.colorize('extra', extra.toLowerCase()));
+          // if error or warning then try to make it more obvious by splicing in the level
+          if (_.includes(userLevels, options.level)) output.splice(1, 0, level);
+          // return
+          return `  ${output.join(' ')}`;
         },
         label: logName,
         level: logLevelConsole,
@@ -204,10 +211,15 @@ module.exports = class Log extends winston.Logger {
     // Get the winston logger
     super({transports: transports, exitOnError: true, colors: logColors});
 
+    // set initial timestamp
+    this.lasttime = Date.now();
     // Extend with special lando things
     this.sanitizedKeys = ['auth', 'token', 'password', 'key', 'api_key', 'secret', 'machine_token'];
     // Loop through our sanitizedKeys and add sanitation
     _.forEach(this.sanitizedKeys, key => this.rewriters.push(keySanitizer(key)));
+
+    // save the initial config for shiming
+    this.shim = {logDir, extra, logLevelConsole, logLevel, logName};
   };
 
   // Method to help other things add sanitizations