Work around the latest Microsoft server restrictions

* It looks like Microsoft are actively filtering our script by detecting our first request with the
  spoofed user-agent, so work around that.
* Also switch to using 'curl' instead of 'Invoke-WebRequest'. May break PowerShell 7.0, but I'm only
  concerned about Rufus usage for now.
* Also add timeouts on web requests.
* Closes #88.

Fido.ps1

@@ -1,5 +1,5 @@
 #
-# Fido v1.52 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Fido v1.55 - Feature ISO Downloader, for retail Windows images and UEFI Shell
 # Copyright © 2019-2023 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 22621.2428 - 2023.10)",
+			"23H2 v2 (Build 22631.2861 - 2023.12)",
-			@("Windows 11 Home/Pro/Edu", 2860),
+			@("Windows 11 Home/Pro/Edu", 2935),
-			@("Windows 11 Home China ", ($zh + 2861))
+			@("Windows 11 Home China ", ($zh + 2936))
 		)
 	),
 	@(
@@ -164,6 +164,11 @@ $WindowsVersions = @(
 	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"23H2 (edk2-stable202311)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"23H1 (edk2-stable202305)",
 			@("Release", 0),
@@ -432,6 +437,7 @@ function Get-RandomDate()
 
 #region Globals
 $ErrorActionPreference = "Stop"
+$DefaultTimeout = 30
 $dh = 58
 $Stage = 0
 $SelectedIndex = 0
@@ -503,8 +509,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?"
+		curl -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 $url | Out-Null
+		curl -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"
 	}
 }
@@ -559,7 +575,7 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 			Write-Host Querying $url
 		}
 		try {
-			Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
+			curl -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
 		} catch {
 			Error($_.Exception.Message)
 			return @()
@@ -578,7 +594,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 = curl -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"
 			}
@@ -668,7 +684,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 = curl -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)
@@ -721,7 +737,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 = (curl -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)..."
@@ -1054,8 +1070,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWAYJKoZIhvcNAQcCoIIkSTCCJEUCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCCftVZFSq3Sn8jD
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBHf44+d5nlaax1
-# giSFz/kueIck3YT/byvAzDnin6clLKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# zDK20N+s1BjbUkc/aTGHLUQuXBU9BqCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1158,22 +1174,22 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQgqAvJCkeR58H5ULoUr8/SYbJ1aK86hAoK4YORM173AT4wDQYJKoZI
+# 9w0BCQQxIgQgqqe1F1mEJpX4dnl4MXR5prBRZLQto2sBRVwggJo/MmswDQYJKoZI
-# hvcNAQEBBQAEggIAR2b7jIymOLmGaEtgDNFjP+T/AwQTlsyc8zblIlkwMfDL8rc1
+# hvcNAQEBBQAEggIAIV2/sxOW2vNsi2RIR5heiBkJXL9Cr3JkCA8XFvLfKwXe/ut9
-# prPdCIKewiugfZn4+RIruOnx4J2knl+ufRBUi9B8wSiT681s/oVWSKlX0TOH0CA4
+# mROkV8+DB5mDf3jngzXMtI07yx+hMuA/Lu9cJe2/DTBy4KQI8GC0JSVALVYrm2NU
-# LK9EKy/vj15xqKhoHn2PgOi/WQl8C8ZWBXC5mRfBzFUNGJj+6TW6P6CU2i1gJA5O
+# XclHamxx7ab2MLtxX6tSB3fR1LY14oclKNMgdBu6sWF9vmTS5O/T3qEihKjtAdNZ
-# VBefeXwd2kxUrOzp6irvEQnMAQ02EK6neZNybii+ymGjynV4NTO9BNWqzUDe+UL6
+# qRTwgVvQHvK8YKN58uK7Vbu32Pd0j2Eik4oxmc70MXxFmCjIBB8ncdqCQFXG1Yb1
-# cSMPOJNLCWwn9QTd/ibxcGJK3MBoAdCzxmBHHOdS4euWZzkXVSdeeRxQvUu37EnW
+# VO7zHeRa+Y0MRjQEa8KsPR9uD1luklRD6vg4iknGGmlc+Nmly44EeBpK7sRepF+e
-# zwVmQuKXQaVx0Rgg+7Z70PN5gb3+oL2fj+p6QIxD0WUzfbupI/B+LVLrN41Zk/JQ
+# i+kLEzw7IekZOUzLKJCjucWjS1NpJwAobz3aGqQBQ1UB0P8T3ewCx2XX54T8moqJ
-# q/u1jn/6CbAFwcnAcBaDROtUo201+uUe4EeKXQoaueioMhURA4GkE4xqayLJlGvJ
+# AfVM+ZqQV7X6FPBv6CrXD4wnRBIQ5dl6d0tzdFn2L5khY1HUEPGYpN/2l6BWtXjX
-# 8sG5X/Jdi44ksEPQqQaMaaS8auB4YpUqZayXysdUZyxfh7mMvhbHu/Wk8rfB6L8q
+# 0oi5ekkrRWwlRN4l3fY7fNfFoNet5RYjaGQ/i+w8pBaP2K5ww+VTm9nGSfl20DVp
-# tkp/ozl1tVXe46r0UJWX+fVv3Sl6fzVOt5jhnrRvpxla5dX9Fr7LvhyEizAKNTUz
+# WFjT+tV758SPgC+fmLBmYd1FCIPZpY4OMSMa18d6lItom3t940LzSEprtiMy+36f
-# ZXHZcrzsFCR5pC6pTYJScQIYYIbXSHuD+RGqdlAtX1HoCFYoa4uh8tsKmXFELuLN
+# 6SZ2PxYWX1FeEH4lFoMEDwZnq+eyOEgzwYBYORaJBLp7kMByLl8llFZehQEN1LAt
-# 67wuX3T/2sgsSnMxFCxDFLZKB030D9FkePEPKT5DVyDMx+79s2FhCkESzVehgg48
+# ej05ISFVCVTXdor6r+gehODD2vtAQzITU6wXHoV7Lql73bpb+InUDRQMIvmhgg48
 # MIIOOAYKKwYBBAGCNwMDATGCDigwgg4kBgkqhkiG9w0BBwKggg4VMIIOEQIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ4GCyqGSIb3DQEJEAEEoIH+BIH7MIH4AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCCQI0Sgxq1/qs4jdaGtHt+hlbWbiP/t
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCAvatjeRykuVBr5SLwlvgA58YXzCwoH
-# ifwFA89J3gWtuwIUOq97N3H4EpkdBOL2+dkd23u5HYYYDzIwMjMxMDMxMTgxNzQx
+# 9wFdhHo4uzpN1wIUPApJ6noKhPzZkCXyFW/KtK7iM8oYDzIwMjQwMjA3MTU1NDAy
 # WjADAgEeoIGGpIGDMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMg
 # Q29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAv
 # BgNVBAMTKFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzOg
@@ -1237,13 +1253,13 @@ exit $ExitCode
 # A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRy
 # dXN0IE5ldHdvcmsxKDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBp
 # bmcgQ0ECEHvU5a+6zAc/oQEjBCJBTRIwCwYJYIZIAWUDBAIBoIGkMBoGCSqGSIb3
-# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjMxMDMxMTgxNzQx
+# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjQwMjA3MTU1NDAy
-# WjAvBgkqhkiG9w0BCQQxIgQgN8MirsZRtx0Hag939umh2bFUS+X8+SB8KcJ4DCtA
+# WjAvBgkqhkiG9w0BCQQxIgQg570COHsaZPS9rjX6BejuZj8Sq+pKr21RdiXdWz3K
-# b0IwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
+# O1MwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
-# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAJ4k1y9jwC4JhtZwvqaOp8MbLuyx
+# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAInhOfqTOXDdnHraAsocyn30sofK
-# LAFYztqX5YMtx/f1JxuH3hGMMoiKT72YgJI5pSrJYCuy0+biyHtLxBJtl3k/ZlTr
+# m/jHs++YFntM7KV18KMzYmuDtWJlZf98q2LqryJ/4Lq9rwbR+F83GprDYWD7LnpW
-# lAkuhkmqcNvujDkygvLtIW4w1EwFlrPtqSvaWfR2+/VL7BjNQ4nwukLc1u+/6Owh
+# XI/GdSxdUDIO4BDQp6ckAbQ3uzh6DxtlsW9CCMIHdJpPpY5pjeI0Gv4YyGFPDgY+
-# hlvT8LIpvDZAnb532pQ9EtJXpCxWsWiv50ESiGxTNNZ0trsHPe06q9VSBG9ast8o
+# QC4d/95+yC3pUOqxMdeK5O0IHuHOF0iER+52doaqbnAPaA6s0UD1jkJKVk7SXej5
-# 7wWIlTeF3VWSclONzbfp6gkr6Bpo0NsBMo3GZ0Ub4jrseLR1l6QPcLqpejeB+vBv
+# YXa+0hI0Oseu6j1yaqkoFSV24uecmEh+xnfRvVM7dlltGsVJ5L1xLx396/7LW9Wr
-# lR7zXf1n1AZhw4Bo5lWz7KCoVGOILgX38EU/wLzko5PJna8wZ4KZjiF3d4E=
+# J8HxJBxc775T9RcpIMTzxPkrRfngY0e7+D13hVLyfmYNkC0OxuekJ7f16O8=
 # SIG # End signature block