ログ読み込み時のパフォーマンス設定を可変に

xm-i · xm-i · commit 21db468a24b7 · 2025-12-12T21:07:30.000+09:00
diff --git a/.github/workflows/build-web-assets.yml b/.github/workflows/build-web-assets.yml
@@ -3,24 +3,10 @@ permissions:
   contents: read
 
 on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to build from'
-        required: true
-        default: 'master'
-        type: choice
-        options:
-          - master
-      build_type:
-        description: 'Build type'
-        required: true
-        default: 'both'
-        type: choice
-        options:
-          - debug
-          - production
-          - both
+  push:
+    branches: [ master ]
+    paths:
+      - 'RemoteLogViewer.WinUI/Assets/Web/**'
 
 jobs:
   build-web-assets:
@@ -29,8 +15,6 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.inputs.branch }}
       
     - name: Setup Node.js
       uses: actions/setup-node@v4
@@ -45,29 +29,25 @@ jobs:
       timeout-minutes: 10
       
     - name: Build for Debug
-      if: ${{ github.event.inputs.build_type == 'debug' || github.event.inputs.build_type == 'both' }}
       working-directory: RemoteLogViewer.WinUI/Assets/Web
       run: npm run build:dev
       timeout-minutes: 10
       
     - name: Upload Debug Web Assets
-      if: ${{ github.event.inputs.build_type == 'debug' || github.event.inputs.build_type == 'both' }}
       uses: actions/upload-artifact@v4
       with:
-        name: web-assets-debug-${{ github.event.inputs.branch }}-${{ github.sha }}
+        name: web-assets-debug-${{ github.ref_name }}-${{ github.sha }}
         path: RemoteLogViewer.WinUI/Assets/Web/dist/
         retention-days: 30
         
     - name: Build for Production
-      if: ${{ github.event.inputs.build_type == 'production' || github.event.inputs.build_type == 'both' }}
       working-directory: RemoteLogViewer.WinUI/Assets/Web
       run: npm run build
       timeout-minutes: 10
       
     - name: Upload Production Web Assets
-      if: ${{ github.event.inputs.build_type == 'production' || github.event.inputs.build_type == 'both' }}
       uses: actions/upload-artifact@v4
       with:
-        name: web-assets-production-${{ github.event.inputs.branch }}-${{ github.sha }}
+        name: web-assets-production-${{ github.ref_name }}-${{ github.sha }}
         path: RemoteLogViewer.WinUI/Assets/Web/dist/
         retention-days: 30
diff --git a/RemoteLogViewer.Composition/Stores/Settings/TextViewerSettingsModel.cs b/RemoteLogViewer.Composition/Stores/Settings/TextViewerSettingsModel.cs
@@ -11,18 +11,25 @@ namespace RemoteLogViewer.Composition.Stores.Settings;
 public class TextViewerSettingsModel(IServiceProvider service) {
 	public IServiceProvider ScopedService { get; } = service;
 	/// <summary>
-	/// 1行に表示する最大文字数
+	/// 1度に追加読み込みする行数
 	/// </summary>
-	public ReactiveProperty<int> MaxPreviewOneLineCharacters {
+	public ReactiveProperty<int> PrefetchLineCount {
 		get;
-	} = new(1000);
+	} = new(200);
+
+	/// <summary>
+	/// 追加読み込みの閾値行数(残りXX行になったら追加読み込みする。)
+	/// </summary>
+	public ReactiveProperty<int> PrefetchThresholdLines {
+		get;
+	} = new(50);
 
 	/// <summary>
-	/// 全体で表示する最大文字数
+	/// 画面内に保持する最大行数
 	/// </summary>
-	public ReactiveProperty<int> MaxPreviewCharacters {
+	public ReactiveProperty<int> MaxLogLineLimit {
 		get;
-	} = new(30000);
+	} = new(1000);
 
 	/// <summary>
 	/// Grep の最大件数
diff --git a/RemoteLogViewer.Core/ViewModels/Settings/TextViewerSettingsPageViewModel.cs b/RemoteLogViewer.Core/ViewModels/Settings/TextViewerSettingsPageViewModel.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+
 using RemoteLogViewer.Core.Stores.Settings;
 using RemoteLogViewer.Core.Utils.Extensions;
 
@@ -10,16 +11,23 @@ namespace RemoteLogViewer.Core.ViewModels.Settings;
 [Inject(InjectServiceLifetime.Transient)]
 public class TextViewerSettingsPageViewModel : SettingsPageViewModel<TextViewerSettingsPageViewModel> {
 	/// <summary>
-	/// 1行に表示する最大文字数
+	/// 1度に追加読み込みする行数
+	/// </summary>
+	public BindableReactiveProperty<int> PrefetchLineCount {
+		get;
+	}
+
+	/// <summary>
+	/// 追加読み込みの閾値行数(残りXX行になったら追加読み込みする。)
 	/// </summary>
-	public BindableReactiveProperty<int> MaxPreviewOneLineCharacters {
+	public BindableReactiveProperty<int> PrefetchThresholdLines {
 		get;
 	}
 
 	/// <summary>
-	/// 全体で表示する最大文字数
+	/// 画面内に保持する最大行数
 	/// </summary>
-	public BindableReactiveProperty<int> MaxPreviewCharacters {
+	public BindableReactiveProperty<int> MaxLogLineLimit {
 		get;
 	}
 
@@ -32,8 +40,9 @@ public BindableReactiveProperty<int> GrepMaxResults {
 
 	/// <summary>コンストラクタ。</summary>
 	public TextViewerSettingsPageViewModel(SettingsStoreModel settingsStoreModel, ILogger<TextViewerSettingsPageViewModel> logger) : base("TextViewer", logger) {
-		this.MaxPreviewOneLineCharacters = settingsStoreModel.SettingsModel.TextViewerSettings.MaxPreviewOneLineCharacters.ToTwoWayBindableReactiveProperty().AddTo(this.CompositeDisposable);
-		this.MaxPreviewCharacters = settingsStoreModel.SettingsModel.TextViewerSettings.MaxPreviewCharacters.ToTwoWayBindableReactiveProperty().AddTo(this.CompositeDisposable);
+		this.PrefetchLineCount = settingsStoreModel.SettingsModel.TextViewerSettings.PrefetchLineCount.ToTwoWayBindableReactiveProperty().AddTo(this.CompositeDisposable);
+		this.PrefetchThresholdLines = settingsStoreModel.SettingsModel.TextViewerSettings.PrefetchThresholdLines.ToTwoWayBindableReactiveProperty().AddTo(this.CompositeDisposable);
+		this.MaxLogLineLimit = settingsStoreModel.SettingsModel.TextViewerSettings.MaxLogLineLimit.ToTwoWayBindableReactiveProperty().AddTo(this.CompositeDisposable);
 		this.GrepMaxResults = settingsStoreModel.SettingsModel.TextViewerSettings.GrepMaxResults.ToTwoWayBindableReactiveProperty().AddTo(this.CompositeDisposable);
 	}
 }
diff --git a/RemoteLogViewer.WinUI/Assets/Web/src/components/TextFileViewer.vue b/RemoteLogViewer.WinUI/Assets/Web/src/components/TextFileViewer.vue
@@ -42,11 +42,11 @@ const props = withDefaults(defineProps<Props>(), {
 });
 
 // 追加読み込み行数
-const prefetchLines = 200;
+let prefetchLines = 200;
 // 追加読み込みのしきい値行数
-const prefetchThreshold = 50;
+let prefetchThreshold = 50;
 // ログ保持上限行数
-const maxLogLines = 1000;
+let maxLogLines = 1000;
 
 // テンプレート参照
 const logArea = ref<HTMLElement>();
@@ -343,7 +343,7 @@ onMounted(() => {
 	// C# → JS 通信
 	window.chrome.webview.addEventListener('message', e => {
 		const message = e.data;
-		if (message.pageKey !== props.pageKey) {
+    if (![props.pageKey, '*'].includes(message.pageKey)) {
 			return;
 		}
 		switch (message.type) {
@@ -361,6 +361,11 @@ onMounted(() => {
         reset();
 				jumpLine(startLine.value);
 				break;
+			case 'SettingsUpdated':
+				prefetchLines = message.data.prefetchLineCount;
+				prefetchThreshold = message.data.prefetchThresholdLines;
+				maxLogLines = message.data.maxLogLineLimit;
+				break;
 		}
 	});
 });
diff --git a/RemoteLogViewer.WinUI/Assets/Web/src/types/incommingMessages.ts b/RemoteLogViewer.WinUI/Assets/Web/src/types/incommingMessages.ts
@@ -12,6 +12,15 @@ export interface IsDisconnectedUpdatedMessage extends IncomingAbstractWebMessage
 	data: boolean;
 }
 
+export interface SettingsUpdatedMessage extends IncomingAbstractWebMessage {
+  type: 'SettingsUpdated';
+  data: {
+    prefetchLineCount: number;
+    prefetchThresholdLines: number;
+    maxLogLineLimit: number;
+  };
+}
+
 export interface LineStyleChangedMessage extends IncomingAbstractWebMessage {
 	type: 'LineStyleChanged';
 	data: string;
@@ -119,7 +128,8 @@ export interface GrepResultResetMessage extends IncomingAbstractWebMessage {
 }
 
 export type IncomingWebMessage =
-	| IsDisconnectedUpdatedMessage
+  | IsDisconnectedUpdatedMessage
+  | SettingsUpdatedMessage
 	| LineStyleChangedMessage
 	| ReloadRequestedMessage
 	| FileOpenedMessage
diff --git a/RemoteLogViewer.WinUI/Views/Settings/TextViewerSettingsPage.xaml b/RemoteLogViewer.WinUI/Views/Settings/TextViewerSettingsPage.xaml
@@ -7,12 +7,14 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-	<Grid Padding="16" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,Auto">
-		<TextBlock Text="1行あたり表示可能文字数"/>
-		<NumberBox Grid.Column="1" Text="{x:Bind ViewModel.MaxPreviewOneLineCharacters.Value,Mode=TwoWay}"/>
-		<TextBlock Grid.Row="1" Text="全体で表示可能文字数"/>
-		<NumberBox Grid.Row="1" Grid.Column="1" Text="{x:Bind ViewModel.MaxPreviewCharacters.Value,Mode=TwoWay}"/>
-		<TextBlock Grid.Row="2" Text="Grep 最大件数"/>
-		<NumberBox Grid.Row="2" Grid.Column="1" Text="{x:Bind ViewModel.GrepMaxResults.Value,Mode=TwoWay}"/>
+	<Grid Padding="16" RowDefinitions="Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,Auto">
+		<TextBlock Text="Number of lines to prefetch near the end of the buffer."/>
+		<NumberBox Grid.Column="1" Text="{x:Bind ViewModel.PrefetchLineCount.Value,Mode=TwoWay}"/>
+		<TextBlock Grid.Row="1" Text="Number of remaining lines that triggers prefetching."/>
+		<NumberBox Grid.Row="1" Grid.Column="1" Text="{x:Bind ViewModel.PrefetchThresholdLines.Value,Mode=TwoWay}"/>
+		<TextBlock Grid.Row="2" Text="Maximum number of lines to keep in memory."/>
+		<NumberBox Grid.Row="2" Grid.Column="1" Text="{x:Bind ViewModel.MaxLogLineLimit.Value,Mode=TwoWay}"/>
+		<TextBlock Grid.Row="3" Text="Maximum number of matched results returned by GREP."/>
+		<NumberBox Grid.Row="3" Grid.Column="1" Text="{x:Bind ViewModel.GrepMaxResults.Value,Mode=TwoWay}"/>
 	</Grid>
 </Page>
diff --git a/RemoteLogViewer.WinUI/Views/Ssh/FileViewer/TextFileViewer.xaml.cs b/RemoteLogViewer.WinUI/Views/Ssh/FileViewer/TextFileViewer.xaml.cs
@@ -158,6 +158,11 @@ private async Task InitializeWebView() {
 
 		this._settingsStoreModel.SettingsUpdated.Subscribe(x => {
 			this.PostWV2("*", "LineStyleChanged", this._tabObjects.CreateCss());
+			this.PostWV2("*", "SettingsUpdated", new {
+				prefetchLineCount = this._settingsStoreModel.SettingsModel.TextViewerSettings.PrefetchLineCount,
+				prefetchThresholdLines = this._settingsStoreModel.SettingsModel.TextViewerSettings.PrefetchThresholdLines,
+				maxLogLineLimit = this._settingsStoreModel.SettingsModel.TextViewerSettings.MaxLogLineLimit,
+			});
 			this.PostWV2("*", "ReloadRequested", null);
 			this.PostWV2("*", "GrepResultReset", null);
 		});
@@ -178,6 +183,11 @@ private async Task InitializeWebView() {
 								pageKey = vm.PageKey,
 								tabHeader = Path.GetFileName(vm.OpenedFilePath.Value)
 							});
+							this.PostWV2("*", "SettingsUpdated", new {
+								prefetchLineCount = this._settingsStoreModel.SettingsModel.TextViewerSettings.PrefetchLineCount.Value,
+								prefetchThresholdLines = this._settingsStoreModel.SettingsModel.TextViewerSettings.PrefetchThresholdLines.Value,
+								maxLogLineLimit = this._settingsStoreModel.SettingsModel.TextViewerSettings.MaxLogLineLimit.Value,
+							});
 							this.RegisterViewerVMEvents(vm);
 						}
 					}
diff --git a/RemoteLogViewer.slnx b/RemoteLogViewer.slnx
@@ -29,6 +29,7 @@
   <Folder Name="/SolutionItems/">
     <File Path=".editorconfig" />
     <File Path=".gitattributes" />
+    <File Path=".github/workflows/build-web-assets.yml" />
     <File Path=".github/workflows/release.yml" />
     <File Path=".gitignore" />
     <File Path="AGENTS.md" />
