--- googlecode.com/svn/trunk/public_html/meteor.js	2007/04/30 18:38:55	14
+++ googlecode.com/svn/trunk/public_html/meteor.js	2007/08/02 09:29:07	28
@@ -19,35 +19,36 @@
 
 function Meteor(instID) {
 
-	this.lastmsgreceived = -1;
 	this.transferDoc = false;
 	this.pingtimer = false;
 	this.updatepollfreqtimer = false;
 	this.lastrequest = 0;
-	this.recvtimes = new Array();
+	this.recvtimes = [];
 	this.MHostId = false;
 	this.callback_process = function() {};
 	this.callback_reset = function() {};
 	this.callback_eof = function() {};
 	this.callback_changemode = function() {};
 	this.callback_statuschanged = function() {};
-	this.persist = true;
+	this.persist = 1;
 	this.frameloadtimer = false;
-	this.frameurl = false;
 	this.debugmode = false;
+	this.subsurl = false;
+	this.channels = {};
+	this.channelcount = 0;
+	this.streamreq = false;
+	this.byteoffset = 0;
 
 	// Documented public properties
-	this.channel = false;
 	this.subdomain = "data";
 	this.dynamicpageaddress = "push";
-	this.backtrack = 0;
-	this.smartpoll = true;
+	this.smartpoll = 1;
 	this.pollfreq = 2000;
 	this.minpollfreq = 2000;
-	this.mode = "poll";
-	this.polltimeout=30000;
-	this.maxmessages=0;
+	this.mode = "stream";
+	this.polltimeout = 30000;
 	this.pingtimeout = 10000;
+	this.maxmessages = 0;
 	this.status = 0;
 
 	/* Statuses:	0 = Uninitialised,
@@ -83,31 +84,50 @@
 	if (this.debugmode) console.log("Frame registered");
 }
 
+Meteor.reset = function(ifr) {
+	instid = new String(ifr.window.frameElement.id);
+	instid = instid.replace(/.*_([0-9]*)$/, "$1");
+	this.instances[instid].reset();
+}
+
+Meteor.prototype.joinChannel = function(channelname, backtrack) {
+	if (typeof(this.channels[channelname]) != "undefined") throw "Cannot join channel "+channelname+": already subscribed";
+	this.channels[channelname] = {backtrack:backtrack, lastmsgreceived:0};
+	if (this.debugmode) console.log("Joined channel "+channelname+", channel list follows");
+	if (this.debugmode) console.log(this.channels);
+	if (this.status != 0) this.start();
+	this.channelcount++;
+}
+
+Meteor.prototype.leaveChannel = function(channelname) {
+	if (typeof(this.channels[channelname]) == "undefined") throw "Cannot leave channel "+channelname+": not subscribed";
+	delete this.channels[channelname];
+	if (this.status != 0) this.start();
+	this.channelcount--;
+}
+
 Meteor.prototype.start = function() {
-	this.persist = (this.maxmessages)?1:0;
+	this.persist = (this.persist)?1:0;
 	this.smartpoll = (this.smartpoll)?1:0;
 	this.mode = (this.mode=="stream")?"stream":"poll";
-	if (!this.subdomain || !this.channel) throw "Channel or Meteor subdomain host not specified";
+	if (!this.subdomain || !this.channelcount) throw "Channel or Meteor subdomain host not specified";
 	this.stop();
 	var now = new Date();
 	var t = now.getTime();
 	this.setstatus(1);
+	this.updateSubsUrl();
 	if (this.mode=="stream") {
-		var surl = "http://"+this.subdomain+"."+location.hostname+"/"+this.dynamicpageaddress+"?channel="+this.channel+"&id="+this.MHostId;
-		if (this.lastmsgreceived >= 0) {
-			surl += "&restartfrom="+this.lastmsgreceived;
-		} else if (this.backtrack > 0) {
-			surl += "&backtrack="+this.backtrack;
-		} else if (this.backtrack < 0 || isNaN(this.backtrack)) {
-			surl += "&restartfrom=";
+		if (document.all) {
+			this.createIframe(this.subsurl);
+		} else {
+			this.createIframe("http://"+this.subdomain+"."+location.hostname+"/stream.html");
 		}
-		this.createIframe(surl);
 		var f = this.pollmode.bind(this);
 		clearTimeout(this.pingtimer);
 		this.pingtimer = setTimeout(f, this.pingtimeout);
 
 	} else {
-		this.createIframe("http://"+this.subdomain+"."+location.hostname+"/poll.html");
+		this.createIframe("http://"+this.subdomain+"."+location.hostname+"/poll.html?nc="+t);
 		this.recvtimes[0] = t;
 		if (this.updatepollfreqtimer) clearTimeout(this.updatepollfreqtimer);
 		this.updatepollfreqtimer = setInterval(this.updatepollfreq.bind(this), 2500);
@@ -115,14 +135,34 @@
 	this.lastrequest = t;
 }
 
+Meteor.prototype.updateSubsUrl = function() {
+
+	// If streaming or long polling, connection should persist
+	this.persist = (this.mode == "stream" || (this.mode=='poll' && this.maxmessages > 0)) ? 1 : 0;
+	var surl = "http://" + this.subdomain + "." + location.hostname + "/" + this.dynamicpageaddress + "?id=" + this.MHostId;
+	if (this.persist && this.mode != "stream") surl += "&maxmessages=" + this.maxmessages;
+	surl += "&persist="+this.persist;
+	for (var c in this.channels) {
+		surl += "&channel="+c;
+		if (this.channels[c].lastmsgreceived > 0) {
+			surl += "&restartfrom="+(this.channels[c].lastmsgreceived+1);
+		} else if (this.channels[c].backtrack > 0) {
+			surl += "&backtrack="+this.channels[c].backtrack;
+		} else if (this.channels[c].backtrack < 0 || isNaN(this.channels[c].backtrack)) {
+			surl += "&restartfrom=";
+		}
+	}
+	this.subsurl = surl;
+}
+
 Meteor.prototype.createIframe = function(url) {
-	if (document.all) {
-		this.transferDoc = new ActiveXObject("htmlfile");
+	delete this.transferDoc;
+	if (document.all) try { this.transferDoc = new ActiveXObject("htmlfile") } catch(ex) { this.transferDoc = null }
+	if (document.all && this.transferDoc) {
 		this.transferDoc.open();
 		this.transferDoc.write("<html>");
 		this.transferDoc.write("<script>document.domain=\""+(document.domain)+"\";</"+"script>");
 		this.transferDoc.write("</html>");
-		var selfref = this;
 		this.transferDoc.parentWindow.Meteor = Meteor;
 		this.transferDoc.close();
 		var ifrDiv = this.transferDoc.createElement("div");
@@ -139,11 +179,16 @@
 		ifr.style.zIndex = "-20";
 		ifr.setAttribute("id", "meteorframe_"+this.instID);
 		ifr.Meteor = Meteor;
-		var innerifr = document.createElement("IFRAME");
-		innerifr.setAttribute("src", url);
-		innerifr.setAttribute("id", "meteorinnerframe_"+this.instID);
-		ifr.appendChild(innerifr);
-		document.body.appendChild(ifr);
+		if (document.compatMode=='CSS1Compat') {
+			var innerifr = document.createElement("IFRAME");
+			innerifr.setAttribute("src", url);
+			innerifr.setAttribute("id", "meteorinnerframe_"+this.instID);
+			ifr.appendChild(innerifr);
+			document.body.appendChild(ifr);
+		} else {
+			ifr.setAttribute("src", url);
+			document.body.appendChild(ifr);
+		}
 	}
 	if (this.debugmode) console.log("Loading URL '"+url+"' into frame...");
 	var f = this.frameloadtimeout.bind(this);
@@ -158,34 +203,36 @@
 		document.getElementById("meteorframe_"+this.instID).src="about:blank";
 		document.body.removeChild(document.getElementById("meteorframe_"+this.instID));
 	}
-	if (!isNaN(this.pingtimer)) clearTimeout(this.pingtimer);
-	if (!isNaN(this.updatepollfreqtimer)) clearTimeout(this.updatepollfreqtimer);
-	if (!isNaN(this.frameloadtimer)) clearTimeout(this.frameloadtimer);
+	clearTimeout(this.pingtimer);
+	clearTimeout(this.updatepollfreqtimer);
+	clearTimeout(this.frameloadtimer);
 	this.setstatus(0);
 }
 
 Meteor.prototype.pollmode = function() {
 	if (this.debugmode) console.log("Ping timeout");
-	this.stop();
 	this.mode="poll";
 	this.start();
 	this.callback_changemode("poll");
 	this.lastpingtime = false;
 }
 
-Meteor.prototype.process = function(id, data, timestamp) {
-	if (id > this.lastmsgreceived) {
-		this.callback_process(data, timestamp);
-		if (id != -1) this.lastmsgreceived = id;
+Meteor.prototype.process = function(id, channel, data) {
+	if (id == -1) {
+		if (this.debugmode) console.log("Ping");
+		this.ping();
+	} else if (typeof(this.channels[channel]) != "undefined" && id > this.channels[channel].lastmsgreceived) {
+		if (this.debugmode) console.log("Message "+id+" received on channel "+channel+" (last id on channel: "+this.channels[channel].lastmsgreceived+")\n"+data);
+		this.callback_process(data);
+		this.channels[channel].lastmsgreceived = id;
 		if (this.mode=="poll") {
 			var now = new Date();
 			var t = now.getTime();
 			this.recvtimes[this.recvtimes.length] = t;
 			while (this.recvtimes.length > 5) this.recvtimes.shift();
 		}
-	} else if (id == -1) {
-		this.ping();
 	}
+	this.updateSubsUrl();
 	this.setstatus(5);
 }
 
@@ -269,6 +316,7 @@
 	}
 }
 
+
 Meteor.createCookie = function(name,value,days) {
 	if (days) {
 		var date = new Date();
@@ -292,4 +340,4 @@
 
 Meteor.eraseCookie = function(name) {
 	createCookie(name,"",-1);
-}
\ No newline at end of file
+}