browser4-cli 4.14.0-rc.4 → 4.14.0-rc.6

package/scripts/tests/install-browser4-cli.tests.sh

@@ -27,8 +27,8 @@ dim()    { echo -e "\033[2m$*\033[0m"; }
 
 test() {
     local name="$1"
-    local fn="$2"
-    if "$fn"; then
+    shift
+    if "$@"; then
         PASS=$((PASS + 1))
         green "  PASS  $name"
     else
@@ -109,26 +109,65 @@ test "--source invalid rejected" bash -c "
     bash '$INSTALL_SCRIPT' --source invalid --dry-run 2>&1 | grep -qi 'github.*oss\|must be'
 "
 
+test "--version rejects a following option as its value" bash -c "
+    rc=0
+    out=\$(bash '$INSTALL_SCRIPT' --version --dry-run 2>&1) || rc=\$?
+    [[ \$rc -ne 0 ]] && echo \"\$out\" | grep -q 'requires a value'
+"
+
+test "--install-dir rejects a following option as its value" bash -c "
+    rc=0
+    out=\$(bash '$INSTALL_SCRIPT' --install-dir --silent 2>&1) || rc=\$?
+    [[ \$rc -ne 0 ]] && echo \"\$out\" | grep -q 'requires a value'
+"
+
+test "--version accepts a bare semver and prefixes it with v" bash -c "
+    bash '$INSTALL_SCRIPT' --locate --version 4.13.18 2>&1 | grep -q 'releases/download/v4\.13\.18/'
+"
+
+test "--version with the v prefix is left untouched" bash -c "
+    bash '$INSTALL_SCRIPT' --locate --version v4.13.18 2>&1 | grep -q 'releases/download/v4\.13\.18/'
+"
+
 test "--dry-run flag accepted" bash -c "
-    bash '$INSTALL_SCRIPT' --dry-run 2>&1 | grep -qi 'DRY-RUN\|dry-run\|Install'
+    bash '$INSTALL_SCRIPT' --dry-run 2>&1 | grep -q 'DRY-RUN'
 "
 
-test "--silent flag accepted" bash -c "
-    bash '$INSTALL_SCRIPT' --silent --dry-run 2>&1 | grep -v '^$' | head -1 | grep -qv '→\|step'
+test "--silent suppresses progress output" bash -c "
+    out=\$(bash '$INSTALL_SCRIPT' --silent --dry-run 2>&1)
+    echo \"\$out\" | grep -q 'DRY-RUN' && ! echo \"\$out\" | grep -q 'Install:'
 "
 
 test "--skip-local flag accepted" bash -c "
-    bash '$INSTALL_SCRIPT' --skip-local --dry-run 2>&1 | grep -qi 'skip\|DRY-RUN\|Already\|Install'
+    bash '$INSTALL_SCRIPT' --skip-local --dry-run 2>&1 | grep -q 'Skipping local binary check'
 "
 
 test "--no-path flag accepted" bash -c "
-    bash '$INSTALL_SCRIPT' --no-path --dry-run 2>&1 | grep -vq 'Added to PATH'
+    ! bash '$INSTALL_SCRIPT' --no-path --dry-run 2>&1 | grep -q 'Added to PATH'
 "
 
 test "unknown arg rejected" bash -c "
     bash '$INSTALL_SCRIPT' --bogus-flag 2>&1 | grep -q 'Unknown argument'
 "
 
+# A PATH that has everything the diagnostics need except the download tooling.
+# `--locate` must still answer; a real install must refuse with a clear message
+# instead of failing later with 'curl: command not found'.
+minimal_path_locate_works() {
+    local dir; dir="$(mktemp -d)"
+    local bash_bin; bash_bin=$(command -v bash)
+    local tool tool_path
+    for tool in uname stat cat grep awk sed dirname basename tr od; do
+        tool_path=$(command -v "$tool") && ln -sf "$tool_path" "$dir/$tool"
+    done
+    local locate_rc=0 install_rc=0
+    PATH="$dir" "$bash_bin" "$INSTALL_SCRIPT" --locate >/dev/null 2>&1 || locate_rc=$?
+    PATH="$dir" "$bash_bin" "$INSTALL_SCRIPT" --dry-run --no-path >/dev/null 2>&1 || install_rc=$?
+    rm -rf "$dir"
+    [[ $locate_rc -eq 0 ]] && [[ $install_rc -ne 0 ]]
+}
+test "--locate needs no download tooling, installing does" minimal_path_locate_works
+
 echo ""
 
 # ── Locate mode ────────────────────────────────────────
@@ -191,6 +230,103 @@ test "OSS URL NOT using broken download/latest pattern" bash -c "
 
 echo ""
 
+# ── Download integrity (stubbed curl -- no network) ────
+
+echo "--- Download integrity ---" | cyan
+
+STUB_DIR="$(mktemp -d)"
+mkdir -p "$STUB_DIR"
+
+cat > "$STUB_DIR/curl" << 'STUBEOF'
+#!/usr/bin/env bash
+# curl stub for the installer tests.  Honours -o <file>, takes the body from
+# STUB_BODY (html = an error page, elf = a native binary), reports STUB_STATUS
+# and records its own command line in STUB_ARGS_FILE so a test can assert on
+# the headers the installer would have sent.
+out=""
+printf '%s\n' "$*" >> "${STUB_ARGS_FILE:-/dev/null}"
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -o) out="$2"; shift 2 ;;
+    *) shift ;;
+  esac
+done
+if [[ "${STUB_STATUS:-200}" == "200" ]]; then
+  if [[ "${STUB_BODY:-elf}" == "html" ]]; then
+    { printf '<html>'; head -c 200000 /dev/zero | tr '\0' 'x'; printf '</html>'; } > "$out"
+  else
+    { printf '\177ELF\002\001\001\000'; head -c 200000 /dev/zero; } > "$out"
+  fi
+fi
+echo "${STUB_STATUS:-200}"
+exit "${STUB_EXIT:-0}"
+STUBEOF
+chmod +x "$STUB_DIR/curl"
+
+stub_install() {
+    # $1 = body kind (html|elf), $2 = source, $3 = args file, $4 = extra env
+    local body="$1" source="$2" args_file="$3" dir rc=0
+    dir="$(mktemp -d)"
+    STUB_BODY="$body" STUB_ARGS_FILE="$args_file" \
+        PATH="$STUB_DIR:$PATH" bash "$INSTALL_SCRIPT" \
+        --source "$source" --no-path --skip-backend --skip-local \
+        --install-dir "$dir/inst" >"$dir/out" 2>&1 || rc=$?
+    printf '%s\n' "$rc" > "$dir/rc"
+    echo "$dir"
+}
+
+download_rejects_html() {
+    local args; args="$(mktemp)"
+    local dir; dir=$(stub_install html oss "$args")
+    local rc; rc=$(cat "$dir/rc")
+    local rejected=0
+    grep -q 'not a native executable' "$dir/out" && rejected=1
+    rm -rf "$dir" "$args"
+    [[ "$rc" -ne 0 ]] && [[ $rejected -eq 1 ]]
+}
+
+download_accepts_elf() {
+    local args; args="$(mktemp)"
+    local dir; dir=$(stub_install elf oss "$args")
+    local rc; rc=$(cat "$dir/rc")
+    local installed; installed=$(find "$dir/inst" -maxdepth 1 -type f -name 'browser4-cli-*' 2>/dev/null | head -1)
+    local ok=1
+    [[ "$rc" -eq 0 ]] && [[ -n "$installed" ]] && [[ -x "$installed" ]] && ok=0
+    rm -rf "$dir" "$args"
+    [[ $ok -eq 0 ]]
+}
+
+token_not_sent_to_oss() {
+    local args; args="$(mktemp)"
+    export GITHUB_TOKEN=stub-secret-token
+    local dir; dir=$(stub_install elf oss "$args")
+    unset GITHUB_TOKEN
+    local leaked=0
+    grep -q 'stub-secret-token' "$args" && leaked=1
+    rm -rf "$dir" "$args"
+    [[ $leaked -eq 0 ]]
+}
+
+token_sent_to_github() {
+    local args; args="$(mktemp)"
+    export GITHUB_TOKEN=stub-secret-token
+    local dir; dir=$(stub_install elf github "$args")
+    unset GITHUB_TOKEN
+    local sent=0
+    grep -q 'stub-secret-token' "$args" && sent=1
+    rm -rf "$dir" "$args"
+    [[ $sent -eq 1 ]]
+}
+
+test "download rejects an HTML error page (bad magic bytes)" download_rejects_html
+test "download accepts a native binary body" download_accepts_elf
+test "GITHUB_TOKEN is never sent to the OSS mirror" token_not_sent_to_oss
+test "GITHUB_TOKEN is sent to GitHub" token_sent_to_github
+
+rm -rf "$STUB_DIR"
+
+echo ""
+
 # ── Functions (extracted via copy without main call) ──
 
 echo "--- Functions ---" | cyan
@@ -232,7 +368,9 @@ test "get_default_install_dir returns non-empty" bash -c "
 
 test "detect_china_locale returns 0 or 1 (no crash)" bash -c "
     source '$FUNC_TEST_SCRIPT' >/dev/null 2>&1
-    detect_china_locale && true || true
+    rc=0
+    detect_china_locale || rc=\$?
+    [[ \$rc -eq 0 || \$rc -eq 1 ]]
 "
 
 test "detect_os returns valid OS" bash -c "
@@ -323,7 +461,10 @@ test "header is ASCII (no box-drawing chars)" bash -c "
 "
 
 test "header does not contain Unicode box-drawing" bash -c "
-    ! bash '$INSTALL_SCRIPT' --locate 2>&1 | grep -P '[\x{2500}-\x{257F}]' 2>/dev/null || true
+    # Portable (no grep -P): drop the ANSI colour escapes first, then any byte
+    # outside printable ASCII would be a non-ASCII character; the installer
+    # prints ASCII only.
+    ! bash '$INSTALL_SCRIPT' --locate 2>&1 | tr -d '\033' | LC_ALL=C grep -q '[^ -~]'
 "
 
 echo ""
@@ -333,7 +474,13 @@ echo ""
 echo "--- Edge cases ---" | cyan
 
 test "double dash in --version handled (no operator parsing)" bash -c "
-    bash '$INSTALL_SCRIPT' --locate 2>&1 | grep -q 'version'
+    # '--version --dry-run' must not be read as the tag '--dry-run'; the value
+    # has to be a release tag, and a bare semver gets the 'v' prefix.
+    rc=0
+    out=\$(bash '$INSTALL_SCRIPT' --version --dry-run 2>&1) || rc=\$?
+    [[ \$rc -ne 0 ]] || exit 1
+    echo \"\$out\" | grep -q 'looks like another option' || exit 1
+    bash '$INSTALL_SCRIPT' --locate --version 4.13.18 2>&1 | grep -q 'releases/download/v4\.13\.18/'
 "
 
 test "empty --version with dry-run doesn't download" bash -c "

package/scripts/tests/wait-for-npm-version.tests.sh

@@ -0,0 +1,219 @@
+#!/usr/bin/env bash
+# wait-for-npm-version.tests.sh
+# Test suite for wait-for-npm-version.sh
+# Uses only bash builtins and standard Unix tools -- no external test
+# frameworks and no network: `npm` is stubbed on PATH.
+#
+# Run:
+#   bash cli/scripts/tests/wait-for-npm-version.tests.sh
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_UNDER_TEST="$(cd "$SCRIPT_DIR/.." && pwd)/wait-for-npm-version.sh"
+
+PASS=0
+FAIL=0
+
+green()  { echo -e "\033[0;32m$*\033[0m"; }
+red()    { echo -e "\033[0;31m$*\033[0m"; }
+cyan()   { echo -e "\033[0;36m$*\033[0m"; }
+dim()    { echo -e "\033[2m$*\033[0m"; }
+
+# test <name> <command...>
+# The whole command is forwarded: `test "x" bash -c "..."` must not drop the
+# `-c "..."` part, or a bare `bash` would exit 0 and the assertion would pass
+# vacuously.
+test() {
+    local name="$1"
+    shift
+    if "$@"; then
+        PASS=$((PASS + 1))
+        green "  PASS  $name"
+    else
+        FAIL=$((FAIL + 1))
+        red   "  FAIL  $name"
+    fi
+}
+
+# ---- stub npm ---------------------------------------------------------
+
+STUB_DIR="$(mktemp -d)"
+cleanup() { rm -rf "$STUB_DIR"; }
+trap cleanup EXIT
+
+cat > "$STUB_DIR/npm" <<'STUB'
+#!/usr/bin/env bash
+# Fake `npm view <package>@<version> version`, driven by the test environment:
+#   FAKE_NPM_MODE       available | available-after:<n> | unavailable |
+#                       network-error-once | wrong-version
+#   FAKE_NPM_VERSION    version reported on success
+#   FAKE_NPM_COUNT_FILE file counting the invocations
+set -euo pipefail
+
+count_file="${FAKE_NPM_COUNT_FILE:?FAKE_NPM_COUNT_FILE is required}"
+count=0
+if [ -f "$count_file" ]; then count="$(cat "$count_file")"; fi
+count=$((count + 1))
+printf '%s' "$count" > "$count_file"
+
+not_found() {
+    echo "npm error code E404" >&2
+    echo "npm error 404 No match found for version ${FAKE_NPM_VERSION:?FAKE_NPM_VERSION is required}" >&2
+    exit 1
+}
+
+mode="${FAKE_NPM_MODE:?FAKE_NPM_MODE is required}"
+case "$mode" in
+    available)
+        printf '%s\n' "$FAKE_NPM_VERSION"
+        ;;
+    available-after:*)
+        threshold="${mode#available-after:}"
+        if [ "$count" -ge "$threshold" ]; then
+            printf '%s\n' "$FAKE_NPM_VERSION"
+        else
+            not_found
+        fi
+        ;;
+    unavailable)
+        not_found
+        ;;
+    wrong-version)
+        printf '%s\n' "0.0.1"
+        ;;
+    network-error-once)
+        if [ "$count" -ge 2 ]; then
+            printf '%s\n' "$FAKE_NPM_VERSION"
+        else
+            echo "npm error network request to https://registry.npmjs.org failed" >&2
+            exit 1
+        fi
+        ;;
+    *)
+        echo "fake npm: unknown FAKE_NPM_MODE '$mode'" >&2
+        exit 2
+        ;;
+esac
+STUB
+chmod +x "$STUB_DIR/npm"
+
+# run_wait <mode> <timeout-seconds> <poll-interval-seconds> <package> <version>
+# Sets RUN_STATUS, RUN_OUTPUT (stdout+stderr) and RUN_COUNT (npm invocations).
+RUN_STATUS=0
+RUN_OUTPUT=''
+RUN_COUNT=0
+
+run_wait() {
+    local mode="$1" timeout="$2" interval="$3" package="$4" version="$5"
+    local count_file="$STUB_DIR/count.$$.$RANDOM"
+    rm -f "$count_file"
+
+    RUN_STATUS=0
+    RUN_OUTPUT="$(
+        FAKE_NPM_MODE="$mode" \
+        FAKE_NPM_VERSION="$version" \
+        FAKE_NPM_COUNT_FILE="$count_file" \
+        PATH="$STUB_DIR:$PATH" \
+        bash "$SCRIPT_UNDER_TEST" "$package" "$version" "$timeout" "$interval" 2>&1
+    )" || RUN_STATUS=$?
+
+    RUN_COUNT=0
+    if [ -f "$count_file" ]; then RUN_COUNT="$(cat "$count_file")"; fi
+}
+
+# ---- pre-flight -------------------------------------------------------
+
+cyan  "============================================"
+cyan  " wait-for-npm-version.sh Test Suite"
+cyan  "============================================"
+echo ""
+
+dim "--- Pre-flight ---"
+
+test "file exists" bash -c "[[ -f '$SCRIPT_UNDER_TEST' ]]"
+test "starts with shebang" bash -c "head -c 20 '$SCRIPT_UNDER_TEST' | grep -q '^#!/bin/bash'"
+test "bash syntax check passes" bash -c "bash -n '$SCRIPT_UNDER_TEST' 2>&1"
+test "no non-ASCII bytes" bash -c "! grep -Pn '[^\\x00-\\x7F]' '$SCRIPT_UNDER_TEST' >/dev/null 2>&1"
+
+echo ""
+
+# ---- behaviour --------------------------------------------------------
+
+test_version_visible_immediately() {
+    run_wait available 30 1 browser4-cli 1.2.3
+    [ "$RUN_STATUS" -eq 0 ] || return 1
+    [[ "$RUN_OUTPUT" == *"Verified browser4-cli@1.2.3 on npm"* ]] || return 1
+    [ "$RUN_COUNT" -eq 1 ] || return 1
+}
+
+test_waits_until_the_version_appears() {
+    run_wait "available-after:3" 30 1 browser4-cli 1.2.3
+    [ "$RUN_STATUS" -eq 0 ] || return 1
+    [[ "$RUN_OUTPUT" == *"Verified browser4-cli@1.2.3 on npm"* ]] || return 1
+    [ "$RUN_COUNT" -ge 3 ] || return 1
+}
+
+# Discrimination test for the CI failure this script fixes: the registry
+# reports the version only on the 7th call -- beyond the 5 attempts the old
+# inline loop allowed. A 3 s budget reproduces the old give-up, a 30 s budget
+# rides it out.
+test_keeps_polling_past_the_old_five_attempt_window() {
+    run_wait "available-after:7" 3 1 browser4-cli 1.2.3
+    [ "$RUN_STATUS" -eq 1 ] || return 1
+
+    run_wait "available-after:7" 30 1 browser4-cli 1.2.3
+    [ "$RUN_STATUS" -eq 0 ] || return 1
+    [ "$RUN_COUNT" -ge 7 ] || return 1
+    [[ "$RUN_OUTPUT" == *"Verified browser4-cli@1.2.3 on npm"* ]] || return 1
+}
+
+test_fails_when_the_version_never_appears() {
+    run_wait unavailable 3 1 browser4-cli 1.2.3
+    [ "$RUN_STATUS" -eq 1 ] || return 1
+    [[ "$RUN_OUTPUT" == *"unable to verify browser4-cli@1.2.3 on npm within 3s"* ]] || return 1
+    [[ "$RUN_OUTPUT" == *"E404"* ]] || return 1
+    [[ "$RUN_OUTPUT" == *"npm view browser4-cli@1.2.3 version"* ]] || return 1
+}
+
+test_tolerates_a_transient_registry_error() {
+    run_wait network-error-once 30 1 browser4-cli 1.2.3
+    [ "$RUN_STATUS" -eq 0 ] || return 1
+    [[ "$RUN_OUTPUT" == *"WARN: npm view failed"* ]] || return 1
+}
+
+test_reports_a_mismatched_version_and_keeps_waiting() {
+    run_wait wrong-version 3 1 browser4-cli 1.2.3
+    [ "$RUN_STATUS" -eq 1 ] || return 1
+    [[ "$RUN_OUTPUT" == *"npm reports '0.0.1'"* ]] || return 1
+}
+
+test_requires_both_arguments() {
+    local output status
+    output="$(PATH="$STUB_DIR:$PATH" bash "$SCRIPT_UNDER_TEST" 2>&1)" && status=0 || status=$?
+    [ "$status" -ne 0 ] || return 1
+    [[ "$output" == *"Usage:"* ]] || return 1
+}
+
+dim "--- Behaviour ---"
+
+test "version already visible: verifies on the first poll" test_version_visible_immediately
+test "waits until the registry reports the version" test_waits_until_the_version_appears
+test "keeps polling past the old 5-attempt window" test_keeps_polling_past_the_old_five_attempt_window
+test "fails when the version never appears" test_fails_when_the_version_never_appears
+test "tolerates a transient registry error" test_tolerates_a_transient_registry_error
+test "reports a mismatched version and keeps waiting" test_reports_a_mismatched_version_and_keeps_waiting
+test "requires both arguments" test_requires_both_arguments
+
+# ---- summary ----------------------------------------------------------
+
+echo ""
+cyan "============================================"
+if [ "$FAIL" -eq 0 ]; then
+    green " All $PASS tests passed"
+else
+    red   " $FAIL of $((PASS + FAIL)) tests failed"
+fi
+cyan "============================================"
+
+[ "$FAIL" -eq 0 ]

package/scripts/wait-for-npm-version.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+# ---------------------------------------------------------------------------
+# wait-for-npm-version.sh -- wait until a published version is visible on npm
+# ---------------------------------------------------------------------------
+# Usage:
+#   wait-for-npm-version.sh <package> <version> [timeout-seconds] [poll-interval-seconds]
+#
+# Defaults: timeout 600 s, poll interval 15 s.
+#
+# `npm publish` exiting 0 only means the registry ACCEPTED the upload. npm now
+# processes publishes asynchronously and answers with
+#   "Your package is being processed and may take a few minutes to become available."
+# after which the new version stays invisible to `npm view` for an unpredictable
+# while (observed on v4.13.18: still missing 41 s after a successful publish,
+# i.e. past the whole 5 x 10 s window this script replaces). Verification must
+# therefore wait minutes, not seconds -- otherwise a successful publish is
+# reported as a failed release job, and everything gated on that job (the
+# GitHub release) is skipped.
+#
+# Every answer that is not the expected version is retried:
+#   - 404 / "No match found for version" -> not published yet (expected, quiet)
+#   - any other error                   -> transient registry/network problem
+#                                          (logged, still retried)
+#
+# Exit codes:
+#   0  the exact version is visible on the registry
+#   1  still not visible when the timeout expires, or bad usage
+#
+# Designed for CI (GitHub Actions) but also runs on developer machines.
+# ---------------------------------------------------------------------------
+set -euo pipefail
+
+PACKAGE="${1:?Usage: $0 <package> <version> [timeout-seconds] [poll-interval-seconds]}"
+VERSION="${2:?Usage: $0 <package> <version> [timeout-seconds] [poll-interval-seconds]}"
+TIMEOUT_SECONDS="${3:-600}"
+POLL_INTERVAL_SECONDS="${4:-15}"
+
+STDERR_FILE="$(mktemp)"
+trap 'rm -f "$STDERR_FILE"' EXIT
+
+started=$SECONDS
+attempt=0
+published=''
+npm_error=''
+
+while :; do
+    attempt=$((attempt + 1))
+
+    set +e
+    published="$(npm view "$PACKAGE@$VERSION" version 2>"$STDERR_FILE")"
+    status=$?
+    set -e
+
+    published="$(printf '%s' "$published" | tr -d '[:space:]')"
+    npm_error="$(head -n 1 "$STDERR_FILE" 2>/dev/null || true)"
+    elapsed=$((SECONDS - started))
+
+    if [ "$status" -eq 0 ] && [ "$published" = "$VERSION" ]; then
+        echo "Verified $PACKAGE@$VERSION on npm after ${elapsed}s (attempt $attempt)"
+        exit 0
+    fi
+
+    remaining=$((TIMEOUT_SECONDS - elapsed))
+    if [ "$remaining" -le 0 ]; then
+        break
+    fi
+
+    if [ "$status" -eq 0 ]; then
+        echo "WARN: npm reports '${published:-<empty>}' for $PACKAGE@$VERSION (attempt $attempt, ${elapsed}s elapsed, ${remaining}s left)"
+    elif printf '%s' "$npm_error" | grep -qE 'E404|404'; then
+        echo "Waiting for $PACKAGE@$VERSION to appear on npm (attempt $attempt, ${elapsed}s elapsed, ${remaining}s left) -- the registry may still be processing the publish"
+    else
+        echo "WARN: npm view failed (attempt $attempt, ${elapsed}s elapsed, ${remaining}s left): ${npm_error:-<no output>}"
+    fi
+
+    # never sleep past the deadline: the total wait stays within the budget
+    if [ "$POLL_INTERVAL_SECONDS" -gt "$remaining" ]; then
+        sleep "$remaining"
+    else
+        sleep "$POLL_INTERVAL_SECONDS"
+    fi
+done
+
+echo "ERROR: unable to verify $PACKAGE@$VERSION on npm within ${TIMEOUT_SECONDS}s after publish" >&2
+echo "ERROR: last registry answer: ${npm_error:-<no output>}" >&2
+echo "ERROR: the version may still be processing on the registry side; re-check with:" >&2
+echo "ERROR:   npm view $PACKAGE@$VERSION version" >&2
+echo "ERROR:   https://www.npmjs.com/package/$PACKAGE/v/$VERSION" >&2
+exit 1