Support popen() in "w" mode

Author: adamziel

packages/php-wasm/compile/Dockerfile

@@ -601,6 +601,7 @@ RUN echo -n ' -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 ' >> /root/.emcc-php-w
 "invoke_viiiiiii",\n\
 "invoke_viiiiiiiii",\n\
 "js_open_process",\n\
+"js_popen_to_file",\n\
 "wasm_poll_socket",\n\
 "wasm_shutdown"]'; \
     echo -n " -s ASYNCIFY_IMPORTS=$ASYNCIFY_IMPORTS " | tr -d "\n" >> /root/.emcc-php-wasm-flags; \
@@ -697,6 +698,7 @@ RUN echo -n ' -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 ' >> /root/.emcc-php-w
 "ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMPVAR_CONST_HANDLER",\
 "ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMPVAR_HANDLER",\
 "cli",\
+"wasm_php_exec",\
 "wasm_sapi_handle_request",\
 "_call_user_function_ex",\
 "_call_user_function_impl",\
@@ -782,6 +784,7 @@ RUN echo -n ' -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 ' >> /root/.emcc-php-w
 "php_cli_server_do_event_for_each_fd_callback",\
 "php_cli_server_poller_poll",\
 "php_cli_server_recv_event_read_request",\
+"php_exec",\
 "php_execute_script",\
 "php_fsockopen_stream",\
 "php_getimagesize_from_any",\
@@ -904,6 +907,14 @@ RUN echo -n ' -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 ' >> /root/.emcc-php-w
 "zif_mysqli_stmt_execute",\
 "zif_mysqli_stmt_fetch",\
 "zif_preg_replace_callback",\
+"zif_popen",\
+"php_exec_ex",\
+"wasm_popen",\
+"zif_wasm_popen",\
+"zif_system",\
+"zif_exec",\
+"zif_passthru",\
+"zif_shell_exec",\
 "zif_proc_open",\
 "zif_stream_socket_client",\
 "zim_PDOStatement_execute",\
@@ -953,7 +964,7 @@ RUN source /root/emsdk/emsdk_env.sh && \
 "_wasm_set_request_port", \n\
 "_wasm_set_request_uri", \n\
 "_wasm_set_skip_shebang" '"$(cat /root/.EXPORTED_FUNCTIONS)"']'; \
-    emcc -O3 \
+    emcc -O3 -g2 \
     --js-library /root/phpwasm-emscripten-library.js \
     -I .  \
     -I ext   \

packages/php-wasm/compile/build-assets/phpwasm-emscripten-library.js

@@ -312,14 +312,11 @@ const LibraryExample = {
 				}
 			}
 		}
-		console.log("ABC");
 		PHPWASM.proc_fds[stdoutParentFd] = new EventEmitter();
 		PHPWASM.proc_fds[stderrParentFd] = new EventEmitter();
 
-		console.log("DEF");
 		const stdoutStream = SYSCALLS.getStreamFromFD(stdoutChildFd);
 		cp.on("exit", function (data) {
-			console.log("exit yay");
 			PHPWASM.proc_fds[stdoutParentFd].exited = true;
 			PHPWASM.proc_fds[stdoutParentFd].emit("data");
 			PHPWASM.proc_fds[stderrParentFd].exited = true;
@@ -344,6 +341,7 @@ const LibraryExample = {
 
 		// Pass data from stdin fd to child process's stdin.
 		if (PHPWASM.callback_pipes && procopenCallId in PHPWASM.callback_pipes) {
+
 			// It is a "pipe". By now it is listed in `callback_pipes`.
 			// Let's listen to anything it outputs and pass it to the child process.
 			PHPWASM.callback_pipes[procopenCallId].onData(function(data) {
@@ -366,7 +364,6 @@ const LibraryExample = {
         const buffer = Buffer.alloc(CHUNK_SIZE);
         let offset = 0;
 
-		console.log("Before")
         while (true) {
             const bytesRead = stdinStream.stream_ops.read(stdinStream, buffer, offset, CHUNK_SIZE, null);
             if (bytesRead === null) {
@@ -378,7 +375,6 @@ const LibraryExample = {
             }
             offset += bytesRead;
         }
-		console.log("after")
 
 		return 0;
 	},
@@ -600,18 +596,26 @@ const LibraryExample = {
 			}
 			throw e;
 		}
-
-		const outBuffer = [];
+		
+		const outByteArrays = [];
 		cp.stdout.on("data", function (data) {
-			outBuffer.push(data);
+			outByteArrays.push(data);
 		});
 		return Asyncify.handleSleep((wakeUp) => {
 			const outputPath = "/tmp/popen_output";
 			cp.on("exit", function (exitCode) {
-				FS.writeFile(
-					outputPath,
-					outBuffer.join("\n")
+				// Concat outByteArrays, an array of UInt8Arrays
+				// into a single Uint8Array.
+				const outBytes = new Uint8Array(
+					outByteArrays.reduce((acc, curr) => acc + curr.length, 0)
 				);
+				let offset = 0;
+				for (const byteArray of outByteArrays) {
+					outBytes.set(byteArray, offset);
+					offset += byteArray.length;
+				}
+
+				FS.writeFile(outputPath, outBytes);
 
 				HEAPU8[exitCodePtr] = exitCode;
 				wakeUp(allocateUTF8OnStack(outputPath)); // 2 is SIGINT