Fix issue#9807 review 2nd (Replaces PR #11867) DRAFT

src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/Devices/Network.UploadFile.vb

@@ -2,6 +2,9 @@
 ' The .NET Foundation licenses this file to you under the MIT license.
 
 Imports System.Net
+Imports System.Net.Http
+Imports System.Threading
+Imports System.Windows.Forms
 Imports Microsoft.VisualBasic.CompilerServices
 Imports Microsoft.VisualBasic.FileIO
 Imports Microsoft.VisualBasic.MyServices.Internal
@@ -262,6 +265,7 @@ Namespace Microsoft.VisualBasic.Devices
             connectionTimeout As Integer,
             onUserCancel As UICancelOption)
 
+            ' Construct the local file. This will validate the full name and path
             sourceFileName = FileSystemUtils.NormalizeFilePath(sourceFileName, NameOf(sourceFileName))
 
             ' Make sure the file exists
@@ -280,15 +284,13 @@ Namespace Microsoft.VisualBasic.Devices
                 Throw GetArgumentNullException(NameOf(address))
             End If
 
-            Using client As New WebClientExtended()
-                client.Timeout = connectionTimeout
-
-                ' Set credentials if we have any
-                If networkCredentials IsNot Nothing Then
-                    client.Credentials = networkCredentials
-                End If
-
-                Dim dialog As ProgressDialog = Nothing
+            Dim dialog As ProgressDialog = Nothing
+            Try
+                ' Get network credentials
+                Dim clientHandler As HttpClientHandler =
+                    If(networkCredentials Is Nothing,
+                        New HttpClientHandler,
+                        New HttpClientHandler With {.Credentials = networkCredentials})
                 If InteractiveEnvironment(showUI) Then
                     dialog = New ProgressDialog With {
                         .Text = GetResourceString(SR.ProgressDialogUploadingTitle, sourceFileName),
@@ -299,19 +301,39 @@ Namespace Microsoft.VisualBasic.Devices
                     }
                 End If
 
-                ' Create the copier
-                Dim copier As New WebClientCopy(client, dialog)
-
-                ' Download the file
-                copier.UploadFile(sourceFileName, address)
-
-                ' Handle a dialog cancel
-                If InteractiveEnvironment(showUI) Then
-                    If onUserCancel = UICancelOption.ThrowException And dialog.UserCanceledTheDialog Then
-                        Throw New OperationCanceledException()
+                Dim t As Task = UploadFileAsync(
+                    sourceFileName,
+                    addressUri:=address,
+                    clientHandler,
+                    dialog,
+                    connectionTimeout,
+                    onUserCancel)
+
+                If t.IsFaulted Then
+                    ' IsFaulted will be true if any parameters are bad
+                    Throw t.Exception
+                Else
+                    dialog?.ShowProgressDialog()
+                    Do While Not (t.IsCompleted OrElse t.IsFaulted OrElse t.IsCanceled)
+                        ' prevent UI freeze
+                        Thread.Sleep(10)
+                        Application.DoEvents()
+                    Loop
+                    If t.IsFaulted Then
+                        Throw t.Exception
                     End If
+                    If t.IsCanceled Then
+                        Throw New OperationCanceledException
+                    End If
+                End If
+            Catch ex As Exception
+                If ex.InnerException IsNot Nothing Then
+                    Throw ex.InnerException
                 End If
-            End Using
+                Throw
+            Finally
+                CloseProgressDialog(dialog)
+            End Try
 
         End Sub
 

src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/Devices/Network.UploadFileAsync.vb

@@ -0,0 +1,89 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+
+Imports System.Net
+Imports System.Net.Http
+Imports System.Threading
+Imports Microsoft.VisualBasic.CompilerServices
+Imports Microsoft.VisualBasic.FileIO
+Imports Microsoft.VisualBasic.MyServices.Internal
+
+Imports VbUtils = Microsoft.VisualBasic.CompilerServices.ExceptionUtils
+
+Namespace Microsoft.VisualBasic.Devices
+
+    Partial Public Class Network
+        ''' <summary>
+        '''  Uploads a file to the network to the specified path.
+        ''' </summary>
+        ''' <param name="sourceFileName">Name and path of file to be uploaded.</param>
+        ''' <param name="addressUri">Uri to the remote file</param>
+        ''' <param name="clientHandler">An HttpClientHandler of the user performing the download.</param>
+        ''' <param name="dialog">Progress Dialog.</param>
+        ''' <param name="connectionTimeout">Time allotted before giving up on a connection.</param>
+        ''' <param name="onUserCancel">Indicates what to do if user cancels dialog (either throw or do nothing).</param>
+        ''' <param name="cancelToken"><see cref="CancellationToken"/></param>
+        ''' <remarks>Calls to all the other overloads will come through here.</remarks>
+        Friend Shared Async Function UploadFileAsync(
+            sourceFileName As String,
+            addressUri As Uri,
+            clientHandler As HttpClientHandler,
+            dialog As ProgressDialog,
+            connectionTimeout As Integer,
+            onUserCancel As UICancelOption,
+            Optional cancelToken As CancellationToken = Nothing) As Task
+
+            If cancelToken = Nothing Then
+                cancelToken = New CancellationTokenSource().Token
+            End If
+
+            If connectionTimeout <= 0 Then
+                Throw VbUtils.GetArgumentExceptionWithArgName(NameOf(connectionTimeout), SR.Network_BadConnectionTimeout)
+            End If
+
+            If addressUri Is Nothing Then
+                Throw VbUtils.GetArgumentNullException(NameOf(addressUri))
+            End If
+
+            Dim normalizedFilePath As String = FileSystemUtils.NormalizeFilePath(sourceFileName, NameOf(sourceFileName))
+
+            ' Make sure we have a meaningful file.
+            If String.IsNullOrEmpty(normalizedFilePath) Then
+                Throw VbUtils.GetInvalidOperationException(SR.Network_DownloadNeedsFilename)
+            End If
+
+            Dim client As HttpClient = If(clientHandler Is Nothing,
+                                          New HttpClient(),
+                                          New HttpClient(clientHandler))
+            client.Timeout = New TimeSpan(0, 0, 0, 0, connectionTimeout)
+
+            ' Create the copier
+            Dim copier As New HttpClientCopy(client, dialog)
+
+            ' Upload the file
+            Try
+                Await copier.UploadFileWorkerAsync(
+                    filePath:=normalizedFilePath,
+                    requestURI:=addressUri,
+                    externalToken:=cancelToken).ConfigureAwait(continueOnCapturedContext:=False)
+            Catch ioEx As IO.IOException
+                Throw
+
+            Catch ex As Exception
+                If onUserCancel = UICancelOption.ThrowException OrElse (dialog IsNot Nothing AndAlso Not dialog.UserCanceledTheDialog) Then
+                    If ex.Message.Contains("401") Then
+                        Throw New WebException(SR.net_webstatus_Unauthorized, WebExceptionStatus.ProtocolError)
+                    End If
+                    Throw
+                End If
+                If ex.Message.Contains("401") Then
+                    Throw New WebException(SR.net_webstatus_Unauthorized)
+                End If
+            Finally
+                CloseProgressDialog(dialog)
+            End Try
+
+        End Function
+
+    End Class
+End Namespace

src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/Devices/NetworkUtilities.vb

@@ -68,7 +68,7 @@ Namespace Microsoft.VisualBasic.Devices
             showUI As Boolean) As ProgressDialog
 
             If InteractiveEnvironment(showUI) Then
-                'Construct the local file. This will validate the full name and path
+                ' Construct the local file. This will validate the full name and path
                 Dim fullFilename As String = FileSystemUtils.NormalizeFilePath(
                     path:=destinationFileName,
                     paramName:=NameOf(destinationFileName))
@@ -95,7 +95,7 @@ Namespace Microsoft.VisualBasic.Devices
             Try
                 Return New Uri(address)
             Catch ex As UriFormatException
-                'Throw an exception with an error message more appropriate to our API
+                ' Throw an exception with an error message more appropriate to our API
                 Throw GetArgumentExceptionWithArgName(
                     argumentName:=NameOf(address),
                     resourceKey:=SR.Network_InvalidUriString,