PyPtt 2.3.15__tar.gz → 2.3.16__tar.gz

{pyptt-2.3.15 → pyptt-2.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.15
+Version: 2.3.16
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.15 → pyptt-2.3.16}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.3.15'
+__version__ = '2.3.16'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.3.15 → pyptt-2.3.16}/PyPtt/connect_core.py

@@ -179,6 +179,21 @@ class API(object):
             asyncio.set_event_loop(self._loop)
         return self._loop
 
+    def _websocket_endpoint(self) -> tuple[str, str]:
+        # PTT1 started answering wss://ws.ptt.cc/bbs/ (trailing slash) with HTTP 404 on
+        # 2026-11-06; term.ptt.cc connects to /bbs, so use the slash-less path everywhere
+        if self.config.host == data_type.HOST.PTT1:
+            return 'wss://ws.ptt.cc/bbs', 'https://term.ptt.cc'
+        if self.config.host == data_type.HOST.PTT2:
+            return 'wss://ws.ptt2.cc/bbs', 'https://term.ptt2.cc'
+        if self.config.host == data_type.HOST.LOCALHOST:
+            # ponytail: local pttbbs docker image (bbsdocker/imageptt) serves plain ws
+            # (no TLS) on 48763; config.port defaults to 23 (telnet default) so treat
+            # that as "not set" and fall back to imageptt's default port
+            port = self.config.port if self.config.port != 23 else 48763
+            return f'ws://localhost:{port}/bbs', 'http://localhost'
+        return f'wss://{self.config.host}', 'https://term.ptt.cc'
+
     def connect(self) -> None:
         def _wait():
             for i in range(self.config.retry_wait_time):
@@ -198,22 +213,7 @@ class API(object):
 
         self.current_encoding = 'big5uao'
 
-        if self.config.host == data_type.HOST.PTT1:
-            websocket_host = 'wss://ws.ptt.cc/bbs/'
-            websocket_origin = 'https://term.ptt.cc'
-        elif self.config.host == data_type.HOST.PTT2:
-            websocket_host = 'wss://ws.ptt2.cc/bbs/'
-            websocket_origin = 'https://term.ptt2.cc'
-        elif self.config.host == data_type.HOST.LOCALHOST:
-            # ponytail: local pttbbs docker image (bbsdocker/imageptt) serves plain ws
-            # (no TLS) on 48763; config.port defaults to 23 (telnet default) so treat
-            # that as "not set" and fall back to imageptt's default port
-            port = self.config.port if self.config.port != 23 else 48763
-            websocket_host = f'ws://localhost:{port}/bbs'
-            websocket_origin = 'http://localhost'
-        else:
-            websocket_host = f'wss://{self.config.host}'
-            websocket_origin = 'https://term.ptt.cc'
+        websocket_host, websocket_origin = self._websocket_endpoint()
 
         self._pending = []
         connect_success = False

{pyptt-2.3.15 → pyptt-2.3.16}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.15
+Version: 2.3.16
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.15 → pyptt-2.3.16}/PyPtt.egg-info/SOURCES.txt

@@ -103,4 +103,5 @@ tests/test_set_board_title.py
 tests/test_set_signature_file.py
 tests/test_status_line.py
 tests/test_uao_codec.py
-tests/test_vt100_parser.py
+tests/test_vt100_parser.py
+tests/test_websocket_endpoint.py

pyptt-2.3.16/tests/test_websocket_endpoint.py

@@ -0,0 +1,39 @@
+"""No-network regression test for the WebSocket endpoint connect_core dials.
+
+On 2026-11-06 PTT1's gateway started answering wss://ws.ptt.cc/bbs/ (with a
+trailing slash) with HTTP 404, so login died with ConnectError before reaching
+any screen. term.ptt.cc connects to wss://ws.ptt.cc/bbs, which still works.
+"""
+import pytest
+
+from PyPtt import config, connect_core, data_type
+
+
+class FakeApi:
+    def __init__(self, host, port=23):
+        self.config = config.Config()
+        self.config.host = host
+        self.config.port = port
+
+
+def _endpoint(host, port=23):
+    return connect_core.API(FakeApi(host, port))._websocket_endpoint()
+
+
+@pytest.mark.parametrize('host, url, origin', [
+    (data_type.HOST.PTT1, 'wss://ws.ptt.cc/bbs', 'https://term.ptt.cc'),
+    (data_type.HOST.PTT2, 'wss://ws.ptt2.cc/bbs', 'https://term.ptt2.cc'),
+    (data_type.HOST.LOCALHOST, 'ws://localhost:48763/bbs', 'http://localhost'),
+])
+def test_known_hosts(host, url, origin):
+    assert _endpoint(host) == (url, origin)
+
+
+@pytest.mark.parametrize('host', [data_type.HOST.PTT1, data_type.HOST.PTT2, data_type.HOST.LOCALHOST])
+def test_no_trailing_slash(host):
+    url, _ = _endpoint(host)
+    assert not url.endswith('/')
+
+
+def test_localhost_custom_port():
+    assert _endpoint(data_type.HOST.LOCALHOST, port=12345)[0] == 'ws://localhost:12345/bbs'