aboutsummaryrefslogtreecommitdiffstats
path: root/python-tornado
diff options
context:
space:
mode:
Diffstat (limited to 'python-tornado')
-rw-r--r--python-tornado/Makefile28
-rw-r--r--python-tornado/Pubnub.py772
-rw-r--r--python-tornado/PubnubCrypto.py92
-rw-r--r--python-tornado/examples/here-now-example.py45
-rw-r--r--python-tornado/examples/history-example.py2
-rw-r--r--python-tornado/examples/publish-example.py43
-rw-r--r--python-tornado/examples/subscribe-example.py20
-rw-r--r--python-tornado/tests/benchmark.py2
-rw-r--r--python-tornado/tests/unit-test.py224
-rw-r--r--python-tornado/tests/unit-tests.py73
-rw-r--r--python-tornado/unassembled/Platform.py67
11 files changed, 794 insertions, 574 deletions
diff --git a/python-tornado/Makefile b/python-tornado/Makefile
new file mode 100644
index 0000000..bf23137
--- /dev/null
+++ b/python-tornado/Makefile
@@ -0,0 +1,28 @@
+include ../Makefile.inc
+
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build:
+ cat ../common/LICENSE_HEADER > ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ../common/PubnubCrypto.py >> ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ../common/PubnubBase.py >> ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ../common/PubnubCoreAsync.py >> ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ./unassembled/Platform.py >> ./Pubnub.py
+ find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g"
+
+
+.PHONY: clean
+clean:
+ rm -f Pubnub.py*
+
+.PHONY: test
+test:
+ python tests/unit-tests.py
+
diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py
index 12baf17..268cd6a 100644
--- a/python-tornado/Pubnub.py
+++ b/python-tornado/Pubnub.py
@@ -6,37 +6,102 @@
## http://www.pubnub.com/
## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
+## PubNub 3.3.4 Real-time Push Cloud API
## -----------------------------------
-import json
-import time
+
+from Crypto.Cipher import AES
+from Crypto.Hash import MD5
+from base64 import encodestring, decodestring
import hashlib
-import urllib2
-import tornado.httpclient
-import sys
-import uuid
+import hmac
-try:
- from hashlib import sha256
- digestmod = sha256
-except ImportError:
- import Crypto.Hash.SHA256 as digestmod
- sha256 = digestmod.new
+class PubnubCrypto() :
+ """
+ #**
+ #* PubnubCrypto
+ #*
+ #**
-import hmac
-import tornado.ioloop
-from PubnubCrypto import PubnubCrypto
+ ## Initiate Class
+ pc = PubnubCrypto
-ioloop = tornado.ioloop.IOLoop.instance()
+ """
+
+ def pad( self, msg, block_size=16 ):
+ """
+ #**
+ #* pad
+ #*
+ #* pad the text to be encrypted
+ #* appends a padding character to the end of the String
+ #* until the string has block_size length
+ #* @return msg with padding.
+ #**
+ """
+ padding = block_size - (len(msg) % block_size)
+ return msg + chr(padding)*padding
+
+ def depad( self, msg ):
+ """
+ #**
+ #* depad
+ #*
+ #* depad the decryptet message"
+ #* @return msg without padding.
+ #**
+ """
+ return msg[0:-ord(msg[-1])]
-class Pubnub():
+ def getSecret( self, key ):
+ """
+ #**
+ #* getSecret
+ #*
+ #* hases the key to MD5
+ #* @return key in MD5 format
+ #**
+ """
+ return hashlib.sha256(key).hexdigest()
- def stop(self): ioloop.stop()
- def start(self): ioloop.start()
- def timeout( self, callback, delay ):
- ioloop.add_timeout( time.time()+float(delay), callback )
-
+ def encrypt( self, key, msg ):
+ """
+ #**
+ #* encrypt
+ #*
+ #* encrypts the message
+ #* @return message in encrypted format
+ #**
+ """
+ secret = self.getSecret(key)
+ Initial16bytes='0123456789012345'
+ cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
+ enc = encodestring(cipher.encrypt(self.pad(msg)))
+ return enc
+ def decrypt( self, key, msg ):
+ """
+ #**
+ #* decrypt
+ #*
+ #* decrypts the message
+ #* @return message in decryped format
+ #**
+ """
+ secret = self.getSecret(key)
+ Initial16bytes='0123456789012345'
+ cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
+ return self.depad((cipher.decrypt(decodestring(msg))))
+
+
+try: import json
+except ImportError: import simplejson as json
+
+import time
+import hashlib
+import urllib2
+import uuid
+
+class PubnubBase(object):
def __init__(
self,
publish_key,
@@ -44,7 +109,8 @@ class Pubnub():
secret_key = False,
cipher_key = False,
ssl_on = False,
- origin = 'pubsub.pubnub.com'
+ origin = 'pubsub.pubnub.com',
+ UUID = None
) :
"""
#**
@@ -54,9 +120,10 @@ class Pubnub():
#*
#* @param string publish_key required key to send messages.
#* @param string subscribe_key required key to receive messages.
- #* @param string secret_key required key to sign messages.
+ #* @param string secret_key optional key to sign messages.
#* @param boolean ssl required for 2048 bit encrypted messages.
#* @param string origin PUBNUB Server Origin.
+ #* @param string pres_uuid optional identifier for presence (auto-generated if not supplied)
#**
## Initiat Class
@@ -64,17 +131,79 @@ class Pubnub():
"""
self.origin = origin
+ self.limit = 1800
self.publish_key = publish_key
self.subscribe_key = subscribe_key
self.secret_key = secret_key
self.cipher_key = cipher_key
self.ssl = ssl_on
- self.subscriptions = {}
if self.ssl :
self.origin = 'https://' + self.origin
else :
self.origin = 'http://' + self.origin
+
+ self.uuid = UUID or str(uuid.uuid4())
+
+ if not isinstance(self.uuid, basestring):
+ raise AttributeError("pres_uuid must be a string")
+
+ def sign(self, channel, message):
+ ## Sign Message
+ if self.secret_key:
+ signature = hashlib.md5('/'.join([
+ self.publish_key,
+ self.subscribe_key,
+ self.secret_key,
+ channel,
+ message
+ ])).hexdigest()
+ else:
+ signature = '0'
+ return signature
+
+ def encrypt(self, message):
+ if self.cipher_key:
+ pc = PubnubCrypto()
+ out = []
+ if type( message ) == type(list()):
+ for item in message:
+ encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
+ out.append(encryptItem)
+ message = json.dumps(out)
+ elif type( message ) == type(dict()):
+ outdict = {}
+ for k, item in message.iteritems():
+ encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
+ outdict[k] = encryptItem
+ out.append(outdict)
+ message = json.dumps(out[0])
+ else:
+ message = json.dumps(pc.encrypt(self.cipher_key, json.dumps(message)).replace('\n',''))
+ else :
+ message = json.dumps(message)
+
+ return message;
+
+ def decrypt(self, message):
+ if self.cipher_key:
+ pc = PubnubCrypto()
+ if type( message ) == type(list()):
+ for item in message:
+ encryptItem = pc.decrypt(self.cipher_key, item )
+ out.append(encryptItem)
+ message = out
+ elif type( message ) == type(dict()):
+ outdict = {}
+ for k, item in message.iteritems():
+ encryptItem = pc.decrypt(self.cipher_key, item )
+ outdict[k] = encryptItem
+ out.append(outdict)
+ message = out[0]
+ else:
+ message = pc.decrypt(self.cipher_key, message)
+
+ return message
def publish( self, args ) :
@@ -89,71 +218,35 @@ class Pubnub():
#**
## Publish Example
- def publish_complete(info):
- print(info)
-
- pubnub.publish({
+ info = pubnub.publish({
'channel' : 'hello_world',
'message' : {
'some_text' : 'Hello my World'
- },
- 'callback' : publish_complete
+ }
})
+ print(info)
"""
## Fail if bad input.
if not (args['channel'] and args['message']) :
- print('Missing Channel or Message')
- return False
+ return [ 0, 'Missing Channel or Message' ]
## Capture User Input
channel = str(args['channel'])
- message = args['message']
-
- if self.cipher_key :
- pc = PubnubCrypto()
- out = []
- if type( message ) == type(list()):
- for item in message:
- encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
- out.append(encryptItem)
- message = json.dumps(out)
- elif type( message ) == type(dict()):
- outdict = {}
- for k, item in message.iteritems():
- encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
- outdict[k] = encryptItem
- out.append(outdict)
- message = json.dumps(out[0])
- else:
- message = json.dumps(pc.encrypt(self.cipher_key, message).replace('\n',''))
- else :
- message = json.dumps(args['message'])
## Capture Callback
if args.has_key('callback') :
callback = args['callback']
else :
- callback = lambda x : x
+ callback = None
+
+ #message = json.dumps(args['message'], separators=(',',':'))
+ message = self.encrypt(args['message'])
+
+ signature = self.sign(channel, message)
- ## Sign Message
- if self.secret_key :
- hashObject = sha256()
- hashObject.update(self.secret_key)
- hashedSecret = hashObject.hexdigest()
- hash = hmac.HMAC(hashedSecret, '/'.join([
- self.publish_key,
- self.subscribe_key,
- self.secret_key,
- channel,
- message
- ]), digestmod=digestmod)
- signature = hash.hexdigest()
- else :
- signature = '0'
-
## Send Message
- return self._request([
+ return self._request({"urlcomponents": [
'publish',
self.publish_key,
self.subscribe_key,
@@ -161,8 +254,295 @@ class Pubnub():
channel,
'0',
message
- ], callback );
+ ]}, callback)
+
+ def presence( self, args ) :
+ """
+ #**
+ #* presence
+ #*
+ #* This is BLOCKING.
+ #* Listen for presence events on a channel.
+ #*
+ #* @param array args with channel and callback.
+ #* @return false on fail, array on success.
+ #**
+
+ ## Presence Example
+ def pres_event(message) :
+ print(message)
+ return True
+
+ pubnub.presence({
+ 'channel' : 'hello_world',
+ 'callback' : receive
+ })
+ """
+
+ ## Fail if missing channel
+ if not 'channel' in args :
+ raise Exception('Missing Channel.')
+ return False
+
+ ## Fail if missing callback
+ if not 'callback' in args :
+ raise Exception('Missing Callback.')
+ return False
+
+ ## Capture User Input
+ channel = str(args['channel'])
+ callback = args['callback']
+ subscribe_key = args.get('subscribe_key') or self.subscribe_key
+
+ return self.subscribe({'channel': channel+'-pnpres', 'subscribe_key':subscribe_key, 'callback': callback})
+
+
+ def here_now( self, args ) :
+ """
+ #**
+ #* Here Now
+ #*
+ #* Load current occupancy from a channel.
+ #*
+ #* @param array args with 'channel'.
+ #* @return mixed false on fail, array on success.
+ #*
+
+ ## Presence Example
+ here_now = pubnub.here_now({
+ 'channel' : 'hello_world',
+ })
+ print(here_now['occupancy'])
+ print(here_now['uuids'])
+
+ """
+ channel = str(args['channel'])
+
+ ## Capture Callback
+ if args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+
+ ## Fail if bad input.
+ if not channel :
+ raise Exception('Missing Channel')
+ return False
+
+ ## Get Presence Here Now
+ return self._request({"urlcomponents": [
+ 'v2','presence',
+ 'sub_key', self.subscribe_key,
+ 'channel', channel
+ ]}, callback);
+
+
+ def history( self, args ) :
+ """
+ #**
+ #* History
+ #*
+ #* Load history from a channel.
+ #*
+ #* @param array args with 'channel' and 'limit'.
+ #* @return mixed false on fail, array on success.
+ #*
+
+ ## History Example
+ history = pubnub.history({
+ 'channel' : 'hello_world',
+ 'limit' : 1
+ })
+ print(history)
+
+ """
+ ## Capture User Input
+ limit = args.has_key('limit') and int(args['limit']) or 10
+ channel = str(args['channel'])
+
+ ## Fail if bad input.
+ if not channel :
+ raise Exception('Missing Channel')
+ return False
+
+ ## Capture Callback
+ if args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+
+ ## Get History
+ return self._request({ "urlcomponents" : [
+ 'history',
+ self.subscribe_key,
+ channel,
+ '0',
+ str(limit)
+ ] }, callback);
+
+ def detailedHistory(self, args) :
+ """
+ #**
+ #* Detailed History
+ #*
+ #* Load Detailed history from a channel.
+ #*
+ #* @param array args with 'channel', optional: 'start', 'end', 'reverse', 'count'
+ #* @return mixed false on fail, array on success.
+ #*
+
+ ## History Example
+ history = pubnub.detailedHistory({
+ 'channel' : 'hello_world',
+ 'count' : 5
+ })
+ print(history)
+
+ """
+ ## Capture User Input
+ channel = str(args['channel'])
+
+ params = dict()
+ count = 100
+
+ if args.has_key('count'):
+ count = int(args['count'])
+
+ params['count'] = str(count)
+
+ if args.has_key('reverse'):
+ params['reverse'] = str(args['reverse']).lower()
+
+ if args.has_key('start'):
+ params['start'] = str(args['start'])
+
+ if args.has_key('end'):
+ params['end'] = str(args['end'])
+
+ ## Fail if bad input.
+ if not channel :
+ raise Exception('Missing Channel')
+ return False
+
+ ## Capture Callback
+ if args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+
+ ## Get History
+ return self._request({ 'urlcomponents' : [
+ 'v2',
+ 'history',
+ 'sub-key',
+ self.subscribe_key,
+ 'channel',
+ channel,
+ ],'urlparams' : params }, callback=callback);
+
+ def time(self, args = None) :
+ """
+ #**
+ #* Time
+ #*
+ #* Timestamp from PubNub Cloud.
+ #*
+ #* @return int timestamp.
+ #*
+
+ ## PubNub Server Time Example
+ timestamp = pubnub.time()
+ print(timestamp)
+
+ """
+ ## Capture Callback
+ if args and args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+ time = self._request({'urlcomponents' : [
+ 'time',
+ '0'
+ ]}, callback)
+ if time != None:
+ return time[0]
+
+
+ def _encode( self, request ) :
+ return [
+ "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+ hex(ord(ch)).replace( '0x', '%' ).upper() or
+ ch for ch in list(bit)
+ ]) for bit in request]
+
+ def getUrl(self,request):
+ ## Build URL
+ url = self.origin + '/' + "/".join([
+ "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+ hex(ord(ch)).replace( '0x', '%' ).upper() or
+ ch for ch in list(bit)
+ ]) for bit in request["urlcomponents"]])
+ if (request.has_key("urlparams")):
+ url = url + '?' + "&".join([ x + "=" + y for x,y in request["urlparams"].iteritems()])
+ return url
+
+
+try:
+ from hashlib import sha256
+ digestmod = sha256
+except ImportError:
+ import Crypto.Hash.SHA256 as digestmod
+ sha256 = digestmod.new
+import hmac
+
+class PubnubCoreAsync(PubnubBase):
+
+ def start(self): pass
+ def stop(self): pass
+ def timeout( self, delay, callback ):
+ pass
+
+ def __init__(
+ self,
+ publish_key,
+ subscribe_key,
+ secret_key = False,
+ cipher_key = False,
+ ssl_on = False,
+ origin = 'pubsub.pubnub.com',
+ uuid = None
+ ) :
+ """
+ #**
+ #* Pubnub
+ #*
+ #* Init the Pubnub Client API
+ #*
+ #* @param string publish_key required key to send messages.
+ #* @param string subscribe_key required key to receive messages.
+ #* @param string secret_key required key to sign messages.
+ #* @param boolean ssl required for 2048 bit encrypted messages.
+ #* @param string origin PUBNUB Server Origin.
+ #**
+
+ ## Initiat Class
+ pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False )
+
+ """
+ super(PubnubCoreAsync, self).__init__(
+ publish_key=publish_key,
+ subscribe_key=subscribe_key,
+ secret_key=secret_key,
+ cipher_key=cipher_key,
+ ssl_on=ssl_on,
+ origin=origin,
+ UUID=uuid
+ )
+ self.subscriptions = {}
+ self.timetoken = 0
+ self.version = '3.3.4'
+ self.accept_encoding = 'gzip'
def subscribe( self, args ) :
"""
@@ -198,13 +578,11 @@ class Pubnub():
"""
## Fail if missing channel
if not 'channel' in args :
- print('Missing Channel.')
- return False
+ return 'Missing Channel.'
## Fail if missing callback
if not 'callback' in args :
- print('Missing Callback.')
- return False
+ return 'Missing Callback.'
## Capture User Input
channel = str(args['channel'])
@@ -220,86 +598,66 @@ class Pubnub():
if not (channel in self.subscriptions) :
self.subscriptions[channel] = {
'first' : False,
- 'connected' : 0,
- 'timetoken' : '0'
+ 'connected' : False,
}
## Ensure Single Connection
if self.subscriptions[channel]['connected'] :
- print("Already Connected")
- return False
+ return "Already Connected"
self.subscriptions[channel]['connected'] = 1
-
## SUBSCRIPTION RECURSION
- def substabizel():
+ def _subscribe():
## STOP CONNECTION?
if not self.subscriptions[channel]['connected']:
return
-
+
def sub_callback(response):
+ if not self.subscriptions[channel]['first'] :
+ self.subscriptions[channel]['first'] = True
+ connectcb()
+
## STOP CONNECTION?
if not self.subscriptions[channel]['connected']:
return
- ## CONNECTED CALLBACK
- if not self.subscriptions[channel]['first'] :
- self.subscriptions[channel]['first'] = True
- connectcb()
+
## PROBLEM?
if not response:
def time_callback(_time):
if not _time:
- ioloop.add_timeout(time.time()+1, substabizel)
+ self.timeout( 1, _subscribe )
return errorback("Lost Network Connection")
else:
- ioloop.add_timeout(time.time()+1, substabizel)
+ self.timeout( 1, _subscribe)
## ENSURE CONNECTED (Call Time Function)
return self.time({ 'callback' : time_callback })
- self.subscriptions[channel]['timetoken'] = response[1]
- substabizel()
+ self.timetoken = response[1]
+ _subscribe()
pc = PubnubCrypto()
out = []
for message in response[0]:
- if self.cipher_key :
- if type( message ) == type(list()):
- for item in message:
- encryptItem = pc.decrypt(self.cipher_key, item )
- out.append(encryptItem)
- message = out
- elif type( message ) == type(dict()):
- outdict = {}
- for k, item in message.iteritems():
- encryptItem = pc.decrypt(self.cipher_key, item )
- outdict[k] = encryptItem
- out.append(outdict)
- message = out[0]
- else:
- message = pc.decrypt(self.cipher_key, message )
-
- callback(message)
+ callback(self.decrypt(message))
## CONNECT TO PUBNUB SUBSCRIBE SERVERS
- try :
- self._request( [
+ try:
+ self._request( { "urlcomponents" : [
'subscribe',
self.subscribe_key,
channel,
'0',
- str(self.subscriptions[channel]['timetoken'])
- ], sub_callback )
+ str(self.timetoken)
+ ], "urlparams" : {"uuid":self.uuid} }, sub_callback )
except :
- ioloop.add_timeout(time.time()+1, substabizel)
+ self.timeout( 1, _subscribe)
return
## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES)
- substabizel()
-
-
+ _subscribe()
def unsubscribe( self, args ):
channel = str(args['channel'])
if not (channel in self.subscriptions):
@@ -311,140 +669,70 @@ class Pubnub():
self.subscriptions[channel]['first'] = False
- def history( self, args ) :
- """
- #**
- #* History
- #*
- #* Load history from a channel.
- #*
- #* @param array args with 'channel' and 'limit'.
- #* @return mixed false on fail, array on success.
- #*
-
- ## History Example
- history = pubnub.history({
- 'channel' : 'hello_world',
- 'limit' : 1
- })
- print(history)
-
- """
- ## Capture User Input
- limit = args.has_key('limit') and int(args['limit']) or 10
- channel = str(args['channel'])
-
- ## Fail if bad input.
- if not channel :
- print('Missing Channel')
- return False
-
- ## Get History
- return self._request( [
- 'history',
- self.subscribe_key,
- channel,
- '0',
- str(limit)
- ], args['callback'] );
+import tornado.httpclient
- def time( self, args ) :
- """
- #**
- #* Time
- #*
- #* Timestamp from PubNub Cloud.
- #*
- #* @return int timestamp.
- #*
+try:
+ from hashlib import sha256
+ digestmod = sha256
+except ImportError:
+ import Crypto.Hash.SHA256 as digestmod
+ sha256 = digestmod.new
- ## PubNub Server Time Example
- def time_complete(timestamp):
- print(timestamp)
+import hmac
+import tornado.ioloop
+from tornado.stack_context import ExceptionStackContext
+from PubnubCrypto import PubnubCrypto
- pubnub.time(time_complete)
+ioloop = tornado.ioloop.IOLoop.instance()
- """
- def complete(response) :
- args['callback'](response and response[0])
+class Pubnub(PubnubCoreAsync):
- self._request( [
- 'time',
- '0'
- ], complete )
+ def stop(self): ioloop.stop()
+ def start(self): ioloop.start()
+ def timeout( self, delay, callback):
+ ioloop.add_timeout( time.time()+float(delay), callback )
- def uuid(self) :
- """
- #**
- #* uuid
- #*
- #* Generate a UUID
- #*
- #* @return UUID.
- #*
-
- ## PubNub UUID Example
- uuid = pubnub.uuid()
- print(uuid)
- """
- return uuid.uuid1()
+ def __init__(
+ self,
+ publish_key,
+ subscribe_key,
+ secret_key = False,
+ cipher_key = False,
+ ssl_on = False,
+ origin = 'pubsub.pubnub.com'
+ ) :
+ super(Pubnub, self).__init__(
+ publish_key=publish_key,
+ subscribe_key=subscribe_key,
+ secret_key=secret_key,
+ cipher_key=cipher_key,
+ ssl_on=ssl_on,
+ origin=origin,
+ )
+ self.headers = {}
+ self.headers['User-Agent'] = 'Python-Tornado'
+ self.headers['Accept-Encoding'] = self.accept_encoding
+ self.headers['V'] = self.version
+ self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000)
def _request( self, request, callback ) :
- ## Build URL
- url = self.origin + '/' + "/".join([
- "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
- hex(ord(ch)).replace( '0x', '%' ).upper() or
- ch for ch in list(bit)
- ]) for bit in request])
-
- requestType = request[0]
-
- def complete(response) :
- if response.error:
- return callback(None)
- obj = json.loads(response.buffer.getvalue())
- pc = PubnubCrypto()
- out = []
- if self.cipher_key :
- if requestType == "history" :
- if type(obj) == type(list()):
- for item in obj:
- if type(item) == type(list()):
- for subitem in item:
- encryptItem = pc.decrypt(self.cipher_key, subitem )
- out.append(encryptItem)
- elif type(item) == type(dict()):
- outdict = {}
- for k, subitem in item.iteritems():
- encryptItem = pc.decrypt(self.cipher_key, subitem )
- outdict[k] = encryptItem
- out.append(outdict)
- else :
- encryptItem = pc.decrypt(self.cipher_key, item )
- out.append(encryptItem)
- callback(out)
- elif type( obj ) == type(dict()):
- for k, item in obj.iteritems():
- encryptItem = pc.decrypt(self.cipher_key, item )
- out.append(encryptItem)
- callback(out)
- else :
- callback(obj)
- else :
- callback(obj)
-
+ url = self.getUrl(request)
## Send Request Expecting JSON Response
- http = tornado.httpclient.AsyncHTTPClient(max_clients=1000)
- request = tornado.httpclient.HTTPRequest( url, 'GET', dict({
- 'V' : '3.1',
- 'User-Agent' : 'Python-Tornado',
- 'Accept-Encoding' : 'gzip'
- }) )
+ #print self.headers
+
+ request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=10, request_timeout=310 )
+
+ def responseCallback(response):
+ def handle_exc(*args):
+ return True
+ if response.error is not None:
+ with ExceptionStackContext(handle_exc):
+ response.rethrow()
+ elif callback:
+ callback(eval(response._get_body()))
- http.fetch(
+ self.http.fetch(
request,
- callback=complete,
- connect_timeout=310,
- request_timeout=310
+ callback=responseCallback,
)
diff --git a/python-tornado/PubnubCrypto.py b/python-tornado/PubnubCrypto.py
deleted file mode 100644
index 744f2d3..0000000
--- a/python-tornado/PubnubCrypto.py
+++ /dev/null
@@ -1,92 +0,0 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
-# coding=utf8
-
-## PubNub Real-time Push APIs and Notifications Framework
-## Copyright (c) 2010 Stephen Blum
-## http://www.pubnub.com/
-
-## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
-## -----------------------------------
-
-from Crypto.Cipher import AES
-from Crypto.Hash import MD5
-from base64 import encodestring, decodestring
-import hashlib
-import hmac
-
-class PubnubCrypto() :
- """
- #**
- #* PubnubCrypto
- #*
- #**
-
- ## Initiate Class
- pc = PubnubCrypto
-
- """
-
- def pad( self, msg, block_size=16 ):
- """
- #**
- #* pad
- #*
- #* pad the text to be encrypted
- #* appends a padding character to the end of the String
- #* until the string has block_size length
- #* @return msg with padding.
- #**
- """
- return msg + ((block_size - len(msg) % block_size) * chr(block_size - len(msg) % block_size))
-
- def depad( self, msg ):
- """
- #**
- #* depad
- #*
- #* depad the decryptet message"
- #* @return msg without padding.
- #**
- """
- return msg[0:-ord(msg[-1])]
-
- def getSecret( self, key ):
- """
- #**
- #* getSecret
- #*
- #* hases the key to MD5
- #* @return key in MD5 format
- #**
- """
- return MD5.new(key).digest()
-
- def encrypt( self, key, msg ):
- """
- #**
- #* encrypt
- #*
- #* encrypts the message
- #* @return message in encrypted format
- #**
- """
- secret = self.getSecret(key)
- Initial16bytes='0123456789012345'
- cipher = AES.new(secret,AES.MODE_CBC,Initial16bytes)
- return encodestring(cipher.encrypt(self.pad(msg)))
-
- def decrypt( self, key, msg ):
- """
- #**
- #* decrypt
- #*
- #* decrypts the message
- #* @return message in decryped format
- #**
- """
- secret = self.getSecret(key)
- Initial16bytes='0123456789012345'
- cipher = AES.new(secret,AES.MODE_CBC,Initial16bytes)
- return self.depad((cipher.decrypt(decodestring(msg))))
-
diff --git a/python-tornado/examples/here-now-example.py b/python-tornado/examples/here-now-example.py
new file mode 100644
index 0000000..85e3432
--- /dev/null
+++ b/python-tornado/examples/here-now-example.py
@@ -0,0 +1,45 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud.
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+## -----------------------------------
+## PubNub 3.1 Real-time Push Cloud API
+## -----------------------------------
+
+import sys
+import tornado
+sys.path.append('..')
+sys.path.append('../../common')
+from Pubnub import Pubnub
+
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+crazy = 'hello_world'
+
+## -----------------------------------------------------------------------
+## History Example
+## -----------------------------------------------------------------------
+def here_now_complete(messages):
+ print(messages)
+ pubnub.stop()
+
+pubnub.here_now( {
+ 'channel' : crazy,
+ 'callback' : here_now_complete
+})
+
+## -----------------------------------------------------------------------
+## IO Event Loop
+## -----------------------------------------------------------------------
+pubnub.start()
diff --git a/python-tornado/examples/history-example.py b/python-tornado/examples/history-example.py
index 5c6fb5b..c1619f4 100644
--- a/python-tornado/examples/history-example.py
+++ b/python-tornado/examples/history-example.py
@@ -11,7 +11,6 @@
import sys
import tornado
-sys.path.append('../')
from Pubnub import Pubnub
publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
@@ -31,6 +30,7 @@ crazy = 'hello_world'
## -----------------------------------------------------------------------
def history_complete(messages):
print(messages)
+ tornado.ioloop.IOLoop.instance().stop()
pubnub.history( {
'channel' : crazy,
diff --git a/python-tornado/examples/publish-example.py b/python-tornado/examples/publish-example.py
index cd66720..b9eaa15 100644
--- a/python-tornado/examples/publish-example.py
+++ b/python-tornado/examples/publish-example.py
@@ -6,38 +6,57 @@
## http://www.pubnub.com/
## -----------------------------------
-## PubNub 3.0 Real-time Push Cloud API
+## PubNub 3.1 Real-time Push Cloud API
## -----------------------------------
import sys
import tornado
sys.path.append('../')
+sys.path.append('../..')
+sys.path.append('../../common')
from Pubnub import Pubnub
publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' ##(Cipher key is Optional)
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'demo' ##(Cipher key is Optional)
ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
## -----------------------------------------------------------------------
## Initiate Pubnub State
## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key,cipher_key, ssl_on )
+pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key,cipher_key=cipher_key, ssl_on=ssl_on )
+#pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
crazy = 'hello_world'
-## -----------------------------------------------------------------------
-## History Example
-## -----------------------------------------------------------------------
-def history_complete(messages):
- print(messages)
+def publish_complete(info):
+ print(info)
+
+## Publish string
+pubnub.publish({
+ 'channel' : crazy,
+ 'message' : 'Hello World!',
+ 'callback' : publish_complete
+})
-pubnub.history( {
- 'channel' : crazy,
- 'limit' : 10,
- 'callback' : history_complete
+## Publish list
+li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+pubnub.publish({
+ 'channel' : crazy,
+ 'message' : li,
+ 'callback' : publish_complete
})
+def done_cb(info):
+ publish_complete(info)
+ tornado.ioloop.IOLoop.instance().stop()
+
+## Publish Dictionary Object
+pubnub.publish({
+ 'channel' : crazy,
+ 'message' : { 'some_key' : 'some_val' },
+ 'callback' : done_cb
+})
## -----------------------------------------------------------------------
## IO Event Loop
## -----------------------------------------------------------------------
diff --git a/python-tornado/examples/subscribe-example.py b/python-tornado/examples/subscribe-example.py
index c819f94..dfe8010 100644
--- a/python-tornado/examples/subscribe-example.py
+++ b/python-tornado/examples/subscribe-example.py
@@ -12,23 +12,37 @@
import sys
import tornado
sys.path.append('../')
+sys.path.append('../..')
from Pubnub import Pubnub
publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' ##(Cipher key is Optional)
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'demo' ##(Cipher key is Optional)
ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
## -----------------------------------------------------------------------
## Initiate Pubnub State
## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key,cipher_key, ssl_on )
+pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key,cipher_key=cipher_key, ssl_on=ssl_on )
+#pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
crazy = 'hello_world'
+def connect_cb():
+ print 'Connect'
+
+def subscribe_result(response):
+ print response
+
+pubnub.subscribe({
+ 'channel' : crazy,
+ 'callback' : subscribe_result,
+ 'connect' : connect_cb
+})
## -----------------------------------------------------------------------
## Publish Example
## -----------------------------------------------------------------------
+'''
def publish_complete(info):
print(info)
@@ -53,7 +67,7 @@ pubnub.publish({
'message' : { 'some_key' : 'some_val' },
'callback' : publish_complete
})
-
+'''
## -----------------------------------------------------------------------
## IO Event Loop
## -----------------------------------------------------------------------
diff --git a/python-tornado/tests/benchmark.py b/python-tornado/tests/benchmark.py
index 5f9b5e3..9d1840e 100644
--- a/python-tornado/tests/benchmark.py
+++ b/python-tornado/tests/benchmark.py
@@ -12,7 +12,9 @@
import sys
import datetime
import tornado
+sys.path.append('./')
sys.path.append('../')
+sys.path.append('../common')
from Pubnub import Pubnub
publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
diff --git a/python-tornado/tests/unit-test.py b/python-tornado/tests/unit-test.py
deleted file mode 100644
index f593d11..0000000
--- a/python-tornado/tests/unit-test.py
+++ /dev/null
@@ -1,224 +0,0 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
-# coding=utf8
-
-## PubNub Real-time Push APIs and Notifications Framework
-## Copyright (c) 2010 Stephen Blum
-## http://www.pubnub.com/
-
-## TODO Tests
-##
-## - wait 20 minutes, send a message, receive and success.
-## -
-## -
-##
-##
-
-## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
-## -----------------------------------
-
-import sys
-sys.path.append('../')
-from Pubnub import Pubnub
-
-publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
-subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or None
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or None
-ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
-
-## -----------------------------------------------------------------------
-## Command Line Options Supplied PubNub
-## -----------------------------------------------------------------------
-pubnub_user_supplied_options = Pubnub(
- publish_key, ## OPTIONAL (supply None to disable)
- subscribe_key, ## REQUIRED
- secret_key, ## OPTIONAL (supply None to disable)
- cipher_key, ## OPTIONAL (supply None to disable)
- ssl_on ## OPTIONAL (supply None to disable)
-)
-
-## -----------------------------------------------------------------------
-## High Security PubNub
-## -----------------------------------------------------------------------
-pubnub_high_security = Pubnub(
- ## Publish Key
- 'pub-c-a30c030e-9f9c-408d-be89-d70b336ca7a0',
-
- ## Subscribe Key
- 'sub-c-387c90f3-c018-11e1-98c9-a5220e0555fd',
-
- ## Secret Key
- 'sec-c-MTliNDE0NTAtYjY4Ni00MDRkLTllYTItNDhiZGE0N2JlYzBl',
-
- ## Cipher Key
- 'YWxzamRmbVjFaa05HVnGFqZHM3NXRBS73jxmhVMkjiwVVXV1d5UrXR1JLSkZFRr'+
- 'WVd4emFtUm1iR0TFpUZvbiBoYXMgYmVlbxWkhNaF3uUi8kM0YkJTEVlZYVFjBYi'+
- 'jFkWFIxSkxTa1pGUjd874hjklaTFpUwRVuIFNob3VsZCB5UwRkxUR1J6YVhlQWa'+
- 'V1ZkNGVH32mDkdho3pqtRnRVbTFpUjBaeGUgYXNrZWQtZFoKjda40ZWlyYWl1eX'+
- 'U4RkNtdmNub2l1dHE2TTA1jd84jkdJTbFJXYkZwWlZtRnKkWVrSRhhWbFpZVmFz'+
- 'c2RkZmTFpUpGa1dGSXhTa3hUYTFwR1Vpkm9yIGluZm9ybWFNfdsWQdSiiYXNWVX'+
- 'RSblJWYlRGcFVqQmFlRmRyYUU0MFpXbHlZV2wxZVhVNFJrTnR51YjJsMWRIRTJU'+
- 'W91ciBpbmZvcm1hdGliBzdWJtaXR0ZWQb3UZSBhIHJlc3BvbnNlLCB3ZWxsIHJl'+
- 'VEExWdHVybiB0am0aW9uIb24gYXMgd2UgcG9zc2libHkgY2FuLuhcFe24ldWVns'+
- 'dSaTFpU3hVUjFKNllWaFdhRmxZUWpCaQo34gcmVxdWlGFzIHNveqQl83snBfVl3',
-
- ## 2048bit SSL ON - ENABLED TRUE
- True
-)
-
-## -----------------------------------------------------------------------
-## Channel | Message Test Data (UTF-8)
-## -----------------------------------------------------------------------
-crazy = ' ~`â¦â§!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd'
-many_channels = [ str(x) + '-many_channel_test' for x in range(10) ]
-runthroughs = 0
-planned_tests = 2
-delivery_retries = 0
-max_retries = 10
-
-## -----------------------------------------------------------------------
-## Unit Test Function
-## -----------------------------------------------------------------------
-def test( trial, name ) :
- if trial : print( 'PASS: ' + name )
- else : print( '- FAIL - ' + name )
-
-def test_pubnub(pubnub):
- global runthroughs, planned_tests, delivery_retries, max_retries
-
- ## -----------------------------------------------------------------------
- ## Many Channels
- ## -----------------------------------------------------------------------
- def phase2():
- status = {
- 'sent' : 0,
- 'received' : 0,
- 'connections' : 0
- }
-
- def received( message, chan ):
- global runthroughs
-
- test( status['received'] <= status['sent'], 'many sends' )
- status['received'] += 1
- pubnub.unsubscribe({ 'channel' : chan })
- if status['received'] == len(many_channels):
- runthroughs += 1
- if runthroughs == planned_tests: pubnub.stop()
-
- def publish_complete( info, chan ):
- global delivery_retries, max_retries
- status['sent'] += 1
- test( info, 'publish complete' )
- test( info and len(info) > 2, 'publish response' )
- if not info[0]:
- delivery_retries += 1
- if max_retries > delivery_retries: sendit(chan)
-
- def sendit(chan):
- tchan = chan
- pubnub.publish({
- 'channel' : chan,
- 'message' : "Hello World",
- 'callback' : (lambda msg:publish_complete( msg, tchan ))
- })
-
- def connected(chan):
- status['connections'] += 1
- sendit(chan)
-
- def delivered(info):
- if info and info[0]: status['sent'] += 1
-
- def subscribe(chan):
- pubnub.subscribe({
- 'channel' : chan,
- 'connect' : (lambda:connected(chan+'')),
- 'callback' : (lambda msg:received( msg, chan ))
- })
-
- ## Subscribe All Channels
- for chan in many_channels: subscribe(chan)
-
- ## -----------------------------------------------------------------------
- ## Time Example
- ## -----------------------------------------------------------------------
- def time_complete(timetoken):
- test( timetoken, 'timetoken fetch' )
- test( isinstance( timetoken, int ), 'timetoken int type' )
-
- pubnub.time({ 'callback' : time_complete })
-
- ## -----------------------------------------------------------------------
- ## Publish Example
- ## -----------------------------------------------------------------------
- def publish_complete(info):
- test( info, 'publish complete' )
- test( info and len(info) > 2, 'publish response' )
-
- pubnub.history( {
- 'channel' : crazy,
- 'limit' : 10,
- 'callback' : history_complete
- })
-
- ## -----------------------------------------------------------------------
- ## History Example
- ## -----------------------------------------------------------------------
- def history_complete(messages):
- test( messages and len(messages) > 0, 'history' )
- test( messages, 'history' )
-
-
- pubnub.publish({
- 'channel' : crazy,
- 'message' : "Hello World",
- 'callback' : publish_complete
- })
-
- ## -----------------------------------------------------------------------
- ## Subscribe Example
- ## -----------------------------------------------------------------------
- def message_received(message):
- test( message, 'message received' )
- pubnub.unsubscribe({ 'channel' : crazy })
-
- def done() :
- pubnub.unsubscribe({ 'channel' : crazy })
- pubnub.publish({
- 'channel' : crazy,
- 'message' : "Hello World",
- 'callback' : (lambda x:x)
- })
-
- def dumpster(message) :
- test( 0, 'never see this' )
-
- pubnub.subscribe({
- 'channel' : crazy,
- 'connect' : done,
- 'callback' : dumpster
- })
-
- def connected() :
- pubnub.publish({
- 'channel' : crazy,
- 'message' : { 'Info' : 'Connected!' }
- })
-
- pubnub.subscribe({
- 'channel' : crazy,
- 'connect' : connected,
- 'callback' : message_received
- })
-
- phase2()
-
-## -----------------------------------------------------------------------
-## Run Tests
-## -----------------------------------------------------------------------
-test_pubnub(pubnub_user_supplied_options)
-test_pubnub(pubnub_high_security)
-pubnub_high_security.start()
-
diff --git a/python-tornado/tests/unit-tests.py b/python-tornado/tests/unit-tests.py
new file mode 100644
index 0000000..fdaa194
--- /dev/null
+++ b/python-tornado/tests/unit-tests.py
@@ -0,0 +1,73 @@
+
+import sys
+
+sys.path.append('../../common')
+sys.path.append('..')
+sys.path.append('../common')
+sys.path.append('.')
+
+from PubnubUnitTest import Suite
+from Pubnub import Pubnub
+
+pubnub = Pubnub("demo","demo")
+
+tests_count = 1 + 2
+test_suite = Suite(pubnub,tests_count)
+
+tests = []
+
+
+def test_publish():
+ name = "Publish Test"
+ def success(r):
+ test_suite.test(r[0] == 1, name)
+
+ def fail(e):
+ test_suite.test(False, msg , e)
+
+
+ pubnub.publish({
+ 'channel' : 'hello',
+ 'message' : 'hi',
+ 'callback' : success,
+ 'error' : fail
+ })
+tests.append(test_publish)
+
+
+def test_subscribe_publish():
+ channel = "hello"
+ name = "Subscribe Publish Test"
+ publish_msg = "This is Pubnub Python-Twisted"
+ def connect():
+ def success(r):
+ test_suite.test(r[0] == 1, name, "publish success")
+
+ def fail(e):
+ test_suite.test(False, name , "Publish Failed", e)
+
+ pubnub.publish({
+ 'channel' : channel,
+ 'message' : publish_msg,
+ 'callback' : success,
+ 'error' : fail
+ })
+
+ def callback(r):
+ test_suite.test(r == publish_msg, name, "message received")
+
+ pubnub.subscribe({
+ 'channel' : channel,
+ 'callback' : callback,
+ 'connect' : connect
+ })
+tests.append(test_subscribe_publish)
+
+
+
+
+
+for t in tests:
+ t()
+
+pubnub.start()
diff --git a/python-tornado/unassembled/Platform.py b/python-tornado/unassembled/Platform.py
new file mode 100644
index 0000000..7565fd2
--- /dev/null
+++ b/python-tornado/unassembled/Platform.py
@@ -0,0 +1,67 @@
+import tornado.httpclient
+
+try:
+ from hashlib import sha256
+ digestmod = sha256
+except ImportError:
+ import Crypto.Hash.SHA256 as digestmod
+ sha256 = digestmod.new
+
+import hmac
+import tornado.ioloop
+from tornado.stack_context import ExceptionStackContext
+from PubnubCrypto import PubnubCrypto
+
+ioloop = tornado.ioloop.IOLoop.instance()
+
+class Pubnub(PubnubCoreAsync):
+
+ def stop(self): ioloop.stop()
+ def start(self): ioloop.start()
+ def timeout( self, delay, callback):
+ ioloop.add_timeout( time.time()+float(delay), callback )
+
+ def __init__(
+ self,
+ publish_key,
+ subscribe_key,
+ secret_key = False,
+ cipher_key = False,
+ ssl_on = False,
+ origin = 'pubsub.pubnub.com'
+ ) :
+ super(Pubnub, self).__init__(
+ publish_key=publish_key,
+ subscribe_key=subscribe_key,
+ secret_key=secret_key,
+ cipher_key=cipher_key,
+ ssl_on=ssl_on,
+ origin=origin,
+ )
+ self.headers = {}
+ self.headers['User-Agent'] = 'Python-Tornado'
+ self.headers['Accept-Encoding'] = self.accept_encoding
+ self.headers['V'] = self.version
+ self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000)
+
+ def _request( self, request, callback ) :
+ url = self.getUrl(request)
+ ## Send Request Expecting JSON Response
+ #print self.headers
+
+ request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=10, request_timeout=310 )
+
+ def responseCallback(response):
+ def handle_exc(*args):
+ return True
+ if response.error is not None:
+ with ExceptionStackContext(handle_exc):
+ response.rethrow()
+ elif callback:
+ callback(eval(response._get_body()))
+
+ self.http.fetch(
+ request,
+ callback=responseCallback,
+ )
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 14:58:43 +0000