eldonilo/lightstring: lightstring.js comparison

comparison lightstring.js @ 43:136df1708856

Better iq callbacks. (breaks everything)

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Tue, 31 Jan 2012 18:12:19 +0100
parents	ee874d064650
children	3dfb596cf669

comparison

equal deleted inserted replaced

-:ee874d064650
+:136df1708856
 if (stanza.DOM.tagName === 'iq') {
 var payload = stanza.DOM.firstChild;
 if (payload)
 that.emit('iq/' + payload.namespaceURI + ':' + payload.localName, stanza);
-that.emit(stanza.DOM.getAttribute('id'), stanza); //FIXME: possible attack vector.
+var id = stanza.DOM.getAttributeNS(null, 'id');
+if (!(id && id in that.callbacks))
+return;
+var type = stanza.DOM.getAttributeNS(null, 'type');
+if (type !== 'result' || type !== 'error')
+return; //TODO: emit an warning, perhaps.
+var callback = that.callbacks[id];
+if (type === 'result' && callback.result)
+callback.result(stanza);
+else if (type === 'error' && callback.error)
+callback.error(stanza);
+delete that.callbacks[id];
 //TODO: really needed?
 } else if (stanza.DOM.tagName === 'message') {
 var payloads = stanza.DOM.children;
 for (var i = 0; i < payloads.length; i++)
 /**
 * @function Send a message.
 * @param {String|Object} aStanza The message to send.
 * @param {Function} [aCallback] Executed on answer. (stanza must be iq)
 */
-send: function(aStanza, aCallback) {
+send: function(aStanza, aResult, aError) {
 if (!(aStanza instanceof Lightstring.Stanza))
 var stanza = new Lightstring.Stanza(aStanza);
 else
 var stanza = aStanza;
 if (stanza.DOM.tagName === 'iq') {
 var type = stanza.DOM.getAttributeNS(null, 'type');
 if (type !== 'get' || type !== 'set')
 ; //TODO: emit an error.
+var callback = {result: aResult, error: aError};
 var id = stanza.DOM.getAttributeNS(null, 'id');
-if (!id) {
+if (!id)
-if (aCallback)
+; //TODO: emit an warning.
-; //TODO: emit an error.
+else
-else
+this.callback[id] = callback;
-; //TODO: emit an warning.
-} else if (aCallback)
+} else if (aResult || aError)
-this.on(id, aCallback);
-}
-else if (aCallback)
 ; //TODO: callback can’t be called with non-iq stanza.
 //TODO this.socket.send(stanza.XML); (need some work on Lightstring.Stanza)
 var fixme = Lightstring.DOM2XML(stanza.DOM);
 if (!handlers)
 return;
 for (var i = 0; i < handlers.length; i++)
 handlers[i].call(this, aData);
-if (aName.match('sendiq:'))
-delete this.handlers[aName];
 },
 /**
 * @function Register an event handler.
 * @param {String} aName The event name.
 * @param {Function} aCallback The callback to call when the event is emitted.
 on: function(aName, callback) {
 if (!this.handlers[aName])
 this.handlers[aName] = [];
 this.handlers[aName].push(callback);
 }
-//FIXME do this!
-//~ this.once = function(name, callback) {
-//~ if(!this.handlers[name])
-//~ this.handlers[name] = [];
-//~ this.handlers[name].push(callback);
-//~ };
 };