fix: prevent zombie process when canceling on web

Author: funway

.dockerignore

@@ -32,5 +32,6 @@ output/
 dev_output/
 
 .env
-.DS_Store
+docker-compose.yml
 
+.DS_Store

.env.example

@@ -1,7 +1,7 @@
 # Copy this file to .env and fill your real keys
 
-AZURE_TTS_KEY=YOUR_AZURE_SPEECH_KEY
+AZURE_TTS_KEY=your_azure_speech_key
 
-AZURE_TTS_REGION=YOUR_REGION
+AZURE_TTS_REGION=your_speech_region
 
 AUDIBLE_EPUB3_MAKER_ENV=production

.gitignore

@@ -13,6 +13,8 @@ logs/*
 !logs/.gitkeep
 
 .env
+docker-compose.yml
+
 .DS_Store
 report.html
 manual_test.py

audible_epub3_maker/utils/constants.py

@@ -2,7 +2,7 @@
 ## Internal configuration (not intended for user modification) ##
 
 APP_NAME = "Audible EPUB3 Maker"
-APP_VERSION = "0.3.0"
+APP_VERSION = "0.3.1"
 APP_FULLNAME = APP_NAME + " v" + APP_VERSION
 APP_IN_DEV = True
 

docker-compose.example.yml

@@ -1,8 +1,6 @@
-version: '3.8'
-
 services:
-  aem:
-    image: ghcr.io/funway/audible-epub3-maker  # or funway/audible-epub3-maker
+  aem-web:
+    image: funway/audible-epub3-maker  # or ghcr.io/funway/audible-epub3-maker
     ports:
       - "7860:7860"
     volumes:

web_gui.py

@@ -191,11 +191,17 @@ def on_cancel_click():
     global aem_process
 
     if aem_process and aem_process.poll() is None:
-        aem_process.terminate()
-        aem_process = None
-        gr.Info(f"AEM process terminated")
+        try:
+            aem_process.terminate()
+            aem_process.wait(0.5)
+            gr.Info(f"AEM process terminated")
+        except subprocess.TimeoutExpired:
+            aem_process.kill()
+            gr.Warning(f"Force kill AEM process [{aem_process.pid}]")
+        except Exception as e:
+            raise gr.Error(f"Error terminating AEM process [{aem_process.pid}]")
     else:
-        gr.Warning(f"No AEM process running")
+        gr.Info(f"No AEM process running")
 
 
 def on_engine_change(tts_engine):
@@ -355,11 +361,12 @@ def launch_gui(host: str = "127.0.0.1", port: int = 7860):
             inputs=None,
             outputs=None
         )
+        # gr.Timer is triggered from the frontend browser
         gr.Timer(0.5).tick(
             fn=check_process,
             inputs=None,
             outputs=[run_btn]
-        )
+        ) 
         gr.Timer(0.5).tick(
             fn=tail_log_file,
             inputs=None,