Remove Windows 8.1 downloads

* Microsoft removed them from their website.

Fido.ps1

@@ -1,6 +1,6 @@
 #
-# Fido v1.53 - Feature ISO Downloader, for retail Windows images and UEFI Shell
-# Copyright © 2019-2023 Pete Batard <pete@akeo.ie>
+# Fido v1.58 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Copyright © 2019-2024 Pete Batard <pete@akeo.ie>
 # Command line support: Copyright © 2021 flx5
 # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
 #
@@ -138,9 +138,9 @@ $WindowsVersions = @(
 	@(
 		@("Windows 11", "windows11"),
 		@(
-			"23H2 (Build 22631.2428 - 2023.10)",
-			@("Windows 11 Home/Pro/Edu", 2860),
-			@("Windows 11 Home China ", ($zh + 2861))
+			"23H2 v2 (Build 22631.2861 - 2023.12)",
+			@("Windows 11 Home/Pro/Edu", 2935),
+			@("Windows 11 Home China ", ($zh + 2936))
 		)
 	),
 	@(
@@ -151,19 +151,13 @@ $WindowsVersions = @(
 			@("Windows 10 Home China ", ($zh + 2378))
 		)
 	)
-	@(
-		@("Windows 8.1", "windows8ISO"),
-		@(
-			"Update 3 (build 9600)",
-			@("Windows 8.1 Standard", 52),
-			@("Windows 8.1 N", 55)
-			@("Windows 8.1 Single Language", 48),
-			@("Windows 8.1 K", ($ko + 61)),
-			@("Windows 8.1 KN", ($ko + 62))
-		)
-	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"24H1 (edk2-stable202405)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"23H2 (edk2-stable202311)",
 			@("Release", 0),
@@ -437,6 +431,7 @@ function Get-RandomDate()
 
 #region Globals
 $ErrorActionPreference = "Stop"
+$DefaultTimeout = 30
 $dh = 58
 $Stage = 0
 $SelectedIndex = 0
@@ -508,8 +503,18 @@ function Check-Locale
 		if ($Verbosity -ge 2) {
 			Write-Host Querying $url
 		}
-		Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
+		# Looks Microsoft are filtering our script according to the first query it performs with the spoofed user agent.
+		# So, to continue this pointless cat and mouse game, we simply add an extra first query with the default user agent.
+		# Also: "Hi Microsoft. You sure have A LOT OF RESOURCES TO WASTE to have assigned folks of yours to cripple scripts
+		# that merely exist because you have chosen to make the user experience from your download website utterly subpar.
+		# And while I am glad senpai noticed me (UwU), I feel compelled to ask: Don't you guys have better things to do?"
+		Invoke-WebRequest -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 $url | Out-Null
+		Invoke-WebRequest -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
 	} catch {
+		# Of course PowerShell 7 had to BREAK $_.Exception.Status on timeouts...
+		if ($_.Exception.Status -eq "Timeout" -or $_.Exception.GetType().Name -eq "TaskCanceledException") {
+			Write-Host Operation Timed out
+		}
 		$script:QueryLocale = "en-US"
 	}
 }
@@ -564,7 +569,7 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 			Write-Host Querying $url
 		}
 		try {
-			Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
+			Invoke-WebRequest -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
 		} catch {
 			Error($_.Exception.Message)
 			return @()
@@ -583,7 +588,7 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 
 		$script:SelectedIndex = 0
 		try {
-			$r = Invoke-WebRequest -Method Post -UseBasicParsing -UserAgent $UserAgent -SessionVariable "Session" $url
+			$r = Invoke-WebRequest -Method Post -UseBasicParsing -TimeoutSec $DefaultTimeout -UserAgent $UserAgent -SessionVariable "Session" $url
 			if ($r -match "errorModalMessage") {
 				Throw-Error -Req $r -Alt "Could not retrieve languages from server"
 			}
@@ -673,7 +678,7 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 			$Is64 = [Environment]::Is64BitOperatingSystem
 			# Must add a referer for this request, else Microsoft's servers will deny it
 			$ref = "https://www.microsoft.com/software-download/windows11"
-			$r = Invoke-WebRequest -Method Post -Headers @{ "Referer" = $ref } -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
+			$r = Invoke-WebRequest -Method Post -Headers @{ "Referer" = $ref } -UseBasicParsing -TimeoutSec $DefaultTimeout -UserAgent $UserAgent -WebSession $Session $url
 			if ($r -match "errorModalMessage") {
 				$Alt = [regex]::Match($r.Content, '<p id="errorModalMessage">(.+?)<\/p>').Groups[1].Value -replace "<[^>]+>" -replace "\s+", " " -replace "\?\?\?", "-"
 				$Alt = [System.Text.Encoding]::UTF8.GetString([byte[]][char[]]$Alt)
@@ -726,7 +731,7 @@ function Process-Download-Link([string]$Url)
 				$pattern = '.*\/(.*\.iso).*'
 				$File = [regex]::Match($Url, $pattern).Groups[1].Value
 				# PowerShell implicit conversions are iffy, so we need to force them...
-				$str_size = (Invoke-WebRequest -UseBasicParsing -Uri $Url -Method Head).Headers.'Content-Length'
+				$str_size = (Invoke-WebRequest -UseBasicParsing -TimeoutSec $DefaultTimeout -Uri $Url -Method Head).Headers.'Content-Length'
 				$tmp_size = [uint64]::Parse($str_size)
 				$Size = Size-To-Human-Readable $tmp_size
 				Write-Host "Downloading '$File' ($Size)..."
@@ -1059,8 +1064,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWQYJKoZIhvcNAQcCoIIkSjCCJEYCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDYjo92bdfXAxG7
-# E7724OUfwSAgI6Ed+BW03GU/jrjFqKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAo88a5qfFR5eNa
+# dlaOq6jGKATitcy/nhPuLUO1tQvOwaCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1163,23 +1168,23 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQg3jE5SN1Q0vE632Yt7IdQzzOSOI2EE3ta9eZoL39BAhkwDQYJKoZI
-# hvcNAQEBBQAEggIASNIiHfwWfX2SRbGu6aPk5MN/DzhVmsje8wdz7V+wIb8q+i6s
-# qkv7dG/Q0gNw8MfxWrQjHfMLhoPQOGHA+6qP2+FMrdTapsG1zGlO8AnxrGC0Ie94
-# zP4jXZtB7qYFgJcaQW4eYSd1/o3fLNYGHSvChLwVPqMCzNj9erxaZFRpQ1JAH06s
-# TYWufoeVSA1T3II+awqyUnBav1Qg+hPsZXM0n29K5CSp1cGc/G64Q/w7z5pk3FvS
-# DmFRSG0MOb/dJU/Czc2MeK2+ywDXJ5rFoP5EG7nQXOuMS/j86kL7/nq4dcEODgXQ
-# 1k8hqTQ6i5E3DQCZUtDT8CqGfcCQP/GSXz1+ADcHPAGWTKxq2A4A9/8EpLXhHr+6
-# mzu6lnaWAjvdXnWtjikr+n1vWXR0bPtsDEHO6Dhd/kJIC/mxLR4POoUxs7ZLXkSR
-# GUi7zHOBTagefmh3zck6CTRPgb8CM+2LJPKtyy0HzBa16mwnxHp0ryJ16frtkcg4
-# hJJ73QGsMTGOX/jaa7Ot8uxdt7d8SuuJIyO68yRm4B2h08nTljReHiHoWunRcksA
-# t1h3HgNTVSL+gNqMPNgpJtdA2BWkmInozpXQ6ZQEmNtIdbwr/zWRxob3xTGDCblm
-# Mdb1MEP9Vg2oNdYmUVkEgbL7WXu/B3Q0fk0rlZeTFphPULsVgrsZ2ZKrn6+hgg49
+# 9w0BCQQxIgQguDL5MXYdL6IDFqZBhsLxG4JV8I69ABIQ0PYikjy0JvYwDQYJKoZI
+# hvcNAQEBBQAEggIAqimddGz8aEGedWHSXJfgvQh1S2iZE9qA4rTXWwLQi8yIP84h
+# 0BLiMasx7gcqWWjNv2PC1oM3bf4kO2MmKJNH3QlWuiqgrFNoirIfkfj8egll9rky
+# mzm3c3OQyiYUaOEUssmyIuzazJh4XSLNoGzcinm0EguHmQZlL4FbXtMRnHhjUFvt
+# OG2Qr5p97rUzmllMZ4Q89lrcvYXZjO2pPIQirmwnOclCJ2dHSSKnRhUu5/H3Ks5n
+# eE9Tra9NVvlnSHWbtgIZUPj+1UlKkm0o4E59aTxTvq12rzMA6Hj+67b1Ev6AC7fB
+# qXfDJuGm7zBxeR7KnrEA7uuUfzbeKpH6QviCUJANugnCfYhpmMqKZjBGVVulm6EQ
+# ABlCHw8B+yPYE5jUsqsfyiTd4iiPXuZlDYV+HJ+3fzYm9B19XEP8E7RFfCKzoDIX
+# Kw18dEJeIqlbQuAr8jX7hpdsESd8RDarN5kUZANLgeF3bvBMXN3z9mKempZbWPUT
+# t94NioYTa2Ou+i7eLEGHhVm8FM7WcO3Ux03Ikf27d7b+H+RSwYOVqX0eBhX5xF90
+# xZs0TbLwup/GrdjEm9Rsr5GBt5rTi3vIVUBEdz/Uu0CmtRuBQBSXNqNZgkOB1v5z
+# c4+9Mbg+KbJbULyKdjgz+ZCKGRu5/tqoksORzsncSUaNJ/DSCYeQ80SKjvihgg49
 # MIIOOQYKKwYBBAGCNwMDATGCDikwgg4lBgkqhkiG9w0BBwKggg4WMIIOEgIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ8GCyqGSIb3DQEJEAEEoIH/BIH8MIH5AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCABs4d2q1Wl08oB416VTHNDNEf+pA3C
-# Oicq5Wcr/G/2sAIVAJ7NE2epo/tJaM5LByW+KwYZQ+/aGA8yMDIzMTEyNTE3NTIz
-# M1owAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCDBwVes9QlIOm3aoB0Wu8/YI1CBP4i7
+# 9xX6nwTWTu/8dgIVANtPA2A+Sj3OsOMYxXGMj29NuOmkGA8yMDI0MDcwODExMzI1
+# NFowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
 # IENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEw
 # LwYDVQQDEyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcz
 # oIIKizCCBTgwggQgoAMCAQICEHsFsdRJaFFE98mJ0pwZnRIwDQYJKoZIhvcNAQEL
@@ -1242,13 +1247,13 @@ exit $ExitCode
 # BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
 # cnVzdCBOZXR3b3JrMSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1w
 # aW5nIENBAhB71OWvuswHP6EBIwQiQU0SMAsGCWCGSAFlAwQCAaCBpDAaBgkqhkiG
-# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIzMTEyNTE3NTIz
-# M1owLwYJKoZIhvcNAQkEMSIEIPbePyhJK0jyNUQ4CHsDN+WoGOhIaGHjGkPrSgLi
-# LbMVMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
-# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQApkx0gdDbciJSfgRDhVInr0jmf
-# VAeT/idP/xIBDi5uOHtAUThkutK4snGVMnzvy8JQPHl4TLcTZ1myOI24hW5x2XXp
-# hK+yoPV/AKiyRu3YDaRaZ+aes8jSMIILkoT3aA9kkBjQCFQtic17RpY2GzL6X9Yj
-# gRFmrX95qAY2jfUdLvoH+Y0NQMB0PlJ9EJk/hqwcf8n32Y06Ucl2ROg+X1wbSBiS
-# J7wNvcFam6RdRhQ+l0JJWNqVB2lYHMLJcfpo34CepaMDcaK/YCc6yozdohD6RV0F
-# vxueD7Z33tnLnPN8C2UxUpXn3JFgpPYrjhj33x3uhNjJM94+juDS3ZAC1h9d
+# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTI0MDcwODExMzI1
+# NFowLwYJKoZIhvcNAQkEMSIEIG/gQQhpzPfxlpm/2tdmW6X9awf2Czk8/cxR7UCg
+# 43d7MDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
+# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQCCag3lcuzdiyncWrIwSqi4eLMA
+# lg4Yqhxm2ws63eTEN9jYdQlOqgLE2fVhykqKwfUqm29RSPsK0twBhVxUSl+779Fd
+# r2M1C4t5z6SDKrpJQSb0dKvRG6VD5FFwU43XITJFtKXsu9EcM9SizV1fk6/DUUEw
+# 1uFPptTjB6god6UJb18em84DS11lFVfc1R5nTqmNdJ4PQLM3U0wqjR4vfQkCW+0u
+# diqsdHIkLXzvzK8uPU4IgfN14O20gxwB7L1n8roe/ibil8elFUwHICC44ddHGYsd
+# SN66NREeU82z+4vis38lWzIajhuGNaXa/kSDB31yL431CgPtW+RxMj4D/DvM
 # SIG # End signature block