Merge pull request #2 from Recras/json-decode-error

Pull request from kriansa#20
Recras · Apr 9, 2021 · 3eeec7d · 3eeec7d
2 parents 91575ab + 0c64a6b
commit 3eeec7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/bin/converter.js b/bin/converter.js
@@ -49,7 +49,9 @@ try {
     }
 
     // Take all options in one JSON param
-    var options = JSON.parse(args[1]);
+    // Decode the provided base64 encoded string then parse it as JSON to use as our parameters.
+    var decoded_base64 = atob(args[1]),
+        options = JSON.parse(decoded_base64);
 
     page.customHeaders = options.request.headers;
     page.settings.dpi = 96;

diff --git a/src/H2P/Converter/ConverterAbstract.php b/src/H2P/Converter/ConverterAbstract.php
@@ -116,7 +116,7 @@ public function convert($origin, $destination)
     {
         if (!$origin instanceof Request) {
             if ($origin instanceof TempFile) {
-                $origin = 'file://' . $origin->getFileName();
+                $origin = 'file:///' . $origin->getFileName();
             }
 
             // Create a simple GET request URI

diff --git a/src/H2P/Converter/PhantomJS.php b/src/H2P/Converter/PhantomJS.php
@@ -279,7 +279,9 @@ protected function transform(Request $origin, $destination)
             'request' => $request,
         ) + $this->options;
 
-        $result = json_decode(trim(shell_exec($this->getBinPath() . ' ' . escapeshellarg(json_encode($args)))));
+        $result = json_decode(trim(shell_exec(
+            $this->getBinPath() . ' ' . escapeshellarg(base64_encode(json_encode($args))))
+        ));
 
         if (!$result->success) {
             throw new Exception('Error while executing PhantomJS: "' . $result->response . '"');