--- googlecode.com/svn/trunk/public_html/meteor.js 2006/11/23 15:53:25 7
+++ googlecode.com/svn/trunk/public_html/meteor.js 2007/04/30 18:38:55 14
@@ -34,6 +34,7 @@
this.persist = true;
this.frameloadtimer = false;
this.frameurl = false;
+ this.debugmode = false;
// Documented public properties
this.channel = false;
@@ -43,7 +44,7 @@
this.smartpoll = true;
this.pollfreq = 2000;
this.minpollfreq = 2000;
- this.mode = "stream";
+ this.mode = "poll";
this.polltimeout=30000;
this.maxmessages=0;
this.pingtimeout = 10000;
@@ -52,46 +53,26 @@
/* 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
*/
- // Set or retrieve host id. Cookie takes this form:
- // MeteorID=123:6356353/124:098320454;
- var MeteIds = Meteor.readCookie("MeteorID");
- var regex1 = new RegExp("^([0-9\:\/M]+\/)*"+instID+"\:([^\/]+)(\/[0-9\:\/M]+)*$");
- var regex2 = new RegExp("^([0-9\:\/M]+\/)*M\:([^\/]+)(\/[0-9\:\/M]+)*$");
- if (typeof(instID) == "Number" && regex1.exec(MeteIds)) {
- this.MHostId = ma[2];
- } else if (typeof(instID) == "Number") {
- this.MHostId = Math.floor(Math.random()*1000000);
- var newcookie = (MeteIds)?MeteIds+"/":"";
- newcookie += instID+":"+this.MHostId;
- Meteor.createCookie("MeteorID", newcookie);
- } else if (ma = regex2.exec(MeteIds)) {
- this.MHostId = ma[2];
- } else {
- this.MHostId = Math.floor(Math.random()*1000000);
- var newcookie = (MeteIds)?MeteIds+"/":"";
- newcookie += "M:"+this.MHostId;
- Meteor.createCookie("MeteorID", newcookie);
- }
this.instID = (typeof(instID) != "undefined") ? instID : 0;
+ this.MHostId = Math.floor(Math.random()*100000000)+""+this.instID;
}
Meteor.instances = new Array();
-Meteor.servertimeoffset = 0;
Meteor.create = function(instID) {
- if (!instID) instID = 0;
+ if (!instID) instID = Meteor.instances.length;
Meteor.instances[instID] = new Meteor(instID);
return Meteor.instances[instID];
}
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]);
@@ -99,12 +80,7 @@
ifr.increasepolldelay = this.instances[instid].increasepolldelay.bind(this.instances[instid]);
clearTimeout(this.instances[instid].frameloadtimer);
this.instances[instid].setstatus(4);
-}
-
-Meteor.setServerTime = function(timestamp) {
- var now = new Date();
- var clienttime = (now.getTime() / 1000);
- Meteor.servertimeoffset = timestamp - clienttime;
+ if (this.debugmode) console.log("Frame registered");
}
Meteor.prototype.start = function() {
@@ -112,89 +88,94 @@
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";
+ 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);
if (this.mode=="stream") {
- if (document.all) {
- this.setstatus(1);
- this.transferDoc = new ActiveXObject("htmlfile");
- this.transferDoc.open();
- this.transferDoc.write("");
- this.transferDoc.write("