eldonilo/barbecue: script2.js comparison

comparison script2.js @ 7:853dcbe8f06f

Make barbecue work with latest Lightstring.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Thu, 02 Feb 2012 12:11:33 +0100
parents	24aa8dccb170
children	7b2ca4d5af6d

comparison

equal deleted inserted replaced

-:24aa8dccb170
+:853dcbe8f06f
 var conn = new Lightstring.Connection(SERVICE);
 var roster = {};
 var documents = {};
-Lightstring.NS.sxe = 'urn:xmpp:sxe:0';
+Lightstring.plugins['jingle'] = {
-Lightstring.NS.jingle = {
+namespaces: {
-main: 'urn:xmpp:jingle:1',
+jingle: 'urn:xmpp:jingle:1',
-transports: {
+jingle_transports_sxe: 'urn:xmpp:jingle:transports:sxe',
-sxe: 'urn:xmpp:jingle:transports:sxe'
+jingle_apps_xhtml: 'urn:xmpp:jingle:apps:xhtml'
-},
+}
-apps: {
+};
-xhtml: 'urn:xmpp:jingle:apps:xhtml'
+Lightstring.ns['sxe'] = 'urn:xmpp:sxe:0';
-}
-};
+conn.on('iq/' + Lightstring.ns['disco#info'] + ':query', function(stanza) {
-conn.on('iq/' + Lightstring.NS['disco#info'] + ':query', function(stanza) {
 if (stanza.DOM.getAttributeNS(null, 'type') !== 'get')
 return;
 var query = stanza.DOM.firstChild;
 if (query.getAttributeNS(null, 'node')) {
 " type='error'/>"; //TODO: precise the error.
 conn.send(response);
 return;
 }
-var features = [Lightstring.NS.sxe, Lightstring.NS.jingle.transports.sxe]; //TODO: put that elsewhere.
+var features = [Lightstring.ns['sxe'], Lightstring.ns['jingle_transports_sxe']]; //TODO: put that elsewhere.
 var response = "<iq to='" + stanza.DOM.getAttributeNS(null, 'from') + "'" +
 " id='" + stanza.DOM.getAttributeNS(null, 'id') + "'" +
 " type='result'>" +
-"<query xmlns='" + Lightstring.NS['disco#info'] + "'>" +
+"<query xmlns='" + Lightstring.ns['disco#info'] + "'>" +
 "<identity category='client' type='browser'/>";
 features.forEach(function(f) {
 response += "<feature var='" + f + "'/>";
 });
 response += "</query>" +
 conn.on('presence', function(stanza) {
 var from = new Lightstring.JID(stanza.DOM.getAttributeNS(null, 'from'));
 if (!from.equals(conn.jid)) {
 var type = stanza.DOM.getAttributeNS(null, 'type');
 if (!type)
-Lightstring.discoInfo(conn, from, undefined, function(aData) {
+conn.disco.info(from, undefined, function(stanza) {
-roster[from.full] = aData;
+roster[from.full] = {identities: stanza.identities, features: stanza.features};
+}, function(stanza) {
+console.log(from + ' doesn’t handle disco#info.');
+roster[from.full] = {};
 });
 else if (type === 'unavailable')
 delete roster[from.full];
 }
 });
 documents[sid] = new Document(conn.jid.full, name, conn.jid.full, 'document');
 for (var jid in roster) {
 var contact = roster[jid];
-if ((contact.features.indexOf(Lightstring.NS.sxe) !== -1) && (contact.features.indexOf(Lightstring.NS.jingle.transports.sxe) !== -1))
+if ((contact.features.indexOf(Lightstring.ns['sxe']) !== -1) && (contact.features.indexOf(Lightstring.ns['jingle_transports_sxe']) !== -1))
 initiate(jid, sid);
 }
 }
 var initiate = function(jid, sid) {
 var initiate = "<iq to='" + jid + "' type='set'>" +
-"<jingle xmlns='" + Lightstring.NS.jingle.main + "'" +
+"<jingle xmlns='" + Lightstring.ns.jingle.main + "'" +
 " action='session-initiate'" +
 " initiator='" + documents[sid].initiator + "'" +
 " sid='" + sid + "'>" +
 "<content creator='initiator' name='" + documents[sid].name + "'>" +
-"<description xmlns='" + Lightstring.NS.jingle.apps.xhtml + "'/>" +
+"<description xmlns='" + Lightstring.ns['jingle_apps_xhtml'] + "'/>" +
-"<transport xmlns='" + Lightstring.NS.jingle.transports.sxe + "'>" +
+"<transport xmlns='" + Lightstring.ns['jingle_transports_sxe'] + "'>" +
 "<host>" + documents[sid].host + "</host>" +
 "</transport>" +
 "</content>" +
 "</jingle>" +
 "</iq>";
 var accept = function(sid) {
 var doc = documents[sid];
 doc.empty();
 var accept = "<iq to='" + doc.initiator + "' type='set'>" +
-"<jingle xmlns='" + Lightstring.NS.jingle.main + "'" +
+"<jingle xmlns='" + Lightstring.ns.jingle.main + "'" +
 " action='session-accept'" +
 " initiator='" + doc.initiator + "'" +
 " sid='" + sid + "'>" +
 "<content creator='initiator' name='" + documents[sid].name + "'>" +
-"<description xmlns='" + Lightstring.NS.jingle.apps.xhtml + "'/>" +
+"<description xmlns='" + Lightstring.ns['jingle_apps_xhtml'] + "'/>" +
-"<transport xmlns='" + Lightstring.NS.jingle.transports.sxe + "'>" +
+"<transport xmlns='" + Lightstring.ns['jingle_transports_sxe'] + "'>" +
 "<host>" + doc.host + "</host>" +
 "</transport>" +
 "</content>" +
 "</jingle>" +
 "</iq>";
 var terminate = function(sid, reason) {
 if (!(sid in documents))
 return console.log('BIG WARNING!!!');
 var terminate = "<iq to='" + documents[sid].initiator + "' type='set'>" +
-"<jingle xmlns='" + Lightstring.NS.jingle.main + "'" +
+"<jingle xmlns='" + Lightstring.ns.jingle.main + "'" +
 " action='session-terminate'" +
 " host='" + documents[sid].host + "'" +
 " initiator='" + documents[sid].initiator + "'" +
 " sid='" + sid + "'>" +
 "<reason>" +
 "</iq>";
 delete documents[sid];
 conn.send(terminate);
 };
-conn.on('iq/' + Lightstring.NS.jingle.main + ':jingle', function(stanza) {
+conn.on('iq/' + Lightstring.ns.jingle + ':jingle', function(stanza) {
 conn.send("<iq to='" + stanza.DOM.getAttributeNS(null, 'from') + "'" +
 " id='" + stanza.DOM.getAttributeNS(null, 'id') + "'" +
 " type='result'/>");
 var jingle = stanza.DOM.firstChild;
 if (documents[sid])
 return terminate(sid, 'alternative-session'); //TODO: The XEP: “and wishes to use that [previous] session instead”
 var description = content.getElementsByTagName('description')[0]; //TODO: supporte multiple applications.
-if (description.namespaceURI !== Lightstring.NS.jingle.apps.xhtml)
+if (description.namespaceURI !== Lightstring.ns['jingle_apps_xhtml'])
 return terminate(sid, 'unsupported-applications');
 var transport = content.getElementsByTagName('transport')[0]; //TODO: supporte multiple transports.
-if (transport.namespaceURI !== Lightstring.NS.jingle.transports.sxe)
+if (transport.namespaceURI !== Lightstring.ns['jingle_transports_sxe'])
 return terminate(sid, 'unsupported-transports');
 var host = transport.textContent; //TODO: verify the presence of the host element.
 documents[sid] = new Document(initiator, name, host, 'document');
 var name = content.getAttributeNS(null, 'name');
 alert('Accepted! \\o/');
 var description = content.getElementsByTagName('description')[0]; //TODO: supporte multiple applications.
-if (description.namespaceURI !== Lightstring.NS.jingle.apps.xhtml)
+if (description.namespaceURI !== Lightstring.ns['jingle_apps_xhtml'])
 return terminate(sid, 'unsupported-applications');
 var transport = content.getElementsByTagName('transport')[0]; //TODO: supporte multiple transports.
-if (transport.namespaceURI !== Lightstring.NS.jingle.transports.sxe)
+if (transport.namespaceURI !== Lightstring.ns['jingle_transports_sxe'])
 return terminate(sid, 'unsupported-transports');
 var host = transport.textContent; //TODO: verify the presence of the host element.
 var doc = documents[sid];
 if (identity.category === 'conference')
 type = 'groupchat';
 });
 var message = "<message to='" + host + "'" +
 " type='" + type + "'>" +
-"<sxe xmlns='" + Lightstring.NS.sxe + "'" +
+"<sxe xmlns='" + Lightstring.ns['sxe'] + "'" +
 " id='" + Lightstring.newId('sxe') + "'" +
 " session='" + sid + "'>" +
 "<connect/>" +
 "</sxe>" +
 "</message>";
 conn.send(message);
 };
-conn.on('message/' + Lightstring.NS.sxe + ':sxe', function(stanza) {
+conn.on('message/' + Lightstring.ns['sxe'] + ':sxe', function(stanza) {
 var from = stanza.DOM.getAttributeNS(null, 'from');
 var type = 'chat'; //TODO: always?
 var sxe = stanza.DOM.firstChild; //TODO: there can be multiple payloads.
 var id = sxe.getAttributeNS(null, 'id');
 var sid = sxe.getAttributeNS(null, 'session');
 var payload = sxe.firstChild; //TODO: really?
 switch (payload.localName) {
 case 'connect':
 var message = "<message to='" + from + "'" +
 " type='" + type + "'>" +
-"<sxe xmlns='" + Lightstring.NS.sxe + "'" +
+"<sxe xmlns='" + Lightstring.ns['sxe'] + "'" +
 " id='" + Lightstring.newId('sxe') + "'" +
 " session='" + sid + "'>" +
 "<state-offer>" +
-"<description xmlns='" + Lightstring.NS.jingle.apps.xhtml + "'/>" +
+"<description xmlns='" + Lightstring.ns['jingle_apps_xhtml'] + "'/>" +
 "</state-offer>" +
 "</sxe>" +
 "</message>";
 conn.send(message);
 break;
 case 'state-offer':
 var description = payload.firstChild;
-if (description.namespaceURI !== Lightstring.NS.jingle.apps.xhtml)
+if (description.namespaceURI !== Lightstring.ns['jingle_apps_xhtml'])
 return terminate(sid, 'unsupported-applications');
 var accept = false;
 if (from === doc.host || from === doc.initiator)
 accept = true;
 //TODO: refuse if proposed multiple times.
 var message = "<message to='" + from + "'" +
 " type='" + type + "'>" +
-"<sxe xmlns='" + Lightstring.NS.sxe + "'" +
+"<sxe xmlns='" + Lightstring.ns['sxe'] + "'" +
 " id='" + Lightstring.newId('sxe') + "'" +
 " session='" + sid + "'>" +
 "<" + (accept? 'accept': 'refuse') + "-state/>" +
 "</sxe>" +
 "</message>";
 conn.send(message);
 break;
 case 'accept-state':
-var initialState = doc.createState([]).map(function(element) {
+console.log(doc);
+var initialState = doc.createState([]);
+console.log(initialState);
+initialState = initialState.map(function(element) {
 return Lightstring.DOM2XML(element);
 }).join('');
+console.log(initialState);
 var message = "<message to='" + from + "'" +
 " type='" + type + "'>" +
-"<sxe xmlns='" + Lightstring.NS.sxe + "'" +
+"<sxe xmlns='" + Lightstring.ns['sxe'] + "'" +
 " id='" + Lightstring.newId('sxe') + "'" +
 " session='" + sid + "'>" +
 "<state>" +
 "<document-begin prolog='" + doc.prolog + "'/>" +
 initialState +
 var events = ['connected', 'conn-error', 'connecting', 'disconnected', 'disconnecting'];
 var state = document.getElementById('state');
 events.forEach(function(e) {
 conn.on(e, function() {
 state.innerHTML = e;
+return false;
 });
 });
 })();
 conn.on('error', function(a) {
 document.getElementById('host').addEventListener('click', function() {
 host(Lightstring.newId('sess'), 'My First XHTML Document');
 }, false);
+conn.on('output', function(stanza) {
+console.log('out:', stanza.DOM || stanza.XML);
+});
+conn.on('input', function(stanza) {
+console.log('in:', stanza.DOM || stanza.XML);
+});
 conn.on('connected', function() {
-conn.on('output', function(stanza) {
+conn.presence.send(conn);
-console.log('out:', stanza.DOM);
+return true;
 });
-conn.on('input', function(stanza) {
-console.log('in:', stanza.DOM);
+conn.load('DIGEST-MD5');
-});
+conn.load('presence');
+conn.load('disco');
-Lightstring.presence(conn);
+conn.load('jingle');
-});
+conn.disco.addFeatures(Lightstring.ns['jingle_transports_sxe'], Lightstring.ns['sxe']);
 conn.connect(JID + '/' + prompt('Resource?'), PASSWORD);
-register_feature_not_implemented.call(conn);