--- googlecode.com/svn/trunk/public_html/meteor.js	2006/12/08 16:52:58	9
+++ googlecode.com/svn/trunk/public_html/meteor.js	2007/08/01 17:38:00	27
@@ -16,74 +16,54 @@
 		f(a);g(args);
 	}
 };
-function addUnLoadEvent(func) {
-  var oldonunload = window.onunload;
-  if (typeof window.onunload != 'function') {
-    window.onunload = func;
-  } else {
-    window.onunload = function() {
-      if (oldonunload) {
-        oldonunload();
-      }
-      func();
-    }
-  }
-}
-//addUnLoadEvent(meteordestroy);
-function meteordestroy() {
-	var x = Meteor.instances.length;
-	for(var i=0; i<x; i++) {
-		Meteor.instances[i].stop();
-		delete Meteor.instances[i];
-	}
-}
 
 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 = "stream";
-	this.polltimeout=30000;
-	this.maxmessages=0;
+	this.polltimeout = 30000;
 	this.pingtimeout = 10000;
+	this.maxmessages = 0;
 	this.status = 0;
 
 	/* Statuses:	0 = Uninitialised,
 					1 = Loading stream,
 					2 = Loading controller frame,
-					3 = Controller frame timeout, retrying every 5 seconds
+					3 = Controller frame timeout, retrying.
 					4 = Controller frame loaded and ready
 					5 = Receiving data
 	*/
 
 	this.instID = (typeof(instID) != "undefined") ? instID : 0;
-	this.MHostId = Math.floor(Math.random()*100000000)+this.instID;
+	this.MHostId = Math.floor(Math.random()*100000000)+""+this.instID;
 }
 
 Meteor.instances = new Array();
-Meteor.servertimeoffset = 0;
 
 Meteor.create = function(instID) {
 	if (!instID) instID = Meteor.instances.length;
@@ -93,7 +73,7 @@
 
 Meteor.register = function(ifr) {
 	instid = new String(ifr.window.frameElement.id);
-	instid = instid.replace("meteorframe_", "");
+	instid = instid.replace(/.*_([0-9]*)$/, "$1");
 	ifr.p = this.instances[instid].process.bind(this.instances[instid]);
 	ifr.r = this.instances[instid].reset.bind(this.instances[instid]);
 	ifr.eof = this.instances[instid].eof.bind(this.instances[instid]);
@@ -101,132 +81,160 @@
 	ifr.increasepolldelay = this.instances[instid].increasepolldelay.bind(this.instances[instid]);
 	clearTimeout(this.instances[instid].frameloadtimer);
 	this.instances[instid].setstatus(4);
+	if (this.debugmode) console.log("Frame registered");
 }
 
-Meteor.setServerTime = function(timestamp) {
-	var now = new Date();
-	var clienttime = (now.getTime() / 1000);
-	Meteor.servertimeoffset = timestamp - clienttime;
+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();
-	if (typeof(this.transferDoc)=="object") {
-		this.transferDoc.open();
-		this.transferDoc.close();
-		delete this.transferDoc;
-	}
-	if (document.getElementById("meteorframe_"+this.instID)) {
-		document.body.removeChild(document.getElementById("meteorframe_"+this.instID));
-	}
+	this.setstatus(1);
+	this.updateSubsUrl();
 	if (this.mode=="stream") {
 		if (document.all) {
-			this.setstatus(1);
-			this.transferDoc = new ActiveXObject("htmlfile");
-			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");
-			this.transferDoc.appendChild(ifrDiv);
-			var url = "http://"+this.subdomain+"."+location.hostname+"/"+this.dynamicpageaddress+"?channel="+this.channel+"&id="+this.MHostId;
-			if (this.lastmsgreceived >= 0) {
-				url += "&restartfrom="+this.lastmsgreceived;
-			} else if (this.backtrack > 0) {
-				url += "&backtrack="+this.backtrack;
-			} else if (this.backtrack < 0 || isNaN(this.backtrack)) {
-				url += "&restartfrom=";
-			}
-			ifrDiv.innerHTML = "<iframe id=\"meteorframe_"+this.instID+"\" src=\""+url+"&nocache="+t+"\" style=\"display: none;\"></iframe>";
+			this.createIframe(this.subsurl);
 		} else {
-			var ifr = document.createElement("IFRAME");
-			ifr.style.width = "10px";
-			ifr.style.height = "10px";
-			ifr.style.border = "none";
-			ifr.style.position = "absolute";
-			ifr.style.top = "-10px";
-			ifr.style.marginTop = "-10px";
-			ifr.style.zIndex = "-20";
-			ifr.id = "meteorframe_"+this.instID;
-			document.body.appendChild(ifr);
-			this.frameurl = "http://"+this.subdomain+"."+location.hostname+"/stream.html";
-			this.frameload();
+			this.createIframe("http://"+this.subdomain+"."+location.hostname+"/stream.html");
 		}
 		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?nc="+t);
+		this.recvtimes[0] = t;
+		if (this.updatepollfreqtimer) clearTimeout(this.updatepollfreqtimer);
+		this.updatepollfreqtimer = setInterval(this.updatepollfreq.bind(this), 2500);
+	}
+	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) {
+	delete this.transferDoc;
+	if (document.all) try { this.transferDoc = new ActiveXObject("htmlfile") } catch(ex) { this.transferDoc = null }
+	if (document.all && this.transferDoc) {
+		this.transferDoc = new ActiveXObject("htmlfile");
+		this.transferDoc.open();
+		this.transferDoc.write("<html>");
+		this.transferDoc.write("<script>document.domain=\""+(document.domain)+"\";</"+"script>");
+		this.transferDoc.write("</html>");
+		this.transferDoc.parentWindow.Meteor = Meteor;
+		this.transferDoc.close();
+		var ifrDiv = this.transferDoc.createElement("div");
+		this.transferDoc.appendChild(ifrDiv);
+		ifrDiv.innerHTML = "<iframe id=\"meteorframe_"+this.instID+"\" src=\""+url+"\" style=\"display: none;\"></iframe>";
+	} else {
 		var ifr = document.createElement("IFRAME");
 		ifr.style.width = "10px";
 		ifr.style.height = "10px";
 		ifr.style.border = "none";
-		if (document.all) {
-			ifr.style.display = "none";
+		ifr.style.position = "absolute";
+		ifr.style.top = "-10px";
+		ifr.style.marginTop = "-10px";
+		ifr.style.zIndex = "-20";
+		ifr.setAttribute("id", "meteorframe_"+this.instID);
+		ifr.Meteor = Meteor;
+		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.style.position = "absolute";
-			ifr.style.marginTop = "-10px";
-			ifr.style.zIndex = "-20";
+			ifr.setAttribute("src", url);
+			document.body.appendChild(ifr);
 		}
-		ifr.id = "meteorframe_"+this.instID;
-		document.body.appendChild(ifr);
-		this.frameurl = "http://"+this.subdomain+"."+location.hostname+"/poll.html";
-		this.frameload();
-		this.recvtimes[0] = t;
-		if (this.updatepollfreqtimer) clearTimeout(this.updatepollfreqtimer);
-		this.updatepollfreqtimer = setInterval(this.updatepollfreq.bind(this), 2500);
 	}
-	this.lastrequest = t;
+	if (this.debugmode) console.log("Loading URL '"+url+"' into frame...");
+	var f = this.frameloadtimeout.bind(this);
+	this.frameloadtimer = setTimeout(f, 5000);
 }
 
 Meteor.prototype.stop = function() {
 	if (typeof(this.transferDoc)=="object") {
-		this.transferDoc.open();
-		this.transferDoc.close();
-		delete this.transferDoc;
+		this.transferDoc = false;
 	}
 	if (document.getElementById("meteorframe_"+this.instID)) {
 		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.mode="poll";
 	this.start();
 	this.callback_changemode("poll");
 	this.lastpingtime = false;
 }
 
-Meteor.prototype.process = function(id, data, timestamp) {
-	if (id > this.lastmsgreceived) {
+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);
-		if (id != -1) this.lastmsgreceived = id;
+		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);
-	if (!isNaN(timestamp)) {
-		Meteor.setServerTime(timestamp);
-	}
 }
 
 Meteor.prototype.ping = function() {
@@ -241,6 +249,7 @@
 }
 
 Meteor.prototype.reset = function() {
+	if (this.debugmode) console.log("Stream reset");
 	var now = new Date();
 	var t = now.getTime();
 	var x = this.pollfreq - (t-this.lastrequest);
@@ -295,24 +304,11 @@
 	}
 }
 
-Meteor.prototype.frameload = function() {
-	this.setstatus(2);
-	if (document.getElementById("meteorframe_"+this.instID)) {
-		var f = this.frameloadtimeout.bind(this);
-		this.frameloadtimer = setTimeout(f, 5000);
-		document.getElementById("meteorframe_"+this.instID).src = "about:blank";
-		setTimeout(this.doloadurl.bind(this), 100);
-	}
-}
-Meteor.prototype.doloadurl = function() {
-	var now = new Date();
-	var t = now.getTime();
-	document.getElementById("meteorframe_"+this.instID).src = this.frameurl+"?nocache="+t;
-}
 Meteor.prototype.frameloadtimeout = function() {
+	if (this.debugmode) console.log("Frame load timeout");
 	if (this.frameloadtimer) clearTimeout(this.frameloadtimer);
 	this.setstatus(3);
-	this.frameload();
+	setTimeout(this.start.bind(this), 5000);
 }
 Meteor.prototype.setstatus = function(newstatus) {
 	if (this.status != newstatus) {
@@ -321,6 +317,7 @@
 	}
 }
 
+
 Meteor.createCookie = function(name,value,days) {
 	if (days) {
 		var date = new Date();
@@ -344,4 +341,4 @@
 
 Meteor.eraseCookie = function(name) {
 	createCookie(name,"",-1);
-}
\ No newline at end of file
+}