|
|
@ -25,18 +25,23 @@ weechat.factory('connection', ['$rootScope', function($scope) { |
|
|
|
$scope.connected = true; |
|
|
|
$scope.connected = true; |
|
|
|
$scope.$apply(); |
|
|
|
$scope.$apply(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
websocket.onclose = function (evt) { |
|
|
|
websocket.onclose = function (evt) { |
|
|
|
console.log("disconnected", "Disconnected"); |
|
|
|
console.log("disconnected", "Disconnected"); |
|
|
|
$scope.connected = false; |
|
|
|
$scope.connected = false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
websocket.onmessage = function (evt) { |
|
|
|
websocket.onmessage = function (evt) { |
|
|
|
console.log("recv", "⇒ " + evt.data); |
|
|
|
protocol.setData(evt.data); |
|
|
|
protocol.setData(evt.data); |
|
|
|
message = protocol.parse() |
|
|
|
console.log(protocol.parse()); |
|
|
|
console.log(evt); |
|
|
|
$scope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type) ; |
|
|
|
$scope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type) ; |
|
|
|
data = evt.data; |
|
|
|
parseMessage(message); |
|
|
|
|
|
|
|
data = evt.data; |
|
|
|
$scope.$apply(); |
|
|
|
$scope.$apply(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
websocket.onerror = function (evt) { |
|
|
|
websocket.onerror = function (evt) { |
|
|
|
console.log("error", "ERROR: " + evt.data); |
|
|
|
console.log("error", "ERROR: " + evt.data); |
|
|
|
} |
|
|
|
} |
|
|
@ -44,10 +49,31 @@ weechat.factory('connection', ['$rootScope', function($scope) { |
|
|
|
this.websocket = websocket; |
|
|
|
this.websocket = websocket; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var parseMessage = function(message) { |
|
|
|
|
|
|
|
console.log(message['id']); |
|
|
|
|
|
|
|
if (message['id'] == '_buffer_line_added') { |
|
|
|
|
|
|
|
types[message['id']](message); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
console.log(message); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var handleBufferLineAdded = function(message) { |
|
|
|
|
|
|
|
var buffer_line = message['objects'][0]['content'][0]['message']; |
|
|
|
|
|
|
|
$scope.buffer.push(buffer_line); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var sendMessage = function(message) { |
|
|
|
var sendMessage = function(message) { |
|
|
|
message = message + "\n" |
|
|
|
message = message + "\n" |
|
|
|
doSend(message); |
|
|
|
doSend(message); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var types = { |
|
|
|
|
|
|
|
_buffer_line_added: handleBufferLineAdded |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return { |
|
|
|
return { |
|
|
|
connect: connect, |
|
|
|
connect: connect, |
|
|
|
sendMessage: sendMessage |
|
|
|
sendMessage: sendMessage |
|
|
@ -57,6 +83,8 @@ weechat.factory('connection', ['$rootScope', function($scope) { |
|
|
|
weechat.controller('WeechatCtrl', ['$rootScope', '$scope', 'connection', function ($rootScope, $scope, connection) { |
|
|
|
weechat.controller('WeechatCtrl', ['$rootScope', '$scope', 'connection', function ($rootScope, $scope, connection) { |
|
|
|
$rootScope.commands = [] |
|
|
|
$rootScope.commands = [] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$rootScope.buffer = [] |
|
|
|
|
|
|
|
|
|
|
|
$scope.hostport = "localhost:9001" |
|
|
|
$scope.hostport = "localhost:9001" |
|
|
|
$scope.proto = "weechat" |
|
|
|
$scope.proto = "weechat" |
|
|
|
$scope.password = "" |
|
|
|
$scope.password = "" |
|
|
|