opal-webpack-loader 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75cfc2e9527b252335ad359e1eb5c7aa476cec879ed76c4501b686a50f39b1f2
-  data.tar.gz: b6d13eac5c5eaa0e3c46dfd15b8f59d01d59124f92608c741e93952c87bb04f6
+  metadata.gz: f1a1b24301ed05a439abf847ae77a460919a227d250432d0c769d3080d100dec
+  data.tar.gz: 48f48641c277ecbf2fd50a7c274bdcf94b960dc28bf5103da70555815b70112f
 SHA512:
-  metadata.gz: c9edddd5f0a21625c5376dbf609e594a35bfe36ab84ca2fb804fa7f011093e8a45aa516530bb0dceceec4dcc069619dc0e7c31ceecfd3f68a5ad0c6caf39699f
-  data.tar.gz: f21627293c524a6db7f7c53f89e83f13f77519597133c05dd992173b7d2cff05f0ab915cfe7eb8e52f036ce448f3905e572d75a2d345cefe93990ece36ad342b
+  metadata.gz: 7ef00f2c1e57f71eadaae2a3b2edc6c47745c980a1f85921b0ca9e6e0b092e960c9c3971826ffec3ca22b42e56d45a9b36bd6d692b794b97f23c2343f043e25d
+  data.tar.gz: a5ebdd0518490d0eea2e78de43f1527f333b32ab778603fd24cc8052c3870aa4e5408a631c6a0a676185d7355f488c4cc605f5b8a793418a2072ed3c09174b85

data/README.md

@@ -23,7 +23,7 @@ At the [Isomorfeus Framework Project](http://isomorfeus.com)
 opal-webpack-loader-0.7.1 compiles all of opal, a bunch of gems and over 19000SLC on a
 Intel® Core™ i7-7700HQ CPU @ 2.80GHz × 8, with 8 workers in around 1850ms
 - support for memcached or redis as compiler cache
-- fast builds on windows too, parallel when building multiple assets with parallel webpack
+- fast builds on windows too, parallel when building multiple assets with parallel-webpack
 - opal modules are packaged as es6 modules
 - support for rails with webpacker
 - other webpack features become available, like:
@@ -36,6 +36,7 @@ Intel® Core™ i7-7700HQ CPU @ 2.80GHz × 8, with 8 workers in around 1850ms
   - everything else webpack can do, like loading stylesheets, etc.
 
 ### Requirements
+- npm or yarn
 - opal-webpack-loader consists of 2 parts, the npm package and the gem, both are required and must be the same version.
 - webpack ^4.46
 - webpack-dev-server ^3.11.0

data/lib/opal-webpack-loader.rb

@@ -38,27 +38,31 @@ OpalWebpackLoader.manifest_path = File.join(Dir.getwd, 'public', 'assets', 'mani
 OpalWebpackLoader.client_asset_path = 'http://localhost:3035/assets/'
 OpalWebpackLoader.use_manifest = false
 
-# TODO require yarn instead of npm
-npm = if Gem.win_platform?
-        `where npm`.chop.lines.last
-      else
-        `which npm`.chop
-      end
+owl_npm_version = nil
+begin
+  yarn = if Gem.win_platform?
+          `where yarn`.chop.lines.last.include?('yarn')
+        else
+          `which yarn`.chop.include?('yarn')
+        end
+  owl_npm_version = `yarn run -s opal-webpack-loader-npm-version`.chop if yarn
 
-if !npm.nil? && !npm.empty?
-  bin_dir = `npm bin`.chop
-  begin
-    owl_npm_version = `#{File.join(bin_dir, 'opal-webpack-loader-npm-version')}`.chop
-  rescue
-    owl_npm_version = nil
+  unless owl_npm_version
+    npm = if Gem.win_platform?
+            `where npm`.chop.lines.last.include?('npm')
+          else
+            `which npm`.chop.include?('npm')
+          end
+    owl_npm_version = `npm exec opal-webpack-loader-npm-version`.chop if npm
   end
+rescue
+  owl_npm_version = nil
+end
 
-  if owl_npm_version != OpalWebpackLoader::VERSION
-    STDERR.puts "opal-webpack-loader: Incorrect version of npm package found or npm package not installed.\n" +
-      "Please install the npm package for opal-webpack-loader:\n" +
-      "\twith npm:\tnpm install opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n" +
-      "\tor with yarn:\tyarn add opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n"
-  end
-else
-  STDERR.puts "opal-webpack-loader: Unable to check npm package version. Please check your npm installation."
+if owl_npm_version != OpalWebpackLoader::VERSION
+  STDERR.puts "opal-webpack-loader: Incorrect version of npm package found or npm package not installed.\n" +
+    "Please install the npm package for opal-webpack-loader:\n" +
+    "\twith npm:\tnpm install opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n" +
+    "\tor with yarn:\tyarn add opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n"
 end
+

data/lib/opal-webpack-loader/pipe_server.rb

@@ -1,219 +1,219 @@
-require 'ffi'
-
-module OpalWebpackLoader
-  module WindowsyThings
-    extend FFI::Library
-
-    ffi_lib :kernel32, :user32
-
-    ERROR_IO_PENDING      = 997
-    ERROR_PIPE_CONNECTED  = 535
-    ERROR_SUCCESS         = 0
-    
-    FILE_FLAG_OVERLAPPED  = 0x40000000
-    
-    INFINITE              = 0xFFFFFFFF
-    INVALID_HANDLE_VALUE  = FFI::Pointer.new(-1).address
-
-    PIPE_ACCESS_DUPLEX    = 0x00000003
-    PIPE_READMODE_BYTE    = 0x00000000
-    PIPE_READMODE_MESSAGE = 0x00000002
-    PIPE_TYPE_BYTE        = 0x00000000
-    PIPE_TYPE_MESSAGE     = 0x00000004
-    PIPE_WAIT             = 0x00000000
-
-    QS_ALLINPUT           = 0x04FF
-
-    typedef :uintptr_t, :handle
-
-    attach_function :ConnectNamedPipe, [:handle, :pointer], :ulong
-    attach_function :CreateEvent, :CreateEventA, [:pointer, :ulong, :ulong, :string], :handle
-    attach_function :CreateNamedPipe, :CreateNamedPipeA, [:string, :ulong, :ulong, :ulong, :ulong, :ulong, :ulong, :pointer], :handle
-    attach_function :DisconnectNamedPipe, [:handle], :bool
-    attach_function :FlushFileBuffers, [:handle], :bool
-    attach_function :GetLastError, [], :ulong
-    attach_function :GetOverlappedResult, [:handle, :pointer, :pointer, :bool], :bool
-    attach_function :MsgWaitForMultipleObjects, [:ulong, :pointer, :ulong, :ulong, :ulong], :ulong
-    attach_function :ReadFile, [:handle, :buffer_out, :ulong, :pointer, :pointer], :bool
-    attach_function :SetEvent, [:handle], :bool
-    attach_function :WaitForMultipleObjects, [:ulong, :pointer, :ulong, :ulong], :ulong
-    attach_function :WriteFile, [:handle, :buffer_in, :ulong, :pointer, :pointer], :bool
-  end
-
-  class PipeServer
-    include OpalWebpackLoader::WindowsyThings
-
-    CONNECTING_STATE = 0
-    READING_STATE    = 1
-    WRITING_STATE    = 2
-    INSTANCES        = 4
-    PIPE_TIMEOUT     = 5000
-    BUFFER_SIZE      = 65536
-
-    class Overlapped < FFI::Struct
-      layout(
-        :Internal, :uintptr_t,
-        :InternalHigh, :uintptr_t,
-        :Offset, :ulong,
-        :OffsetHigh, :ulong,
-        :hEvent, :uintptr_t
-      )
-    end
-
-    def initialize(pipe_name, instances = 4, &block)
-      @run_block = block
-      @full_pipe_name = "\\\\.\\pipe\\#{pipe_name}"
-      @instances = instances
-      @events = []
-      @events_pointer = FFI::MemoryPointer.new(:uintptr_t, @instances)
-      @pipes = []
-    end
-
-    def run
-      create_instances
-      while_loop
-    end
-
-    private
-
-    def create_instances
-      (0...@instances).each do |i|
-        @events[i] = CreateEvent(nil, 1, 1, nil)
-        raise "CreateEvent failed with #{GetLastError()}" unless @events[i]
-
-        overlap = Overlapped.new
-        overlap[:hEvent] = @events[i]
-
-        @pipes[i] = { overlap: overlap, instance: nil, request: FFI::Buffer.new(1, BUFFER_SIZE), bytes_read: 0, reply: FFI::Buffer.new(1, BUFFER_SIZE), bytes_to_write: 0, state: nil, pending_io: false }
-        @pipes[i][:instance] = CreateNamedPipe(@full_pipe_name, 
-                                              PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
-                                              PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
-                                              @instances,
-                                              BUFFER_SIZE,
-                                              BUFFER_SIZE,
-                                              PIPE_TIMEOUT,
-                                              nil)
-
-        raise "CreateNamedPipe failed with #{GetLastError()}" if @pipes[i][:instance] == INVALID_HANDLE_VALUE
-        @pipes[i][:pending_io] = connect_to_new_client(i)
-        @pipes[i][:state] = @pipes[i][:pending_io] ? CONNECTING_STATE : READING_STATE
-      end
-      @events_pointer.write_array_of_ulong_long(@events)
-      nil
-    end
-
-    def while_loop
-      while true
-        i = MsgWaitForMultipleObjects(@instances, @events_pointer, 0, INFINITE, QS_ALLINPUT)
-        # Having this STDOUT.putc is essential, otherwise there is a tendency to block within MsgWaitForMultipleObjects ...
-        STDOUT.putc "."
-        # ... because the ruby interpreter is waiting for objects too on Windows. Thats why we wait for QS_ALLINPUT and
-        # with STDOUT.putc give back control to the ruby interpreter that it can handle its things.
-        if i < 0 || i > (@instances - 1)
-          STDERR.puts "Pipe index out of range. Maybe a error occured."
-          next
-        end
-
-        if @pipes[i][:pending_io]
-          bytes_transferred = FFI::MemoryPointer.new(:ulong)
-          success = GetOverlappedResult(@pipes[i][:instance], @pipes[i][:overlap], bytes_transferred, false)
-
-          case @pipes[i][:state]
-          when CONNECTING_STATE
-            raise "Error #{GetLastError()}" unless success
-            @pipes[i][:state] = READING_STATE
-          when READING_STATE
-            if !success || bytes_transferred.read_ulong == 0
-              disconnect_and_reconnect(i)
-              next
-            else
-              @pipes[i][:bytes_read] = bytes_transferred.read_ulong
-              @pipes[i][:state] = WRITING_STATE
-            end
-          when WRITING_STATE
-            if !success || bytes_transferred.read_ulong != @pipes[i][:bytes_to_write]
-              disconnect_and_reconnect(i)
-              next
-            else
-              @pipes[i][:state] = READING_STATE
-            end
-          else
-            raise "Invalid pipe state."
-          end
-        end
-
-        case @pipes[i][:state]
-        when READING_STATE
-          bytes_read = FFI::MemoryPointer.new(:ulong)
-          success = ReadFile(@pipes[i][:instance], @pipes[i][:request], BUFFER_SIZE, bytes_read, @pipes[i][:overlap].to_ptr)
-          if success && bytes_read.read_ulong != 0
-            @pipes[i][:pending_io] = false
-            @pipes[i][:state] = WRITING_STATE
-            next
-          end
-
-          err = GetLastError()
-          if !success && err == ERROR_IO_PENDING
-            @pipes[i][:pending_io] = true
-            next
-          end
-
-          disconnect_and_reconnect(i)
-        when WRITING_STATE
-          @pipes[i][:reply] = @run_block.call(@pipes[i][:request].get_string(0))
-          @pipes[i][:bytes_to_write] = @pipes[i][:reply].bytesize
-          bytes_written = FFI::MemoryPointer.new(:ulong)
-          success = WriteFile(@pipes[i][:instance], @pipes[i][:reply], @pipes[i][:bytes_to_write], bytes_written, @pipes[i][:overlap].to_ptr)
-
-          if success && bytes_written.read_ulong == @pipes[i][:bytes_to_write]
-            @pipes[i][:pending_io] = false
-            @pipes[i][:state] = READING_STATE
-            next
-          end
-
-          err = GetLastError()
-
-          if !success && err == ERROR_IO_PENDING
-            @pipes[i][:pending_io] = true
-            next
-          end
-
-          disconnect_and_reconnect(i)
-        else
-          raise "Invalid pipe state."
-        end
-      end
-    end
-
-    def disconnect_and_reconnect(i)
-      FlushFileBuffers(@pipes[i][:instance])
-      STDERR.puts("DisconnectNamedPipe failed with #{GetLastError()}") if !DisconnectNamedPipe(@pipes[i][:instance])
-  
-      @pipes[i][:pending_io] = connect_to_new_client(i)
-      
-      @pipes[i][:state] = @pipes[i][:pending_io] ? CONNECTING_STATE : READING_STATE
-    end
-
-    def connect_to_new_client(i)
-      pending_io = false
-      @pipes[i][:request].clear
-      @pipes[i][:reply].clear
-      connected = ConnectNamedPipe(@pipes[i][:instance], @pipes[i][:overlap].to_ptr)
-      last_error = GetLastError()
-      raise "ConnectNamedPipe failed with #{last_error} - #{connected}" if connected != 0
-      
-      case last_error
-      when ERROR_IO_PENDING
-        pending_io = true
-      when ERROR_PIPE_CONNECTED
-        SetEvent(@pipes[i][:overlap][:hEvent])
-      when ERROR_SUCCESS
-        pending_io = true
-      else
-        raise "ConnectNamedPipe failed with error #{last_error}"
-      end
-
-      pending_io
-    end
-  end
-end
+require 'ffi'
+
+module OpalWebpackLoader
+  module WindowsyThings
+    extend FFI::Library
+
+    ffi_lib :kernel32, :user32
+
+    ERROR_IO_PENDING      = 997
+    ERROR_PIPE_CONNECTED  = 535
+    ERROR_SUCCESS         = 0
+    
+    FILE_FLAG_OVERLAPPED  = 0x40000000
+    
+    INFINITE              = 0xFFFFFFFF
+    INVALID_HANDLE_VALUE  = FFI::Pointer.new(-1).address
+
+    PIPE_ACCESS_DUPLEX    = 0x00000003
+    PIPE_READMODE_BYTE    = 0x00000000
+    PIPE_READMODE_MESSAGE = 0x00000002
+    PIPE_TYPE_BYTE        = 0x00000000
+    PIPE_TYPE_MESSAGE     = 0x00000004
+    PIPE_WAIT             = 0x00000000
+
+    QS_ALLINPUT           = 0x04FF
+
+    typedef :uintptr_t, :handle
+
+    attach_function :ConnectNamedPipe, [:handle, :pointer], :ulong
+    attach_function :CreateEvent, :CreateEventA, [:pointer, :ulong, :ulong, :string], :handle
+    attach_function :CreateNamedPipe, :CreateNamedPipeA, [:string, :ulong, :ulong, :ulong, :ulong, :ulong, :ulong, :pointer], :handle
+    attach_function :DisconnectNamedPipe, [:handle], :bool
+    attach_function :FlushFileBuffers, [:handle], :bool
+    attach_function :GetLastError, [], :ulong
+    attach_function :GetOverlappedResult, [:handle, :pointer, :pointer, :bool], :bool
+    attach_function :MsgWaitForMultipleObjects, [:ulong, :pointer, :ulong, :ulong, :ulong], :ulong
+    attach_function :ReadFile, [:handle, :buffer_out, :ulong, :pointer, :pointer], :bool
+    attach_function :SetEvent, [:handle], :bool
+    attach_function :WaitForMultipleObjects, [:ulong, :pointer, :ulong, :ulong], :ulong
+    attach_function :WriteFile, [:handle, :buffer_in, :ulong, :pointer, :pointer], :bool
+  end
+
+  class PipeServer
+    include OpalWebpackLoader::WindowsyThings
+
+    CONNECTING_STATE = 0
+    READING_STATE    = 1
+    WRITING_STATE    = 2
+    INSTANCES        = 4
+    PIPE_TIMEOUT     = 5000
+    BUFFER_SIZE      = 65536
+
+    class Overlapped < FFI::Struct
+      layout(
+        :Internal, :uintptr_t,
+        :InternalHigh, :uintptr_t,
+        :Offset, :ulong,
+        :OffsetHigh, :ulong,
+        :hEvent, :uintptr_t
+      )
+    end
+
+    def initialize(pipe_name, instances = 4, &block)
+      @run_block = block
+      @full_pipe_name = "\\\\.\\pipe\\#{pipe_name}"
+      @instances = instances
+      @events = []
+      @events_pointer = FFI::MemoryPointer.new(:uintptr_t, @instances)
+      @pipes = []
+    end
+
+    def run
+      create_instances
+      while_loop
+    end
+
+    private
+
+    def create_instances
+      (0...@instances).each do |i|
+        @events[i] = CreateEvent(nil, 1, 1, nil)
+        raise "CreateEvent failed with #{GetLastError()}" unless @events[i]
+
+        overlap = Overlapped.new
+        overlap[:hEvent] = @events[i]
+
+        @pipes[i] = { overlap: overlap, instance: nil, request: FFI::Buffer.new(1, BUFFER_SIZE), bytes_read: 0, reply: FFI::Buffer.new(1, BUFFER_SIZE), bytes_to_write: 0, state: nil, pending_io: false }
+        @pipes[i][:instance] = CreateNamedPipe(@full_pipe_name, 
+                                              PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
+                                              PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+                                              @instances,
+                                              BUFFER_SIZE,
+                                              BUFFER_SIZE,
+                                              PIPE_TIMEOUT,
+                                              nil)
+
+        raise "CreateNamedPipe failed with #{GetLastError()}" if @pipes[i][:instance] == INVALID_HANDLE_VALUE
+        @pipes[i][:pending_io] = connect_to_new_client(i)
+        @pipes[i][:state] = @pipes[i][:pending_io] ? CONNECTING_STATE : READING_STATE
+      end
+      @events_pointer.write_array_of_ulong_long(@events)
+      nil
+    end
+
+    def while_loop
+      while true
+        i = MsgWaitForMultipleObjects(@instances, @events_pointer, 0, INFINITE, QS_ALLINPUT)
+        # Having this STDOUT.putc is essential, otherwise there is a tendency to block within MsgWaitForMultipleObjects ...
+        STDOUT.putc "."
+        # ... because the ruby interpreter is waiting for objects too on Windows. Thats why we wait for QS_ALLINPUT and
+        # with STDOUT.putc give back control to the ruby interpreter that it can handle its things.
+        if i < 0 || i > (@instances - 1)
+          STDERR.puts "Pipe index out of range. Maybe a error occured."
+          next
+        end
+
+        if @pipes[i][:pending_io]
+          bytes_transferred = FFI::MemoryPointer.new(:ulong)
+          success = GetOverlappedResult(@pipes[i][:instance], @pipes[i][:overlap], bytes_transferred, false)
+
+          case @pipes[i][:state]
+          when CONNECTING_STATE
+            raise "Error #{GetLastError()}" unless success
+            @pipes[i][:state] = READING_STATE
+          when READING_STATE
+            if !success || bytes_transferred.read_ulong == 0
+              disconnect_and_reconnect(i)
+              next
+            else
+              @pipes[i][:bytes_read] = bytes_transferred.read_ulong
+              @pipes[i][:state] = WRITING_STATE
+            end
+          when WRITING_STATE
+            if !success || bytes_transferred.read_ulong != @pipes[i][:bytes_to_write]
+              disconnect_and_reconnect(i)
+              next
+            else
+              @pipes[i][:state] = READING_STATE
+            end
+          else
+            raise "Invalid pipe state."
+          end
+        end
+
+        case @pipes[i][:state]
+        when READING_STATE
+          bytes_read = FFI::MemoryPointer.new(:ulong)
+          success = ReadFile(@pipes[i][:instance], @pipes[i][:request], BUFFER_SIZE, bytes_read, @pipes[i][:overlap].to_ptr)
+          if success && bytes_read.read_ulong != 0
+            @pipes[i][:pending_io] = false
+            @pipes[i][:state] = WRITING_STATE
+            next
+          end
+
+          err = GetLastError()
+          if !success && err == ERROR_IO_PENDING
+            @pipes[i][:pending_io] = true
+            next
+          end
+
+          disconnect_and_reconnect(i)
+        when WRITING_STATE
+          @pipes[i][:reply] = @run_block.call(@pipes[i][:request].get_string(0))
+          @pipes[i][:bytes_to_write] = @pipes[i][:reply].bytesize
+          bytes_written = FFI::MemoryPointer.new(:ulong)
+          success = WriteFile(@pipes[i][:instance], @pipes[i][:reply], @pipes[i][:bytes_to_write], bytes_written, @pipes[i][:overlap].to_ptr)
+
+          if success && bytes_written.read_ulong == @pipes[i][:bytes_to_write]
+            @pipes[i][:pending_io] = false
+            @pipes[i][:state] = READING_STATE
+            next
+          end
+
+          err = GetLastError()
+
+          if !success && err == ERROR_IO_PENDING
+            @pipes[i][:pending_io] = true
+            next
+          end
+
+          disconnect_and_reconnect(i)
+        else
+          raise "Invalid pipe state."
+        end
+      end
+    end
+
+    def disconnect_and_reconnect(i)
+      FlushFileBuffers(@pipes[i][:instance])
+      STDERR.puts("DisconnectNamedPipe failed with #{GetLastError()}") if !DisconnectNamedPipe(@pipes[i][:instance])
+  
+      @pipes[i][:pending_io] = connect_to_new_client(i)
+      
+      @pipes[i][:state] = @pipes[i][:pending_io] ? CONNECTING_STATE : READING_STATE
+    end
+
+    def connect_to_new_client(i)
+      pending_io = false
+      @pipes[i][:request].clear
+      @pipes[i][:reply].clear
+      connected = ConnectNamedPipe(@pipes[i][:instance], @pipes[i][:overlap].to_ptr)
+      last_error = GetLastError()
+      raise "ConnectNamedPipe failed with #{last_error} - #{connected}" if connected != 0
+      
+      case last_error
+      when ERROR_IO_PENDING
+        pending_io = true
+      when ERROR_PIPE_CONNECTED
+        SetEvent(@pipes[i][:overlap][:hEvent])
+      when ERROR_SUCCESS
+        pending_io = true
+      else
+        raise "ConnectNamedPipe failed with error #{last_error}"
+      end
+
+      pending_io
+    end
+  end
+end

data/lib/opal-webpack-loader/version.rb

@@ -1,3 +1,3 @@
-module OpalWebpackLoader
-  VERSION="0.11.0"
-end
+module OpalWebpackLoader
+  VERSION="0.11.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Jan Biedermann
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -257,7 +257,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.15
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Bundle assets with webpack, resolve and compile opal ruby files and import
   them in the bundle.