weechat-protocol.js: add command formatting helper functions

This commit is contained in:
Philippe Proulx 2013-10-05 19:54:07 -04:00
parent bd4bfe0cb3
commit 257b4f01cf
2 changed files with 176 additions and 7 deletions

View file

@ -337,18 +337,25 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', funct
} }
websocket.send(message); websocket.send(message);
} }
// Takes care of the connection and websocket hooks // Takes care of the connection and websocket hooks
var connect = function (hostport, proto, password) { var connect = function (hostport, proto, passwd) {
websocket = new WebSocket("ws://" + hostport + "/weechat"); websocket = new WebSocket("ws://" + hostport + "/weechat");
websocket.binaryType = "arraybuffer" websocket.binaryType = "arraybuffer"
websocket.onopen = function (evt) { websocket.onopen = function (evt) {
// FIXME: does password need to be sent only if protocol is not weechat? // FIXME: does password need to be sent only if protocol is not weechat?
if (proto == "weechat") { if (proto == "weechat") {
if (password) { doSend(WeeChatProtocol.formatInit({
doSend("init compression=off,password=" + password + "\n(bufinfo) hdata buffer:gui_buffers(*) full_name\nsync\n"); password: passwd,
} compression: 'off'
}));
doSend(WeeChatProtocol.formatHdata({
id: 'bufinfo',
path: 'buffer:gui_buffers(*)',
keys: ['full_name']
}));
doSend(WeeChatProtocol.formatSync({}));
} else { } else {
} }
@ -381,8 +388,10 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', funct
} }
var sendMessage = function(message) { var sendMessage = function(message) {
message = "input " + $rootScope.activeBuffer['full_name'] + " " + message + "\n" doSend(WeeChatProtocol.formatInput({
doSend(message); buffer: $rootScope.activeBuffer['full_name'],
data: message
}));
} }
return { return {

View file

@ -50,6 +50,166 @@ WeeChatProtocol._uia2s = function(uia) {
return decodeURIComponent(escape(str.join(''))); return decodeURIComponent(escape(str.join('')));
}; };
WeeChatProtocol._mergeParams = function(defaults, override) {
for (var v in override) {
defaults[v] = override[v];
}
return defaults;
}
WeeChatProtocol._formatWrapCmdParts = function(parts) {
return parts.join(' ') + '\n';
};
WeeChatProtocol._formatBeginCmd = function(id, name) {
var cmd;
cmd = (id !== null) ? '(' + id + ') ' : '';
cmd += name;
return cmd;
}
WeeChatProtocol.formatInit = function(params) {
var keys = [];
var parts = [];
var defaultParams = {
password: null,
compression: 'off'
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(null, 'init'));
keys.push('compression=' + params.compression);
if (params.password !== null) {
keys.push('password=' + params.password);
}
parts.push(keys.join(','));
return WeeChatProtocol._formatWrapCmdParts(parts);
};
WeeChatProtocol.formatHdata = function(params) {
var parts = [];
var defaultParams = {
id: null,
keys: null
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(params.id, 'hdata'));
parts.push(params.path);
if (params.keys !== null) {
parts.push(params.keys.join(','));
}
return WeeChatProtocol._formatWrapCmdParts(parts);
};
WeeChatProtocol.formatInfo = function(params) {
var parts = [];
var defaultParams = {
id: null
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(params.id, 'info'));
parts.push(params.name);
return WeeChatProtocol._formatWrapCmdParts(parts);
};
WeeChatProtocol.formatNicklist = function(params) {
var parts = [];
var defaultParams = {
id: null,
buffer: null
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(params.id, 'nicklist'));
if (params.buffer !== null) {
parts.push(params.buffer);
}
return WeeChatProtocol._formatWrapCmdParts(parts);
};
WeeChatProtocol.formatInput = function(params) {
var parts = [];
var defaultParams = {
id: null
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(params.id, 'input'));
parts.push(params.buffer);
parts.push(params.data);
return WeeChatProtocol._formatWrapCmdParts(parts);
};
WeeChatProtocol._formatSyncDesync = function(cmdName, params) {
var parts = [];
var defaultParams = {
id: null,
buffers: null,
options: null
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(params.id, cmdName));
if (params.buffers !== null) {
parts.push(params.buffers.join(','));
if (params.options !== null) {
parts.push(params.options.join(','));
}
}
return WeeChatProtocol._formatWrapCmdParts(parts);
}
WeeChatProtocol.formatSync = function(params) {
return WeeChatProtocol._formatSyncDesync('sync', params);
};
WeeChatProtocol.formatDesync = function(params) {
return WeeChatProtocol._formatSyncDesync('desync', params);
};
WeeChatProtocol.formatTest = function(params) {
var parts = [];
var defaultParams = {
id: null
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(params.id, 'test'));
return WeeChatProtocol._formatWrapCmdParts(parts);
};
WeeChatProtocol.formatQuit = function() {
return WeeChatProtocol._formatWrapCmdParts(['quit']);
};
WeeChatProtocol.formatPing = function(params) {
var parts = [];
var defaultParams = {
id: null,
args: null
};
params = WeeChatProtocol._mergeParams(defaultParams, params);
parts.push(WeeChatProtocol._formatBeginCmd(params.id, 'ping'));
if (params.args !== null) {
parts.push(params.args.join(' '));
}
return WeeChatProtocol._formatWrapCmdParts(parts);
};
WeeChatProtocol.prototype = { WeeChatProtocol.prototype = {
/** /**
* Warns that message parsing is not implemented for a * Warns that message parsing is not implemented for a