Changeset 478

Timestamp:

08/11/08 04:17:29 (5 months ago)

Author:

heyadayo

Message:

cross sub-domain working in FF

Location:

trunk/daemon/orbited/static

Files:

• Orbited.js (modified) (10 diffs)
• xsdrBridge.html (modified) (8 diffs)

trunk/daemon/orbited/static/Orbited.js

@@ -341 +341 @@
     self.open = function(_url) {
         self.readyState = self.READY_STATE_OPENING;
-        xhr = createXHR();
+        var url = new Orbited.URL(_url)
+        if (url.isSameDomain(location.href)) {
+            xhr = createXHR();
+        }
+        else {
+            xhr = new Orbited.XSDR();
+        }
+//        xhr = createXHR();
         xhr.open('GET', _url, true);
         xhr.onreadystatechange = function() {
@@ -539 +546 @@
         var numSent = sendQueue.length
         sessionUrl.setQsParameter('ack', lastPacketId)
-        xhr = createXHR();
+//        xhr = createXHR();
         xhr.onreadystatechange = function() {
 ;;;         self.logger.debug('send readyState', xhr.readyState)
@@ -752 +759 @@
     id: 0,
     register: function(receive, queue) {
-        var id = ++Orbited.singleton.XSDR;
+        var id = ++Orbited.singleton.XSDR.id;
         Orbited.singleton.XSDR.receiveCbs[id] = receive;
         Orbited.singleton.XSDR.queues[id] = queue;
+;;;     Orbited.system.debug('id is', id)
+        return id;
     }
 }
-
 Orbited.XSDR = function() {
     var self = this;
@@ -771 +779 @@
         queue
     )
-    var bridgeUrl = new URL("")
-    bridgeUrl.domain = Orbited.hostname
-    bridgeUrl.port = Orbited.port
+    var bridgeUrl = new Orbited.URL("")
+    bridgeUrl.domain = Orbited.settings.hostname
+    bridgeUrl.port = Orbited.settings.port
     bridgeUrl.path = '/static/xsdrBridge.html'
-    bridgeUrl.hash = id;
-    
+    bridgeUrl.hash = id.toString();
+    bridgeUrl.protocol = Orbited.settings.protocol
+;;; self.logger.debug('bridgeUrl.hash is', bridgeUrl.hash);
+;;; self.logger.debug('bridgeUrl.path is', bridgeUrl.path);
+;;; self.logger.debug('bridgeUrl is', bridgeUrl.render());
     var reset = function() {
         self.responseText = ""
@@ -788 +799 @@
     }
     reset();
-
+    self.onreadystatechange = function() { }
     self.open = function(_method, _url, async) {
         if (self.readyState == 4) {
@@ -799 +810 @@
             throw new Error("Only Async XSDR supported")
         }
+;;;     self.logger.debug('open', _method, _url, async)
         self.readyState = 1;
         url = _url;
@@ -808 +820 @@
             throw new Error("Invalid readyState");
         }
+;;;     self.logger.debug('send', data)
         if (!ifr) {
+;;;         self.logger.debug('creating iframe')
             ifr = document.createElement("iframe")
             hideIframe(ifr);
             ifr.src = bridgeUrl.render()
+;;;         self.logger.debug('set ifr.src to', ifr.src);
             document.body.appendChild(ifr);
         }
@@ -840 +855 @@
 
     var receive = function(payload) {
+;;;     self.logger.debug('received', payload)
         switch(payload[0]) {
-            case 'initialize':
-                push([method, url, data, requestHeaders]);
+            case 'initialized':
+                queue.push([method, url, data, requestHeaders]);
+;;;             self.logger.debug('queue is', queue)
+;;;             self.logger.debug('Orbited.singleton.XSDR.queues[id] is', Orbited.singleton.XSDR.queues[id])
                 break;
             case 'readystatechange':
@@ -870 +888 @@
 }
 Orbited.XSDR.prototype.logger = Orbited.getLogger("Orbited.XSDR");
-
+Orbited.singleton.XSDRBridgeLogger = Orbited.getLogger('XSDRBridge');
 
 /* Comet Transports!
@@ -916 +934 @@
             }
             else {
-                xhr = new XSubdomainRequest(url.domain, url.port);
+                xhr = new Orbited.XSDR();
             }
         }

trunk/daemon/orbited/static/xsdrBridge.html

@@ -21 +21 @@
 };
 
-
 function push(data) {
 
@@ -37 +36 @@
     }        
 }
-if (!isOpera)
+logger = null;
+function debug() {
+    document.domain = topDomain
+    logger.debug.apply(logger, arguments)
+    try {
+        document.domain = origDomain;
+    }
+    catch(e) {
+    }
+}
+if (!isOpera) {
     if (parts.length == 1) {
         try {
             document.domain = document.domain
-            parent.Orbited
+            logger = parent.Orbited.singleton.XSDRBridgeLogger
             topDomain = document.domain
         }
@@ -51 +60 @@
             document.domain = parts.slice(i).join(".")
             try {
-                parent.Orbited
+                logger = parent.Orbited.singleton.XSDRBridgeLogger
                 topDomain = document.domain
                 break;
@@ -60 +69 @@
         }
     }
-}
 if (topDomain == null)
     throw new Error("Invalid document.domain for cross-frame communication")
-
+}
 push(['initialized'])
-
 try {
     document.domain = origDomain
@@ -74 +81 @@
 
 function getNext() {
+//    alert(
     document.domain = topDomain
     var queue = parent.Orbited.singleton.XSDR.queues[id]
-//    alert('queue: ' + parent.JSON.stringify(queue))
+//    alert('queue: ' + queue.length)
     var data = null
     if (queue.length > 0)
@@ -97 +105 @@
 function checkAbort() {
     if (isOpera)    
-
+        return
+}
 
 function doNextRequest() {
-    if (isOpera)
-        sendGetNext()
-    else
+//    if (isOpera)
+//        sendGetNext()
+//    else
         req = getNext();
-
     if (req == null) {
         return setTimeout(doNextRequest, 10);
     }
-
     var smethod = req[0]
     var surl = req[1]
@@ -120 +127 @@
             readyState: xhr.readyState
         }
-        if (xhr.readyState == 3) {
-            try {
-                var data = xhr.responseText.slice(responseIndex)
-                responseIndex = xhr.responseText.length;
-                payload['responseText'] = data;
-            }
-            catch(e) {
-//                alert('status..?');
-            }
+        try {
+            payload['status'] = xhr.status
         }
+        catch(e) {           
+        }
+        try {
+            var data = xhr.responseText.slice(responseIndex)
+            responseIndex = xhr.responseText.length;
+            payload['responseText'] = data;
+        }
+        catch(e) {
+        }
+        push(["readystatechange", payload])
+
         if (xhr.readyState == 4) {
-            payload['responseText'] = xhr.responseText.slice(responseIndex)
-            payload['status'] = xhr.status
-            push(["readystatechange", payload])
             req = null;
             return doNextRequest();
         }
-        push(["readystatechange", payload])
     }
-//    alert('xhr.open(' + smethod + ', ' + surl + ', true)');
-//    alert('document.domain: ' + document.domain);
     xhr.open(smethod, surl, true)
     for (key in sheaders) {
@@ -159 +164 @@
 
 
-if (isOpera)
-{
+if (isOpera) {
     // Message receiver handler (req. for Opera compatibility)
     document.addEventListener('message', function(e) {