/*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
* Author "Fulup Ar Foll"
* Author José Bollo <jose.bollo@iot.bzh>
*
#include <systemd/sd-event.h>
#include <json-c/json.h>
+#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE)
+#define JSON_C_TO_STRING_NOSLASHESCAPE 0
+#endif
#include "afb-wsj1.h"
#include "afb-ws-client.h"
#include "afb-proto-ws.h"
+enum {
+ Exit_Success = 0,
+ Exit_Error = 1,
+ Exit_HangUp = 2,
+ Exit_Input_Fail = 3,
+ Exit_Bad_Arg = 4,
+ Exit_Cant_Connect = 5
+};
+
+
/* declaration of functions */
static void on_wsj1_hangup(void *closure, struct afb_wsj1 *wsj1);
static void on_wsj1_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
static void on_pws_hangup(void *closure);
static void on_pws_reply(void *closure, void *request, struct json_object *result, const char *error, const char *info);
-static void on_pws_event_create(void *closure, const char *event_name, int event_id);
-static void on_pws_event_remove(void *closure, const char *event_name, int event_id);
-static void on_pws_event_subscribe(void *closure, void *request, const char *event_name, int event_id);
-static void on_pws_event_unsubscribe(void *closure, void *request, const char *event_name, int event_id);
-static void on_pws_event_push(void *closure, const char *event_name, int event_id, struct json_object *data);
-static void on_pws_event_broadcast(void *closure, const char *event_name, struct json_object *data);
+static void on_pws_event_create(void *closure, uint16_t event_id, const char *event_name);
+static void on_pws_event_remove(void *closure, uint16_t event_id);
+static void on_pws_event_subscribe(void *closure, void *request, uint16_t event_id);
+static void on_pws_event_unsubscribe(void *closure, void *request, uint16_t event_id);
+static void on_pws_event_push(void *closure, uint16_t event_id, struct json_object *data);
+static void on_pws_event_broadcast(void *closure, const char *event_name, struct json_object *data, const afb_proto_ws_uuid_t uuid, uint8_t hop);
-static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *closure);
+static void idle();
+static int process_stdin();
+static int on_stdin(sd_event_source *src, int fd, uint32_t revents, void *closure);
static void wsj1_emit(const char *api, const char *verb, const char *object);
static void pws_call(const char *verb, const char *object);
static int callcount;
static int human;
static int raw;
+static int keeprun;
static int direct;
static int echo;
+static int synchro;
+static int usein;
+static sd_event *loop;
static sd_event_source *evsrc;
-static char *sessionid = "afb-client-demo";
+static char *uuid;
+static char *token;
+static uint16_t numuuid;
+static uint16_t numtoken;
+static char *url;
+static int exitcode = 0;
/* print usage of the program */
static void usage(int status, char *arg0)
{
char *name = strrchr(arg0, '/');
name = name ? name + 1 : arg0;
- fprintf(status ? stderr : stdout, "usage: %s [-H [-r]] [-b] [-e] uri [api verb [data]]\n", name);
- fprintf(status ? stderr : stdout, " %s -d [-H [-r]] [-b] [-e] uri [verb [data]]\n", name);
+ fprintf(status ? stderr : stdout, "usage: %s [options]... uri [api verb [data]]\n", name);
+ fprintf(status ? stderr : stdout, " %s -d [options]... uri [verb [data]]\n", name);
fprintf(status ? stderr : stdout, "\n"
"allowed options\n"
- " --break, -b Break connection just after event/call has been emitted.\n"
- " --direct, -d Direct api\n"
- " --echo, -e Echo inputs\n"
- " --help, -h Display this help\n"
- " --human, -H Display human readable JSON\n"
- " --raw, -r Raw output (default)\n"
+ " -b, --break Break connection just after event/call has been emitted.\n"
+ " -d, --direct Direct api\n"
+ " -e, --echo Echo inputs\n"
+ " -h, --help Display this help\n"
+ " -H, --human Display human readable JSON\n"
+ " -k, --keep-running Keep running until disconnect, even if input closed\n"
+ " -p, --pipe COUNT Allow to pipe COUNT requests\n"
+ " -r, --raw Raw output (default)\n"
+ " -s, --sync Synchronous: wait for answers (like -p 1)\n"
+ " -t, --token TOKEN The token to use\n"
+ " -u, --uuid UUID The identifier of session to use\n"
"Example:\n"
" %s --human 'localhost:1234/api?token=HELLO&uuid=magic' hello ping\n"
"\n", name
int main(int ac, char **av, char **env)
{
int rc;
- char *a0;
- sd_event *loop;
+ char *a0, *an;
/* get the program name */
a0 = av[0];
/* check options */
- while (ac > 1 && av[1][0] == '-') {
- if (av[1][1] == '-') {
+ while (ac > 1 && (an = av[1])[0] == '-') {
+ if (an[1] == '-') {
/* long option */
- if (!strcmp(av[1], "--human")) /* request for human output */
+ if (!strcmp(an, "--human")) /* request for human output */
human = 1;
- else if (!strcmp(av[1], "--raw")) /* request for raw output */
+ else if (!strcmp(an, "--raw")) /* request for raw output */
raw = 1;
- else if (!strcmp(av[1], "--direct")) /* request for direct api */
+ else if (!strcmp(an, "--direct")) /* request for direct api */
direct = 1;
- else if (!strcmp(av[1], "--break")) /* request to break connection */
+ else if (!strcmp(an, "--break")) /* request to break connection */
breakcon = 1;
- else if (!strcmp(av[1], "--echo")) /* request to echo inputs */
+ else if (!strcmp(an, "--keep-running")) /* request to break connection */
+ keeprun = 1;
+
+ else if (!strcmp(an, "--sync")) /* request to break connection */
+ synchro = 1;
+
+ else if (!strcmp(an, "--echo")) /* request to echo inputs */
echo = 1;
+ else if (!strcmp(an, "--pipe") && av[2] && atoi(av[2]) > 0) {
+ synchro = atoi(av[2]);
+ av++;
+ ac--;
+ }
+ else if (!strcmp(an, "--token") && av[2]) { /* token to use */
+ token = av[2];
+ av++;
+ ac--;
+ }
+ else if (!strcmp(an, "--uuid") && av[2]) { /* session id to join */
+ uuid = av[2];
+ av++;
+ ac--;
+ }
/* emit usage and exit */
else
- usage(!!strcmp(av[1], "--help"), a0);
+ usage(strcmp(an, "--help") ? Exit_Bad_Arg : Exit_Success, a0);
} else {
/* short option(s) */
- for (rc = 1 ; av[1][rc] ; rc++)
- switch (av[1][rc]) {
+ for (rc = 1 ; an[rc] ; rc++)
+ switch (an[rc]) {
case 'H': human = 1; break;
case 'r': raw = 1; break;
case 'd': direct = 1; break;
case 'b': breakcon = 1; break;
+ case 'k': keeprun = 1; break;
+ case 's': synchro = 1; break;
case 'e': echo = 1; break;
- default: usage(av[1][rc] != 'h', a0);
+ case 't': if (!av[2]) usage(Exit_Bad_Arg, a0); token = av[2]; av++; ac--; break;
+ case 'u': if (!av[2]) usage(Exit_Bad_Arg, a0); uuid = av[2]; av++; ac--; break;
+ case 'p': if (av[2] && atoi(av[2]) > 0) { synchro = atoi(av[2]); av++; ac--; break; } /*@fallthrough@*/
+ default:
+ usage(an[rc] != 'h' ? Exit_Bad_Arg : Exit_Success, a0);
+ break;
}
}
av++;
pws = afb_ws_client_connect_api(loop, av[1], &pws_itf, NULL);
if (pws == NULL) {
fprintf(stderr, "connection to %s failed: %m\n", av[1]);
- return 1;
+ return Exit_Cant_Connect;
}
afb_proto_ws_on_hangup(pws, on_pws_hangup);
+ if (uuid) {
+ numuuid = 1;
+ afb_proto_ws_client_session_create(pws, numuuid, uuid);
+ }
+ if (token) {
+ numtoken = 1;
+ afb_proto_ws_client_token_create(pws, numtoken, token);
+ }
} else {
- wsj1 = afb_ws_client_connect_wsj1(loop, av[1], &wsj1_itf, NULL);
+ rc = asprintf(&url, "%s%s%s%s%s%s%s",
+ av[1],
+ uuid || token ? "?" : "",
+ uuid ? "uuid=" : "",
+ uuid ?: "",
+ uuid && token ? "&" : "",
+ token ? "token=" : "",
+ token ?: ""
+ );
+ wsj1 = afb_ws_client_connect_wsj1(loop, url, &wsj1_itf, NULL);
if (wsj1 == NULL) {
fprintf(stderr, "connection to %s failed: %m\n", av[1]);
- return 1;
+ return Exit_Cant_Connect;
}
}
/* test the behaviour */
if (ac == 2) {
/* get requests from stdin */
+ usein = 1;
fcntl(0, F_SETFL, O_NONBLOCK);
- sd_event_add_io(loop, &evsrc, 0, EPOLLIN, io_event_callback, NULL);
+ if (sd_event_add_io(loop, &evsrc, 0, EPOLLIN, on_stdin, NULL) < 0)
+ evsrc = NULL;
} else {
/* the request is defined by the arguments */
- exonrep = 1;
+ usein = 0;
+ exonrep = !keeprun;
if (direct)
pws_call(av[2], av[3]);
else
}
/* loop until end */
- for(;;)
- sd_event_run(loop, 30000000);
+ idle();
return 0;
}
+static void idle()
+{
+ for(;;) {
+ if (!usein) {
+ if (!keeprun && !callcount)
+ exit(exitcode);
+ sd_event_run(loop, 30000000);
+ }
+ else if (!synchro || callcount < synchro) {
+ if (!process_stdin() && usein)
+ sd_event_run(loop, 100000);
+ } else {
+ sd_event_run(loop, 30000000);
+ }
+ }
+}
+
/* decrement the count of calls */
static void dec_callcount()
{
callcount--;
if (exonrep && !callcount)
- exit(0);
+ exit(exitcode);
}
/* called when wsj1 hangsup */
{
printf("ON-HANGUP\n");
fflush(stdout);
- exit(0);
+ exit(Exit_HangUp);
}
/* called when wsj1 receives a method invocation */
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));
+ JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
fflush(stdout);
rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL);
if (rc < 0)
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));
+ JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
fflush(stdout);
}
/* called when wsj1 receives a reply */
static void on_wsj1_reply(void *closure, struct afb_wsj1_msg *msg)
{
+ int iserror = !afb_wsj1_msg_is_reply_ok(msg);
+ exitcode = iserror ? Exit_Error : Exit_Success;
if (raw)
printf("%s\n", 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",
+ iserror ? "ERROR" : "OK",
json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
- JSON_C_TO_STRING_PRETTY));
+ JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
fflush(stdout);
free(closure);
dec_callcount();
exit(0);
}
-/* called when something happens on stdin */
-static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *closure)
+/* process stdin */
+static int process_stdin()
{
static size_t count = 0;
static char line[16384];
static char sep[] = " \t";
static char sepnl[] = " \t\n";
- ssize_t rc;
+ int result = 0;
+ ssize_t rc = 0;
size_t pos;
/* read the buffer */
- do { rc = read(0, line + count, sizeof line - count); } while (rc < 0 && errno == EINTR);
+ while (sizeof line > count) {
+ rc = read(0, line + count, sizeof line - count);
+ if (rc >= 0 || errno != EINTR)
+ break;
+ }
if (rc < 0) {
+ if (errno == EAGAIN)
+ return 0;
fprintf(stderr, "read error: %m\n");
- exit(1);
+ exit(Exit_Input_Fail);
}
if (rc == 0) {
- if (!callcount)
- exit(0);
- exonrep = 1;
- sd_event_source_unref(evsrc);
+ usein = count != 0;
+ if (!usein && !keeprun) {
+ if (!callcount)
+ exit(exitcode);
+ exonrep = 1;
+ }
}
count += (size_t)rc;
+ if (synchro && callcount >= synchro)
+ return 0;
/* normalise the buffer content */
/* TODO: handle backspace \x7f ? */
-
/* process the lines */
pos = 0;
for(;;) {
rest[0] = i; while(i < count && line[i] != '\n') i++; rest[1] = i;
if (i == count) break;
line[i++] = 0;
+ pos = i;
if (api[0] == api[1]) {
/* empty line */
} else if (line[api[0]] == '#') {
pws_call(line + verb[0], line + rest[0]);
else
wsj1_emit(line + api[0], line + verb[0], line + rest[0]);
+ result = 1;
+ break;
}
- pos = i;
}
count -= pos;
if (count == sizeof line) {
fprintf(stderr, "overflow\n");
- exit(1);
+ exit(Exit_Input_Fail);
}
if (count)
memmove(line, line + pos, count);
+
+ return result;
+}
+
+/* called when something happens on stdin */
+static int on_stdin(sd_event_source *src, int fd, uint32_t revents, void *closure)
+{
+ process_stdin();
+ if (!usein) {
+ sd_event_source_unref(src);
+ evsrc = NULL;
+ }
return 1;
}
static void on_pws_reply(void *closure, void *request, struct json_object *result, const char *error, const char *info)
{
+ int iserror = !!error;
+ exitcode = iserror ? Exit_Error : Exit_Success;
error = error ?: "success";
if (raw) {
/* TODO: transitionnal: fake the structured response */
if (result)
json_object_object_add(x, "response", json_object_get(result));
- printf("%s\n", json_object_to_json_string(x));
+ printf("%s\n", json_object_to_json_string_ext(x, JSON_C_TO_STRING_NOSLASHESCAPE));
json_object_put(x);
}
if (human)
- printf("ON-REPLY %s: %s %s\n%s\n", (char*)request, error, info ?: "", json_object_to_json_string_ext(result, JSON_C_TO_STRING_PRETTY));
+ printf("ON-REPLY %s: %s %s\n%s\n", (char*)request, error, info ?: "", json_object_to_json_string_ext(result, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
fflush(stdout);
free(request);
dec_callcount();
}
-static void on_pws_event_create(void *closure, const char *event_name, int event_id)
+static void on_pws_event_create(void *closure, uint16_t event_id, const char *event_name)
{
printf("ON-EVENT-CREATE: [%d:%s]\n", event_id, event_name);
fflush(stdout);
}
-static void on_pws_event_remove(void *closure, const char *event_name, int event_id)
+static void on_pws_event_remove(void *closure, uint16_t event_id)
{
- printf("ON-EVENT-REMOVE: [%d:%s]\n", event_id, event_name);
+ printf("ON-EVENT-REMOVE: [%d]\n", event_id);
fflush(stdout);
}
-static void on_pws_event_subscribe(void *closure, void *request, const char *event_name, int event_id)
+static void on_pws_event_subscribe(void *closure, void *request, uint16_t event_id)
{
- printf("ON-EVENT-SUBSCRIBE %s: [%d:%s]\n", (char*)request, event_id, event_name);
+ printf("ON-EVENT-SUBSCRIBE %s: [%d]\n", (char*)request, event_id);
fflush(stdout);
}
-static void on_pws_event_unsubscribe(void *closure, void *request, const char *event_name, int event_id)
+static void on_pws_event_unsubscribe(void *closure, void *request, uint16_t event_id)
{
- printf("ON-EVENT-UNSUBSCRIBE %s: [%d:%s]\n", (char*)request, event_id, event_name);
+ printf("ON-EVENT-UNSUBSCRIBE %s: [%d]\n", (char*)request, event_id);
fflush(stdout);
}
-static void on_pws_event_push(void *closure, const char *event_name, int event_id, struct json_object *data)
+static void on_pws_event_push(void *closure, uint16_t event_id, struct json_object *data)
{
if (raw)
- printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, 0));
+ printf("ON-EVENT-PUSH: [%d]\n%s\n", event_id, json_object_to_json_string_ext(data, JSON_C_TO_STRING_NOSLASHESCAPE));
if (human)
- printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY));
+ printf("ON-EVENT-PUSH: [%d]\n%s\n", event_id, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
fflush(stdout);
}
-static void on_pws_event_broadcast(void *closure, const char *event_name, struct json_object *data)
+static void on_pws_event_broadcast(void *closure, const char *event_name, struct json_object *data, const afb_proto_ws_uuid_t uuid, uint8_t hop)
{
if (raw)
- printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, 0));
+ printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_NOSLASHESCAPE));
if (human)
- printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY));
+ printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
fflush(stdout);
}
char *key;
int rc;
struct json_object *o;
+ enum json_tokener_error jerr;
/* allocates an id for the request */
rc = asprintf(&key, "%d:%s", ++num, verb);
/* send the request */
callcount++;
- if (object == NULL || object[0] == 0 || !strcmp(object, "null"))
+ if (object == NULL || object[0] == 0)
o = NULL;
else {
- o = json_tokener_parse(object);
- if (!o)
+ o = json_tokener_parse_verbose(object, &jerr);
+ if (jerr != json_tokener_success)
o = json_object_new_string(object);
}
- rc = afb_proto_ws_client_call(pws, verb, o, sessionid, key, NULL);
+ rc = afb_proto_ws_client_call(pws, verb, o, numuuid, numtoken, key, NULL);
json_object_put(o);
if (rc < 0) {
fprintf(stderr, "calling %s(%s) failed: %m\n", verb, object?:"");
{
printf("ON-HANGUP\n");
fflush(stdout);
- exit(0);
+ exit(Exit_HangUp);
}
-
-
Code Review / src / app-framework-binder.git / blobdiff