eldonilo/lightstring: lightstring.js comparison

comparison lightstring.js @ 29:1e6d2ca2daae

Adds a Lightstring.Stanza object and use it.

author	Sonny Piers <sonny.piers@gmail.com>
date	Sat, 28 Jan 2012 04:34:30 +0100
parents	630b9579fe4a
children	6ce66fba0242

comparison

equal deleted inserted replaced

-:630b9579fe4a
+:1e6d2ca2daae
 /**
 * @function Transforms a XML string to a DOM object.
 * @param {String} aString XML string.
 * @return {Object} Domified XML.
 */
-xml2dom: function(aString) {
+XML2DOM: function(aString) {
-return this.parser.parseFromString(aString, 'text/xml').documentElement;
+var DOM = null;
+try {
+DOM = this.parser.parseFromString(aString, 'text/xml').documentElement;
+}
+catch (e) {
+alert(e);
+}
+finally {
+return DOM;
+};
 },
 /**
 * @function Transforms a DOM object to a XML string.
 * @param {Object} aString DOM object.
 * @return {String} Stringified DOM.
 */
-dom2xml: function(aElement) {
+DOM2XML: function(aElement) {
-return this.serializer.serializeToString(aElement);
+var XML = null;
+try {
+XML = this.serializer.serializeToString(aElement);
+}
+catch (e) {
+alert(e);
+}
+finally {
+return XML;
+};
 }
 };
 /**
 * @constructor Creates a new Lightstring connection
 this.getNewId = function() {
 this.iqid++;
 return 'sendiq:' + this.iqid;
 };
 this.on('stream:features', function(stanza, that) {
-var nodes = stanza.querySelectorAll('mechanism');
+var nodes = stanza.DOM.querySelectorAll('mechanism');
 //SASL/Auth features
 if (nodes.length > 0) {
 that.emit('mechanisms', stanza);
 var mechanisms = {};
 for (var i = 0; i < nodes.length; i++)
 "<iq type='set' xmlns='jabber:client'>" +
 "<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>" +
 (that.jid.resource? "<resource>" + that.jid.resource + "</resource>": "") +
 "</bind>" +
 "</iq>";
 that.send(
 bind,
 function(stanza) {
 //Session http://xmpp.org/rfcs/rfc3921.html#session
-that.jid = new Lightstring.JID(stanza.textContent);
+that.jid = new Lightstring.JID(stanza.DOM.textContent);
 that.send(
 "<iq type='set' xmlns='jabber:client'>" +
 "<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>" +
 "</iq>",
 function() {
 " xmlns:stream='http://etherx.jabber.org/streams'" +
 " version='1.0'/>"
 );
 });
 this.on('failure', function(stanza, that) {
-that.emit('conn-error', stanza.firstChild.tagName);
+that.emit('conn-error', stanza.DOM.firstChild.tagName);
 });
 this.on('challenge', function(stanza, that) {
 //FIXME this is mostly Strophe code
 function _quote(str) {
 return '"' + str.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"';
 };
-var challenge = atob(stanza.textContent);
+var challenge = atob(stanza.DOM.textContent);
 var attribMatch = /([a-z]+)=("[^"]+"|[^,"]+)(?:,|$)/;
 var cnonce = MD5.hexdigest(Math.random() * 1234567890);
 var realm = '';
 this.socket = new MozWebSocket(this.service, 'xmpp');
 }
 var that = this;
 this.socket.addEventListener('open', function() {
-if (this.protocol !== 'xmpp')
+//TODO: if (this.protocol !== 'xmpp')
-console.error('Lightstring: The server located at '+ that.service + ' doesn\'t seems to be XMPP aware.');
 var stream = Lightstring.stanza.stream.open(that.jid.domain);
+//TODO: Use Lightstring.Connection.send (problem with parsing steam);
 that.socket.send(stream);
-that.emit('XMLOutput', stream);
+var stanza = {
+XML: stream
+};
+that.emit('output', stanza);
 });
 this.socket.addEventListener('error', function(e) {
 that.emit('error', e.data);
 console.log(e.data);
 });
 this.socket.addEventListener('close', function(e) {
 that.emit('disconnected', e.data);
 });
 this.socket.addEventListener('message', function(e) {
-that.emit('XMLInput', e.data);
+var stanza = new Lightstring.Stanza(e.data);
-var elm = Lightstring.xml2dom(e.data);
-that.emit('DOMInput', elm);
+//TODO node-xmpp-bosh sends a self-closing stream:stream tag; it is wrong!
-that.emit(elm.tagName, elm);
+that.emit('input', stanza);
-if (elm.tagName === 'iq') {
+if(!stanza.DOM)
-var payload = elm.firstChild;
+return;
+that.emit(stanza.DOM.tagName, stanza);
+if (stanza.DOM.tagName === 'iq') {
+var payload = stanza.DOM.firstChild;
 if (payload)
-that.emit('iq/' + payload.namespaceURI + ':' + payload.localName, elm);
+that.emit('iq/' + payload.namespaceURI + ':' + payload.localName, stanza);
-that.emit(elm.getAttribute('id'), elm); //FIXME: possible attack vector.
+that.emit(stanza.DOM.getAttribute('id'), stanza); //FIXME: possible attack vector.
 }
 });
 },
 /**
 * @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) {
-if (typeof aStanza === 'string') {
+if (!(aStanza instanceof Lightstring.Stanza))
-var str = aStanza;
+var stanza = new Lightstring.Stanza(aStanza);
-var elm = Lightstring.xml2dom(str);
+else
-}
+var stanza = aStanza;
-else if (aStanza instanceof Element) {
-var elm = aStanza;
+if(!stanza)
-var str = this.dom2xml(elm);
-}
-else {
-this.emit('error', 'Unsupported data type.');
 return;
-}
+if (stanza.DOM.tagName === 'iq') {
+var id = stanza.DOM.getAttribute('id');
-if (elm.tagName === 'iq') {
+//TODO: This should be done by a plugin
-var id = elm.getAttribute('id');
 if (!id) {
-elm.setAttribute('id', this.getNewId());
+alert(Lightstring.DOM2XML(stanza.DOM));
-str = Lightstring.dom2xml(elm);
+stanza.DOM.setAttribute('id', this.getNewId());
 }
 if (aCallback)
-this.on(elm.getAttribute('id'), aCallback);
+this.on(stanza.DOM.getAttribute('id'), aCallback);
 }
-else if (aCallback)
+else if (aCallback) {
 this.emit('warning', 'Callback can\'t be called with non-iq stanza.');
+}
-this.socket.send(str);
-this.emit('XMLOutput', str);
+//TODO this.socket.send(stanza.XML); (need some work on Lightstring.Stanza)
-this.emit('DOMOutput', elm);
+this.socket.send(Lightstring.DOM2XML(stanza.DOM));
+this.emit('output', stanza);
 },
 /**
 * @function Closes the XMPP stream and the socket.
 */
 disconnect: function() {