opal-webpack-loader 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a695e20b5241e7494291b694fc637e1e810cc997e53a235a77c6c9672e180ef0
-  data.tar.gz: 5faf19c2255368bae26ccf0a36c14e14d5e4fbca50ddf38cb6c0a023bf214601
+  metadata.gz: df7daa4166a459e2bbd8942eb051e176718b2f0f2b3e0a8eec03d4c3c7232607
+  data.tar.gz: e4ca6d4e0a2f3ccb8696d1d6d4cfa6f0812e9342511ca888d26a725a98370701
 SHA512:
-  metadata.gz: a3425769cc9802627bb418d84a615d89fcc4e42c04a8b344ed885ecb829b7f5f89e3cd0ea9538c95dd75fb6f4b22192834d7fe93f9922cd8e04c14fa58d48e5c
-  data.tar.gz: 9f2283d3e18722c6d9095ced3bf3fa854045058037f2707848314996affc8a35845b807247fabdd80c321aab18fa5f174954e2f8623018f21d51232e389fdae4
+  metadata.gz: df26e49ff98da208b57f55e253b6c4c9f5a25ac3dba28b7d9485882f8e207069e24acbaf730368a2da543e2d57030e4c36c230350bfb025aed6c3b50f0ebfcc9
+  data.tar.gz: 2367ec570bc9ca4fcb28b1829c992ab3ee2365e3119b90040696b0bf2da55427ddafb0ff0ec128c645b4c1a7d701a5cc3bb87be03d841006f236a532dd91e1df

data/bin/opal-webpack-compile-server

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'digest'
 require 'open3'
 require 'oj'
 require 'c_lexer'
@@ -44,6 +45,16 @@ OptionParser.new do |opts|
   opts.on('-s', '--socket-path PATH', 'Path of the socket the compile server should create.') do |s|
     compile_server_options[:socket_path] = s
   end
+
+  opts.on('-m', '--memcached URL', 'URL of memcached server. Will enable use of memcached for caching compiler results.') do |m|
+    compile_server_options[:memcached] = m
+    require 'dalli'
+  end
+
+  opts.on('-e', '--redis URL', 'URL of redis server. Will enable use of redis for caching compiler results.') do |e|
+    compile_server_options[:redis] = e
+    require 'redis'
+  end
 end.parse!
 
 modules_to_require.each do |mod|
@@ -66,13 +77,6 @@ else
     number_of_workers = ARGV[1].to_i
     number_of_workers == 4 if number_of_workers == 0
     number_of_workers == 16 if number_of_workers > 16
-    if ARGV[2] && ARGV[2].start_with?('webpack')
-      raise <<~MSG
-      Please change the scripts in package.json to only start webpack:\n
-      eg. from: "debug": "bundle exec opal-webpack-compile-server start 8 webpack --config=config/webpack/test.js"
-      to just:  "debug": "webpack --config=config/webpack/test.js"
-      MSG
-    end
   else
     raise 'arguments must be either "stop" or "start number_of_workers"'
     exit(1)
@@ -83,7 +87,7 @@ else
     Opal.append_paths(*load_paths)
   end
 
-  pid = fork { OpalWebpackLoader::CompileServer.new.start(number_of_workers, compiler_options, compile_server_options[:socket_path]) }
+  pid = fork { OpalWebpackLoader::CompileServer.new(compile_server_options).start(number_of_workers, compiler_options) }
 
   have_socket = false
   start_time = Time.now
@@ -117,4 +121,4 @@ else
     exit 0
   end
   Process.kill("TERM", pid)
-end
+end

data/lib/opal-webpack-loader.rb

@@ -58,4 +58,4 @@ if npm != ''
   end
 else
   STDERR.puts "opal-webpack-loader: Unable to check npm package version. Please check your npm installation."
-end
+end

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

@@ -33,18 +33,22 @@ module OpalWebpackLoader
       end
     end
 
-    def initialize
+    attr_reader :cache
+
+    def initialize(options)
       @read_pipe, @write_pipe = IO.pipe
       @workers = {}
       @signal_queue = []
+      @socket_path = options[:socket_path]
+      @options = options
     end
 
-    def start(number_of_workers = 4, compiler_options, socket_path)
+    def start(number_of_workers = 4, compiler_options)
       $PROGRAM_NAME = 'owl compile server'
       @number_of_workers = number_of_workers
       @server_pid = Process.pid
       $stderr.sync = $stdout.sync = true
-      @socket = UNIXServer.new(socket_path)
+      @socket = UNIXServer.new(@socket_path)
       spawn_workers(compiler_options)
       SIGNALS.each { |sig| trap_deferred(sig) }
       trap('CHLD') { @write_pipe.write_nonblock('.') }
@@ -118,7 +122,7 @@ module OpalWebpackLoader
         tempfile = Tempfile.new('')
         tempfile.unlink
         tempfile.sync = true
-        worker = OpalWebpackLoader::CompileWorker.new(@server_pid, @socket, tempfile, worker_number, compiler_options)
+        worker = OpalWebpackLoader::CompileWorker.new(@server_pid, @socket, tempfile, worker_number, compiler_options, @options)
         pid = fork { init_worker(worker) }
         @workers[pid] = worker
       end
@@ -131,4 +135,4 @@ module OpalWebpackLoader
       end
     end
   end
-end
+end

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

@@ -4,14 +4,22 @@ module OpalWebpackLoader
   class CompileWorker
     SIGNALS = %w[QUIT]
 
-    attr_reader :number, :tempfile
+    attr_reader :cache, :number, :compiler_options_digest, :tempfile
 
-    def initialize(master_pid, socket, tempfile, number, compiler_options)
+    def initialize(master_pid, socket, tempfile, number, compiler_options, other_options)
       @master_pid = master_pid
       @socket     = socket
       @tempfile   = tempfile
       @number     = number
       @compiler_options = compiler_options.merge(es6_modules: true)
+      if other_options[:memcached]
+        @cache = Dalli::Client.new(other_options[:memchached])
+      elsif other_options[:redis]
+        @cache = Redis.new(url: other_options[:redis])
+      else
+        @cache = false
+      end
+      @compiler_options_digest = Digest::SHA1.hexdigest(Oj.dump(@compiler_options, mode: :strict)) if cache
     end
 
     def ==(other_number)
@@ -73,6 +81,12 @@ module OpalWebpackLoader
       source = File.read(filename)
 
       begin
+        if cache
+          source_digest = Digest::SHA1.hexdigest(source)
+          key = "owl_#{compiler_options_digest}_#{source_digest}_#{compile_source_map}"
+          result_json = cache.get(key)
+          return result_json if result_json
+        end
         c = Opal::Compiler.new(source, @compiler_options.merge(file: filename))
         result = { 'javascript' => c.compile }
         if compile_source_map
@@ -80,7 +94,9 @@ module OpalWebpackLoader
           result['source_map']['file'] = filename
         end
         result['required_trees'] = c.required_trees
-        Oj.dump(result, mode: :strict)
+        result_json = Oj.dump(result, mode: :strict)
+        cache.set(key, result_json) if cache
+        result_json
       rescue Exception => e
         Oj.dump({ 'error' => { 'name' => e.class.to_s, 'message' => e.message, 'backtrace' => e.backtrace.join("\n") } }, mode: :strict)
       end

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

@@ -1,3 +1,3 @@
 module OpalWebpackLoader
-  VERSION="0.9.10"
+  VERSION="0.9.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement