summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumberto Alfonso Díaz <humberto.alfonso@asvito.es>2019-10-08 11:37:42 +0200
committerLorenzo Tilve <ltilve@igalia.com>2020-02-04 20:02:02 +0100
commit020825740296db5a74864e1cd62978c732b079f3 (patch)
tree435671af362f044f12f4df9297b63dceeaa12afc
parent74d935c6a3a4cc130000f23e84a7362fbb8db1bd (diff)
FUNCT Integrate agl-js-api
Change-Id: I04ba92c055b761c84bbfb8382921628fd3c5b262
-rw-r--r--package.json3
-rw-r--r--src/index.js1
-rw-r--r--src/js/AFB.js215
-rw-r--r--src/js/app.js72
4 files changed, 8 insertions, 283 deletions
diff --git a/package.json b/package.json
index c5c9687..27ecd0d 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
"zip-webpack-plugin": "^3.0.0"
},
"dependencies": {
- "mustache": "^3.0.1"
+ "mustache": "^3.0.1",
+ "agl-js-api": "git@bitbucket.org:smarsol/agl-js-api.git#master"
}
}
diff --git a/src/index.js b/src/index.js
index ec4eafa..775b3af 100644
--- a/src/index.js
+++ b/src/index.js
@@ -15,7 +15,6 @@
*/
/* JS */
-import './js/AFB.js';
import { init, launch } from './js/app.js';
/* CSS */
diff --git a/src/js/AFB.js b/src/js/AFB.js
deleted file mode 100644
index d6e6bfa..0000000
--- a/src/js/AFB.js
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2017, 2018 "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")
- base = { base: base, token: initialtoken };
-
-var initial = {
- base: base.base || "api",
- token: base.token || initialtoken || "HELLO",
- host: base.host || window.location.host,
- url: base.url || undefined
-};
-
-var urlws = initial.url || "ws://"+initial.host+"/"+initial.base;
-
-/*********************************************/
-/**** ****/
-/**** AFB_context ****/
-/**** ****/
-/*********************************************/
-var AFB_context;
-{
- var UUID = undefined;
- var TOKEN = initial.token;
-
- var context = function(token, uuid) {
- this.token = token;
- this.uuid = uuid;
- }
-
- context.prototype = {
- get token() {return TOKEN;},
- set token(tok) {if(tok) TOKEN=tok;},
- get uuid() {return UUID;},
- set uuid(id) {if(id) UUID=id;}
- };
-
- AFB_context = new context();
-}
-/*********************************************/
-/**** ****/
-/**** AFB_websocket ****/
-/**** ****/
-/*********************************************/
-var AFB_websocket;
-{
- var CALL = 2;
- var RETOK = 3;
- var RETERR = 4;
- var EVENT = 5;
-
- var PROTO1 = "x-afb-ws-json1";
-
- AFB_websocket = function(on_open, on_abort) {
- var u = urlws, p = '?';
- if (AFB_context.token) {
- u = u + '?x-afb-token=' + AFB_context.token;
- 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.awaitens = {};
- this.counter = 0;
- this.ws.onopen = onopen.bind(this);
- this.ws.onerror = onerror.bind(this);
- this.ws.onclose = onclose.bind(this);
- this.ws.onmessage = onmessage.bind(this);
- this.onopen = on_open;
- this.onabort = on_abort;
- }
-
- function onerror(event) {
- var f = this.onabort;
- if (f) {
- delete this.onopen;
- delete this.onabort;
- f && f(this);
- }
- this.onerror && this.onerror(this);
- }
-
- function onopen(event) {
- var f = this.onopen;
- delete this.onopen;
- delete this.onabort;
- f && f(this);
- }
-
- function onclose(event) {
- var err = {
- jtype: 'afb-reply',
- request: {
- status: 'disconnected',
- info: 'server hung up'
- }
- };
- for (var id in this.pendings) {
- try { this.pendings[id][1](err); } catch (x) {/*NOTHING*/}
- }
- this.pendings = {};
- this.onclose && this.onclose();
- }
-
- function fire(awaitens, name, data) {
- var a = awaitens[name];
- if (a)
- a.forEach(function(handler){handler(data);});
- var i = name.indexOf("/");
- if (i >= 0) {
- a = awaitens[name.substring(0,i)];
- if (a)
- a.forEach(function(handler){handler(data);});
- }
- a = awaitens["*"];
- if (a)
- a.forEach(function(handler){handler(data);});
- }
-
- function reply(pendings, id, ans, offset) {
- if (id in pendings) {
- var p = pendings[id];
- delete pendings[id];
- try { p[offset](ans); } catch (x) {/*TODO?*/}
- }
- }
-
- function onmessage(event) {
- var obj = JSON.parse(event.data);
- var code = obj[0];
- var id = obj[1];
- var ans = obj[2];
- AFB_context.token = obj[3];
- switch (code) {
- case RETOK:
- reply(this.pendings, id, ans, 0);
- break;
- case RETERR:
- reply(this.pendings, id, ans, 1);
- break;
- case EVENT:
- default:
- fire(this.awaitens, id, ans);
- break;
- }
- }
-
- 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, callid) {
- return new Promise((function(resolve, reject){
- var id, arr;
- 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);
- this.ws.send(JSON.stringify(arr));
- }).bind(this));
- }
-
- function onevent(name, handler) {
- var id = name;
- var list = this.awaitens[id] || (this.awaitens[id] = []);
- list.push(handler);
- }
-
- AFB_websocket.prototype = {
- close: close,
- call: call,
- onevent: onevent
- };
-}
-/*********************************************/
-/**** ****/
-/**** ****/
-/**** ****/
-/*********************************************/
-return {
- context: AFB_context,
- ws: AFB_websocket
-};
-};
diff --git a/src/js/app.js b/src/js/app.js
index 7f92d4f..08ae599 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -15,13 +15,9 @@
*/
import Mustache from 'mustache';
-var configjson = require('../config.json');
+import { afmMain } from 'agl-js-api';
-var host = document.location.hostname;
-var port = document.location.port;
-var args = new URLSearchParams(document.location.search.substring(1));
-var token = args.get("x-afb-token") || args.get("token") || "HELLO";
-var afb;
+var configjson = require('../config.json');
var template;
function log(smgs) {
@@ -69,76 +65,20 @@ function render_applications(apps) {
}
function load_application_list() {
- var ws = new afb.ws(function() {
- var api_verb = "afm-main/runnables";
- ws.call(api_verb, {}).then(
- function(obj) {
- render_applications(obj.response);
- },
- function(obj) {
- //TODO Manage errors
- log("failure");
- }
- );
- },
- function() {
- //TODO manage errors
- log("ws aborted");
- });
-}
-
-export function display(app) {
- var appId = app.getAttribute('app-id');
- var ws = new afb.ws(function() {
- var api_verb = "homescreen/showWindow";
- var split_id = appId.split('@');
- var request = {application_id: split_id[0], parameter: {area: "normal.full"}};
- ws.call(api_verb, request).then(
- function(obj) {
- log("success: " + obj.response);
- },
- function(obj) {
- //TODO Manage errors
- log("failure on display");
- }
- );
- },
- function() {
- //TODO Manage errors
- log("ws aborted");
+ afmMain.runnables().then(function(result) {
+ render_applications(result);
});
}
export function launch(app) {
var appId = app.getAttribute('app-id');
- var ws = new afb.ws(function() {
- var api_verb = "afm-main/start";
- var request = {id: appId};
- ws.call(api_verb, request).then(
- function(obj) {
- log("success: " + obj.response);
- display(app);
- },
- function(obj) {
- //TODO Manage errors
- log("failure on launch");
- }
- );
- },
- function() {
- //TODO Manage errors
- log("ws aborted");
+ afmMain.start(appId).then(function(result) {
+ log("success: " + result);
});
}
export function init() {
template = document.getElementById('item-template').innerHTML;
Mustache.parse(template);
-
- // host: "raspberrypi3.local:31022",
- afb = new AFB({
- host: host+":"+port,
- token: token
- });
load_application_list();
} \ No newline at end of file