PSĜS: psgxs.js comparison

comparison psgxs.js @ 8:efe8dbd34780

Rename cx method to cnode and define it if xmpp.js didn’t.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Thu, 26 Aug 2010 23:50:04 +0200
parents	781ac4f1e304
children	a6429f48e403

comparison

equal deleted inserted replaced

-:781ac4f1e304
+:efe8dbd34780
 	if (c)
 		sys.print('\033[0m');
 	sys.puts('');
 };
+if (typeof xmpp.StanzaBuilder.cnode != 'function' || typeof xmpp.StanzaBuilder.prototype.cnode != 'function') {
+	xmpp.StanzaBuilder.prototype.cnode = function (stanza)
+	{
+		var parent = this;
+		parent.tags.push(stanza);
+		parent.children.push(stanza);
+		return this;
+	};
+}
 function onIq(stanza) {
 	var type = stanza.getAttribute('type');
 	var from = stanza.getAttribute('to');
 	var to = stanza.getAttribute('from');
 	var id = stanza.getAttribute('id');
 		if (stanza.getChild('query', 'jabber:iq:version')) {
 			var query = xmpp.stanza('query', {xmlns: 'jabber:iq:version'})
 				.s('name').t('PSĜS')
 				.s('version').t(config.version)
 				.s('os').t(config.os);
-			response.cx(query);
+			response.cnode(query);
 		// SECTION 5.1
 		} else if (stanza.getChild('query', 'http://jabber.org/protocol/disco#info')) {
 			var query = stanza.getChild('query', 'http://jabber.org/protocol/disco#info');
 			var nodeID = query.getAttribute('node');
 				// SECTION 5.4
 				if (config.enabled('meta-data')) {
 					var x = forms.build('result', 'node_metadata', storage.getMetadata(nodeID), true);
 					if (x)
-						q.cx(x);
+						q.cnode(x);
 				}
-				response.cx(q);
+				response.cnode(q);
 			// SECTION 5.1
 			} else {
 				var q = xmpp.stanza('query', {xmlns: 'http://jabber.org/protocol/disco#info'})
 					.s('identity', {category: 'pubsub', type: 'service', name: 'PubSub JavaScript Server'})
 					.s('feature', {'var': 'jabber:iq:version'})
 //					.s('feature', {'var': 'http://jabber.org/protocol/commands'})
 					for (var i in config.activated)
 						if (typeof i == 'string')
 							q.s('feature', {'var': 'http://jabber.org/protocol/pubsub#' + config.activated[i]});
-				response.cx(q);
+				response.cnode(q);
 			}
 		// SECTION 5.2
 		} else if (stanza.getChild('query', 'http://jabber.org/protocol/disco#items')) {
 			var query = stanza.getChild('query', 'http://jabber.org/protocol/disco#items');
 				} else
 					attr.name = i;
 				q.s('item', attr);
 			}
-			response.cx(q);
+			response.cnode(q);
 		} else if (stanza.getChild('pubsub', 'http://jabber.org/protocol/pubsub')) {
 			var pubsub = stanza.getChild('pubsub', 'http://jabber.org/protocol/pubsub');
 			// SECTION 5.6
 			if (pubsub.getChild('subscriptions')) {
 				var s = xmpp.stanza('subscriptions');
 				for (i in subs)
 					s.s('subscription', {node: i, jid: to, subscription: subs[i].type, subid: subs[i].subid});
 				var p = xmpp.stanza('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub'});
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			// SECTION 5.7
 			} else if (pubsub.getChild('affiliations')) {
 				if (!config.enabled('retrieve-affiliations'))
 					return makeError(response, errors.affiliations_retrieval_not_supported.n);
 				var s = xmpp.stanza('affiliations');
 				for (i in affils)
 					s.s('affiliation', {node: i, affiliation: affils[i]});
 				var p = xmpp.stanza('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub'});
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			// SECTION 6.3.2
 			} else if (pubsub.getChild('options')) {
 				if (!config.enabled('subscription-options'))
 					return makeError(response, errors.sub.configure.subscription_options_not_supported.n);
 					return makeError(response, errors.sub.configure.no_such_subscriber.n);
 				var s = xmpp.stanza('options', {node: nodeID, jid: jid});
 				var p = xmpp.stanza('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub'});
 				var form = forms.build('form', 'subscribe_options', subs.options, true);
-				s.cx(form);
+				s.cnode(form);
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			// SECTION 6.4
 			} else if (pubsub.getChild('default')) {
 				if (!config.enabled('retrieve-default-sub'))
 					return makeError(response, errors.sub.default_options.default_subscription_configuration_retrieval_not_supported.n);
 					s = xmpp.stanza('default', {node: nodeID});
 				else
 					s = xmpp.stanza('default');
 				var form = forms.build('form', 'subscribe_options', 'default', false);
-				s.cx(form);
+				s.cnode(form);
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			// SECTION 6.5
 			} else if (pubsub.getChild('items')) {
 				if (!config.enabled('retrieve-items'))
 					return makeError(response, errors.sub.default_options.node_configuration_not_supported.n);
 						var j = storage.getItem(nodeID, item[i]);
 						if (typeof j == 'number')
 							return makeError(response, j);
 						var k = xmpp.stanza('item', {id: item[i]})
-						k.cx(j);
+						k.cnode(j);
-						s.cx(k);
+						s.cnode(k);
 					}
 				} else {
 					var s = xmpp.stanza('items', {node: nodeID});
 					var j;
 						return makeError(response, j);
 					var k = 0;
 					for (var i in j) {
 						var contentItem = xmpp.stanza('item', {id: i}).t(j[i].content);
-						s.cx(contentItem);
+						s.cnode(contentItem);
 					}
 				}
 				var p = xmpp.stanza('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub'});
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			} else
 				return makeError(response, errors.feature_not_implemented.n);
 		} else if (stanza.getChild('pubsub', 'http://jabber.org/protocol/pubsub#owner')) {
 			var pubsub = stanza.getChild('pubsub', 'http://jabber.org/protocol/pubsub#owner');
 					return makeError(response, errors.pub.publish.insufficient_privileges.n);
 				var p = xmpp.stanza('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub#owner'});
 				var s = xmpp.stanza('configure', {node: nodeID});
 				var form = forms.build('form', 'node_config', 'default', true);
-				s.cx(form);
+				s.cnode(form);
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			// SECTION 8.3
 			} else if (pubsub.getChild('default')) {
 				if (!config.enabled('config-node'))
 					return makeError(response, errors.owner.default_options.node_configuration_not_supported.n);
 				var p = xmpp.stanza('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub#owner'});
 				var s = xmpp.stanza('default');
 				var form = forms.build('node_config', service_configuration.node_config, null, true);
-				s.cx(form);
+				s.cnode(form);
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			// SECTION 8.8
 			} else if (pubsub.getChild('subscriptions')) {
 				if (!config.enabled('manage-subscriptions'))
 					return makeError(response, errors.owner.manage_subscriptions.not_supported.n);
 				var subs = storage.getSubscriptionsFromNodeID(nodeID)
 				for (var jid in subs)
 					s.s('subscription', {jid: jid, subscription: subs[jid].type, subid: subs[jid].subid})
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			// SECTION 8.9
 			} else if (pubsub.getChild('affiliations')) {
 				if (!config.enabled('modify-affiliations'))
 					return makeError(response, errors.owner.manage_affiliations.not_supported.n);
 				var s = xmpp.stanza('affiliations', {node: nodeID});
 				for (var jid in affils)
 					s.s('affiliation', {jid: jid, affiliation: affils[jid]})
-				p.cx(s);
+				p.cnode(s);
-				response.cx(p);
+				response.cnode(p);
 			} else
 				return makeError(response, errors.feature_not_implemented.n);
 		} else
 			return makeError(response, errors.feature_not_implemented.n);
 	} else if (type == 'set') {
 				response.c('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub'})
 					.c('subscription', {node: nodeID, jid: jid, subid: subID.subid, subscription: subID.type});
 				if (conf)
-					response.cx(options);
+					response.cnode(options);
 				if (config.enabled('get-pending')) {
 					var affiliates = storage.getAffiliationsFromNodeID(nodeID);
 					var form = forms.build('form', 'subscribe_authorization', {allow: false, node: nodeID, subscriber_jid: jid}, true); //168
 					for (var i in affiliates) {
 						if (affiliates[i] == 'super-owner' || affiliates[i] == 'owner') {
-							var message = xmpp.message({to: i}).cx(form);
+							var message = xmpp.message({to: i}).cnode(form);
 							conn.send(message);
 						}
 					}
 				}
 }
 function makeError(response, errorNumber, payload) {
 	response.attr.type = 'error';
 	if (payload)
-		response.cx(payload);
+		response.cnode(payload);
 	var e = errors.reverse[errorNumber];
 	var error = xmpp.stanza('error', {type: e.type});
 	error.s(e.error, {xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas'})
 			error.s(e.reason, {xmlns: 'http://jabber.org/protocol/pubsub#errors', feature: e.feature});
 		else
 			error.s(e.reason, {xmlns: 'http://jabber.org/protocol/pubsub#errors'});
 	}
-	response.cx(error);
+	response.cnode(error);
 	conn.send(response);
 }
 function sendNotifs(notifs, type, nodeID, a1, a2) {
 	var ev = xmpp.stanza('event', {xmlns: 'http://jabber.org/protocol/pubsub#event'});
 			else if (i == 'jid')
 				args.jid = attr;
 		}
 		var affiliations = xmpp.stanza('affiliations', {node: nodeID})
 			.c('affiliation', args);
-		ev.cx(affiliations);
+		ev.cnode(affiliations);
 	} else if (type == 'collection') {
 		var collection = xmpp.stanza('collection', {node: nodeID});
 		if (a1 == 'associate')
-			collection.cx('associate', {node: nodeID});
+			collection.cnode('associate', {node: nodeID});
 		else
-			collection.cx('disassociate', {node: nodeID});
+			collection.cnode('disassociate', {node: nodeID});
-		ev.cx(collection);
+		ev.cnode(collection);
 	} else if (type == 'configuration') {
 		if (!config.enabled('config-node')) {
 			_('Error #4', 41)
 			return;
 		}
 		var configuration = xmpp.stanza('configuration', {node: nodeID});
 		if (a1) {
 			var x = forms.build('node_config', service_configuration.node_config, storage.getConfiguration(nodeID));
 			if (x)
-				configuration.cx(x); //TODO: voir exemple 150
+				configuration.cnode(x); //TODO: voir exemple 150
 		}
-		ev.cx(configuration);
+		ev.cnode(configuration);
 	} else if (type == 'delete') {
 		var del = xmpp.stanza('delete', {node: nodeID});
 		if (a1)
 			del.c('redirect', {uri: a1});
-		ev.cx(del);
+		ev.cnode(del);
 	} else if (type == 'items') {
 		var items = xmpp.stanza(type, {node: nodeID});
 		if (a2 == 'retract')
 			for (var i in a1)
 				items.s('retract', {id: i});
 					args.node = item.node;
 				if (item.publisher)
 					args.publisher = item.publisher;
 				var it = xmpp.stanza('item', args);
 				if (item.content)
-					it.cx(item.content);
+					it.cnode(item.content);
-				items.cx(it);
+				items.cnode(it);
 			}
 		}
-		ev.cx(items);
+		ev.cnode(items);
 	} else if (type == 'purge') {
 		ev.c('purge', {node: nodeID});
 	} else if (type == 'subscription') {
 		if (!config.enabled('subscription-notifications'))
 			return;
 		if (!args.jid || args.jid == '') {
 			_('Error #2', 41)
 			return;
 		}
 		var sub = xmpp.stanza('subscription', args);
-		ev.cx(sub);
+		ev.cnode(sub);
 	} else {
 		_('Error #1', 41)
 		return;
 	}
 				continue;
 			}
 		}
 		var message = xmpp.message({to: i, from: componentJID, id: conn.getUniqueId()});
-		message.cx(ev);
+		message.cnode(ev);
 		conn.send(message);
 	}
 }
 function sendDigest(jid, nodeID) {
 	if (sub.digestTimeout)
 		sub.digestTimeout = false;
 	var message = xmpp.message({to: jid, from: componentJID, id: conn.getUniqueId()});
 	for (var i in sub.digest)
-		message.cx(sub.digest[i]);
+		message.cnode(sub.digest[i]);
 	conn.send(message);
 }
 conn.connect(componentJID, componentPassword, function (status, condition) {
 	if (status == xmpp.Status.CONNECTED) {