Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-export: Emit a warning on bad 'afb_require_api' call
[src/app-framework-binder.git]
/
test
/
AFB.js
diff --git
a/test/AFB.js
b/test/AFB.js
index
ea70357
..
aa63416
100644
(file)
--- a/
test/AFB.js
+++ b/
test/AFB.js
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017
, 2018
"IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-21,7
+21,7
@@
if (typeof base != "object")
var initial = {
base: base.base || "api",
var initial = {
base: base.base || "api",
- token: base.token || initialtoken || "
hello
",
+ token: base.token || initialtoken || "
HELLO
",
host: base.host || window.location.host,
url: base.url || undefined
};
host: base.host || window.location.host,
url: base.url || undefined
};
@@
-67,12
+67,13
@@
var AFB_websocket;
var PROTO1 = "x-afb-ws-json1";
AFB_websocket = function(on_open, on_abort) {
var PROTO1 = "x-afb-ws-json1";
AFB_websocket = function(on_open, on_abort) {
- var u = urlws;
+ var u = urlws
, p = '?'
;
if (AFB_context.token) {
u = u + '?x-afb-token=' + AFB_context.token;
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 = {};
this.ws = new WebSocket(u, [ PROTO1 ]);
this.url = u;
this.pendings = {};
@@
-104,8
+105,15
@@
var AFB_websocket;
}
function onclose(event) {
}
function onclose(event) {
+ var err = {
+ jtype: 'afb-reply',
+ request: {
+ status: 'disconnected',
+ info: 'server hung up'
+ }
+ };
for (var id in this.pendings) {
for (var id in this.pendings) {
- try { this.pendings[id][1](
); } catch (x) {/*TODO?
*/}
+ try { this.pendings[id][1](
err); } catch (x) {/*NOTHING
*/}
}
this.pendings = {};
this.onclose && this.onclose();
}
this.pendings = {};
this.onclose && this.onclose();