AFB.js: Improve default token discovery

[src/app-framework-binder.git] / test / AFB.js

diff --git a/test/AFB.js b/test/AFB.js
index 88da4d5..4c500b9 100644 (file)
--- a/test/AFB.js
+++ b/test/AFB.js
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2017-2019 "IoT.bzh"
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 AFB = function(base, initialtoken){
 
 if (typeof base != "object")
@@ -5,7 +21,7 @@ if (typeof base != "object")
 
 var initial = {
        base: base.base || "api",
-       token: base.token || "hello",
+       token: initialtoken || base.token || URLSearchParams(window.location.search).get('token') || "HELLO",
        host: base.host || window.location.host,
        url: base.url || undefined
 };
@@ -50,13 +66,14 @@ var AFB_websocket;
 
        var PROTO1 = "x-afb-ws-json1";
 
-       AFB_websocket = function(onopen, onabort) {
-               var u = urlws;
+       AFB_websocket = function(on_open, on_abort) {
+               var u = urlws, p = '?';
                if (AFB_context.token) {
                        u = u + '?x-afb-token=' + AFB_context.token;
-                       if (AFB_context.uuid)
-                               u = u + '&x-afb-uuid=' + AFB_context.uuid;
+                       p = '&';
                }
+               if (AFB_context.uuid)
+                       u = u + p + 'x-afb-uuid=' + AFB_context.uuid;
                this.ws = new WebSocket(u, [ PROTO1 ]);
                this.url = u;
                this.pendings = {};
@@ -66,8 +83,8 @@ var AFB_websocket;
                this.ws.onerror = onerror.bind(this);
                this.ws.onclose = onclose.bind(this);
                this.ws.onmessage = onmessage.bind(this);
-               this.onopen = onopen;
-               this.onabort = onabort;
+               this.onopen = on_open;
+               this.onabort = on_abort;
        }
 
        function onerror(event) {
@@ -75,7 +92,7 @@ var AFB_websocket;
                if (f) {
                        delete this.onopen;
                        delete this.onabort;
-                       f && f(this);
+                       f(this);
                }
                this.onerror && this.onerror(this);
        }
@@ -88,9 +105,15 @@ var AFB_websocket;
        }
 
        function onclose(event) {
+               var err = {
+                       jtype: 'afb-reply',
+                       request: {
+                               status: 'disconnected',
+                               info: 'server hung up'
+                       }
+               };
                for (var id in this.pendings) {
-                       var ferr = this.pendings[id].onerror;
-                       ferr && ferr(null, this);
+                       try { this.pendings[id][1](err); } catch (x) {/*NOTHING*/}
                }
                this.pendings = {};
                this.onclose && this.onclose();
@@ -115,8 +138,7 @@ var AFB_websocket;
                if (id in pendings) {
                        var p = pendings[id];
                        delete pendings[id];
-                       var f = p[offset];
-                       f(ans);
+                       try { p[offset](ans); } catch (x) {/*TODO?*/}
                }
        }
 
@@ -129,14 +151,14 @@ var AFB_websocket;
                switch (code) {
                case RETOK:
                        reply(this.pendings, id, ans, 0);
-                       break; 
+                       break;
                case RETERR:
                        reply(this.pendings, id, ans, 1);
-                       break; 
+                       break;
                case EVENT:
                default:
                        fire(this.awaitens, id, ans);
-                       break; 
+                       break;
                }
        }
 
@@ -150,12 +172,18 @@ var AFB_websocket;
                this.onabort = function(){};
        }
 
-       function call(method, request) {
+       function call(method, request, callid) {
                return new Promise((function(resolve, reject){
                        var id, arr;
-                       do {
-                               id = String(this.counter = 4095 & (this.counter + 1));
-                       } while (id in this.pendings);
+                       if (callid) {
+                               id = String(callid);
+                               if (id in this.pendings)
+                                       throw new Error("pending callid("+id+") exists");
+                       } else {
+                               do {
+                                       id = String(this.counter = 4095 & (this.counter + 1));
+                               } while (id in this.pendings);
+                       }
                        this.pendings[id] = [ resolve, reject ];
                        arr = [CALL, id, method, request ];
                        if (AFB_context.token) arr.push(AFB_context.token);