Re-organize the project layout and refactor request processing code

azure-functions-powershell-worker.sln

@@ -5,11 +5,11 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8C758288-3909-4CE1-972D-1BE966628D6C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Functions.PowerShell.Worker", "src\Azure.Functions.PowerShell.Worker\Azure.Functions.PowerShell.Worker.csproj", "{939262BA-4823-405E-81CD-436C0B77D524}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Functions.PowerShell.Worker", "src\Azure.Functions.PowerShell.Worker.csproj", "{939262BA-4823-405E-81CD-436C0B77D524}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{12092936-4F2A-4B40-9AF2-56C840D44FEA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Functions.PowerShell.Worker.Test", "test\Azure.Functions.PowerShell.Worker.Test\Azure.Functions.PowerShell.Worker.Test.csproj", "{535C8DA3-479D-42BF-B1AF-5B03ECAF67A4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Functions.PowerShell.Worker.Test", "test\Azure.Functions.PowerShell.Worker.Test.csproj", "{535C8DA3-479D-42BF-B1AF-5B03ECAF67A4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Azure.Functions.PowerShell.Worker/Properties/AssemblyInfo.cs → src/AssemblyInfo.cs

@@ -6,3 +6,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly:InternalsVisibleTo("Azure.Functions.PowerShell.Worker.Test")]
+

src/Azure.Functions.PowerShell.Worker/Azure.Functions.PowerShell.Worker.csproj → src/Azure.Functions.PowerShell.Worker.csproj

@@ -14,6 +14,7 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <NeutralLanguage>en-US</NeutralLanguage>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0-rc.1" />
@@ -27,7 +28,8 @@
     <None Include="worker.config.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Azure.Functions.PowerShell.Worker.Module\**">
+    <None Include="Modules\**">
+      <Link>Modules\%(RecursiveDir)\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

src/Azure.Functions.PowerShell.Worker/Messaging/FunctionMessagingClient.cs → src/Messaging/MessagingStream.cs

@@ -12,13 +12,13 @@
 
 namespace Microsoft.Azure.Functions.PowerShellWorker.Messaging
 {
-    internal class FunctionMessagingClient : IDisposable
+    internal class MessagingStream : IDisposable
     {
-        SemaphoreSlim _writeStreamHandle = new SemaphoreSlim(1, 1);
-        AsyncDuplexStreamingCall<StreamingMessage, StreamingMessage> _call;
-        public bool isDisposed;
+        private SemaphoreSlim _writeStreamHandle = new SemaphoreSlim(1, 1);
+        private AsyncDuplexStreamingCall<StreamingMessage, StreamingMessage> _call;
+        private bool isDisposed;
 
-        public FunctionMessagingClient(string host, int port)
+        public MessagingStream(string host, int port)
         {
             Channel channel = new Channel(host, port, ChannelCredentials.Insecure);
             _call = new FunctionRpc.FunctionRpcClient(channel).EventStream();
@@ -56,4 +56,4 @@ public async Task WriteAsync(StreamingMessage message)
             }
         }
     }
-}
+}

src/Azure.Functions.PowerShell.Worker/Messaging/RpcLogger.cs → src/Messaging/RpcLogger.cs

@@ -13,13 +13,13 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.Utility
 {
     internal class RpcLogger : ILogger
     {
-        FunctionMessagingClient _client;
-        string _invocationId = "";
-        string _requestId = "";
+        private MessagingStream _msgStream;
+        private string _invocationId = "";
+        private string _requestId = "";
 
-        public RpcLogger(FunctionMessagingClient client)
+        public RpcLogger(MessagingStream msgStream)
         {
-            _client = client;
+            _msgStream = msgStream;
         }
 
         public IDisposable BeginScope<TState>(TState state) =>
@@ -51,7 +51,7 @@ public bool IsEnabled(LogLevel logLevel) =>
 
         public async void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
         {
-            if (_client != null)
+            if (_msgStream != null)
             {
                 var logMessage = new StreamingMessage
                 {
@@ -65,7 +65,7 @@ public async void Log<TState>(LogLevel logLevel, EventId eventId, TState state,
                     }
                 };
 
-                await _client.WriteAsync(logMessage);
+                await _msgStream.WriteAsync(logMessage);
             }
         }