sqreen 1.18.2-java → 1.18.3-java

data/lib/sqreen/frameworks/rails.rb

@@ -5,6 +5,8 @@
 
 require 'sqreen/frameworks/generic'
 require 'sqreen/middleware'
+require 'sqreen/error_handling_middleware'
+require 'sqreen/rails_middleware'
 
 module Sqreen
   module Frameworks

data/lib/sqreen/frameworks/request_recorder.rb

@@ -1,6 +1,9 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+# TODO: Sqreen::Framework::RequestRecorder misnamed/misplaced?
+# TODO: deps?
+
 require 'set'
 require 'sqreen/shared_storage'
 require 'sqreen/events/request_record'

data/lib/sqreen/frameworks/sinatra.rb

@@ -3,6 +3,8 @@
 
 require 'sqreen/frameworks/generic'
 require 'sqreen/middleware'
+require 'sqreen/error_handling_middleware'
+require 'sqreen/sinatra_middleware'
 
 module Sqreen
   module Frameworks

data/lib/sqreen/frameworks/sqreen_test.rb

@@ -1,6 +1,8 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+# TODO: drop
+
 require 'sqreen/frameworks/generic'
 
 module Sqreen

data/lib/sqreen/instrumentation.rb

@@ -1,17 +1,17 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
-require 'sqreen/callback_tree'
+require 'sqreen/cb_tree'
 require 'sqreen/log'
 require 'sqreen/exception'
 require 'sqreen/performance_notifications'
 require 'sqreen/call_countable'
 require 'sqreen/events/remote_exception'
-require 'sqreen/rules_signature'
+require 'sqreen/sqreen_signed_verifier'
 require 'sqreen/shared_storage'
-require 'sqreen/rules_callbacks/record_request_context'
-require 'sqreen/rules_callbacks/run_req_start_actions'
-require 'sqreen/rules_callbacks/run_user_actions'
+require 'sqreen/rules/record_request_context'
+require 'sqreen/rules/run_req_start_actions'
+require 'sqreen/rules/run_user_actions'
 require 'sqreen/mono_time'
 require 'set'
 

data/lib/sqreen/invalid_signature_exception.rb

@@ -0,0 +1,8 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'sqreen/exception'
+
+module Sqreen
+  class InvalidSignatureException < Sqreen::Exception; end
+end

data/lib/{sqreen-alt.rb → sqreen/js.rb}

@@ -1,4 +1,9 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
-require "sqreen"
+# TODO: case JS/Js?
+
+module Sqreen
+  module Js
+  end
+end

data/lib/sqreen/js/call_context.rb

@@ -0,0 +1,10 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+# TODO: useless?
+
+module Sqreen
+  module Js
+    CallContext = Struct.new(:inst, :args, :rv)
+  end
+end

data/lib/sqreen/js/context_pool.rb

@@ -0,0 +1,60 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+# TODO: => Sqreen::JS:MiniRacer ?
+
+module Sqreen
+  module Js
+    class ContextPool
+      def initialize
+        @mutex = Mutex.new
+        @total_ctxs = 0
+        @contexts = []
+      end
+
+      def with_context(&block)
+        isolate = context
+        begin
+          block[isolate]
+        ensure
+          give_back_context isolate
+        end
+      end
+
+      private
+
+      def 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(context)
+        context.possibly_gc
+
+        if context.gc_load > 30
+          if context.gc_threshold_in_bytes == DEFAULT_GC_THRESHOLD
+            context.gc_threshold_in_bytes *= 2
+            Sqreen.log.warn("Context #{context} had too many close garbage " \
+                            'collections; doubling the threshold to ' \
+                            "#{context.gc_threshold_in_bytes} bytes")
+            context.gc_load = 0
+          else
+            Sqreen.log.warn("Context #{context} had too many close garbage " \
+                            'collections; discarding it')
+            context.dispose
+            return
+          end
+        end
+
+        @mutex.synchronize { @contexts.push(context); }
+      end
+    end
+  end
+end

data/lib/sqreen/js/exec_js_runnable.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+# TODO: => Sqreen::JS:ExecJS
+
+require 'sqreen/js/executable_js'
+
+module Sqreen
+  module Js
+    class ExecJsRunnable < ExecutableJs
+      def initialize(compiled)
+        @compiled = compiled
+      end
+
+      def run_js_cb(cbname, _budget, arguments)
+        @compiled.call(cbname, *arguments)
+      end
+    end
+  end
+end

data/lib/sqreen/js/execjs_adapter.rb

@@ -1,8 +1,14 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+# TODO: => Sqreen::JS:ExecJS
+
 require 'execjs'
 require 'weakref'
+require 'sqreen/js/executable_js'
+require 'sqreen/js/js_service_adapter'
+require 'sqreen/js/exec_js_runnable'
+require 'sqreen/js/thread_local_exec_js_runnable'
 
 module Sqreen
   module Js
@@ -25,52 +31,5 @@ module Sqreen
         ExecJS.runtime.name != 'therubyrhino (Rhino)'
       end
     end
-
-    class ExecJsRunnable < ExecutableJs
-      def initialize(compiled)
-        @compiled = compiled
-      end
-
-      def run_js_cb(cbname, _budget, arguments)
-        @compiled.call(cbname, *arguments)
-      end
-    end
-
-    class ThreadLocalExecJsRunnable < ExecutableJs
-      def initialize(code)
-        @code = code
-        @tl_key = "SQREEN_EXECJS_CONTEXT_#{object_id}".freeze
-        @runtimes = [] # place where to keep strong references
-        @runtimes_mutex = Mutex.new
-      end
-
-      def run_js_cb(cbname, _budget, arguments)
-        tl_exec_js_runnable.call(cbname, *arguments)
-      end
-
-      def with_runtimes_mutex
-        @runtimes_mutex.synchronize { yield }
-      end
-
-      private
-
-      def dispose_from_dead_threads
-        with_runtimes_mutex do
-          @runtimes.delete_if { |th, _runtime| !th.alive? }
-        end
-      end
-
-      def tl_exec_js_runnable
-        runnable = Thread.current[@tl_key]
-        return runnable if runnable && runnable.weakref_alive?
-
-        dispose_from_dead_threads
-        runtime = ExecJS.compile(@code)
-        with_runtimes_mutex do
-          @runtimes << [Thread.current, runtime]
-        end
-        Thread.current[@tl_key] = WeakRef.new(runtime)
-      end
-    end
   end
 end

data/lib/sqreen/js/executable_js.rb

@@ -0,0 +1,12 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+module Sqreen
+  module Js
+    class ExecutableJs
+      def run_js_cb(_cb_name, _budget, _arguments)
+        raise Sqreen::NotImplementedYet
+      end
+    end
+  end
+end

data/lib/sqreen/js/js_service.rb

@@ -1,12 +1,12 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+require 'sqreen/log'
 require 'sqreen/exception'
+require 'singleton'
 
 module Sqreen
   module Js
-    # start public interface
-
     class JsService
       include ::Singleton
 
@@ -66,25 +66,5 @@ module Sqreen
         false
       end
     end
-
-    CallContext = Struct.new(:inst, :args, :rv)
-
-    class ExecutableJs
-      def run_js_cb(_cb_name, _budget, _arguments)
-        raise Sqreen::NotImplementedYet
-      end
-    end
-
-    # end public interface
-
-    class JsServiceAdapter
-      def preprocess(rule_name, code)
-        raise Sqreen::NotImplementedYet
-      end
-
-      def variant_name
-        'unspecified'
-      end
-    end
   end
 end

data/lib/sqreen/js/js_service_adapter.rb

@@ -0,0 +1,18 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'sqreen/exception'
+
+module Sqreen
+  module Js
+    class JsServiceAdapter
+      def preprocess(_rule_name, _code)
+        raise Sqreen::NotImplementedYet
+      end
+
+      def variant_name
+        'unspecified'
+      end
+    end
+  end
+end

data/lib/sqreen/js/mini_racer_adapter.rb

@@ -1,14 +1,19 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+# TODO: => Sqreen::JS:MiniRacer
+
 require 'digest'
 require 'json'
+require 'sqreen/js/executable_js'
+require 'sqreen/js/js_service_adapter'
+require 'sqreen/js/context_pool'
+require 'sqreen/js/mini_racer_executable_js'
 
 module Sqreen
   module Js
     DEFAULT_GC_THRESHOLD = 15000000  # 15 MB
 
-
     class MiniRacerAdapter < JsServiceAdapter
       def initialize(vendored = false)
         @vendored = vendored
@@ -30,184 +35,5 @@ module Sqreen
         @done_static_init = true
       end
     end
-
-    # 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(context)
-        context.possibly_gc
-
-        if context.gc_load > 30
-          if context.gc_threshold_in_bytes == DEFAULT_GC_THRESHOLD
-            context.gc_threshold_in_bytes *= 2
-            Sqreen.log.warn("Context #{context} had too many close garbage " \
-                            'collections; doubling the threshold to ' \
-                            "#{context.gc_threshold_in_bytes} bytes")
-            context.gc_load = 0
-          else
-            Sqreen.log.warn("Context #{context} had too many close garbage " \
-                            'collections; discarding it')
-            context.dispose
-            return
-          end
-        end
-
-        @mutex.synchronize { @contexts.push(context); }
-      end
-    end
-
-    class MiniRacerExecutableJs < ExecutableJs
-      @@ctx_defined = false
-
-      def initialize(pool, code, vendored)
-        @pool = pool
-        @code = code
-        @code_id = self.class.code_id(code)
-
-        @module = vendored ? Sqreen::MiniRacer : MiniRacer
-
-        mod = vendored ? Sqreen::MiniRacer : MiniRacer
-        unless @@ctx_defined
-          self.class.define_sqreen_context(mod)
-          @@ctx_defined = true
-        end
-      end
-
-      def run_js_cb(cb_name, budget, arguments)
-        @pool.with_context do |ctx|
-          if ctx.code_failed?(@code_id)
-            Sqreen.log.debug do
-              "Skipping execution of callback #{cb_name} (code md5 #{@code_id})" \
-              " due to prev failure of definition evaluation"
-            end
-            return nil
-          end
-
-          ctx.add_code(@code_id, @code) unless ctx.has_code?(@code_id)
-
-          # mini_racer expects timeout to be in ms
-          ctx.timeout = budget ? budget * 1000.0 : nil
-          begin
-            ctx.call("sqreen_#{@code_id}_#{cb_name}", *arguments)
-          rescue @module::ScriptTerminatedError
-            Sqreen.log.debug "ScriptTerminatedError/#{cb_name}"
-            nil
-          end
-        end
-      end
-
-      def self.code_id(code)
-        Digest::MD5.hexdigest(code)
-      end
-
-      private
-
-      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
-            attr_accessor :gc_threshold_in_bytes
-            attr_accessor :gc_load
-            attr_writer   :timeout
-
-            def has_code?(code_id)
-              return false unless @code_ids
-              @code_ids.include?(code_id)
-            end
-
-            def code_failed?(code_id)
-              return false unless @failed_code_ids
-              @failed_code_ids.include?(code_id)
-            end
-
-            def add_code(code_id, code)
-              # It's important that the definition is run in its own scope (by executing it inside an anonymous function)
-              # Otherwise some auxiliary functions that the backend server sends will collide the name
-              # Because they're defined with `var`, running the definitions inside a function is enough
-              eval_unsafe "(function() { #{code} })()"
-              transf_global_funcs code_id
-              @code_ids ||= Set.new
-              @code_ids << code_id
-            rescue
-              @failed_code_ids ||= Set.new
-              @failed_code_ids << code_id
-              raise
-            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
-              # As it's unused by execjscb we are not cleaning it
-              return super(str, filename) if timeoutv.nil?
-              return if timeoutv <= 0.0
-              timeoutv *= 1000 # Timeout are currently expressed in seconds
-              @timeout = timeoutv
-              @eval_thread = Thread.current
-              timeout do
-                super(str, filename)
-              end
-            end
-
-            def possibly_gc
-              @gc_threshold_in_bytes ||= DEFAULT_GC_THRESHOLD
-              @gc_load ||= 0
-
-              # garbage collections max 1 in every 4 calls (avg)
-              if heap_stats[:total_heap_size] > @gc_threshold_in_bytes
-                low_memory_notification
-                @gc_load += 4
-              else
-                @gc_load = [0, @gc_load - 1].max
-              end
-            end
-
-            private
-
-            def transf_global_funcs(code_id)
-              # Multiple callbacks may share the same name. In order to avoid collisions, we rename them here.
-              eval_unsafe <<EOD
-                Object.keys(this).forEach(name => {
-                  if (typeof this[name] === "function" && !name.startsWith("sqreen_")) {
-                    this['sqreen_#{code_id}_' + name] = this[name];
-                    this[name] = undefined;
-                  }
-                });
-EOD
-
-            end
-          end
-        end
-      end
-    end
   end
 end