Use ConvertFromJson/ConvertToJson APIs directly

Author: daxian-dbw

src/PowerShell/PowerShellManager.cs

@@ -190,18 +190,6 @@ internal Hashtable InvokeFunction(
             }
         }
 
-        /// <summary>
-        /// Helper method to convert the result returned from a function to JSON.
-        /// </summary>
-        internal string ConvertToJson(object fromObj)
-        {
-            return _pwsh.AddCommand("Microsoft.PowerShell.Utility\\ConvertTo-Json")
-                            .AddParameter("InputObject", fromObj)
-                            .AddParameter("Depth", 3)
-                            .AddParameter("Compress", true)
-                        .InvokeAndClearCommands<string>()[0];
-        }
-
         private void ResetRunspace(string moduleName)
         {
             // Reset the runspace to the Initial Session State

src/RequestProcessor.cs

@@ -164,7 +164,7 @@ private void ProcessInvocationRequestImpl(StreamingMessage request, AzFunctionIn
                     ? InvokeOrchestrationFunction(psManager, functionInfo, invocationRequest)
                     : InvokeSingleActivityFunction(psManager, functionInfo, invocationRequest);
 
-                BindOutputFromResult(psManager, response.InvocationResponse, functionInfo, results);
+                BindOutputFromResult(response.InvocationResponse, functionInfo, results);
             }
             catch (Exception e)
             {
@@ -239,7 +239,7 @@ private Hashtable InvokeSingleActivityFunction(PowerShellManager psManager, AzFu
         /// <summary>
         /// Set the 'ReturnValue' and 'OutputData' based on the invocation results appropriately.
         /// </summary>
-        private void BindOutputFromResult(PowerShellManager psManager, InvocationResponse response, AzFunctionInfo functionInfo, Hashtable results)
+        private void BindOutputFromResult(InvocationResponse response, AzFunctionInfo functionInfo, Hashtable results)
         {
             switch (functionInfo.Type)
             {
@@ -252,7 +252,7 @@ private void BindOutputFromResult(PowerShellManager psManager, InvocationRespons
 
                         object outValue = results[outBindingName];
                         object transformedValue = Utils.TransformOutBindingValueAsNeeded(outBindingName, bindingInfo, outValue);
-                        TypedData dataToUse = transformedValue.ToTypedData(psManager);
+                        TypedData dataToUse = transformedValue.ToTypedData();
 
                         // if one of the bindings is '$return' we need to set the ReturnValue
                         if(string.Equals(outBindingName, AzFunctionInfo.DollarReturn, StringComparison.OrdinalIgnoreCase))
@@ -273,7 +273,7 @@ private void BindOutputFromResult(PowerShellManager psManager, InvocationRespons
 
                 case AzFunctionType.OrchestrationFunction:
                 case AzFunctionType.ActivityFunction:
-                    response.ReturnValue = results[AzFunctionInfo.DollarReturn].ToTypedData(psManager);
+                    response.ReturnValue = results[AzFunctionInfo.DollarReturn].ToTypedData();
                     break;
 
                 default:

src/Utility/TypeExtensions.cs

@@ -8,11 +8,11 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation;
-using System.Reflection;
 
 using Google.Protobuf;
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Microsoft.Azure.Functions.PowerShellWorker.PowerShell;
+using Microsoft.PowerShell.Commands;
 using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Azure.Functions.PowerShellWorker.Utility
@@ -94,30 +94,9 @@ internal static object ToObject(this TypedData data)
             }
         }
 
-        // PowerShell NuGet packages only have 'System.Management.Automation.dll' as the ref assembly, and thus types from other powershell assemblies
-        // cannot be used directly in an application that reference the PowerShell NuGet packages. This is tracked by PowerShell#8121.
-        // Here we need to use 'Microsoft.PowerShell.Commands.JsonObject' from 'Microsoft.PowerShell.Commands.Utility'. Due the above issue, we have to
-        // use reflection to call 'JsonObject.ConvertFromJson(...)'.
-        private static MethodInfo s_ConvertFromJson = null;
         private static object ConvertFromJson(string json)
         {
-            const string UtilityAssemblyFullName = "Microsoft.PowerShell.Commands.Utility, Version=6.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
-
-            if (s_ConvertFromJson == null)
-            {
-                Assembly utilityAssembly = AppDomain.CurrentDomain.GetAssemblies().First(asm => asm.FullName == UtilityAssemblyFullName);
-                Type jsonObjectType = utilityAssembly.GetType("Microsoft.PowerShell.Commands.JsonObject");
-                s_ConvertFromJson = jsonObjectType.GetMethod(
-                    name: "ConvertFromJson",
-                    types: new Type[] { typeof(string), typeof(bool), typeof(ErrorRecord).MakeByRefType() },
-                    modifiers: null);
-            }
-
-            object retObj = s_ConvertFromJson.Invoke(null, new object[] { json, true, null });
-            if (retObj is PSObject psObj)
-            {
-                retObj = psObj.BaseObject;
-            }
+            object retObj = JsonObject.ConvertFromJson(json, returnHashtable: true, out _);
 
             if (retObj is Hashtable hashtable)
             {
@@ -136,6 +115,16 @@ private static object ConvertFromJson(string json)
             return retObj;
         }
 
+        private static string ConvertToJson(object fromObj)
+        {
+            var context = new JsonObject.ConvertToJsonContext(
+                maxDepth: 3,
+                enumsAsStrings: false,
+                compressOutput: true);
+
+            return JsonObject.ConvertToJson(fromObj, in context);
+        }
+
         internal static RpcException ToRpcException(this Exception exception)
         {
             return new RpcException
@@ -146,7 +135,7 @@ internal static RpcException ToRpcException(this Exception exception)
             };
         }
 
-        private static RpcHttp ToRpcHttp(this HttpResponseContext httpResponseContext, PowerShellManager psHelper)
+        private static RpcHttp ToRpcHttp(this HttpResponseContext httpResponseContext)
         {
             var rpcHttp = new RpcHttp
             {
@@ -155,7 +144,7 @@ private static RpcHttp ToRpcHttp(this HttpResponseContext httpResponseContext, P
 
             if (httpResponseContext.Body != null)
             {
-                rpcHttp.Body = httpResponseContext.Body.ToTypedData(psHelper);
+                rpcHttp.Body = httpResponseContext.Body.ToTypedData();
             }
 
             rpcHttp.EnableContentNegotiation = httpResponseContext.EnableContentNegotiation;
@@ -178,7 +167,7 @@ private static RpcHttp ToRpcHttp(this HttpResponseContext httpResponseContext, P
             return rpcHttp;
         }
 
-        internal static TypedData ToTypedData(this object value, PowerShellManager psHelper)
+        internal static TypedData ToTypedData(this object value)
         {
             if (value is TypedData self)
             {
@@ -218,14 +207,13 @@ internal static TypedData ToTypedData(this object value, PowerShellManager psHel
                     typedData.Stream = ByteString.FromStream(s);
                     break;
                 case HttpResponseContext http:
-                    typedData.Http = http.ToRpcHttp(psHelper);
+                    typedData.Http = http.ToRpcHttp();
                     break;
                 case string str:
                     if (IsValidJson(str)) { typedData.Json = str; } else { typedData.String = str; }
                     break;
                 default:
-                    if (psHelper == null) { throw new ArgumentNullException(nameof(psHelper)); }
-                    typedData.Json = psHelper.ConvertToJson(originalValue);
+                    typedData.Json = ConvertToJson(originalValue);
                     break;
             }
             return typedData;