execjs-pcruntime 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a36bdd0ffeafecbae5dff76e27596b8c1d5087e3e9fd7e935dac8d41284f63
-  data.tar.gz: 5f0f2527ade99ae2d93fc997db5c345e3e0348fd6cfa1582369e03cb34481b10
+  metadata.gz: aec9e69936452420277727dacd0c7d27331b7766c8008c433cd840a8c6f38f45
+  data.tar.gz: 75271e7344781d9338c09263b1ac036355147cd228ae0b7581272cfb3dc53a1a
 SHA512:
-  metadata.gz: d7216ba79372073c2a3213b11173f86fe20cdbb2267ffd5b2c8747acf4f30fec08117ee6dea6e37fe4426e2149d9f9b2ca476efb2712531b22626210a36f0450
-  data.tar.gz: 7c9741fe563eb0eb6e4633bc9ddd9d8bfd37411f9dfd9ecc72753313b71ee2a13d6e66d8aaa7f975f121d9f415f38307a04f3a0a035ee72b407524ffc0be5941
+  metadata.gz: b8a8075e90042f2e6183dae5faf84e3c8749b0b8138e9f30fc3499287eef1cf2a3120f5bc7d5c9e3427ce9fe088ad0b28f38cfa3a4471df6b9c25cb4b3c38006
+  data.tar.gz: '088fe43e02e523346e26ad05cd8617aa3298e046b90760cdafcdb7d0f74fd9a4b3c0ab56e8489e65ac51493850611faf267bd1899a3486088153ddc9fd594ad0'

data/lib/execjs/pcruntime/context_process_runtime.rb

@@ -158,7 +158,10 @@ module ExecJS
           request['Connection'] = 'close'
           unless content_type.nil?
             request['Content-Type'] = content_type
-            request.body = body
+            # URI.encode_www_form_component replaces space(U+0020) into '+' (not '%20')
+            # but decodeURIComponent(in JavaScript) cannot decode '+' into space
+            # so, replace '+' into '%20'
+            request.body = URI.encode_www_form_component(body).gsub('+', '%20')
           end
 
           # Net::HTTPGenericRequest#exec
@@ -172,13 +175,13 @@ module ExecJS
           end while response.is_a?(Net::HTTPContinue)
           # rubocop:enable Lint/Loop
           response.reading_body(socket, request.response_body_permitted?) {}
+          result = URI.decode_www_form_component response.body
 
           if response.code == '200'
-            result = response.body
-            ::JSON.parse(response.body, create_additions: false) if /\S/.match?(result)
+            ::JSON.parse(result, create_additions: false) if /\S/.match?(result)
           else
             # expects ErrorMessage\0StackTrace =~ response.body
-            message, stack = response.body.split "\0"
+            message, stack = result.split "\0"
             error_class = /SyntaxError:/.match?(message) ? RuntimeError : ProgramError
             error = error_class.new(message)
             error.set_backtrace(stack)

data/lib/execjs/pcruntime/runner.js

@@ -14,16 +14,17 @@ const server = http.createServer(function (req, res) {
             req.on('data', (data) => allData += data);
             req.on('end', () => {
                 try {
-                    const result = vm.runInContext(allData, context, "(execjs)");
+                    // Percent-encoding HTTP requests and responses to avoid invalid UTF-8 sequences.
+                    const result = vm.runInContext(decodeURIComponent(allData), context, "(execjs)");
                     res.statusCode = 200;
                     res.setHeader('Content-Type', 'application/json');
-                    res.end(JSON.stringify(result), 'utf-8');
+                    res.end(encodeURIComponent(JSON.stringify(result) || null));
                 } catch (e) {
                     res.statusCode = 500;
                     res.setHeader('Content-Type', 'text/plain');
                     // to split by \0 on Ruby side
                     // see context_process_runtime.rb:179
-                    res.end(e.toString() + "\0" + (e.stack || ""));
+                    res.end(encodeURIComponent(e.toString() + "\0" + (e.stack || "")));
                 }
             });
             break;

data/lib/execjs/pcruntime/version.rb

@@ -2,6 +2,6 @@
 
 module Execjs
   module PCRuntime
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: execjs-pcruntime
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - White-Green