perf: Only copy scripts on plugin change and do not check the versions on every run

Author: florianPat

hooks/lando-copy-v3-scripts.js

@@ -7,8 +7,7 @@ module.exports = async lando => {
   return lando.Promise.map(lando.config.plugins, plugin => {
     if (fs.existsSync(plugin.scripts)) {
       const confDir = path.join(lando.config.userConfRoot, 'scripts');
-      const dest = require('../utils/move-config')(plugin.scripts, confDir);
-      require('../utils/make-executable')(fs.readdirSync(dest), dest);
+      require('../utils/move-config')(plugin.scripts, confDir);
       lando.log.debug('automoved scripts from %s to %s and set to mode 755', plugin.scripts, confDir);
     }
   });

hooks/lando-get-compat.js

@@ -5,11 +5,20 @@ const _ = require('lodash');
 module.exports = async lando => {
   // only run if engine bootstrap or above and if engine/orchestrator have been installed
   if (lando._bootstrapLevel >= 3) {
-    if (lando.engine.composeInstalled && lando.engine.dockerInstalled ) {
+    if (lando.engine.composeInstalled && lando.engine.dockerInstalled) {
+      if (!await lando.cache.isOlderThanMinutes('versions')) {
+        return;
+      }
+
       lando.engine.getCompatibility().then(results => {
         lando.log.verbose('checking docker version compatibility...');
         lando.log.debug('compatibility results', _.keyBy(results, 'name'));
-        lando.cache.set('versions', _.assign(lando.versions, _.keyBy(results, 'name')), {persist: true});
+        const lastLandoVersions = _.cloneDeep(lando.versions);
+        _.assign(lando.versions, _.keyBy(results, 'name'));
+        if (_.isEqual(lando.versions, lastLandoVersions)) {
+          return;
+        }
+        lando.cache.set('versions', lando.versions, {persist: true});
         lando.versions = lando.cache.get('versions');
       });
     }

index.js

@@ -81,7 +81,7 @@ module.exports = async lando => {
   lando.events.once('pre-install-plugins', async options => await require('./hooks/lando-setup-common-plugins')(lando, options));
 
   // move v3 scripts directories as needed
-  lando.events.on('pre-setup', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
+  lando.events.on('post-install-plugins', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
 
   // ensure we setup docker if needed
   lando.events.once('pre-setup', async options => await require(`./hooks/lando-setup-build-engine-${platform}`)(lando, options));
@@ -100,12 +100,6 @@ module.exports = async lando => {
   // ensure we setup landonet
   lando.events.once('pre-setup', async options => await require('./hooks/lando-setup-landonet')(lando, options));
 
-  // also move scripts for init considerations
-  lando.events.on('pre-init', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
-
-  // move v3 scripts directories as needed
-  lando.events.on('pre-init', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
-
   // set proxy config
   lando.events.on('post-bootstrap-config', async () => await require('./hooks/lando-set-proxy-config')(lando));
 
@@ -131,9 +125,6 @@ module.exports = async lando => {
   // autostart docker if we need to
   lando.events.once('engine-autostart', async () => await require('./hooks/lando-autostart-engine')(lando));
 
-  // move v3 scripts directories as needed
-  lando.events.on('pre-engine-start', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
-
   // clean networks
   lando.events.on('pre-engine-start', 1, async () => await require('./hooks/lando-clean-networks')(lando));
 

lib/cache.js

@@ -118,6 +118,18 @@ class Cache extends NodeCache {
       this.log.debug('No file cache with key %s', key);
     }
   }
+
+  async isOlderThanMinutes(key, minutes = 5) {
+    try {
+      const stats = await fs.stat(path.join(this.cacheDir, key));
+      const modifiedTime = stats.mtime;
+      const minutesAgo = Date.now() - minutes * 60 * 1000;
+
+      return modifiedTime.getTime() < minutesAgo;
+    } catch (err) {
+      return false;
+    }
+  }
 }
 
 /*

lib/daemon.js

@@ -223,7 +223,7 @@ module.exports = class LandoDaemon {
 
     // Return true if we get a zero response and cache the result
     try {
-      await require('../utils/run-command')(docker, ['ps'], {debug: this.debug});
+      await require('../utils/run-command')(docker, ['ps', '-q'], {debug: this.debug});
       this.debug('engine is up.');
       cache.set('engineup', true, {ttl: 5});
       this.isRunning = true;

tasks/plugin-add.js

@@ -84,6 +84,8 @@ module.exports = lando => {
         },
       });
 
+      await lando.events.emit('post-install-plugins', {errors, results, total});
+
       // status
       console.log();
       console.log('added %s of %s plugins with %s errors', results.length, total, errors.length); // eslint-disable-line max-len

tasks/plugin-remove.js

@@ -39,6 +39,8 @@ module.exports = lando => {
         },
       });
 
+      await lando.events.emit('post-install-plugins', {errors, results, total});
+
       // otherwise we good!
       console.log();
       console.log('removed %s of %s plugins with %s errors', results.length, total, errors.length); // eslint-disable-line max-len

tasks/update.js

@@ -157,6 +157,7 @@ module.exports = lando => {
         },
       });
 
+      await lando.events.emit('post-install-plugins', {errors, results});
       // flush relevant caches
       lando.cli.clearTaskCaches();
       lando.cache.remove('updates-2');