binaryen 1.1.6.3 → 1.1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae90a4e59e6f813687257623ab4d4a35633c9409de5459101d8080d65fe1fdf1
-  data.tar.gz: 20c161cfa875c14801d03ae2f7a43f5342a0e0a8b9c70f9d9e2d1f44b722f3e7
+  metadata.gz: 7ec6cd19949163f81747301353e37912f7d2924205816df9f6620f0cb6a266ce
+  data.tar.gz: cfc6e449979a806440f5c893640618bd321597e1ae8848108fea8c7b9da88d72
 SHA512:
-  metadata.gz: 74f7b3010d06316d25eb8b3e74fc2fd33b60f50fcd3bd6db83db8b11c135e003f49f460779e02992e0826a86240b220d3c8e1c82e56361e1e6d054cc7b172679
-  data.tar.gz: 90de5bc2e078f8083116a8dc8244e3807185ff35c1697ef210070bcd4f01d7bf730f13fa1731f479b06032dcc778109faf848a0daa2da0915ab7fe18b033a3e0
+  metadata.gz: 9e83c357446ac3c2e04d6de7a575d8dca7b4164cd4050416edd87d23fe864165085f25b5e3f7a7f28d46debedcc7fa146f1416aa8a529376c5ea07dfd8f1713b
+  data.tar.gz: 8f3e7d8a8582608436191bdea891aa8564cebc0ccceceb750bdbce38b563bd590c32e8b5025a9a63761eb6592347709e06983c023b950d377b016354da111b35

data/lib/binaryen/command.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "English"
+require "shellwords"
 require "timeout"
 require "posix/spawn"
 
@@ -13,6 +15,8 @@ module Binaryen
   #   optimized_wasm = command.run("-O4", stdin: "(module)")
   #   ```
   class Command
+    include POSIX::Spawn
+
     DEFAULT_ARGS_FOR_COMMAND = {
       "wasm-opt" => ["--output=-"],
     }.freeze
@@ -40,26 +44,86 @@ module Binaryen
       @default_args = DEFAULT_ARGS_FOR_COMMAND.fetch(cmd, [])
     end
 
-    def run(*arguments, stdin: nil, stderr: File::NULL)
-      args = build_arguments(*arguments)
-      child = POSIX::Spawn::Child.new(@cmd, *args, input: stdin, timeout: @timeout)
-      if child.status && !child.status.success?
-        err_io = stderr.is_a?(String) ? File.open(stderr, "w") : stderr
-        err_io.binmode
-        err_io.write(child.err)
-        err_io.rewind
-        raise NonZeroExitStatus, "command exited with non-zero status: #{child.status}"
+    def run(*arguments, stdin: nil, stderr: nil)
+      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
+      command = build_command(*arguments)
+      pid, iwr, ord, erd = popen4(*command)
+      timeout_checker = TimeoutChecker.new(end_time: end_time, pid: pid)
+
+      write_to_pipe(iwr, stdin, timeout_checker) if stdin
+      if stderr
+        err_output = read_from_pipe(erd, timeout_checker)
+        begin
+          write_to_pipe(stderr, err_output, timeout_checker, close_write: false)
+        rescue Errno::EPIPE
+          # ignore
+        end
       end
+      output = read_from_pipe(ord, timeout_checker)
+      wait_or_kill(pid, timeout_checker, erd, stderr)
 
-      child.out
-    rescue POSIX::Spawn::TimeoutExceeded => e
-      raise Timeout::Error, e.message
+      output
     end
 
     private
 
-    def build_arguments(*arguments)
-      arguments + @default_args
+    def write_to_pipe(pipe, stdin, timeout_checker, close_write: true)
+      offset = 0
+      length = stdin.bytesize
+
+      while offset < length
+        remaining_time = timeout_checker.check!
+
+        if IO.select(nil, [pipe], nil, remaining_time)
+          written = pipe.write_nonblock(stdin.byteslice(offset, length), exception: false)
+          offset += written if written.is_a?(Integer)
+        else
+          raise Timeout::Error, "Command timed out"
+        end
+      end
+
+      pipe.close_write if close_write
+    end
+
+    def read_from_pipe(pipe, timeout_checker)
+      output = +""
+
+      while (result = pipe.read_nonblock(8192, exception: false))
+        remaining_time = timeout_checker.check!
+        raise Timeout::Error, "Command timed out" if remaining_time <= 0
+
+        case result
+        when :wait_readable
+          IO.select([pipe], nil, nil, remaining_time)
+        when nil
+          break
+        else
+          output << result
+        end
+      end
+
+      output
+    end
+
+    def wait_or_kill(pid, timeout_checker, err_read, err_write)
+      loop do
+        remaining_time = timeout_checker.check!
+        raise Timeout::Error, "timed out waiting on process" if remaining_time <= 0
+
+        if (_, status = Process.wait2(pid, Process::WNOHANG))
+
+          raise Binaryen::NonZeroExitStatus,
+            "command exited with status #{status.exitstatus}" if status.exitstatus != 0
+
+          return true
+        else
+          sleep(0.1)
+        end
+      end
+    end
+
+    def build_command(*arguments)
+      [@cmd] + arguments + @default_args
     end
 
     def command_path(cmd, ignore_missing)

data/lib/binaryen/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Binaryen
-  VERSION = "1.1.6.3"
+  VERSION = "1.1.6.5"
   BINARYEN_VERSION = "version_116"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: binaryen
 version: !ruby/object:Gem::Version
-  version: 1.1.6.3
+  version: 1.1.6.5
 platform: ruby
 authors:
 - Shopify Inc.
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.15
 description: 
 email:
 - gems@shopify.com