Revert "Implicit handshake: 33% faster time-to-first-interactivity (#5499)"

This reverts commit e5fbab0.

Author: falkoschindler

nicegui/client.py

@@ -159,7 +159,6 @@ def build_response(self, request: Request, status_code: int = 200) -> Response:
             **core.app.config.socket_io_js_query_params,
             'client_id': self.id,
             'next_message_id': self.outbox.next_message_id,
-            'implicit_handshake': not _is_prefetch(request),
         }
         vue_html, vue_styles, vue_scripts, imports, js_imports, js_imports_urls = \
             generate_resources(prefix, self.elements.values())
@@ -209,8 +208,10 @@ async def connected(self, timeout: float | None = None) -> None:
             return
         self._waiting_for_connection.set()
         self._connected.clear()
+        purpose = (self.request.headers.get('Sec-Purpose') or self.request.headers.get('Purpose') or '').lower()
+        is_prefetch = 'prefetch' in purpose and 'prerender' not in purpose
         try:
-            await asyncio.wait_for(self._connected.wait(), timeout=None if _is_prefetch(self.request) else timeout)
+            await asyncio.wait_for(self._connected.wait(), timeout=None if is_prefetch else timeout)
         except asyncio.TimeoutError as e:
             raise ClientConnectionTimeout(self) from e
 
@@ -453,8 +454,3 @@ def prune_instances(cls, *, client_age_threshold: float = 60.0) -> None:
 
         except Exception:
             log.exception('Error while pruning clients')
-
-
-def _is_prefetch(request: Request) -> bool:
-    purpose = (request.headers.get('Sec-Purpose') or request.headers.get('Purpose') or '').lower()
-    return 'prefetch' in purpose and 'prerender' not in purpose

nicegui/nicegui.py

@@ -187,14 +187,6 @@ async def _exception_handler_500(request: Request, exception: Exception) -> Resp
     return client.build_response(request, 500)
 
 
-@sio.on('connect')
-async def _on_connect(sid: str, data: dict[str, Any], _=None) -> bool:
-    query = {k: v[0] for k, v in urllib.parse.parse_qs(data.get('QUERY_STRING', '')).items()}
-    if query.get('implicit_handshake', '') == 'true' and not await _on_handshake(sid, query):
-        return False
-    return True
-
-
 @sio.on('handshake')
 async def _on_handshake(sid: str, data: dict[str, Any]) -> bool:
     client = Client.instances.get(data['client_id'])
@@ -208,8 +200,7 @@ async def _on_handshake(sid: str, data: dict[str, Any]) -> bool:
     else:
         client.environ = sio.get_environ(sid)
         await sio.enter_room(sid, client.id)
-    client.handle_handshake(sid, data['document_id'],
-                            int(data['next_message_id']) if 'next_message_id' in data else None)
+    client.handle_handshake(sid, data['document_id'], data.get('next_message_id'))
     assert client.tab_id is not None
     await core.app.storage._create_tab_storage(client.tab_id)  # pylint: disable=protected-access
     return True

nicegui/static/nicegui.js

@@ -345,9 +345,6 @@ function createApp(elements, options) {
       window.path_prefix = options.prefix;
       window.nextMessageId = options.query.next_message_id;
       window.ackedMessageId = -1;
-      options.query.document_id = window.documentId;
-      options.query.tab_id = TAB_ID;
-      options.query.old_tab_id = OLD_TAB_ID;
       window.socket = io(url, {
         path: `${options.prefix}/_nicegui_ws/socket.io`,
         query: options.query,
@@ -380,20 +377,21 @@ function createApp(elements, options) {
           if (transport?.ws?.send) transport.ws.send = wrapFunction(transport.ws.send);
           if (transport?.doWrite) transport.doWrite = wrapFunction(transport.doWrite);
 
-          function finishHandshake(ok) {
+          const args = {
+            client_id: window.clientId,
+            document_id: window.documentId,
+            tab_id: TAB_ID,
+            old_tab_id: OLD_TAB_ID,
+            next_message_id: window.nextMessageId,
+          };
+          window.socket.emit("handshake", args, (ok) => {
             if (!ok) {
               console.log("reloading because handshake failed for clientId " + window.clientId);
               window.location.reload();
             }
             window.did_handshake = true;
             document.getElementById("popup").ariaHidden = true;
-          }
-
-          if (options.query.implicit_handshake) {
-            finishHandshake(true);
-          } else {
-            window.socket.emit("handshake", options.query, finishHandshake);
-          }
+          });
         },
         connect_error: (err) => {
           if (err.message == "timeout") {