introduce exit code propagation

Author: Lukas Wingerberg

client/ffmpeg.proto

@@ -13,5 +13,5 @@ message CommandRequest {
 message CommandResponse {
   string output = 1;
   int32 exit_code = 2;
-  string stream = 3; // Added field to indicate stream type
+  string stream = 3; // "stdout", "stderr", or "exit_code"
 }

client/grpc-ffmpeg.py

@@ -29,18 +29,20 @@ async def run_command(command, use_ssl):
     else:
         channel = grpc.aio.insecure_channel(target)
 
+    exit_code = 0  # Default exit code
+
     async with channel:
         stub = ffmpeg_pb2_grpc.FFmpegServiceStub(channel)
         request = ffmpeg_pb2.CommandRequest(command=command)
         async for response in stub.ExecuteCommand(request):
-            if response.output:
-                if response.stream:
-                    if response.stream == "STDOUT":
-                        sys.stdout.write(f"{response.output}\n")  # Write to stdout
-                    else:
-                        sys.stderr.write(f"{response.stream}: {response.output}\n")  # Write to stderr with prefix
-                else:
-                    print(response.output, end="")
+            if response.output_type == "stdout":
+                sys.stdout.write(f"{response.output}")
+            elif response.output_type == "stderr":
+                sys.stderr.write(f"{response.output}")
+            elif response.output_type == "exit_code":
+                exit_code = response.exit_code
+
+    return exit_code
 
 def handle_quoted_arguments(command_args):
     """
@@ -101,5 +103,6 @@ def handle_quoted_arguments(command_args):
     # Convert the list to a single command string
     command_str = ' '.join(command)
 
-    # Run the command
-    asyncio.run(run_command(command_str, USE_SSL))
+    # Run the command and handle exit code
+    exit_code = asyncio.run(run_command(command_str, USE_SSL))
+    sys.exit(exit_code)

proto/ffmpeg.proto

@@ -13,5 +13,5 @@ message CommandRequest {
 message CommandResponse {
   string output = 1;
   int32 exit_code = 2;
-  string stream = 3; // Added field to indicate stream type
+  string stream = 3; // "stdout", "stderr", or "exit_code"
 }

server/grpc-ffmpeg.py

@@ -91,7 +91,7 @@ async def read_stream(stream, response_type, stream_name):
 
         await process.wait()
         exit_code = process.returncode
-        yield ffmpeg_pb2.CommandResponse(exit_code=exit_code)
+        yield ffmpeg_pb2.CommandResponse(exit_code=exit_code, stream_name="exit_code")
 
     async def health_check(self):
         logger.info("Running initial health check...")