sqreen 1.14.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e50a974c4a6de258f73e1f7a99ad000a87a9a78a3a439211cba1aceaa08d44c
-  data.tar.gz: b2b6d9f85d26270b242febf553ae0311ecb923faa36ea840e03e5dc747f7c1b8
+  metadata.gz: 59d80d2fe6c9c0bd343380d867b4c1b7f878a42890e3cbe5ab005e4e32507abc
+  data.tar.gz: 1e7c0ee1ef948048fb020b3b64377a1476f2b000aaf22df683b5aec38658895e
 SHA512:
-  metadata.gz: 22f29bcd92e5f4a0e91422ec1490b8e3c32f9f0254d0fdaf1337a3b3a0f1f1b664b5e079449b382b722b0209acecf80d6677b9d6f7232c5985b34f567aaf94ca
-  data.tar.gz: a52c91b15cd6d5c56e8167b2ca05f1fa65aa929b43671bbbfe54d0047f536750d8500ed69c76671958f224253c741ce2069b1adb59d875ff428ede4f2c760116
+  metadata.gz: 8b26544a382b1ef480be8bd92593187584efa7c0b63a05d366f4d53083d6d2f3e71acb168c216985d649281b6004f5bb31ed068b688062531a77cfe0ead4d0e0
+  data.tar.gz: 6331863e48ce18d812ed294b9d1a6fef01a1a805ca2dbab1a20bd76d5837b983bcd022572d751f1e006a68e34a5cf0db2b32a4fc4e7eaf598bf6cd9f7c269ee2

data/lib/sqreen/js/mini_racer_adapter.rb

@@ -1,5 +1,4 @@
-require 'weakref'
-require 'sqreen/runner' # for Sqreen.on_forked_worker?
+require 'digest'
 
 module Sqreen
   module Js
@@ -8,11 +7,12 @@ module Sqreen
     class MiniRacerAdapter < JsServiceAdapter
       def initialize(vendored = false)
         @vendored = vendored
+        @pool = ContextPool.new
         self.class.static_init
       end
 
       def preprocess(_rule_name, code)
-        MiniRacerExecutableJs.new(code, @vendored)
+        MiniRacerExecutableJs.new(@pool, code, @vendored)
       end
 
       def variant_name
@@ -28,48 +28,74 @@ module Sqreen
 
     # Auxiliary classes
 
+    class ContextPool
+      def initialize
+        @mutex = Mutex.new
+        @total_ctxs = 0
+        @contexts = []
+      end
+
+      def with_context(&block)
+        isolate = get_context
+        begin
+          block[isolate]
+        ensure
+          give_back_context isolate
+        end
+      end
+
+      private
+
+      def get_context
+        @mutex.synchronize do
+          if @contexts.empty?
+            @total_ctxs += 1
+            Sqreen.log.debug "Creating new V8 context (#{@total_ctxs})"
+            SqreenContext.new
+          else
+            @contexts.pop
+          end
+        end
+      end
+
+      def give_back_context(isolate)
+        @mutex.synchronize { @contexts.push(isolate); }
+      end
+    end
+
     class MiniRacerExecutableJs < ExecutableJs
       @@ctx_defined = false
 
-      def initialize(source, vendored)
+      def initialize(pool, code, vendored)
+        @pool = pool
+        @code = code
+        @code_id = self.class.code_id(code)
+
         @module = vendored ? Sqreen::MiniRacer : MiniRacer
-        @source = source
-        @recycle_runtime_every = GC_MINI_RACER
-        @runtimes = []
-        @tl_key = "SQREEN_MINI_RACER_CONTEXT_#{object_id}".freeze
-        snapshot if Sqreen.on_forked_worker? # called to eagerly initialize snapshot
+
+        mod = vendored ? Sqreen::MiniRacer : MiniRacer
         unless @@ctx_defined
-          self.class.define_sqreen_context(@module)
+          self.class.define_sqreen_context(mod)
           @@ctx_defined = true
         end
       end
 
       def run_js_cb(cb_name, budget, arguments)
-        mini_racer_context = Thread.current[@tl_key]
-        dead_runtime = !mini_racer_context ||
-            !mini_racer_context[:r] || !mini_racer_context[:r].weakref_alive?
-        if !dead_runtime && mini_racer_context[:c] >= @recycle_runtime_every
-          dispose_runtime(mini_racer_context[:r])
-          dead_runtime = true
-        end
-        if dead_runtime
-          new_runtime = SqreenContext.new(:snapshot => snapshot)
-          push_runtime new_runtime
-          mini_racer_context = {
-              :c => 0,
-              :r => WeakCtx.new(new_runtime),
-          }
-          Thread.current[@tl_key] = mini_racer_context
+        @pool.with_context do |ctx|
+          ctx.add_code(@code_id, @code) unless ctx.has_code?(@code_id)
+
+          begin
+            json_args = "[#{arguments.map(&method(:fixup_bad_encoding)).map(&:to_json).join(',')}]"
+            ctx.eval_unsafe(
+                 "sqreen_data['#{@code_id}']['#{cb_name}'].apply(this, #{json_args})", nil, budget)
+          rescue @module::ScriptTerminatedError
+            nil
+          end
         end
+      end
 
-        mini_racer_context[:c] += 1
-        begin
-          json_args = "[#{arguments.map(&method(:fixup_bad_encoding)).map(&:to_json).join(',')}]"
-          mini_racer_context[:r].eval_unsafe(
-              "#{cb_name}.apply(this, #{json_args})", nil, budget)
-        rescue @module::ScriptTerminatedError
-          nil
-        end
+      def self.code_id(code)
+        Digest::MD5.base64digest(code)
       end
 
       private
@@ -91,29 +117,25 @@ module Sqreen
         end
       end
 
-      def snapshot
-        @snapshot ||= @module::Snapshot.new(@source)
-      end
-
-      def push_runtime(runtime)
-        @runtimes.delete_if do |th, runt, _thid|
-          del = th.nil? || !th.weakref_alive? || !th.alive?
-          runt.dispose if del
-          del
-        end
-        @runtimes.push [WeakRef.new(Thread.current), runtime, Thread.current.object_id]
-      end
-
-      def dispose_runtime(runtime)
-        @runtimes.delete_if { |_th, _runt, thid| thid == Thread.current.object_id }
-        runtime.dispose
-      end
-
       class << self
         def define_sqreen_context(modoole)
           # Context specialized for Sqreen usage
           Sqreen::Js.const_set 'SqreenContext', Class.new(modoole.const_get('Context'))
           SqreenContext.class_eval do
+            def has_code?(code_id)
+              return false unless @code_ids
+              @code_ids.include?(code_id)
+            end
+
+            def add_code(code_id, code)
+              @code_ids ||= Set.new
+              # if it fails, we don't try again
+              @code_ids << code_id
+
+              eval_unsafe code
+              transf_global_funcs code_id
+            end
+
             def eval_unsafe(str, filename = nil, timeoutv = nil)
               # Beware, timeout could be kept in the context
               # if perf cap is removed after having been activated
@@ -127,21 +149,29 @@ module Sqreen
                 super(str, filename)
               end
             end
-          end
-        end
-      end
-    end
 
+            private
+
+            def transf_global_funcs(code_id)
+              eval_unsafe <<EOD
+                if (typeof sqreen_data === 'undefined') {
+                  sqreen_data = {};
+                }
+
+                group = {};
+                Object.keys(this).forEach(name => {
+                  if (typeof this[name] === "function") {
+                    group[name] = this[name];
+                    this[name] = undefined;
+                  }
+                });
+                sqreen_data['#{code_id}'] = group
+                delete group;
+EOD
 
-    # Weak ref to a context
-    # enables us to skip a method missing call
-    class WeakCtx < WeakRef
-      def initialize(*args)
-        super(*args)
-      end
-
-      def eval_unsafe(str, filename, timeoutv)
-        __getobj__.eval_unsafe(str, filename, timeoutv)
+            end
+          end
+        end
       end
     end
   end

data/lib/sqreen/metrics/binning.rb

@@ -55,6 +55,7 @@ module Sqreen
       private
 
       def bin_no(x)
+        return 1 if x <= 0
         res = 2 + (@inv_log_base * Math.log(x) + @add_parcel).floor
         res < 1 ? 1 : res
       end

data/lib/sqreen/rules.rb

@@ -77,8 +77,8 @@ module Sqreen
       js = hash_rule[Attrs::CALLBACKS]
 
       if js && !Sqreen::Js::JsService.instance.online?
-        unless @@issue_nojs_warn
-          @@issue_nojs_warn = true
+        unless @issue_nojs_warn
+          @issue_nojs_warn = true
           Sqreen.log.warn('No JavaScript engine is available. ' \
               'JavaScript callbacks will be ignored')
         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.14.2'.freeze
+  VERSION = '1.15.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer