run-spaceapp 0.1.5 → 0.1.7

package/README.md

@@ -24,10 +24,15 @@ The launcher requires Node.js 20.11 or newer, 4 CPUs, 8 GB RAM, and 15 GiB free
 disk. If Docker is missing, `spaceapp install` automatically installs it from
 official Docker sources on Windows, macOS, Ubuntu, Debian, Fedora, RHEL, and
 CentOS, starts it, and waits for Engine and Compose readiness before pulling
-images. Docker Desktop license acceptance and Linux `docker` group membership
-require confirmation inside the same command. On Windows, approve the UAC
-prompt if WSL2 must be enabled. If Windows requests one restart, rerun the same
-command afterward and installation continues safely.
+images. Windows prefers Windows Package Manager's hash-pinned Docker Desktop
+manifest and retains a signed direct-download fallback. Docker Desktop license
+acceptance and Linux `docker` group membership require confirmation inside the
+same command. On Windows, approve any UAC prompt required by WSL2 or Docker
+Desktop. On Docker Desktop's first launch, select **Skip** in the top-right of
+the **Welcome to Docker** window (or sign in), accept any remaining Docker
+prompt, and keep the terminal open. SpaceApp waits for up to ten minutes and
+continues automatically when Docker is ready. If Windows requests one restart,
+rerun `spaceapp install` afterward and installation continues safely.
 
 The launcher selects the `light` profile below 12 GiB RAM and the `standard`
 profile otherwise; override this with `--profile light` or

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "run-spaceapp",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Cross-platform Docker launcher for the SpaceApp self-hosted agent workspace",
   "license": "Apache-2.0",
   "type": "module",
@@ -45,5 +45,5 @@
     "access": "public",
     "provenance": true
   },
-  "gitHead": "e5e8bcd4f3250068785181faa8152c6795f624c9"
+  "gitHead": "3f5612291d2aea84f1a763c8b094ec0f42208fd1"
 }

package/src/cli.mjs

@@ -35,6 +35,7 @@ const trustedCommands = new Set([
   "sg",
   "spctl",
   "sudo",
+  "winget.exe",
   "wsl.exe",
   "xdg-open"
 ]);
@@ -583,6 +584,7 @@ function spawnTrustedCommand(spec, options) {
     case "sg": return spawn("sg", args, options);
     case "spctl": return spawn("spctl", args, options);
     case "sudo": return spawn("sudo", args, options);
+    case "winget.exe": return spawn("winget.exe", args, options);
     case "wsl.exe": return spawn("wsl.exe", args, options);
     case "xdg-open": return spawn("xdg-open", args, options);
     default: throw new Error("SpaceApp refused to execute an untrusted command.");

package/src/prerequisites.mjs

@@ -19,6 +19,19 @@ const MAC_DOCKER_DOWNLOADS = Object.freeze({
   x64: "https://desktop.docker.com/mac/main/amd64/Docker.dmg",
   arm64: "https://desktop.docker.com/mac/main/arm64/Docker.dmg"
 });
+// Sources:
+// https://learn.microsoft.com/windows/package-manager/winget/install
+// https://github.com/microsoft/winget-pkgs/tree/master/manifests/d/Docker/DockerDesktop
+const WINDOWS_DOCKER_WINGET_ARGS = Object.freeze([
+  "install",
+  "--id", "Docker.DockerDesktop",
+  "--exact",
+  "--source", "winget",
+  "--silent",
+  "--accept-package-agreements",
+  "--accept-source-agreements",
+  "--disable-interactivity"
+]);
 
 export function windowsPowerShellArgs(operation) {
   const scripts = {
@@ -169,6 +182,35 @@ async function ensureWindowsDocker({
     }
   }
 
+  if (!application) {
+    const wingetCode = await execute(
+      { command: "winget.exe", args: ["--version"] },
+      { stdin, stdout: null, stderr: null }
+    );
+    if (wingetCode === 0) {
+      stdout.write(
+        "Installing Docker Desktop through Windows Package Manager with manifest hash verification...\n"
+      );
+      const installCode = await execute(
+        { command: "winget.exe", args: [...WINDOWS_DOCKER_WINGET_ARGS] },
+        { stdin, stdout, stderr }
+      );
+      if (installCode === 0) {
+        application = await firstExisting(paths.applications, pathExists);
+        if (!application) {
+          stderr.write(
+            "Windows Package Manager reported success, but Docker Desktop could not be found.\n"
+          );
+          return { code: 1, reexecuted: false };
+        }
+      } else {
+        stdout.write(
+          "Windows Package Manager could not install Docker Desktop; trying Docker's signed direct installer...\n"
+        );
+      }
+    }
+  }
+
   if (!application) {
     const downloadUrl = WINDOWS_DOCKER_DOWNLOADS[arch];
     if (!downloadUrl) {
@@ -220,6 +262,15 @@ async function ensureWindowsDocker({
   if (cliDirectory) {
     prependPath(env, cliDirectory);
   }
+  stdout.write(
+    "Opening Docker Desktop for its first-run setup.\n" +
+    "If Docker shows \"Welcome to Docker\", select \"Skip\" in the top-right (or sign in), and accept any remaining Docker prompt.\n" +
+    "Keep this terminal open; SpaceApp will continue automatically when Docker is ready (up to 10 minutes).\n"
+  );
+  await execute(
+    { command: "docker", args: ["desktop", "start", "--detach"] },
+    { stdin, stdout: null, stderr: null }
+  );
   const launchCode = await launch({
     operation: "start-docker-desktop",
     env: {
@@ -230,12 +281,12 @@ async function ensureWindowsDocker({
     stderr.write("Docker Desktop is installed, but SpaceApp could not start it.\n");
     return { code: launchCode, reexecuted: false };
   }
-  if (await waitForDocker({ execute, sleep })) {
+  if (await waitForDocker({ execute, sleep, attempts: 300 })) {
     stdout.write("Docker Desktop is ready.\n");
     return { code: 0, reexecuted: false };
   }
   stderr.write(
-    "Docker Desktop was installed but did not become ready. Complete any Docker Desktop prompt or restart Windows if requested, then run the same SpaceApp command again.\n"
+    "Docker Desktop did not become ready after 10 minutes. Open Docker Desktop and complete its first-run setup (select \"Skip\" on \"Welcome to Docker\" or sign in), restart Windows if requested, then run \"spaceapp install\" again.\n"
   );
   return { code: 1, reexecuted: false };
 }
@@ -653,12 +704,14 @@ function shellQuote(value) {
   return `'${String(value).replaceAll("'", "'\\''")}'`;
 }
 
-async function waitForDocker({ execute, sleep }) {
-  for (let attempt = 0; attempt < 90; attempt += 1) {
+async function waitForDocker({ execute, sleep, attempts = 90 }) {
+  for (let attempt = 0; attempt <= attempts; attempt += 1) {
     if (await dockerIsReady(execute)) {
       return true;
     }
-    await sleep(2_000);
+    if (attempt < attempts) {
+      await sleep(2_000);
+    }
   }
   return false;
 }