X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=transports%2Fstratum_http.py;h=659bae033d139d33546202bdb9b3de74eb0d22eb;hb=561047a590b4f1546174c8dc8814d0523533aae1;hp=419b1ad71bb42b44303d86fd3e26b51bfd673f1d;hpb=638b04908c8a25b8e40511eb5b5b6c0fce99b99a;p=electrum-server.git

diff --git a/transports/stratum_http.py b/transports/stratum_http.py
index 419b1ad..659bae0 100644
--- a/transports/stratum_http.py
+++ b/transports/stratum_http.py
@@ -47,11 +47,7 @@ from the processor point of view:
 """
 
 
-def random_string(N):
-    import random, string
-    return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N))
-
-
+from processor import random_string
 
 
 def get_version(request):
@@ -111,12 +107,11 @@ class StratumJSONRPCDispatcher(SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
                 responses.append(result.response())
                 continue
 
-            session = self.sessions.get(session_id)
-            if session:
-                self.dispatcher.process(session, req_entry)
-                if req_entry['method'] == 'server.stop':
-                    return json.dumps({'result':'ok'})
-
+            session = self.dispatcher.get_session_by_address(session_id)
+            self.dispatcher.process(session, req_entry)
+                
+            if req_entry['method'] == 'server.stop':
+                return json.dumps({'result':'ok'})
 
         r = self.poll_session(session_id)
         for item in r:
@@ -169,6 +164,7 @@ class StratumJSONRPCRequestHandler(
             self.send_header("Set-Cookie", "SESSION=%s"%session_id)
 
         self.send_header("Content-type", "application/json-rpc")
+        self.send_header("Access-Control-Allow-Origin", "*")
         self.send_header("Content-length", str(len(response)))
         self.end_headers()
         self.wfile.write(response)
@@ -194,12 +190,12 @@ class StratumJSONRPCRequestHandler(
             c = self.headers.get('cookie')
             if c:
                 if c[0:8]=='SESSION=':
-                    print "found cookie", c[8:]
+                    #print "found cookie", c[8:]
                     session_id = c[8:]
 
             if session_id is None:
                 session_id = self.server.create_session()
-                print "setting cookie", session_id
+                #print "setting cookie", session_id
 
             response = self.server._marshaled_dispatch(session_id, data)
             self.send_response(200)
@@ -217,6 +213,7 @@ class StratumJSONRPCRequestHandler(
             self.send_header("Set-Cookie", "SESSION=%s"%session_id)
 
         self.send_header("Content-type", "application/json-rpc")
+        self.send_header("Access-Control-Allow-Origin", "*")
         self.send_header("Content-length", str(len(response)))
         self.end_headers()
         self.wfile.write(response)
@@ -257,34 +254,39 @@ class StratumJSONRPCServer(SocketServer.TCPServer, StratumJSONRPCDispatcher):
             flags |= fcntl.FD_CLOEXEC
             fcntl.fcntl(self.fileno(), fcntl.F_SETFD, flags)
 
-        self.sessions = {}
-
 
 
     def create_session(self):
         session_id = random_string(10)
-        self.sessions[session_id] = HttpSession(session_id)
+        session = HttpSession(session_id)
+        self.dispatcher.add_session(session)
         return session_id
 
-    def poll_session(self,session_id):
-        responses = self.sessions[session_id].pending_responses[:]
-        self.sessions[session_id].pending_responses = []
-        print "poll: %d responses"%len(responses)
+    def poll_session(self, session_id):
+        session = self.dispatcher.get_session_by_address(session_id)
+        q = session.pending_responses
+        responses = []
+        while not q.empty():
+            r = q.get()
+            responses.append(r)
+        #print "poll: %d responses"%len(responses)
         return responses
 
 
 from processor import Session
+import Queue
 
 class HttpSession(Session):
 
     def __init__(self, session_id):
         Session.__init__(self)
-        self.pending_responses = []
-        print "new http session", session_id
+        self.pending_responses = Queue.Queue()
+        self.address = session_id
+        self.name = "HTTP session"
 
     def send_response(self, response):
         raw_response = json.dumps(response)
-        self.pending_responses.append(response)
+        self.pending_responses.put(response)
 
 class HttpServer(threading.Thread):
     def __init__(self, dispatcher, host, port):
@@ -304,6 +306,7 @@ class HttpServer(threading.Thread):
         self.server = StratumThreadedJSONRPCServer(( self.host, self.port))
         self.server.dispatcher = self.dispatcher
         self.server.register_function(None, 'server.stop')
+        self.server.register_function(None, 'server.info')
 
         print "HTTP server started."
         self.server.serve_forever()