--- googlecode.com/svn/trunk/public_html/meteor.js	2007/12/20 21:24:24	32
+++ googlecode.com/svn/trunk/public_html/meteor.js	2008/03/25 22:34:16	60
@@ -25,7 +25,7 @@
 	mode: "stream",
 	pingtimeout: 20000,
 	pingtimer: null,
-	pollfreq: 5000,
+	pollfreq: 3000,
 	port: 80,
 	polltimeout: 30000,
 	recvtimes: [],
@@ -36,6 +36,7 @@
 		ifr.p = Meteor.process;
 		ifr.r = Meteor.reset;
 		ifr.eof = Meteor.eof;
+		ifr.ch = Meteor.channelInfo;
 		clearTimeout(Meteor.frameloadtimer);
 		Meteor.setstatus(4);
 		Meteor.log("Frame registered");
@@ -43,7 +44,7 @@
 
 	joinChannel: function(channelname, backtrack) {
 		if (typeof(Meteor.channels[channelname]) != "undefined") throw "Cannot join channel "+channelname+": already subscribed";
-		Meteor.channels[channelname] = {backtrack:backtrack, lastmsgreceived:0};
+		Meteor.channels[channelname] = {backtrack:backtrack};
 		Meteor.log("Joined channel "+channelname);
 		Meteor.channelcount++;
 		if (Meteor.status != 0) Meteor.connect();
@@ -53,8 +54,9 @@
 		if (typeof(Meteor.channels[channelname]) == "undefined") throw "Cannot leave channel "+channelname+": not subscribed";
 		delete Meteor.channels[channelname];
 		Meteor.log("Left channel "+channelname);
-		if (Meteor.status != 0) Meteor.connect();
 		Meteor.channelcount--;
+		if (Meteor.channelcount && Meteor.status != 0) Meteor.connect();
+		else Meteor.disconnect();
 	},
 
 	connect: function() {
@@ -83,7 +85,7 @@
 			Meteor.loadFrame("http://"+Meteor.host+((Meteor.port==80)?"":":"+Meteor.port)+"/poll.html");
 			Meteor.recvtimes[0] = t;
 			if (Meteor.updatepollfreqtimer) clearTimeout(Meteor.updatepollfreqtimer);
-			if (Meteor.mode=='smartpoll') Meteor.updatepollfreqtimer = setInterval(Meteor.updatepollfreq, 2500);
+			if (Meteor.mode=='smartpoll') Meteor.updatepollfreqtimer = setInterval(Meteor.updatepollfreq, 10000);
 			if (Meteor.mode=='longpoll') Meteor.pollfreq = Meteor.minpollfreq;
 		}
 		Meteor.lastrequest = t;
@@ -91,13 +93,19 @@
 
 	disconnect: function() {
 		if (Meteor.status) {
-			if (typeof(Meteor.frameref)=="iframe") Meteor.frameref.setAttribute("src", "about:blank");
-			Meteor.frameref = null;
 			clearTimeout(Meteor.pingtimer);
 			clearTimeout(Meteor.updatepollfreqtimer);
 			clearTimeout(Meteor.frameloadtimer);
 			if (typeof CollectGarbage == 'function') CollectGarbage();
-			Meteor.setstatus(0);
+			if (Meteor.status != 6) Meteor.setstatus(0);
+			if (Meteor.frameref.tagName=='IFRAME') {
+				Meteor.frameref.parentNode.removeChild(Meteor.frameref);
+			} else {
+				Meteor.frameref.open();
+				Meteor.frameref.close();
+			}
+			delete Meteor.frameref;
+			Meteor.log("Disconnected");
 		}
 	},
 	
@@ -114,44 +122,49 @@
 		var surl = "http://" + Meteor.host + ((Meteor.port==80)?"":":"+Meteor.port) + "/push/" + Meteor.hostid + "/" + Meteor.mode;
 		for (var c in Meteor.channels) {
 			surl += "/"+c;
-			if (Meteor.channels[c].lastmsgreceived > 0) {
+			if (typeof Meteor.channels[c].lastmsgreceived != 'undefined' && Meteor.channels[c].lastmsgreceived >= 0) {
 				surl += ".r"+(Meteor.channels[c].lastmsgreceived+1);
 			} else if (Meteor.channels[c].backtrack > 0) {
 				surl += ".b"+Meteor.channels[c].backtrack;
-			} else if (Meteor.channels[c].backtrack < 0 || isNaN(Meteor.channels[c].backtrack)) {
+			} else if (Meteor.channels[c].backtrack != undefined) {
 				surl += ".h";
 			}
 		}
+		var now = new Date();
+		surl += "?nc="+now.getTime();
 		return surl;
 	},
 
 	loadFrame: function(url) {
-		Meteor.frameref = null;
 		try {
-			var transferDoc = new ActiveXObject("htmlfile");
-			transferDoc.open();
-			transferDoc.write("<html><script>");
-			transferDoc.write("document.domain=\""+(document.domain)+"\";");
-			transferDoc.write("</"+"script></html>");
-			transferDoc.parentWindow.Meteor = Meteor;
-			transferDoc.close();
-			var ifrDiv = transferDoc.createElement("div");
-			transferDoc.appendChild(ifrDiv);
+			if (!Meteor.frameref) {
+				var transferDoc = new ActiveXObject("htmlfile");
+				Meteor.frameref = transferDoc;
+			}
+			Meteor.frameref.open();
+			Meteor.frameref.write("<html><script>");
+			Meteor.frameref.write("document.domain=\""+(document.domain)+"\";");
+			Meteor.frameref.write("</"+"script></html>");
+			Meteor.frameref.parentWindow.Meteor = Meteor;
+			Meteor.frameref.close();
+			var ifrDiv = Meteor.frameref.createElement("div");
+			Meteor.frameref.appendChild(ifrDiv);
 			ifrDiv.innerHTML = "<iframe src=\""+url+"\"></iframe>";
-			Meteor.frameref = transferDoc;
 		} catch (e) {
-			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.Meteor = Meteor;
-			ifr.setAttribute("src", url);
-			document.body.appendChild(ifr);
-			Meteor.frameref = ifr;
+			if (!Meteor.frameref) {
+				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.Meteor = Meteor;
+				document.body.appendChild(ifr);
+				Meteor.frameref = ifr;
+			}
+			Meteor.frameref.setAttribute("src", url);
 		}
 		Meteor.log("Loading URL '"+url+"' into frame...");
 		Meteor.frameloadtimer = setTimeout(Meteor.frameloadtimeout, 5000);
@@ -159,18 +172,20 @@
 
 	pollmode: function() {
 		Meteor.log("Ping timeout");
-		Meteor.mode="smartpoll";
-		clearTimeout(Meteor.pingtimer);
+		if (Meteor.mode != "smartpoll") {
+			Meteor.mode="smartpoll";
+			Meteor.callbacks["changemode"]("poll");
+			clearTimeout(Meteor.pingtimer);
+			Meteor.lastpingtime = false;
+		}
 		Meteor.connect();
-		Meteor.callbacks["changemode"]("poll");
-		Meteor.lastpingtime = false;
 	},
 
 	process: function(id, channel, data) {
 		if (id == -1) {
 			Meteor.log("Ping");
 			Meteor.ping();
-		} else if (typeof(Meteor.channels[channel]) != "undefined" && id > Meteor.channels[channel].lastmsgreceived) {
+		} else if (typeof(Meteor.channels[channel]) != "undefined") {
 			Meteor.log("Message "+id+" received on channel "+channel+" (last id on channel: "+Meteor.channels[channel].lastmsgreceived+")\n"+data);
 			Meteor.callbacks["process"](data);
 			Meteor.channels[channel].lastmsgreceived = id;
@@ -194,18 +209,28 @@
 	},
 
 	reset: function() {
-		Meteor.log("Stream reset");
-		Meteor.ping();
-		Meteor.callbacks["reset"]();
-		var now = new Date();
-		var t = now.getTime();
-		var x = Meteor.pollfreq - (t-Meteor.lastrequest);
-		if (x < 10) x = 10;
-		setTimeout(Meteor.connect, x);
+		if (Meteor.status != 6) {
+			Meteor.log("Stream reset");
+			Meteor.ping();
+			Meteor.callbacks["reset"]();
+			var now = new Date();
+			var t = now.getTime();
+			var x = Meteor.pollfreq - (t-Meteor.lastrequest);
+			if (x < 10) x = 10;
+			setTimeout(Meteor.connect, x);
+		}
 	},
 
 	eof: function() {
+		Meteor.log("Received end of stream, will not reconnect");
 		Meteor.callbacks["eof"]();
+		Meteor.setstatus(6);
+		Meteor.disconnect();
+	},
+
+	channelInfo: function(channel, id) {
+		Meteor.channels[channel].lastmsgreceived = id;
+		Meteor.log("Received channel info for channel "+channel+": resume from "+id);
 	},
 
 	updatepollfreq: function() {
@@ -241,7 +266,7 @@
 		Meteor.log("Frame load timeout");
 		if (Meteor.frameloadtimer) clearTimeout(Meteor.frameloadtimer);
 		Meteor.setstatus(3);
-		setTimeout(Meteor.connect, 5000);
+		Meteor.pollmode();
 	},
 
 	extract_xss_domain: function(old_domain) {
@@ -257,6 +282,7 @@
 		//				3 = Controller frame timeout, retrying.
 		//				4 = Controller frame loaded and ready
 		//				5 = Receiving data
+		//				6 = End of stream, will not reconnect
 
 		if (Meteor.status != newstatus) {
 			Meteor.status = newstatus;
