fix(voice): keep watcher alive through quiet checks and reconnects
Server CI and Windows package / verify (push) Successful in 3m5s
Server CI and Windows package / windows-package (push) Successful in 13m2s

This commit is contained in:
yilsem committed 2026-10-12 20:06:46 +03:00
1 parent b4e8664115
commit 2718b460ed
2 files changed
+146 -25

No files matched your search

@@ -256,3 +256,102 @@ def test_actual_handler_nonvoice_preserves_response_pipeline(tmp_path, monkeypat
wrapped.assert_not_called();shortcut.assert_not_called();owner.accept.assert_not_called()
finally:
server.shutdown();server.server_close();upstream.shutdown();upstream.server_close()
class QuietWatchServer:
"""Real sockets, with no heartbeat; observes client shutdown at the peer."""
def __init__(self, protocol='HTTP/1.0', delay=0, headers_delay=False, reconnects=False, delayed_headers=False):
self.requests=[];self.closed=threading.Event();self.peer_closed=threading.Event()
self.ready=threading.Event();owner=self
class H(BaseHTTPRequestHandler):
protocol_version='HTTP/1.1' if protocol=='HTTP/1.1-close' else protocol
def log_message(self,*args): pass
def do_POST(self):
body=json.loads(self.rfile.read(int(self.headers['Content-Length'])))
owner.requests.append(body);number=len(owner.requests)
try:
if headers_delay:
owner.ready.set()
self.connection.settimeout(5)
if self.connection.recv(1)==b'': owner.peer_closed.set()
return
if delayed_headers and owner.closed.wait(delay): return
self.send_response(200);self.send_header('Content-Type','text/event-stream')
if protocol=='HTTP/1.1-close': self.send_header('Connection','close')
self.end_headers()
self.wfile.write(frame('ready',{'cursor':'start'}));self.wfile.flush();owner.ready.set()
if reconnects:
n=notice('first' if number<9 else 'ninth')
self.wfile.write(frame('notice',n,n['cursor']));self.wfile.flush()
if number<9:
self.close_connection=True
return
elif delay and number==1:
if not delayed_headers and owner.closed.wait(delay): return
n=notice('delayed');self.wfile.write(frame('notice',n,n['cursor']));self.wfile.flush()
self.connection.settimeout(5 if not delay else 20)
if self.connection.recv(1)==b'': owner.peer_closed.set()
except OSError: pass
self.server=ThreadingHTTPServer(('127.0.0.1',0),H);self.server.daemon_threads=True
self.origin='http://127.0.0.1:'+str(self.server.server_port)
threading.Thread(target=self.server.serve_forever,daemon=True).start()
def close(self):
self.closed.set();self.server.shutdown();self.server.server_close()
@pytest.mark.parametrize('delayed_headers',[False,True])
def test_quiet_watch_delivers_after_more_than_ten_seconds(tmp_path,delayed_headers):
server=QuietWatchServer(delay=11.2,delayed_headers=delayed_headers)
mux=NativeSpeechMux(['unused'],observer=True);started(mux,'A')
owner=WatchOwner(mux,Ledger(tmp_path/'quiet'),origin=server.origin,test_loopback=True)
try:
assert owner.accept(meta(),capture(owner,'A'),'member',server.origin)=='subscribing'
assert server.ready.wait(14)
until=time.monotonic()+14
while mux._queue.empty() and time.monotonic()<until: time.sleep(.02)
assert not mux._queue.empty(), 'valid quiet stream lost delayed notice'
assert len(server.requests)==1, 'quiet channel spuriously reconnected'
finally:owner.close();server.close()
@pytest.mark.parametrize('protocol',['HTTP/1.0','HTTP/1.1','HTTP/1.1-close'])
@pytest.mark.parametrize('cancel',['close','expiry','generation'])
@pytest.mark.parametrize('headers_delay',[False,True])
def test_quiet_owned_socket_is_interrupted(tmp_path,protocol,cancel,headers_delay):
server=QuietWatchServer(protocol=protocol,headers_delay=headers_delay)
mux=NativeSpeechMux(['unused'],observer=True);started(mux,'A')
owner=WatchOwner(mux,Ledger(tmp_path/'cancel'),origin=server.origin,test_loopback=True)
try:
p=meta()
if cancel=='expiry':p['expires_at']=(time.time()+.7)*1000
owner.accept(p,capture(owner,'A'),'member',server.origin)
assert server.ready.wait(3)
if not headers_delay:wait(lambda:bool(mux._bindings))
if cancel=='close':owner.close()
elif cancel=='generation':mux._observe_client({'method':'thread/realtime/stop','params':{'threadId':'A'}})
assert server.peer_closed.wait(2), 'owned response/header socket remained open'
wait(lambda:not owner.watches)
assert not mux._bindings and mux._queue.empty()
finally:owner.close();server.close()
def test_ninth_reconnect_delivers_and_preserves_cursor_dedup(tmp_path):
class FastBackoff:
def __init__(self):self.event=threading.Event()
def is_set(self):return self.event.is_set()
def set(self):self.event.set()
def wait(self,seconds):return self.event.wait(min(seconds,.01))
server=QuietWatchServer(reconnects=True)
mux=NativeSpeechMux(['unused'],observer=True);started(mux,'A')
owner=WatchOwner(mux,Ledger(tmp_path/'reconnect'),origin=server.origin,test_loopback=True)
p=meta();c=capture(owner,'A');scope=opaque('public-watch','member',p['subscription']);stop=FastBackoff()
owner.watches[scope]=stop
worker=threading.Thread(target=owner._watch,args=(p,c,'member',scope,stop),daemon=True);worker.start()
try:
wait(lambda:len(server.requests)>=9)
wait(lambda:owner.ledger.cursor(scope)=='cursor-ninth')
assert mux._queue.qsize()==2
assert all(req.get('cursor')=='cursor-first' for req in server.requests[1:9])
finally:
owner.close();worker.join(timeout=3);server.close()
assert not worker.is_alive()