Changeset 545

Timestamp:

09/20/08 15:44:51 (2 months ago)

Author:

rgl

Message:

Merge the 0.7 branch into trunk.

For now on, trunk will contain the bleeding-edge version of Orbited.

Location:

trunk/daemon

Files:

• orbited-debug.cfg (modified) (1 diff)
• orbited/cometsession.py (modified) (2 diffs)
• orbited/config.py (modified) (2 diffs)
• orbited/start.py (modified) (4 diffs)
• orbited/static/Orbited.js (modified) (9 diffs)
• orbited/transports/htmlfile.py (modified) (3 diffs)
• setup.py (modified) (2 diffs)

trunk/daemon/orbited-debug.cfg

@@ -2 +2 @@
 reactor=epoll
 proxy.enabled=1
-session.ping_interval = 3
-session.ping_timeout = 4
+session.ping_interval = 60
+session.ping_timeout = 70
 
 [listen]

trunk/daemon/orbited/cometsession.py

@@ -320 +320 @@
         if not self.open:
             self.open = True
-            self.packetId += 1
             self.cometTransport.sendPacket("open", self.packetId)
         self.cometTransport.flush()
@@ -373 +372 @@
         if ackId <= self.lastAckId:
             return
-        for i in range(ackId - self.lastAckId - 1): # -1 as the OPEN packet need not be ack'ed
+        for i in range(ackId - self.lastAckId):
             self.unackQueue.pop(0)
         self.lastAckId = ackId

trunk/daemon/orbited/config.py

@@ -50 +50 @@
     return True
 
-def setup(argv):
+defaultPaths = [
+    os.path.join('/', 'etc', 'orbited.cfg'),
+    os.path.join('/', 'Program Files', 'Orbited', 'etc', 'orbited.cfg'),
+    'orbited.cfg',
+]
+
+def setup(argv, paths=defaultPaths):
     parser = OptionParser()
     parser.add_option(
@@ -67 +73 @@
     if not options.config:
         # no config file specified, try to search it.
-        paths = [
-            os.path.join('/', 'etc', 'orbited.cfg'),
-            os.path.join('/', 'Program Files', 'Orbited', 'etc', 'orbited.cfg'),
-            'orbited.cfg',
-        ]
         for path in paths:
             if os.path.exists(path):

trunk/daemon/orbited/start.py

@@ -26 +26 @@
             logger.info('%s protocol active' % config_key)
 
-def _setup_static(root):
+def _setup_static(root, config):
     from twisted.web import static
-    for key, val in config.map['[static]'].items():
+    for key, val in config['[static]'].items():
         if key == 'INDEX':
             key = ''
@@ -64 +64 @@
 
     _setup_protocols(root)
-    _setup_static(root)
+    _setup_static(root, config.map)
+    start_listening(site, config.map, logger)
+    reactor.run()
 
-    for addr in config.map['[listen]']:
+def start_listening(site, config, logger):
+    from twisted.internet import reactor
+    for addr in config['[listen]']:
         url = urlparse.urlparse(addr)
         hostname = url.hostname or ''
@@ -74 +78 @@
         elif url.scheme == 'https':
             from twisted.internet import ssl
-            crt = config.map['[ssl]']['crt']
-            key = config.map['[ssl]']['key']
+            crt = config['[ssl]']['crt']
+            key = config['[ssl]']['key']
             try:
                 ssl_context = ssl.DefaultOpenSSLContextFactory(key, crt)
@@ -89 +93 @@
             sys.exit(-1)
 
-    reactor.run()
 
 if __name__ == "__main__":

trunk/daemon/orbited/static/Orbited.js

@@ +1 @@
+
 // NOTE: to log/debug with Orbited, there are two methods:
 //          Use firebug 
@@ -362 +363 @@
 
 
-
+Orbited.legacy = {}
+//Orbited.web.connect = function() {
+//
+//}
 
 Orbited.CometSession = function() {
@@ -589 +593 @@
 ;;;     self.logger.debug('transportOnClose');
         if (self.readyState < self.READY_STATE_CLOSED) {
-            doClose(Orbited.Statuses.ServerClosedConnection)
+            try {
+                doClose(Orbited.Statuses.ServerClosedConnection)
+            }
+            catch(e) {
+//              Fix for navigation-close
+                return
+            }
         }
     }        
@@ -1159 +1169 @@
                         // If we got a 200, then we're in business
                         if (status == 200) {
-                            heartbeatTimer = window.setTimeout(heartbeatTimeout, Orbited.settings.HEARTBEAT_TIMEOUT);
+                            try {
+                                heartbeatTimer = window.setTimeout(heartbeatTimeout, Orbited.settings.HEARTBEAT_TIMEOUT);
+                            }
+                            catch(e) {
+//                               Happens after navigation
+                                 self.close()
+                                 return
+                            }
                             var testtimer = heartbeatTimer;
                         }
@@ -1241 +1258 @@
 //            self.logger.debug('do abort..')
             xhr.abort();
-            window.clearTimeout(heartbeatTimer);            
+            window.clearTimeout(heartbeatTimer);
         }
         else {
@@ -1304 +1321 @@
         window.clearTimeout(heartbeatTimer);
 ;;;     self.logger.debug('clearing heartbeatTimer', heartbeatTimer)
-        heartbeatTimer = window.setTimeout(function() { 
+        try {
+            heartbeatTimer = window.setTimeout(function() { 
 ;;;         self.logger.debug('timer', testtimer, 'did it'); 
-            heartbeatTimeout();
-        }, Orbited.settings.HEARTBEAT_TIMEOUT);
+                heartbeatTimeout();
+            }, Orbited.settings.HEARTBEAT_TIMEOUT);
+        }
+        catch(e) {
+            
+            return
+        }
         var testtimer = heartbeatTimer;
 
@@ -1772 +1795 @@
             throw new Error("Already Connected")
         }
+        self.logger.debug('self.connect', _url)
         url = new Orbited.URL(_url)
         url.path += '/htmlfile'
@@ -1787 +1811 @@
 
     var doOpen = function(_url) {
+;;;     self.logger.debug('doOpen', _url)
         htmlfile = new ActiveXObject('htmlfile'); // magical microsoft object
         htmlfile.open();
@@ -2493 +2518 @@
 }
 Orbited.JSON = JSON;
+
 })();

trunk/daemon/orbited/transports/htmlfile.py

@@ -14 +14 @@
             <html>
              <head>
-              <script src="../../static/HTMLFileFrame.js"></script>
+              <script src="../static/HTMLFileFrame.js"></script>
              </head>
              <body>
@@ -29 +29 @@
         self.request.setHeader('pragma', 'no-cache')
         self.request.setHeader('expires', '-1')
+        logger.debug('send initialData: ', self.initialData)
         self.request.write(self.initialData)
 
@@ -38 +39 @@
         #      after they are executed.
         payload = '<script>e(%s)</script>' % (json.encode(packets),)
+        logger.debug('write ', payload)
         self.request.write(payload);
         self.totalBytes += len(payload)

trunk/daemon/setup.py

@@ -22 +22 @@
 setup(
     name='orbited',
-    version='0.6.2',
+    version='0.7.0',
     author='Michael Carter',
     author_email='CarterMichael@gmail.com',
@@ -43 +43 @@
     
     classifiers = [
-        'Development Status :: 3 - Beta',
+        'Development Status :: 4 - Beta',
         'Environment :: Console',
         'Intended Audience :: Developers',