browser4-cli 0.1.15 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser4-cli",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Browser automation CLI for AI agents",
   "type": "module",
   "files": [

package/scripts/install-browser4-cli.ps1

@@ -154,12 +154,60 @@ function Get-DefaultInstallDir {
   throw "Unsupported OS"
 }
 
+# ──────────────────────────────────────────────
+# China mainland locale detection (zero-network)
+# ──────────────────────────────────────────────
+
+<#
+.SYNOPSIS
+  Detect whether the current system is likely in China mainland.
+  Uses only local env vars and .NET APIs — no network calls.
+#>
+function Test-ChinaLocale {
+  # 1 — Locale env vars
+  $lang = $env:LC_ALL, $env:LANG, $env:LC_CTYPE, $env:LC_MESSAGES | Where-Object { $_ } | Select-Object -First 1
+  if ($lang -and ($lang -match '^zh_CN' -or $lang -match '^zh-CN' -or $lang -match '^Chinese \(Simplified\)_China')) {
+    return $true
+  }
+
+  # 2 — TZ env var
+  $tzEnv = $env:TZ
+  if ($tzEnv -and ($tzEnv -match '^Asia/(Shanghai|Chongqing|Urumqi|Harbin)$')) {
+    return $true
+  }
+
+  # 3 — .NET TimeZoneInfo (works on Windows and Unix PowerShell 7+)
+  try {
+    $tzId = [System.TimeZoneInfo]::Local.Id
+    if ($tzId -match '^Asia/(Shanghai|Chongqing|Urumqi|Harbin)$') {
+      return $true
+    }
+  } catch {
+    # TimeZoneInfo not available (unlikely on PS 5.1+ but guard anyway)
+  }
+
+  # 4 — /etc/timezone (PowerShell on Linux/macOS)
+  if (-not $script:OSWin -and (Test-Path '/etc/timezone')) {
+    try {
+      $tz = Get-Content '/etc/timezone' -Raw -ErrorAction Stop
+      if ($tz -match '^Asia/(Shanghai|Chongqing|Urumqi|Harbin)$') {
+        return $true
+      }
+    } catch {
+      # Permission or read error — skip
+    }
+  }
+
+  return $false
+}
+
 # ──────────────────────────────────────────────
 # Download URLs
 # ──────────────────────────────────────────────
 
 $GITHUB_REPO = "platonai/Browser4"
 $OSS_BASE = "https://browser4.oss-cn-beijing.aliyuncs.com"
+$script:ChinaDetected = $false
 
 function Get-DownloadUrls {
   param([string]$BinaryName, [string]$VersionTag)
@@ -181,8 +229,13 @@ function Get-DownloadUrls {
   } elseif ($Source -eq "oss") {
     $urls += @{ Url = $ossUrl; Label = "Aliyun OSS" }
   } else {
-    $urls += @{ Url = $ghUrl; Label = "GitHub Releases" }
-    $urls += @{ Url = $ossUrl; Label = "Aliyun OSS" }
+    if ($script:ChinaDetected) {
+      $urls += @{ Url = $ossUrl; Label = "Aliyun OSS" }
+      $urls += @{ Url = $ghUrl; Label = "GitHub Releases" }
+    } else {
+      $urls += @{ Url = $ghUrl; Label = "GitHub Releases" }
+      $urls += @{ Url = $ossUrl; Label = "Aliyun OSS" }
+    }
   }
 
   return $urls
@@ -359,6 +412,14 @@ function Main {
   Write-Summary "╚════════════════════════════════════════╝" -Color Cyan
   Write-Summary ""
 
+  # Auto-detect China mainland locale when no explicit source is given
+  if (-not $Source) {
+    $script:ChinaDetected = Test-ChinaLocale
+    if ($script:ChinaDetected) {
+      Write-Step "China mainland locale detected: preferring Aliyun OSS mirror."
+    }
+  }
+
   # Detect platform
   $platformKey = Get-PlatformKey
   $binaryName = Get-BinaryName -PlatformKey $platformKey

package/scripts/install-browser4-cli.sh

@@ -36,6 +36,7 @@ SOURCE=""
 ADD_TO_PATH=true
 SILENT=false
 DRY_RUN=false
+CHINA_DETECTED=false
 
 # ──────────────────────────────────────────────
 # Helpers
@@ -110,6 +111,35 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+# ──────────────────────────────────────────────
+# China mainland locale detection (zero-network)
+# ──────────────────────────────────────────────
+
+detect_china_locale() {
+  # 1 — Locale env vars
+  local lang
+  lang="${LC_ALL:-${LANG:-${LC_CTYPE:-${LC_MESSAGES:-}}}}"
+  case "$lang" in
+    zh_CN*|zh-CN*|"Chinese (Simplified)_China"*) return 0 ;;
+  esac
+
+  # 2 — TZ env var
+  case "${TZ:-}" in
+    Asia/Shanghai|Asia/Chongqing|Asia/Urumqi|Asia/Harbin) return 0 ;;
+  esac
+
+  # 3 — /etc/timezone
+  if [[ -f /etc/timezone ]]; then
+    local tz
+    tz=$(cat /etc/timezone 2>/dev/null || true)
+    case "$tz" in
+      Asia/Shanghai|Asia/Chongqing|Asia/Urumqi|Asia/Harbin) return 0 ;;
+    esac
+  fi
+
+  return 1
+}
+
 # ──────────────────────────────────────────────
 # Platform detection
 # ──────────────────────────────────────────────
@@ -140,14 +170,34 @@ detect_libc() {
     return
   fi
 
-  # Check for musl
-  if ldd --version 2>&1 | grep -qi musl; then
-    echo "musl"
-  elif [[ -f /lib/ld-musl-x86_64.so.1 ]] || [[ -f /lib/ld-musl-aarch64.so.1 ]]; then
-    echo "musl"
-  else
-    echo ""
+  # Check for musl via ldd --version (guarded against missing ldd)
+  if command -v ldd >/dev/null 2>&1; then
+    if ldd --version 2>&1 | grep -qi musl; then
+      echo "musl"
+      return
+    fi
   fi
+
+  # Check for musl loader — covers common architectures
+  # x86_64, aarch64, armhf (32-bit ARM), i386, riscv64, s390x, ppc64le, mips64
+  local musl_loader
+  for musl_loader in \
+    /lib/ld-musl-x86_64.so.1 \
+    /lib/ld-musl-aarch64.so.1 \
+    /lib/ld-musl-armhf.so.1 \
+    /lib/ld-musl-i386.so.1 \
+    /lib/ld-musl-riscv64.so.1 \
+    /lib/ld-musl-s390x.so.1 \
+    /lib/ld-musl-ppc64le.so.1 \
+    /lib/ld-musl-mips64.so.1 \
+    /lib/ld-musl-mipsel.so.1; do
+    if [[ -f "$musl_loader" ]]; then
+      echo "musl"
+      return
+    fi
+  done
+
+  echo ""
 }
 
 get_platform_key() {
@@ -196,8 +246,14 @@ get_default_install_dir() {
 # ──────────────────────────────────────────────
 
 check_commands() {
-  if ! command -v curl >/dev/null 2>&1; then
-    die "'curl' is required but not found. Install curl and retry."
+  local missing=()
+  for cmd in curl mktemp stat awk grep ln mkdir chmod; do
+    if ! command -v "$cmd" >/dev/null 2>&1; then
+      missing+=("$cmd")
+    fi
+  done
+  if [[ ${#missing[@]} -gt 0 ]]; then
+    die "Required command(s) not found: ${missing[*]}. Install them and retry."
   fi
 }
 
@@ -219,8 +275,13 @@ get_download_urls() {
     github) urls+=("GitHub Releases|${gh_url}") ;;
     oss)    urls+=("Aliyun OSS|${oss_url}") ;;
     *)
-      urls+=("GitHub Releases|${gh_url}")
-      urls+=("Aliyun OSS|${oss_url}")
+      if [[ "$CHINA_DETECTED" == true ]]; then
+        urls+=("Aliyun OSS|${oss_url}")
+        urls+=("GitHub Releases|${gh_url}")
+      else
+        urls+=("GitHub Releases|${gh_url}")
+        urls+=("Aliyun OSS|${oss_url}")
+      fi
       ;;
   esac
 
@@ -240,10 +301,27 @@ download_file() {
     return 0
   fi
 
-  local http_code
+  local curl_stderr
+  curl_stderr=$(mktemp)
+  local http_code curl_exit
+
   http_code=$(curl -sSfL -w "%{http_code}" -o "$dest" \
     ${GITHUB_TOKEN:+-H "Authorization: Bearer $GITHUB_TOKEN"} \
-    "$url" 2>/dev/null) || true
+    "$url" 2>"$curl_stderr")
+  curl_exit=$?
+
+  if [[ $curl_exit -ne 0 ]]; then
+    local stderr_msg
+    stderr_msg=$(<"$curl_stderr")
+    rm -f "$curl_stderr" "$dest"
+    if [[ -n "$stderr_msg" ]]; then
+      warn "curl error (exit ${curl_exit}): ${stderr_msg}"
+    else
+      warn "curl failed with exit code ${curl_exit} (no stderr output)"
+    fi
+    return 1
+  fi
+  rm -f "$curl_stderr"
 
   if [[ "$http_code" == "200" ]] || [[ "$http_code" == "302" ]]; then
     local size
@@ -297,12 +375,38 @@ add_to_shell_rc() {
     return
   fi
 
+  # Ensure the file ends with a newline before appending, so the new
+  # content isn't glued to the last existing line.
+  if [[ -s "$rc_file" ]]; then
+    local last_byte
+    last_byte=$(tail -c1 "$rc_file" 2>/dev/null || true)
+    if [[ -n "$last_byte" ]]; then
+      echo "" >> "$rc_file"
+    fi
+  fi
+
+  # Use a lock file to prevent concurrent append races (best-effort).
+  local lock_file="${rc_file}.browser4-install.lock"
+  local lock_fd=9
+  # Wait up to 10 seconds for another install process to release the lock.
+  local waited=0
+  while ! (umask 0002 && command -v flock >/dev/null 2>&1 && flock -n 9 2>/dev/null); do
+    if [[ $waited -ge 10 ]]; then
+      warn "Could not acquire lock on ${rc_file} after 10s; appending anyway"
+      break
+    fi
+    sleep 0.5
+    waited=$((waited + 1))
+  done 9>"$lock_file"
+
   {
-    echo ""
     echo "# browser4-cli"
     echo "export PATH=\"$dir:\$PATH\""
   } >> "$rc_file"
 
+  # Clean up (flock auto-releases when fd 9 is closed)
+  rm -f "$lock_file" 2>/dev/null || true
+
   ok "Added to PATH in $rc_file"
   say "    Reload with: source $rc_file"
 }
@@ -361,6 +465,14 @@ main() {
   check_commands
   header
 
+  # Auto-detect China mainland locale when no explicit source is given
+  if [[ -z "$SOURCE" ]]; then
+    if detect_china_locale; then
+      CHINA_DETECTED=true
+      step "China mainland locale detected: preferring Aliyun OSS mirror."
+    fi
+  fi
+
   # Detect platform
   local platform_key binary_name
   platform_key=$(get_platform_key)

package/scripts/postinstall.js

@@ -45,9 +45,65 @@ const packageJson = JSON.parse(
 const version = packageJson.version;
 const commandNames = Object.keys(packageJson.bin || { 'browser4-cli': './bin/browser4-cli.js' });
 
-// GitHub release URL
+// ---------------------------------------------------------------------------
+// China mainland locale detection (zero-network — uses only local env / Intl)
+// ---------------------------------------------------------------------------
+
+function isChinaLocale() {
+  // 1 — Locale env vars (Unix, Git Bash, WSL, Docker)
+  const lang = process.env.LC_ALL
+    || process.env.LANG
+    || process.env.LC_CTYPE
+    || process.env.LC_MESSAGES
+    || '';
+  if (/^(?:zh_CN|zh-CN|Chinese \(Simplified\)_China)/i.test(lang)) {
+    return true;
+  }
+
+  // 2 — TZ env var (Docker, CI)
+  const tz = process.env.TZ || '';
+  if (/^Asia\/(Shanghai|Chongqing|Urumqi|Harbin)$/.test(tz)) {
+    return true;
+  }
+
+  // 3 — Intl timezone API (V8/Node.js, no filesystem access needed)
+  try {
+    const resolvedTz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    if (/^Asia\/(Shanghai|Chongqing|Urumqi|Harbin)$/.test(resolvedTz)) {
+      return true;
+    }
+  } catch {
+    // Intl not available (very old Node) — skip
+  }
+
+  return false;
+}
+
+// ---------------------------------------------------------------------------
+// Download URLs (locale-aware ordering)
+// ---------------------------------------------------------------------------
+
 const GITHUB_REPO = 'platonai/Browser4';
-const DOWNLOAD_URL = `https://github.com/${GITHUB_REPO}/releases/download/v${version}/${binaryName}`;
+const DOWNLOAD_URL_GITHUB = `https://github.com/${GITHUB_REPO}/releases/download/v${version}/${binaryName}`;
+const DOWNLOAD_URL_OSS = `https://browser4.oss-cn-beijing.aliyuncs.com/releases/download/v${version}/${binaryName}`;
+
+/**
+ * Return download URLs ordered by locale preference.  `BROWSER4_RELEASES_BASE_URL`
+ * takes precedence; otherwise China mainland users get OSS-first ordering.
+ */
+function getDownloadUrls() {
+  // Single-source override
+  const envOverride = (process.env.BROWSER4_RELEASES_BASE_URL || '').trim();
+  if (envOverride) {
+    const base = envOverride.replace(/\/+$/, '');
+    return [`${base}/download/v${version}/${binaryName}`];
+  }
+
+  if (isChinaLocale()) {
+    return [DOWNLOAD_URL_OSS, DOWNLOAD_URL_GITHUB];
+  }
+  return [DOWNLOAD_URL_GITHUB, DOWNLOAD_URL_OSS];
+}
 
 async function downloadFile(url, dest) {
   return new Promise((resolve, reject) => {
@@ -130,19 +186,31 @@ async function main() {
   }
 
   console.log(`Downloading native binary for ${platformKey}...`);
-  console.log(`URL: ${DOWNLOAD_URL}`);
 
-  try {
-    await downloadFile(DOWNLOAD_URL, binaryPath);
+  const urls = getDownloadUrls();
 
-    // Make executable on Unix
-    if (platform() !== 'win32') {
-      chmodSync(binaryPath, 0o755);
+  let lastError = null;
+  for (const url of urls) {
+    console.log(`URL: ${url}`);
+    try {
+      await downloadFile(url, binaryPath);
+
+      // Make executable on Unix
+      if (platform() !== 'win32') {
+        chmodSync(binaryPath, 0o755);
+      }
+
+      console.log(`✓ Downloaded native binary: ${binaryName}`);
+      lastError = null;
+      break;
+    } catch (err) {
+      console.log(`Download failed: ${err.message}`);
+      lastError = err;
     }
+  }
 
-    console.log(`✓ Downloaded native binary: ${binaryName}`);
-  } catch (err) {
-    console.log(`Could not download native binary: ${err.message}`);
+  if (lastError) {
+    console.log(`Could not download native binary from any mirror: ${lastError.message}`);
     console.log('');
     console.log('To build the native binary locally:');
     console.log('  1. Install Rust: https://rustup.rs');