Added server detection

Implemented server detection at the request of NTEWIZ. If not detected, it will ask after collecting pull data.

tests/support.py

@@ -21,6 +21,7 @@ from nte_history_exporter.constants import POOL_META
 from nte_history_exporter.mappings import ARC_META, CHARACTERS, ITEMS, REWARDS_BY_ID
 from nte_history_exporter.decoder.protocol import decode_reward_key, infer_reward_type
 from nte_history_exporter.decoder.user_uid import extract_user_uid
+from nte_history_exporter.decoder.server_region import extract_server_id
 from nte_history_exporter.export.csv_export import write_csv
 from nte_history_exporter.decoder.arc import (
     arc_request_page,
@@ -46,6 +47,7 @@ from nte_history_exporter.live_capture.windows_raw import parse_ipv4_packet
 from nte_history_exporter.live_capture.backends import open_capture_backend
 from nte_history_exporter.export.json_export import build_export_json
 from nte_history_exporter.live_capture.runner import export_paths
+from nte_history_exporter import console
 from nte_history_exporter.pool_mappings import load_pool_mappings, pool_meta_from_mapping
 from nte_history_exporter.update_check import UpdateInfo, check_for_update, is_newer_version
 

tests/test_export_contract.py

@@ -10,6 +10,8 @@ class ExportContractTests(unittest.TestCase):
         self.assertEqual(export["format"], "nte-history-export")
         self.assertIn("exporter", export)
         self.assertNotIn("user_uid", export)
+        self.assertNotIn("server_id", export)
+        self.assertNotIn("account_region", export)
         self.assertNotIn("record_hex", export["records"][0])
         self.assertNotIn("request_msg", export["records"][0])
         self.assertNotIn("response_msg", export["records"][0])
@@ -27,6 +29,75 @@ class ExportContractTests(unittest.TestCase):
         self.assertEqual(export["capture_source"], "npcap")
         self.assertEqual(export["user_uid"], "123456789")
 
+    def test_export_includes_server_id_and_mapped_account_region(self):
+        annotated = annotate_groups(fixture_session().build_rows("permanent"))
+        export = build_export_json(annotated, [], server_id="23003")
+
+        self.assertEqual(export["server_id"], "23003")
+        self.assertEqual(export["account_region"], "EU")
+
+    def test_export_preserves_unknown_server_without_guessing_region(self):
+        annotated = annotate_groups(fixture_session().build_rows("permanent"))
+        export = build_export_json(annotated, [], server_id="23999")
+
+        self.assertEqual(export["server_id"], "23999")
+        self.assertNotIn("account_region", export)
+
+    def test_extracts_server_id_from_valid_initial_tcp_response(self):
+        payload = bytearray(204)
+        payload[0:4] = (200).to_bytes(4, "little")
+        payload[4:8] = (20).to_bytes(4, "little")
+        payload[96:100] = (23003).to_bytes(4, "little")
+        address = b"198.51.100.20"
+        payload[132:136] = len(address).to_bytes(4, "little")
+        payload[136 : 136 + len(address)] = address
+
+        self.assertEqual(extract_server_id(bytes(payload)), "23003")
+
+    def test_rejects_server_id_at_offset_without_valid_message_structure(self):
+        payload = bytearray(204)
+        payload[96:100] = (23003).to_bytes(4, "little")
+
+        self.assertIsNone(extract_server_id(bytes(payload)))
+
+    def test_live_session_detects_server_only_on_inbound_tcp(self):
+        payload = bytearray(204)
+        payload[0:4] = (200).to_bytes(4, "little")
+        payload[4:8] = (20).to_bytes(4, "little")
+        payload[96:100] = (23004).to_bytes(4, "little")
+        address = b"198.51.100.20"
+        payload[132:136] = len(address).to_bytes(4, "little")
+        payload[136 : 136 + len(address)] = address
+        session = LiveHistorySession("192.0.2.10")
+
+        session.process_packet(
+            UdpPacket(
+                1.0,
+                "198.51.100.20",
+                "192.0.2.10",
+                30000,
+                40000,
+                bytes(payload),
+                protocol="tcp",
+            )
+        )
+
+        self.assertEqual(session.server_id, "23004")
+
+    @patch("builtins.input", side_effect=["9", "3"])
+    def test_server_prompt_retries_then_returns_selected_server_id(self, _input):
+        self.assertEqual(console.prompt_server_id(), "23003")
+
+    @patch("builtins.input", return_value="")
+    def test_server_prompt_can_be_skipped(self, _input):
+        self.assertIsNone(console.prompt_server_id())
+
+    @patch("nte_history_exporter.console.wait_for_keypress")
+    def test_wait_for_close_waits_for_a_second_keypress(self, wait_for_keypress):
+        console.wait_for_close()
+
+        wait_for_keypress.assert_called_once_with()
+
     def test_debug_csv_includes_exporter_version(self):
         with TemporaryDirectory() as tmp:
             path = Path(tmp) / "debug.csv"