add PageClosedException catch in hold() and pin_wait_change()

Author: wang0618

pywebio/output.py

@@ -1855,7 +1855,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         get_current_session().pop_page()
         if isinstance(exc_val, PageClosedException):  # page is close by app user
             if self.silent_quit:
-                # supress PageClosedException Exception
+                # suppress PageClosedException Exception
                 return True
         else:
             send_msg('close_page', dict(page_id=self.page_id))

pywebio/pin.py

@@ -130,8 +130,9 @@
 from pywebio.output import OutputPosition, Output
 from pywebio.output import _get_output_spec
 from .io_ctrl import send_msg, single_input_kwargs, output_register_callback
-from .session import next_client_event, chose_impl
+from .session import next_client_event, chose_impl, get_current_session
 from .utils import check_dom_name_value
+from .exceptions import PageClosedException
 
 _pin_name_chars = set(string.ascii_letters + string.digits + '_-')
 
@@ -227,6 +228,12 @@ def put_actions(name, *, label='', buttons=None, help_text=None,
 @chose_impl
 def get_client_val():
     res = yield next_client_event()
+    if res['event'] == 'page_close':
+        current_page = get_current_session().get_page_id(check_active=False)
+        closed_page = res['data']
+        if closed_page == current_page:
+            raise PageClosedException
+
     assert res['event'] == 'js_yield', "Internal Error, please report this bug on " \
                                        "https://github.com/wang0618/PyWebIO/issues"
     return res['data']

pywebio/session/__init__.py

@@ -168,7 +168,7 @@ def show():
 from .base import Session
 from .coroutinebased import CoroutineBasedSession
 from .threadbased import ThreadBasedSession, ScriptModeSession
-from ..exceptions import SessionNotFoundException, SessionException
+from ..exceptions import SessionNotFoundException, SessionException, PageClosedException
 from ..utils import iscoroutinefunction, isgeneratorfunction, run_as_function, to_coroutine, ObjectDictProxy, \
     ReadOnlyObjectDict
 
@@ -293,7 +293,7 @@ def next_client_event():
 
 @chose_impl
 def hold():
-    """Keep the session alive until the browser page is closed by user.
+    """Hold and wait the browser page is closed by user.
 
     .. attention::
 
@@ -315,6 +315,8 @@ def hold():
             yield next_client_event()
         except SessionException:
             return
+        except PageClosedException:
+            return
 
 
 def download(name, content):

pywebio/session/base.py

@@ -113,7 +113,7 @@ def get_page_id(self, check_active=True):
         if page_id not in self.active_page[task_id] and check_active:
             raise PageClosedException(
                 "The page is closed by app user, "
-                "you see this exception mostly because you set `silent_quit=False` in `pywebio.output.page()`"
+                "set `silent_quit=True` in `pywebio.output.page()` to suppress this error"
             )
 
         return page_id