isomorfeus-puppetmaster 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b69bddef25d838e7929df96b7e2c7d0cf81393246f13e41f27e6ba339cbc7e8
-  data.tar.gz: d98c51dcce087917b021dbb84f6bf95498708a2926ef8ef577d7bce936d72192
+  metadata.gz: 2d57bb719de397a00cdf97fd40b88a90262f5894016079e45157ac8b2fbf79fe
+  data.tar.gz: 5c6b027e3e8667e812204df269e5bb0093667ecb781fd72999d5cbea4282e042
 SHA512:
-  metadata.gz: 190f54b29db015148c94435701716dd4dacfe2b500a0a6eea8534cb2dfb607d46ae98e9ed3868a4434e404c1c5d1be32f38a002c54be910f373b30b7a374c111
-  data.tar.gz: 6bee0a70d9998e700c2ab6bbcc8462efe8c4e45832b1caff6400917b15279daad7f2d01eb6cf057dfa3e5df4bae08000279f172c6a9a7a6c3e3b5e01f7b27dec
+  metadata.gz: 9d960a9ebd52461e3ca8366c7c773d060149b7ed70f0ef4fb628315f11a1a15aafec998bd79188241e418db82761e14f3390cba7f12f3a179341e3f8e3974ed8
+  data.tar.gz: aad6972e400c9daac1b07e8eca5424fbcc3abb7ff2dcb31b95211be8f34139710c5096bf44ac440a2fd1d5b68d59156c869d9b73c3fd1db58ce8bd782e0fb1bf

data/lib/isomorfeus/puppeteer/execution_context.rb

@@ -82,7 +82,7 @@ class Puppeteer::ExecutionContext
 
   def await_ruby(ruby_source = '', file = nil, line = nil, &block)
     ruby_source, file = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-    ruby_source = "#{ruby_source}.always { |result| $promise_result = result; $promise_resolved = true }"
+    ruby_source = "#{ruby_source}.then { |result| $promise_result = result; $promise_resolved = true }.fail { |e| $await_ruby_exception = e; $promise_resolved = true }"
     compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source, file)
     evaluate <<~JAVASCRIPT
       function(){
@@ -91,13 +91,22 @@ class Puppeteer::ExecutionContext
             Opal.gvars.promise_resolved = false;
             Opal.await_ruby_exception = null;
             try {
-              return #{compiled_ruby}
+              #{compiled_ruby}
             } catch (e) {
               Opal.await_ruby_exception = e;
               Opal.gvars.promise_resolved = true;
             }
           } else {
-            setTimeout(fun, 100);
+            if (typeof Opal.gvars.do_not_have_opal !== 'undefined' && Opal.gvars.do_not_have_opal >= 0) { Opal.gvars.do_not_have_opal++; }
+            else { Opal.gvars.do_not_have_opal = 1; }
+            if (Opal.gvars.do_not_have_opal < 50) {
+              Opal.gvars.do_not_have_opal = 0;
+              setTimeout(fun, 100);
+            } else {
+              Opal.await_ruby_exception = new Error('Opal is not available!');
+              Opal.gvars.promise_resolved = true;
+              Opal.gvars.do_not_have_opal = 0;
+            }
           }
         }
         fun();
@@ -107,7 +116,7 @@ class Puppeteer::ExecutionContext
     start = Time.now
     until have_result do
       raise "await_ruby: execution timed out! Is Opal available?" if (Time.now - start) > 30
-      have_result = evaluate 'function() { return Opal ? Opal.gvars.promise_resolved : null; }'
+      have_result = evaluate 'function() { return (Opal ? Opal.gvars.promise_resolved : null); }'
       sleep 0.1 unless have_result
     end
     res, exception = evaluate <<~JAVASCRIPT
@@ -120,11 +129,9 @@ class Puppeteer::ExecutionContext
         } else if (Opal.gvars.promise_result['$respond_to?']('is_a?') && Opal.gvars.promise_result['$is_a?'](Opal.Exception)) {
           let r = Opal.gvars.promise_result;
           exception = { message: r.$message(), name: r.$class().$name(), stack: r.$backtrace() }
-        } else if (Opal.gvars.promise_result['$respond_to?']('to_n')) {
-          res = Opal.gvars.promise_result.$to_n()
         } else { res = Opal.gvars.promise_result };
-        delete Opal.gvars.promise_result;
-        delete Opal.gvars.promise_resolved;
+        Opal.gvars.promise_result = null;
+        Opal.gvars.promise_resolved = null;
         if (res && res.$to_n) res = res.$to_n();
         let conv = function(o) {
           if (o === Opal.nil) o = null;

data/lib/isomorfeus/puppetmaster/dsl.rb

@@ -1,9 +1,9 @@
 module Isomorfeus
   module Puppetmaster
     module DSL
-      def self.set_launch_options(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: false, dumpio: nil,
+      def self.set_launch_options(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
                              env: nil, executable_path: nil, handle_SIGINT: nil, handle_SIGTERM: nil, handle_SIGHUP: nil,
-                             headless: true, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
+                             headless: nil, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
                              product: :chrome, slow_mo: nil, timeout: nil, user_data_dir: nil)
         Isomorfeus::Puppetmaster.launch_options = {
           app: app,
@@ -36,9 +36,8 @@ module Isomorfeus
         session.default_page
       end
 
-      def visit(uri, referer: nil, timeout: nil, wait_until: 'networkidle0', headless: true, devtools: false)
+      def visit(uri, referer: nil, timeout: nil, wait_until: 'networkidle0', headless: nil, devtools: nil)
         session(headless: headless, devtools: devtools).visit(uri, referer: referer, timeout: timeout, wait_until: wait_until, headless: headless, devtools: devtools)
-        session.default_page
       end
       alias_method :goto, :visit
 
@@ -82,6 +81,8 @@ module Isomorfeus
           timeout = timeout || opts[:timeout]
           user_data_dir = user_data_dir || opts[:user_data_dir]
         end
+        headless = true if headless.nil?
+        devtools = false if devtools.nil?
         Isomorfeus::Puppetmaster::Session.new(app: (app ? app : Isomorfeus::Puppetmaster.served_app),
                                               args: args, channel: channel&.to_s, devtools: devtools, default_viewport: default_viewport,
                                               dumpio: dumpio, env: env, executable_path: executable_path, handle_SIGINT: handle_SIGINT,
@@ -112,7 +113,7 @@ module Isomorfeus
         Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, file, line)
       end
 
-      def session(headless: true, devtools: false)
+      def session(headless: nil, devtools: nil)
         @@puppetmaster_session ||= new_session(app: Isomorfeus::Puppetmaster.served_app, headless: headless, devtools: devtools)
       end
     end

data/lib/isomorfeus/puppetmaster/session.rb

@@ -6,16 +6,18 @@ module Isomorfeus
       attr_accessor :app, :browser, :default_page, :product, :response
       attr_reader :headless, :devtools
 
-      def initialize(app:, args: nil, channel: nil, default_viewport: nil, devtools: false, dumpio: nil,
+      def initialize(app:, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
                      env: nil, executable_path: nil, handle_SIGINT: nil, handle_SIGTERM: nil, handle_SIGHUP: nil,
-                     headless: true, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
+                     headless: nil, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
                      product: :chrome, slow_mo: nil, timeout: nil, user_data_dir: nil)
         @parameters = binding.local_variables.map { |v| [v, binding.local_variable_get(v)] }.to_h
         @parameters[:channel] = @parameters[:channel].to_s if channel
         @parameters[:timeout] = TIMEOUT unless timeout
         @app = @parameters.delete(:app)
         @headless = headless
+        @headless = true if @headless.nil?
         @devtools = devtools
+        @devtools = false if @devtools.nil?
         @channel = channel.to_s
         default_viewport
         product = product.to_s
@@ -41,7 +43,9 @@ module Isomorfeus
         @browser.pages
       end
 
-      def visit(uri, referer: nil, timeout: nil, wait_until: 'networkidle0', headless: true, devtools: false)
+      def visit(uri, referer: nil, timeout: nil, wait_until: 'networkidle0', headless: nil, devtools: nil)
+        headless = @headless if headless.nil?
+        devtools = @devtools if devtools.nil?
         if @headless != headless || @devtools != devtools
           @browser.close
           @headless = headless

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.9.2'
+  PUPPETMASTER_VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport