Skip to content

Commit 6ca39ea

Browse files
authored
Merge branch 'main' into docs/add-user-guide
2 parents 0ebcab5 + d894d17 commit 6ca39ea

2 files changed

Lines changed: 28 additions & 0 deletions

File tree

.github/workflows/e2e-desktop.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,26 @@ jobs:
127127
xvfb-run --auto-servernum pnpm test:e2e
128128
'
129129
130+
- name: Install matching EdgeDriver (Windows)
131+
if: matrix.os == 'windows-latest'
132+
shell: pwsh
133+
run: |
134+
# Tauri uses the WebView2 runtime, not Edge directly.
135+
# msedgedriver must match the WebView2 runtime version, not the Edge browser version.
136+
$wv2Key = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
137+
if (-not (Test-Path $wv2Key)) { $wv2Key = 'HKLM:\SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}' }
138+
$wv2Version = (Get-ItemProperty $wv2Key).pv
139+
Write-Host "WebView2 runtime version: $wv2Version"
140+
$driverUrl = "https://msedgewebdriverstorage.blob.core.windows.net/edgewebdriver/$wv2Version/edgedriver_win64.zip"
141+
$zipPath = "$env:TEMP\edgedriver.zip"
142+
$extractDir = "$env:TEMP\edgedriver"
143+
Invoke-WebRequest -Uri $driverUrl -OutFile $zipPath
144+
Expand-Archive -Path $zipPath -DestinationPath $extractDir -Force
145+
$driverDir = "$extractDir\edgedriver_win64"
146+
if (-not (Test-Path "$driverDir\msedgedriver.exe")) { $driverDir = $extractDir }
147+
Write-Host "EdgeDriver path: $driverDir"
148+
echo "$driverDir" | Out-File -Append -Encoding utf8 $env:GITHUB_PATH
149+
130150
- name: Run desktop E2E tests (Windows)
131151
if: matrix.os == 'windows-latest'
132152
run: pnpm test:e2e

crates/mcpmux-gateway/src/pool/transport/http.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ impl HttpTransport {
9494
"access token",
9595
"missing or invalid",
9696
"bearer",
97+
"unexpected content type",
9798
];
9899
oauth_indicators.iter().any(|s| error_lower.contains(s))
99100
}
@@ -845,6 +846,13 @@ mod tests {
845846
assert!(HttpTransport::requires_oauth("transport channel closed"));
846847
}
847848

849+
#[test]
850+
fn test_requires_oauth_unexpected_content_type() {
851+
assert!(HttpTransport::requires_oauth(
852+
"Unexpected content type: Some(\"text/plain;charset=UTF-8\")"
853+
));
854+
}
855+
848856
#[test]
849857
fn test_requires_oauth_false_for_unrelated() {
850858
assert!(!HttpTransport::requires_oauth("connection refused"));

0 commit comments

Comments
 (0)