fix Test-Network

Author: FaserF

Sources/Winget-AutoUpdate/functions/Test-Network.ps1

@@ -2,16 +2,16 @@
 
 function Test-Network {
 
-    #Init
+    # Init
     $timeout = 0
 
     #Test connectivity during 30 min then timeout
     Write-ToLog "Checking internet connection..." "Yellow"
 
     try {
         $NlaRegKey = "HKLM:\SYSTEM\CurrentControlSet\Services\NlaSvc\Parameters\Internet"
-        $ncsiHost = Get-ItemPropertyValue    -Path $NlaRegKey -Name ActiveWebProbeHost
-        $ncsiPath = Get-ItemPropertyValue    -Path $NlaRegKey -Name ActiveWebProbePath
+        $ncsiHost = Get-ItemPropertyValue -Path $NlaRegKey -Name ActiveWebProbeHost
+        $ncsiPath = Get-ItemPropertyValue -Path $NlaRegKey -Name ActiveWebProbePath
         $ncsiContent = Get-ItemPropertyValue -Path $NlaRegKey -Name ActiveWebProbeContent
     }
     catch {
@@ -20,7 +20,7 @@ function Test-Network {
         $ncsiContent = "Microsoft Connect Test"
     }
 
-    While ($timeout -lt 1800) {
+    while ($timeout -lt 1800) {
         try {
             $ncsiResponse = Invoke-WebRequest -Uri "http://$($ncsiHost)/$($ncsiPath)" -UseBasicParsing -UserAgent ([Microsoft.PowerShell.Commands.PSUserAgent]::Chrome); # DevSkim: ignore DS137138 Insecure URL
         }
@@ -31,74 +31,60 @@ function Test-Network {
         if (($ncsiResponse) -and ($ncsiResponse.StatusCode -eq 200) -and ($ncsiResponse.content -eq $ncsiContent)) {
             Write-ToLog "Connected !" "Green"
 
-            #Check for metered connection
+            # Check for metered connection
             try {
-                Add-Type -AssemblyName 'Windows.Networking, ContentType=WindowsRuntime' -ErrorAction Stop
-                #[void][Windows.Networking.Connectivity.NetworkInformation, Windows, ContentType = WindowsRuntime]
+                [void][Windows.Networking.Connectivity.NetworkInformation, Windows, ContentType = WindowsRuntime]
                 $cost = [Windows.Networking.Connectivity.NetworkInformation]::GetInternetConnectionProfile().GetConnectionCost()
+
+                $networkCostTypeName = [Windows.Networking.Connectivity.NetworkCostType]::GetName(
+                    [Windows.Networking.Connectivity.NetworkCostType],
+                    $cost.NetworkCostType
+                )
             }
             catch {
                 Write-ToLog "Could not evaluate metered connection status - skipping check." "Gray"
                 return $true
             }
 
-            if ($cost.ApproachingDataLimit -or $cost.OverDataLimit -or $cost.Roaming -or $cost.BackgroundDataUsageRestricted -or ($cost.NetworkCostType -ne "Unrestricted")) {
-
+            if ($cost.ApproachingDataLimit -or $cost.OverDataLimit -or $cost.Roaming -or $cost.BackgroundDataUsageRestricted -or ($networkCostTypeName -ne "Unrestricted")) {
                 Write-ToLog "Metered connection detected." "Yellow"
 
                 if ($WAUConfig.WAU_DoNotRunOnMetered -eq 1) {
-
                     Write-ToLog "WAU is configured to bypass update checking on metered connection"
                     return $false
-
                 }
                 else {
-
                     Write-ToLog "WAU is configured to force update checking on metered connection"
                     return $true
-
                 }
-
             }
             else {
-
                 return $true
-
             }
-
         }
         else {
-
             Start-Sleep 10
             $timeout += 10
 
-            #Send Warning Notif if no connection for 5 min
             if ($timeout -eq 300) {
-                #Log
                 Write-ToLog "Notify 'No connection' sent." "Yellow"
 
-                #Notif
                 $Title = $NotifLocale.local.outputs.output[0].title
                 $Message = $NotifLocale.local.outputs.output[0].message
                 $MessageType = "warning"
                 $Balise = "Connection"
                 Start-NotifTask -Title $Title -Message $Message -MessageType $MessageType -Balise $Balise
             }
-
         }
-
     }
 
-    #Send Timeout Notif if no connection for 30 min
     Write-ToLog "Timeout. No internet connection !" "Red"
 
-    #Notif
     $Title = $NotifLocale.local.outputs.output[1].title
     $Message = $NotifLocale.local.outputs.output[1].message
     $MessageType = "error"
     $Balise = "Connection"
     Start-NotifTask -Title $Title -Message $Message -MessageType $MessageType -Balise $Balise
 
     return $false
-
-}
+}