Commit 84b36a71 authored by Marek Kotewicz's avatar Marek Kotewicz

retabed files

parent dea68f07
...@@ -21,74 +21,73 @@ ...@@ -21,74 +21,73 @@
* @date 2014 * @date 2014
*/ */
if(process.env.NODE_ENV !== "build") { if (process.env.NODE_ENV !== "build") {
var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
} }
var HttpRpcProvider = function (host) {
this.handlers = [];
this.host = host;
};
var HttpRpcProvider = function (host) { function formatJsonRpcObject(object) {
this.handlers = []; return {
this.host = host; jsonrpc: '2.0',
method: object.call,
params: object.args,
id: object._id
}; };
}
function formatJsonRpcObject(object) { function formatJsonRpcMessage(message) {
return { var object = JSON.parse(message);
jsonrpc: '2.0',
method: object.call,
params: object.args,
id: object._id
};
}
function formatJsonRpcMessage(message) {
var object = JSON.parse(message);
return {
_id: object.id,
data: object.result,
error: object.error
};
}
HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
var data = formatJsonRpcObject(payload);
var request = new XMLHttpRequest(); return {
request.open("POST", this.host, true); _id: object.id,
request.send(JSON.stringify(data)); data: object.result,
request.onreadystatechange = function () { error: object.error
if (request.readyState === 4 && cb) {
cb(request);
}
};
}; };
}
HttpRpcProvider.prototype.send = function (payload) { HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
var self = this; var data = formatJsonRpcObject(payload);
this.sendRequest(payload, function (request) {
self.handlers.forEach(function (handler) { var request = new XMLHttpRequest();
handler.call(self, formatJsonRpcMessage(request.responseText)); request.open("POST", this.host, true);
}); request.send(JSON.stringify(data));
}); request.onreadystatechange = function () {
if (request.readyState === 4 && cb) {
cb(request);
}
}; };
};
HttpRpcProvider.prototype.poll = function (payload, id) { HttpRpcProvider.prototype.send = function (payload) {
var self = this; var self = this;
this.sendRequest(payload, function (request) { this.sendRequest(payload, function (request) {
var parsed = JSON.parse(request.responseText); self.handlers.forEach(function (handler) {
if (parsed.error || (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result)) { handler.call(self, formatJsonRpcMessage(request.responseText));
return;
}
self.handlers.forEach(function (handler) {
handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
});
}); });
}; });
};
Object.defineProperty(HttpRpcProvider.prototype, "onmessage", { HttpRpcProvider.prototype.poll = function (payload, id) {
set: function (handler) { var self = this;
this.handlers.push(handler); this.sendRequest(payload, function (request) {
var parsed = JSON.parse(request.responseText);
if (parsed.error || (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result)) {
return;
} }
self.handlers.forEach(function (handler) {
handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
});
}); });
};
Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
set: function (handler) {
this.handlers.push(handler);
}
});
module.exports = HttpRpcProvider; module.exports = HttpRpcProvider;
This diff is collapsed.
...@@ -16,29 +16,30 @@ ...@@ -16,29 +16,30 @@
*/ */
/** @file qt.js /** @file qt.js
* @authors: * @authors:
* Jeffrey Wilcke <jeff@ethdev.com>
* Marek Kotewicz <marek@ethdev.com> * Marek Kotewicz <marek@ethdev.com>
* @date 2014 * @date 2014
*/ */
var QtProvider = function() { var QtProvider = function() {
this.handlers = []; this.handlers = [];
var self = this; var self = this;
navigator.qt.onmessage = function (message) { navigator.qt.onmessage = function (message) {
self.handlers.forEach(function (handler) { self.handlers.forEach(function (handler) {
handler.call(self, JSON.parse(message.data)); handler.call(self, JSON.parse(message.data));
}); });
};
}; };
};
QtProvider.prototype.send = function(payload) { QtProvider.prototype.send = function(payload) {
navigator.qt.postMessage(JSON.stringify(payload)); navigator.qt.postMessage(JSON.stringify(payload));
}; };
Object.defineProperty(QtProvider.prototype, "onmessage", { Object.defineProperty(QtProvider.prototype, "onmessage", {
set: function(handler) { set: function(handler) {
this.handlers.push(handler); this.handlers.push(handler);
} }
}); });
module.exports = QtProvider; module.exports = QtProvider;
...@@ -16,59 +16,61 @@ ...@@ -16,59 +16,61 @@
*/ */
/** @file websocket.js /** @file websocket.js
* @authors: * @authors:
* Jeffrey Wilcke <jeff@ethdev.com>
* Marek Kotewicz <marek@ethdev.com> * Marek Kotewicz <marek@ethdev.com>
* Marian Oancea <marian@ethdev.com> * Marian Oancea <marian@ethdev.com>
* @date 2014 * @date 2014
*/ */
if(process.env.NODE_ENV !== "build") { if (process.env.NODE_ENV !== "build") {
var WebSocket = require('ws'); // jshint ignore:line var WebSocket = require('ws'); // jshint ignore:line
} }
var WebSocketProvider = function(host) { var WebSocketProvider = function(host) {
// onmessage handlers // onmessage handlers
this.handlers = []; this.handlers = [];
// queue will be filled with messages if send is invoked before the ws is ready // queue will be filled with messages if send is invoked before the ws is ready
this.queued = []; this.queued = [];
this.ready = false; this.ready = false;
this.ws = new WebSocket(host); this.ws = new WebSocket(host);
var self = this; var self = this;
this.ws.onmessage = function(event) { this.ws.onmessage = function(event) {
for(var i = 0; i < self.handlers.length; i++) { for(var i = 0; i < self.handlers.length; i++) {
self.handlers[i].call(self, JSON.parse(event.data), event); self.handlers[i].call(self, JSON.parse(event.data), event);
} }
};
this.ws.onopen = function() {
self.ready = true;
for(var i = 0; i < self.queued.length; i++) {
// Resend
self.send(self.queued[i]);
}
};
}; };
WebSocketProvider.prototype.send = function(payload) {
if(this.ready) {
var data = JSON.stringify(payload);
this.ws.send(data); this.ws.onopen = function() {
} else { self.ready = true;
this.queued.push(payload);
for(var i = 0; i < self.queued.length; i++) {
// Resend
self.send(self.queued[i]);
} }
}; };
};
WebSocketProvider.prototype.onMessage = function(handler) { WebSocketProvider.prototype.send = function(payload) {
this.handlers.push(handler); if(this.ready) {
}; var data = JSON.stringify(payload);
WebSocketProvider.prototype.unload = function() { this.ws.send(data);
this.ws.close(); } else {
}; this.queued.push(payload);
Object.defineProperty(WebSocketProvider.prototype, "onmessage", { }
set: function(provider) { this.onMessage(provider); } };
});
WebSocketProvider.prototype.onMessage = function(handler) {
this.handlers.push(handler);
};
WebSocketProvider.prototype.unload = function() {
this.ws.close();
};
Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
set: function(provider) { this.onMessage(provider); }
});
module.exports = WebSocketProvider; module.exports = WebSocketProvider;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment