mini_racer 0.1.15 → 0.2.0

data/lib/mini_racer.rb

@@ -59,15 +59,9 @@ module MiniRacer
         raise ArgumentError, "snapshot must be a Snapshot object, passed a #{snapshot.inspect}"
       end
 
-      @lock = Mutex.new
-
       # defined in the C class
       init_with_snapshot(snapshot)
     end
-
-    def with_lock
-      @lock.synchronize { yield }
-    end
   end
 
   class Platform
@@ -136,8 +130,6 @@ module MiniRacer
       end
     end
 
-    attr_reader :isolate
-
     def initialize(options = nil)
       options ||= {}
 
@@ -151,7 +143,8 @@ module MiniRacer
       if options[:max_memory].is_a?(Numeric) && options[:max_memory] > 0
         @max_memory = options[:max_memory]
       end
-      @isolate = options[:isolate] || Isolate.new(options[:snapshot])
+      # false signals it should be fetched if requested
+      @isolate = options[:isolate] || false
       @disposed = false
 
       @callback_mutex = Mutex.new
@@ -159,10 +152,14 @@ module MiniRacer
       @thread_raise_called = false
       @eval_thread = nil
 
-      isolate.with_lock do
-        # defined in the C class
-        init_with_isolate(@isolate)
-      end
+      # defined in the C class
+      init_unsafe(options[:isolate], options[:snapshot])
+    end
+
+    def isolate
+      return @isolate if @isolate != false
+      # defined in the C class
+      @isolate = create_isolate_value
     end
 
     def load(filename)
@@ -176,7 +173,7 @@ module MiniRacer
       filename = options && options[:filename].to_s
 
       @eval_thread = Thread.current
-      isolate.with_lock do
+      isolate_mutex.synchronize do
         @current_exception = nil
         timeout do
           eval_unsafe(str, filename)
@@ -186,41 +183,67 @@ module MiniRacer
       @eval_thread = nil
     end
 
-    def dispose
-      if !@disposed
-        isolate.with_lock do
-          dispose_unsafe
+    def call(function_name, *arguments)
+      raise(ContextDisposedError, 'attempted to call function on a disposed context!') if @disposed
+
+      @eval_thread = Thread.current
+      isolate_mutex.synchronize do
+        timeout do
+          call_unsafe(function_name, *arguments)
         end
-        @disposed = true
       end
+    ensure
+      @eval_thread = nil
+    end
+
+    def dispose
+      return if @disposed
+      isolate_mutex.synchronize do
+        dispose_unsafe
+      end
+      @disposed = true
+      @isolate = nil # allow it to be garbage collected, if set
     end
 
 
     def attach(name, callback)
+      raise(ContextDisposedError, 'attempted to call function on a disposed context!') if @disposed
 
       wrapped = lambda do |*args|
         begin
-          @callback_mutex.synchronize{
-            @callback_running = true
-          }
 
-          callback.call(*args)
-        ensure
-          @callback_mutex.synchronize {
-            @callback_running = false
+          r = nil
+
+          begin
+            @callback_mutex.synchronize{
+              @callback_running = true
+            }
+            r = callback.call(*args)
+          ensure
+            @callback_mutex.synchronize{
+              @callback_running = false
+            }
+          end
 
-            # this is some odd code, but it is required
-            # if we raised on this thread we better wait for it
-            # otherwise we may end up raising in an unsafe spot
+          # wait up to 2 seconds for this to be interrupted
+          # will very rarely be called cause #raise is called
+          # in another mutex
+          @callback_mutex.synchronize {
             if @thread_raise_called
-              sleep 0.1
+              sleep 2
             end
+          }
+
+          r
+
+        ensure
+          @callback_mutex.synchronize {
             @thread_raise_called = false
           }
         end
       end
 
-      isolate.with_lock do
+      isolate_mutex.synchronize do
         external = ExternalFunction.new(name, wrapped, self)
         @functions["#{name}"] = external
       end
@@ -245,7 +268,7 @@ module MiniRacer
 
       rp,wp = IO.pipe
 
-      Thread.new do
+      t = Thread.new do
         begin
           result = IO.select([rp],[],[],(@timeout/1000.0))
           if !result
@@ -265,6 +288,10 @@ module MiniRacer
       end
 
       wp.write("done")
+
+      # ensure we do not leak a thread in state
+      t.join
+
       rval
 
     end
@@ -288,8 +315,33 @@ module MiniRacer
   # `size` and `warmup!` public methods are defined in the C class
   class Snapshot
     def initialize(str = '')
+      # ensure it first can load
+      begin
+        ctx = MiniRacer::Context.new
+        ctx.eval(str)
+      rescue MiniRacer::RuntimeError => e
+        raise MiniRacer::SnapshotError.new,  e.message
+      end
+
+      @source = str
+
       # defined in the C class
       load(str)
     end
+
+    def warmup!(src)
+      # we have to do something here
+      # we are bloating memory a bit but it is more correct
+      # than hitting an exception when attempty to compile invalid source
+      begin
+        ctx = MiniRacer::Context.new
+        ctx.eval(@source)
+        ctx.eval(src)
+      rescue MiniRacer::RuntimeError => e
+        raise MiniRacer::SnapshotError.new,  e.message
+      end
+
+      warmup_unsafe!(src)
+    end
   end
 end

data/lib/mini_racer/version.rb

@@ -1,3 +1,3 @@
 module MiniRacer
-  VERSION = "0.1.15"
+  VERSION = "0.2.0"
 end

data/mini_racer.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake-compiler"
 
-  spec.add_dependency 'libv8', '~> 6.3'
+  spec.add_dependency 'libv8', '>= 6.3'
   spec.require_paths = ["lib", "ext"]
 
   spec.extensions = ["ext/mini_racer_extension/extconf.rb"]
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_racer
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.2.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,14 +70,14 @@ dependencies:
   name: libv8
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.3'
 description: Minimal embedded v8 engine for Ruby
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Minimal embedded v8 for Ruby