isomorfeus-puppetmaster 0.6.15 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269dd1f6465a3861c8590f471d3db376b11a0570fa4bf97bd44b9dfb5d9c1e42
-  data.tar.gz: 0315a46480c8e60a185b5ad3e8fd5649eecb937cb9c606ac6e3ab2e70e57a454
+  metadata.gz: d7d963bc338bbbb2ecf4a64a2a7352a7a42280438f177a8b6462dbe2189e8245
+  data.tar.gz: d282a11b84d54e9e30a2928785c7ca8704343cc21dfaa16bc464d9da149bae56
 SHA512:
-  metadata.gz: d52eb1625c95027d9ef3d7b3f57c7742d07307bf650f7b7545ef222bb6b4135500229670bf95dfc5e2081a41f623536d005cf5fcf392c887c03e7b4c7c75c263
-  data.tar.gz: c1af261f57a1f1ad3cce47a7cb2b10ad8c3b539300d98e925918db666231de4f72d8c5b606de64089af02cf79f3296596efbcce60a909702dc2a63808a77e8b1
+  metadata.gz: 5588e6d58f1459a07aa433d097ec36d4c34467a9f414a94d08662ebbc787d9bd579b624dcbf1e1bd88b6839468e1ecedb21e95d770c7e87db979265446b0d4c8
+  data.tar.gz: 85266b7bd52a7e064ae15c456dbd31d4ba488df2cddcc9ac9e25d6093ac0858f5d44acb1781a592e51a6eaa4affd1aa0b6bccb7d20d2599dae45f028f17d360f

data/lib/isomorfeus/puppeteer/execution_context.rb

@@ -48,7 +48,7 @@ class Puppeteer::ExecutionContext
 
   def await_ruby(ruby_source = '', &block)
     ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-    ruby_source = "#{ruby_source}.then { |result| $promise_result = result; $promise_resolved = true }.fail { |result| $promise_result = result; $promise_resolved = true }"
+    ruby_source = "#{ruby_source}.always { |result| $promise_result = result; $promise_resolved = true }"
     compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
     evaluate <<~JAVASCRIPT
       function(){

data/lib/isomorfeus/puppetmaster/server/executor_middleware.rb

@@ -18,7 +18,6 @@ module Isomorfeus
             unless request.body.nil?
               request_hash = Oj.load(request.body.read, mode: :strict)
               if request_hash['key'] != @@request_key
-                STDERR.puts "wrong key"
                 response = Rack::Response.new(Oj.dump({ 'error' => 'wrong key given, execution denied' }),
                                              401,
                                              'Content-Type' => 'application/json')
@@ -29,7 +28,8 @@ module Isomorfeus
                     Isomorfeus.store.clear! if Isomorfeus.store.respond_to?(:clear!)
                   end
                   result = TOPLEVEL_BINDING.eval(request_hash['code']) if request_hash['code']
-                  response = Rack::Response.new(Oj.dump({ 'result' => result }),
+                  result = result.value if result.is_a?(Promise)
+                  response = Rack::Response.new(Oj.dump({ 'result' => result }, circular: true),
                                                 200,
                                                 'Content-Type' => 'application/json')
                 rescue Exception => e

data/lib/isomorfeus/puppetmaster/server.rb

@@ -85,7 +85,7 @@ module Isomorfeus
                      http.post('/__executor__', Oj.dump(request_hash, mode: :strict))
                    end
         if response.code == '200'
-          result_hash = Oj.load(response.body)
+          result_hash = Oj.load(response.body, circular: true)
           if result_hash.key?('error')
             error = RuntimeError.new(result_hash['error'])
             error.set_backtrace(result_hash['backtrace'])

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.6.15'
+  PUPPETMASTER_VERSION = '0.6.18'
 end

data/lib/isomorfeus-puppetmaster.rb

@@ -5,6 +5,9 @@ require 'uri'
 require 'net/http'
 require 'rack'
 require 'opal'
+opal_path = Gem::Specification.find_by_name('opal').full_gem_path
+promise_path = File.join(opal_path, 'stdlib', 'promise.rb')
+require promise_path
 require 'parser'
 
 # isomorfeus needs kwargs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.18
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.0
+        version: 0.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.0
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement