isomorfeus-speednode 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6853c585356e8829a315a146dbf12f7625f90eb2d23683147279c5eab581fe4f
-  data.tar.gz: 7fd22dc8309c7d25685cc921853ac52f9ed342dac22ab71883226c2525ca48a0
+  metadata.gz: 7b3ece9e49e7a5105aef77b28b04445e4d39e2f22d061bfd1f03e43a79e403eb
+  data.tar.gz: e3d57e156c9d1efa686a18ae784125cc8c9d553e9946cabfd0c1325f20a959f0
 SHA512:
-  metadata.gz: 67668d00cf0294ed3df27c4992e95f671799cfea181cb01b33ed4c789870a7e3ab1f953c0d09e0010a8e119e6f5101aa6a31716f54d1498ca1ea5e83bfebc486
-  data.tar.gz: 2ea56bc9974145a6c1bab593c15001e9f7e56edb432ee38a656c2f88087ebb6935ed0f5653f4841bd362d0a70a601e01a55dcedcd9986bf5c5bae6de8257429e
+  metadata.gz: 67a6b031a66b5b29a9db16924087dc013a4c0ce360edbc8c4db3c076766c6c31d00783472a7b6f4d6bde526c61602ff1a78cc4e343c142016ef183005dcb339c
+  data.tar.gz: c4600a01abe22631455c4dce5209f656409a7931b5295116a551420c03c78906b3d6733afac90ebc87ce3835c9af2228b35c1e3bdb86296dc5aac2ce93b4ecdd

data/lib/isomorfeus/speednode/runner.js

@@ -132,6 +132,13 @@ CircularJSON.stringify = function stringify(value, replacer, space, doNotResolve
   };
 /*** end of circular-json ***/
 
+// serialize Map as Object, also below in attach
+function simple_map_replacer(key, value) {
+  if (value && typeof value === 'object' && value.constructor.name === "Map")
+    return Object.fromEntries(value);
+  return value;
+}
+
 function attachFunctionSource(responder_path, context, func) {
   return `${func} = async function(...method_args) {
     let context = '${context}';
@@ -158,8 +165,13 @@ function attachFunctionSource(responder_path, context, func) {
         }, 10)
       });
     }
+    function simple_map_replacer(key, value) {
+      if (value && typeof value === 'object' && value.constructor.name === "Map")
+        return Object.fromEntries(value);
+      return value;
+    }
     return new Promise(function(resolve, reject) {
-      let request_json = JSON.stringify(request);
+      let request_json = JSON.stringify(request, simple_map_replacer);
       let buffer = Buffer.alloc(0);
       let socket = net.connect(responder_path);
       socket.setTimeout(2000);
@@ -228,18 +240,15 @@ function getContext(uuid) {
 
 function getContextOptions(uuid) {
   let options = { filename: "(execjs)", displayErrors: true };
-  if (contexts[uuid].options.timeout) {
+  if (contexts[uuid].options.timeout)
     options.timeout = contexts[uuid].options.timeout;
-  }
   return options;
 }
 
 function massageStackTrace(stack) {
-  if (stack && stack.indexOf("SyntaxError") == 0) {
+  if (stack && stack.indexOf("SyntaxError") == 0)
       return "(execjs):1\n" + stack;
-  } else {
-      return stack;
-  }
+  return stack;
 }
 
 let socket_path = process.env.SOCKET_PATH;
@@ -384,9 +393,9 @@ let server = net.createServer(function(s) {
           return;
         }
 
-        try { outputJSON = JSON.stringify(result); }
+        try { outputJSON = JSON.stringify(result, simple_map_replacer); }
         catch(err) {
-            if (err.message.includes('circular')) { outputJSON = CircularJSON.stringify(result); }
+            if (err.message.includes('circular')) { outputJSON = CircularJSON.stringify(result, simple_map_replacer); }
             else { outputJSON = JSON.stringify([['', err].join(''), err.stack]); }
             s.write([outputJSON, "\x04"].join(''));
             if (process_exit !== false) { process.exit(process_exit); }

data/lib/isomorfeus/speednode/runtime/context.rb

@@ -165,7 +165,7 @@ module Isomorfeus
         end
 
         def await_result
-          start_time = Time.now
+          start_time = ::Time.now
           while eval_script(key: :_internal_exec_fin) && !timed_out?(start_time)
             sleep 0.005
           end
@@ -193,7 +193,7 @@ module Isomorfeus
         end
 
         def timed_out?(start_time)
-          if (Time.now - start_time) > @timeout
+          if (::Time.now - start_time) > @timeout
             raise "IsomorfeusSpeednode: Command Execution timed out!"
           end
           false

data/lib/isomorfeus/speednode/runtime/vm.rb

@@ -5,7 +5,7 @@ if Gem.win_platform?
   module Win32
     class Pipe
       def write(data)
-        bytes = FFI::MemoryPointer.new(:ulong)
+        bytes = ::FFI::MemoryPointer.new(:ulong)
 
         raise Error, "no pipe created" unless @pipe
 
@@ -44,7 +44,7 @@ module Isomorfeus
         attr_reader :responder
 
         def initialize(options)
-          @mutex = Thread::Mutex.new
+          @mutex = ::Thread::Mutex.new
           @socket_path = nil
           @options = options
           @started = false

data/lib/isomorfeus/speednode/runtime/vm_command.rb

@@ -15,7 +15,7 @@ module Isomorfeus
           bytes_to_send = message.bytesize
           sent_bytes = 0
 
-          if ExecJS.windows?
+          if ::ExecJS.windows?
             @socket.write(message)
             begin
               result << @socket.read

data/lib/isomorfeus/speednode/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Speednode
-    VERSION = '0.6.2'
+    VERSION = '0.6.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-speednode
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs