Revert "different port localhost solution"

This reverts commit 0bf871cadd.

qt/aqt/mediasrv.py

@@ -56,7 +56,6 @@ waitress.wasyncore._DISCONNECTED = waitress.wasyncore._DISCONNECTED.union({EPROT
 
 logger = logging.getLogger(__name__)
 app = flask.Flask(__name__, root_path="/fake")
-card_data_app = flask.Flask(__name__, root_path="/fake")
 flask_cors.CORS(app, resources={r"/*": {"origins": "127.0.0.1"}})
 
 
@@ -116,35 +115,20 @@ class MediaServer(threading.Thread):
         try:
             desired_host = os.getenv("ANKI_API_HOST", "127.0.0.1")
             desired_port = int(os.getenv("ANKI_API_PORT") or 0)
-            desired_card_data_port = int(os.getenv("ANKI_CARD_DATA_PORT") or 0)
             self.server = create_server(
                 app,
                 host=desired_host,
                 port=desired_port,
                 clear_untrusted_proxy_headers=True,
             )
-            self.card_data_server = create_server(
-                card_data_app,
-                host=desired_host,
-                port=desired_card_data_port,
-                clear_untrusted_proxy_headers=True,
-            )
             logger.info(
                 "Serving on http://%s:%s",
                 self.server.effective_host,  # type: ignore[union-attr]
                 self.server.effective_port,  # type: ignore[union-attr]
             )
-            logger.info(
-                "Serving iframes on http://%s:%s",
-                self.card_data_server.effective_host,  # type: ignore[union-attr]
-                self.card_data_server.effective_port,  # type: ignore[union-attr]
-            )
 
             self._ready.set()
-            card_data_thread = threading.Thread(target=self.card_data_server.run)
-            card_data_thread.start()
             self.server.run()
-            card_data_thread.join()
 
         except Exception:
             if not self.is_shutdown:
@@ -195,19 +179,6 @@ def favicon() -> Response:
     return _handle_builtin_file_request(request)
 
 
-@card_data_app.route("/reviewer-inner.<ext>")
-def card_data(ext):
-    if ext not in ("html", "js", "css"):
-        abort(404)
-    response = _handle_builtin_file_request(
-        BundledFileRequest(path=os.path.join("pages", f"reviewer-inner.{ext}"))
-    )
-    print(response.headers)
-    response.headers["Content-Security-Policy"] = ""
-    print(response.headers)
-    return response
-
-
 def _mime_for_path(path: str) -> str:
     "Mime type for provided path/filename."
 

qt/aqt/reviewer.py

@@ -1297,8 +1297,7 @@ class SvelteReviewer(Reviewer):
         # hide the bottom bar
         self.bottom.web.setHtml("<style>body {margin:0;} html {height:0;}</style>")
         # main window
-        inner_port = self.mw.mediaServer.card_data_server.effective_port
+        self.web.load_sveltekit_page("reviewer")
-        self.web.load_sveltekit_page(f"reviewer?p={inner_port}")
         # block default drag & drop behavior while allowing drop events to be received by JS handlers
         self.web.allow_drops = True
         self.web.eval("_blockDefaultDragDropBehavior();")

ts/routes/reviewer/Reviewer.svelte

@@ -12,27 +12,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         state.registerIFrame(iframe);
         state.registerShortcuts();
     }
-
-    const innerPort = new URLSearchParams(window.location.search).get("p");
-
-    $: hostname = innerPort
-        ? `${window.location.protocol}//${window.location.hostname}:${innerPort}/reviewer-inner.html`
-        : "/_anki/pages/reviewer-inner.html"; // fallback
-
-    $: sandboxAllowList =
-        "allow-scripts" +
-        (new URL(hostname).origin != window.location.origin
-            ? " allow-same-origin"
-            : "");
 </script>
 
 <div id="qa">
     <iframe
-        src={hostname + (isNightMode() ? "?nightMode" : "")}
+        src={"/_anki/pages/reviewer-inner.html" + (isNightMode() ? "?nightMode" : "")}
         bind:this={iframe}
         title="card"
         frameborder="0"
-        sandbox={sandboxAllowList}
+        sandbox="allow-scripts"
     ></iframe>
 </div>