From 995ac7204e9960c3bc46fa7313a5547f64f50c53 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Wed, 27 Jan 2016 13:07:34 +0100
Subject: [PATCH] Change Websocket implementation
---
www/js/home-controller.js | 3 +++
www/js/services.js | 15 +++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/www/js/home-controller.js b/www/js/home-controller.js
index 58da7d874..4df170c29 100644
--- a/www/js/home-controller.js
+++ b/www/js/home-controller.js
@@ -112,6 +112,9 @@ function ExploreController($scope, $rootScope, $state, BMA, $q, UIUtils, $interv
}, wait);
}
});
+ BMA.websocket.peer().on('peer', function(peer) {
+ console.log(peer);
+ });
};
$scope.$watch('formData.useRelative', function() {
diff --git a/www/js/services.js b/www/js/services.js
index 5cb259a9a..a3b028a55 100644
--- a/www/js/services.js
+++ b/www/js/services.js
@@ -32,6 +32,17 @@ angular.module('cesium.services', ['ngResource'])
}
}
+ function ws(uri) {
+ var sock = new WebSocket(uri);
+ return {
+ on: function(type, callback) {
+ sock.onmessage = function(e) {
+ callback(JSON.parse(e.data));
+ };
+ }
+ };
+ }
+
return {
wot: {
lookup: getResource('http://' + server + '/wot/lookup/:search'),
@@ -56,10 +67,10 @@ angular.module('cesium.services', ['ngResource'])
},
websocket: {
block: function() {
- return io('http://' + server + '/websocket/block');
+ return ws('ws://' + server + '/ws/block');
},
peer: function() {
- return io('http://' + server + '/websocket/peer');
+ return ws('ws://' + server + '/ws/peer');
}
}
}
--
GitLab