@anvil-works/anvil-cli 0.4.3 → 0.5.1

package/dist/index.js

@@ -20042,7 +20042,8 @@ var __webpack_exports__ = {};
     }
     const configDefaults = {
         devMode: false,
-        verbose: false
+        verbose: false,
+        preferredEditor: ""
     };
     function isTestMode() {
         return "test" === process.env.NODE_ENV || !!process.env.RSTEST;
@@ -22721,6 +22722,7 @@ var __webpack_exports__ = {};
             });
             this.ws.on("error", (error)=>{
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Error: ${error.message}`);
+                if (this.isClosing) return;
                 if (error.message.includes("502")) logger_logger.error(chalk_source.red("WebSocket connection failed (502 Bad Gateway) - likely a temporary server issue"));
                 else logger_logger.error(chalk_source.red(`WebSocket error: ${error.message}`));
                 this.emit("error", {
@@ -22821,15 +22823,20 @@ var __webpack_exports__ = {};
         }
         teardownSocket() {
             this.stopHeartbeat();
-            if (!this.ws) return;
+            const socket = this.ws;
+            this.ws = null;
+            if (!socket) return;
             try {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing WebSocket");
-                this.ws.removeAllListeners();
-                if (this.ws.readyState === ws_wrapper.OPEN || this.ws.readyState === ws_wrapper.CONNECTING) this.ws.terminate();
+                if (socket.readyState === ws_wrapper.CONNECTING) {
+                    socket.once("error", ()=>{});
+                    socket.terminate();
+                    return;
+                }
+                if (socket.readyState === ws_wrapper.OPEN) return void socket.close();
             } catch (e) {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Error closing WebSocket (ignoring):", e);
             }
-            this.ws = null;
         }
     }
     async function detectRemoteChanges(gitService, oldCommitId, newCommitId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.4.3",
+  "version": "0.5.1",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,8 @@
     "anvil": "./dist/cli.js"
   },
   "files": [
-    "dist"
+    "dist",
+    "scripts/install"
   ],
   "publishConfig": {
     "access": "public"

package/scripts/install/install.cmd

@@ -0,0 +1,26 @@
+@echo off
+REM Source of truth: @anvil-works/anvil-cli (scripts/install/install.cmd).
+REM This script is synced into anvil website static install endpoints; do not edit the synced copy directly.
+setlocal
+
+set "SCRIPT_URL=%ANVIL_INSTALL_URL%"
+if not defined SCRIPT_URL set "SCRIPT_URL=https://anvil.works/install/anvil-cli/install.ps1"
+set "SCRIPT_PATH=%TEMP%\anvil-install-%RANDOM%%RANDOM%.ps1"
+
+where curl >nul 2>&1
+if errorlevel 1 (
+  echo Error: curl is required but was not found.
+  exit /b 1
+)
+
+curl -fsSL "%SCRIPT_URL%" -o "%SCRIPT_PATH%"
+if errorlevel 1 (
+  echo Error: failed to download installer from %SCRIPT_URL%
+  exit /b 1
+)
+
+powershell -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_PATH%"
+set "EXIT_CODE=%ERRORLEVEL%"
+
+del /q "%SCRIPT_PATH%" >nul 2>&1
+exit /b %EXIT_CODE%

package/scripts/install/install.ps1

@@ -0,0 +1,180 @@
+# Source of truth: @anvil-works/anvil-cli (scripts/install/install.ps1).
+# This script is synced into anvil website static install endpoints; do not edit the synced copy directly.
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version Latest
+
+$AnvilHome = if ($env:ANVIL_HOME) { $env:ANVIL_HOME } else { Join-Path $env:USERPROFILE '.anvil-cli' }
+$NodeDir = Join-Path $AnvilHome 'node-v20'
+$NpmPrefix = Join-Path $AnvilHome 'npm-global'
+$MinTargetMajor = 20
+
+function Write-Info([string] $Message) {
+    Write-Host $Message
+}
+
+function Fail([string] $Message) {
+    throw $Message
+}
+
+function Ensure-Directory([string] $Path) {
+    if (-not (Test-Path -LiteralPath $Path)) {
+        New-Item -ItemType Directory -Path $Path | Out-Null
+    }
+}
+
+function Get-PlatformArch {
+    if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_ARCHITEW6432 -eq 'ARM64') {
+        return 'arm64'
+    }
+    return 'x64'
+}
+
+function Get-NodeMajorFromPath {
+    if (-not (Get-Command node -ErrorAction SilentlyContinue)) {
+        return $null
+    }
+
+    $version = (& node -v).Trim()
+    if ($version -match '^v(\d+)') {
+        return [int]$Matches[1]
+    }
+
+    return $null
+}
+
+function Update-CurrentPath {
+    $env:Path = "$NpmPrefix;$NodeDir;$env:Path"
+}
+
+function Add-UserPathSegment([string] $Segment) {
+    $currentUserPath = [Environment]::GetEnvironmentVariable('Path', 'User')
+    if (-not $currentUserPath) {
+        [Environment]::SetEnvironmentVariable('Path', $Segment, 'User')
+        return
+    }
+
+    $parts = $currentUserPath -split ';' | Where-Object { $_ -ne '' }
+    if ($parts -contains $Segment) {
+        return
+    }
+
+    [Environment]::SetEnvironmentVariable('Path', "$Segment;$currentUserPath", 'User')
+}
+
+function Install-NodeV20 {
+    $arch = Get-PlatformArch
+    $baseUrl = 'https://nodejs.org/dist/latest-v20.x'
+    $sumsUrl = "$baseUrl/SHASUMS256.txt"
+
+    $tmpRoot = Join-Path ([System.IO.Path]::GetTempPath()) ("anvil-install-" + [System.Guid]::NewGuid().ToString('N'))
+    Ensure-Directory -Path $tmpRoot
+
+    try {
+        $sumsPath = Join-Path $tmpRoot 'SHASUMS256.txt'
+        Invoke-WebRequest -UseBasicParsing -Uri $sumsUrl -OutFile $sumsPath
+
+        $pattern = "node-v20\.[0-9]+\.[0-9]+-win-$arch\.zip$"
+        $archiveLine = Get-Content -LiteralPath $sumsPath | Where-Object { $_ -match $pattern } | Select-Object -First 1
+        if (-not $archiveLine) {
+            Fail "Could not resolve Node.js archive for win-$arch"
+        }
+
+        $tokens = $archiveLine -split '\s+'
+        $archiveName = $tokens[-1]
+        $archivePath = Join-Path $tmpRoot $archiveName
+        $archiveUrl = "$baseUrl/$archiveName"
+
+        Write-Info "Installing Node.js v20 for win-$arch..."
+        Invoke-WebRequest -UseBasicParsing -Uri $archiveUrl -OutFile $archivePath
+
+        $expectedHash = ($tokens | Where-Object { $_ -match '^[A-Fa-f0-9]{64}$' } | Select-Object -First 1)
+        if ($expectedHash) {
+            $actualHash = (Get-FileHash -Algorithm SHA256 -LiteralPath $archivePath).Hash.ToLowerInvariant()
+            if ($actualHash -ne $expectedHash.ToLowerInvariant()) {
+                Fail 'Checksum verification failed for Node.js archive'
+            }
+        }
+
+        if (Test-Path -LiteralPath $NodeDir) {
+            Remove-Item -LiteralPath $NodeDir -Recurse -Force
+        }
+
+        Expand-Archive -LiteralPath $archivePath -DestinationPath $tmpRoot -Force
+        $expandedRoot = Get-ChildItem -LiteralPath $tmpRoot -Directory | Where-Object { $_.Name -like 'node-v20.*-win-*' } | Select-Object -First 1
+        if (-not $expandedRoot) {
+            Fail 'Failed to locate extracted Node.js directory'
+        }
+
+        Move-Item -LiteralPath $expandedRoot.FullName -Destination $NodeDir
+    }
+    finally {
+        if (Test-Path -LiteralPath $tmpRoot) {
+            Remove-Item -LiteralPath $tmpRoot -Recurse -Force
+        }
+    }
+}
+
+function Ensure-Node {
+    $major = Get-NodeMajorFromPath
+    if ($major -and $major -ge $MinTargetMajor) {
+        $version = (& node -v).Trim()
+        Write-Info "Using existing Node.js $version"
+        return
+    }
+
+    if ($major) {
+        Write-Info "Existing Node.js major v$major is too old; installing Node.js v20 user-local"
+    }
+
+    Ensure-Directory -Path $AnvilHome
+    Install-NodeV20
+}
+
+function Ensure-Npm {
+    $npmCmd = Join-Path $NodeDir 'npm.cmd'
+    if (Test-Path -LiteralPath $npmCmd) {
+        return $npmCmd
+    }
+
+    if (Get-Command npm -ErrorAction SilentlyContinue) {
+        return 'npm'
+    }
+
+    Fail 'npm is unavailable after Node.js setup'
+}
+
+function Main {
+    Ensure-Directory -Path $AnvilHome
+    Ensure-Directory -Path $NpmPrefix
+
+    Ensure-Node
+
+    Update-CurrentPath
+    Add-UserPathSegment -Segment $NodeDir
+    Add-UserPathSegment -Segment $NpmPrefix
+
+    $npm = Ensure-Npm
+
+    Write-Info 'Installing anvil-cli...'
+    & $npm config set prefix "$NpmPrefix"
+    & $npm install -g @anvil-works/anvil-cli@latest
+
+    $anvilCmd = Join-Path $NpmPrefix 'anvil.cmd'
+    if (-not (Test-Path -LiteralPath $anvilCmd)) {
+        $anvilCmd = 'anvil'
+    }
+
+    try {
+        $version = (& $anvilCmd --version).Trim()
+    }
+    catch {
+        Fail "anvil installed but command verification failed: $($_.Exception.Message)"
+    }
+
+    Write-Info ''
+    Write-Info "anvil-cli installed successfully (v$version)"
+    Write-Info "Next step: run 'anvil onboard'"
+    Write-Info "If your current terminal cannot find 'anvil', start a new terminal session."
+}
+
+Main

package/scripts/install/install.sh

@@ -0,0 +1,151 @@
+#!/usr/bin/env sh
+# Source of truth: @anvil-works/anvil-cli (scripts/install/install.sh).
+# This script is synced into anvil website static install endpoints; do not edit the synced copy directly.
+set -eu
+
+ANVIL_HOME="${ANVIL_HOME:-$HOME/.anvil-cli}"
+NODE_DIR="$ANVIL_HOME/node-v20"
+NPM_PREFIX="$ANVIL_HOME/npm-global"
+MIN_NODE_MAJOR=20
+
+log() {
+    printf '%s\n' "$*"
+}
+
+fail() {
+    printf 'Error: %s\n' "$*" >&2
+    exit 1
+}
+
+need_cmd() {
+    command -v "$1" >/dev/null 2>&1 || fail "Required command not found: $1"
+}
+
+append_path_export() {
+    profile_file="$1"
+    line='export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"'
+
+    [ -f "$profile_file" ] || touch "$profile_file"
+    grep -F "$line" "$profile_file" >/dev/null 2>&1 || {
+        printf '\n%s\n' "$line" >> "$profile_file"
+    }
+}
+
+persist_path_hint() {
+    append_path_export "$HOME/.profile"
+
+    if [ -n "${ZSH_VERSION:-}" ] || [ "${SHELL:-}" = "$(command -v zsh 2>/dev/null || true)" ]; then
+        append_path_export "$HOME/.zshrc"
+    fi
+
+    if [ -n "${BASH_VERSION:-}" ] || [ "${SHELL:-}" = "$(command -v bash 2>/dev/null || true)" ]; then
+        append_path_export "$HOME/.bashrc"
+    fi
+}
+
+detect_platform() {
+    os_name="$(uname -s)"
+    arch_name="$(uname -m)"
+
+    case "$os_name" in
+        Darwin) platform_os="darwin" ;;
+        Linux) platform_os="linux" ;;
+        *) fail "Unsupported OS: $os_name (only macOS and Linux are supported)" ;;
+    esac
+
+    case "$arch_name" in
+        x86_64|amd64) platform_arch="x64" ;;
+        arm64|aarch64) platform_arch="arm64" ;;
+        *) fail "Unsupported architecture: $arch_name" ;;
+    esac
+}
+
+node_version_major() {
+    node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/'
+}
+
+install_node_v20() {
+    detect_platform
+    need_cmd curl
+    need_cmd tar
+
+    base_url="https://nodejs.org/dist/latest-v20.x"
+    sums_url="$base_url/SHASUMS256.txt"
+    tmp_dir="$(mktemp -d)"
+    trap 'rm -rf "$tmp_dir"' EXIT INT TERM
+
+    log "Installing Node.js v20 for $platform_os-$platform_arch..."
+    curl -fsSL "$sums_url" -o "$tmp_dir/SHASUMS256.txt"
+
+    archive_name="$(grep -E "node-v20\\.[0-9]+\\.[0-9]+-$platform_os-$platform_arch\\.tar\\.xz$" "$tmp_dir/SHASUMS256.txt" | awk '{print $2}' | head -n1)"
+    [ -n "$archive_name" ] || fail "Could not resolve Node.js archive for $platform_os-$platform_arch"
+
+    archive_url="$base_url/$archive_name"
+    archive_path="$tmp_dir/$archive_name"
+
+    curl -fsSL "$archive_url" -o "$archive_path"
+
+    if command -v shasum >/dev/null 2>&1; then
+        expected_sum="$(grep "  $archive_name$" "$tmp_dir/SHASUMS256.txt" | awk '{print $1}' | head -n1)"
+        actual_sum="$(shasum -a 256 "$archive_path" | awk '{print $1}')"
+        [ "$expected_sum" = "$actual_sum" ] || fail "Checksum verification failed for Node.js archive"
+    elif command -v sha256sum >/dev/null 2>&1; then
+        expected_sum="$(grep "  $archive_name$" "$tmp_dir/SHASUMS256.txt" | awk '{print $1}' | head -n1)"
+        actual_sum="$(sha256sum "$archive_path" | awk '{print $1}')"
+        [ "$expected_sum" = "$actual_sum" ] || fail "Checksum verification failed for Node.js archive"
+    else
+        log "Warning: no sha256 tool found; skipping checksum verification"
+    fi
+
+    rm -rf "$NODE_DIR"
+    mkdir -p "$NODE_DIR"
+    tar -xJf "$archive_path" -C "$NODE_DIR" --strip-components=1
+}
+
+ensure_node() {
+    if command -v node >/dev/null 2>&1; then
+        major="$(node_version_major || true)"
+        if [ -n "$major" ] && [ "$major" -ge "$MIN_NODE_MAJOR" ]; then
+            log "Using existing Node.js $(node -v)"
+            return
+        fi
+        log "Existing Node.js $(node -v) is too old; installing Node.js v20 user-local"
+        install_node_v20
+        return
+    fi
+
+    install_node_v20
+}
+
+main() {
+    need_cmd curl
+    need_cmd tar
+
+    mkdir -p "$ANVIL_HOME" "$NPM_PREFIX"
+
+    ensure_node
+
+    export PATH="$NPM_PREFIX/bin:$NODE_DIR/bin:$PATH"
+    persist_path_hint
+
+    need_cmd npm
+
+    log "Installing anvil-cli..."
+    npm config set prefix "$NPM_PREFIX" >/dev/null
+    NPM_CONFIG_PREFIX="$NPM_PREFIX" npm install -g @anvil-works/anvil-cli@latest
+
+    if command -v anvil >/dev/null 2>&1; then
+        version="$(anvil --version 2>/dev/null || true)"
+    elif [ -x "$NPM_PREFIX/bin/anvil" ]; then
+        version="$($NPM_PREFIX/bin/anvil --version 2>/dev/null || true)"
+    else
+        fail "anvil installed but command not found on PATH"
+    fi
+
+    log ""
+    log "anvil-cli installed successfully${version:+ (v$version)}"
+    log "Next step: run 'anvil onboard'"
+    log "If your current shell cannot find 'anvil', open a new terminal session."
+}
+
+main "$@"