Changeset 279 for binary-improvements/MapRendering

Timestamp:

Jun 19, 2016, 1:52:31 PM (9 years ago)

Author:

alloc

Message:

Mod stuff

Location:

binary-improvements/MapRendering

Files:

• Commands/webstat.cs (modified) (1 diff)
• Web/API/ExecuteConsoleCommand.cs (modified) (2 diffs)
• Web/API/GetAllowedCommands.cs (added)
• Web/API/GetPlayerList.cs (added)
• Web/API/GetServerInfo.cs (added)
• Web/API/GetStats.cs (modified) (1 diff)
• Web/API/GetWebUIUpdates.cs (modified) (1 diff)
• Web/API/WebAPI.cs (modified) (1 diff)
• Web/Handlers/ApiHandler.cs (modified) (1 diff)
• Web/Handlers/PathHandler.cs (modified) (1 diff)
• Web/Web.cs (modified) (4 diffs)
• Web/WebCommandResult.cs (added)
• Web/WebPermissions.cs (modified) (1 diff)
• WebAndMapRendering.csproj (modified) (1 diff)

binary-improvements/MapRendering/Commands/webstat.cs

@@ -19 +19 @@
                 {
                         try {
-                                SdtdConsole.Instance.Output ("Current handlers: " + AllocsFixes.NetConnections.Servers.Web.Web.currentHandlers + " - total: " + AllocsFixes.NetConnections.Servers.Web.Web.handlingCount);
+                                int curHandlers = AllocsFixes.NetConnections.Servers.Web.Web.currentHandlers;
+                                int totalHandlers = AllocsFixes.NetConnections.Servers.Web.Web.handlingCount;
+                                long totalTime = AllocsFixes.NetConnections.Servers.Web.Web.totalHandlingTime;
+                                SdtdConsole.Instance.Output ("Current Web handlers: " + curHandlers + " - total: " + totalHandlers);
+                                SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs - average time: " + (totalTime / totalHandlers) + " µs");
+
+                                curHandlers = AllocsFixes.NetConnections.Servers.Web.WebCommandResult.currentHandlers;
+                                totalHandlers = AllocsFixes.NetConnections.Servers.Web.WebCommandResult.handlingCount;
+                                totalTime = AllocsFixes.NetConnections.Servers.Web.WebCommandResult.totalHandlingTime;
+                                SdtdConsole.Instance.Output ("Current Web command handlers: " + curHandlers + " - total: " + totalHandlers);
+                                SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs" + (totalHandlers > 0 ? " - average time: " + (totalTime / totalHandlers) + " µs" : ""));
                         } catch (Exception e) {
                                 Log.Out ("Error in webstat.Run: " + e);

binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs

@@ -16 +16 @@
                         }
 
-                        string commandName = req.QueryString ["command"];
+                        string commandline = req.QueryString ["command"];
+                        string commandPart = commandline.Split (' ') [0];
+                        string argumentsPart = commandline.Substring (Math.Min (commandline.Length, commandPart.Length + 1));
 
-                        IConsoleCommand command = SdtdConsole.Instance.GetCommand (commandName);
+                        IConsoleCommand command = SdtdConsole.Instance.GetCommand (commandline);
 
                         if (command == null) {
@@ -36 +38 @@
                         // TODO: Execute command (store resp as IConsoleConnection instance to deliver response to the single client?)
 
-//                      JSONObject result = new JSONObject ();
-//                      result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumGamePrefs.LandClaimSize)));
-//
-//                      JSONArray claimOwners = new JSONArray ();
-//                      result.Add ("claimowners", claimOwners);
-//
-//                      Dictionary<Vector3i, PersistentPlayerData> d = GameManager.Instance.GetPersistentPlayerList ().m_lpBlockMap;
-//                      if (d != null) {
-//                              World w = GameManager.Instance.World;
-//                              Dictionary<PersistentPlayerData, List<Vector3i>> owners = new Dictionary<PersistentPlayerData, List<Vector3i>> ();
-//                              foreach (KeyValuePair<Vector3i, PersistentPlayerData> kvp in d) {
-//                                      if (steamid.Length == 0 || kvp.Value.PlayerId.Equals (steamid)) {
-//                                              if (!owners.ContainsKey (kvp.Value)) {
-//                                                      owners.Add (kvp.Value, new List<Vector3i> ());
-//                                              }
-//                                              owners [kvp.Value].Add (kvp.Key);
-//                                      }
-//                              }
-//
-//                              foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
-//                                      if (steamid.Length == 0 || kvp.Key.PlayerId.Equals (steamid)) {
-//                                              string curID = kvp.Key.PlayerId;
-//                                              bool isActive = w.IsLandProtectionValidForPlayer (kvp.Key);
-//
-//                                              JSONObject owner = new JSONObject ();
-//                                              claimOwners.Add (owner);
-//
-//                                              owner.Add ("steamid", new JSONString (curID));
-//                                              owner.Add ("claimactive", new JSONBoolean (isActive));
-//
-//                                              JSONArray claims = new JSONArray ();
-//                                              owner.Add ("claims", claims);
-//
-//                                              foreach (Vector3i v in kvp.Value) {
-//                                                      JSONObject claim = new JSONObject ();
-//                                                      claim.Add ("x", new JSONNumber (v.x));
-//                                                      claim.Add ("y", new JSONNumber (v.y));
-//                                                      claim.Add ("z", new JSONNumber (v.z));
-//
-//                                                      claims.Add (claim);
-//                                              }
-//                                      }
-//                              }
-//                      }
-//
-//                      WriteJSON (resp, result);
+                        resp.SendChunked = true;
+                        WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, resp);
+                        SdtdConsole.Instance.ExecuteAsync (commandline, wcr);
+                }
+
+                public override int DefaultPermissionLevel () {
+                        return 2000;
                 }
         }

binary-improvements/MapRendering/Web/API/GetStats.cs

@@ -26 +26 @@
                         WriteJSON (resp, result);
                 }
+
+                public override int DefaultPermissionLevel () {
+                        return 2000;
+                }
         }
 }

binary-improvements/MapRendering/Web/API/GetWebUIUpdates.cs

@@ -31 +31 @@
                         WriteJSON (resp, result);
                 }
+
+                public override int DefaultPermissionLevel () {
+                        return 2000;
+                }
         }
 }

binary-improvements/MapRendering/Web/API/WebAPI.cs

@@ -17 +17 @@
 
                 public abstract void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel);
+
+                public virtual int DefaultPermissionLevel () {
+                        return 0;
+                }
         }
 }

binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

@@ -40 +40 @@
                 private void addApi (string _apiName, WebAPI _api) {
                         apis.Add (_apiName, _api);
-                        WebPermissions.Instance.AddKnownModule ("webapi." + _apiName);
+                        WebPermissions.Instance.AddKnownModule ("webapi." + _apiName, _api.DefaultPermissionLevel ());
                 }
 

binary-improvements/MapRendering/Web/Handlers/PathHandler.cs

@@ -11 +11 @@
                 }
 
-                protected PathHandler (string _moduleName) {
+                protected PathHandler (string _moduleName, int _defaultPermissionLevel = 0) {
                         this.moduleName = _moduleName;
-                        WebPermissions.Instance.AddKnownModule (_moduleName);
+                        WebPermissions.Instance.AddKnownModule (_moduleName, _defaultPermissionLevel);
                 }
 

binary-improvements/MapRendering/Web/Web.cs

@@ -20 +20 @@
                 public static int handlingCount = 0;
                 public static int currentHandlers = 0;
+                public static long totalHandlingTime = 0;
                 private string dataFolder;
                 private bool useStaticCache = false;
@@ -131 +132 @@
                                 Interlocked.Increment (ref handlingCount);
                                 Interlocked.Increment (ref currentHandlers);
+                                MicroStopwatch msw = new MicroStopwatch ();
                                 HttpListenerContext ctx = _listener.EndGetContext (result);
                                 _listener.BeginGetContext (new AsyncCallback (HandleRequest), _listener);
@@ -136 +138 @@
                                         HttpListenerRequest request = ctx.Request;
                                         HttpListenerResponse response = ctx.Response;
+                                        response.SendChunked = false;
 
                                         response.ProtocolVersion = new Version ("1.1");
@@ -187 +190 @@
                                         Log.Out ("Error in Web.HandleRequest(): " + e);
                                 } finally {
-                                        if (ctx != null) {
+                                        if (ctx != null && !ctx.Response.SendChunked) {
                                                 ctx.Response.Close ();
                                         }
+                                        msw.Stop ();
+                                        totalHandlingTime += msw.ElapsedMicroseconds;
+                                        Log.Out ("Web.HandleRequest(): Took {0} µs", msw.ElapsedMicroseconds);
                                         Interlocked.Decrement (ref currentHandlers);
                                 }

binary-improvements/MapRendering/Web/WebPermissions.cs

@@ -96 +96 @@
                 }
 
-                public void AddKnownModule (string _module) {
+                public void AddKnownModule (string _module, int _defaultPermission) {
                         if (!string.IsNullOrEmpty (_module)) {
                                 lock (this) {
                     if (!IsKnownModule( _module)) {
-                                            knownModules.Add (_module, new WebModulePermission (_module, 0));
+                                                knownModules.Add (_module, new WebModulePermission (_module, _defaultPermission));
                     }
+                                        if (_defaultPermission > 0 && !modules.ContainsKey (_module.ToLower ())) {
+                                                AddModulePermission (_module, _defaultPermission);
+                                        }
                                 }
                         }

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -86 +86 @@
     <Compile Include="Web\API\GetWebUIUpdates.cs" />
     <Compile Include="Web\API\GetServerInfo.cs" />
+    <Compile Include="Web\API\GetPlayerList.cs" />
+    <Compile Include="Web\WebCommandResult.cs" />
+    <Compile Include="Web\API\GetAllowedCommands.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />