kubeclient_exec 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5649bee867b5a1b4bee74f728bd9d4e20237f8147d1f2b322d1a5c837dc525dc
-  data.tar.gz: 2ccc8823b1f3184b975729385652003ac826e8cc3e4fa2b03c4d49cfb7cb16d7
+  metadata.gz: 17b3e2d61714b926cddbdd6735e6f6e068a32831313753597a2d05fcf4de6eb0
+  data.tar.gz: 03b121f120609632f793217d42e7f1cab6b95c8655086fa68a7ed28e9b9e15e4
 SHA512:
-  metadata.gz: 5016b2107c6efb54d6ad996e7b9fe24d5f3a4ec2a11b7f103c792ec0bd6e1170d89aebfad05537d557cb0ee247a5ca6a69f4cef4069d06c91136d16d8b0f1609
-  data.tar.gz: d8e74ca1a7bfd763c851393d89f548d012177a854ed16878969eb7db4f7a8a03c31fa9583d83e63130ec2f53a0ce03d93fef23babf324e898186da436338b98d
+  metadata.gz: 33986e59d05b7c4cf4a0e1c98bc97b7c227689da60cb6932176ac2dea8ce35fe26b1dfe1802cb1435fcb7ec10fb203abaacaa3747a666b932659c03ab017c116
+  data.tar.gz: d37fcd4f1e3cf30449a8b8a73c0084c6f202d6a12b0599d394ecca3d5f9bbb14207077b3413522282d3ae3286834114cf99b293f8fac03d4df782b246930d438

data/lib/kubeclient_exec/copy/copy.rb

@@ -42,13 +42,22 @@ module KubeclientExec
 
       if copy_file
         exec_pod("tar xf - -C #{remote_path.split('/')[0...-1].join('/')}", name, namespace, options: { tty: false }.merge!(options)) do |executor|
-          executor.write(tar_file.string)
+          chunks = split_string_into_chunks(tar_file.string, 1024 * 1024) # 1MB
+          chunks.each do |chunk|
+            executor.write(chunk)
+          end
 
           # Feels like there should be a better way for this
+          stopping = false
           EM.add_periodic_timer(0.1) do
-            if executor.done?
+            if executor.done? && !stopping
+              stopping = true
               executor.stop
             end
+
+            if executor.ready_state == 3
+              EM.stop_event_loop
+            end
           end
         end
       else
@@ -56,10 +65,16 @@ module KubeclientExec
           executor.write(tar_file.string)
 
           # Feels like there should be a better way for this
+          stopping = false
           EM.add_periodic_timer(0.1) do
-            if executor.done?
+            if executor.done? && !stopping
+              stopping = true
               executor.stop
             end
+
+            if executor.ready_state == 3
+              EM.stop_event_loop
+            end
           end
         end
       end
@@ -70,22 +85,40 @@ module KubeclientExec
 
       exec_pod("tar cf - #{remote_path}", name, namespace, options: { tty: false }.merge!(options)) do |executor|
         count = 0
+        content = ''
 
         executor.on_stdout do |data|
-          if count == 1
-            if local_path.is_a? String
-              untar(StringIO.new(data), local_path)
-            elsif local_path == :single_result
-              result = single_untar(StringIO.new(data))
-            end
-            executor.stop
+          if count >= 1
+            content += data
           end
 
           count += 1
         end
+
+        executor.on_close do
+          if local_path.is_a? String
+            untar(StringIO.new(content), local_path)
+          elsif local_path == :single_result
+            result = single_untar(StringIO.new(content))
+          end
+        end
       end
 
       result
     end
+
+    private
+    def split_string_into_chunks(string, chunk_size)
+      chunks = []
+      start_index = 0
+
+      while start_index < string.length
+        chunk = string[start_index, chunk_size]
+        chunks << chunk
+        start_index += chunk_size
+      end
+
+      chunks
+    end
   end
 end

data/lib/kubeclient_exec/execute/executor.rb

@@ -55,8 +55,12 @@ module KubeclientExec
       end
 
       def stop
-        @ws.close if @ws
+        @ws.instance_variable_get(:@stream).close_connection_after_writing
         @on_close.call if @on_close
+      end
+
+      def stop!
+        stop
         EM.stop_event_loop
       end
 
@@ -64,6 +68,10 @@ module KubeclientExec
         @ws.instance_variable_get(:@driver).instance_variable_get(:@queue).empty?
       end
 
+      def ready_state
+        @ws.ready_state
+      end
+
       private
       def setup
         @ws = Faye::WebSocket::Client.new(@url, nil, {
@@ -73,12 +81,13 @@ module KubeclientExec
             cert_chain_file: @kubeclient_options[:tls][:cert_chain_file],
             private_key_file: @kubeclient_options[:tls][:private_key_file],
             verify_peer: @kubeclient_options[:tls][:verify_peer],
-          }
+          },
+          max_length: 2**32,
         })
 
         @ws.on(:message) do |msg|
           if msg.type == :close
-            stop
+            stop!
             return
           end
 
@@ -91,7 +100,7 @@ module KubeclientExec
             if @options[:mode] == :adhoc
               @last_stdout = 1 if type == EXEC_STDOUT
               @last_stderr = 1 if type == EXEC_STDERR || EXEC_DCKERR
-              stop
+              stop!
             end
           end
 
@@ -112,7 +121,7 @@ module KubeclientExec
         end
 
         @ws.on(:close) do
-          stop
+          stop!
         end
 
         @ws.on(:open) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient_exec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Wout Ceulemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubeclient