Dynamo: Handle deserialisation errors on Receive (#1745)

* fix(dyn): Hide System.EventArgs from showing * fix(dyn): Handle deserialisation errors better
specklesystems · Oct 19, 2022 · 0a57040 · 0a57040
1 parent 8b7aa6d
commit 0a57040
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/ConnectorDynamo/ConnectorDynamo/ReceiveNode/Receive.cs b/ConnectorDynamo/ConnectorDynamo/ReceiveNode/Receive.cs
@@ -324,12 +324,12 @@ void ErrorAction(string transportName, Exception e)
       {
         if (!_cancellationToken.IsCancellationRequested)
         {
-          //_cancellationToken.Cancel();
+          _cancellationToken.Cancel();
           var msg = e.ToFormattedString();
           Message = msg.Contains("401") || msg.Contains("don't have access") ? "Not authorized" : "Error";
           Warning(msg);
           _errors.Add(e);
-          //throw;
+          throw;
         }
       }
       finally

diff --git a/ConnectorDynamo/ConnectorDynamoFunctions/BatchConverter.cs b/ConnectorDynamo/ConnectorDynamoFunctions/BatchConverter.cs
@@ -19,6 +19,7 @@ private ISpeckleKit _kit
       get;
       set;
     }
+
     public EventHandler<OnErrorEventArgs> OnError;
 
     public BatchConverter()
@@ -331,16 +332,5 @@ public static bool IsDictionary(object @object)
       return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Dictionary<,>);
     }
   }
-
-  [IsVisibleInDynamoLibrary(false)]
-  public class OnErrorEventArgs : EventArgs
-  {
-    public Exception Error;
-
-    public OnErrorEventArgs(Exception error)
-    {
-      Error = error;
-    }
-  }
 }
 
diff --git a/ConnectorDynamo/ConnectorDynamoFunctions/ConnectorDynamoFunctions.csproj b/ConnectorDynamo/ConnectorDynamoFunctions/ConnectorDynamoFunctions.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -72,6 +72,7 @@
     <Compile Include="InMemoryCache.cs" />
     <Compile Include="Account.cs" />
     <Compile Include="Functions.cs" />
+    <Compile Include="OnErrorEventArgs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Stream.cs" />
     <Compile Include="BatchConverter.cs" />

diff --git a/ConnectorDynamo/ConnectorDynamoFunctions/Functions.cs b/ConnectorDynamo/ConnectorDynamoFunctions/Functions.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading;
 using Autodesk.DesignScript.Runtime;
+using Sentry;
 using Speckle.Core.Api;
 using Speckle.Core.Credentials;
 using Speckle.Core.Kits;
@@ -159,11 +160,15 @@ public static Dictionary<string, object> Receive(StreamWrapper stream, Cancellat
         cancellationToken,
         remoteTransport: transport,
         onProgressAction: onProgressAction,
-        onErrorAction: onErrorAction,
+        onErrorAction: ((s, exception) => throw exception),
         onTotalChildrenCountKnown: onTotalChildrenCountKnown,
         disposeTransports: true
       ).Result;
 
+      if (@base == null)
+      {
+        throw new SpeckleException("Receive operation returned nothing", false);
+      }
       try
       {
         client.CommitReceived(new CommitReceivedInput

diff --git a/ConnectorDynamo/ConnectorDynamoFunctions/OnErrorEventArgs.cs b/ConnectorDynamo/ConnectorDynamoFunctions/OnErrorEventArgs.cs
@@ -0,0 +1,16 @@
+using System;
+using Autodesk.DesignScript.Runtime;
+
+namespace Speckle.ConnectorDynamo
+{
+  [IsVisibleInDynamoLibrary(false)]
+  public class OnErrorEventArgs
+  {
+    public Exception Error;
+
+    public OnErrorEventArgs(Exception error)
+    {
+      Error = error;
+    }
+  }
+}