xterm

weibaohui · Nov 22, 2023 · 78fec78 · 78fec78
1 parent 9c83208
commit 78fec78
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 28 deletions.
diff --git a/BlazorApp/Pages/Pod/PodAction.razor b/BlazorApp/Pages/Pod/PodAction.razor
@@ -5,6 +5,7 @@
     <a>删除</a>
 </Popconfirm>
 <a onclick="@(() => OnPodLogClick(PodItem))">日志</a>
+<a onclick="@(() => OnPodExecClick(PodItem))">Exec</a>
 
 @if (Enable)
 {

diff --git a/BlazorApp/Pages/Pod/PodAction.razor.cs b/BlazorApp/Pages/Pod/PodAction.razor.cs
@@ -46,6 +46,12 @@ private async Task OnPodLogClick(V1Pod pod)
         await PageDrawerService.ShowDrawerAsync<PodLogsView, V1Pod, bool>(options, pod);
     }
 
+    private async Task OnPodExecClick(V1Pod pod)
+    {
+        var options = PageDrawerService.DefaultOptions($"Logs:{pod.Name()}", width: 1000);
+        await PageDrawerService.ShowDrawerAsync<PodExecView, V1Pod, bool>(options, pod);
+    }
+
     private async Task OnAnalyzeClick(V1Pod pod)
     {
         var options = PageDrawerService.DefaultOptions($"AI智能分析:{pod.Name()}", width: 1000);

diff --git a/BlazorApp/Pages/Pod/PodExecView.razor.cs b/BlazorApp/Pages/Pod/PodExecView.razor.cs
@@ -7,6 +7,7 @@
 using k8s.Models;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.JSInterop;
 using XtermBlazor;
 
 namespace BlazorApp.Pages.Pod;
@@ -25,6 +26,9 @@ protected override void OnInitialized()
         base.OnInitialized();
     }
 
+    [Inject]
+    protected IJSRuntime JSRuntime { get; set; }
+
     private Xterm _terminal, _terminalEvent;
 
     private TerminalOptions _options = new TerminalOptions
@@ -54,35 +58,43 @@ protected override void OnInitialized()
     private int    _eventId     = 0,  _columns, _rows;
     private string _searchInput = "", _input = "Hello World";
 
-
     private async Task OnFirstRender()
     {
-        var logs = await PodService.Logs(PodItem, true);
-
-        await using (var xs = new XtermStream(_terminal))
-        {
-            await logs.CopyToAsync(xs);
-        }
-
-
         await _terminalEvent.WriteLine($"({++_eventId}) OnFirstRender()");
 
+        bool isWebAssembly = JSRuntime is IJSInProcessRuntime;
 
-        // Blazor Server
-        await _terminal.AttachCustomKeyEventHandlerEvaluate("(event) => true");
-
-        _terminal.AttachCustomKeyEventHandler((args) =>
+        if (isWebAssembly)
         {
-            if (showAttachCustomKeyEventHandlerLog)
+            // Blazor WebAssembly
+            _terminal.AttachCustomKeyEventHandler((args) =>
             {
-                _terminalEvent.WriteLine(
-                    $"({++_eventId}) AttachCustomKeyEventHandler(): Key: {args.Key}, Ctrl: {args.CtrlKey} {JsonSerializer.Serialize(args)}");
-            }
-
-            // The return value is ignored on Blazor Server, AttachCustomKeyEventHandlerEvaluate is used for handling that
-            return true;
-        });
+                if (showAttachCustomKeyEventHandlerLog)
+                {
+                    _terminalEvent.WriteLine(
+                        $"({++_eventId}) AttachCustomKeyEventHandler(): Key: {args.Key}, Ctrl: {args.CtrlKey} {JsonSerializer.Serialize(args)}");
+                }
+
+                return true;
+            });
+        }
+        else
+        {
+            // Blazor Server
+            await _terminal.AttachCustomKeyEventHandlerEvaluate("(event) => true");
 
+            _terminal.AttachCustomKeyEventHandler((args) =>
+            {
+                if (showAttachCustomKeyEventHandlerLog)
+                {
+                    _terminalEvent.WriteLine(
+                        $"({++_eventId}) AttachCustomKeyEventHandler(): Key: {args.Key}, Ctrl: {args.CtrlKey} {JsonSerializer.Serialize(args)}");
+                }
+
+                // The return value is ignored on Blazor Server, AttachCustomKeyEventHandlerEvaluate is used for handling that
+                return true;
+            });
+        }
 
         await _terminal.InvokeAddonFunctionVoidAsync("xterm-addon-fit", "fit");
         await _terminalEvent.InvokeAddonFunctionVoidAsync("xterm-addon-fit", "fit");

diff --git a/BlazorApp/Pages/Pod/PodLogsView.razor b/BlazorApp/Pages/Pod/PodLogsView.razor
@@ -11,4 +11,5 @@
 <Xterm
     @ref="_terminal"
     Options="_options"
+    AddonIds="_addonIds"
     OnFirstRender="@OnFirstRender"/>
diff --git a/BlazorApp/Pages/Pod/PodLogsView.razor.cs b/BlazorApp/Pages/Pod/PodLogsView.razor.cs
@@ -40,7 +40,8 @@ protected override void OnInitialized()
 
     private string[] _addonIds = new string[]
     {
-        "xterm-addon-attach",
+        // "xterm-addon-attach",
+        "xterm-addon-fit"
     };
 
 
@@ -60,7 +61,7 @@ private async Task OnFirstRender()
 
         // Blazor Server
         // await _terminal.InvokeAddonFunctionVoidAsync("xterm-addon-attach", "new AttachAddon()");
-        // await _terminal.InvokeAddonFunctionVoidAsync("xterm-addon-fit", "fit");
+        await _terminal.InvokeAddonFunctionVoidAsync("xterm-addon-fit", "fit");
 
         _columns = await _terminal.GetColumns();
         _rows    = await _terminal.GetRows();

diff --git a/BlazorApp/Pages/_Host.cshtml b/BlazorApp/Pages/_Host.cshtml
@@ -32,11 +32,20 @@
     <a href="" class="reload">Reload</a>
     <a class="dismiss">🗙</a>
 </div>
-<script src="_content/XtermBlazor/XtermBlazor.min.js"></script>
-@* <script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/xterm-addon-attach.min.js"></script> *@
-@* <script> *@
-@*         window.XtermBlazor.registerAddons({"xterm-addon-attach":  window.AttachAddon.AttachAddon}); *@
-@*     </script> *@
+
 <script src="_framework/blazor.server.js"></script>
+<script src="_content/XtermBlazor/XtermBlazor.min.js"></script>
+
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/xterm-addon-fit.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/xterm-addon-search.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/xterm-addon-web-links.min.js"></script>
+
+<script>
+        XtermBlazor.registerAddons({
+            "xterm-addon-fit": new FitAddon.FitAddon(),
+            "xterm-addon-search": new SearchAddon.SearchAddon(),
+            "xterm-addon-web-links": new WebLinksAddon.WebLinksAddon(),
+        });
+    </script>
 </body>
 </html>