refactor(interop): reorganize remaining interop methods and change visibility to internal

Author: max-lancaster

src/PactNet.Extensions.Grpc/GrpcExtensions.cs

@@ -27,8 +27,8 @@ public static IGrpcPactBuilderV4 WithGrpcInteractions(this IPactV4 pact, int? po
 
     private static PactHandle NewGrpcPact(string consumerName, string providerName)
     {
-        PactHandle pact = NativeInterop.NewPact(consumerName, providerName);
-        NativeInterop.WithSpecification(pact, PactSpecification.V4).ThrowExceptionOnFailure();
+        PactHandle pact = PactInterop.NewPact(consumerName, providerName);
+        PactInterop.WithSpecification(pact, PactSpecification.V4).ThrowExceptionOnFailure();
         return pact;
     }
 }

src/PactNet.Extensions.Grpc/GrpcPactBuilder.cs

@@ -91,7 +91,7 @@ public void Verify(Action<IConsumerContext> interact)
         }
         finally
         {
-            this.PrintLogs(mockServer);
+            this.PrintLogs();
         }
     }
 
@@ -119,7 +119,7 @@ public async Task VerifyAsync(Func<IConsumerContext, Task> interact)
         }
         finally
         {
-            this.PrintLogs(mockServer);
+            this.PrintLogs();
         }
     }
 
@@ -165,10 +165,9 @@ private void VerifyInternal(IMockServerDriver mockServer)
     /// <summary>
     /// Print logs to the configured outputs
     /// </summary>
-    /// <param name="mockServer">Mock server</param>
-    private void PrintLogs(IMockServerDriver mockServer)
+    private void PrintLogs()
     {
-        string logs = NativeInterop.FetchLogBuffer(null);
+        string logs = LoggingInterop.FetchLogBuffer(null);
 
         this.config.WriteLine("Mock driver logs:");
         this.config.WriteLine(string.Empty);

src/PactNet.Extensions.Grpc/GrpcRequestBuilder.cs

@@ -58,7 +58,7 @@ internal class GrpcRequestBuilder(InteractionHandle interaction) : IGrpcRequestB
     /// <returns>Fluent builder</returns>
     public IGrpcRequestBuilderV4 Given(string providerState)
     {
-        NativeInterop.Given(interaction, providerState).ThrowExceptionOnFailure();
+        PactInterop.Given(interaction, providerState).ThrowExceptionOnFailure();
         return this;
     }
 
@@ -72,7 +72,7 @@ public IGrpcRequestBuilderV4 Given(string providerState, IDictionary<string, str
     {
         foreach (var param in parameters)
         {
-            NativeInterop.GivenWithParam(interaction, providerState, param.Key, param.Value).ThrowExceptionOnFailure();
+            PactInterop.GivenWithParam(interaction, providerState, param.Key, param.Value).ThrowExceptionOnFailure();
         }
 
         return this;

src/PactNet.Interop/AssemblyInfo.cs

@@ -0,0 +1,2 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("PactNet")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("PactNet.Extensions.Grpc")]

src/PactNet.Interop/HttpInterop.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace PactNet.Interop
+{
+    /// <summary>
+    /// Interop definitions to the Pact FFI library
+    /// </summary>
+    internal static class HttpInterop
+    {
+        private const string DllName = "pact_ffi";
+
+        [DllImport(DllName, EntryPoint = "pactffi_new_interaction")]
+        public static extern InteractionHandle NewInteraction(PactHandle pact, string description);
+
+        [DllImport(DllName, EntryPoint = "pactffi_with_request")]
+        public static extern bool WithRequest(InteractionHandle interaction, string method, string path);
+
+        [DllImport(DllName, EntryPoint = "pactffi_with_query_parameter_v2")]
+        public static extern bool WithQueryParameter(InteractionHandle interaction, string name, UIntPtr index, string value);
+
+        [DllImport(DllName, EntryPoint = "pactffi_with_header_v2")]
+        public static extern bool WithHeader(InteractionHandle interaction, InteractionPart part, string name, UIntPtr index, string value);
+
+        [DllImport(DllName, EntryPoint = "pactffi_response_status")]
+        public static extern bool ResponseStatus(InteractionHandle interaction, ushort status);
+
+        [DllImport(DllName, EntryPoint = "pactffi_with_body")]
+        public static extern bool WithBody(InteractionHandle interaction, InteractionPart part, string contentType, string body);
+    }
+}

src/PactNet.Interop/InteropActionExtensions.cs

@@ -5,7 +5,7 @@ namespace PactNet.Interop
     /// <summary>
     /// Extensions for checking interop action success
     /// </summary>
-    public static class InteropActionExtensions
+    internal static class InteropActionExtensions
     {
         /// <summary>
         /// Check the result of an interop action to ensure it succeeded

src/PactNet.Interop/LevelFilter.cs

@@ -1,6 +1,6 @@
 namespace PactNet.Interop
 {
-    public enum LevelFilter
+    internal enum LevelFilter
     {
         Off = 0,
         Error = 1,

src/PactNet.Interop/LogLevelExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 
 namespace PactNet.Interop;
 
@@ -36,14 +35,5 @@ public static void InitialiseLogging(this PactLogLevel level)
 
             LogInitialised = true;
         }
-
-    }
-
-    private static class LoggingInterop
-    {
-        private const string DllName = "pact_ffi";
-
-        [DllImport(DllName, EntryPoint = "pactffi_log_to_buffer")]
-        public static extern int LogToBuffer(LevelFilter levelFilter);
     }
 }

src/PactNet.Interop/LoggingInterop.cs

@@ -0,0 +1,14 @@
+using System.Runtime.InteropServices;
+
+namespace PactNet.Interop;
+
+internal static class LoggingInterop
+{
+    private const string DllName = "pact_ffi";
+
+    [DllImport(DllName, EntryPoint = "pactffi_log_to_buffer")]
+    public static extern int LogToBuffer(LevelFilter levelFilter);
+
+    [DllImport(DllName, EntryPoint = "pactffi_fetch_log_buffer")]
+    public static extern string FetchLogBuffer(string logId);
+}

src/PactNet.Interop/MessagingInterop.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace PactNet.Interop;
+
+internal static class MessagingInterop
+{
+    private const string DllName = "pact_ffi";
+
+    [DllImport(DllName, EntryPoint = "pactffi_with_message_pact_metadata")]
+    public static extern void WithMessagePactMetadata(PactHandle pact, string @namespace, string name, string value);
+
+    [DllImport(DllName, EntryPoint = "pactffi_new_message_interaction")]
+    public static extern InteractionHandle NewMessageInteraction(PactHandle pact, string description);
+
+    [DllImport(DllName, EntryPoint = "pactffi_message_expects_to_receive")]
+    public static extern void MessageExpectsToReceive(InteractionHandle message, string description);
+
+    [DllImport(DllName, EntryPoint = "pactffi_message_with_metadata")]
+    public static extern void MessageWithMetadata(InteractionHandle message, string key, string value);
+
+    [DllImport(DllName, EntryPoint = "pactffi_message_with_contents")]
+    public static extern void MessageWithContents(InteractionHandle message, string contentType, string body, UIntPtr size);
+
+    [DllImport(DllName, EntryPoint = "pactffi_message_reify")]
+    public static extern IntPtr MessageReify(InteractionHandle message);
+}