diff options
Diffstat (limited to 'python-twisted')
| -rw-r--r-- | python-twisted/Pubnub.py | 246 | ||||
| -rw-r--r-- | python-twisted/Pubnub.pyc | bin | 12246 -> 7499 bytes | |||
| -rw-r--r-- | python-twisted/PubnubCrypto.pyc | bin | 2619 -> 2564 bytes | |||
| -rw-r--r-- | python-twisted/examples/publish-example.py | 1 |
4 files changed, 24 insertions, 223 deletions
diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index 3c3f4b1..97895fd 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -14,6 +14,10 @@ import time import hashlib import urllib2 import uuid +sys.path.append('../') +sys.path.append('../../') +sys.path.append('../../../') +from PubnubCoreAsync import PubnubCoreAsync try: from hashlib import sha256 digestmod = sha256 @@ -21,6 +25,7 @@ except ImportError: import Crypto.Hash.SHA256 as digestmod sha256 = digestmod.new import hmac +from twisted.web.client import getPage from twisted.internet import reactor from twisted.internet.defer import Deferred from twisted.internet.protocol import Protocol @@ -35,7 +40,7 @@ pnconn_pool = HTTPConnectionPool(reactor) pnconn_pool.maxPersistentPerHost = 100 pnconn_pool.cachedConnectionTimeout = 310 -class Pubnub(): +class Pubnub(PubnubCoreAsync): def start(self): reactor.run() def stop(self): reactor.stop() @@ -51,124 +56,13 @@ class Pubnub(): ssl_on = False, origin = 'pubsub.pubnub.com' ) : - """ - #** - #* 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 ) - - """ - self.origin = origin - 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 - - - def publish( self, args ) : - """ - #** - #* Publish - #* - #* Send a message to a channel. - #* - #* @param array args with channel and message. - #* @return array success information. - #** - - ## Publish Example - def publish_complete(info): - print(info) - - pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { - 'some_text' : 'Hello my World' - }, - 'callback' : publish_complete - }) - - """ - ## Capture Callback - if args.has_key('callback'): callback = args['callback'] - else: callback = lambda x : x - - ## Fail if bad input. - if not (args['channel'] and args['message']): - callback([ 0, 'Missing Channel or Message', 0 ]) - return False - - ## 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']) - - def publish_response(info): - callback(info or [0, 'Disconnected', 0]); - - ## 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([ - 'publish', - self.publish_key, - self.subscribe_key, - signature, - channel, - '0', - message - ], publish_response ) - + super(Pubnub, self).__init__( + publish_key, + subscribe_key, + secret_key, + ssl_on, + origin, + ) def subscribe( self, args ) : """ @@ -315,44 +209,6 @@ class Pubnub(): self.subscriptions[channel]['timetoken'] = 0 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 : - return 'Missing Channel' - - ## Get History - pc = PubnubCrypto() - return self._request( [ - 'history', - self.subscribe_key, - channel, - '0', - str(limit) - ], args['callback'] ) - def time( self, args ) : """ #** @@ -395,7 +251,7 @@ class Pubnub(): """ return uuid.uuid1() - def _request( self, request, callback ) : + def _request( self, request, callback, timeout=30 ) : global pnconn_pool ## Build URL @@ -409,74 +265,18 @@ class Pubnub(): agent = Agent( reactor, self.ssl and None or pnconn_pool, - connectTimeout=30 + connectTimeout=timeout ) - request = agent.request( 'GET', url, Headers({ - 'V' : ['3.1'], + print url + gp = getPage( url, headers={ + 'V' : ['3.4'], 'User-Agent' : ['Python-Twisted'], 'Accept-Encoding' : ['gzip'] - }), None ) - - self.resulting_is = str() - def received(response): - headerlist = list(response.headers.getAllRawHeaders()) - for item in headerlist: - if( item[0] == "Content-Encoding"): - if type(item[1]) == type(list()): - for subitem in item[1]: - self.resulting_is = subitem - elif type(item[1]) == type(str()): - self.resulting_is = item[1] - - finished = Deferred() - response.deliverBody(PubNubResponse(finished)) - return finished - - def complete(data): - if ( type(data) == type(str()) ): - if self.resulting_is: - d = zlib.decompressobj(16+zlib.MAX_WBITS) - - try : data = d.decompress(data) # try/catch here, pass through if except - except : data = data - - try : obj = json.loads(data) - except : obj = None - - 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) - - request.addCallback(received) - request.addBoth(complete) - - + } ); + + gp.addCallback(callback) + gp.addErrback(callback) + class PubNubResponse(Protocol): def __init__( self, finished ): diff --git a/python-twisted/Pubnub.pyc b/python-twisted/Pubnub.pyc Binary files differindex 94d6ecc..4f3fab5 100644 --- a/python-twisted/Pubnub.pyc +++ b/python-twisted/Pubnub.pyc diff --git a/python-twisted/PubnubCrypto.pyc b/python-twisted/PubnubCrypto.pyc Binary files differindex a349424..d338aee 100644 --- a/python-twisted/PubnubCrypto.pyc +++ b/python-twisted/PubnubCrypto.pyc diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py index 4a5baf6..9c3be60 100644 --- a/python-twisted/examples/publish-example.py +++ b/python-twisted/examples/publish-example.py @@ -12,6 +12,7 @@ import sys from twisted.internet import reactor sys.path.append('../') +sys.path.append('../../') from Pubnub import Pubnub publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' |