tesses50
/
Ooui-tws-port
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an Etag to client.js

This commit is contained in:
Frank A. Krueger 2017-12-09 17:02:04 -08:00
parent 877a835367
commit a96c3977f6
2 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Ooui.AspNetCore/OouiMiddlewareExtensions.cs
View File

@ -30,14 +30,21 @@ namespace Microsoft.AspNetCore.Builder
if (context.Request.Path == jsPath) {
var response = context.Response;
var clientJsBytes = Ooui.UI.ClientJsBytes;
var clientJsEtag = Ooui.UI.ClientJsEtag;
if (context.Request.Headers.TryGetValue ("If-None-Match", out var inms) && inms.Count > 0 && inms[0] == clientJsEtag) {
response.StatusCode = 304;
}
else {
response.StatusCode = 200;
response.ContentLength = clientJsBytes.Length;
response.ContentType = "application/javascript; charset=utf-8";
response.Headers.Add ("Cache-Control", "public, max-age=3600");
response.Headers.Add ("Cache-Control", "public, max-age=60");
response.Headers.Add ("Etag", clientJsEtag);
using (var s = response.Body) {
await s.WriteAsync (clientJsBytes, 0, clientJsBytes.Length).ConfigureAwait (false);
}
}
}
else if (context.Request.Path == WebSocketHandler.WebSocketPath) {
if (context.WebSockets.IsWebSocketRequest) {
await WebSocketHandler.HandleWebSocketRequestAsync (context).ConfigureAwait (false);

33
Ooui/UI.cs
View File

@ -14,6 +14,9 @@ namespace Ooui
{
static readonly ManualResetEvent started = new ManualResetEvent (false);
[ThreadStatic]
static System.Security.Cryptography.SHA256 sha256;
static CancellationTokenSource serverCts;
static readonly Dictionary<string, RequestHandler> publishedPaths =
@ -26,8 +29,10 @@ namespace Ooui
public static StyleSelectors Styles => rules;
static readonly byte[] clientJsBytes;
static readonly string clientJsEtag;
public static byte[] ClientJsBytes => clientJsBytes;
public static string ClientJsEtag => clientJsEtag;
public static string Template { get; set; } = $@"<!DOCTYPE html>
<html>
@ -79,6 +84,22 @@ namespace Ooui
clientJsBytes = Encoding.UTF8.GetBytes (r.ReadToEnd ());
}
}
clientJsEtag = "\"" + Hash (clientJsBytes) + "\"";
}
static string Hash (byte[] bytes)
{
var sha = sha256;
if (sha == null) {
sha = System.Security.Cryptography.SHA256.Create ();
sha256 = sha;
}
var data = sha.ComputeHash (bytes);
StringBuilder sBuilder = new StringBuilder ();
for (int i = 0; i < data.Length; i++) {
sBuilder.Append (data[i].ToString ("x2"));
}
return sBuilder.ToString ();
}
static void Publish (string path, RequestHandler handler)
@ -232,13 +253,23 @@ namespace Ooui
var response = listenerContext.Response;
if (path == "/ooui.js") {
var inm = listenerContext.Request.Headers.Get ("If-None-Match");
if (string.IsNullOrEmpty (inm) || inm != clientJsEtag) {
response.StatusCode = 200;
response.ContentLength64 = clientJsBytes.LongLength;
response.ContentType = "application/javascript";
response.ContentEncoding = Encoding.UTF8;
response.AddHeader ("Cache-Control", "public, max-age=3600");
response.AddHeader ("Cache-Control", "public, max-age=60");
response.AddHeader ("Etag", clientJsEtag);
using (var s = response.OutputStream) {
s.Write (clientJsBytes, 0, clientJsBytes.Length);
}
response.Close ();
}
else {
response.StatusCode = 304;
response.Close ();
}
}
else {
var found = false;