Use separate clients in proxy. Add tg-proxy scripts.

Author: allisterb

build.cmd

@@ -2,9 +2,14 @@
 @setlocal
 set ERROR_CODE=0
 
+echo Building CLI...
 cd src\TigerGraph.CLI\
 dotnet build /p:Configuration=Debug %*
 
+echo Building proxy...
+cd ..\TigerGraph.CLI\
+dotnet build /p:Configuration=Debug %*
+
 :end
 cd ..\..
 exit /B %ERROR_CODE%

src/TigerGraph.NET.sln

@@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{9A0B
 		..\scripts\endpoints.cmd = ..\scripts\endpoints.cmd
 		..\scripts\schema.cmd = ..\scripts\schema.cmd
 		..\tg = ..\tg
+		..\tg-proxy = ..\tg-proxy
+		..\tg-proxy.cmd = ..\tg-proxy.cmd
 		..\tg.cmd = ..\tg.cmd
 		..\scripts\vertices.cmd = ..\scripts\vertices.cmd
 	EndProjectSection

src/TigerGraph.Proxy/Program.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Text;
 using System.Net;
 
 using Microsoft.AspNetCore.Hosting;
@@ -17,44 +18,66 @@ public class Program
         #region Entry-point
         public static void Main(string[] args)
         {
+            /* Configure the Serilog Logger */
             var config = new LoggerConfiguration();
             Log.Logger = config.MinimumLevel.Debug().Enrich.FromLogContext().WriteTo.Console().CreateLogger();
 
-            if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TG_TOKEN")))
+            /* Check for required environment vars */
+            if (string.IsNullOrEmpty(TG_TOKEN))
             {
                 Log.Error("The environment variable {0} could not be read.", "TG_TOKEN");
                 return;
             }
-            else if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TG_SERVER_URL")))
+            else if (string.IsNullOrEmpty(TG_REST_SERVER_URL))
             {
-                Log.Error("The environment variable {0} could not be read.", "TG_SERVER_URL");
+                Log.Error("The environment variable {0} could not be read.", "TG_REST_SERVER_URL");
                 return;
             }
-            else if (!Uri.TryCreate(Environment.GetEnvironmentVariable("TG_SERVER_URL"), UriKind.Absolute, out Uri u))
+            else if (string.IsNullOrEmpty(TG_GSQL_SERVER_URL))
             {
-                Log.Error("The environment variable {0}:{1} is not a valid URI.", "TG_SERVER_URL", Environment.GetEnvironmentVariable("TG_SERVER_URL"));
+                Log.Error("The environment variable {0} could not be read.", "TG_GSQL_SERVER_URL");
+                return;
+            }
+            else if (!Uri.TryCreate(TG_REST_SERVER_URL, UriKind.Absolute, out Uri rsu))
+            {
+                Log.Error("The environment variable {0}:{1} is not a valid URI.", "TG_REST_SERVER_URL", TG_REST_SERVER_URL);
+                return;
+            }
+            else if (!Uri.TryCreate(TG_GSQL_SERVER_URL, UriKind.Absolute, out Uri gu))
+            {
+                Log.Error("The environment variable {0}:{1} is not a valid URI.", "TG_GSQL_SERVER_URL", TG_GSQL_SERVER_URL);
                 return;
             }
             else
             {
-                WebClient wc = new WebClient();
-                wc.Headers.Add("Authorization", "Bearer " + Environment.GetEnvironmentVariable("TG_TOKEN"));
+                /* Setup authentication to the TG servers */
+                RestServerWebClient = new WebClient();
+                RestServerWebClient.Headers.Add("Authorization", "Bearer " + TG_TOKEN);
+                GsqlServerWebClient = new WebClient();
+                string credentials = Convert.ToBase64String(
+                    Encoding.ASCII.GetBytes(TG_USER + ":" + TG_PASS));
+                GsqlServerWebClient.Headers[HttpRequestHeader.Authorization] = string.Format(
+                    "Basic {0}", credentials);
+                Log.Information("Authentication to REST++ server at {0} and GSQL server at {1} initialized.", TG_REST_SERVER_URL, TG_GSQL_SERVER_URL);
+                /* Setup the timer for pinging the server.*/
                 var pingTimer = new System.Timers.Timer(1000 * 60 * 15);
                 pingTimer.Elapsed += (sender, e) => {
                     var now = DateTime.Now;
                     try
                     {
-                        wc.DownloadString(u.ToString() + "echo");
-                        Log.Information("Pinged {0} at {1}.", u, now);
+                        RestServerWebClient.DownloadString(rsu.ToString() + "echo");
+                        Log.Information("Pinged {0} at {1}.", rsu, now);
                     }
                     catch (Exception ex)
                     {
-                        Log.Error(ex, "Error attempting to ping {0} at {1}.", u, now);
+                        Log.Error(ex, "Error attempting to ping {0} at {1}.", rsu, now);
                     }
                 };
                 pingTimer.Enabled = true;
                 CreateHostBuilder(args).Build().Run();
-                wc.Dispose();
+                /* After the webhost shuts down dispose of any unmanaged resources. */
+                RestServerWebClient.Dispose();
+                GsqlServerWebClient.Dispose();
                 pingTimer.Dispose();
             }
         }
@@ -70,13 +93,20 @@ public static void Main(string[] args)
         public static string TG_REST_SERVER_URL = Environment.GetEnvironmentVariable("TG_REST_SERVER_URL");
 
         public static string TG_GSQL_SERVER_URL = Environment.GetEnvironmentVariable("TG_GSQL_SERVER_URL");
+
+        public static WebClient RestServerWebClient = new WebClient();
+
+        public static WebClient GsqlServerWebClient = new WebClient();
         #endregion
+
+        #region Methods
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseSerilog();
                     webBuilder.UseStartup<Startup>();
                 });
+        #endregion
     }
 }

src/TigerGraph.Proxy/ProxyController.cs

@@ -16,13 +16,27 @@ namespace TigerGraph.Proxy
 {
     public class ProxyController : ControllerBase
     {
-        private static ILogger<ProxyController> log;
+        #region Constructors
         public ProxyController(ILogger<ProxyController> logger)
         {
             log = logger;
         }
 
-        private HttpProxyOptions _httpOptions = HttpProxyOptionsBuilder.Instance
+        #endregion
+
+        #region Actions
+        [Route("p/{**rest}")]
+        public Task RestServerProxy(string rest)
+        {
+            log.LogInformation("Proxying request {0} to {1}...", rest, $"{Program.TG_REST_SERVER_URL}{rest}");
+            return this.HttpProxyAsync($"{Program.TG_REST_SERVER_URL}/{rest}", _restServerHttpOptions);
+        }
+        #endregion
+
+        #region Fields
+        private static ILogger<ProxyController> log;
+
+        private HttpProxyOptions _restServerHttpOptions = HttpProxyOptionsBuilder.Instance
         .WithShouldAddForwardedHeaders(false)
         .WithHttpClientName("TigerGraphClient")
         .WithIntercept(context =>
@@ -31,8 +45,7 @@ public ProxyController(ILogger<ProxyController> logger)
         })
         .WithBeforeSend((c, hrm) =>
         {
-            hrm.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Environment.GetEnvironmentVariable("TG_TOKEN"));
-
+            hrm.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Program.TG_TOKEN);
             return Task.CompletedTask;
         })
         .WithAfterReceive((c, hrm) =>
@@ -48,12 +61,7 @@ public ProxyController(ILogger<ProxyController> logger)
             log.LogError(e, "Proxy to {0} error.", c.Request.Query);
             return Task.CompletedTask;
         }).Build();
-
-        [Route("p/{**rest}")]
-        public Task Proxy(string rest)
-        {
-            log.LogInformation("Proxying request {0} to {1}...", rest, $"{Environment.GetEnvironmentVariable("TG_SERVER_URL")}{rest}");
-            return this.HttpProxyAsync($"{Environment.GetEnvironmentVariable("TG_SERVER_URL")}{rest}", _httpOptions);
-        }
+        #endregion
     }
+
 }

tg-proxy

@@ -0,0 +1,4 @@
+#!/bin/bash
+cd src/TigerGraph.Proxy
+dotnet run bin/Debug/netcoreapp3.1/TigerGraph.Proxy.exe --urls=$1
+cd ../..

tg-proxy.cmd

@@ -0,0 +1,6 @@
+@echo off
+@setlocal
+
+cd src\TigerGraph.Proxy
+dotnet run bin\Debug\netcoreapp3.1\TigerGraph.Proxy.exe --urls=%1
+cd ..\..