Update app.py

app.py

@@ -9,7 +9,7 @@ import mss
 import threading
 from io import BytesIO
 from PIL import Image
-from Xlib import display, X, error
+from Xlib import display, X
 from Xlib.ext import xtest
 from aiohttp import web
 from aiortc import RTCPeerConnection, RTCSessionDescription, RTCIceServer, RTCConfiguration
@@ -19,8 +19,6 @@ HOST = "0.0.0.0"
 PORT = 7860
 DISPLAY_NUM = ":99"
 WIDTH, HEIGHT = 1280, 720
-FPS = 60
-INTERVAL = 1.0 / FPS
 
 TURN_USER = "g08abe68c81a07f098bb5f0914549bb32440e5aad0b216c7fba2b61e76fd62c6"
 TURN_PASS = "aed1a10dd10eba9401ad9d99e5c66036d8a970eab5ba8e6dc9845ab57c771a7d"
@@ -30,20 +28,30 @@ logger = logging.getLogger("X11-RTC")
 
 class X11Engine:
     def __init__(self):
+        self.sct = mss.mss()
+        self.dirty_rects = []
+        self.lock = threading.Lock()
+        self.use_damage = False
+        
         try:
             self.d = display.Display(DISPLAY_NUM)
             self.root = self.d.screen().root
-            if not self.d.has_extension('DAMAGE'):
-                logger.error("DAMAGE extension not found")
-            self.damage_ext = self.d.damage_create(self.root, X.DamageReportLevelNonEmpty)
-            self.sct = mss.mss()
-            self.dirty_rects = []
-            self.lock = threading.Lock()
+            
+            # Check for Damage Extension
+            if self.d.has_extension('DAMAGE'):
+                self.damage_ext = self.d.damage_create(self.root, X.DamageReportLevelNonEmpty)
+                self.use_damage = True
+                logger.info("X11 Damage Extension enabled.")
+            else:
+                logger.warning("DAMAGE extension missing. Falling back to polling mode.")
         except Exception as e:
-            logger.error(f"X11 Init Failed: {e}")
-            raise
+            logger.error(f"X11 Connection failed: {e}. Ensure Xvfb is running.")
+            # We don't raise here; we allow the engine to exist in polling-only mode
+            self.d = None 
 
     def collect_damage(self):
+        if not self.d or not self.use_damage:
+            return
         try:
             while self.d.pending_events() > 0:
                 ev = self.d.next_event()
@@ -54,9 +62,13 @@ class X11Engine:
         except: pass
 
     def get_patches(self):
+        # Fallback: If no damage events, capture a small central patch or full screen periodically
+        if not self.use_damage:
+            return [{"x": 0, "y": 0, "w": WIDTH, "h": HEIGHT, "d": self.capture_full()}]
+
         with self.lock:
             if not self.dirty_rects: return []
-            rects = list(self.dirty_rects[-10:]) # Limit patches per frame
+            rects = list(self.dirty_rects[-5:]) # Limit to 5 patches per frame for stability
             self.dirty_rects = []
 
         patches = []
@@ -70,7 +82,16 @@ class X11Engine:
             except: continue
         return patches
 
+    def capture_full(self):
+        """Standard polling capture."""
+        sct_img = self.sct.grab({"top": 0, "left": 0, "width": WIDTH, "height": HEIGHT})
+        img = Image.frombytes("RGB", sct_img.size, sct_img.bgra, "raw", "BGRX")
+        buf = BytesIO()
+        img.save(buf, format="JPEG", quality=50)
+        return base64.b64encode(buf.getvalue()).decode()
+
     def inject_input(self, msg):
+        if not self.d: return
         try:
             t = msg.get("type")
             if t == "mousemove":
@@ -89,12 +110,8 @@ async def patch_stream_loop(channel, engine):
         patches = await asyncio.to_thread(engine.get_patches)
         if patches:
             channel.send(json.dumps({"type": "patch", "p": patches}))
-        await asyncio.sleep(max(0, INTERVAL - (time.perf_counter() - start)))
-
-# --- ROUTES ---
-
-async def index(request):
-    return web.Response(text="hello world")
+        # 30 FPS target for stability in HF
+        await asyncio.sleep(max(0, 0.033 - (time.perf_counter() - start)))
 
 async def offer(request):
     try:
@@ -117,28 +134,25 @@ async def offer(request):
         await pc.setRemoteDescription(RTCSessionDescription(sdp=params["sdp"], type=params["type"]))
         answer = await pc.createAnswer()
         await pc.setLocalDescription(answer)
-        
-        return web.json_response(
-            {"sdp": pc.localDescription.sdp, "type": pc.localDescription.type},
-            headers={"Access-Control-Allow-Origin": "*"}
-        )
+        return web.json_response({"sdp": pc.localDescription.sdp, "type": pc.localDescription.type}, headers={"Access-Control-Allow-Origin": "*"})
     except Exception as e:
-        logger.error(f"Offer Error: {e}")
         return web.json_response({"error": str(e)}, status=500)
 
-async def options(r):
-    return web.Response(headers={
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Methods": "POST, OPTIONS",
-        "Access-Control-Allow-Headers": "Content-Type"
-    })
+async def index(request): return web.Response(text="hello world")
+async def options(r): return web.Response(headers={"Access-Control-Allow-Origin": "*", "Access-Control-Allow-Methods": "POST, OPTIONS", "Access-Control-Allow-Headers": "Content-Type"})
 
 if __name__ == "__main__":
     os.environ["DISPLAY"] = DISPLAY_NUM
-    # Use -ac to disable access control (essential for Docker/HF)
-    subprocess.Popen(["Xvfb", DISPLAY_NUM, "-screen", "0", f"{WIDTH}x{HEIGHT}x24", "+extension", "DAMAGE", "-ac"])
-    time.sleep(3)
-    subprocess.Popen("opera --no-sandbox --start-maximized", shell=True)
+    # UPDATED XVFB COMMAND FOR HF SPACES
+    subprocess.Popen([
+        "Xvfb", DISPLAY_NUM, 
+        "-screen", "0", f"{WIDTH}x{HEIGHT}x24", 
+        "+extension", "DAMAGE", 
+        "+extension", "RANDR", 
+        "+render", "-ac", "-noreset"
+    ])
+    time.sleep(5) # Increased wait time for Xvfb
+    subprocess.Popen("opera --no-sandbox --disable-gpu --start-maximized", shell=True)
     
     app = web.Application()
     app.router.add_get("/", index)