X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-client-demo.c;h=305e1b341cf8e4dbb7fca95e3b772df835ed441f;hb=d7933c0f61a3316cc3d1ca7e74d30e193de2f612;hp=1ead5f749b6738609a319112ab43cfd71675d562;hpb=404f24c13cb45bd3e9ca837bc033fd6840cbf669;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-client-demo.c b/src/afb-client-demo.c
index 1ead5f74..305e1b34 100644
--- a/src/afb-client-demo.c
+++ b/src/afb-client-demo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -29,6 +29,7 @@
 #include <errno.h>
 
 #include <systemd/sd-event.h>
+#include <json-c/json.h>
 
 #include "afb-wsj1.h"
 #include "afb-ws-client.h"
@@ -51,6 +52,8 @@ static struct afb_wsj1_itf itf = {
 static struct afb_wsj1 *wsj1;
 static int exonrep;
 static int callcount;
+static int human;
+static int raw;
 static sd_event_source *evsrc;
 
 /* print usage of the program */
@@ -58,23 +61,64 @@ static void usage(int status, char *arg0)
 {
 	char *name = strrchr(arg0, '/');
 	name = name ? name + 1 : arg0;
-	fprintf(status ? stderr : stdout, "usage: %s uri [api verb [data]]\n", name);
+	fprintf(status ? stderr : stdout, "usage: %s [-H [-r]] uri [api verb [data]]\n", name);
 	exit(status);
 }
 
 /* entry function */
 int main(int ac, char **av, char **env)
 {
+	int rc;
+	char *a0;
+	sd_event *loop;
+
+	/* get the program name */
+	a0 = av[0];
+
+	/* check options */
+	while (ac > 1 && av[1][0] == '-') {
+		if (av[1][1] == '-') {
+			/* long option */
+
+			if (!strcmp(av[1], "--human")) /* request for human output */
+				human = 1;
+
+			else if (!strcmp(av[1], "--raw")) /* request for raw output */
+				raw = 1;
+
+			/* emit usage and exit */
+			else
+				usage(!!strcmp(av[1], "--help"), a0);
+		} else {
+			/* short option(s) */
+			for (rc = 1 ; av[1][rc] ; rc++)
+				switch (av[1][rc]) {
+				case 'H': human = 1; break;
+				case 'r': raw = 1; break;
+				default: usage(av[1][rc] != 'h', a0);
+				}
+		}
+		av++;
+		ac--;
+	}
+
 	/* check the argument count */
 	if (ac != 2 && ac != 4 && ac != 5)
-		usage(1, av[0]);
+		usage(1, a0);
+
+	/* set raw by default */
+	if (!human)
+		raw = 1;
 
-	/* emit error and exit if requested */
-	if (!strcmp(av[1], "-h") || !strcmp(av[1], "--help"))
-		usage(0, av[0]);
+	/* get the default event loop */
+	rc = sd_event_default(&loop);
+	if (rc < 0) {
+		fprintf(stderr, "connection to default event loop failed: %s\n", strerror(-rc));
+		return 1;
+	}
 
 	/* connect the websocket wsj1 to the uri given by the first argument */
-	wsj1 = afb_ws_client_connect_wsj1(av[1], &itf, NULL);
+	wsj1 = afb_ws_client_connect_wsj1(loop, av[1], &itf, NULL);
 	if (wsj1 == NULL) {
 		fprintf(stderr, "connection to %s failed: %m\n", av[1]);
 		return 1;
@@ -84,7 +128,7 @@ int main(int ac, char **av, char **env)
 	if (ac == 2) {
 		/* get requests from stdin */
 		fcntl(0, F_SETFL, O_NONBLOCK);
-		sd_event_add_io(afb_ws_client_get_event_loop(), &evsrc, 0, EPOLLIN, io_event_callback, NULL);
+		sd_event_add_io(loop, &evsrc, 0, EPOLLIN, io_event_callback, NULL);
 	} else {
 		/* the request is defined by the arguments */
 		exonrep = 1;
@@ -93,7 +137,7 @@ int main(int ac, char **av, char **env)
 
 	/* loop until end */
 	for(;;)
-		sd_event_run(afb_ws_client_get_event_loop(), 30000000);
+		sd_event_run(loop, 30000000);
 	return 0;
 }
 
@@ -101,6 +145,7 @@ int main(int ac, char **av, char **env)
 static void on_hangup(void *closure, struct afb_wsj1 *wsj1)
 {
 	printf("ON-HANGUP\n");
+	fflush(stdout);
 	exit(0);
 }
 
@@ -108,7 +153,13 @@ static void on_hangup(void *closure, struct afb_wsj1 *wsj1)
 static void on_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
 {
 	int rc;
-	printf("ON-CALL %s/%s(%s)\n", api, verb, afb_wsj1_msg_object_s(msg));
+	if (raw)
+		printf("ON-CALL %s/%s(%s)\n", api, verb, afb_wsj1_msg_object_s(msg));
+	if (human)
+		printf("ON-CALL %s/%s:\n%s\n", api, verb,
+				json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
+							JSON_C_TO_STRING_PRETTY));
+	fflush(stdout);
 	rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL);
 	if (rc < 0)
 		fprintf(stderr, "replying failed: %m\n");
@@ -117,13 +168,26 @@ static void on_call(void *closure, const char *api, const char *verb, struct afb
 /* called when wsj1 receives an event */
 static void on_event(void *closure, const char *event, struct afb_wsj1_msg *msg)
 {
-	printf("ON-EVENT %s(%s)\n", event, afb_wsj1_msg_object_s(msg));
+	if (raw)
+		printf("ON-EVENT %s(%s)\n", event, afb_wsj1_msg_object_s(msg));
+	if (human)
+		printf("ON-EVENT %s:\n%s\n", event,
+				json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
+							JSON_C_TO_STRING_PRETTY));
+	fflush(stdout);
 }
 
 /* called when wsj1 receives a reply */
 static void on_reply(void *closure, struct afb_wsj1_msg *msg)
 {
-	printf("ON-REPLY %s: %s\n", (char*)closure, afb_wsj1_msg_object_s(msg));
+	if (raw)
+		printf("ON-REPLY %s: %s\n", (char*)closure, afb_wsj1_msg_object_s(msg));
+	if (human)
+		printf("ON-REPLY %s: %s\n%s\n", (char*)closure,
+				afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR",
+				json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
+							JSON_C_TO_STRING_PRETTY));
+	fflush(stdout);
 	free(closure);
 	callcount--;
 	if (exonrep && !callcount)
@@ -212,9 +276,13 @@ static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, voi
 		rest[0] = i; while(i < count && line[i] != '\n') i++; rest[1] = i;
 		if (i == count) break;
 		line[i++] = 0;
-		if (api[0] == api[1] || verb[0] == verb[1])
-			fprintf(stderr, "bad line: %s\n", line+pos);
-		else {
+		if (api[0] == api[1]) {
+			/* empty line */
+		} else if (line[api[0]] == '#') {
+			/* comment */
+		} else if (verb[0] == verb[1]) {
+			fprintf(stderr, "verb missing, bad line: %s\n", line+pos);
+		} else {
 			line[api[1]] = line[verb[1]] = 0;
 			emit(line + api[0], line + verb[0], line + rest[0]);
 		}