mirror of
https://github.com/chylex/Discord-History-Tracker.git
synced 2024-11-25 05:42:45 +01:00
Compare commits
No commits in common. "653d28136c5c544fd41c64425b4257ef14837b18" and "d4da64a5edf2b549276b6c3703be9496c5d66c0c" have entirely different histories.
653d28136c
...
d4da64a5ed
@ -13,10 +13,10 @@
|
||||
<CssCodeStyleSettings>
|
||||
<option name="HEX_COLOR_LOWER_CASE" value="true" />
|
||||
</CssCodeStyleSettings>
|
||||
<DB2CodeStyleSettings version="7">
|
||||
<DB2CodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</DB2CodeStyleSettings>
|
||||
<DerbyCodeStyleSettings version="7">
|
||||
<DerbyCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</DerbyCodeStyleSettings>
|
||||
<GoCodeStyleSettings>
|
||||
@ -26,10 +26,10 @@
|
||||
<option name="WRAP_FUNC_PARAMS" value="5" />
|
||||
<option name="WRAP_FUNC_RESULT" value="5" />
|
||||
</GoCodeStyleSettings>
|
||||
<H2CodeStyleSettings version="7">
|
||||
<H2CodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</H2CodeStyleSettings>
|
||||
<HSQLCodeStyleSettings version="7">
|
||||
<HSQLCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</HSQLCodeStyleSettings>
|
||||
<HTMLCodeStyleSettings>
|
||||
@ -85,10 +85,10 @@
|
||||
<LessCodeStyleSettings>
|
||||
<option name="HEX_COLOR_LOWER_CASE" value="true" />
|
||||
</LessCodeStyleSettings>
|
||||
<MSSQLCodeStyleSettings version="7">
|
||||
<MSSQLCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</MSSQLCodeStyleSettings>
|
||||
<MySQLCodeStyleSettings version="7">
|
||||
<MySQLCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</MySQLCodeStyleSettings>
|
||||
<Objective-C>
|
||||
@ -98,7 +98,7 @@
|
||||
<option name="SPACE_BEFORE_INIT_LIST" value="true" />
|
||||
<option name="SPACE_AFTER_DICTIONARY_LITERAL_COLON" value="false" />
|
||||
</Objective-C>
|
||||
<OracleCodeStyleSettings version="7">
|
||||
<OracleCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</OracleCodeStyleSettings>
|
||||
<PHPCodeStyleSettings>
|
||||
@ -116,7 +116,7 @@
|
||||
<option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
|
||||
<option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
|
||||
</PHPCodeStyleSettings>
|
||||
<PostgresCodeStyleSettings version="7">
|
||||
<PostgresCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</PostgresCodeStyleSettings>
|
||||
<Properties>
|
||||
@ -143,16 +143,13 @@
|
||||
<option name="INDENT_WHEN_CASES" value="true" />
|
||||
<option name="CHAIN_CALLS_ALIGNMENT" value="2" />
|
||||
</Ruby>
|
||||
<SQLiteCodeStyleSettings version="7">
|
||||
<SQLiteCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</SQLiteCodeStyleSettings>
|
||||
<ScssCodeStyleSettings>
|
||||
<option name="HEX_COLOR_LOWER_CASE" value="true" />
|
||||
</ScssCodeStyleSettings>
|
||||
<Shell_Script>
|
||||
<option name="KEEP_COLUMN_ALIGNMENT_PADDING" value="true" />
|
||||
</Shell_Script>
|
||||
<SqlCodeStyleSettings version="7">
|
||||
<SqlCodeStyleSettings version="6">
|
||||
<option name="KEYWORD_CASE" value="2" />
|
||||
<option name="TYPE_CASE" value="2" />
|
||||
<option name="CUSTOM_TYPE_CASE" value="2" />
|
||||
@ -176,10 +173,9 @@
|
||||
<option name="CONSTRAINT_WRAP_3" value="true" />
|
||||
<option name="CONSTRAINT_WRAP_4" value="true" />
|
||||
<option name="VIEW_INDENT_QUERY" value="true" />
|
||||
<option name="IMP_LOOP_LOOP_INDENT" value="false" />
|
||||
<option name="EXPR_CASE_WHEN_WRAP" value="false" />
|
||||
</SqlCodeStyleSettings>
|
||||
<SybaseCodeStyleSettings version="7">
|
||||
<SybaseCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</SybaseCodeStyleSettings>
|
||||
<TypeScriptCodeStyleSettings version="0">
|
||||
@ -207,11 +203,6 @@
|
||||
<option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="Gherkin">
|
||||
<indentOptions>
|
||||
<option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="Groovy">
|
||||
<option name="ELSE_ON_NEW_LINE" value="true" />
|
||||
<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
|
||||
@ -291,13 +282,6 @@
|
||||
<option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="Markdown">
|
||||
<indentOptions>
|
||||
<option name="INDENT_SIZE" value="2" />
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
||||
<option name="TAB_SIZE" value="2" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="ObjectiveC">
|
||||
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
|
||||
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
|
||||
@ -358,6 +342,7 @@
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="Rust">
|
||||
<option name="RIGHT_MARGIN" value="140" />
|
||||
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
|
||||
<indentOptions>
|
||||
<option name="USE_TAB_CHARACTER" value="true" />
|
||||
@ -372,7 +357,6 @@
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="SCSS">
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
||||
<option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
@ -383,6 +367,13 @@
|
||||
<option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="Shell Script">
|
||||
<indentOptions>
|
||||
<option name="INDENT_SIZE" value="4" />
|
||||
<option name="TAB_SIZE" value="4" />
|
||||
<option name="USE_TAB_CHARACTER" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="TOML">
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
@ -436,9 +427,6 @@
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="liquid">
|
||||
<indentOptions>
|
||||
<option name="INDENT_SIZE" value="2" />
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
||||
<option name="TAB_SIZE" value="2" />
|
||||
<option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
|
||||
@ -91,6 +91,7 @@
|
||||
<inspection_tool class="ComparatorNotSerializable" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="CompareToUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ComposeMissingKeys" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
<inspection_tool class="ConditionSignal" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ConditionalExpression" enabled="true" level="INFORMATION" enabled_by_default="true">
|
||||
<option name="ignoreSimpleAssignmentsAndReturns" value="true" />
|
||||
@ -361,7 +362,7 @@
|
||||
</inspection_tool>
|
||||
<inspection_tool class="LocalVariableDeclarationSideOnly" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
<inspection_tool class="LocalVariableNamingConventionJS" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="m_regex" value="[a-z][A-Za-z0-9]*" />
|
||||
<option name="m_regex" value="[a-z][A-Za-z]*" />
|
||||
<option name="m_minLength" value="0" />
|
||||
<option name="m_maxLength" value="99" />
|
||||
</inspection_tool>
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Generated files" type="javaScript">
|
||||
<properties>
|
||||
<sourceFilesUrls>
|
||||
<item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
|
||||
<item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
|
||||
<item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
|
||||
<item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
|
||||
<item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
|
||||
</sourceFilesUrls>
|
||||
</properties>
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
|
||||
<root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
|
||||
<root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
|
||||
<root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
|
||||
<root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
||||
@ -39,6 +39,11 @@
|
||||
<EmbeddedResource Include="Resources/tracker-loader.js">
|
||||
<LogicalName>tracker-loader.js</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../Resources/Viewer/**">
|
||||
<LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
|
||||
<Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
|
||||
<Visible>false</Visible>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Controls;
|
||||
using DHT.Desktop.Main.Pages;
|
||||
using DHT.Utils.Logging;
|
||||
using JetBrains.Annotations;
|
||||
|
||||
@ -41,5 +43,13 @@ public sealed partial class MainWindow : Window {
|
||||
Log.Error("Caught exception while disposing window: " + ex);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
|
||||
try {
|
||||
File.Delete(temporaryFile);
|
||||
} catch (Exception) {
|
||||
// ignored
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
<StackPanel Orientation="Vertical" Spacing="20">
|
||||
<StackPanel Orientation="Horizontal" VerticalAlignment="Top">
|
||||
<Button Command="{Binding OnClickOpenViewer}" Margin="0 0 5 0">Open Viewer</Button>
|
||||
<Button Command="{Binding OnClickSaveViewer}" Margin="5 0 0 0">Save Viewer</Button>
|
||||
</StackPanel>
|
||||
<controls:MessageFilterPanel DataContext="{Binding FilterModel}" />
|
||||
<Expander Header="Database Tools">
|
||||
|
||||
@ -1,22 +1,34 @@
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Platform.Storage;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using DHT.Desktop.Common;
|
||||
using DHT.Desktop.Dialogs.File;
|
||||
using DHT.Desktop.Dialogs.Message;
|
||||
using DHT.Desktop.Dialogs.Progress;
|
||||
using DHT.Desktop.Main.Controls;
|
||||
using DHT.Desktop.Server;
|
||||
using DHT.Server;
|
||||
using DHT.Server.Data.Filters;
|
||||
using DHT.Server.Service.Viewer;
|
||||
using DHT.Server.Database.Export;
|
||||
using static DHT.Desktop.Program;
|
||||
|
||||
namespace DHT.Desktop.Main.Pages;
|
||||
|
||||
sealed partial class ViewerPageModel : ObservableObject, IDisposable {
|
||||
public static readonly ConcurrentBag<string> TemporaryFiles = [];
|
||||
|
||||
private static readonly FilePickerFileType[] ViewerFileTypes = [
|
||||
FileDialogs.CreateFilter("Discord History Viewer", ["html"])
|
||||
];
|
||||
|
||||
public bool DatabaseToolFilterModeKeep { get; set; } = true;
|
||||
public bool DatabaseToolFilterModeRemove { get; set; } = false;
|
||||
|
||||
@ -49,18 +61,101 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
|
||||
|
||||
public async void OnClickOpenViewer() {
|
||||
try {
|
||||
string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
|
||||
string serverToken = ServerConfiguration.Token;
|
||||
string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
|
||||
var fullPath = await PrepareTemporaryViewerFile();
|
||||
|
||||
Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
|
||||
string jsConstants = $"""
|
||||
window.DHT_SERVER_URL = "{HttpUtility.JavaScriptStringEncode("http://127.0.0.1:" + ServerConfiguration.Port)}";
|
||||
window.DHT_SERVER_TOKEN = "{HttpUtility.JavaScriptStringEncode(ServerConfiguration.Token)}";
|
||||
""";
|
||||
|
||||
await ProgressDialog.ShowIndeterminate(window, "Open Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(fullPath, jsConstants)));
|
||||
|
||||
Process.Start(new ProcessStartInfo(fullPath) {
|
||||
UseShellExecute = true
|
||||
});
|
||||
} catch (Exception e) {
|
||||
await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
|
||||
await Dialog.ShowOk(window, "Open Viewer", "Could not create or save viewer: " + e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<string> PrepareTemporaryViewerFile() {
|
||||
return await Task.Run(() => {
|
||||
string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
|
||||
string filenameBase = Path.GetFileNameWithoutExtension(state.Db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
|
||||
string fullPath = Path.Combine(rootPath, filenameBase + ".html");
|
||||
|
||||
int counter = 0;
|
||||
|
||||
while (File.Exists(fullPath)) {
|
||||
++counter;
|
||||
fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
|
||||
}
|
||||
|
||||
TemporaryFiles.Add(fullPath);
|
||||
|
||||
Directory.CreateDirectory(rootPath);
|
||||
|
||||
return fullPath;
|
||||
});
|
||||
}
|
||||
|
||||
public async void OnClickSaveViewer() {
|
||||
string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
|
||||
Title = "Save Viewer",
|
||||
FileTypeChoices = ViewerFileTypes,
|
||||
SuggestedFileName = Path.GetFileNameWithoutExtension(state.Db.Path) + ".html",
|
||||
SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(state.Db.Path)),
|
||||
});
|
||||
|
||||
if (path == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await ProgressDialog.ShowIndeterminate(window, "Save Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(path, string.Empty)));
|
||||
} catch (Exception e) {
|
||||
await Dialog.ShowOk(window, "Save Viewer", "Could not create or save viewer: " + e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task WriteViewerFile(string path, string jsConstants) {
|
||||
const string ArchiveTag = "/*[ARCHIVE]*/";
|
||||
|
||||
string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
|
||||
string viewerTemplate = indexFile.Replace("/*[CONSTANTS]*/", jsConstants)
|
||||
.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
|
||||
.Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
|
||||
|
||||
int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
|
||||
int viewerArchiveTagEnd = viewerArchiveTagStart + ArchiveTag.Length;
|
||||
|
||||
string jsonTempFile = path + ".tmp";
|
||||
|
||||
await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
|
||||
await ViewerJsonExport.Generate(jsonStream, state.Db, FilterModel.CreateFilter());
|
||||
|
||||
char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
|
||||
jsonStream.Position = 0;
|
||||
|
||||
await using (var outputStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
|
||||
await using (var outputWriter = new StreamWriter(outputStream, Encoding.UTF8)) {
|
||||
await outputWriter.WriteAsync(viewerTemplate[..viewerArchiveTagStart]);
|
||||
|
||||
using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8)) {
|
||||
int readBytes;
|
||||
while ((readBytes = await jsonReader.ReadAsync(jsonBuffer, 0, jsonBuffer.Length)) > 0) {
|
||||
string jsonChunk = new string(jsonBuffer, 0, readBytes);
|
||||
await outputWriter.WriteAsync(HttpUtility.JavaScriptStringEncode(jsonChunk));
|
||||
}
|
||||
}
|
||||
|
||||
await outputWriter.WriteAsync(viewerTemplate[viewerArchiveTagEnd..]);
|
||||
}
|
||||
}
|
||||
|
||||
File.Delete(jsonTempFile);
|
||||
}
|
||||
|
||||
public async Task OnClickApplyFiltersToDatabase() {
|
||||
var filter = FilterModel.CreateFilter();
|
||||
var messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
|
||||
|
||||
@ -2,24 +2,16 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="referrer" content="no-referrer">
|
||||
|
||||
<title>Discord Offline History</title>
|
||||
|
||||
<link rel="icon" href="favicon.ico">
|
||||
|
||||
<link rel="stylesheet" href="styles/main.css">
|
||||
<link rel="stylesheet" href="styles/menu.css">
|
||||
<link rel="stylesheet" href="styles/channels.css">
|
||||
<link rel="stylesheet" href="styles/messages.css">
|
||||
<link rel="stylesheet" href="styles/modal.css">
|
||||
|
||||
<script type="text/javascript">
|
||||
const query = new URLSearchParams(location.search);
|
||||
window.DHT_SERVER_TOKEN = query.get("token");
|
||||
window.DHT_SERVER_SESSION = query.get("session");
|
||||
window.DHT_EMBEDDED = "/*[ARCHIVE]*/";
|
||||
/*[CONSTANTS]*/
|
||||
/*[JS]*/
|
||||
</script>
|
||||
<script type="module" src="scripts/bootstrap.mjs"></script>
|
||||
<style>
|
||||
/*[CSS]*/
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id="menu">
|
||||
@ -73,9 +65,7 @@
|
||||
</div>
|
||||
|
||||
<div id="app">
|
||||
<div id="channels">
|
||||
<div class="loading"></div>
|
||||
</div>
|
||||
<div id="channels"></div>
|
||||
<div id="messages"></div>
|
||||
</div>
|
||||
|
||||
|
||||
39
app/Resources/Viewer/scripts/bootstrap.js
vendored
Normal file
39
app/Resources/Viewer/scripts/bootstrap.js
vendored
Normal file
@ -0,0 +1,39 @@
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
DISCORD.setup();
|
||||
GUI.setup();
|
||||
|
||||
GUI.onOptionMessagesPerPageChanged(() => {
|
||||
STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
|
||||
});
|
||||
|
||||
STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
|
||||
|
||||
GUI.onOptMessageFilterChanged(filter => {
|
||||
STATE.setActiveFilter(filter);
|
||||
});
|
||||
|
||||
GUI.onNavigationButtonClicked(action => {
|
||||
STATE.updateCurrentPage(action);
|
||||
});
|
||||
|
||||
STATE.onUsersRefreshed(users => {
|
||||
GUI.updateUserList(users);
|
||||
});
|
||||
|
||||
STATE.onChannelsRefreshed((channels, selected) => {
|
||||
GUI.updateChannelList(channels, selected, STATE.selectChannel);
|
||||
});
|
||||
|
||||
STATE.onMessagesRefreshed(messages => {
|
||||
GUI.updateNavigation(STATE.getCurrentPage(), STATE.getPageCount());
|
||||
GUI.updateMessageList(messages);
|
||||
GUI.scrollMessagesToTop();
|
||||
});
|
||||
|
||||
try {
|
||||
STATE.uploadFile(JSON.parse(window.DHT_EMBEDDED));
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert("Could not parse embedded file, see console for details.");
|
||||
}
|
||||
});
|
||||
@ -1,110 +0,0 @@
|
||||
import discord from "./discord.mjs";
|
||||
import gui from "./gui.mjs";
|
||||
import state from "./state.mjs";
|
||||
|
||||
window.DISCORD = discord;
|
||||
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
discord.setup();
|
||||
gui.setup();
|
||||
|
||||
gui.onOptionMessagesPerPageChanged(() => {
|
||||
state.setMessagesPerPage(gui.getOptionMessagesPerPage());
|
||||
});
|
||||
|
||||
state.setMessagesPerPage(gui.getOptionMessagesPerPage());
|
||||
|
||||
gui.onOptMessageFilterChanged(filter => {
|
||||
state.setActiveFilter(filter);
|
||||
});
|
||||
|
||||
gui.onNavigationButtonClicked(action => {
|
||||
state.updateCurrentPage(action);
|
||||
});
|
||||
|
||||
state.onUsersRefreshed(users => {
|
||||
gui.updateUserList(users);
|
||||
});
|
||||
|
||||
state.onChannelsRefreshed((channels, selected) => {
|
||||
gui.updateChannelList(channels, selected, state.selectChannel);
|
||||
});
|
||||
|
||||
state.onMessagesRefreshed(messages => {
|
||||
gui.updateNavigation(state.getCurrentPage(), state.getPageCount());
|
||||
gui.updateMessageList(messages);
|
||||
gui.scrollMessagesToTop();
|
||||
});
|
||||
|
||||
async function fetchUrl(path, contentType) {
|
||||
const response = await fetch("/" + path + "?token=" + encodeURIComponent(window.DHT_SERVER_TOKEN) + "&session=" + encodeURIComponent(window.DHT_SERVER_SESSION), {
|
||||
method: "GET",
|
||||
headers: {
|
||||
"Content-Type": contentType,
|
||||
},
|
||||
credentials: "omit",
|
||||
redirect: "error",
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw "Unexpected response status: " + response.statusText;
|
||||
}
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
async function processLines(response, callback) {
|
||||
let body = "";
|
||||
|
||||
for await (const chunk of response.body.pipeThrough(new TextDecoderStream("utf-8"))) {
|
||||
body += chunk;
|
||||
|
||||
let startIndex = 0;
|
||||
|
||||
while (true) {
|
||||
const endIndex = body.indexOf("\n", startIndex);
|
||||
if (endIndex === -1) {
|
||||
break;
|
||||
}
|
||||
|
||||
callback(body.substring(startIndex, endIndex));
|
||||
startIndex = endIndex + 1;
|
||||
}
|
||||
|
||||
body = body.substring(startIndex);
|
||||
}
|
||||
|
||||
if (body !== "") {
|
||||
callback(body);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadData() {
|
||||
try {
|
||||
const metadataResponse = await fetchUrl("get-viewer-metadata", "application/json");
|
||||
const metadataJson = await metadataResponse.json();
|
||||
|
||||
const messagesResponse = await fetchUrl("get-viewer-messages", "application/x-ndjson");
|
||||
const messages = {};
|
||||
|
||||
await processLines(messagesResponse, line => {
|
||||
const message = JSON.parse(line);
|
||||
const channel = message.c;
|
||||
|
||||
const channelMessages = messages[channel] || (messages[channel] = {});
|
||||
channelMessages[message.id] = message;
|
||||
|
||||
delete message.id;
|
||||
delete message.c;
|
||||
});
|
||||
|
||||
state.uploadFile(metadataJson, messages);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert("Could not load data, see console for details.");
|
||||
document.querySelector("#channels > div.loading").remove();
|
||||
}
|
||||
}
|
||||
|
||||
loadData();
|
||||
});
|
||||
@ -1,10 +1,4 @@
|
||||
import discord from "./discord.mjs";
|
||||
import dom from "./dom.mjs";
|
||||
import template from "./template.mjs";
|
||||
import settings from "./settings.mjs";
|
||||
import state from "./state.mjs";
|
||||
|
||||
export default (function() {
|
||||
const DISCORD = (function() {
|
||||
const regex = {
|
||||
formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
|
||||
formatItalic1: /\*([\s\S]+?)\*(?!\*)/g,
|
||||
@ -41,14 +35,17 @@ export default (function() {
|
||||
let templateReaction;
|
||||
let templateReactionCustom;
|
||||
|
||||
const fileUrlProcessor = function(serverToken) {
|
||||
if (typeof serverToken === "string") {
|
||||
return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
|
||||
const fileUrlProcessor = function(serverUrl, serverToken) {
|
||||
if (typeof serverUrl === "string" && typeof serverToken === "string") {
|
||||
return url => serverUrl + "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
|
||||
}
|
||||
else {
|
||||
return url => url;
|
||||
}
|
||||
}(window.DHT_SERVER_TOKEN);
|
||||
}(
|
||||
window["DHT_SERVER_URL"],
|
||||
window["DHT_SERVER_TOKEN"]
|
||||
);
|
||||
|
||||
const getEmoji = function(name, id, extension) {
|
||||
const tag = ":" + name + ":";
|
||||
@ -56,9 +53,9 @@ export default (function() {
|
||||
};
|
||||
|
||||
const processMessageContents = function(contents) {
|
||||
let processed = dom.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
|
||||
let processed = DOM.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
|
||||
|
||||
if (settings.enableFormatting) {
|
||||
if (SETTINGS.enableFormatting) {
|
||||
const escapeHtmlMatch = (full, match) => "&#" + match.charCodeAt(0) + ";";
|
||||
|
||||
processed = processed
|
||||
@ -74,13 +71,13 @@ export default (function() {
|
||||
.replace(regex.formatStrike, "<s>$1</s>");
|
||||
}
|
||||
|
||||
const animatedEmojiExtension = settings.enableAnimatedEmoji ? "gif" : "webp";
|
||||
const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
processed = processed
|
||||
.replace(regex.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
|
||||
.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + state.getChannelName(match) + "</span>")
|
||||
.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (state.getUserTag(match) || "????") + "'>@" + state.getUserName(match) + "</span>")
|
||||
.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + STATE.getChannelName(match) + "</span>")
|
||||
.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (STATE.getUserTag(match) || "????") + "'>@" + STATE.getUserName(match) + "</span>")
|
||||
.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
|
||||
.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
|
||||
|
||||
@ -92,7 +89,7 @@ export default (function() {
|
||||
};
|
||||
|
||||
const getImageEmbed = function(url, image) {
|
||||
if (!settings.enableImagePreviews) {
|
||||
if (!SETTINGS.enableImagePreviews) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@ -112,21 +109,21 @@ export default (function() {
|
||||
|
||||
return {
|
||||
setup() {
|
||||
templateChannelServer = new template([
|
||||
"<div class='channel' data-channel='{id}'>",
|
||||
templateChannelServer = new TEMPLATE([
|
||||
"<div data-channel='{id}'>",
|
||||
"<div class='info' title='{topic}'><strong class='name'>#{name}</strong>{nsfw}<span class='tag'>{msgcount}</span></div>",
|
||||
"<span class='server'>{server.name} ({server.type})</span>",
|
||||
"</div>"
|
||||
].join(""));
|
||||
|
||||
templateChannelPrivate = new template([
|
||||
"<div class='channel' data-channel='{id}'>",
|
||||
templateChannelPrivate = new TEMPLATE([
|
||||
"<div data-channel='{id}'>",
|
||||
"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
|
||||
"<span class='server'>({server.type})</span>",
|
||||
"</div>"
|
||||
].join(""));
|
||||
|
||||
templateMessageNoAvatar = new template([
|
||||
templateMessageNoAvatar = new TEMPLATE([
|
||||
"<div>",
|
||||
"<div class='reply-message'>{reply}</div>",
|
||||
"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
|
||||
@ -135,7 +132,7 @@ export default (function() {
|
||||
"</div>"
|
||||
].join(""));
|
||||
|
||||
templateMessageWithAvatar = new template([
|
||||
templateMessageWithAvatar = new TEMPLATE([
|
||||
"<div>",
|
||||
"<div class='reply-message reply-message-with-avatar'>{reply}</div>",
|
||||
"<div class='avatar-wrapper'>",
|
||||
@ -150,50 +147,50 @@ export default (function() {
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateUserAvatar = new template([
|
||||
templateUserAvatar = new TEMPLATE([
|
||||
"<img src='{url}' alt=''>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateAttachmentDownload = new template([
|
||||
templateAttachmentDownload = new TEMPLATE([
|
||||
"<a href='{url}' class='embed download'>Download {name}</a>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedImage = new template([
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
templateEmbedImage = new TEMPLATE([
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedImageWithSize = new template([
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
templateEmbedImageWithSize = new TEMPLATE([
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedRich = new template([
|
||||
templateEmbedRich = new TEMPLATE([
|
||||
"<div class='embed download'><a href='{url}' class='title'>{title}</a><p class='desc'>{description}</p></div>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedRichNoDescription = new template([
|
||||
templateEmbedRichNoDescription = new TEMPLATE([
|
||||
"<div class='embed download'><a href='{url}' class='title'>{title}</a></div>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedUrl = new template([
|
||||
templateEmbedUrl = new TEMPLATE([
|
||||
"<a href='{url}' class='embed download'>{url}</a>"
|
||||
].join(""));
|
||||
|
||||
templateEmbedUnsupported = new template([
|
||||
templateEmbedUnsupported = new TEMPLATE([
|
||||
"<div class='embed download'><p>(Unsupported embed)</p></div>"
|
||||
].join(""));
|
||||
|
||||
templateReaction = new template([
|
||||
templateReaction = new TEMPLATE([
|
||||
"<span class='reaction-wrapper'><span class='reaction-emoji'>{n}</span><span class='count'>{c}</span></span>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateReactionCustom = new template([
|
||||
templateReactionCustom = new TEMPLATE([
|
||||
"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
|
||||
].join(""));
|
||||
},
|
||||
@ -210,7 +207,7 @@ export default (function() {
|
||||
},
|
||||
|
||||
isImageAttachment(attachment) {
|
||||
const url = dom.tryParseUrl(attachment.url);
|
||||
const url = DOM.tryParseUrl(attachment.url);
|
||||
return url != null && isImageUrl(url);
|
||||
},
|
||||
|
||||
@ -223,7 +220,7 @@ export default (function() {
|
||||
},
|
||||
|
||||
getMessageHTML(message) { // noinspection FunctionWithInconsistentReturnsJS
|
||||
return (settings.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
|
||||
return (SETTINGS.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
|
||||
if (property === "avatar") {
|
||||
return value ? templateUserAvatar.apply(getAvatarUrlObject(value)) : "";
|
||||
}
|
||||
@ -231,7 +228,7 @@ export default (function() {
|
||||
return value ? value : "????";
|
||||
}
|
||||
else if (property === "timestamp") {
|
||||
return dom.getHumanReadableTime(value);
|
||||
return DOM.getHumanReadableTime(value);
|
||||
}
|
||||
else if (property === "contents") {
|
||||
return value && value.length > 0 ? processMessageContents(value) : "";
|
||||
@ -246,10 +243,10 @@ export default (function() {
|
||||
return templateEmbedUnsupported.apply(embed);
|
||||
}
|
||||
else if ("image" in embed && embed.image.url) {
|
||||
return getImageEmbed(embed.url, embed.image);
|
||||
return getImageEmbed(fileUrlProcessor(embed.url), embed.image);
|
||||
}
|
||||
else if ("thumbnail" in embed && embed.thumbnail.url) {
|
||||
return getImageEmbed(embed.url, embed.thumbnail);
|
||||
return getImageEmbed(fileUrlProcessor(embed.url), embed.thumbnail);
|
||||
}
|
||||
else if ("title" in embed && "description" in embed) {
|
||||
return templateEmbedRich.apply(embed);
|
||||
@ -270,7 +267,7 @@ export default (function() {
|
||||
return value.map(attachment => {
|
||||
const url = fileUrlProcessor(attachment.url);
|
||||
|
||||
if (!discord.isImageAttachment(attachment) || !settings.enableImagePreviews) {
|
||||
if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
|
||||
return templateAttachmentDownload.apply({ url, name: attachment.name });
|
||||
}
|
||||
else if ("width" in attachment && "height" in attachment) {
|
||||
@ -282,10 +279,10 @@ export default (function() {
|
||||
}).join("");
|
||||
}
|
||||
else if (property === "edit") {
|
||||
return value ? "<span class='info edited'>Edited " + dom.getHumanReadableTime(value) + "</span>" : "";
|
||||
return value ? "<span class='info edited'>Edited " + DOM.getHumanReadableTime(value) + "</span>" : "";
|
||||
}
|
||||
else if (property === "jump") {
|
||||
return state.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
|
||||
return STATE.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
|
||||
}
|
||||
else if (property === "reply") {
|
||||
if (!value) {
|
||||
@ -293,7 +290,7 @@ export default (function() {
|
||||
}
|
||||
|
||||
const user = "<span class='reply-username' title='#" + (value.user.tag ? value.user.tag : "????") + "'>" + value.user.name + "</span>";
|
||||
const avatar = settings.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
|
||||
const avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
|
||||
const contents = value.contents ? "<span class='reply-contents'>" + processMessageContents(value.contents) + "</span>" : "";
|
||||
|
||||
return "<span class='jump' data-jump='" + value.id + "'>Jump to reply</span><span class='user'>" + avatar + user + "</span>" + contents;
|
||||
@ -305,7 +302,7 @@ export default (function() {
|
||||
|
||||
return "<div class='reactions'>" + value.map(reaction => {
|
||||
if ("id" in reaction){
|
||||
const ext = reaction.a && settings.enableAnimatedEmoji ? "gif" : "webp";
|
||||
const ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
|
||||
const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
|
||||
// noinspection JSUnusedGlobalSymbols
|
||||
return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });
|
||||
@ -8,12 +8,9 @@ const HTML_ENTITY_MAP = {
|
||||
|
||||
const HTML_ENTITY_REGEX = /[&<>"']/g;
|
||||
|
||||
export default class {
|
||||
class DOM {
|
||||
/**
|
||||
* Returns a child element by its ID. Parent defaults to the entire document.
|
||||
* @param {string} id
|
||||
* @param {HTMLElement} [parent]
|
||||
* @returns {HTMLElement|null}
|
||||
*/
|
||||
static id(id, parent) {
|
||||
return (parent || document).getElementById(id);
|
||||
@ -21,9 +18,6 @@ export default class {
|
||||
|
||||
/**
|
||||
* Returns an array of all child elements containing the specified class. Parent defaults to the entire document.
|
||||
* @param {string} cls
|
||||
* @param {HTMLElement} [parent]
|
||||
* @returns {HTMLElement[]}
|
||||
*/
|
||||
static cls(cls, parent) {
|
||||
return Array.prototype.slice.call((parent || document).getElementsByClassName(cls));
|
||||
@ -31,9 +25,6 @@ export default class {
|
||||
|
||||
/**
|
||||
* Returns an array of all child elements that have the specified tag. Parent defaults to the entire document.
|
||||
* @param {string} tag
|
||||
* @param {HTMLElement} [parent]
|
||||
* @returns {HTMLElement[]}
|
||||
*/
|
||||
static tag(tag, parent) {
|
||||
return Array.prototype.slice.call((parent || document).getElementsByTagName(tag));
|
||||
@ -41,9 +32,6 @@ export default class {
|
||||
|
||||
/**
|
||||
* Returns the first child element containing the specified class. Parent defaults to the entire document.
|
||||
* @param {string} cls
|
||||
* @param {HTMLElement} [parent]
|
||||
* @returns {HTMLElement}
|
||||
*/
|
||||
static fcls(cls, parent) {
|
||||
return (parent || document).getElementsByClassName(cls)[0];
|
||||
@ -1,16 +1,10 @@
|
||||
import dom from "./dom.mjs";
|
||||
import discord from "./discord.mjs";
|
||||
import settings from "./settings.mjs";
|
||||
import state from "./state.mjs";
|
||||
|
||||
export default (function() {
|
||||
const GUI = (function() {
|
||||
let eventOnOptMessagesPerPageChanged;
|
||||
let eventOnOptMessageFilterChanged;
|
||||
let eventOnNavButtonClicked;
|
||||
|
||||
const getActiveFilter = function() {
|
||||
/** @type HTMLSelectElement */
|
||||
const active = dom.fcls("active", dom.id("opt-filter-list"));
|
||||
const active = DOM.fcls("active", DOM.id("opt-filter-list"));
|
||||
|
||||
return active && active.value !== "" ? {
|
||||
"type": active.getAttribute("data-filter-type"),
|
||||
@ -23,12 +17,12 @@ export default (function() {
|
||||
};
|
||||
|
||||
const showModal = function(width, html) {
|
||||
const dialog = dom.id("dialog");
|
||||
const dialog = DOM.id("dialog");
|
||||
dialog.innerHTML = html;
|
||||
dialog.style.width = width + "px";
|
||||
dialog.style.marginLeft = (-width / 2) + "px";
|
||||
|
||||
dom.id("modal").classList.add("visible");
|
||||
DOM.id("modal").classList.add("visible");
|
||||
return dialog;
|
||||
};
|
||||
|
||||
@ -44,9 +38,9 @@ export default (function() {
|
||||
<label><input id='dht-cfg-animemoji' type='checkbox'> Animated Emoji</label><br>`);
|
||||
|
||||
const setupCheckBox = function(id, settingName) {
|
||||
const ele = dom.id(id);
|
||||
ele.checked = settings[settingName];
|
||||
ele.addEventListener("change", () => settings[settingName] = ele.checked);
|
||||
const ele = DOM.id(id);
|
||||
ele.checked = SETTINGS[settingName];
|
||||
ele.addEventListener("change", () => SETTINGS[settingName] = ele.checked);
|
||||
};
|
||||
|
||||
setupCheckBox("dht-cfg-imgpreviews", "enableImagePreviews");
|
||||
@ -71,20 +65,20 @@ export default (function() {
|
||||
// ---------
|
||||
|
||||
setup() {
|
||||
const inputMessageFilter = dom.id("opt-messages-filter");
|
||||
const containerFilterList = dom.id("opt-filter-list");
|
||||
const inputMessageFilter = DOM.id("opt-messages-filter");
|
||||
const containerFilterList = DOM.id("opt-filter-list");
|
||||
|
||||
const resetActiveFilter = function() {
|
||||
inputMessageFilter.value = "";
|
||||
inputMessageFilter.dispatchEvent(new Event("change"));
|
||||
|
||||
dom.id("opt-filter-contents").value = "";
|
||||
DOM.id("opt-filter-contents").value = "";
|
||||
};
|
||||
|
||||
inputMessageFilter.value = ""; // required to prevent browsers from remembering old value
|
||||
|
||||
inputMessageFilter.addEventListener("change", () => {
|
||||
dom.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
|
||||
DOM.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
|
||||
|
||||
if (inputMessageFilter.value) {
|
||||
containerFilterList.querySelector("[data-filter-type='" + inputMessageFilter.value + "']").classList.add("active");
|
||||
@ -97,11 +91,11 @@ export default (function() {
|
||||
ele.addEventListener(ele.tagName === "SELECT" ? "change" : "input", () => triggerFilterChanged());
|
||||
});
|
||||
|
||||
dom.id("opt-messages-per-page").addEventListener("change", () => {
|
||||
DOM.id("opt-messages-per-page").addEventListener("change", () => {
|
||||
eventOnOptMessagesPerPageChanged && eventOnOptMessagesPerPageChanged();
|
||||
});
|
||||
|
||||
dom.tag("button", dom.fcls("nav")).forEach(button => {
|
||||
DOM.tag("button", DOM.fcls("nav")).forEach(button => {
|
||||
button.disabled = true;
|
||||
|
||||
button.addEventListener("click", () => {
|
||||
@ -109,34 +103,34 @@ export default (function() {
|
||||
});
|
||||
});
|
||||
|
||||
dom.id("btn-settings").addEventListener("click", () => {
|
||||
DOM.id("btn-settings").addEventListener("click", () => {
|
||||
showSettingsModal();
|
||||
});
|
||||
|
||||
dom.id("btn-about").addEventListener("click", () => {
|
||||
DOM.id("btn-about").addEventListener("click", () => {
|
||||
showInfoModal();
|
||||
});
|
||||
|
||||
dom.id("messages").addEventListener("click", e => {
|
||||
DOM.id("messages").addEventListener("click", e => {
|
||||
const jump = e.target.getAttribute("data-jump");
|
||||
|
||||
if (jump) {
|
||||
resetActiveFilter();
|
||||
|
||||
const index = state.navigateToMessage(jump);
|
||||
const index = STATE.navigateToMessage(jump);
|
||||
|
||||
if (index === -1) {
|
||||
alert("Message not found.");
|
||||
}
|
||||
else {
|
||||
dom.id("messages").children[index].scrollIntoView();
|
||||
DOM.id("messages").children[index].scrollIntoView();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
dom.id("overlay").addEventListener("click", () => {
|
||||
dom.id("modal").classList.remove("visible");
|
||||
dom.id("dialog").innerHTML = "";
|
||||
DOM.id("overlay").addEventListener("click", () => {
|
||||
DOM.id("modal").classList.remove("visible");
|
||||
DOM.id("dialog").innerHTML = "";
|
||||
});
|
||||
},
|
||||
|
||||
@ -174,19 +168,19 @@ export default (function() {
|
||||
*/
|
||||
getOptionMessagesPerPage() {
|
||||
/** @type HTMLInputElement */
|
||||
const messagesPerPage = dom.id("opt-messages-per-page");
|
||||
const messagesPerPage = DOM.id("opt-messages-per-page");
|
||||
return parseInt(messagesPerPage.value, 10);
|
||||
},
|
||||
|
||||
updateNavigation(currentPage, totalPages) {
|
||||
dom.id("nav-page-current").innerHTML = currentPage;
|
||||
dom.id("nav-page-total").innerHTML = totalPages || "?";
|
||||
DOM.id("nav-page-current").innerHTML = currentPage;
|
||||
DOM.id("nav-page-total").innerHTML = totalPages || "?";
|
||||
|
||||
dom.id("nav-first").disabled = currentPage === 1;
|
||||
dom.id("nav-prev").disabled = currentPage === 1;
|
||||
dom.id("nav-pick").disabled = (totalPages || 0) <= 1;
|
||||
dom.id("nav-next").disabled = currentPage === (totalPages || 1);
|
||||
dom.id("nav-last").disabled = currentPage === (totalPages || 1);
|
||||
DOM.id("nav-first").disabled = currentPage === 1;
|
||||
DOM.id("nav-prev").disabled = currentPage === 1;
|
||||
DOM.id("nav-pick").disabled = (totalPages || 0) <= 1;
|
||||
DOM.id("nav-next").disabled = currentPage === (totalPages || 1);
|
||||
DOM.id("nav-last").disabled = currentPage === (totalPages || 1);
|
||||
},
|
||||
|
||||
// --------------
|
||||
@ -197,7 +191,7 @@ export default (function() {
|
||||
* Updates the channel list and sets up their click events. The callback is triggered whenever a channel is selected, and takes the channel ID as its argument.
|
||||
*/
|
||||
updateChannelList(channels, selected, callback) {
|
||||
const eleChannels = dom.id("channels");
|
||||
const eleChannels = DOM.id("channels");
|
||||
|
||||
if (!channels) {
|
||||
eleChannels.innerHTML = "";
|
||||
@ -207,11 +201,11 @@ export default (function() {
|
||||
channels = channels.filter(channel => channel.msgcount > 0);
|
||||
}
|
||||
|
||||
eleChannels.innerHTML = channels.map(channel => discord.getChannelHTML(channel)).join("");
|
||||
eleChannels.innerHTML = channels.map(channel => DISCORD.getChannelHTML(channel)).join("");
|
||||
|
||||
Array.prototype.forEach.call(eleChannels.children, ele => {
|
||||
ele.addEventListener("click", () => {
|
||||
const currentChannel = dom.fcls("active", eleChannels);
|
||||
const currentChannel = DOM.fcls("active", eleChannels);
|
||||
|
||||
if (currentChannel) {
|
||||
currentChannel.classList.remove("active");
|
||||
@ -230,12 +224,12 @@ export default (function() {
|
||||
},
|
||||
|
||||
updateMessageList(messages) {
|
||||
dom.id("messages").innerHTML = messages ? messages.map(message => discord.getMessageHTML(message)).join("") : "";
|
||||
DOM.id("messages").innerHTML = messages ? messages.map(message => DISCORD.getMessageHTML(message)).join("") : "";
|
||||
},
|
||||
|
||||
updateUserList(users) {
|
||||
/** @type HTMLSelectElement */
|
||||
const eleSelect = dom.id("opt-filter-user");
|
||||
const eleSelect = DOM.id("opt-filter-user");
|
||||
|
||||
while (eleSelect.length > 1) {
|
||||
eleSelect.remove(1);
|
||||
@ -255,7 +249,7 @@ export default (function() {
|
||||
},
|
||||
|
||||
scrollMessagesToTop() {
|
||||
dom.id("messages").scrollTop = 0;
|
||||
DOM.id("messages").scrollTop = 0;
|
||||
}
|
||||
};
|
||||
})();
|
||||
@ -1,16 +1,16 @@
|
||||
import discord from "./discord.mjs";
|
||||
const PROCESSOR = {};
|
||||
|
||||
// ------------------------
|
||||
// Global filter generators
|
||||
// ------------------------
|
||||
|
||||
const filter = {
|
||||
PROCESSOR.FILTER = {
|
||||
byUser: ((userindex) => message => message.u === userindex),
|
||||
byTime: ((timeStart, timeEnd) => message => message.t >= timeStart && message.t <= timeEnd),
|
||||
byContents: ((substr) => message => ("m" in message ? message.m : "").indexOf(substr) !== -1),
|
||||
byRegex: ((regex) => message => regex.test("m" in message ? message.m : "")),
|
||||
withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(discord.isImageAttachment))),
|
||||
withDownloads: (() => message => message.a && message.a.some(attachment => !discord.isImageAttachment(attachment))),
|
||||
withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(DISCORD.isImageAttachment))),
|
||||
withDownloads: (() => message => message.a && message.a.some(attachment => !DISCORD.isImageAttachment(attachment))),
|
||||
withEmbeds: (() => message => message.e && message.e.length > 0),
|
||||
withAttachments: (() => message => message.a && message.a.length > 0),
|
||||
isEdited: (() => message => ("te" in message) ? message.te : (message.f & 1) === 1)
|
||||
@ -20,7 +20,7 @@ const filter = {
|
||||
// Global sorters
|
||||
// --------------
|
||||
|
||||
const sorter = {
|
||||
PROCESSOR.SORTER = {
|
||||
oldestToNewest: (key1, key2) => {
|
||||
if (key1.length === key2.length) {
|
||||
return key1 > key2 ? 1 : key1 < key2 ? -1 : 0;
|
||||
@ -39,8 +39,3 @@ const sorter = {
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export default {
|
||||
FILTER: filter,
|
||||
SORTER: sorter
|
||||
};
|
||||
@ -1,4 +1,4 @@
|
||||
export default (function() {
|
||||
const SETTINGS = (function() {
|
||||
/**
|
||||
* @type {{}}
|
||||
* @property {Function} onSettingsChanged
|
||||
@ -1,12 +1,10 @@
|
||||
import settings from "./settings.mjs";
|
||||
import processor from "./processor.mjs";
|
||||
|
||||
// noinspection FunctionWithInconsistentReturnsJS
|
||||
export default (function() {
|
||||
const STATE = (function() {
|
||||
/**
|
||||
* @type {{}}
|
||||
* @property {{}} users
|
||||
* @property {{}} servers
|
||||
* @property {String[]} userindex
|
||||
* @property {{}[]} servers
|
||||
* @property {{}} channels
|
||||
*/
|
||||
let loadedFileMeta;
|
||||
@ -19,16 +17,20 @@ export default (function() {
|
||||
let currentPage;
|
||||
let messagesPerPage;
|
||||
|
||||
const getUser = function(id) {
|
||||
return loadedFileMeta.users[id] || { "name": "<unknown>" };
|
||||
const getUser = function(index) {
|
||||
return loadedFileMeta.users[loadedFileMeta.userindex[index]] || { "name": "<unknown>" };
|
||||
};
|
||||
|
||||
const getUserId = function(index) {
|
||||
return loadedFileMeta.userindex[index];
|
||||
};
|
||||
|
||||
const getUserList = function() {
|
||||
return loadedFileMeta ? loadedFileMeta.users : [];
|
||||
};
|
||||
|
||||
const getServer = function(id) {
|
||||
return loadedFileMeta.servers[id] || { "name": "<unknown>", "type": "unknown" };
|
||||
const getServer = function(index) {
|
||||
return loadedFileMeta.servers[index] || { "name": "<unknown>", "type": "unknown" };
|
||||
};
|
||||
|
||||
const generateChannelHierarchy = function() {
|
||||
@ -202,7 +204,7 @@ export default (function() {
|
||||
*/
|
||||
const message = messages[key];
|
||||
const user = getUser(message.u);
|
||||
const avatar = user.avatar ? { id: message.u, path: user.avatar } : null;
|
||||
const avatar = user.avatar ? { id: getUserId(message.u), path: user.avatar } : null;
|
||||
|
||||
const obj = {
|
||||
user,
|
||||
@ -230,7 +232,7 @@ export default (function() {
|
||||
if ("r" in message) {
|
||||
const replyMessage = getMessageById(message.r);
|
||||
const replyUser = replyMessage ? getUser(replyMessage.u) : null;
|
||||
const replyAvatar = replyUser && replyUser.avatar ? { id: replyMessage.u, path: replyUser.avatar } : null;
|
||||
const replyAvatar = replyUser && replyUser.avatar ? { id: getUserId(replyMessage.u), path: replyUser.avatar } : null;
|
||||
|
||||
obj["reply"] = replyMessage ? {
|
||||
"id": message.r,
|
||||
@ -288,17 +290,20 @@ export default (function() {
|
||||
eventOnUsersRefreshed = callback;
|
||||
},
|
||||
|
||||
uploadFile(meta, data) {
|
||||
/**
|
||||
* @param {{ meta, data }} file
|
||||
*/
|
||||
uploadFile(file) {
|
||||
if (loadedFileMeta != null) {
|
||||
throw "A file is already loaded!";
|
||||
}
|
||||
|
||||
if (typeof meta !== "object" || typeof data !== "object") {
|
||||
if (!file || typeof file.meta !== "object" || typeof file.data !== "object") {
|
||||
throw "Invalid file format!";
|
||||
}
|
||||
|
||||
loadedFileMeta = meta;
|
||||
loadedFileData = data;
|
||||
loadedFileMeta = file.meta;
|
||||
loadedFileData = file.data;
|
||||
loadedMessages = null;
|
||||
|
||||
selectedChannel = null;
|
||||
@ -308,7 +313,7 @@ export default (function() {
|
||||
triggerChannelsRefreshed();
|
||||
triggerMessagesRefreshed();
|
||||
|
||||
settings.onSettingsChanged(() => triggerMessagesRefreshed());
|
||||
SETTINGS.onSettingsChanged(() => triggerMessagesRefreshed());
|
||||
},
|
||||
|
||||
getChannelName(channel) {
|
||||
@ -330,7 +335,7 @@ export default (function() {
|
||||
currentPage = 1;
|
||||
selectedChannel = channel;
|
||||
|
||||
loadedMessages = getFilteredMessageKeys(channel).sort(processor.SORTER.oldestToNewest);
|
||||
loadedMessages = getFilteredMessageKeys(channel).sort(PROCESSOR.SORTER.oldestToNewest);
|
||||
triggerMessagesRefreshed();
|
||||
},
|
||||
|
||||
@ -411,23 +416,23 @@ export default (function() {
|
||||
setActiveFilter(filter) {
|
||||
switch (filter ? filter.type : "") {
|
||||
case "user":
|
||||
filterFunction = processor.FILTER.byUser(loadedFileMeta.userindex.indexOf(filter.value));
|
||||
filterFunction = PROCESSOR.FILTER.byUser(loadedFileMeta.userindex.indexOf(filter.value));
|
||||
break;
|
||||
|
||||
case "contents":
|
||||
filterFunction = processor.FILTER.byContents(filter.value);
|
||||
filterFunction = PROCESSOR.FILTER.byContents(filter.value);
|
||||
break;
|
||||
|
||||
case "withimages":
|
||||
filterFunction = processor.FILTER.withImages();
|
||||
filterFunction = PROCESSOR.FILTER.withImages();
|
||||
break;
|
||||
|
||||
case "withdownloads":
|
||||
filterFunction = processor.FILTER.withDownloads();
|
||||
filterFunction = PROCESSOR.FILTER.withDownloads();
|
||||
break;
|
||||
|
||||
case "edited":
|
||||
filterFunction = processor.FILTER.isEdited();
|
||||
filterFunction = PROCESSOR.FILTER.isEdited();
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -1,8 +1,6 @@
|
||||
import dom from "./dom.mjs";
|
||||
|
||||
const TEMPLATE_REGEX = /{([^{}]+?)}/g;
|
||||
|
||||
export default class {
|
||||
class TEMPLATE {
|
||||
constructor(contents) {
|
||||
this.contents = contents;
|
||||
};
|
||||
@ -13,10 +11,10 @@ export default class {
|
||||
|
||||
if (processor) {
|
||||
const updated = processor(match, value);
|
||||
return typeof updated === "undefined" ? dom.escapeHTML(value) : updated;
|
||||
return typeof updated === "undefined" ? DOM.escapeHTML(value) : updated;
|
||||
}
|
||||
|
||||
return dom.escapeHTML(value);
|
||||
return DOM.escapeHTML(value);
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -3,24 +3,18 @@
|
||||
min-width: 215px;
|
||||
max-width: 300px;
|
||||
overflow-y: auto;
|
||||
color: #eee;
|
||||
background-color: #1c1e22;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
#channels > div.loading {
|
||||
margin: 0 auto;
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
}
|
||||
|
||||
#channels > div.channel {
|
||||
#channels > div {
|
||||
cursor: pointer;
|
||||
padding: 10px 12px;
|
||||
color: #eee;
|
||||
font-size: 15px;
|
||||
border-bottom: 1px solid #333333;
|
||||
}
|
||||
|
||||
#channels > div.channel:hover, #channels > div.channel.active {
|
||||
#channels > div:hover, #channels > div.active {
|
||||
background-color: #282b30;
|
||||
}
|
||||
|
||||
|
||||
@ -11,20 +11,3 @@ body {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.loading {
|
||||
position: relative;
|
||||
--loading-backdrop: rgba(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
.loading::after {
|
||||
content: "";
|
||||
background: var(--loading-backdrop)
|
||||
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
|
||||
no-repeat center center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@ -107,11 +107,23 @@
|
||||
}
|
||||
|
||||
.message .thumbnail {
|
||||
--loading-backdrop: rgba(0, 0, 0, 0.75);
|
||||
position: relative;
|
||||
max-width: calc(100% - 20px);
|
||||
max-height: 320px;
|
||||
}
|
||||
|
||||
.message .thumbnail.loading::after {
|
||||
content: "";
|
||||
background: rgba(0, 0, 0, 0.75)
|
||||
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
|
||||
no-repeat center center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.message .thumbnail img {
|
||||
width: auto;
|
||||
max-width: 100%;
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
namespace DHT.Server.Database.Export;
|
||||
|
||||
readonly record struct Snowflake(ulong Id) {
|
||||
public static implicit operator Snowflake(ulong id) => new (id);
|
||||
}
|
||||
readonly record struct Snowflake(ulong Id);
|
||||
|
||||
@ -3,10 +3,14 @@ using System.Text.Json.Serialization;
|
||||
|
||||
namespace DHT.Server.Database.Export;
|
||||
|
||||
static class ViewerJson {
|
||||
sealed class ViewerJson {
|
||||
public required JsonMeta Meta { get; init; }
|
||||
public required Dictionary<Snowflake, Dictionary<Snowflake, JsonMessage>> Data { get; init; }
|
||||
|
||||
public sealed class JsonMeta {
|
||||
public required Dictionary<Snowflake, JsonUser> Users { get; init; }
|
||||
public required Dictionary<Snowflake, JsonServer> Servers { get; init; }
|
||||
public required List<Snowflake> Userindex { get; init; }
|
||||
public required List<JsonServer> Servers { get; init; }
|
||||
public required Dictionary<Snowflake, JsonChannel> Channels { get; init; }
|
||||
}
|
||||
|
||||
@ -26,7 +30,7 @@ static class ViewerJson {
|
||||
}
|
||||
|
||||
public sealed class JsonChannel {
|
||||
public required Snowflake Server { get; init; }
|
||||
public required int Server { get; init; }
|
||||
public required string Name { get; init; }
|
||||
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
||||
@ -43,9 +47,7 @@ static class ViewerJson {
|
||||
}
|
||||
|
||||
public sealed class JsonMessage {
|
||||
public required Snowflake Id { get; init; }
|
||||
public required Snowflake C { get; init; }
|
||||
public required Snowflake U { get; init; }
|
||||
public required int U { get; init; }
|
||||
public required long T { get; init; }
|
||||
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
||||
|
||||
@ -7,5 +7,5 @@ namespace DHT.Server.Database.Export;
|
||||
PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
|
||||
GenerationMode = JsonSourceGenerationMode.Default
|
||||
)]
|
||||
[JsonSerializable(typeof(ViewerJson.JsonMeta))]
|
||||
sealed partial class ViewerJsonMetadataContext : JsonSerializerContext;
|
||||
[JsonSerializable(typeof(ViewerJson))]
|
||||
sealed partial class ViewerJsonContext : JsonSerializerContext;
|
||||
@ -2,9 +2,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
using DHT.Server.Data.Filters;
|
||||
@ -12,93 +10,109 @@ using DHT.Utils.Logging;
|
||||
|
||||
namespace DHT.Server.Database.Export;
|
||||
|
||||
static class ViewerJsonExport {
|
||||
public static class ViewerJsonExport {
|
||||
private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));
|
||||
|
||||
public static async Task GetMetadata(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
|
||||
public static async Task Generate(Stream stream, IDatabaseFile db, MessageFilter? filter = null) {
|
||||
var perf = Log.Start();
|
||||
|
||||
var includedChannels = new List<Channel>();
|
||||
var includedUserIds = new HashSet<ulong>();
|
||||
var includedChannelIds = new HashSet<ulong>();
|
||||
var includedServerIds = new HashSet<ulong>();
|
||||
|
||||
var channelIdFilter = filter?.ChannelIds;
|
||||
var includedMessages = await db.Messages.Get(filter).ToListAsync();
|
||||
var includedChannels = new List<Channel>();
|
||||
|
||||
await foreach (var channel in db.Channels.Get(cancellationToken)) {
|
||||
if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
|
||||
foreach (var message in includedMessages) {
|
||||
includedUserIds.Add(message.Sender);
|
||||
includedChannelIds.Add(message.Channel);
|
||||
}
|
||||
|
||||
await foreach (var channel in db.Channels.Get()) {
|
||||
if (includedChannelIds.Contains(channel.Id)) {
|
||||
includedChannels.Add(channel);
|
||||
includedServerIds.Add(channel.Server);
|
||||
}
|
||||
}
|
||||
|
||||
var users = await GenerateUserList(db, cancellationToken);
|
||||
var servers = await GenerateServerList(db, includedServerIds, cancellationToken);
|
||||
var channels = GenerateChannelList(includedChannels);
|
||||
|
||||
var meta = new ViewerJson.JsonMeta {
|
||||
Users = users,
|
||||
Servers = servers,
|
||||
Channels = channels
|
||||
};
|
||||
var (users, userIndex, userIndices) = await GenerateUserList(db, includedUserIds);
|
||||
var (servers, serverIndices) = await GenerateServerList(db, includedServerIds);
|
||||
var channels = GenerateChannelList(includedChannels, serverIndices);
|
||||
|
||||
perf.Step("Collect database data");
|
||||
|
||||
await JsonSerializer.SerializeAsync(stream, meta, ViewerJsonMetadataContext.Default.JsonMeta, cancellationToken);
|
||||
var value = new ViewerJson {
|
||||
Meta = new ViewerJson.JsonMeta {
|
||||
Users = users,
|
||||
Userindex = userIndex,
|
||||
Servers = servers,
|
||||
Channels = channels
|
||||
},
|
||||
Data = GenerateMessageList(includedMessages, userIndices)
|
||||
};
|
||||
|
||||
perf.Step("Generate value object");
|
||||
|
||||
await JsonSerializer.SerializeAsync(stream, value, ViewerJsonContext.Default.ViewerJson);
|
||||
|
||||
perf.Step("Serialize to JSON");
|
||||
perf.End();
|
||||
}
|
||||
|
||||
public static async Task GetMessages(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
|
||||
var perf = Log.Start();
|
||||
|
||||
ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
|
||||
|
||||
await foreach(var message in GenerateMessageList(db, filter, cancellationToken)) {
|
||||
await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
|
||||
await stream.WriteAsync(newLine, cancellationToken);
|
||||
}
|
||||
|
||||
perf.Step("Generate and serialize messages to JSON");
|
||||
perf.End();
|
||||
}
|
||||
|
||||
private static async Task<Dictionary<Snowflake, ViewerJson.JsonUser>> GenerateUserList(IDatabaseFile db, CancellationToken cancellationToken) {
|
||||
private static async Task<(Dictionary<Snowflake, ViewerJson.JsonUser> Users, List<Snowflake> UserIndex, Dictionary<ulong, int> UserIndices)> GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds) {
|
||||
var users = new Dictionary<Snowflake, ViewerJson.JsonUser>();
|
||||
var userIndex = new List<Snowflake>();
|
||||
var userIndices = new Dictionary<ulong, int>();
|
||||
|
||||
await foreach (var user in db.Users.Get(cancellationToken)) {
|
||||
users[user.Id] = new ViewerJson.JsonUser {
|
||||
await foreach (var user in db.Users.Get()) {
|
||||
var id = user.Id;
|
||||
if (!userIds.Contains(id)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
var idSnowflake = new Snowflake(id);
|
||||
userIndices[id] = users.Count;
|
||||
userIndex.Add(idSnowflake);
|
||||
|
||||
users[idSnowflake] = new ViewerJson.JsonUser {
|
||||
Name = user.Name,
|
||||
Avatar = user.AvatarUrl,
|
||||
Tag = user.Discriminator
|
||||
};
|
||||
}
|
||||
|
||||
return users;
|
||||
return (users, userIndex, userIndices);
|
||||
}
|
||||
|
||||
private static async Task<Dictionary<Snowflake, ViewerJson.JsonServer>> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, CancellationToken cancellationToken) {
|
||||
var servers = new Dictionary<Snowflake, ViewerJson.JsonServer>();
|
||||
private static async Task<(List<ViewerJson.JsonServer> Servers, Dictionary<ulong, int> ServerIndices)> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds) {
|
||||
var servers = new List<ViewerJson.JsonServer>();
|
||||
var serverIndices = new Dictionary<ulong, int>();
|
||||
|
||||
await foreach (var server in db.Servers.Get(cancellationToken)) {
|
||||
if (!serverIds.Contains(server.Id)) {
|
||||
await foreach (var server in db.Servers.Get()) {
|
||||
var id = server.Id;
|
||||
if (!serverIds.Contains(id)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
servers[server.Id] = new ViewerJson.JsonServer {
|
||||
serverIndices[id] = servers.Count;
|
||||
|
||||
servers.Add(new ViewerJson.JsonServer {
|
||||
Name = server.Name,
|
||||
Type = ServerTypes.ToJsonViewerString(server.Type)
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
return servers;
|
||||
return (servers, serverIndices);
|
||||
}
|
||||
|
||||
private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels) {
|
||||
private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, int> serverIndices) {
|
||||
var channels = new Dictionary<Snowflake, ViewerJson.JsonChannel>();
|
||||
|
||||
foreach (var channel in includedChannels) {
|
||||
channels[channel.Id] = new ViewerJson.JsonChannel {
|
||||
Server = channel.Server,
|
||||
var channelIdSnowflake = new Snowflake(channel.Id);
|
||||
|
||||
channels[channelIdSnowflake] = new ViewerJson.JsonChannel {
|
||||
Server = serverIndices[channel.Server],
|
||||
Name = channel.Name,
|
||||
Parent = channel.ParentId?.ToString(),
|
||||
Position = channel.Position,
|
||||
@ -110,40 +124,51 @@ static class ViewerJsonExport {
|
||||
return channels;
|
||||
}
|
||||
|
||||
private static async IAsyncEnumerable<ViewerJson.JsonMessage> GenerateMessageList(IDatabaseFile db, MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
|
||||
await foreach (var message in db.Messages.Get(filter, cancellationToken)) {
|
||||
yield return new ViewerJson.JsonMessage {
|
||||
Id = message.Id,
|
||||
C = message.Channel,
|
||||
U = message.Sender,
|
||||
T = message.Timestamp,
|
||||
M = string.IsNullOrEmpty(message.Text) ? null : message.Text,
|
||||
Te = message.EditTimestamp,
|
||||
R = message.RepliedToId?.ToString(),
|
||||
private static Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>> GenerateMessageList(List<Message> includedMessages, Dictionary<ulong, int> userIndices) {
|
||||
var data = new Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>>();
|
||||
|
||||
A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
|
||||
var a = new ViewerJson.JsonMessageAttachment {
|
||||
Url = attachment.DownloadUrl,
|
||||
Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl
|
||||
};
|
||||
foreach (var grouping in includedMessages.GroupBy(static message => message.Channel)) {
|
||||
var channelIdSnowflake = new Snowflake(grouping.Key);
|
||||
var channelData = new Dictionary<Snowflake, ViewerJson.JsonMessage>();
|
||||
|
||||
if (attachment is { Width: not null, Height: not null }) {
|
||||
a.Width = attachment.Width;
|
||||
a.Height = attachment.Height;
|
||||
}
|
||||
foreach (var message in grouping) {
|
||||
var messageIdSnowflake = new Snowflake(message.Id);
|
||||
|
||||
return a;
|
||||
}).ToArray(),
|
||||
channelData[messageIdSnowflake] = new ViewerJson.JsonMessage {
|
||||
U = userIndices[message.Sender],
|
||||
T = message.Timestamp,
|
||||
M = string.IsNullOrEmpty(message.Text) ? null : message.Text,
|
||||
Te = message.EditTimestamp,
|
||||
R = message.RepliedToId?.ToString(),
|
||||
|
||||
E = message.Embeds.IsEmpty ? null : message.Embeds.Select(static embed => embed.Json).ToArray(),
|
||||
A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
|
||||
var a = new ViewerJson.JsonMessageAttachment {
|
||||
Url = attachment.DownloadUrl,
|
||||
Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl
|
||||
};
|
||||
|
||||
Re = message.Reactions.IsEmpty ? null : message.Reactions.Select(static reaction => new ViewerJson.JsonMessageReaction {
|
||||
Id = reaction.EmojiId?.ToString(),
|
||||
N = reaction.EmojiName,
|
||||
A = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated),
|
||||
C = reaction.Count
|
||||
}).ToArray()
|
||||
};
|
||||
if (attachment is { Width: not null, Height: not null }) {
|
||||
a.Width = attachment.Width;
|
||||
a.Height = attachment.Height;
|
||||
}
|
||||
|
||||
return a;
|
||||
}).ToArray(),
|
||||
|
||||
E = message.Embeds.IsEmpty ? null : message.Embeds.Select(static embed => embed.Json).ToArray(),
|
||||
|
||||
Re = message.Reactions.IsEmpty ? null : message.Reactions.Select(static reaction => new ViewerJson.JsonMessageReaction {
|
||||
Id = reaction.EmojiId?.ToString(),
|
||||
N = reaction.EmojiName,
|
||||
A = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated),
|
||||
C = reaction.Count
|
||||
}).ToArray()
|
||||
};
|
||||
}
|
||||
|
||||
data[channelIdSnowflake] = channelData;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace DHT.Server.Database.Export;
|
||||
|
||||
[JsonSourceGenerationOptions(
|
||||
Converters = [typeof(SnowflakeJsonSerializer)],
|
||||
PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
|
||||
GenerationMode = JsonSourceGenerationMode.Default
|
||||
)]
|
||||
[JsonSerializable(typeof(ViewerJson.JsonMessage))]
|
||||
sealed partial class ViewerJsonMessageContext : JsonSerializerContext;
|
||||
@ -15,7 +15,7 @@ public interface IChannelRepository {
|
||||
|
||||
Task<long> Count(CancellationToken cancellationToken = default);
|
||||
|
||||
IAsyncEnumerable<Channel> Get(CancellationToken cancellationToken = default);
|
||||
IAsyncEnumerable<Channel> Get();
|
||||
|
||||
internal sealed class Dummy : IChannelRepository {
|
||||
public IObservable<long> TotalCount { get; } = Observable.Return(0L);
|
||||
@ -28,7 +28,7 @@ public interface IChannelRepository {
|
||||
return Task.FromResult(0L);
|
||||
}
|
||||
|
||||
public IAsyncEnumerable<Channel> Get(CancellationToken cancellationToken) {
|
||||
public IAsyncEnumerable<Channel> Get() {
|
||||
return AsyncEnumerable.Empty<Channel>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ public interface IDownloadRepository {
|
||||
|
||||
Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor);
|
||||
|
||||
Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken = default);
|
||||
Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor);
|
||||
|
||||
IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken = default);
|
||||
|
||||
@ -55,7 +55,7 @@ public interface IDownloadRepository {
|
||||
return Task.FromResult(false);
|
||||
}
|
||||
|
||||
public Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken) {
|
||||
public Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor) {
|
||||
return Task.FromResult(false);
|
||||
}
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ public interface IMessageRepository {
|
||||
|
||||
Task<long> Count(MessageFilter? filter = null, CancellationToken cancellationToken = default);
|
||||
|
||||
IAsyncEnumerable<Message> Get(MessageFilter? filter = null, CancellationToken cancellationToken = default);
|
||||
IAsyncEnumerable<Message> Get(MessageFilter? filter = null);
|
||||
|
||||
IAsyncEnumerable<ulong> GetIds(MessageFilter? filter = null);
|
||||
|
||||
@ -33,7 +33,7 @@ public interface IMessageRepository {
|
||||
return Task.FromResult(0L);
|
||||
}
|
||||
|
||||
public IAsyncEnumerable<Message> Get(MessageFilter? filter, CancellationToken cancellationToken) {
|
||||
public IAsyncEnumerable<Message> Get(MessageFilter? filter) {
|
||||
return AsyncEnumerable.Empty<Message>();
|
||||
}
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ public interface IServerRepository {
|
||||
|
||||
Task<long> Count(CancellationToken cancellationToken = default);
|
||||
|
||||
IAsyncEnumerable<Data.Server> Get(CancellationToken cancellationToken = default);
|
||||
IAsyncEnumerable<Data.Server> Get();
|
||||
|
||||
internal sealed class Dummy : IServerRepository {
|
||||
public IObservable<long> TotalCount { get; } = Observable.Return(0L);
|
||||
@ -27,7 +27,7 @@ public interface IServerRepository {
|
||||
return Task.FromResult(0L);
|
||||
}
|
||||
|
||||
public IAsyncEnumerable<Data.Server> Get(CancellationToken cancellationToken) {
|
||||
public IAsyncEnumerable<Data.Server> Get() {
|
||||
return AsyncEnumerable.Empty<Data.Server>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ public interface IUserRepository {
|
||||
|
||||
Task<long> Count(CancellationToken cancellationToken = default);
|
||||
|
||||
IAsyncEnumerable<User> Get(CancellationToken cancellationToken = default);
|
||||
IAsyncEnumerable<User> Get();
|
||||
|
||||
internal sealed class Dummy : IUserRepository {
|
||||
public IObservable<long> TotalCount { get; } = Observable.Return(0L);
|
||||
@ -28,7 +28,7 @@ public interface IUserRepository {
|
||||
return Task.FromResult(0L);
|
||||
}
|
||||
|
||||
public IAsyncEnumerable<User> Get(CancellationToken cancellationToken) {
|
||||
public IAsyncEnumerable<User> Get() {
|
||||
return AsyncEnumerable.Empty<User>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
@ -55,13 +54,13 @@ sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository
|
||||
return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM channels", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Channel> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
|
||||
public async IAsyncEnumerable<Channel> Get() {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using var cmd = conn.Command("SELECT id, server, name, parent_id, position, topic, nsfw FROM channels");
|
||||
await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
|
||||
await using var reader = await cmd.ExecuteReaderAsync();
|
||||
|
||||
while (await reader.ReadAsync(cancellationToken)) {
|
||||
while (await reader.ReadAsync()) {
|
||||
yield return new Channel {
|
||||
Id = reader.GetUint64(0),
|
||||
Server = reader.GetUint64(1),
|
||||
|
||||
@ -210,7 +210,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken) {
|
||||
public async Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor) {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using var cmd = conn.Command(
|
||||
@ -228,8 +228,8 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
string? type;
|
||||
long rowid;
|
||||
|
||||
await using (var reader = await cmd.ExecuteReaderAsync(cancellationToken)) {
|
||||
if (!await reader.ReadAsync(cancellationToken)) {
|
||||
await using (var reader = await cmd.ExecuteReaderAsync()) {
|
||||
if (!await reader.ReadAsync()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -239,7 +239,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
}
|
||||
|
||||
await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
|
||||
await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob, cancellationToken);
|
||||
await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
@ -214,7 +213,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
}
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Message> Get(MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
|
||||
public async IAsyncEnumerable<Message> Get(MessageFilter? filter) {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
const string AttachmentSql =
|
||||
@ -270,9 +269,9 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
"""
|
||||
);
|
||||
|
||||
await using var reader = await messageCmd.ExecuteReaderAsync(cancellationToken);
|
||||
await using var reader = await messageCmd.ExecuteReaderAsync();
|
||||
|
||||
while (await reader.ReadAsync(cancellationToken)) {
|
||||
while (await reader.ReadAsync()) {
|
||||
ulong messageId = reader.GetUint64(0);
|
||||
|
||||
yield return new Message {
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
@ -47,13 +46,13 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
|
||||
return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM servers", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Data.Server> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
|
||||
public async IAsyncEnumerable<Data.Server> Get() {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using var cmd = conn.Command("SELECT id, name, type FROM servers");
|
||||
await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
|
||||
await using var reader = await cmd.ExecuteReaderAsync();
|
||||
|
||||
while (await reader.ReadAsync(cancellationToken)) {
|
||||
while (await reader.ReadAsync()) {
|
||||
yield return new Data.Server {
|
||||
Id = reader.GetUint64(0),
|
||||
Name = reader.GetString(1),
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
@ -59,13 +58,13 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
|
||||
return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM users", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<User> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
|
||||
public async IAsyncEnumerable<User> Get() {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using var cmd = conn.Command("SELECT id, name, avatar_url, discriminator FROM users");
|
||||
await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
|
||||
await using var reader = await cmd.ExecuteReaderAsync();
|
||||
|
||||
while (await reader.ReadAsync(cancellationToken)) {
|
||||
while (await reader.ReadAsync()) {
|
||||
yield return new User {
|
||||
Id = reader.GetUint64(0),
|
||||
Name = reader.GetString(1),
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
using System;
|
||||
using System.Net;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Utils.Http;
|
||||
@ -20,9 +19,7 @@ abstract class BaseEndpoint(IDatabaseFile db) {
|
||||
|
||||
try {
|
||||
response.StatusCode = (int) HttpStatusCode.OK;
|
||||
await Respond(ctx.Request, response, ctx.RequestAborted);
|
||||
} catch (OperationCanceledException) {
|
||||
throw;
|
||||
await Respond(ctx.Request, response);
|
||||
} catch (HttpException e) {
|
||||
Log.Error(e);
|
||||
response.StatusCode = (int) e.StatusCode;
|
||||
@ -38,7 +35,7 @@ abstract class BaseEndpoint(IDatabaseFile db) {
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken);
|
||||
protected abstract Task Respond(HttpRequest request, HttpResponse response);
|
||||
|
||||
protected static async Task<JsonElement> ReadJson(HttpRequest request) {
|
||||
try {
|
||||
@ -47,13 +44,4 @@ abstract class BaseEndpoint(IDatabaseFile db) {
|
||||
throw new HttpException(HttpStatusCode.UnsupportedMediaType, "This endpoint only accepts JSON.");
|
||||
}
|
||||
}
|
||||
|
||||
protected static Guid GetSessionId(HttpRequest request) {
|
||||
if (request.Query.TryGetValue("session", out var sessionIdValue) && sessionIdValue.Count == 1 && Guid.TryParse(sessionIdValue[0], out Guid sessionId)) {
|
||||
return sessionId;
|
||||
}
|
||||
else {
|
||||
throw new HttpException(HttpStatusCode.BadRequest, "Invalid session ID.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,4 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Download;
|
||||
@ -11,16 +8,12 @@ using Microsoft.AspNetCore.Http;
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
string url = WebUtility.UrlDecode((string) request.RouteValues["url"]!);
|
||||
string normalizedUrl = DiscordCdn.NormalizeUrl(url);
|
||||
|
||||
if (!await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, WriteDataTo(response), cancellationToken)) {
|
||||
if (!await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, (download, stream) => response.WriteStreamAsync(download.Type, download.Size, stream))) {
|
||||
response.Redirect(url, permanent: false);
|
||||
}
|
||||
}
|
||||
|
||||
private static Func<Data.Download, Stream, CancellationToken, Task> WriteDataTo(HttpResponse response) {
|
||||
return (download, stream, cancellationToken) => response.WriteStreamAsync(download.Type, download.Size, stream, cancellationToken);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
using System.Net.Mime;
|
||||
using System.Threading;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using DHT.Server.Database;
|
||||
@ -10,17 +10,19 @@ using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters, ResourceLoader resources) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
|
||||
sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters) : BaseEndpoint(db) {
|
||||
private static ResourceLoader Resources { get; } = new (Assembly.GetExecutingAssembly());
|
||||
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
|
||||
string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")
|
||||
.Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(parameters.Token))
|
||||
.Replace("/*[IMPORTS]*/", await resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
|
||||
.Replace("/*[CSS-CONTROLLER]*/", await resources.ReadTextAsync("Tracker/styles/controller.css"))
|
||||
.Replace("/*[CSS-SETTINGS]*/", await resources.ReadTextAsync("Tracker/styles/settings.css"))
|
||||
.Replace("/*[IMPORTS]*/", await Resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
|
||||
.Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
|
||||
.Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"))
|
||||
.Replace("/*[DEBUGGER]*/", request.Query.ContainsKey("debug") ? "debugger;" : "");
|
||||
|
||||
response.Headers.Append("X-DHT", "1");
|
||||
await response.WriteTextAsync(MediaTypeNames.Text.JavaScript, script, cancellationToken);
|
||||
await response.WriteTextAsync(MediaTypeNames.Text.JavaScript, script);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Database.Export;
|
||||
using DHT.Server.Service.Viewer;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
|
||||
protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
var sessionId = GetSessionId(request);
|
||||
var session = viewerSessions.Get(sessionId);
|
||||
|
||||
response.ContentType = "application/x-ndjson";
|
||||
return ViewerJsonExport.GetMessages(response.Body, Db, session.MessageFilter, cancellationToken);
|
||||
}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
using System.Net.Mime;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Database.Export;
|
||||
using DHT.Server.Service.Viewer;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
|
||||
protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
var sessionId = GetSessionId(request);
|
||||
var session = viewerSessions.Get(sessionId);
|
||||
|
||||
response.ContentType = MediaTypeNames.Application.Json;
|
||||
return ViewerJsonExport.GetMetadata(response.Body, Db, session.MessageFilter, cancellationToken);
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
using System.Net;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
using DHT.Server.Database;
|
||||
@ -10,7 +9,7 @@ using Microsoft.AspNetCore.Http;
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
var root = await ReadJson(request);
|
||||
var server = ReadServer(root.RequireObject("server"), "server");
|
||||
var channel = ReadChannel(root.RequireObject("channel"), "channel", server.Id);
|
||||
|
||||
@ -4,7 +4,6 @@ using System.Diagnostics.CodeAnalysis;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
using DHT.Server.Data.Filters;
|
||||
@ -20,7 +19,7 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
private const string HasNewMessages = "1";
|
||||
private const string NoNewMessages = "0";
|
||||
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
var root = await ReadJson(request);
|
||||
|
||||
if (root.ValueKind != JsonValueKind.Array) {
|
||||
@ -38,11 +37,11 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
}
|
||||
|
||||
var addedMessageFilter = new MessageFilter { MessageIds = addedMessageIds };
|
||||
bool anyNewMessages = await Db.Messages.Count(addedMessageFilter, CancellationToken.None) < addedMessageIds.Count;
|
||||
bool anyNewMessages = await Db.Messages.Count(addedMessageFilter) < addedMessageIds.Count;
|
||||
|
||||
await Db.Messages.Add(messages);
|
||||
|
||||
await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages, cancellationToken);
|
||||
await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages);
|
||||
}
|
||||
|
||||
private static Message ReadMessage(JsonElement json, string path) => new () {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
using System.Net;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
using DHT.Server.Database;
|
||||
@ -10,7 +9,7 @@ using Microsoft.AspNetCore.Http;
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
var root = await ReadJson(request);
|
||||
|
||||
if (root.ValueKind != JsonValueKind.Array) {
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Utils.Http;
|
||||
using DHT.Utils.Resources;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.StaticFiles;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEndpoint(db) {
|
||||
private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
|
||||
|
||||
private readonly Dictionary<string, byte[]?> cache = new ();
|
||||
private readonly SemaphoreSlim cacheSemaphore = new (1);
|
||||
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
|
||||
string path = (string?) request.RouteValues["path"] ?? "index.html";
|
||||
string resourcePath = "Viewer/" + path;
|
||||
|
||||
byte[]? resourceBytes;
|
||||
|
||||
await cacheSemaphore.WaitAsync(cancellationToken);
|
||||
try {
|
||||
if (!cache.TryGetValue(resourcePath, out resourceBytes)) {
|
||||
cache[resourcePath] = resourceBytes = await resources.ReadBytesAsyncIfExists(resourcePath);
|
||||
}
|
||||
} finally {
|
||||
cacheSemaphore.Release();
|
||||
}
|
||||
|
||||
if (resourceBytes == null) {
|
||||
throw new HttpException(HttpStatusCode.NotFound, "File not found: " + path);
|
||||
}
|
||||
else {
|
||||
var contentType = ContentTypeProvider.TryGetContentType(path, out string? type) ? type : null;
|
||||
await response.WriteFileAsync(contentType, resourceBytes, cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -39,16 +39,6 @@
|
||||
<Link>Resources/Tracker/styles/%(RecursiveDir)%(Filename)%(Extension)</Link>
|
||||
<Visible>false</Visible>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../Resources/Viewer/**">
|
||||
<LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
|
||||
<Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
|
||||
<Visible>false</Visible>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../Desktop/Resources/icon.ico">
|
||||
<LogicalName>Viewer\favicon.ico</LogicalName>
|
||||
<Link>Resources/icon.ico</Link>
|
||||
<Visible>false</Visible>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Utils.Logging;
|
||||
@ -7,34 +6,24 @@ using Microsoft.AspNetCore.Http.Extensions;
|
||||
|
||||
namespace DHT.Server.Service.Middlewares;
|
||||
|
||||
sealed class ServerLoggingMiddleware(RequestDelegate next) {
|
||||
sealed class ServerLoggingMiddleware {
|
||||
private static readonly Log Log = Log.ForType<ServerLoggingMiddleware>();
|
||||
|
||||
private readonly RequestDelegate next;
|
||||
|
||||
public ServerLoggingMiddleware(RequestDelegate next) {
|
||||
this.next = next;
|
||||
}
|
||||
|
||||
public async Task InvokeAsync(HttpContext context) {
|
||||
var stopwatch = Stopwatch.StartNew();
|
||||
try {
|
||||
await next(context);
|
||||
} catch (OperationCanceledException) {
|
||||
OnFinished(stopwatch, context);
|
||||
throw;
|
||||
}
|
||||
|
||||
OnFinished(stopwatch, context);
|
||||
}
|
||||
|
||||
private static void OnFinished(Stopwatch stopwatch, HttpContext context) {
|
||||
await next(context);
|
||||
stopwatch.Stop();
|
||||
|
||||
var request = context.Request;
|
||||
var requestLength = request.ContentLength ?? 0L;
|
||||
var responseStatus = context.Response.StatusCode;
|
||||
var elapsedMs = stopwatch.ElapsedMilliseconds;
|
||||
|
||||
if (context.RequestAborted.IsCancellationRequested) {
|
||||
Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
|
||||
}
|
||||
else {
|
||||
var responseStatus = context.Response.StatusCode;
|
||||
Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
|
||||
}
|
||||
Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +1,8 @@
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Service.Viewer;
|
||||
using DHT.Utils.Logging;
|
||||
using DHT.Utils.Resources;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Server.Kestrel.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
@ -28,12 +25,10 @@ public sealed class ServerManager {
|
||||
}
|
||||
|
||||
private readonly IDatabaseFile db;
|
||||
private readonly ViewerSessions viewerSessions;
|
||||
private readonly SemaphoreSlim semaphore = new (1, 1);
|
||||
|
||||
internal ServerManager(IDatabaseFile db, ViewerSessions viewerSessions) {
|
||||
internal ServerManager(IDatabaseFile db) {
|
||||
this.db = db;
|
||||
this.viewerSessions = viewerSessions;
|
||||
}
|
||||
|
||||
public async Task Start(ushort port, string token) {
|
||||
@ -62,8 +57,6 @@ public sealed class ServerManager {
|
||||
void AddServices(IServiceCollection services) {
|
||||
services.AddSingleton(typeof(IDatabaseFile), db);
|
||||
services.AddSingleton(typeof(ServerParameters), new ServerParameters(port, token));
|
||||
services.AddSingleton(typeof(ResourceLoader), new ResourceLoader(Assembly.GetExecutingAssembly()));
|
||||
services.AddSingleton(typeof(ViewerSessions), viewerSessions);
|
||||
}
|
||||
|
||||
void SetKestrelOptions(KestrelServerOptions options) {
|
||||
|
||||
@ -3,8 +3,6 @@ using System.Text.Json.Serialization;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Endpoints;
|
||||
using DHT.Server.Service.Middlewares;
|
||||
using DHT.Server.Service.Viewer;
|
||||
using DHT.Utils.Resources;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Http.Json;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
@ -35,24 +33,14 @@ sealed class Startup {
|
||||
}
|
||||
|
||||
[SuppressMessage("ReSharper", "UnusedMember.Global")]
|
||||
public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime, IDatabaseFile db, ServerParameters parameters, ResourceLoader resources, ViewerSessions viewerSessions) {
|
||||
public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime, IDatabaseFile db, ServerParameters parameters) {
|
||||
app.UseMiddleware<ServerLoggingMiddleware>();
|
||||
app.UseCors();
|
||||
|
||||
app.Map("/viewer", node => {
|
||||
node.UseRouting();
|
||||
node.UseEndpoints(endpoints => {
|
||||
endpoints.MapGet("/{**path}", new ViewerEndpoint(db, resources).Handle);
|
||||
});
|
||||
});
|
||||
|
||||
app.UseMiddleware<ServerAuthorizationMiddleware>();
|
||||
|
||||
app.UseRouting();
|
||||
|
||||
app.UseEndpoints(endpoints => {
|
||||
endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters, resources).Handle);
|
||||
endpoints.MapGet("/get-viewer-metadata", new GetViewerMetadataEndpoint(db, viewerSessions).Handle);
|
||||
endpoints.MapGet("/get-viewer-messages", new GetViewerMessagesEndpoint(db, viewerSessions).Handle);
|
||||
endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters).Handle);
|
||||
endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
|
||||
endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
|
||||
endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
using DHT.Server.Data.Filters;
|
||||
|
||||
namespace DHT.Server.Service.Viewer;
|
||||
|
||||
public readonly record struct ViewerSession(MessageFilter? MessageFilter);
|
||||
@ -1,35 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DHT.Server.Service.Viewer;
|
||||
|
||||
public sealed class ViewerSessions : IDisposable {
|
||||
private readonly Dictionary<Guid, ViewerSession> sessions = new ();
|
||||
private bool isDisposed = false;
|
||||
|
||||
public Guid Register(ViewerSession session) {
|
||||
Guid guid = Guid.NewGuid();
|
||||
|
||||
lock (this) {
|
||||
ObjectDisposedException.ThrowIf(isDisposed, this);
|
||||
sessions[guid] = session;
|
||||
}
|
||||
|
||||
return guid;
|
||||
}
|
||||
|
||||
internal ViewerSession Get(Guid guid) {
|
||||
lock (this) {
|
||||
return sessions.GetValueOrDefault(guid);
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
lock (this) {
|
||||
if (!isDisposed) {
|
||||
isDisposed = true;
|
||||
sessions.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3,29 +3,19 @@ using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Download;
|
||||
using DHT.Server.Service;
|
||||
using DHT.Server.Service.Viewer;
|
||||
|
||||
namespace DHT.Server;
|
||||
|
||||
public sealed class State : IAsyncDisposable {
|
||||
public sealed class State(IDatabaseFile db, int? concurrentDownloads) : IAsyncDisposable {
|
||||
public static State Dummy { get; } = new (DummyDatabaseFile.Instance, null);
|
||||
|
||||
public IDatabaseFile Db { get; }
|
||||
public Downloader Downloader { get; }
|
||||
public ViewerSessions ViewerSessions { get; }
|
||||
public ServerManager Server { get; }
|
||||
|
||||
public State(IDatabaseFile db, int? concurrentDownloads) {
|
||||
Db = db;
|
||||
Downloader = new Downloader(db, concurrentDownloads);
|
||||
ViewerSessions = new ViewerSessions();
|
||||
Server = new ServerManager(db, ViewerSessions);
|
||||
}
|
||||
public IDatabaseFile Db { get; } = db;
|
||||
public Downloader Downloader { get; } = new (db, concurrentDownloads);
|
||||
public ServerManager Server { get; } = new (db);
|
||||
|
||||
public async ValueTask DisposeAsync() {
|
||||
await Downloader.Stop();
|
||||
await Server.Stop();
|
||||
await Db.DisposeAsync();
|
||||
ViewerSessions.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,34 +1,33 @@
|
||||
using System.IO;
|
||||
using System.Net.Mime;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Utils.Http;
|
||||
|
||||
public static class HttpExtensions {
|
||||
public static Task WriteTextAsync(this HttpResponse response, string text, CancellationToken cancellationToken) {
|
||||
return WriteTextAsync(response, MediaTypeNames.Text.Plain, text, cancellationToken);
|
||||
public static Task WriteTextAsync(this HttpResponse response, string text) {
|
||||
return WriteTextAsync(response, MediaTypeNames.Text.Plain, text);
|
||||
}
|
||||
|
||||
public static async Task WriteTextAsync(this HttpResponse response, string contentType, string text, CancellationToken cancellationToken) {
|
||||
public static async Task WriteTextAsync(this HttpResponse response, string contentType, string text) {
|
||||
response.ContentType = contentType;
|
||||
await response.StartAsync(cancellationToken);
|
||||
await response.WriteAsync(text, Encoding.UTF8, cancellationToken);
|
||||
await response.StartAsync();
|
||||
await response.WriteAsync(text, Encoding.UTF8);
|
||||
}
|
||||
|
||||
public static async Task WriteFileAsync(this HttpResponse response, string? contentType, byte[] bytes, CancellationToken cancellationToken) {
|
||||
public static async Task WriteFileAsync(this HttpResponse response, string? contentType, byte[] bytes) {
|
||||
response.ContentType = contentType ?? string.Empty;
|
||||
response.ContentLength = bytes.Length;
|
||||
await response.StartAsync(cancellationToken);
|
||||
await response.Body.WriteAsync(bytes, cancellationToken);
|
||||
await response.StartAsync();
|
||||
await response.Body.WriteAsync(bytes);
|
||||
}
|
||||
|
||||
public static async Task WriteStreamAsync(this HttpResponse response, string? contentType, ulong? contentLength, Stream source, CancellationToken cancellationToken) {
|
||||
public static async Task WriteStreamAsync(this HttpResponse response, string? contentType, ulong? contentLength, Stream source) {
|
||||
response.ContentType = contentType ?? string.Empty;
|
||||
response.ContentLength = (long?) contentLength;
|
||||
await response.StartAsync(cancellationToken);
|
||||
await source.CopyToAsync(response.Body, cancellationToken);
|
||||
await response.StartAsync();
|
||||
await source.CopyToAsync(response.Body);
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,9 +7,8 @@ using System.Threading.Tasks;
|
||||
namespace DHT.Utils.Resources;
|
||||
|
||||
public sealed class ResourceLoader(Assembly assembly) {
|
||||
private Stream? TryGetEmbeddedStream(string filename) {
|
||||
private Stream GetEmbeddedStream(string filename) {
|
||||
Stream? stream = null;
|
||||
|
||||
foreach (var embeddedName in assembly.GetManifestResourceNames()) {
|
||||
if (embeddedName.Replace('\\', '/') == filename) {
|
||||
stream = assembly.GetManifestResourceStream(embeddedName);
|
||||
@ -17,11 +16,7 @@ public sealed class ResourceLoader(Assembly assembly) {
|
||||
}
|
||||
}
|
||||
|
||||
return stream;
|
||||
}
|
||||
|
||||
private Stream GetEmbeddedStream(string filename) {
|
||||
return TryGetEmbeddedStream(filename) ?? throw new ArgumentException("Missing embedded resource: " + filename);
|
||||
return stream ?? throw new ArgumentException("Missing embedded resource: " + filename);
|
||||
}
|
||||
|
||||
private async Task<string> ReadTextAsync(Stream stream) {
|
||||
@ -29,20 +24,10 @@ public sealed class ResourceLoader(Assembly assembly) {
|
||||
return await reader.ReadToEndAsync();
|
||||
}
|
||||
|
||||
private async Task<byte[]> ReadBytesAsync(Stream stream) {
|
||||
using var memoryStream = new MemoryStream();
|
||||
await stream.CopyToAsync(memoryStream);
|
||||
return memoryStream.ToArray();
|
||||
}
|
||||
|
||||
public async Task<string> ReadTextAsync(string filename) {
|
||||
return await ReadTextAsync(GetEmbeddedStream(filename));
|
||||
}
|
||||
|
||||
public async Task<byte[]?> ReadBytesAsyncIfExists(string filename) {
|
||||
return TryGetEmbeddedStream(filename) is {} stream ? await ReadBytesAsync(stream) : null;
|
||||
}
|
||||
|
||||
public async Task<string> ReadJoinedAsync(string path, char separator) {
|
||||
StringBuilder joined = new ();
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user