remove PVE/APIClient/Commands/help.pm

[pve-client.git] / PVE / APIClient / Commands / lxc.pm

diff --git a/PVE/APIClient/Commands/lxc.pm b/PVE/APIClient/Commands/lxc.pm
index 979b580b0e2f363fe46522effa3d41bca6b02a60..4e76f70fce4bfc696f1ec7b6f19e46b42497bae2 100644 (file)
--- a/PVE/APIClient/Commands/lxc.pm
+++ b/PVE/APIClient/Commands/lxc.pm
@@ -149,6 +149,16 @@ my $full_write = sub {
     return $len;
 };
 
+# Takes an escape character with an optional '^' prefix and returns an escape
+# character code.
+my $escapekey_to_char = sub {
+    my ($def) = @_;
+    if ($def =~ /^\^?([a-zA-Z])$/) {
+       return 1 + ord(lc($1)) - ord('a');
+    }
+    die "bad escape key definition: $def\n";
+};
+
 __PACKAGE__->register_method ({
     name => 'enter',
     path => 'enter',
@@ -158,10 +168,7 @@ __PACKAGE__->register_method ({
        additionalProperties => 0,
        properties => {
            remote => get_standard_option('pveclient-remote-name'),
-           vmid => {
-               description => "The container ID",
-               type => 'string',
-           },
+           vmid => get_standard_option('pve-vmid')
        },
     },
     returns => { type => 'null'},
@@ -171,6 +178,9 @@ __PACKAGE__->register_method ({
        my $config = PVE::APIClient::Config->load();
        my $conn = PVE::APIClient::Config->remote_conn($config, $param->{remote});
 
+       # FIXME: This should come from $config
+       my $escape_char = $escapekey_to_char->('a');
+
        # Get the real node from the resources endpoint
        my $resource_list = $conn->get("api2/json/cluster/resources", { type => 'vm'});
        my ($resource) = grep { $_->{type} eq "lxc" && $_->{vmid} eq $param->{vmid}} @$resource_list;
@@ -202,7 +212,9 @@ __PACKAGE__->register_method ({
 
        my $wb_socket_read_available_bytes = sub {
            my $nr = $web_socket->sysread($wsbuf, $max_payload_size, length($wsbuf));
-           die "web socket read error - $!\n" if $nr < 0;
+           if (!defined($nr) && !($! == EINTR || $! == EAGAIN)) {
+               die "web socket read error - $!\n";
+           }
            return $nr;
        };
 
@@ -258,14 +270,15 @@ __PACKAGE__->register_method ({
 
            # And set it to non-blocking so we can every char with IO::Select.
            STDIN->blocking(0);
-           $web_socket->blocking(1);
+           STDOUT->blocking(0);
+           $web_socket->blocking(0);
            $read_select->add($web_socket);
-           my $input_fh = fileno(STDIN);
+           my $input_fh = \*STDIN;
            $read_select->add($input_fh);
 
-           my $output_fh = fileno(STDOUT);
+           my $output_fh = \*STDOUT;
 
-           my $ctrl_a_pressed_before = 0;
+           my $in_escape_sequence;
 
            my $winch_received = 0;
            $SIG{WINCH} = sub { $winch_received = 1; };
@@ -281,18 +294,21 @@ __PACKAGE__->register_method ({
                $winch_received = 0;
            };
 
+           my $max_buffer_len = 256*1024;
+
            my $drain_buffer = sub {
                my ($fh, $buffer_ref) = @_;
 
                my $len = length($$buffer_ref);
                my $nr = syswrite($fh, $$buffer_ref);
                if (!defined($nr)) {
-                   next if $! == EINTR || $! == EAGAIN;
+                   return if $! == EINTR || $! == EAGAIN;
                    die "drain buffer - write error - $!\n";
                }
                return $nr if !$nr;
                substr($$buffer_ref, 0, $nr, '');
-               $write_select->remove($fh) if !length($$buffer_ref);
+               $len = length($$buffer_ref);
+               $write_select->remove($fh) if !$len;
            };
 
            while (1) {
@@ -301,7 +317,8 @@ __PACKAGE__->register_method ({
 
                    foreach my $fh (@$writable) {
                        if ($fh == $output_fh) {
-                           $drain_buffer->(\*STDOUT, \$output_buffer);
+                           $drain_buffer->($output_fh, \$output_buffer);
+                           $read_select->add($web_socket) if length($output_buffer) <= $max_buffer_len;
                        } elsif ($fh == $web_socket) {
                            $drain_buffer->($web_socket, \$websock_buffer);
                        }
@@ -314,14 +331,17 @@ __PACKAGE__->register_method ({
 
                            my $nr = $wb_socket_read_available_bytes->();
                            if (!defined($nr)) {
-                               die "web socket read error $!\n";
+                               # wait
                            } elsif ($nr == 0) {
                                return; # EOF
                            } else {
                                my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
-                               if ($payload) {
+                               if (defined($payload) && length($payload)) {
                                    $output_buffer .= $payload;
                                    $write_select->add($output_fh);
+                                   if (length($output_buffer) > $max_buffer_len) {
+                                       $read_select->remove($web_socket);
+                                   }
                                }
                                return if $req_close;
                            }
@@ -329,16 +349,32 @@ __PACKAGE__->register_method ({
                        } elsif ($fh == $input_fh) {
                            # Read from STDIN
 
-                           my $nr = read(\*STDIN, my $buff, 4096);
+                           my $nr = sysread($input_fh, my $buff, 4096);
                            return if !$nr; # EOF or error
 
                            my $char = ord($buff);
 
-                           # check for CTRL-a-q
-                           return if $ctrl_a_pressed_before == 1 && $char == hex("0x71");
-
-                           $ctrl_a_pressed_before = ($char == hex("0x01") && $ctrl_a_pressed_before == 0) ? 1 : 0;
+                           # Handle escape sequences:
+                           if ($in_escape_sequence) {
+                               $in_escape_sequence = 0;
+                               if ($char == 0x71) {
+                                   # (escape, 'q')
+                                   return;
+                               } elsif ($char == $escape_char) {
+                                   # (escape, escape)
+                                   # Pass this one through as a single escapekey
+                               } else {
+                                   # Unknown escape sequence
+                                   # We could generate a bell or something...
+                                   # but for now just skip it
+                                   next;
+                               }
+                           } elsif ($char == $escape_char) {
+                               $in_escape_sequence = 1;
+                               next;
+                           }
 
+                           # Pass the key through:
                            $websock_buffer .= $create_websockt_frame->("0:" . $nr . ":" . $buff);
                            $write_select->add($web_socket);
                        }
@@ -380,29 +416,8 @@ __PACKAGE__->register_method ({
        return undef;
     }});
 
-__PACKAGE__->register_method ({
-    name => 'list',
-    path => 'list',
-    method => 'GET',
-    description => "List containers.",
-    parameters => {
-       additionalProperties => 0,
-       properties => {
-           remote => get_standard_option('pveclient-remote-name'),
-       },
-    },
-    returns => { type => 'null'},
-    code => sub {
-       my ($param) = @_;
-
-       die "implement me";
-
-    }});
-
-
 our $cmddef = {
     enter => [ __PACKAGE__, 'enter', ['remote', 'vmid']],
-    list => [ __PACKAGE__, 'list', ['remote']],
 };
 
 1;