Update README.md (#24)

Author: gryumov

README.md

@@ -27,43 +27,52 @@ mutable struct UserData
     callback::Function
 end
 
-function ws_callback(wsi::Ptr{Cvoid}, reason::Cint, user::Ptr{Cvoid}, data::Ptr{Cvoid}, len::Csize_t)
+function ws_callback(wsi::Ptr{Cvoid}, reason::Cint, user::Ptr{Cvoid}, data::Ptr{Cvoid}, len::Csize_t)::Cint
     if reason == LWS_CALLBACK_CLIENT_RECEIVE && data != C_NULL
         ctx = lws_get_context(wsi)
-        user_ctx = unsafe_pointer_to_objref(lws_context_user(ctx))
+        user_ctx = unsafe_pointer_to_objref(lws_context_user(ctx))::UserData
         user_ctx.callback(unsafe_wrap(Vector{UInt8}, Ptr{UInt8}(data), len))
     end
-    return lws_callback_http_dummy(wsi, reason, user, data, len)
+    return Cint(0)
 end
 
 function ws_open(callback::Function, addr::String, port::Int, path::String)
     lws_set_log_level(0, C_NULL)
-    
-    callback_ptr = @cfunction(ws_callback, Cint, (Ptr{Cvoid}, Cint, Ptr{Cvoid}, Ptr{Cvoid}, Csize_t))
+
+    callback_ptr = @cfunction(ws_callback, Cint,
+        (Ptr{Cvoid}, Cint, Ptr{Cvoid}, Ptr{Cvoid}, Csize_t))
+
+    proto = "ws"
     protocols = [
-        LwsProtocols(pointer("ws"), callback_ptr, 0, 0, 0, C_NULL, 0),
+        LwsProtocols(pointer(proto), callback_ptr, 0, 0, 0, C_NULL, 0),
         LwsProtocols(C_NULL, C_NULL, 0, 0, 0, C_NULL, 0)
     ]
+
     user = UserData(callback)
 
     ctx_info = LwsContextCreationInfo()
-    ctx_info.options = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT
-    ctx_info.port = CONTEXT_PORT_NO_LISTEN
-    ctx_info.user = Base.unsafe_convert(Ptr{UserData}, Ref(user))
+    ctx_info.options   = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT
+    ctx_info.port      = CONTEXT_PORT_NO_LISTEN
+    ctx_info.user      = pointer_from_objref(user)
     ctx_info.protocols = pointer(protocols)
     ws_ctx = lws_create_context(Ref(ctx_info))
 
+    addr_ref = addr
+    path_ref = path
+    
     conn_info = LwsClientConnectInfo()
-    conn_info.context = ws_ctx
-    conn_info.port = port
-    conn_info.address = pointer(addr)
-    conn_info.path = pointer(path)
-    conn_info.host = conn_info.address
+    conn_info.context        = ws_ctx
+    conn_info.port           = port
+    conn_info.address        = pointer(addr_ref)
+    conn_info.path           = pointer(path_ref)
+    conn_info.host           = conn_info.address
     conn_info.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED
-    lws_client_connect_via_info(Ref(conn_info))
 
-    while true
-        lws_service(ws_ctx, 0)
+    GC.@preserve user proto protocols addr_ref path_ref begin
+        lws_client_connect_via_info(Ref(conn_info))
+        while true
+            lws_service(ws_ctx, 20)
+        end
     end
 end
 

docs/src/index.md

@@ -21,43 +21,52 @@ mutable struct UserData
     callback::Function
 end
 
-function ws_callback(wsi::Ptr{Cvoid}, reason::Cint, user::Ptr{Cvoid}, data::Ptr{Cvoid}, len::Csize_t)
+function ws_callback(wsi::Ptr{Cvoid}, reason::Cint, user::Ptr{Cvoid}, data::Ptr{Cvoid}, len::Csize_t)::Cint
     if reason == LWS_CALLBACK_CLIENT_RECEIVE && data != C_NULL
         ctx = lws_get_context(wsi)
-        user_ctx = unsafe_pointer_to_objref(lws_context_user(ctx))
+        user_ctx = unsafe_pointer_to_objref(lws_context_user(ctx))::UserData
         user_ctx.callback(unsafe_wrap(Vector{UInt8}, Ptr{UInt8}(data), len))
     end
-    return lws_callback_http_dummy(wsi, reason, user, data, len)
+    return Cint(0)
 end
 
 function ws_open(callback::Function, addr::String, port::Int, path::String)
     lws_set_log_level(0, C_NULL)
-    
-    callback_ptr = @cfunction(ws_callback, Cint, (Ptr{Cvoid}, Cint, Ptr{Cvoid}, Ptr{Cvoid}, Csize_t))
+
+    callback_ptr = @cfunction(ws_callback, Cint,
+        (Ptr{Cvoid}, Cint, Ptr{Cvoid}, Ptr{Cvoid}, Csize_t))
+
+    proto = "ws"
     protocols = [
-        LwsProtocols(pointer("ws"), callback_ptr, 0, 0, 0, C_NULL, 0),
+        LwsProtocols(pointer(proto), callback_ptr, 0, 0, 0, C_NULL, 0),
         LwsProtocols(C_NULL, C_NULL, 0, 0, 0, C_NULL, 0)
     ]
+
     user = UserData(callback)
 
     ctx_info = LwsContextCreationInfo()
-    ctx_info.options = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT
-    ctx_info.port = CONTEXT_PORT_NO_LISTEN
-    ctx_info.user = Base.unsafe_convert(Ptr{UserData}, Ref(user))
+    ctx_info.options   = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT
+    ctx_info.port      = CONTEXT_PORT_NO_LISTEN
+    ctx_info.user      = pointer_from_objref(user)
     ctx_info.protocols = pointer(protocols)
     ws_ctx = lws_create_context(Ref(ctx_info))
 
+    addr_ref = addr
+    path_ref = path
+    
     conn_info = LwsClientConnectInfo()
-    conn_info.context = ws_ctx
-    conn_info.port = port
-    conn_info.address = pointer(addr)
-    conn_info.path = pointer(path)
-    conn_info.host = conn_info.address
+    conn_info.context        = ws_ctx
+    conn_info.port           = port
+    conn_info.address        = pointer(addr_ref)
+    conn_info.path           = pointer(path_ref)
+    conn_info.host           = conn_info.address
     conn_info.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED
-    lws_client_connect_via_info(Ref(conn_info))
 
-    while true
-        lws_service(ws_ctx, 0)
+    GC.@preserve user proto protocols addr_ref path_ref begin
+        lws_client_connect_via_info(Ref(conn_info))
+        while true
+            lws_service(ws_ctx, 20)
+        end
     end
 end
 
@@ -71,7 +80,3 @@ end
 - [Libwebsockets](https://github.com/warmcat/libwebsockets) – Official library repository.  
 - [libwebsockets_org](https://libwebsockets.org/) – Library documentation.
 - [libwebsockets_jll](https://github.com/JuliaBinaryWrappers/libwebsockets_jll.jl) – Julia wrapper for Libwebsockets.
-
-## Contributing
-
-Contributions to Libwebsockets are welcome! If you encounter a bug, have a feature request, or would like to contribute code, please open an issue or a pull request on GitHub.