ticket #102 attempt 1

devplacepy/services/xmlrpc/__init__.py

@@ -2,8 +2,10 @@
 
 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
@@ -25,20 +27,48 @@ 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.DEVNULL,
+            stderr=subprocess.PIPE,
         )
         self.log(
-            f"Forking XML-RPC server started (pid {self._process.pid}) on "
+            f"Forking XML-RPC server spawning (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():
@@ -65,6 +95,13 @@ 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:

devplacepy/services/xmlrpc/server.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import sys
 from socketserver import ForkingMixIn
 from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
 
@@ -116,6 +117,9 @@ 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()
 

devplacepy/static/js/CommentManager.js

@@ -8,11 +8,6 @@ export class CommentManager {
         this.initCommentReply();
         this.initCommentEdit();
         this.initCommentDelete();
-        document.addEventListener("paste", (event) => {
-            const textarea = event.target.closest("form textarea[name='body'], form textarea[name='content']");
-            if (!textarea) return;
-            this._onPaste(event, textarea);
-        });
     }
 
     initCommentDelete() {
@@ -213,41 +208,4 @@ export class CommentManager {
             if (btn) btn.disabled = true;
         });
     }
-
-    _onPaste(event, textarea) {
-        const items = event.clipboardData?.items;
-        if (!items) return;
-        for (const item of items) {
-            if (item.kind === "file" && item.type.startsWith("image/")) {
-                event.preventDefault();
-                const file = item.getAsFile();
-                const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
-                this._uploadImage(namedFile, textarea);
-                break;
-            }
-        }
-    }
-
-    async _uploadImage(file, textarea) {
-        const formData = new FormData();
-        formData.append("file", file, file.name);
-        try {
-            const response = await fetch("/uploads/upload", {
-                method: "POST",
-                headers: {
-                    "Accept": "application/json",
-                    "X-Requested-With": "fetch",
-                },
-                body: formData,
-            });
-            if (!response.ok) {
-                const data = await response.json().catch(() => ({}));
-                throw new Error(data.error || `Upload failed (${response.status})`);
-            }
-            const result = await response.json();
-            window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
-        } catch (err) {
-            Http.notifyError(err.message);
-        }
-    }
 }

devplacepy/static/js/IssueReporter.js

@@ -12,48 +12,6 @@ export class IssueReporter {
             event.preventDefault();
             this.submit(form);
         });
-        document.addEventListener("paste", (event) => {
-            const textarea = event.target.closest("form[data-issue-create] [name='description']");
-            if (!textarea) return;
-            this._onPaste(event, textarea);
-        });
-    }
-
-    _onPaste(event, textarea) {
-        const items = event.clipboardData?.items;
-        if (!items) return;
-        for (const item of items) {
-            if (item.kind === "file" && item.type.startsWith("image/")) {
-                event.preventDefault();
-                const file = item.getAsFile();
-                const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
-                this._uploadImage(namedFile, textarea);
-                break;
-            }
-        }
-    }
-
-    async _uploadImage(file, textarea) {
-        const formData = new FormData();
-        formData.append("file", file, file.name);
-        try {
-            const response = await fetch("/uploads/upload", {
-                method: "POST",
-                headers: {
-                    "Accept": "application/json",
-                    "X-Requested-With": "fetch",
-                },
-                body: formData,
-            });
-            if (!response.ok) {
-                const data = await response.json().catch(() => ({}));
-                throw new Error(data.error || `Upload failed (${response.status})`);
-            }
-            const result = await response.json();
-            window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
-        } catch (err) {
-            Http.notifyError(err.message);
-        }
     }
 
     async submit(form) {

tests/api/uploads/upload.py

@@ -240,17 +240,3 @@ def test_delete_own_allowed_other_user_forbidden(app_server):
     bob = _session_uploads()
     assert bob.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 403
     assert alice.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 200
-
-
-def test_paste_image_upload_returns_url(app_server):
-    s = _session_uploads()
-    r = s.post(
-        f"{BASE_URL}/uploads/upload",
-        files={"file": ("clipboard.png", _png_bytes_uploads(), "image/png")},
-    )
-    assert r.status_code == 201, r.text
-    data = r.json()
-    assert "url" in data
-    assert data["url"].startswith("/static/uploads/attachments/")
-    assert data["uid"]
-    assert data["is_image"] is True

venv/bin/python

@@ -1 +0,0 @@
-python3

venv/bin/python3

@@ -1 +0,0 @@
-/usr/bin/python3

venv/bin/python3.11

@@ -1 +0,0 @@
-python3

venv/lib64

@@ -1 +0,0 @@
-lib

venv/pyvenv.cfg

@@ -1,5 +0,0 @@
-home = /usr/bin
-include-system-site-packages = false
-version = 3.11.2
-executable = /usr/bin/python3.11
-command = /usr/bin/python3 -m venv /workspace/repo/venv