sqreen 1.10.1-java → 1.10.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2769174da57177a2fb014d06f5c810f35d1b011e0b84640b935079f83bc01153
-  data.tar.gz: 06be029bc2497b2e1f5eb2f6993f09c4f0ad0dae8597ecd62e1d7ec6b3470f54
+  metadata.gz: 2277eaa2d49d4308c33a920b5faf831445067e4bce6e46a745211c511f59e318
+  data.tar.gz: 510b43dd0c0b70cec0c6423bb7090321e7f64ffdd8189d7fc799d6f0ed6d0ad3
 SHA512:
-  metadata.gz: 19804e889ab4f9aadacaac5d87805c2bb7873f62f95b30829367752a224a7ec9f12d4a31ebccde3ffda21584c6483473c17dfe18c573ec4f393f9e3f1e17fead
-  data.tar.gz: c85dea9e1a61cfb25dcb278213fbb344344f4a5932425b49b80d8375d75a68a7c4042af88d5d700ec65945246014fe14e48f1ceee9eb125d4e3472d3e3ad9909
+  metadata.gz: 344b5bb85b8d5c5b1d42c46bb853e2b3163450a513c0c05c27dac4141c0c621678a550722e20528d8e40de4a1e76b97e378ca426cfd7dd655e102c57fddeb200
+  data.tar.gz: 1f1de62a20ce2e3afc39969ef53459b9b5b8a25ef9ceb4fc7d88c947bc424693d1d75dea9ed4c02fbf234afe7dde54639a850f2b8bdb91df2f0eb3bc0f17a9ca

data/lib/sqreen/rules_callbacks/execjs.rb

@@ -3,14 +3,15 @@
 
 if defined?(::JRUBY_VERSION)
   require 'rhino'
-  SQREEN_V8_THREAD = false
+  SQREEN_MINI_RACER = false
 else
   begin
     require 'mini_racer'
-    SQREEN_V8_THREAD = true
+    SQREEN_MINI_RACER = true
+    GC_MINI_RACER = 10000
   rescue LoadError
     require 'therubyracer'
-    SQREEN_V8_THREAD = false
+    SQREEN_MINI_RACER = false
   end
 end
 
@@ -40,9 +41,10 @@ module Sqreen
         end
 
         build_runnable(callbacks)
-        if !SQREEN_V8_THREAD
+        if !SQREEN_MINI_RACER
           @compiled = ExecJS.compile(@source)
         else
+          @snapshot = MiniRacer::Snapshot.new(@source)
           @runtimes = []
         end
         @restrict_max_depth = 20
@@ -146,11 +148,23 @@ module Sqreen
       end
 
       def call_callback(name, inst, args, rv = nil)
-        if SQREEN_V8_THREAD
-          if Thread.current["SQREEN_EXECJS_SOURCE#{self.object_id}"].nil? || !Thread.current["SQREEN_EXECJS_SOURCE#{self.object_id}"].weakref_alive? 
-            runtime = ExecJS.compile(@source)
+        if SQREEN_MINI_RACER
+          mini_racer_context = Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"]
+          if mini_racer_context.nil? || mini_racer_context[:r].nil? || !mini_racer_context[:r].weakref_alive?
+            runtime = MiniRacer::Context.new(snapshot: @snapshot)
             @runtimes.push runtime
-            Thread.current["SQREEN_EXECJS_SOURCE#{self.object_id}"] = WeakRef.new(runtime)
+            Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"] = {:c => 0, :r => WeakRef.new(runtime)}
+          elsif mini_racer_context[:c] >= GC_MINI_RACER
+            @runtimes.delete(mini_racer_context[:r])
+            mini_racer_context[:r].dispose
+
+            new_runtime = MiniRacer::Context.new(snapshot: @snapshot)
+            @runtimes.push new_runtime
+
+            Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"] = {
+              :c => 0,
+              :r => WeakRef.new(new_runtime)
+            }
           end
         end
         ret = nil
@@ -162,8 +176,10 @@ module Sqreen
           end
           arguments = restrict(name, arguments) if @conditions.key?(name)
           Sqreen.log.debug { [name, arguments].inspect }
-          if SQREEN_V8_THREAD
-            ret = Thread.current["SQREEN_EXECJS_SOURCE#{self.object_id}"].call(name, *arguments)
+          if SQREEN_MINI_RACER
+            mini_racer_context = Thread.current["SQREEN_MINI_RACER_CONTEXT_#{self.object_id}"]
+            mini_racer_context[:c] += 1
+            ret = mini_racer_context[:r].eval("#{name}.apply(this, #{::JSON.generate(arguments)})")
           else
             ret = @compiled.call(name, *arguments)
           end

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.10.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs