Compare commits

..
Author SHA1 Message Date
Typosaurus 131f988bea ticket #44 attempt 2 2026-07-19 20:05:41 +00:00
Typosaurus 1c31c1d6a5 ticket #44 attempt 1 2026-07-19 19:47:01 +00:00
6 changed files with 8 additions and 48 deletions
File diff suppressed because one or more lines are too long
+2 -39
View File
@@ -2,10 +2,8 @@
from __future__ import annotations
import socket
import subprocess
import sys
import time
from devplacepy.config import XMLRPC_BIND, XMLRPC_PORT
from devplacepy.services.base import BaseService
@@ -27,48 +25,20 @@ class XmlrpcService(BaseService):
def __init__(self) -> None:
super().__init__("xmlrpc", interval_seconds=XMLRPC_INTERVAL_SECONDS)
self._process: subprocess.Popen | None = None
self._last_stderr: str | None = None
def _alive(self) -> bool:
return self._process is not None and self._process.poll() is None
def _spawn(self) -> None:
self._last_stderr = None
self._process = subprocess.Popen(
[sys.executable, "-m", SERVER_MODULE],
stdout=subprocess.DEVNULL,
stderr=subprocess.PIPE,
stderr=subprocess.DEVNULL,
)
self.log(
f"Forking XML-RPC server spawning (pid {self._process.pid}) on "
f"Forking XML-RPC server started (pid {self._process.pid}) on "
f"{XMLRPC_BIND}:{XMLRPC_PORT}"
)
time.sleep(0.5)
if self._process.poll() is not None:
stderr_data = self._process.communicate()[1]
if stderr_data:
self._last_stderr = stderr_data.decode("utf-8", errors="replace")
self.log(
f"Forking XML-RPC server died after spawn (pid {self._process.pid}, "
f"exit code {self._process.returncode})"
)
if self._last_stderr:
for line in self._last_stderr.strip().split("\n"):
self.log(f" stderr: {line}")
return
try:
sock = socket.create_connection((XMLRPC_BIND, XMLRPC_PORT), timeout=1)
sock.close()
except (OSError, socket.timeout):
self.log(
f"Forking XML-RPC server not yet ready (pid {self._process.pid}) "
f"on {XMLRPC_BIND}:{XMLRPC_PORT}"
)
else:
self.log(
f"Forking XML-RPC server started (pid {self._process.pid}) on "
f"{XMLRPC_BIND}:{XMLRPC_PORT}"
)
def _terminate(self) -> None:
if not self._alive():
@@ -95,13 +65,6 @@ class XmlrpcService(BaseService):
self.log(f"XML-RPC server healthy (pid {self._process.pid})")
return
self.log("XML-RPC server not running, starting it")
if self._process is not None:
self.log(
f"Previous process exited with code {self._process.returncode}"
)
if self._last_stderr:
for line in self._last_stderr.strip().split("\n"):
self.log(f" last stderr: {line}")
self._spawn()
def collect_metrics(self) -> dict:
-4
View File
@@ -3,7 +3,6 @@
from __future__ import annotations
import logging
import sys
from socketserver import ForkingMixIn
from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
@@ -117,9 +116,6 @@ def main() -> None:
server.serve_forever()
except KeyboardInterrupt:
logger.info("XML-RPC server interrupted")
except Exception:
logging.exception("XML-RPC server crashed with unhandled exception")
sys.exit(1)
finally:
server.server_close()
-1
View File
@@ -115,7 +115,6 @@ devii-terminal.devii-state-fullscreen .devii-window {
}
devii-terminal.devii-state-normal .devii-window {
resize: both;
}
devii-terminal.devii-state-normal .devii-titlebar {
cursor: move;
+1
View File
@@ -86,6 +86,7 @@ export class DeviiTerminal {
}
_canOpenOnGesture() {
if (this.element && this.element.state !== "closed") return false;
if (document.querySelector(".modal-overlay.visible")) return false;
if (document.querySelector(".dialog-overlay.visible")) return false;
if (document.querySelector(".context-menu.visible")) return false;
@@ -297,8 +297,8 @@ export default class FloatingWindow extends Component {
if (!this.geometry) return;
const g = this.geometry;
const safeHeight = this._safeViewport.height;
g.width = Math.min(g.width, window.innerWidth - 16);
g.height = Math.min(g.height, safeHeight - 16);
g.width = Math.max(320, Math.min(g.width, window.innerWidth - 16));
g.height = Math.max(220, Math.min(g.height, safeHeight - 16));
g.left = Math.max(8, Math.min(g.left, window.innerWidth - g.width - 8));
g.top = Math.max(8, Math.min(g.top, safeHeight - g.height - 8));
}
@@ -409,8 +409,8 @@ export default class FloatingWindow extends Component {
this._ro = new ResizeObserver(() => {
if (this.state === "normal" && this.geometry && !this._drag) {
const rect = this.win.getBoundingClientRect();
this.geometry.width = Math.round(rect.width);
this.geometry.height = Math.round(rect.height);
this.geometry.width = Math.max(320, Math.round(rect.width));
this.geometry.height = Math.max(220, Math.round(rect.height));
this._persistGeometry();
}
this._syncControls();