Skip to content

Commit

Permalink
Merge pull request #2414 from sbwalker/dev
Browse files Browse the repository at this point in the history 
cache assemblies in IndexedDB on WebAssembly
  • Loading branch information
@sbwalker
sbwalker authored Sep 12, 2022
2 parents 530d80a + b8e2c72 commit 59764d3
Show file tree
Hide file tree
Showing 4 changed files with 296 additions and 39 deletions.
138 changes: 110 additions & 28 deletions Oqtane.Client/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@
using System.Net.Http;
using System.Reflection;
using System.Runtime.Loader;
using System.Text.Json;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.JSInterop;
using Oqtane.Documentation;
using Oqtane.Models;
using Oqtane.Modules;
using Oqtane.Services;
using Oqtane.Shared;
using Oqtane.UI;
using static System.Net.WebRequestMethods;

namespace Oqtane.Client
{
Expand All @@ -42,7 +45,9 @@ public static async Task Main(string[] args)
// register scoped core services
builder.Services.AddOqtaneScopedServices();

await LoadClientAssemblies(httpClient);
var serviceProvider = builder.Services.BuildServiceProvider();

await LoadClientAssemblies(httpClient, serviceProvider);

var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
foreach (var assembly in assemblies)
Expand All @@ -54,43 +59,114 @@ public static async Task Main(string[] args)
RegisterClientStartups(assembly, builder.Services);
}

var host = builder.Build();

await SetCultureFromLocalizationCookie(host.Services);

ServiceActivator.Configure(host.Services);

await host.RunAsync();
await builder.Build().RunAsync();
}

private static async Task LoadClientAssemblies(HttpClient http)
private static async Task LoadClientAssemblies(HttpClient http, IServiceProvider serviceProvider)
{
// get list of loaded assemblies on the client
var assemblies = AppDomain.CurrentDomain.GetAssemblies().Select(a => a.GetName().Name).ToList();

// get assemblies from server and load into client app domain
var zip = await http.GetByteArrayAsync($"/api/Installation/load");

var dlls = new Dictionary<string, byte[]>();
var pdbs = new Dictionary<string, byte[]>();
var filter = new List<string>();

var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>();
var interop = new Interop(jsRuntime);
var files = await interop.GetIndexedDBKeys(".dll");

if (files.Count() != 0)
{
// get list of assemblies from server
var json = await http.GetStringAsync("/api/Installation/list");
var assemblies = JsonSerializer.Deserialize<List<string>>(json);

// determine which assemblies need to be downloaded
foreach (var assembly in assemblies)
{
var file = files.FirstOrDefault(item => item.Contains(assembly));
if (file == null)
{
filter.Add(assembly);
}
else
{
// check if newer version available
if (GetFileDate(assembly) > GetFileDate(file))
{
filter.Add(assembly);
}
}
}

// get assemblies already downloaded
foreach (var file in files)
{
if (assemblies.Contains(file) && !filter.Contains(file))
{
try
{
dlls.Add(file, await interop.GetIndexedDBItem<byte[]>(file));
var pdb = file.Replace(".dll", ".pdb");
if (files.Contains(pdb))
{
pdbs.Add(pdb, await interop.GetIndexedDBItem<byte[]>(pdb));
}
}
catch
{
// ignore
}
}
else // file is deprecated
{
try
{
await interop.RemoveIndexedDBItem(file);
}
catch
{
// ignore
}
}
}
}
else
{
filter.Add("*");
}

// asemblies and debug symbols are packaged in a zip file
using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))
if (filter.Count != 0)
{
foreach (ZipArchiveEntry entry in archive.Entries)
// get assemblies from server and load into client app domain
var zip = await http.GetByteArrayAsync($"/api/Installation/load?list=" + string.Join(",", filter));

// asemblies and debug symbols are packaged in a zip file
using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))
{
using (var memoryStream = new MemoryStream())
foreach (ZipArchiveEntry entry in archive.Entries)
{
entry.Open().CopyTo(memoryStream);
byte[] file = memoryStream.ToArray();
switch (Path.GetExtension(entry.FullName))
using (var memoryStream = new MemoryStream())
{
case ".dll":
dlls.Add(entry.FullName, file);
break;
case ".pdb":
pdbs.Add(entry.FullName, file);
break;
entry.Open().CopyTo(memoryStream);
byte[] file = memoryStream.ToArray();

// save assembly to indexeddb
try
{
await interop.SetIndexedDBItem(entry.FullName, file);
}
catch
{
// ignore
}

switch (Path.GetExtension(entry.FullName))
{
case ".dll":
dlls.Add(entry.FullName, file);
break;
case ".pdb":
pdbs.Add(entry.FullName, file);
break;
}
}
}
}
Expand All @@ -110,6 +186,12 @@ private static async Task LoadClientAssemblies(HttpClient http)
}
}

private static DateTime GetFileDate(string filepath)
{
var segments = filepath.Split('.');
return DateTime.ParseExact(segments[segments.Length - 2], "yyyyMMddHHmmss", CultureInfo.InvariantCulture);
}

private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
{
// dynamically register module scoped services
Expand Down
77 changes: 77 additions & 0 deletions Oqtane.Client/UI/Interop.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using System.Net;
using System;
using System.Threading.Tasks;
using System.Text.Json;
using System.Xml.Linq;
using System.Collections.Generic;
using System.Linq;

namespace Oqtane.UI
{
Expand Down Expand Up @@ -307,5 +313,76 @@ public ValueTask<int> GetCaretPosition(string id)
return new ValueTask<int>(-1);
}
}

public Task SetIndexedDBItem(string key, object value)
{
try
{
_jsRuntime.InvokeVoidAsync(
"Oqtane.Interop.setIndexedDBItem",
key, value);
return Task.CompletedTask;
}
catch
{
return Task.CompletedTask;
}
}

public async Task<T> GetIndexedDBItem<T>(string key)
{
try
{
return await _jsRuntime.InvokeAsync<T>(
"Oqtane.Interop.getIndexedDBItem",
key);
}
catch
{
return default(T);
}
}

public async Task<List<string>> GetIndexedDBKeys()
{
return await GetIndexedDBKeys("");
}

public async Task<List<string>> GetIndexedDBKeys(string contains)
{
try
{
var items = await _jsRuntime.InvokeAsync<JsonDocument>(
"Oqtane.Interop.getIndexedDBKeys");
if (!string.IsNullOrEmpty(contains))
{
return items.Deserialize<List<string>>()
.Where(item => item.Contains(contains)).ToList();
}
else
{
return items.Deserialize<List<string>>();
}
}
catch
{
return new List<string>();
}
}

public Task RemoveIndexedDBItem(string key)
{
try
{
_jsRuntime.InvokeVoidAsync(
"Oqtane.Interop.removeIndexedDBItem",
key);
return Task.CompletedTask;
}
catch
{
return Task.CompletedTask;
}
}
}
}
44 changes: 33 additions & 11 deletions Oqtane.Maui/MauiProgram.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,14 @@ private static void LoadClientAssemblies(HttpClient http)

var dlls = new Dictionary<string, byte[]>();
var pdbs = new Dictionary<string, byte[]>();

var filter = new List<string>();

var files = new List<string>();
foreach (var file in Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories))
{
files.Add(file.Substring(folder.Length + 1).Replace("\\", "/"));
}

if (files.Count() != 0)
{
// get list of assemblies from server
Expand Down Expand Up @@ -108,16 +109,30 @@ private static void LoadClientAssemblies(HttpClient http)
{
if (assemblies.Contains(file) && !filter.Contains(file))
{
dlls.Add(file, File.ReadAllBytes(Path.Combine(folder, file)));
var pdb = file.Replace(".dll", ".pdb");
if (File.Exists(Path.Combine(folder, pdb)))
try
{
dlls.Add(file, File.ReadAllBytes(Path.Combine(folder, file)));
var pdb = file.Replace(".dll", ".pdb");
if (File.Exists(Path.Combine(folder, pdb)))
{
pdbs.Add(pdb, File.ReadAllBytes(Path.Combine(folder, pdb)));
}
}
catch
{
pdbs.Add(pdb, File.ReadAllBytes(Path.Combine(folder, pdb)));
// ignore
}
}
else // file is deprecated
{
File.Delete(Path.Combine(folder, file));
try
{
File.Delete(Path.Combine(folder, file));
}
catch
{
// ignore
}
}
}
}
Expand All @@ -142,13 +157,20 @@ private static void LoadClientAssemblies(HttpClient http)
byte[] file = memoryStream.ToArray();

// save assembly to local folder
int subfolder = entry.FullName.IndexOf('/');
if (subfolder != -1 && !Directory.Exists(Path.Combine(folder, entry.FullName.Substring(0, subfolder))))
try
{
int subfolder = entry.FullName.IndexOf('/');
if (subfolder != -1 && !Directory.Exists(Path.Combine(folder, entry.FullName.Substring(0, subfolder))))
{
Directory.CreateDirectory(Path.Combine(folder, entry.FullName.Substring(0, subfolder)));
}
using var stream = File.Create(Path.Combine(folder, entry.FullName));
stream.Write(file, 0, file.Length);
}
catch
{
Directory.CreateDirectory(Path.Combine(folder, entry.FullName.Substring(0, subfolder)));
// ignore
}
using var stream = File.Create(Path.Combine(folder, entry.FullName));
stream.Write(file, 0, file.Length);

if (Path.GetExtension(entry.FullName) == ".dll")
{
Expand Down
Loading

0 comments on commit 59764d3

Please sign in to comment.