api: add proxmox-firewall to versions pkg list

[pve-manager.git] / www / manager6 / qemu / Monitor.js

diff --git a/www/manager6/qemu/Monitor.js b/www/manager6/qemu/Monitor.js
index cd8e6ecb8d03c8899d205f496ec1299eb8009acb..7a84b39acd54c12a28627e657238d1146507159b 100644 (file)
--- a/www/manager6/qemu/Monitor.js
+++ b/www/manager6/qemu/Monitor.js
@@ -3,9 +3,13 @@ Ext.define('PVE.qemu.Monitor', {
 
     alias: 'widget.pveQemuMonitor',
 
-    maxLines: 500,
+    // start to trim saved command output once there are *both*, more than `commandLimit` commands
+    // executed and the total of saved in+output is over `lineLimit` lines; repeat by dropping one
+    // full command output until either condition is false again
+    commandLimit: 10,
+    lineLimit: 5000,
 
-    initComponent : function() {
+    initComponent: function() {
        var me = this;
 
        var nodename = me.pveSelNode.data.node;
@@ -18,7 +22,9 @@ Ext.define('PVE.qemu.Monitor', {
            throw "no VM ID specified";
        }
 
-       var lines = [];
+       var history = [];
+       var histNum = -1;
+       let commands = [];
 
        var textbox = Ext.createWidget('panel', {
            region: 'center',
@@ -26,7 +32,7 @@ Ext.define('PVE.qemu.Monitor', {
            autoScroll: true,
            border: true,
            margins: '5 5 5 5',
-           bodyStyle: 'font-family: monospace;'
+           bodyStyle: 'font-family: monospace;',
        });
 
        var scrollToEnd = function() {
@@ -43,35 +49,45 @@ Ext.define('PVE.qemu.Monitor', {
        };
 
        var refresh = function() {
-           textbox.update('<pre>' + lines.join('\n') + '</pre>');
+           textbox.update(`<pre>${commands.flat(2).join('\n')}</pre>`);
            scrollToEnd();
        };
 
-       var addLine = function(line) {
-           lines.push(line);
-           if (lines.length > me.maxLines) {
-               lines.shift();
+       let recordInput = line => {
+           commands.push([line]);
+
+           // drop oldest commands and their output until we're not over both limits anymore
+           while (commands.length > me.commandLimit && commands.flat(2).length > me.lineLimit) {
+               commands.shift();
            }
        };
 
+       let addResponse = lines => commands[commands.length - 1].push(lines);
+
        var executeCmd = function(cmd) {
-           addLine("# " + Ext.htmlEncode(cmd));
+           recordInput("# " + Ext.htmlEncode(cmd), true);
+           if (cmd) {
+               history.unshift(cmd);
+               if (history.length > 20) {
+                   history.splice(20);
+               }
+           }
+           histNum = -1;
+
            refresh();
-           PVE.Utils.API2Request({
+           Proxmox.Utils.API2Request({
                params: { command: cmd },
                url: '/nodes/' + nodename + '/qemu/' + vmid + "/monitor",
                method: 'POST',
                waitMsgTarget: me,
                success: function(response, opts) {
-                   var res = response.result.data; 
-                   Ext.Array.each(res.split('\n'), function(line) {
-                       addLine(Ext.htmlEncode(line));
-                   });
+                   var res = response.result.data;
+                   addResponse(res.split('\n').map(line => Ext.htmlEncode(line)));
                    refresh();
                },
                failure: function(response, opts) {
                    Ext.Msg.alert('Error', response.htmlStatus);
-               }
+               },
            });
        };
 
@@ -82,7 +98,7 @@ Ext.define('PVE.qemu.Monitor', {
                textbox,
                {
                    region: 'south',
-                   margins:'0 5 5 5',
+                   margins: '0 5 5 5',
                    border: false,
                    xtype: 'textfield',
                    name: 'cmd',
@@ -92,27 +108,50 @@ Ext.define('PVE.qemu.Monitor', {
                    listeners: {
                        afterrender: function(f) {
                            f.focus(false);
-                           addLine("Type 'help' for help.");
+                           recordInput("Type 'help' for help.");
                            refresh();
                        },
                        specialkey: function(f, e) {
-                           if (e.getKey() === e.ENTER) {
-                               var cmd = f.getValue();
-                               f.setValue('');
-                               executeCmd(cmd);
+                           var key = e.getKey();
+                           switch (key) {
+                               case e.ENTER:
+                                   var cmd = f.getValue();
+                                   f.setValue('');
+                                   executeCmd(cmd);
+                                   break;
+                               case e.PAGE_UP:
+                                   textbox.scrollBy(0, -0.9*textbox.getHeight(), false);
+                                   break;
+                               case e.PAGE_DOWN:
+                                   textbox.scrollBy(0, 0.9*textbox.getHeight(), false);
+                                   break;
+                               case e.UP:
+                                   if (histNum + 1 < history.length) {
+                                       f.setValue(history[++histNum]);
+                                   }
+                                   e.preventDefault();
+                                   break;
+                               case e.DOWN:
+                                   if (histNum > 0) {
+                                       f.setValue(history[--histNum]);
+                                   }
+                                   e.preventDefault();
+                                   break;
+                               default:
+                                   break;
                            }
-                       }
-                   }
-               }
+                       },
+                   },
+               },
            ],
            listeners: {
                show: function() {
                    var field = me.query('textfield[name="cmd"]')[0];
                    field.focus(false, true);
-               }
-           }
-       });             
+               },
+           },
+       });
 
        me.callParent();
-    }
+    },
 });