sqreen 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04735d805b8ea864d96c46e800a897b8a9721189f0ba85aed0d5d299cb6e7907
-  data.tar.gz: 283e87804132bdbeac132989113bd352f71b0e359a55dbffdb577748466ab5b2
+  metadata.gz: 3129e4afc077e7ca7afbe1704c49e3584fc8677de552575307f28d1a11e2a71e
+  data.tar.gz: 6a84e5d01b162c304195e50e13b32d301d9faa5190fcfe7d2ebc657e66f7ed25
 SHA512:
-  metadata.gz: 409bea4a589bf468b0a1d28024137d9ff19c2a7b2a967b7a7e8c21f963ab71085085b7cdacb1eecdc84303d4774a7b89ce0476dd9b2dfdc36349127c16f4ccbb
-  data.tar.gz: e9c396aa040c4c57760e8a27c9ea5caa168da52c4a21c134d565696f801f3c63be4dbbe0888b8cf7ae911f3cb839083dcb85f033d6876a3eb1e3b7f56ee6db0d
+  metadata.gz: e5b855e58472a20f7f190b37e6c7dce6dd36ca3117dd80b9ff8b406fb5c24c7e99713ad11d14833f0887c2af8497971ca0d0a5c3d93069987175f95b414a2956
+  data.tar.gz: 305d5048bbbe5df8d6c9b21c26fae636a6aa6738a77adf8dcc87ff08575b893e7dacb546d4d695ca36b838e9b69cfa0a54410e4ae90ddc5daa0e3da515726e43

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: 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