fixed cork in CPython + PyPy

src/socketify/loop.py

@@ -87,8 +87,8 @@ class Loop:
         #force asyncio run once to enable req in async functions before first await
         self.run_once_asyncio()
 
-        # if response != None: #set auto cork
-            # response.needs_cork = True
+        #if response != None: #set auto cork
+         #   response.needs_cork = True
         return future
 
 

src/socketify/socketify.py

@@ -10,6 +10,9 @@ from datetime import datetime
 from urllib.parse import parse_qs, quote_plus, unquote_plus
 from threading import Thread, local, Lock
 
+import platform    
+is_python = platform.python_implementation() == 'CPython'
+
 ffi = cffi.FFI()
 ffi.cdef("""
 
@@ -266,9 +269,11 @@ def uws_generic_listen_handler(listen_socket, config, user_data):
 @ffi.callback("void(uws_res_t *, void*)")
 def uws_generic_aborted_handler(response, user_data):
     if not user_data == ffi.NULL:
-        res = ffi.from_handle(user_data)
-        res.trigger_aborted()
-
+        try:
+            res = ffi.from_handle(user_data)
+            res.trigger_aborted()
+        except:
+            pass
 @ffi.callback("void(uws_res_t *, const char *, size_t, bool, void*)")
 def uws_generic_on_data_handler(res, chunk, chunk_length, is_end, user_data):
     if not user_data == ffi.NULL:
@@ -408,14 +413,15 @@ class AppResponse:
         self._ptr = ffi.new_handle(self)
         self._grabed_abort_handler_once = False
         self._write_jar = None
-        # self.needs_cork = False
         self._cork_handler = None
 
     def cork(self, callback):
         if not self.aborted:
             self._cork_handler = callback
-            #just add to uv loop in next tick to garantee corking works properly
-            self.loop.set_timeout(0, lambda instance: lib.uws_res_cork(instance.SSL, instance.res, uws_generic_cork_handler, instance._ptr), self)
+            if is_python:
+                lib.uws_res_cork(self.SSL, self.res, uws_generic_cork_handler, self._ptr)
+            else: #just add to uv loop in next tick to garantee corking works properly in pypy3
+                self.loop.set_timeout(0, lambda instance: lib.uws_res_cork(instance.SSL, instance.res, uws_generic_cork_handler, instance._ptr), self)
             
     def set_cookie(self, name, value, options={}):
         if self._write_jar == None:

src/tests.py

@@ -28,7 +28,7 @@ import asyncio
 
 async def home(res, req):
     # res.write_header("Content-Type", "plain/text")
-    await asyncio.sleep(0)
+    # await asyncio.sleep(0)
 
     def corked(res):
         res.write("Test ")
@@ -51,7 +51,7 @@ def create_fork():
     if not n > 0:
         run_app()
 
-# fork limiting the cpu count - 1
+# # fork limiting the cpu count - 1
 # for i in range(1, multiprocessing.cpu_count()):
 #     create_fork()