Fix issues with heavy socket payloads containing non-ASCII characters

src/ProcessSupervisor.php

@@ -306,9 +306,9 @@ protected function readNextProcessValue()
 
         try {
             $startTimestamp = microtime(true);
-            $this->client->selectRead($readTimeout);
 
             do {
+                $this->client->selectRead($readTimeout);
                 $packet = $this->client->read(static::SOCKET_PACKET_SIZE);
 
                 $chunksLeft = (int) substr($packet, 0, static::SOCKET_HEADER_SIZE);
@@ -332,6 +332,8 @@ protected function readNextProcessValue()
             throw $exception;
         }
 
+        $output = base64_decode($output);
+
         $this->log(LogLevel::DEBUG, ["PORT {$this->serverPort()}", "receiving"], $output);
 
         $data = json_decode($output, true);

src/node-process/Connection.js

@@ -103,21 +103,19 @@ class Connection extends EventEmitter
      */
     writeToSocket(str)
     {
-        const bodySize = Connection.SOCKET_PACKET_SIZE - Connection.SOCKET_HEADER_SIZE,
-            chunkCount = Math.ceil(str.length / bodySize);
+        const payload = Buffer.from(str).toString('base64');
 
-        const packets = [];
+        const bodySize = Connection.SOCKET_PACKET_SIZE - Connection.SOCKET_HEADER_SIZE,
+            chunkCount = Math.ceil(payload.length / bodySize);
 
         for (let i = 0 ; i < chunkCount ; i++) {
-            const chunk = str.substr(i * bodySize, bodySize);
+            const chunk = payload.substr(i * bodySize, bodySize);
 
             let chunksLeft = String(chunkCount - 1 - i);
             chunksLeft = chunksLeft.padStart(Connection.SOCKET_HEADER_SIZE - 1, '0');
 
-            packets.push(`${chunksLeft}:${chunk}`);
+            this.socket.write(`${chunksLeft}:${chunk}`);
         }
-
-        this.socket.write(packets.join(''));
     }
 
     /**

tests/Implementation/FsConnectionDelegate.js

@@ -33,6 +33,16 @@ class FsConnectionDelegate extends ConnectionDelegate
 
         fs.multipleResourcesIsFile = resources => resources.map(resource => resource.isFile());
 
+        fs.getHeavyPayloadWithNonAsciiChars = () => {
+            let payload = '';
+
+            for (let i = 0 ; i < 1024 ; i++) {
+                payload += 'a';
+            }
+
+            return `😘${payload}😘`;
+        };
+
         fs.wait = ms => new Promise(resolve => setTimeout(resolve, ms));
 
         fs.runCallback = cb => cb(fs);

tests/ImplementationTest.php

@@ -151,6 +151,15 @@ public function can_create_and_pass_js_functions()
         $this->assertEquals('Callback using scope and arguments: Hello world!', $value);
     }
 
+    /** @test */
+    public function can_receive_heavy_payloads_with_non_ascii_chars()
+    {
+        $payload = $this->fs->getHeavyPayloadWithNonAsciiChars();
+
+        $this->assertStringStartsWith('😘', $payload);
+        $this->assertStringEndsWith('😘', $payload);
+    }
+
     /**
      * @test
      * @expectedException \ExtractrIo\Rialto\Exceptions\Node\FatalException