plan: add shared fetch_wp_salts function with retry/validation

Copilot · PDowney · web-flow · commit f052bb1e0ac7 · 2026-04-11T00:38:52.000Z
Agent-Logs-Url: https://github.com/EngineScript/EngineScript/sessions/29220c6a-26cb-4309-8b44-e054afd721f5 Co-authored-by: PDowney <11467177+PDowney@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to EngineScript will be documented in this file.
 
 Changes are organized by date, with the most recent changes listed first.
 
+## 2026-04-11
+
+### 🔧 VHOST IMPORT BUG FIXES & IMPROVEMENTS
+
+- Updated the single-zip database file detection in `scripts/functions/vhost/vhost-import.sh` to search for both `*.sql` and `*.sql.gz` patterns, so compressed database dumps are correctly found and imported instead of failing silently.
+- Removed the duplicate `URL_VALIDATION_REGEX` argument from the `prompt_input` call for the Site URL field; validation is now handled exclusively by the subsequent `validate_url` function call, eliminating redundant logic.
+- Added `DB_CHARSET="${DB_CHARSET_VALIDATED}"` after the charset `case` statement so `DB_CHARSET` is always the validated, lowercase value when used in the `wp-config.php` `sed` replacement, preventing a potential mismatch if the user supplies a mixed-case charset.
+- Improved the WordPress salt fetch error message to also suggest retrying the import later if the WordPress.org API is temporarily unavailable, rather than only mentioning local network/firewall issues.
+- Simplified `run_url_search_replace_if_present` to run `wp search-replace` directly with `--report-changed-only`, removing the preliminary `wp db search` pre-check that unnecessarily doubled full-table scans on large databases.
+
 ## 2026-04-10
 
 ### 🔧 VHOST IMPORT CODE QUALITY IMPROVEMENTS
diff --git a/scripts/functions/vhost/vhost-import.sh b/scripts/functions/vhost/vhost-import.sh
@@ -257,10 +257,10 @@ if [[ "$IMPORT_FORMAT" == "single_zip" ]]; then
         EXTRACT_STATUS=1
     fi
     if [[ $EXTRACT_STATUS -eq 0 ]]; then
-        # Find exactly one .sql file within the extracted content (deterministic order)
-        mapfile -d '' -t DB_SOURCE_CANDIDATES < <(find "${WP_EXTRACTED_PATH}" -maxdepth 1 -type f -name "*.sql" -print0 | sort -z)
+        # Find exactly one database dump file (.sql or .sql.gz) within the extracted content (deterministic order)
+        mapfile -d '' -t DB_SOURCE_CANDIDATES < <(find "${WP_EXTRACTED_PATH}" -maxdepth 1 -type f \( -name "*.sql" -o -name "*.sql.gz" \) -print0 | sort -z)
         if [[ ${#DB_SOURCE_CANDIDATES[@]} -ne 1 ]]; then
-            echo "FAILED: Could not find exactly one .sql file within the extracted single zip content in ${WP_EXTRACTED_PATH}"
+            echo "FAILED: Could not find exactly one database file (.sql or .sql.gz) within the extracted single zip content in ${WP_EXTRACTED_PATH}"
             EXTRACT_STATUS=1 # Mark as failure
         else
             DB_SOURCE_PATH="${DB_SOURCE_CANDIDATES[0]}" # Set DB path for single_zip format
@@ -379,7 +379,7 @@ while true; do
       
       # Site URL input with validation
       while true; do
-          new_site_url=$(prompt_input "Enter correct Site URL" "${SITE_URL}" 300 "${URL_VALIDATION_REGEX}")
+          new_site_url=$(prompt_input "Enter correct Site URL" "${SITE_URL}" 300)
           if [[ -n "$new_site_url" ]]; then
               if validate_url "$new_site_url"; then
                   SITE_URL="$new_site_url"
@@ -497,6 +497,7 @@ case "${DB_CHARSET_VALIDATED}" in
         exit 1
         ;;
 esac
+DB_CHARSET="${DB_CHARSET_VALIDATED}"
 DB_COLLATION="${DB_CHARSET_VALIDATED}_unicode_ci"
 if [[ ! "${DB}" =~ ^[A-Za-z0-9_]+$ ]]; then
     echo "Error: Generated database name contains invalid characters: ${DB}" >&2
@@ -557,7 +558,7 @@ configure_redis "${SITE_URL}" "${TARGET_WP_PATH}/wp-config.php"
 # WP Salt Creation (Generate new salts)
 echo "Generating new WordPress salts..."
 SALT=$(curl --fail --silent --show-error --location --retry 3 --connect-timeout 10 --max-time 30 "https://api.wordpress.org/secret-key/1.1/salt/") || {
-    echo "Error: Failed to fetch WordPress salts from api.wordpress.org. Please check your internet connection, DNS/firewall/proxy settings, and try running the import again." >&2
+    echo "Error: Failed to fetch WordPress salts from api.wordpress.org. Please check your internet connection and DNS/firewall/proxy settings. If the issue persists, the WordPress.org API may be temporarily unavailable—please retry the import later." >&2
     exit 1
 }
 
@@ -619,13 +620,8 @@ HTTP_ORIGINAL_URL="${HTTPS_ORIGINAL_URL/#https:\/\//http://}"
 run_url_search_replace_if_present() {
     local original_url="$1"
 
-    # Only run expensive full-table replacements when the source URL is present.
-    # Use `wp db search --quiet` exit status directly to avoid an extra grep pass.
-    if wp db search "${original_url}" --all-tables --allow-root --quiet 2>/dev/null; then
-        wp search-replace "${original_url}" "${NEW_URL}" --all-tables --report-changed-only --allow-root
-    else
-        echo "Skipping search-replace: '${original_url}' not found in database text columns."
-    fi
+    # Run search-replace directly; --report-changed-only will emit output only for changed rows.
+    wp search-replace "${original_url}" "${NEW_URL}" --all-tables --report-changed-only --allow-root
     return
 }
 
