fix tls socket, add documentation

client/javascript/main.js

@@ -193,12 +193,9 @@ async function libcurl_fetch(url, params={}) {
 
 function set_websocket_url(url) {
   websocket_url = url;
-  if (!Module.websocket && ENVIRONMENT_IS_WEB) {
-    document.addEventListener("libcurl_load", () => {
-      set_websocket_url(url);
-    });
+  if (Module.websocket) {
+    Module.websocket.url = url;
   }
-  else Module.websocket.url = url;
 }
 
 function get_version() {

client/javascript/tls_socket.js

@@ -1,11 +1,21 @@
 //currently broken
 
 class TLSSocket {
-  constructor(hostname, port, debug) {
+  constructor(hostname, port, options={}) {
+    check_loaded(true);
+
     this.hostname = hostname;
     this.port = port;
     this.url = `https://${hostname}:${port}`;
-    this.debug = debug;
+    this.options = options;
+
+    this.onopen = () => {};
+    this.onerror = () => {};
+    this.onmessage = () => {};
+    this.onclose = () => {};
+
+    this.connected = false;
+    this.event_loop = null;
 
     this.connect();
   }
@@ -13,48 +23,56 @@ class TLSSocket {
   connect() {
     let data_callback = () => {};
     let finish_callback = (error, response_info) => {
-      this.status = this.OPEN;
       if (error === 0) {
-        this.open_callback();
-        this.recv_loop();
+        this.connected = true;
+        this.event_loop = setInterval(() => {
+          let data = this.recv();
+          if (data != null) this.onmessage(data);
+        }, 0);
+        this.onopen();
       }
       else {
         this.cleanup(error);
       }
     }
-    let options = {
+    let request_options = {
       _connect_only: 1,
     }
-    if (this.debug) options._libcurl_verbose = 1;
+    if (this.options.verbose) {
+      request_options._libcurl_verbose = 1;
+    }
 
-    this.http_handle = perform_request(this.url, options, data_callback, finish_callback, null);
+    this.http_handle = perform_request(this.url, request_options, data_callback, finish_callback, null);
   }
 
-  custom_recv() {
+  recv() {
     let buffer_size = 64*1024;
     let result_ptr = _recv_from_socket(this.http_handle, buffer_size);
     let data_ptr = _get_result_buffer(result_ptr);
     let result_code = _get_result_code(result_ptr);
+    let result_closed = _get_result_closed(result_ptr);
 
-    if (result_code == 0) { //CURLE_OK - data received 
-      if (_get_result_closed(result_ptr)) {
-        this.close_callback();
-        return;
-      }
-
+    if (result_code === 0 && !result_closed) { //CURLE_OK - data received 
       let data_size = _get_result_size(result_ptr);
       let data_heap = Module.HEAPU8.subarray(data_ptr, data_ptr + data_size);
       let data = new Uint8Array(data_heap);
+      this.onmessage(data)
+    }
+    
+    else if (result_code === 0 && result_closed) {
+      this.cleanup();
+    }
 
-      let message_event = new MessageEvent("message", {data: data});
-      this.dispatchEvent(message_event);
+    else if (result_code != 81) {
+      this.cleanup(result_code);
     }
 
     _free(data_ptr);
     _free(result_ptr);
   }
 
-  custom_send(data_array) {
+  send(data_array) {
+    if (!this.connected) return;
     let data_ptr = allocate_array(data_array);
     let data_len = data_array.length;
     _send_to_socket(this.http_handle, data_ptr, data_len);
@@ -63,12 +81,20 @@ class TLSSocket {
 
   cleanup(error=false) {
     if (this.http_handle) _cleanup_handle(this.http_handle);
+    else return;
+    
     clearInterval(this.event_loop);
-    this.close_callback(error);
+    this.connected = false;
+
+    if (error) {
+      this.onerror(error);
+    }
+    else {
+      this.onclose();
+    }
   }
 
-  custom_close() {
+  close() {
     this.cleanup();
-    this.status = this.CLOSED;
   }
 }

client/javascript/websocket.js

@@ -33,7 +33,6 @@ class CurlWebSocket {
         this.onopen();
       }
       else {
-        this.status = this.CLOSED;
         this.cleanup(error);
       }
     }
@@ -54,16 +53,14 @@ class CurlWebSocket {
     let result_ptr = _recv_from_websocket(this.http_handle, buffer_size);
     let data_ptr = _get_result_buffer(result_ptr);
     let result_code = _get_result_code(result_ptr);
+    let result_closed = _get_result_closed(result_ptr);
     let returned_data = null;
 
-    function free_result() {
-      _free(data_ptr);
-      _free(result_ptr);
-    }
-
-    if (result_code === 0) { //CURLE_OK - data received 
+    //CURLE_OK - data received 
+    if (result_code === 0 && !result_closed) {
       if (_get_result_closed(result_ptr)) {
-        free_result();
+        _free(data_ptr);
+        _free(result_ptr);
         this.cleanup();
         return returned_data;
       }
@@ -85,18 +82,26 @@ class CurlWebSocket {
         }
       }
     }
-
-    //CURLE_GOT_NOTHING, CURLE_RECV_ERROR, CURLE_SEND_ERROR - socket closed
-    else if (result_code === 52 || result_code === 55 || result_code === 56) {
+    
+    // websocket was cleanly closed by the server
+    else if (result_code === 0 && result_closed) {
       this.cleanup();
     }
+
+    //code is not CURLE_AGAIN - an error must have occurred
+    else if (result_code !== 81) {
+      this.cleanup(result_code);
+    }
     
-    free_result();
+    _free(data_ptr);
+    _free(result_ptr);
     return returned_data;
   }
 
-  cleanup(error=false) {
+  cleanup(error=0) {
     if (this.http_handle) _cleanup_handle(this.http_handle);
+    else return;
+
     clearInterval(this.event_loop);
     this.connected = false;
 
@@ -110,9 +115,7 @@ class CurlWebSocket {
 
   send(data) {
     let is_text = typeof data === "string";
-    if (!this.connected) {
-      throw new DOMException("websocket not connected");
-    }
+    if (!this.connected) return;
 
     if (is_text) {
       data = new TextEncoder().encode(data);