json-rpc-test-server: fix reading the request URI

Apparently it's reached maturity and there won't be any changes
anytime soon, making this the perfect time for an upgrade.

README.adoc

@@ -18,6 +18,7 @@ you get the following niceties:
    results in your favourite editor or redirect them to a file
  - ability to edit the input line in your favourite editor as well with Alt+E
  - WebSockets (RFC 6455) can also be used as a transport rather than HTTP
+ - support for method name tab completion using OpenRPC discovery
 
 Documentation
 -------------

http-parser

@@ -1 +1 @@
-Subproject commit 5d414fcb4b2ccc1ce9d6063292f9c63c9ec67b04
+Subproject commit ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d

json-rpc-shell.adoc

@@ -76,6 +76,10 @@ Protocol
 *-o* _ORIGIN_, *--origin*=_ORIGIN_::
 	Set the HTTP Origin header to _ORIGIN_.  Some servers may need this.
 
+*-O*, *--openrpc*::
+	Call "rpc.discover" upon start-up in order to pull in OpenRPC data for
+	tab completion of method names.
+
 Program information
 ~~~~~~~~~~~~~~~~~~~
 *-h*, *--help*::

json-rpc-shell.c

@@ -3225,24 +3225,16 @@ fail:
 // --- OpenRPC information extraction ------------------------------------------
 
 static void
-init_openrpc (struct app_context *ctx)
+parse_rpc_discover (struct app_context *ctx, struct str *buf, struct error **e)
 {
-	if (!ctx->openrpc)
-		return;
-
-	json_t *id = json_integer (ctx->next_id++);
-	struct str buf = str_make ();
-	struct error *e = json_rpc_call_raw (ctx, "rpc.discover", id, NULL, &buf);
-	json_decref (id);
-
 	// Just optimistically punch through, I don't have time for this shit
 	json_error_t error;
 	json_t *response = NULL, *result = NULL, *value = NULL;
-	if (!e && !(response = json_loadb (buf.str, buf.len, 0, &error)))
-		error_set (&e, "parse failure: %s", error.text);
+	if (!(response = json_loadb (buf->str, buf->len, 0, &error)))
+		error_set (e, "parse failure: %s", error.text);
 	else if (!(result = json_object_get (response, "result"))
 		|| !(result = json_object_get (result, "methods")))
-		error_set (&e, "unsupported");
+		error_set (e, "unsupported");
 	else
 	{
 		const char *name = NULL;
@@ -3252,10 +3244,25 @@ init_openrpc (struct app_context *ctx)
 				str_map_set (&ctx->methods, name, (void *) 1);
 	}
 	json_decref (response);
-	if (e)
+}
+
+static void
+init_openrpc (struct app_context *ctx)
 {
-		print_error ("OpenRPC: %s", e->message);
-		error_free (e);
+	if (!ctx->openrpc)
+		return;
+
+	json_t *id = json_integer (ctx->next_id++);
+	struct str buf = str_make ();
+	struct error *error;
+	if (!(error = json_rpc_call_raw (ctx, "rpc.discover", id, NULL, &buf)))
+		parse_rpc_discover (ctx, &buf, &error);
+	json_decref (id);
+
+	if (error)
+	{
+		print_error ("OpenRPC: %s", error->message);
+		error_free (error);
 	}
 	str_free (&buf);
 }

json-rpc-test-server.c

@@ -1014,7 +1014,7 @@ static int
 ws_handler_on_url (http_parser *parser, const char *at, size_t len)
 {
 	struct ws_handler *self = parser->data;
-	str_append_data (&self->value, at, len);
+	str_append_data (&self->url, at, len);
 	return 0;
 }