Fixes indenting
This commit is contained in:
David Cormier
parent
5af244737e
commit
40d0145979
1 changed files with 101 additions and 98 deletions
199
js/websockets.js
199
js/websockets.js
|
|
@ -106,126 +106,129 @@ weechat.factory('colors', [function($scope) {
|
||||||
|
|
||||||
|
|
||||||
weechat.factory('connection', ['$rootScope', 'colors', function($scope, colors) {
|
weechat.factory('connection', ['$rootScope', 'colors', function($scope, colors) {
|
||||||
protocol = new Protocol();
|
protocol = new Protocol();
|
||||||
var websocket = null;
|
var websocket = null;
|
||||||
|
|
||||||
var doSend = function(message) {
|
var doSend = function(message) {
|
||||||
|
|
||||||
msgs = message.replace(/[\r\n]+$/g, "").split("\n");
|
msgs = message.replace(/[\r\n]+$/g, "").split("\n");
|
||||||
for (var i = 0; i < msgs.length; i++) {
|
for (var i = 0; i < msgs.length; i++) {
|
||||||
console.log('=' + msgs[i] + '=');
|
console.log('=' + msgs[i] + '=');
|
||||||
$scope.commands.push("SENT: " + msgs[i]);
|
$scope.commands.push("SENT: " + msgs[i]);
|
||||||
}
|
|
||||||
websocket.send(message);
|
|
||||||
}
|
}
|
||||||
var connect = function (hostport, proto, password) {
|
websocket.send(message);
|
||||||
websocket = new WebSocket("ws://" + hostport + "/weechat");
|
}
|
||||||
websocket.binaryType = "arraybuffer"
|
var connect = function (hostport, proto, password) {
|
||||||
|
websocket = new WebSocket("ws://" + hostport + "/weechat");
|
||||||
|
websocket.binaryType = "arraybuffer"
|
||||||
|
|
||||||
websocket.onopen = function (evt) {
|
websocket.onopen = function (evt) {
|
||||||
if (proto == "weechat") {
|
if (proto == "weechat") {
|
||||||
doSend("init compression=off\nversion\n");
|
doSend("init compression=off\nversion\n");
|
||||||
doSend("hdata buffer:gui_buffers(*) full_name\n");
|
doSend("hdata buffer:gui_buffers(*) full_name\n");
|
||||||
doSend("sync\n");
|
doSend("sync\n");
|
||||||
} else {
|
|
||||||
doSend("PASS " + password + "\r\nNICK test\r\nUSER test 0 * :test\r\n");
|
|
||||||
}
|
|
||||||
$scope.connected = true;
|
|
||||||
$scope.$apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
websocket.onclose = function (evt) {
|
|
||||||
console.log("disconnected", "Disconnected");
|
|
||||||
$scope.connected = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
websocket.onmessage = function (evt) {
|
|
||||||
protocol.setData(evt.data);
|
|
||||||
message = protocol.parse()
|
|
||||||
console.log(message);
|
|
||||||
$scope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type) ;
|
|
||||||
parseMessage(message);
|
|
||||||
data = evt.data;
|
|
||||||
$scope.$apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
websocket.onerror = function (evt) {
|
|
||||||
console.log("error", "ERROR: " + evt.data);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.websocket = websocket;
|
|
||||||
}
|
|
||||||
|
|
||||||
var parseMessage = function(message) {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (!message['id']) {
|
|
||||||
// should only be in case of hda objects
|
|
||||||
parseObjects(message['objects']);
|
|
||||||
} else {
|
} else {
|
||||||
types[message['id']](message);
|
doSend("PASS " + password + "\r\nNICK test\r\nUSER test 0 * :test\r\n");
|
||||||
}
|
}
|
||||||
};
|
$scope.connected = true;
|
||||||
|
$scope.$apply();
|
||||||
|
}
|
||||||
|
|
||||||
|
websocket.onclose = function (evt) {
|
||||||
|
console.log("disconnected", "Disconnected");
|
||||||
|
$scope.connected = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
websocket.onmessage = function (evt) {
|
||||||
|
protocol.setData(evt.data);
|
||||||
|
message = protocol.parse()
|
||||||
|
console.log(message);
|
||||||
|
$scope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type) ;
|
||||||
|
parseMessage(message);
|
||||||
|
data = evt.data;
|
||||||
|
$scope.$apply();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
websocket.onerror = function (evt) {
|
||||||
|
console.log("error", "ERROR: " + evt.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.websocket = websocket;
|
||||||
|
}
|
||||||
|
|
||||||
|
var parseMessage = function(message) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if (!message['id']) {
|
||||||
|
// should only be in case of hda objects
|
||||||
|
parseObjects(message['objects']);
|
||||||
|
} else {
|
||||||
|
types[message['id']](message);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
var parseObjects = function(objects) {
|
var parseObjects = function(objects) {
|
||||||
|
|
||||||
for (var i = 0; i < objects.length ; i++) {
|
for (var i = 0; i < objects.length ; i++) {
|
||||||
console.log('type', objects[i]['type']);
|
console.log('type', objects[i]['type']);
|
||||||
if (objects[i]['type'] == 'hda') {
|
if (objects[i]['type'] == 'hda') {
|
||||||
parseHdaObject(objects[i]);
|
parseHdaObject(objects[i]);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var parseHdaObject = function(hdaObject) {
|
var parseHdaObject = function(hdaObject) {
|
||||||
console.log('parse hda', hdaObject['content'], hdaObject['content'].length);
|
console.log('parse hda', hdaObject['content'], hdaObject['content'].length);
|
||||||
buffers = {};
|
buffers = {};
|
||||||
for (var i = 0; i < hdaObject['content'].length; i++) {
|
for (var i = 0; i < hdaObject['content'].length; i++) {
|
||||||
content = hdaObject['content'][i];
|
content = hdaObject['content'][i];
|
||||||
content['lines'] = [];
|
content['lines'] = [];
|
||||||
console.log('content', content);
|
console.log('content', content);
|
||||||
var pointer = content['pointers'][0];
|
var pointer = content['pointers'][0];
|
||||||
buffers[pointer] = content;
|
buffers[pointer] = content;
|
||||||
}
|
|
||||||
|
|
||||||
$scope.buffers = buffers;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$scope.buffers = buffers;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
var handleBufferLineAdded = function(message) {
|
var handleBufferLineAdded = function(message) {
|
||||||
|
|
||||||
var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']);
|
var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']);
|
||||||
var text = colors.parse(message['objects'][0]['content'][0]['message']);
|
var text = colors.parse(message['objects'][0]['content'][0]['message']);
|
||||||
var buffer = message['objects'][0]['content'][0]['buffer'];
|
var buffer = message['objects'][0]['content'][0]['buffer'];
|
||||||
var buffer_line = _.union(prefix, text);
|
var buffer_line = _.union(prefix, text);
|
||||||
console.log('BUFFER: ', $scope.buffers[buffer]);
|
console.log('BUFFER: ', $scope.buffers[buffer]);
|
||||||
$scope.buffers[buffer]['lines'].push(buffer_line);
|
$scope.buffers[buffer]['lines'].push(buffer_line);
|
||||||
}
|
}
|
||||||
|
|
||||||
var handleBufferOpened = function(message) {
|
var handleBufferOpened = function(message) {
|
||||||
var fullName = message['objects'][0]['content'][0]['full_name']
|
console.log('buffer opened');
|
||||||
var buffer = message['objects'][0]['content'][0]['pointers'][0]
|
var fullName = message['objects'][0]['content'][0]['full_name']
|
||||||
$scope.buffers[buffer] = { 'lines':[], 'full_name':fullName }
|
var buffer = message['objects'][0]['content'][0]['pointers'][0]
|
||||||
console.log($scope.buffers);
|
$scope.buffers[buffer] = { 'lines':[], 'full_name':fullName }
|
||||||
}
|
console.log($scope.buffers);
|
||||||
var sendMessage = function(message) {
|
}
|
||||||
message = "input " + $scope.activeBuffer['full_name'] + " " + message + "\n"
|
|
||||||
doSend(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
var types = {
|
var sendMessage = function(message) {
|
||||||
_buffer_line_added: handleBufferLineAdded,
|
message = "input " + $scope.activeBuffer['full_name'] + " " + message + "\n"
|
||||||
_buffer_opened: handleBufferOpened
|
console.log($scope.activeBuffer);
|
||||||
}
|
doSend(message);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
var types = {
|
||||||
connect: connect,
|
_buffer_line_added: handleBufferLineAdded,
|
||||||
sendMessage: sendMessage
|
_buffer_opened: handleBufferOpened
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
connect: connect,
|
||||||
|
sendMessage: sendMessage
|
||||||
|
}
|
||||||
}]);
|
}]);
|
||||||
|
|
||||||
weechat.controller('WeechatCtrl', ['$rootScope', '$scope', 'connection', function ($rootScope, $scope, connection) {
|
weechat.controller('WeechatCtrl', ['$rootScope', '$scope', 'connection', function ($rootScope, $scope, connection) {
|
||||||
|
|
@ -251,5 +254,5 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', 'connection', functio
|
||||||
$scope.connect = function() {
|
$scope.connect = function() {
|
||||||
connection.connect($scope.hostport, $scope.proto, $scope.password);
|
connection.connect($scope.hostport, $scope.proto, $scope.password);
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue