X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2FAFB.js;h=88da4d55c9a9a31d627404c65507e1b0c7630837;hb=e28787235090fdf2be6626e1e0a7e02314013652;hp=ae2fd8b8f4a11a6663c316d32197a16d12c3aedb;hpb=94ad734842c1359a012f9850b851063637d3e061;p=src%2Fapp-framework-binder.git

diff --git a/test/AFB.js b/test/AFB.js
index ae2fd8b8..88da4d55 100644
--- a/test/AFB.js
+++ b/test/AFB.js
@@ -1,7 +1,16 @@
 AFB = function(base, initialtoken){
 
-var urlws = "ws://"+window.location.host+"/"+base;
-var urlhttp = "http://"+window.location.host+"/"+base;
+if (typeof base != "object")
+	base = { base: base, token: initialtoken };
+
+var initial = {
+	base: base.base || "api",
+	token: base.token || "hello",
+	host: base.host || window.location.host,
+	url: base.url || undefined
+};
+
+var urlws = initial.url || "ws://"+initial.host+"/"+initial.base;
 
 /*********************************************/
 /****                                     ****/
@@ -11,7 +20,7 @@ var urlhttp = "http://"+window.location.host+"/"+base;
 var AFB_context;
 {
 	var UUID = undefined;
-	var TOKEN = initialtoken;
+	var TOKEN = initial.token;
 
 	var context = function(token, uuid) {
 		this.token = token;
@@ -42,7 +51,14 @@ var AFB_websocket;
 	var PROTO1 = "x-afb-ws-json1";
 
 	AFB_websocket = function(onopen, onabort) {
-		this.ws = new WebSocket(urlws, [ PROTO1 ]);
+		var u = urlws;
+		if (AFB_context.token) {
+			u = u + '?x-afb-token=' + AFB_context.token;
+			if (AFB_context.uuid)
+				u = u + '&x-afb-uuid=' + AFB_context.uuid;
+		}
+		this.ws = new WebSocket(u, [ PROTO1 ]);
+		this.url = u;
 		this.pendings = {};
 		this.awaitens = {};
 		this.counter = 0;
@@ -126,6 +142,12 @@ var AFB_websocket;
 
 	function close() {
 		this.ws.close();
+		this.ws.onopen = 
+		this.ws.onerror = 
+		this.ws.onclose = 
+		this.ws.onmessage = 
+		this.onopen = 
+		this.onabort = function(){};
 	}
 
 	function call(method, request) {