Show error messages, fix some fetch crashes

2 files changed, 9 insertions, 0 deletions

diff --git a/src/io/loader.nim b/src/io/loader.nim
index 5ed270ca..34eb9b42 100644
--- a/src/io/loader.nim
+++ b/src/io/loader.nim
@@ -282,6 +282,8 @@ proc onConnected*(loader: FileLoader, fd: int) =
     loader.ongoing[fd] = response
     promise.resolve(response)
   else:
+    loader.unregisterFun(fd)
+    loader.unregistered.add(fd)
     #TODO: reject promise instead.
     let response = newResponse(res, request)
     promise.resolve(response)
@@ -308,3 +310,8 @@ proc quit*(loader: FileLoader) =
   let stream = connectSocketStream(loader.process)
   if stream != nil:
     stream.swrite(QUIT)
+
+func getLoaderErrorMessage*(code: int): string =
+  if code < 0:
+    return $ConnectErrorCode(code)
+  return $curl_easy_strerror(CURLcode(cint(code)))
diff --git a/src/io/request.nim b/src/io/request.nim
index ed38ad47..4a123a0b 100644
--- a/src/io/request.nim
+++ b/src/io/request.nim
@@ -326,6 +326,8 @@ proc Response_json(ctx: JSContext, this: JSValue, argc: cint, argv: ptr JSValue)
     return JS_ThrowTypeError(ctx, "Value is not an instance of %s", "Response")
   let response = cast[Response](op)
   var s = response.text()
+  if s == "":
+    return JS_ThrowSyntaxError("unexpected end of input")
   return JS_ParseJSON(ctx, addr s[0], cast[csize_t](s.len), cstring"<input>")
 
 func credentialsMode*(attribute: CORSAttribute): CredentialsMode =