sqreen-alt 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fbf5dd32eefb6b656d3faf05b0f352ede30960e86496dd1551c52d2806a2fb
-  data.tar.gz: 56cd5bcb1ccc2d3c4cc8b0c6d5cfdbfb44e137e9b51ca9a9e0af47d44fb3f79c
+  metadata.gz: 16186d53b0984c0463633198bf2210cfbe064824f53f30cedfda19c240c41a49
+  data.tar.gz: 73590a2c4f70f9fa70ed6755c2d9ac6e84cff95ed218143b12cf260d83f8ed63
 SHA512:
-  metadata.gz: 3ae9b65ef690fb571339996e2ac66e36efe8c9d7099d5009cbc042474ce01a08a4fd40d769644f74db169540f4701a08fbf5d374db605ae8a14f5914e30425f9
-  data.tar.gz: b29257450a6a567b885e11c045d80d15c2cdbbcb3a70d8f16591478dd21008392a752415c35b67e9d73106cd61b2b57b63ca7e5e2b3b45110f89a2ed2c046a5e
+  metadata.gz: 5ebd96ffdc51c557831d7b75fa42112e7f24259f64847177c7df263c7395accac3936f84c56cdf99298ba970b7bc2eefe096bf3fd604840480f2915b85b05dbd
+  data.tar.gz: 1aebe82d2440739f96029c67c6731f301dd83a15eda8d40a27316c374565df3ad8635f328e31a7bb8d085f7c0c8c10956a84be050cb8eec4f0716f0edd8c606f

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-alt
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 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