eldonilo/lightstring: lightstring.js comparison

comparison lightstring.js @ 106:c06ec02217ee

many changes

author	Sonny Piers <sonny@fastmail.net>
date	Tue, 26 Jun 2012 12:02:14 +0200
parents	f14558915187
children	5cb4733c5189

comparison

equal deleted inserted replaced

-:fb50311997b5
+:c06ec02217ee
 /**
 * @function Transforms a XML string to a DOM object.
 * @param {String} aString XML string.
 * @return {Object} Domified XML.
 */
-XML2DOM: function(aString) {
+parse: function(aString) {
-var DOM = null;
+var el = null;
+//FIXME webkit doesn't throw an error when the parsing fails
 try {
-DOM = this.parser.parseFromString(aString, 'text/xml').documentElement;
+el = this.parser.parseFromString(aString, 'text/xml').documentElement;
 }
 catch (e) {
 //TODO: error
 }
 finally {
-return DOM;
+return el;
 };
 },
 /**
 * @function Transforms a DOM object to a XML string.
 * @param {Object} aString DOM object.
 * @return {String} Stringified DOM.
 */
-DOM2XML: function(aElement) {
+serialize: function(aElement) {
-var XML = null;
+var string = null;
 try {
-XML = this.serializer.serializeToString(aElement);
+string = this.serializer.serializeToString(aElement);
 }
 catch (e) {
 //TODO: error
 }
 finally {
-return XML;
+return string;
 };
 },
 /**
 * @function Get an unique identifier.
 * @param {String} [aString] Prefix to put before the identifier.
 * @constructor Creates a new Lightstring connection
 * @param {String} [aService] The connection manager URL.
 * @memberOf Lightstring
 */
 Lightstring.Connection = function(aService) {
+var that = this;
+window.addEventListener('message', function(e) {
+that.send(e.data.send)
+});
 if (aService)
 this.service = aService;
 /**
 * @namespace Holds connection events handlers
 */
 return a.protocol.replace(':', '');
 }
 var protocol = getProtocol(this.service);
 if (protocol.match('http'))
-this.connection = new Lightstring.BOSHConnection(this.service);
+this.connection = new Lightstring.BOSHConnection(this.service, this.jid);
 else if (protocol.match('ws'))
-this.connection = new Lightstring.WebSocketConnection(this.service);
+this.connection = new Lightstring.WebSocketConnection(this.service, this.jid);
 this.connection.open();
 var that = this;
 });
 this.connection.on('out', function(stanza) {
 that.emit('out', stanza);
 });
 this.connection.on('in', function(stanza) {
-var stanza = new Lightstring.Stanza(stanza);
 //FIXME: node-xmpp-bosh sends a self-closing stream:stream tag; it is wrong!
 that.emit('stanza', stanza);
-if (!stanza.DOM)
+if (!stanza.el)
 return;
-var name = stanza.DOM.localName;
+var el = stanza.el;
 //Authentication
 //FIXME SASL mechanisms and XMPP features can be both in a stream:features
-if (name === 'features') {
+if (el.localName === 'features') {
-//SASL mechanisms
+var children = el.childNodes;
-if (stanza.DOM.firstChild.localName === 'mechanisms') {
+for (var i = 0, length = children.length; i < length; i++) {
-stanza.mechanisms = [];
+//SASL mechanisms
-var nodes = stanza.DOM.getElementsByTagName('mechanism');
+if(children[i].localName === 'mechanisms') {
-for (var i = 0; i < nodes.length; i++)
+stanza.mechanisms = [];
-stanza.mechanisms.push(nodes[i].textContent);
+var nodes = el.getElementsByTagName('mechanism');
-that.emit('mechanisms', stanza);
+for (var i = 0; i < nodes.length; i++)
+stanza.mechanisms.push(nodes[i].textContent);
+that.emit('mechanisms', stanza);
+return;
+}
 }
 //XMPP features
-else {
+// else {
 //TODO: stanza.features
 that.emit('features', stanza);
-}
+// }
 }
-else if (name === 'challenge') {
+else if (el.localName === 'challenge') {
 that.emit('challenge', stanza);
 }
-else if (name === 'failure') {
+else if (el.localName === 'failure') {
 that.emit('failure', stanza);
 }
-else if (name === 'success') {
+else if (el.localName === 'success') {
 that.emit('success', stanza);
 }
 //Iq callbacks
-else if (name === 'iq') {
+else if (el.localName === 'iq') {
-var payload = stanza.DOM.firstChild;
+var payload = el.firstChild;
 if (payload)
 that.emit('iq/' + payload.namespaceURI + ':' + payload.localName, stanza);
-var id = stanza.DOM.getAttribute('id');
+var id = el.getAttribute('id');
 if (!(id && id in that.callbacks))
 return;
-var type = stanza.DOM.getAttribute('type');
+var type = el.getAttribute('type');
 if (type !== 'result' && type !== 'error')
 return; //TODO: warning
 var callback = that.callbacks[id];
 if (type === 'result' && callback.success)
 callback.error.call(that, stanza);
 delete that.callbacks[id];
 }
-else if (name === 'presence' || name === 'message') {
+else if (el.localName === 'presence' || el.localName === 'message') {
 that.emit(name, stanza);
 }
 });
 };
 /**
 var stanza = aStanza;
 if (!stanza)
 return;
-if (stanza.DOM.tagName === 'iq') {
+if (stanza.el.tagName === 'iq') {
-var type = stanza.DOM.getAttribute('type');
+var type = stanza.el.getAttribute('type');
 if (type !== 'get' || type !== 'set')
 ; //TODO: error
 var callback = {success: aSuccess, error: aError};
-var id = stanza.DOM.getAttribute('id');
+var id = stanza.el.getAttribute('id');
 if (!id) {
 var id = Lightstring.newId('sendiq:');
-stanza.DOM.setAttribute('id', id);
+stanza.el.setAttribute('id', id);
 }
 this.callbacks[id] = callback;
 }
 else if (aSuccess || aError)
 ; //TODO: warning (no callback without iq)
+this.connection.send(stanza.toString());
-//FIXME this.socket.send(stanza.XML); (need some work on Lightstring.Stanza)
-var fixme = Lightstring.DOM2XML(stanza.DOM);
-stanza.XML = fixme;
-this.connection.send(fixme);
-this.emit('output', stanza);
 };
 /**
 * @function Closes the XMPP stream and the socket.
 */
 Lightstring.Connection.prototype.disconnect = function() {
 this.emit('disconnecting');
 var stream = Lightstring.stanzas.stream.close();
 this.socket.send(stream);
-this.emit('XMLOutput', stream);
+this.emit('out', stream);
 this.socket.close();
 };
 Lightstring.Connection.prototype.load = function() {
 for (var i = 0; i < arguments.length; i++) {
 var name = arguments[i];