imporve py

HapticX · Jan 13, 2024 · 9eba029 · 9eba029
1 parent c374067
commit 9eba029
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/.github/workflows/language_bindings.yml b/.github/workflows/language_bindings.yml
@@ -61,6 +61,7 @@ jobs:
       - name: Python Bindings 🐍
         run: |
           cd src
+          echo "Windows module"
           echo "Win Module compiled with"
           echo "nim c --app:lib --out:../bindings/python/happyx/happyx.pyd -d:useRealtimeGC --mm:arc --tlsEmulation:off --passL:-static --t:-flto --l:-flto --opt:speed --threads:off -d:release -d:httpx -d:export2py happyx"
           echo "Linux module"

diff --git a/src/happyx/ssr/handlers.nim b/src/happyx/ssr/handlers.nim
@@ -493,29 +493,44 @@ elif exportPython:
                 pyFuncParams[handlerParams.getParamName("WebSocket")] = wsConnection
               # Add function parameters to locals
               route.locals["funcParams"] = pFuncParams
-              try:
-                wsConnection.state = wssConnect
-                processWebSocket(py, route.locals)
-                wsConnection.state = wssOpen
-                while wsClient.readyState == Open:
-                  wsConnection.data = await wsClient.receiveStrPacket()
+              when enableHttpBeast:
+                try:
+                  wsConnection.state = wssConnect
                   processWebSocket(py, route.locals)
-              except WebSocketClosedError:
-                wsConnection.state = wssClose
-                processWebSocket(py, route.locals)
-              except WebSocketHandshakeError:
-                error("Invalid WebSocket handshake. Headers haven't Sec-WebSocket-Version!")
-                wsConnection.state = wssHandshakeError
-                processWebSocket(py, route.locals)
-              except WebSocketProtocolMismatchError:
-                error(fmt"Socket tried to use an unknown protocol: {getCurrentExceptionMsg()}")
-                wsConnection.state = wssMismatchProtocol
-                processWebSocket(py, route.locals)
-              except WebSocketError:
-                error(fmt"Unexpected socket error: {getCurrentExceptionMsg()}")
-                wsConnection.state = wssError
-                processWebSocket(py, route.locals)
-              wsClient.close()
+                  wsConnection.state = wssOpen
+                  while true:
+                    let (opcode, data) = await wsClient.readData()
+                    if opcode == Opcode.Close:
+                      wsConnection.state = wssClose
+                      processWebSocket(py, route.locals)
+                      break
+                    wsConnection.data = data
+                    processWebSocket(py, route.locals)
+                except:
+                  error(fmt"Unexpected socket error: {getCurrentExceptionMsg()}")
+                  wsConnection.state = wssError
+                  processWebSocket(py, route.locals)
+              else:
+                try:
+                  while wsClient.readyState == Open:
+                    wsConnection.data = await wsClient.receiveStrPacket()
+                    processWebSocket(py, route.locals)
+                except WebSocketClosedError:
+                  wsConnection.state = wssClose
+                  processWebSocket(py, route.locals)
+                except WebSocketHandshakeError:
+                  error("Invalid WebSocket handshake. Headers haven't Sec-WebSocket-Version!")
+                  wsConnection.state = wssHandshakeError
+                  processWebSocket(py, route.locals)
+                except WebSocketProtocolMismatchError:
+                  error(fmt"Socket tried to use an unknown protocol: {getCurrentExceptionMsg()}")
+                  wsConnection.state = wssMismatchProtocol
+                  processWebSocket(py, route.locals)
+                except WebSocketError:
+                  error(fmt"Unexpected socket error: {getCurrentExceptionMsg()}")
+                  wsConnection.state = wssError
+                  processWebSocket(py, route.locals)
+              wsConnection.close()
               reqResponded = true
               return