rework daemon to accomodate new docker desktop cli commands

Author: pirog

.github/workflows/pr-setup-macos-tests.yml

@@ -63,11 +63,7 @@ jobs:
           stdin: true
       - name: docker desktop cli tests
         run: |
-          lando setup -y --debug --skip-networking --skip-common-plugins
-          docker desktop version || true
-          /Applications/Docker.app/Contents/Resources/bin/docker desktop version || true
-          /Applications/Docker.app/Contents/Resources/bin/docker desktop status || true
-          /Applications/Docker.app/Contents/Resources/bin/docker desktop start || true
-          /Applications/Docker.app/Contents/Resources/bin/docker desktop status || true
-          docker desktop status || true
           lando setup -y --debug --skip-common-plugins
+          # docker desktop start --timeout 60
+          # docker desktop status
+          # lando setup -y --debug --skip-common-plugins

.github/workflows/pr-setup-windows-tests.yml

@@ -60,3 +60,10 @@ jobs:
           shell: powershell
           stdin: true
           debug: true
+      - name: docker desktop cli tests
+        shell: powershell
+        run: |
+          lando setup -y --debug --skip-common-plugins
+          # docker desktop start --timeout 60
+          # docker desktop status
+          # lando setup -y --debug --skip-common-plugins

examples/setup-windows/README.md

@@ -11,6 +11,7 @@ Run the following commands to validate things are rolling as they should.
 ```bash
 # Should dogfood the core plugin we are testing against
 lando plugin-add "@lando/core@file:../.."
+```
 
 # Should be able to run lando setup
 lando setup -y --skip-networking --skip-common-plugins
@@ -27,4 +28,3 @@ Test-Path "$HOME/.lando/certs/LandoCA.crt"
 
 # Should have installed the Lando Development CA
 certutil -store Root | findstr /C:"Lando Development CA"
-```

lib/daemon.js

@@ -6,6 +6,7 @@ const fs = require('fs');
 const getDockerBinPath = require('../utils/get-docker-bin-path');
 const os = require('os');
 const path = require('path');
+const semver = require('semver');
 
 const Cache = require('./cache');
 const Events = require('./events');
@@ -77,7 +78,7 @@ module.exports = class LandoDaemon {
    * @fires post_engine_up
    * @return {Promise} A Promise.
    */
-  up(retry = true, password) {
+  async up(retry = true, password) {
     const debug = require('../utils/debug-shim')(this.log);
 
     // backwards compat
@@ -91,48 +92,66 @@ module.exports = class LandoDaemon {
      * @since 3.0.0
      * @event pre_engine_up
      */
-    return this.events.emit('pre-engine-up').then(() => {
-      // Automatically return true if we are in the GUI and on linux because
-      // this requires SUDO and because the daemon should always be running on nix
-      if (this.context !== 'node' && this.platform === 'linux') return Promise.resolve(true);
+    await this.events.emit('pre-engine-up');
+
+    // Automatically return true if we are in the GUI and on linux because
+    // this requires SUDO and because the daemon should always be running on nix
+    if (this.context !== 'node' && this.platform === 'linux') return Promise.resolve(true);
+
+    // retry func
+    const starter = async () => {
+      return await this.isUp().then(async isUp => {
+        // if we are already up then we are done
+        if (isUp) return Promise.resolve();
 
-      // retry func
-      const starter = async () => {
-        return await this.isUp().then(async isUp => {
-          if (isUp) return Promise.resolve();
+        try {
+          switch (this.platform) {
+            // docker engine
+            case 'linux': {
+              const lscript = path.join(this.scriptsDir, 'docker-engine-start.sh');
+              if (password) await require('../utils/run-elevated')([lscript], {debug, password});
+              else await require('../utils/run-command')(lscript, {debug});
+              break;
+            }
+
+            // docker desktop
+            case 'darwin':
+            case 'win32':
+            case 'wsl': {
+              // get version information
+              const {desktop} = await this.getVersions();
 
-          try {
-            switch (this.platform) {
-              case 'darwin':
+              // if desktop version is >=4.37.1 then use docker desktop cli
+              if (semver.gte(desktop, '4.37.0', {includePrerelease: true, loose: true})) {
+                await require('../utils/run-command')('docker', ['desktop', 'start'], {debug: this.debug});
+
+              // otherwise mac fallback
+              } else if (this.platform === 'darwin') {
                 await require('../utils/run-command')('open', [MACOS_BASE], {debug: this.debug});
-                break;
-              case 'linux': {
-                const lscript = path.join(this.scriptsDir, 'docker-engine-start.sh');
-                if (password) await require('../utils/run-elevated')([lscript], {debug, password});
-                else await require('../utils/run-command')(lscript, {debug});
-                break;
-              }
-              case 'win32':
-              case 'wsl': {
+
+              // otherwise windows/wsl fallback
+              } else {
                 const wscript = path.join(this.scriptsDir, 'docker-desktop-start.ps1');
                 await require('../utils/run-powershell-script')(wscript, undefined, {debug: this.debug});
                 await require('delay')(2000);
-                break;
               }
-            }
 
-            this.debug('build engine started but waiting to connect...');
-            return Promise.reject();
-          } catch (error) {
-            this.debug('could not start build engine with %o', error?.message);
-            this.debug('%j', error);
-            return Promise.reject(error);
+              break;
+            }
           }
-        });
-      };
 
-      return Promise.retry(starter, retry);
-    })
+          this.debug('build engine started but waiting to connect...');
+          return Promise.reject();
+        } catch (error) {
+          this.debug('could not start build engine with %o', error?.message);
+          this.debug('%j', error);
+          return Promise.reject(error);
+        }
+      });
+    };
+
+    // try to start
+    await Promise.retry(starter, retry);
 
     /*
      * Not officially documented event that allows you to do some things after
@@ -141,7 +160,7 @@ module.exports = class LandoDaemon {
      * @since 3.0.0
      * @event post_engine_up
      */
-    .then(() => this.events.emit('post-engine-up'));
+    await this.events.emit('post-engine-up');
   }
 
   down() {