Throwing HttpInvocationException instead of generic Exception

rosieks · SteveSandersonMS · commit 6d85e752e1fb · 2017-06-20T16:33:34.000+01:00
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
@@ -21,6 +21,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
 /// <seealso cref="Microsoft.AspNetCore.NodeServices.HostingModels.OutOfProcessNodeInstance" />
 internal class HttpNodeInstance : OutOfProcessNodeInstance
{
+ private readonly static int streamBufferSize = 16 * 1024;
 private static readonly Regex PortMessageRegex =
 new Regex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port (\d+)\]$");
 
@@ -67,8 +68,10 @@ protected override async Task<T> InvokeExportAsync<T>(
 if (!response.IsSuccessStatusCode)
{
 // Unfortunately there's no true way to cancel ReadAsStringAsync calls, hence AbandonIfCancelled
- var responseErrorString = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
- throw new Exception("Call to Node module failed with error: " + responseErrorString);
+ var responseJson = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
+ var responseError = JsonConvert.DeserializeObject<RpcJsonResponse>(responseJson, jsonSerializerSettings);
+
+ throw new NodeInvocationException(responseError.ErrorMessage, responseError.ErrorDetails);
 }
 
 var responseContentType = response.Content.Headers.ContentType;
@@ -136,5 +139,35 @@ protected override void Dispose(bool disposing)
 _disposed = true;
 }
 }
+
+ private static async Task<T> ReadJsonAsync<T>(Stream stream, CancellationToken cancellationToken)
+{
+ var json = Encoding.UTF8.GetString(await ReadAllBytesAsync(stream, cancellationToken));
+ return JsonConvert.DeserializeObject<T>(json, jsonSerializerSettings);
+ }
+
+ private static async Task<byte[]> ReadAllBytesAsync(Stream input, CancellationToken cancellationToken)
+{
+ byte[] buffer = new byte[streamBufferSize];
+
+ using (var ms = new MemoryStream())
+{
+ int read;
+ while ((read = await input.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0)
+{
+ ms.Write(buffer, 0, read);
+ }
+
+ return ms.ToArray();
+ }
+ }
+
+#pragma warning disable 649 // These properties are populated via JSON deserialization
+ private class RpcJsonResponse
+{
+ public string ErrorMessage{get; set}
+ public string ErrorDetails{get; set}
+ }
+#pragma warning restore 649
 }
 }
diff --git a/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts b/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts
@@ -86,5 +86,8 @@ function readRequestBodyAsJson(request, callback){
 
 function respondWithError(res: http.ServerResponse, errorValue: any){
 res.statusCode = 500;
- res.end(errorValue.stack || errorValue.toString());
+ res.end(JSON.stringify({
+ errorMessage: errorValue.message || errorValue,
+ errorDetails: errorValue.stack || null
+ }));
 }

-Original file line number
+Diff line change
 /// <seealso cref="Microsoft.AspNetCore.NodeServices.HostingModels.OutOfProcessNodeInstance" />
 internalclassHttpNodeInstance:OutOfProcessNodeInstance
+{
 +privatereadonlystaticintstreamBufferSize=16*1024;
 privatestaticreadonlyRegexPortMessageRegex=
 newRegex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port (\d+)\]$");
 if(!response.IsSuccessStatusCode)
+{
 // Unfortunately there's no true way to cancel ReadAsStringAsync calls, hence AbandonIfCancelled
 -varresponseErrorString=awaitresponse.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
 -thrownewException("Call to Node module failed with error: "+responseErrorString);
 +varresponseJson=awaitresponse.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
 +varresponseError=JsonConvert.DeserializeObject<RpcJsonResponse>(responseJson,jsonSerializerSettings);
++
 +thrownewNodeInvocationException(responseError.ErrorMessage,responseError.ErrorDetails);
+}
 varresponseContentType=response.Content.Headers.ContentType;
 _disposed=true;
+}
+}
++
 +privatestaticasyncTask<T>ReadJsonAsync<T>(Streamstream,CancellationTokencancellationToken)
 +{
 +varjson=Encoding.UTF8.GetString(awaitReadAllBytesAsync(stream,cancellationToken));
 +returnJsonConvert.DeserializeObject<T>(json,jsonSerializerSettings);
 +}
++
 +privatestaticasyncTask<byte[]>ReadAllBytesAsync(Streaminput,CancellationTokencancellationToken)
 +{
 +byte[]buffer=newbyte[streamBufferSize];
++
 +using(varms=newMemoryStream())
 +{
 +intread;
 +while((read=awaitinput.ReadAsync(buffer,0,buffer.Length,cancellationToken))>0)
 +{
 +ms.Write(buffer,0,read);
 +}
++
 +returnms.ToArray();
 +}
 +}
++
 +#pragma warning disable 649// These properties are populated via JSON deserialization
 +privateclassRpcJsonResponse
 +{
 +publicstringErrorMessage{get;set;}
 +publicstringErrorDetails{get;set;}
 +}
 +#pragma warning restore 649
+}
+}
Original file line number	Diff line number	Diff line change
`@@ -86,5 +86,8 @@ function readRequestBodyAsJson(request, callback){`
`86`	`86`
`87`	`87`	`functionrespondWithError(res: http.ServerResponse,errorValue: any){`
`88`	`88`	`res.statusCode=500;`
`89`		`-res.end(errorValue.stack\|\|errorValue.toString());`
	`89`	`+res.end(JSON.stringify({`
	`90`	`+errorMessage: errorValue.message\|\|errorValue,`
	`91`	`+errorDetails: errorValue.stack\|\|null`
	`92`	`+}));`
`90`	`93`	`}`