From 90224d02e5f2400fb277217342ffa5cd4a7cb2c6 Mon Sep 17 00:00:00 2001 From: Devendra Date: Sun, 24 Feb 2013 03:23:01 +0530 Subject: saving work --- .PubnubCoreAsync.py.swp | Bin 0 -> 28672 bytes PubnubCore.py | 417 ++++++++++++++++++++++++ PubnubCore.pyc | Bin 0 -> 8755 bytes PubnubCoreAsync.py | 487 +++++++++++++++++++++++++++++ PubnubCoreAsync.pyc | Bin 0 -> 12486 bytes python-tornado/Pubnub.py | 129 +------- python-tornado/Pubnub.pyc | Bin 10623 -> 8285 bytes python-tornado/PubnubCrypto.pyc | Bin 2619 -> 2564 bytes python-tornado/examples/publish-example.py | 1 + python-twisted/Pubnub.py | 246 ++------------- python-twisted/Pubnub.pyc | Bin 12246 -> 7499 bytes python-twisted/PubnubCrypto.pyc | Bin 2619 -> 2564 bytes python-twisted/examples/publish-example.py | 1 + python/3.3/Pubnub.py | 376 ++-------------------- python/3.3/Pubnub.pyc | Bin 9208 -> 1677 bytes 15 files changed, 958 insertions(+), 699 deletions(-) create mode 100644 .PubnubCoreAsync.py.swp create mode 100644 PubnubCore.py create mode 100644 PubnubCore.pyc create mode 100644 PubnubCoreAsync.py create mode 100644 PubnubCoreAsync.pyc diff --git a/.PubnubCoreAsync.py.swp b/.PubnubCoreAsync.py.swp new file mode 100644 index 0000000..b91587f Binary files /dev/null and b/.PubnubCoreAsync.py.swp differ diff --git a/PubnubCore.py b/PubnubCore.py new file mode 100644 index 0000000..76e1cdd --- /dev/null +++ b/PubnubCore.py @@ -0,0 +1,417 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +try: import json +except ImportError: import simplejson as json + +import time +import hashlib +import urllib2 +import uuid + +class PubnubCore(object): + def __init__( + self, + publish_key, + subscribe_key, + secret_key = False, + ssl_on = False, + origin = 'pubsub.pubnub.com', + pres_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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + self.origin = origin + self.limit = 1800 + self.publish_key = publish_key + self.subscribe_key = subscribe_key + self.secret_key = secret_key + self.ssl = ssl_on + + if self.ssl : + self.origin = 'https://' + self.origin + else : + self.origin = 'http://' + self.origin + + self.uuid = pres_uuid or str(uuid.uuid4()) + + if not isinstance(self.uuid, basestring): + raise AttributeError("pres_uuid must be a string") + + def publish( self, args ) : + """ + #** + #* Publish + #* + #* Send a message to a channel. + #* + #* @param array args with channel and message. + #* @return array success information. + #** + + ## Publish Example + info = pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { + 'some_text' : 'Hello my World' + } + }) + print(info) + + """ + ## Fail if bad input. + if not (args['channel'] and args['message']) : + return [ 0, 'Missing Channel or Message' ] + + ## Capture User Input + channel = str(args['channel']) + message = json.dumps(args['message'], separators=(',',':')) + + + ## Capture Callback + if args.has_key('callback') : + callback = args['callback'] + else : + callback = None + + ## 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' + + ## Send Message + return self._request([ + 'publish', + self.publish_key, + self.subscribe_key, + signature, + channel, + '0', + message + ], callback) + + + + def subscribe( self, args ) : + """ + #** + #* Subscribe + #* + #* This is BLOCKING. + #* Listen for a message on a channel. + #* + #* @param array args with channel and callback. + #* @return false on fail, array on success. + #** + + ## Subscribe Example + def receive(message) : + print(message) + return True + + pubnub.subscribe({ + '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 + + ## Begin Subscribe + while True : + + timetoken = 'timetoken' in args and args['timetoken'] or 0 + try : + ## Wait for Message + response = self._request(self._encode([ + 'subscribe', + subscribe_key, + channel, + '0', + str(timetoken) + ])+['?uuid='+self.uuid], encode=False) + + messages = response[0] + args['timetoken'] = response[1] + + ## If it was a timeout + if not len(messages) : + continue + + ## Run user Callback and Reconnect if user permits. + for message in messages : + if not callback(message) : + return + + except Exception: + time.sleep(1) + + return True + + 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([ + '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([ + '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 = [] + count = 100 + + if args.has_key('count'): + count = int(args['count']) + + params.append('count' + '=' + str(count)) + + if args.has_key('reverse'): + params.append('reverse' + '=' + str(args['reverse']).lower()) + + if args.has_key('start'): + params.append('start' + '=' + str(args['start'])) + + if args.has_key('end'): + params.append('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([ + 'v2', + 'history', + 'sub-key', + self.subscribe_key, + 'channel', + channel, + ],params=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([ + '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] + + + + diff --git a/PubnubCore.pyc b/PubnubCore.pyc new file mode 100644 index 0000000..0c6563c Binary files /dev/null and b/PubnubCore.pyc differ diff --git a/PubnubCoreAsync.py b/PubnubCoreAsync.py new file mode 100644 index 0000000..bafbca8 --- /dev/null +++ b/PubnubCoreAsync.py @@ -0,0 +1,487 @@ +## 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 json +import time +import hashlib +import urllib2 +import uuid +try: + from hashlib import sha256 + digestmod = sha256 +except ImportError: + import Crypto.Hash.SHA256 as digestmod + sha256 = digestmod.new +import hmac +from twisted.internet import reactor +from twisted.internet.defer import Deferred +from twisted.internet.protocol import Protocol +from twisted.web.client import Agent +from twisted.web.client import HTTPConnectionPool +from twisted.web.http_headers import Headers +from PubnubCrypto import PubnubCrypto +import gzip +import zlib + +pnconn_pool = HTTPConnectionPool(reactor) +pnconn_pool.maxPersistentPerHost = 100 +pnconn_pool.cachedConnectionTimeout = 310 + +class PubnubCoreAsync(object): + + def start(self): pass + def stop(self): pass + def timeout( self, callback, delay ): + pass + + def __init__( + self, + publish_key, + subscribe_key, + secret_key = False, + cipher_key = False, + 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 ) + + + def subscribe( self, args ) : + """ + #** + #* Subscribe + #* + #* This is NON-BLOCKING. + #* Listen for a message on a channel. + #* + #* @param array args with channel and message. + #* @return false on fail, array on success. + #** + + ## Subscribe Example + def receive(message) : + print(message) + return True + + ## On Connect Callback + def connected() : + pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { 'some_var' : 'text' } + }) + + ## Subscribe + pubnub.subscribe({ + 'channel' : 'hello_world', + 'connect' : connected, + 'callback' : receive + }) + + """ + ## Fail if missing channel + if not 'channel' in args : + return 'Missing Channel.' + + ## Fail if missing callback + if not 'callback' in args : + return 'Missing Callback.' + + ## Capture User Input + channel = str(args['channel']) + callback = args['callback'] + connectcb = args['connect'] + + if 'errorback' in args: + errorback = args['errorback'] + else: + errorback = lambda x: x + + ## New Channel? + if not (channel in self.subscriptions) : + self.subscriptions[channel] = { + 'first' : False, + 'connected' : 0, + 'timetoken' : '0' + } + + ## Ensure Single Connection + if self.subscriptions[channel]['connected'] : + return "Already Connected" + + self.subscriptions[channel]['connected'] = 1 + + ## SUBSCRIPTION RECURSION + def substabizel(): + ## STOP CONNECTION? + if not self.subscriptions[channel]['connected']: + return + + def sub_callback(response): + ## 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: + reactor.callLater( 1, substabizel ) + return errorback("Lost Network Connection") + else: + reactor.callLater( 1, substabizel ) + + ## ENSURE CONNECTED (Call Time Function) + return self.time({ 'callback' : time_callback }) + + self.subscriptions[channel]['timetoken'] = response[1] + substabizel() + + 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 ) + else : + message + + callback(message) + + ## CONNECT TO PUBNUB SUBSCRIBE SERVERS + try : + self._request( [ + 'subscribe', + self.subscribe_key, + channel, + '0', + str(self.subscriptions[channel]['timetoken']) + ], sub_callback ) + except : + reactor.callLater( 1, substabizel ) + return + + ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) + substabizel() + + + def unsubscribe( self, args ): + channel = str(args['channel']) + if not (channel in self.subscriptions): + return False + + ## DISCONNECT + self.subscriptions[channel]['connected'] = 0 + 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 ) : + """ + #** + #* Time + #* + #* Timestamp from PubNub Cloud. + #* + #* @return int timestamp. + #* + + ## PubNub Server Time Example + def time_complete(timestamp): + print(timestamp) + + pubnub.time(time_complete) + + """ + def complete(response) : + if not response: return 0 + args['callback'](response[0]) + + self._request( [ + 'time', + '0' + ], complete ) + + def uuid(self) : + """ + #** + #* uuid + #* + #* Generate a UUID + #* + #* @return UUID. + #* + + ## PubNub UUID Example + uuid = pubnub.uuid() + print(uuid) + """ + return uuid.uuid1() + + def _request( self, request, callback ) : + global pnconn_pool + + ## 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] + agent = Agent( + reactor, + self.ssl and None or pnconn_pool, + connectTimeout=30 + ) + request = agent.request( 'GET', url, Headers({ + 'V' : ['3.1'], + '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) + + + +class PubNubResponse(Protocol): + def __init__( self, finished ): + self.finished = finished + + def dataReceived( self, bytes ): + self.finished.callback(bytes) + diff --git a/PubnubCoreAsync.pyc b/PubnubCoreAsync.pyc new file mode 100644 index 0000000..c6cf30f Binary files /dev/null and b/PubnubCoreAsync.pyc differ diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index 12baf17..b67859f 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -8,7 +8,9 @@ ## ----------------------------------- ## PubNub 3.1 Real-time Push Cloud API ## ----------------------------------- - +import sys +sys.path.append('../') +from PubnubCoreAsync import PubnubCoreAsync import json import time import hashlib @@ -30,7 +32,7 @@ from PubnubCrypto import PubnubCrypto ioloop = tornado.ioloop.IOLoop.instance() -class Pubnub(): +class Pubnub(PubnubCoreAsync): def stop(self): ioloop.stop() def start(self): ioloop.start() @@ -46,122 +48,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 - }) - - """ - ## Fail if bad input. - if not (args['channel'] and args['message']) : - print('Missing Channel or Message') - 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']) - - ## Capture Callback - if args.has_key('callback') : - callback = args['callback'] - else : - callback = lambda x : x - - ## 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 - ], callback ); + super(Pubnub, self).__init__( + publish_key, + subscribe_key, + secret_key, + ssl_on, + origin, + ) def subscribe( self, args ) : diff --git a/python-tornado/Pubnub.pyc b/python-tornado/Pubnub.pyc index 9ca3936..af10b64 100644 Binary files a/python-tornado/Pubnub.pyc and b/python-tornado/Pubnub.pyc differ diff --git a/python-tornado/PubnubCrypto.pyc b/python-tornado/PubnubCrypto.pyc index a349424..8141e27 100644 Binary files a/python-tornado/PubnubCrypto.pyc and b/python-tornado/PubnubCrypto.pyc differ diff --git a/python-tornado/examples/publish-example.py b/python-tornado/examples/publish-example.py index cd66720..7f217d1 100644 --- a/python-tornado/examples/publish-example.py +++ b/python-tornado/examples/publish-example.py @@ -12,6 +12,7 @@ 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' 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 index 94d6ecc..4f3fab5 100644 Binary files a/python-twisted/Pubnub.pyc and b/python-twisted/Pubnub.pyc differ diff --git a/python-twisted/PubnubCrypto.pyc b/python-twisted/PubnubCrypto.pyc index a349424..d338aee 100644 Binary files a/python-twisted/PubnubCrypto.pyc and b/python-twisted/PubnubCrypto.pyc differ 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' diff --git a/python/3.3/Pubnub.py b/python/3.3/Pubnub.py index a3f4d6f..e2b573f 100644 --- a/python/3.3/Pubnub.py +++ b/python/3.3/Pubnub.py @@ -11,13 +11,15 @@ try: import json except ImportError: import simplejson as json - +import sys +sys.path.append('../..') import time import hashlib import urllib2 import uuid +from PubnubCore import PubnubCore -class Pubnub(): +class Pubnub(PubnubCore): def __init__( self, publish_key, @@ -27,360 +29,16 @@ class Pubnub(): origin = 'pubsub.pubnub.com', pres_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 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 - pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) - - """ - self.origin = origin - self.limit = 1800 - self.publish_key = publish_key - self.subscribe_key = subscribe_key - self.secret_key = secret_key - self.ssl = ssl_on - - if self.ssl : - self.origin = 'https://' + self.origin - else : - self.origin = 'http://' + self.origin - - self.uuid = pres_uuid or str(uuid.uuid4()) - - if not isinstance(self.uuid, basestring): - raise AttributeError("pres_uuid must be a string") - - def publish( self, args ) : - """ - #** - #* Publish - #* - #* Send a message to a channel. - #* - #* @param array args with channel and message. - #* @return array success information. - #** - - ## Publish Example - info = pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { - 'some_text' : 'Hello my World' - } - }) - print(info) - - """ - ## Fail if bad input. - if not (args['channel'] and args['message']) : - return [ 0, 'Missing Channel or Message' ] - - ## Capture User Input - channel = str(args['channel']) - message = json.dumps(args['message'], separators=(',',':')) - - ## 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' - - ## Send Message - return self._request([ - 'publish', - self.publish_key, - self.subscribe_key, - signature, - channel, - '0', - message - ]) - - - def subscribe( self, args ) : - """ - #** - #* Subscribe - #* - #* This is BLOCKING. - #* Listen for a message on a channel. - #* - #* @param array args with channel and callback. - #* @return false on fail, array on success. - #** - - ## Subscribe Example - def receive(message) : - print(message) - return True - - pubnub.subscribe({ - '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 - - ## Begin Subscribe - while True : - - timetoken = 'timetoken' in args and args['timetoken'] or 0 - try : - ## Wait for Message - response = self._request(self._encode([ - 'subscribe', - subscribe_key, - channel, - '0', - str(timetoken) - ])+['?uuid='+self.uuid], encode=False) - - messages = response[0] - args['timetoken'] = response[1] - - ## If it was a timeout - if not len(messages) : - continue - - ## Run user Callback and Reconnect if user permits. - for message in messages : - if not callback(message) : - return - - except Exception: - time.sleep(1) - - return True - - 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']) - - ## Fail if bad input. - if not channel : - raise Exception('Missing Channel') - return False - - ## Get Presence Here Now - return self._request([ - 'v2','presence', - 'sub_key', self.subscribe_key, - 'channel', channel - ]); - - - 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 - - ## Get History - return self._request([ - 'history', - self.subscribe_key, - channel, - '0', - str(limit) - ]); - - 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 = [] - count = 100 - - if args.has_key('count'): - count = int(args['count']) - - params.append('count' + '=' + str(count)) - - if args.has_key('reverse'): - params.append('reverse' + '=' + str(args['reverse']).lower()) - - if args.has_key('start'): - params.append('start' + '=' + str(args['start'])) - - if args.has_key('end'): - params.append('end' + '=' + str(args['end'])) - - ## Fail if bad input. - if not channel : - raise Exception('Missing Channel') - return False - - ## Get History - return self._request([ - 'v2', - 'history', - 'sub-key', - self.subscribe_key, - 'channel', - channel, - ],params=params); - - def time(self) : - """ - #** - #* Time - #* - #* Timestamp from PubNub Cloud. - #* - #* @return int timestamp. - #* - - ## PubNub Server Time Example - timestamp = pubnub.time() - print(timestamp) - - """ - return self._request([ - 'time', - '0' - ])[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 _request( self, request, origin = None, encode = True, params = None ) : + super(Pubnub, self).__init__( + publish_key, + subscribe_key, + secret_key, + ssl_on, + origin, + pres_uuid + ) + + def _request( self, request, origin = None, encode = True, params = None, callback = None ) : ## Build URL url = (origin or self.origin) + '/' + "/".join( encode and self._encode(request) or request @@ -395,7 +53,9 @@ class Pubnub(): except TypeError: usock = urllib2.urlopen( url, None ) response = usock.read() usock.close() - return json.loads( response ) + if (callback): + callback(json.loads(response)) + else: + return json.loads( response ) except: return None - diff --git a/python/3.3/Pubnub.pyc b/python/3.3/Pubnub.pyc index 76bebc4..564fde3 100644 Binary files a/python/3.3/Pubnub.pyc and b/python/3.3/Pubnub.pyc differ -- cgit v1.2.3 From 08c75762c1fd19b90f646a04072cb9bef60f5478 Mon Sep 17 00:00:00 2001 From: Devendra Date: Sun, 24 Feb 2013 03:24:17 +0530 Subject: removing .pyc files and adding .gitignore --- .gitignore | 4 ++++ PubnubCore.pyc | Bin 8755 -> 0 bytes PubnubCoreAsync.pyc | Bin 12486 -> 0 bytes python-tornado/Pubnub.pyc | Bin 8285 -> 0 bytes python-tornado/PubnubCrypto.pyc | Bin 2564 -> 0 bytes python-twisted/Pubnub.pyc | Bin 7499 -> 0 bytes python-twisted/PubnubCrypto.pyc | Bin 2564 -> 0 bytes python/3.3/Pubnub.pyc | Bin 1677 -> 0 bytes 8 files changed, 4 insertions(+) create mode 100644 .gitignore delete mode 100644 PubnubCore.pyc delete mode 100644 PubnubCoreAsync.pyc delete mode 100644 python-tornado/Pubnub.pyc delete mode 100644 python-tornado/PubnubCrypto.pyc delete mode 100644 python-twisted/Pubnub.pyc delete mode 100644 python-twisted/PubnubCrypto.pyc delete mode 100644 python/3.3/Pubnub.pyc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f71884d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pyc + + + diff --git a/PubnubCore.pyc b/PubnubCore.pyc deleted file mode 100644 index 0c6563c..0000000 Binary files a/PubnubCore.pyc and /dev/null differ diff --git a/PubnubCoreAsync.pyc b/PubnubCoreAsync.pyc deleted file mode 100644 index c6cf30f..0000000 Binary files a/PubnubCoreAsync.pyc and /dev/null differ diff --git a/python-tornado/Pubnub.pyc b/python-tornado/Pubnub.pyc deleted file mode 100644 index af10b64..0000000 Binary files a/python-tornado/Pubnub.pyc and /dev/null differ diff --git a/python-tornado/PubnubCrypto.pyc b/python-tornado/PubnubCrypto.pyc deleted file mode 100644 index 8141e27..0000000 Binary files a/python-tornado/PubnubCrypto.pyc and /dev/null differ diff --git a/python-twisted/Pubnub.pyc b/python-twisted/Pubnub.pyc deleted file mode 100644 index 4f3fab5..0000000 Binary files a/python-twisted/Pubnub.pyc and /dev/null differ diff --git a/python-twisted/PubnubCrypto.pyc b/python-twisted/PubnubCrypto.pyc deleted file mode 100644 index d338aee..0000000 Binary files a/python-twisted/PubnubCrypto.pyc and /dev/null differ diff --git a/python/3.3/Pubnub.pyc b/python/3.3/Pubnub.pyc deleted file mode 100644 index 564fde3..0000000 Binary files a/python/3.3/Pubnub.pyc and /dev/null differ -- cgit v1.2.3 From 51b1dec8b04258f7bff59fb5bb4f69cbab52260c Mon Sep 17 00:00:00 2001 From: Devendra Date: Sun, 24 Feb 2013 04:56:45 +0530 Subject: saving working version --- PubnubCoreAsync.py | 33 ++-- python-tornado/Pubnub.py | 271 +-------------------------- python-tornado/examples/subscribe-example.py | 13 +- python-twisted/Pubnub.py | 201 +------------------- 4 files changed, 39 insertions(+), 479 deletions(-) diff --git a/PubnubCoreAsync.py b/PubnubCoreAsync.py index bafbca8..0ea03e9 100644 --- a/PubnubCoreAsync.py +++ b/PubnubCoreAsync.py @@ -39,7 +39,7 @@ class PubnubCoreAsync(object): def start(self): pass def stop(self): pass - def timeout( self, callback, delay ): + def timeout( self, delay, callback ): pass def __init__( @@ -75,6 +75,7 @@ class PubnubCoreAsync(object): self.cipher_key = cipher_key self.ssl = ssl_on self.subscriptions = {} + self.timetoken = 0 if self.ssl : self.origin = 'https://' + self.origin @@ -170,6 +171,7 @@ class PubnubCoreAsync(object): ], publish_response ) + def subscribe( self, args ) : """ #** @@ -224,8 +226,7 @@ class PubnubCoreAsync(object): if not (channel in self.subscriptions) : self.subscriptions[channel] = { 'first' : False, - 'connected' : 0, - 'timetoken' : '0' + 'connected' : False, } ## Ensure Single Connection @@ -233,14 +234,15 @@ class PubnubCoreAsync(object): return "Already Connected" self.subscriptions[channel]['connected'] = 1 - + print self.subscriptions ## SUBSCRIPTION RECURSION def substabizel(): ## STOP CONNECTION? if not self.subscriptions[channel]['connected']: return - + def sub_callback(response): + response = json.loads(response) ## STOP CONNECTION? if not self.subscriptions[channel]['connected']: return @@ -254,15 +256,15 @@ class PubnubCoreAsync(object): if not response: def time_callback(_time): if not _time: - reactor.callLater( 1, substabizel ) + self.timeout( 1, substabizel ) return errorback("Lost Network Connection") else: - reactor.callLater( 1, substabizel ) + self.timeout( 1, substabizel ) ## ENSURE CONNECTED (Call Time Function) return self.time({ 'callback' : time_callback }) - self.subscriptions[channel]['timetoken'] = response[1] + self.timetoken = response[1] substabizel() pc = PubnubCrypto() @@ -295,10 +297,10 @@ class PubnubCoreAsync(object): self.subscribe_key, channel, '0', - str(self.subscriptions[channel]['timetoken']) + str(self.timetoken) ], sub_callback ) except : - reactor.callLater( 1, substabizel ) + self.timeout( 1, substabizel ) return ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) @@ -476,12 +478,5 @@ class PubnubCoreAsync(object): request.addCallback(received) request.addBoth(complete) - - -class PubNubResponse(Protocol): - def __init__( self, finished ): - self.finished = finished - - def dataReceived( self, bytes ): - self.finished.callback(bytes) - + def _request( self, request, callback, timeout=30 ) : + pass diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index b67859f..e9251f8 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -36,7 +36,7 @@ class Pubnub(PubnubCoreAsync): def stop(self): ioloop.stop() def start(self): ioloop.start() - def timeout( self, callback, delay ): + def timeout( self, delay, callback): ioloop.add_timeout( time.time()+float(delay), callback ) def __init__( @@ -56,232 +56,6 @@ class Pubnub(PubnubCoreAsync): origin, ) - - def subscribe( self, args ) : - """ - #** - #* Subscribe - #* - #* This is NON-BLOCKING. - #* Listen for a message on a channel. - #* - #* @param array args with channel and message. - #* @return false on fail, array on success. - #** - - ## Subscribe Example - def receive(message) : - print(message) - return True - - ## On Connect Callback - def connected() : - pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { 'some_var' : 'text' } - }) - - ## Subscribe - pubnub.subscribe({ - 'channel' : 'hello_world', - 'connect' : connected, - 'callback' : receive - }) - - """ - ## Fail if missing channel - if not 'channel' in args : - print('Missing Channel.') - return False - - ## Fail if missing callback - if not 'callback' in args : - print('Missing Callback.') - return False - - ## Capture User Input - channel = str(args['channel']) - callback = args['callback'] - connectcb = args['connect'] - - if 'errorback' in args: - errorback = args['errorback'] - else: - errorback = lambda x: x - - ## New Channel? - if not (channel in self.subscriptions) : - self.subscriptions[channel] = { - 'first' : False, - 'connected' : 0, - 'timetoken' : '0' - } - - ## Ensure Single Connection - if self.subscriptions[channel]['connected'] : - print("Already Connected") - return False - - self.subscriptions[channel]['connected'] = 1 - - ## SUBSCRIPTION RECURSION - def substabizel(): - ## STOP CONNECTION? - if not self.subscriptions[channel]['connected']: - return - - def sub_callback(response): - ## 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) - return errorback("Lost Network Connection") - else: - ioloop.add_timeout(time.time()+1, substabizel) - - ## ENSURE CONNECTED (Call Time Function) - return self.time({ 'callback' : time_callback }) - - self.subscriptions[channel]['timetoken'] = response[1] - substabizel() - - 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) - - ## CONNECT TO PUBNUB SUBSCRIBE SERVERS - try : - self._request( [ - 'subscribe', - self.subscribe_key, - channel, - '0', - str(self.subscriptions[channel]['timetoken']) - ], sub_callback ) - except : - ioloop.add_timeout(time.time()+1, substabizel) - return - - ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) - substabizel() - - - def unsubscribe( self, args ): - channel = str(args['channel']) - if not (channel in self.subscriptions): - return False - - ## DISCONNECT - self.subscriptions[channel]['connected'] = 0 - 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 : - print('Missing Channel') - return False - - ## Get History - return self._request( [ - 'history', - self.subscribe_key, - channel, - '0', - str(limit) - ], args['callback'] ); - - def time( self, args ) : - """ - #** - #* Time - #* - #* Timestamp from PubNub Cloud. - #* - #* @return int timestamp. - #* - - ## PubNub Server Time Example - def time_complete(timestamp): - print(timestamp) - - pubnub.time(time_complete) - - """ - def complete(response) : - args['callback'](response and response[0]) - - self._request( [ - 'time', - '0' - ], complete ) - - def uuid(self) : - """ - #** - #* uuid - #* - #* Generate a UUID - #* - #* @return UUID. - #* - - ## PubNub UUID Example - uuid = pubnub.uuid() - print(uuid) - """ - return uuid.uuid1() - def _request( self, request, callback ) : ## Build URL url = self.origin + '/' + "/".join([ @@ -289,43 +63,7 @@ class Pubnub(PubnubCoreAsync): 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) - + print url ## Send Request Expecting JSON Response http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) request = tornado.httpclient.HTTPRequest( url, 'GET', dict({ @@ -333,10 +71,13 @@ class Pubnub(PubnubCoreAsync): 'User-Agent' : 'Python-Tornado', 'Accept-Encoding' : 'gzip' }) ) + def responseCallback(response): + print response._get_body() + callback(response._get_body()) http.fetch( request, - callback=complete, + callback=responseCallback, connect_timeout=310, request_timeout=310 ) diff --git a/python-tornado/examples/subscribe-example.py b/python-tornado/examples/subscribe-example.py index c819f94..1a2e03d 100644 --- a/python-tornado/examples/subscribe-example.py +++ b/python-tornado/examples/subscribe-example.py @@ -12,6 +12,7 @@ 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' @@ -26,6 +27,17 @@ ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False pubnub = Pubnub( publish_key, subscribe_key, secret_key,cipher_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 ## ----------------------------------------------------------------------- @@ -53,7 +65,6 @@ pubnub.publish({ 'message' : { 'some_key' : 'some_val' }, 'callback' : publish_complete }) - ## ----------------------------------------------------------------------- ## IO Event Loop ## ----------------------------------------------------------------------- diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index 97895fd..f7d5c52 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -44,7 +44,7 @@ class Pubnub(PubnubCoreAsync): def start(self): reactor.run() def stop(self): reactor.stop() - def timeout( self, callback, delay ): + def timeout( self, delay, callback ): reactor.callLater( delay, callback ) def __init__( @@ -64,193 +64,6 @@ class Pubnub(PubnubCoreAsync): origin, ) - def subscribe( self, args ) : - """ - #** - #* Subscribe - #* - #* This is NON-BLOCKING. - #* Listen for a message on a channel. - #* - #* @param array args with channel and message. - #* @return false on fail, array on success. - #** - - ## Subscribe Example - def receive(message) : - print(message) - return True - - ## On Connect Callback - def connected() : - pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { 'some_var' : 'text' } - }) - - ## Subscribe - pubnub.subscribe({ - 'channel' : 'hello_world', - 'connect' : connected, - 'callback' : receive - }) - - """ - ## Fail if missing channel - if not 'channel' in args : - return 'Missing Channel.' - - ## Fail if missing callback - if not 'callback' in args : - return 'Missing Callback.' - - ## Capture User Input - channel = str(args['channel']) - callback = args['callback'] - connectcb = args['connect'] - - if 'errorback' in args: - errorback = args['errorback'] - else: - errorback = lambda x: x - - ## New Channel? - if not (channel in self.subscriptions) : - self.subscriptions[channel] = { - 'first' : False, - 'connected' : 0, - 'timetoken' : '0' - } - - ## Ensure Single Connection - if self.subscriptions[channel]['connected'] : - return "Already Connected" - - self.subscriptions[channel]['connected'] = 1 - - ## SUBSCRIPTION RECURSION - def substabizel(): - ## STOP CONNECTION? - if not self.subscriptions[channel]['connected']: - return - - def sub_callback(response): - ## 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: - reactor.callLater( 1, substabizel ) - return errorback("Lost Network Connection") - else: - reactor.callLater( 1, substabizel ) - - ## ENSURE CONNECTED (Call Time Function) - return self.time({ 'callback' : time_callback }) - - self.subscriptions[channel]['timetoken'] = response[1] - substabizel() - - 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 ) - else : - message - - callback(message) - - ## CONNECT TO PUBNUB SUBSCRIBE SERVERS - try : - self._request( [ - 'subscribe', - self.subscribe_key, - channel, - '0', - str(self.subscriptions[channel]['timetoken']) - ], sub_callback ) - except : - reactor.callLater( 1, substabizel ) - return - - ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) - substabizel() - - - def unsubscribe( self, args ): - channel = str(args['channel']) - if not (channel in self.subscriptions): - return False - - ## DISCONNECT - self.subscriptions[channel]['connected'] = 0 - self.subscriptions[channel]['timetoken'] = 0 - self.subscriptions[channel]['first'] = False - - def time( self, args ) : - """ - #** - #* Time - #* - #* Timestamp from PubNub Cloud. - #* - #* @return int timestamp. - #* - - ## PubNub Server Time Example - def time_complete(timestamp): - print(timestamp) - - pubnub.time(time_complete) - - """ - def complete(response) : - if not response: return 0 - args['callback'](response[0]) - - self._request( [ - 'time', - '0' - ], complete ) - - def uuid(self) : - """ - #** - #* uuid - #* - #* Generate a UUID - #* - #* @return UUID. - #* - - ## PubNub UUID Example - uuid = pubnub.uuid() - print(uuid) - """ - return uuid.uuid1() - def _request( self, request, callback, timeout=30 ) : global pnconn_pool @@ -278,10 +91,10 @@ class Pubnub(PubnubCoreAsync): gp.addErrback(callback) -class PubNubResponse(Protocol): - def __init__( self, finished ): - self.finished = finished - - def dataReceived( self, bytes ): - self.finished.callback(bytes) +#class PubNubResponse(Protocol): +# def __init__( self, finished ): +# self.finished = finished +# +# def dataReceived( self, bytes ): +# self.finished.callback(bytes) -- cgit v1.2.3 From 8b1a2eb372f2206f24029cc7e4694ae472599d95 Mon Sep 17 00:00:00 2001 From: Devendra Date: Sun, 24 Feb 2013 23:57:51 +0530 Subject: saving work on async clients consolidation --- PubnubCoreAsync.py | 107 ++++++++++------------------------------------- python-tornado/Pubnub.py | 16 ++----- python-twisted/Pubnub.py | 61 ++++++++++++++++++--------- 3 files changed, 66 insertions(+), 118 deletions(-) diff --git a/PubnubCoreAsync.py b/PubnubCoreAsync.py index 0ea03e9..4eb62e9 100644 --- a/PubnubCoreAsync.py +++ b/PubnubCoreAsync.py @@ -49,7 +49,8 @@ class PubnubCoreAsync(object): secret_key = False, cipher_key = False, ssl_on = False, - origin = 'pubsub.pubnub.com' + origin = 'pubsub.pubnub.com', + uuid = None ) : """ #** @@ -76,6 +77,12 @@ class PubnubCoreAsync(object): self.ssl = ssl_on self.subscriptions = {} self.timetoken = 0 + self.uuid = uuid or str(self.uuid()) + self.headers = { + 'V' : '3.1', + 'User-Agent' : 'Python-*', + 'Accept-Encoding' : 'gzip' + } if self.ssl : self.origin = 'https://' + self.origin @@ -160,7 +167,7 @@ class PubnubCoreAsync(object): signature = '0' ## Send Message - return self._request([ + return self._request({ "urlcomponents" : [ 'publish', self.publish_key, self.subscribe_key, @@ -168,7 +175,7 @@ class PubnubCoreAsync(object): channel, '0', message - ], publish_response ) + ] }, publish_response ) @@ -234,7 +241,6 @@ class PubnubCoreAsync(object): return "Already Connected" self.subscriptions[channel]['connected'] = 1 - print self.subscriptions ## SUBSCRIPTION RECURSION def substabizel(): ## STOP CONNECTION? @@ -242,6 +248,7 @@ class PubnubCoreAsync(object): return def sub_callback(response): + print response response = json.loads(response) ## STOP CONNECTION? if not self.subscriptions[channel]['connected']: @@ -292,13 +299,13 @@ class PubnubCoreAsync(object): ## CONNECT TO PUBNUB SUBSCRIBE SERVERS try : - self._request( [ + self._request( { "urlcomponents" : [ 'subscribe', self.subscribe_key, channel, '0', str(self.timetoken) - ], sub_callback ) + ], "urlparams" : {"uuid":self.uuid} }, sub_callback ) except : self.timeout( 1, substabizel ) return @@ -347,13 +354,13 @@ class PubnubCoreAsync(object): ## Get History pc = PubnubCrypto() - return self._request( [ + return self._request( {"urlcomponents" : [ 'history', self.subscribe_key, channel, '0', str(limit) - ], args['callback'] ) + ]}, args['callback'] ) def time( self, args ) : """ @@ -376,10 +383,10 @@ class PubnubCoreAsync(object): if not response: return 0 args['callback'](response[0]) - self._request( [ + self._request( { "urlcomponents" : [ 'time', '0' - ], complete ) + ]}, complete ) def uuid(self) : """ @@ -397,86 +404,16 @@ class PubnubCoreAsync(object): """ return uuid.uuid1() - def _request( self, request, callback ) : - global pnconn_pool - + 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]) - - requestType = request[0] - agent = Agent( - reactor, - self.ssl and None or pnconn_pool, - connectTimeout=30 - ) - request = agent.request( 'GET', url, Headers({ - 'V' : ['3.1'], - '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) + ]) for bit in request["urlcomponents"]]) + if (request.has_key("urlparams")): + url = url + '?' + "&".join([ x + "=" + y for x,y in request["urlparams"].items()]) + return url def _request( self, request, callback, timeout=30 ) : pass diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index e9251f8..a7d8a01 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -9,7 +9,6 @@ ## PubNub 3.1 Real-time Push Cloud API ## ----------------------------------- import sys -sys.path.append('../') from PubnubCoreAsync import PubnubCoreAsync import json import time @@ -55,24 +54,15 @@ class Pubnub(PubnubCoreAsync): ssl_on, origin, ) + self.headers['User-Agent'] = 'Python-Tornado' 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]) + url = self.getUrl(request) print url ## 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' - }) ) + request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers ) def responseCallback(response): - print response._get_body() callback(response._get_body()) http.fetch( diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index f7d5c52..10875dd 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -29,12 +29,13 @@ from twisted.web.client import getPage from twisted.internet import reactor from twisted.internet.defer import Deferred from twisted.internet.protocol import Protocol -from twisted.web.client import Agent +from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDecoder from twisted.web.client import HTTPConnectionPool from twisted.web.http_headers import Headers from PubnubCrypto import PubnubCrypto import gzip import zlib +from twisted.internet.ssl import ClientContextFactory pnconn_pool = HTTPConnectionPool(reactor) pnconn_pool.maxPersistentPerHost = 100 @@ -64,37 +65,57 @@ class Pubnub(PubnubCoreAsync): origin, ) - def _request( self, request, callback, timeout=30 ) : + def _request( self, request, callback ) : global pnconn_pool ## 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] - agent = Agent( + ''' + url = self.getUrl(request) + cf = WebClientContextFactory() + agent = ContentDecoderAgent(RedirectAgent(Agent( reactor, - self.ssl and None or pnconn_pool, - connectTimeout=timeout - ) + contextFactory = cf, + pool = self.ssl and None or pnconn_pool + )), [('gzip', GzipDecoder)]) print url - gp = getPage( url, headers={ - 'V' : ['3.4'], + request = agent.request( 'GET', url, Headers({ + 'V' : ['3.1'], 'User-Agent' : ['Python-Twisted'], 'Accept-Encoding' : ['gzip'] - } ); - - gp.addCallback(callback) - gp.addErrback(callback) + }), None ) + + def received(response): + #print response + finished = Deferred() + response.deliverBody(PubNubResponse(finished)) + return finished + + def complete(data): + #print data + #try : obj = json.loads(data) + #except : obj = None + + #print obj + callback(data) + + request.addCallback(received) + request.addBoth(complete) + +class WebClientContextFactory(ClientContextFactory): + def getContext(self, hostname, port): + return ClientContextFactory.getContext(self) +class PubNubResponse(Protocol): + def __init__( self, finished ): + self.finished = finished -#class PubNubResponse(Protocol): -# def __init__( self, finished ): -# self.finished = finished -# -# def dataReceived( self, bytes ): -# self.finished.callback(bytes) + def dataReceived( self, bytes ): + #print bytes + self.finished.callback(bytes) -- cgit v1.2.3 From 2ea3826d516fdf10a889e98ffab04a8f1d790650 Mon Sep 17 00:00:00 2001 From: Devendra Date: Mon, 25 Feb 2013 15:19:20 +0530 Subject: saving python async consolidation work --- PubnubCoreAsync.py | 22 ++++------------------ python-tornado/Pubnub.py | 22 ++++++++++++---------- python-twisted/Pubnub.py | 31 ++++++++++++------------------- 3 files changed, 28 insertions(+), 47 deletions(-) diff --git a/PubnubCoreAsync.py b/PubnubCoreAsync.py index 4eb62e9..b31fdfe 100644 --- a/PubnubCoreAsync.py +++ b/PubnubCoreAsync.py @@ -21,19 +21,7 @@ except ImportError: import Crypto.Hash.SHA256 as digestmod sha256 = digestmod.new import hmac -from twisted.internet import reactor -from twisted.internet.defer import Deferred -from twisted.internet.protocol import Protocol -from twisted.web.client import Agent -from twisted.web.client import HTTPConnectionPool -from twisted.web.http_headers import Headers from PubnubCrypto import PubnubCrypto -import gzip -import zlib - -pnconn_pool = HTTPConnectionPool(reactor) -pnconn_pool.maxPersistentPerHost = 100 -pnconn_pool.cachedConnectionTimeout = 310 class PubnubCoreAsync(object): @@ -78,12 +66,9 @@ class PubnubCoreAsync(object): self.subscriptions = {} self.timetoken = 0 self.uuid = uuid or str(self.uuid()) - self.headers = { - 'V' : '3.1', - 'User-Agent' : 'Python-*', - 'Accept-Encoding' : 'gzip' - } - + self.version = '3.4' + self.accept_encoding = 'gzip' + print self.ssl if self.ssl : self.origin = 'https://' + self.origin else : @@ -277,6 +262,7 @@ class PubnubCoreAsync(object): pc = PubnubCrypto() out = [] for message in response[0]: + print type(message) if self.cipher_key : if type( message ) == type(list()): for item in message: diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index a7d8a01..880e396 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -48,27 +48,29 @@ class Pubnub(PubnubCoreAsync): origin = 'pubsub.pubnub.com' ) : super(Pubnub, self).__init__( - publish_key, - subscribe_key, - secret_key, - ssl_on, - origin, + publish_key=publish_key, + subscribe_key=subscribe_key, + secret_key=secret_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) print url ## Send Request Expecting JSON Response - http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) - request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers ) + #print self.headers + request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=310, request_timeout=310 ) def responseCallback(response): callback(response._get_body()) - http.fetch( + self.http.fetch( request, callback=responseCallback, - connect_timeout=310, - request_timeout=310 ) diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index 10875dd..c52bf6d 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -37,7 +37,7 @@ import gzip import zlib from twisted.internet.ssl import ClientContextFactory -pnconn_pool = HTTPConnectionPool(reactor) +pnconn_pool = HTTPConnectionPool(reactor, persistent=True) pnconn_pool.maxPersistentPerHost = 100 pnconn_pool.cachedConnectionTimeout = 310 @@ -58,12 +58,16 @@ class Pubnub(PubnubCoreAsync): origin = 'pubsub.pubnub.com' ) : super(Pubnub, self).__init__( - publish_key, - subscribe_key, - secret_key, - ssl_on, - origin, + publish_key=publish_key, + subscribe_key=subscribe_key, + secret_key=secret_key, + ssl_on=ssl_on, + origin=origin, ) + self.headers = {} + self.headers['User-Agent'] = ['Python-Twisted'] + #self.headers['Accept-Encoding'] = [self.accept_encoding] + self.headers['V'] = [self.version] def _request( self, request, callback ) : global pnconn_pool @@ -77,18 +81,13 @@ class Pubnub(PubnubCoreAsync): ]) for bit in request]) ''' url = self.getUrl(request) - cf = WebClientContextFactory() agent = ContentDecoderAgent(RedirectAgent(Agent( reactor, - contextFactory = cf, + contextFactory = WebClientContextFactory(), pool = self.ssl and None or pnconn_pool )), [('gzip', GzipDecoder)]) print url - request = agent.request( 'GET', url, Headers({ - 'V' : ['3.1'], - 'User-Agent' : ['Python-Twisted'], - 'Accept-Encoding' : ['gzip'] - }), None ) + request = agent.request( 'GET', url, Headers(self.headers), None ) def received(response): #print response @@ -97,11 +96,6 @@ class Pubnub(PubnubCoreAsync): return finished def complete(data): - #print data - #try : obj = json.loads(data) - #except : obj = None - - #print obj callback(data) request.addCallback(received) @@ -116,6 +110,5 @@ class PubNubResponse(Protocol): self.finished = finished def dataReceived( self, bytes ): - #print bytes self.finished.callback(bytes) -- cgit v1.2.3 From 2238067fbbe3fa6154150095f8a3b4b317a7c7dd Mon Sep 17 00:00:00 2001 From: Devendra Date: Mon, 25 Feb 2013 21:58:57 +0530 Subject: refactoring --- PubnubBase.py | 402 +++++++++++++++++++++++++++ PubnubCore.py | 316 ++------------------- PubnubCoreAsync.py | 255 ++--------------- PubnubCrypto.py | 92 ++++++ python-tornado/examples/here-now-example.py | 43 +++ python-tornado/examples/history-example.py | 2 +- python-tornado/examples/publish-example.py | 41 ++- python-tornado/examples/subscribe-example.py | 7 +- python-twisted/examples/here-now-example.py | 43 +++ python-twisted/examples/history-example.py | 1 + python-twisted/examples/publish-example.py | 5 +- python-twisted/examples/subscribe-example.py | 8 +- python/3.3/Pubnub.py | 23 +- python/3.3/here-now-example.py | 33 +++ python/3.3/publish-example.py | 2 +- 15 files changed, 704 insertions(+), 569 deletions(-) create mode 100644 PubnubBase.py create mode 100644 PubnubCrypto.py create mode 100644 python-tornado/examples/here-now-example.py create mode 100644 python-twisted/examples/here-now-example.py create mode 100644 python/3.3/here-now-example.py diff --git a/PubnubBase.py b/PubnubBase.py new file mode 100644 index 0000000..074b891 --- /dev/null +++ b/PubnubBase.py @@ -0,0 +1,402 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +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, + 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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + 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 + + 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, message).replace('\n','')) + else : + message = json.dumps(message) + + return message; + + def decrypt(self, message): + 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) + + return message + + + def publish( self, args ) : + """ + #** + #* Publish + #* + #* Send a message to a channel. + #* + #* @param array args with channel and message. + #* @return array success information. + #** + + ## Publish Example + info = pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { + 'some_text' : 'Hello my World' + } + }) + print(info) + + """ + ## Fail if bad input. + if not (args['channel'] and args['message']) : + return [ 0, 'Missing Channel or Message' ] + + ## Capture User Input + channel = str(args['channel']) + + ## Capture Callback + if args.has_key('callback') : + callback = args['callback'] + else : + callback = None + + #message = json.dumps(args['message'], separators=(',',':')) + message = self.encrypt(args['message']) + + signature = self.sign(channel, message) + + ## Send Message + return self._request({"urlcomponents": [ + 'publish', + self.publish_key, + self.subscribe_key, + signature, + channel, + '0', + message + ]}, 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 = [] + count = 100 + + if args.has_key('count'): + count = int(args['count']) + + params.append('count' + '=' + str(count)) + + if args.has_key('reverse'): + params.append('reverse' + '=' + str(args['reverse']).lower()) + + if args.has_key('start'): + params.append('start' + '=' + str(args['start'])) + + if args.has_key('end'): + params.append('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([ + 'v2', + 'history', + 'sub-key', + self.subscribe_key, + 'channel', + channel, + ],params=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([ + '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"].items()]) + return url diff --git a/PubnubCore.py b/PubnubCore.py index 76e1cdd..4bf143b 100644 --- a/PubnubCore.py +++ b/PubnubCore.py @@ -16,16 +16,18 @@ import time import hashlib import urllib2 import uuid +from PubnubBase import PubnubBase -class PubnubCore(object): +class PubnubCore(PubnubBase): def __init__( self, publish_key, subscribe_key, secret_key = False, + cipher_key = False, ssl_on = False, origin = 'pubsub.pubnub.com', - pres_uuid = None + uuid = None ) : """ #** @@ -45,81 +47,20 @@ class PubnubCore(object): pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) """ - self.origin = origin - self.limit = 1800 - self.publish_key = publish_key - self.subscribe_key = subscribe_key - self.secret_key = secret_key - self.ssl = ssl_on + super(PubnubCore, 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 + ) - if self.ssl : - self.origin = 'https://' + self.origin - else : - self.origin = 'http://' + self.origin - - self.uuid = pres_uuid or str(uuid.uuid4()) - - if not isinstance(self.uuid, basestring): - raise AttributeError("pres_uuid must be a string") - - def publish( self, args ) : - """ - #** - #* Publish - #* - #* Send a message to a channel. - #* - #* @param array args with channel and message. - #* @return array success information. - #** - - ## Publish Example - info = pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { - 'some_text' : 'Hello my World' - } - }) - print(info) - - """ - ## Fail if bad input. - if not (args['channel'] and args['message']) : - return [ 0, 'Missing Channel or Message' ] - - ## Capture User Input - channel = str(args['channel']) - message = json.dumps(args['message'], separators=(',',':')) - - - ## Capture Callback - if args.has_key('callback') : - callback = args['callback'] - else : - callback = None - - ## 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' - - ## Send Message - return self._request([ - 'publish', - self.publish_key, - self.subscribe_key, - signature, - channel, - '0', - message - ], callback) + self.subscriptions = {} + self.timetoken = 0 + self.version = '3.4' + self.accept_encoding = 'gzip' @@ -192,226 +133,3 @@ class PubnubCore(object): time.sleep(1) return True - - 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([ - '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([ - '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 = [] - count = 100 - - if args.has_key('count'): - count = int(args['count']) - - params.append('count' + '=' + str(count)) - - if args.has_key('reverse'): - params.append('reverse' + '=' + str(args['reverse']).lower()) - - if args.has_key('start'): - params.append('start' + '=' + str(args['start'])) - - if args.has_key('end'): - params.append('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([ - 'v2', - 'history', - 'sub-key', - self.subscribe_key, - 'channel', - channel, - ],params=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([ - '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] - - - - diff --git a/PubnubCoreAsync.py b/PubnubCoreAsync.py index b31fdfe..9c53c6e 100644 --- a/PubnubCoreAsync.py +++ b/PubnubCoreAsync.py @@ -22,8 +22,9 @@ except ImportError: sha256 = digestmod.new import hmac from PubnubCrypto import PubnubCrypto +from PubnubBase import PubnubBase -class PubnubCoreAsync(object): +class PubnubCoreAsync(PubnubBase): def start(self): pass def stop(self): pass @@ -57,112 +58,20 @@ class PubnubCoreAsync(object): 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 + 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.uuid = uuid or str(self.uuid()) self.version = '3.4' self.accept_encoding = 'gzip' - print self.ssl - 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({ "urlcomponents" : [ - 'publish', - self.publish_key, - self.subscribe_key, - signature, - channel, - '0', - message - ] }, publish_response ) - - def subscribe( self, args ) : """ @@ -227,7 +136,7 @@ class PubnubCoreAsync(object): self.subscriptions[channel]['connected'] = 1 ## SUBSCRIPTION RECURSION - def substabizel(): + def _subscribe(): ## STOP CONNECTION? if not self.subscriptions[channel]['connected']: return @@ -248,43 +157,24 @@ class PubnubCoreAsync(object): if not response: def time_callback(_time): if not _time: - self.timeout( 1, substabizel ) + self.timeout( 1, _subscribe ) return errorback("Lost Network Connection") else: - self.timeout( 1, substabizel ) + self.timeout( 1, _subscribe) ## ENSURE CONNECTED (Call Time Function) return self.time({ 'callback' : time_callback }) self.timetoken = response[1] - substabizel() + _subscribe() pc = PubnubCrypto() out = [] for message in response[0]: - print type(message) - 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 ) - else : - message - - callback(message) + callback(self.decrypt(message)) ## CONNECT TO PUBNUB SUBSCRIBE SERVERS - try : + try: self._request( { "urlcomponents" : [ 'subscribe', self.subscribe_key, @@ -293,113 +183,8 @@ class PubnubCoreAsync(object): str(self.timetoken) ], "urlparams" : {"uuid":self.uuid} }, sub_callback ) except : - self.timeout( 1, substabizel ) + self.timeout( 1, _subscribe) return ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) - substabizel() - - - def unsubscribe( self, args ): - channel = str(args['channel']) - if not (channel in self.subscriptions): - return False - - ## DISCONNECT - self.subscriptions[channel]['connected'] = 0 - 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( {"urlcomponents" : [ - 'history', - self.subscribe_key, - channel, - '0', - str(limit) - ]}, args['callback'] ) - - def time( self, args ) : - """ - #** - #* Time - #* - #* Timestamp from PubNub Cloud. - #* - #* @return int timestamp. - #* - - ## PubNub Server Time Example - def time_complete(timestamp): - print(timestamp) - - pubnub.time(time_complete) - - """ - def complete(response) : - if not response: return 0 - args['callback'](response[0]) - - self._request( { "urlcomponents" : [ - 'time', - '0' - ]}, complete ) - - def uuid(self) : - """ - #** - #* uuid - #* - #* Generate a UUID - #* - #* @return UUID. - #* - - ## PubNub UUID Example - uuid = pubnub.uuid() - print(uuid) - """ - return uuid.uuid1() - - 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"].items()]) - return url - - def _request( self, request, callback, timeout=30 ) : - pass + _subscribe() diff --git a/PubnubCrypto.py b/PubnubCrypto.py new file mode 100644 index 0000000..744f2d3 --- /dev/null +++ b/PubnubCrypto.py @@ -0,0 +1,92 @@ +## 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..4105776 --- /dev/null +++ b/python-tornado/examples/here-now-example.py @@ -0,0 +1,43 @@ +## 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 +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) + tornado.ioloop.IOLoop.instance().stop() + +pubnub.here_now( { + 'channel' : crazy, + 'callback' : here_now_complete +}) + +## ----------------------------------------------------------------------- +## IO Event Loop +## ----------------------------------------------------------------------- +tornado.ioloop.IOLoop.instance().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 7f217d1..72f2586 100644 --- a/python-tornado/examples/publish-example.py +++ b/python-tornado/examples/publish-example.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.0 Real-time Push Cloud API +## PubNub 3.1 Real-time Push Cloud API ## ----------------------------------- import sys @@ -18,27 +18,44 @@ 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 1a2e03d..dfe8010 100644 --- a/python-tornado/examples/subscribe-example.py +++ b/python-tornado/examples/subscribe-example.py @@ -18,13 +18,14 @@ 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(): @@ -41,6 +42,7 @@ pubnub.subscribe({ ## ----------------------------------------------------------------------- ## Publish Example ## ----------------------------------------------------------------------- +''' def publish_complete(info): print(info) @@ -65,6 +67,7 @@ pubnub.publish({ 'message' : { 'some_key' : 'some_val' }, 'callback' : publish_complete }) +''' ## ----------------------------------------------------------------------- ## IO Event Loop ## ----------------------------------------------------------------------- diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py new file mode 100644 index 0000000..b3c9dc0 --- /dev/null +++ b/python-twisted/examples/here-now-example.py @@ -0,0 +1,43 @@ +## 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 +from twisted.internet import reactor +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) + reactor.stop() + +pubnub.here_now( { + 'channel' : crazy, + 'callback' : here_now_complete +}) + +## ----------------------------------------------------------------------- +## IO Event Loop +## ----------------------------------------------------------------------- +reactor.run() diff --git a/python-twisted/examples/history-example.py b/python-twisted/examples/history-example.py index 31b8edb..5f352ef 100644 --- a/python-twisted/examples/history-example.py +++ b/python-twisted/examples/history-example.py @@ -31,6 +31,7 @@ crazy = 'hello_world' ## ----------------------------------------------------------------------- def history_complete(messages): print(messages) + reactor.stop() pubnub.history( { 'channel' : crazy, diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py index 9c3be60..d09ad8d 100644 --- a/python-twisted/examples/publish-example.py +++ b/python-twisted/examples/publish-example.py @@ -48,11 +48,14 @@ pubnub.publish({ 'callback' : publish_complete }) +def done_cb(info): + publish_complete(info) + reactor.stop() ## Publish Dictionary Object pubnub.publish({ 'channel' : crazy, 'message' : { 'some_key' : 'some_val' }, - 'callback' : publish_complete + 'callback' : done_cb }) ## ----------------------------------------------------------------------- diff --git a/python-twisted/examples/subscribe-example.py b/python-twisted/examples/subscribe-example.py index 994e7e3..cf4a919 100644 --- a/python-twisted/examples/subscribe-example.py +++ b/python-twisted/examples/subscribe-example.py @@ -23,7 +23,8 @@ 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, subscribe_key, secret_key, cipher_key, ssl_on ) +pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on ) crazy = 'hello_world' ## ----------------------------------------------------------------------- @@ -33,10 +34,7 @@ def message_received(message): print(message) def connected() : - pubnub.publish({ - 'channel' : crazy, - 'message' : { 'Info' : 'Connected!' } - }) + print 'Connected' pubnub.subscribe({ 'channel' : crazy, diff --git a/python/3.3/Pubnub.py b/python/3.3/Pubnub.py index e2b573f..5df77d5 100644 --- a/python/3.3/Pubnub.py +++ b/python/3.3/Pubnub.py @@ -25,27 +25,24 @@ class Pubnub(PubnubCore): publish_key, subscribe_key, secret_key = False, + cipher_key = False, ssl_on = False, origin = 'pubsub.pubnub.com', pres_uuid = None ) : super(Pubnub, self).__init__( - publish_key, - subscribe_key, - secret_key, - ssl_on, - origin, - pres_uuid + publish_key = publish_key, + subscribe_key = subscribe_key, + secret_key = secret_key, + cipher_key = cipher_key, + ssl_on = ssl_on, + origin = origin, + uuid = pres_uuid ) - def _request( self, request, origin = None, encode = True, params = None, callback = None ) : + def _request( self, request, callback = None ) : ## Build URL - url = (origin or self.origin) + '/' + "/".join( - encode and self._encode(request) or request - ) - ## Add query params - if params is not None and len(params) > 0: - url = url + "?" + "&".join(params) + url = self.getUrl(request) ## Send Request Expecting JSONP Response try: diff --git a/python/3.3/here-now-example.py b/python/3.3/here-now-example.py new file mode 100644 index 0000000..261500a --- /dev/null +++ b/python/3.3/here-now-example.py @@ -0,0 +1,33 @@ +## 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 +from twisted.internet import reactor +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=publish_key, subscribe_key=subscribe_key, + secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) +crazy = 'hello_world' + + +print pubnub.here_now( { + 'channel' : crazy +}) + diff --git a/python/3.3/publish-example.py b/python/3.3/publish-example.py index 725df0b..c97034b 100755 --- a/python/3.3/publish-example.py +++ b/python/3.3/publish-example.py @@ -1,7 +1,7 @@ from Pubnub import Pubnub ## Initiate Class -pubnub = Pubnub( 'demo', 'demo', None, False ) +pubnub = Pubnub( publish_key='demo', subscribe_key='demo', ssl_on=False ) ## Publish Example info = pubnub.publish({ -- cgit v1.2.3 From 6e6315c345e46a5469844a0841f2029d6a4dca24 Mon Sep 17 00:00:00 2001 From: Devendra Date: Mon, 25 Feb 2013 22:10:42 +0530 Subject: removed swap file --- .PubnubCoreAsync.py.swp | Bin 28672 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .PubnubCoreAsync.py.swp diff --git a/.PubnubCoreAsync.py.swp b/.PubnubCoreAsync.py.swp deleted file mode 100644 index b91587f..0000000 Binary files a/.PubnubCoreAsync.py.swp and /dev/null differ -- cgit v1.2.3 From b4258b8b05544cb1a730550cbc1d87c6ef12eea6 Mon Sep 17 00:00:00 2001 From: Devendra Date: Mon, 25 Feb 2013 22:13:08 +0530 Subject: PubnubCrypto moved to top level dir --- python-tornado/PubnubCrypto.py | 92 ------------------------------------------ python-twisted/PubnubCrypto.py | 92 ------------------------------------------ 2 files changed, 184 deletions(-) delete mode 100644 python-tornado/PubnubCrypto.py delete mode 100644 python-twisted/PubnubCrypto.py 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-twisted/PubnubCrypto.py b/python-twisted/PubnubCrypto.py deleted file mode 100644 index 744f2d3..0000000 --- a/python-twisted/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)))) - -- cgit v1.2.3 From 12aee359893dcdfee2c958ef4c8c98b493b267e6 Mon Sep 17 00:00:00 2001 From: Devendra Date: Mon, 25 Feb 2013 22:18:51 +0530 Subject: removing path append, need to use PYTHONPATH when running examples or tests from command line --- python-twisted/Pubnub.py | 5 ----- python/3.3/Pubnub.py | 1 - 2 files changed, 6 deletions(-) diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index c52bf6d..b0541c9 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -14,9 +14,6 @@ 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 @@ -33,8 +30,6 @@ from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDe from twisted.web.client import HTTPConnectionPool from twisted.web.http_headers import Headers from PubnubCrypto import PubnubCrypto -import gzip -import zlib from twisted.internet.ssl import ClientContextFactory pnconn_pool = HTTPConnectionPool(reactor, persistent=True) diff --git a/python/3.3/Pubnub.py b/python/3.3/Pubnub.py index 5df77d5..e806f9b 100644 --- a/python/3.3/Pubnub.py +++ b/python/3.3/Pubnub.py @@ -12,7 +12,6 @@ try: import json except ImportError: import simplejson as json import sys -sys.path.append('../..') import time import hashlib import urllib2 -- cgit v1.2.3 From 5a47adb56bfe80c34ed5b04a4824e517a3cde16d Mon Sep 17 00:00:00 2001 From: Devendra Date: Tue, 26 Feb 2013 01:02:44 +0530 Subject: fixiing encryption to interact with php app --- PubnubBase.py | 4 +++- PubnubCrypto.py | 13 +++++++------ python-tornado/Pubnub.py | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/PubnubBase.py b/PubnubBase.py index 074b891..07dd27f 100644 --- a/PubnubBase.py +++ b/PubnubBase.py @@ -16,6 +16,7 @@ import time import hashlib import urllib2 import uuid +from PubnubCrypto import PubnubCrypto class PubnubBase(object): def __init__( @@ -95,7 +96,7 @@ class PubnubBase(object): out.append(outdict) message = json.dumps(out[0]) else: - message = json.dumps(pc.encrypt(self.cipher_key, message).replace('\n','')) + message = json.dumps(pc.encrypt(self.cipher_key, json.dumps(message)).replace('\n','')) else : message = json.dumps(message) @@ -103,6 +104,7 @@ class PubnubBase(object): 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 ) diff --git a/PubnubCrypto.py b/PubnubCrypto.py index 744f2d3..b7a57a1 100644 --- a/PubnubCrypto.py +++ b/PubnubCrypto.py @@ -38,7 +38,8 @@ class PubnubCrypto() : #* @return msg with padding. #** """ - return msg + ((block_size - len(msg) % block_size) * chr(block_size - len(msg) % block_size)) + padding = block_size - (len(msg) % block_size) + return msg + chr(padding)*padding def depad( self, msg ): """ @@ -60,7 +61,7 @@ class PubnubCrypto() : #* @return key in MD5 format #** """ - return MD5.new(key).digest() + return hashlib.sha256(key).hexdigest() def encrypt( self, key, msg ): """ @@ -73,9 +74,9 @@ class PubnubCrypto() : """ secret = self.getSecret(key) Initial16bytes='0123456789012345' - cipher = AES.new(secret,AES.MODE_CBC,Initial16bytes) - return encodestring(cipher.encrypt(self.pad(msg))) - + cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes) + enc = encodestring(cipher.encrypt(self.pad(msg))) + return enc def decrypt( self, key, msg ): """ #** @@ -87,6 +88,6 @@ class PubnubCrypto() : """ secret = self.getSecret(key) Initial16bytes='0123456789012345' - cipher = AES.new(secret,AES.MODE_CBC,Initial16bytes) + cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes) return self.depad((cipher.decrypt(decodestring(msg)))) diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index 880e396..eba2a0f 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -51,6 +51,7 @@ class Pubnub(PubnubCoreAsync): publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key, + cipher_key=cipher_key, ssl_on=ssl_on, origin=origin, ) -- cgit v1.2.3 From e5f767f964b651698812f19d33f5223b9a2ed508 Mon Sep 17 00:00:00 2001 From: Devendra Date: Fri, 5 Jul 2013 22:14:19 +0530 Subject: dir structure reorg --- PubnubBase.py | 404 -------------------------- PubnubCore.py | 135 --------- PubnubCoreAsync.py | 190 ------------ PubnubCrypto.py | 93 ------ common/PubnubBase.py | 404 ++++++++++++++++++++++++++ common/PubnubCore.py | 135 +++++++++ common/PubnubCoreAsync.py | 190 ++++++++++++ common/PubnubCrypto.py | 93 ++++++ python/3.2/Pubnub.py | 345 ---------------------- python/3.2/history-example.py | 12 - python/3.2/publish-example.py | 14 - python/3.2/subscribe-example.py | 64 ---- python/3.2/unit-test.py | 77 ----- python/3.3/Pubnub.py | 57 ---- python/3.3/detailed-history-unit-test.py | 134 --------- python/3.3/here-now-example.py | 33 --- python/3.3/history-example.py | 12 - python/3.3/publish-example.py | 14 - python/3.3/subscribe-example.py | 64 ---- python/3.3/unit-test.py | 77 ----- python/Pubnub.py | 57 ++++ python/examples/detailed-history-unit-test.py | 134 +++++++++ python/examples/here-now-example.py | 33 +++ python/examples/history-example.py | 12 + python/examples/publish-example.py | 14 + python/examples/subscribe-example.py | 64 ++++ python/tests/unit-test.py | 77 +++++ 27 files changed, 1213 insertions(+), 1725 deletions(-) delete mode 100644 PubnubBase.py delete mode 100644 PubnubCore.py delete mode 100644 PubnubCoreAsync.py delete mode 100644 PubnubCrypto.py create mode 100644 common/PubnubBase.py create mode 100644 common/PubnubCore.py create mode 100644 common/PubnubCoreAsync.py create mode 100644 common/PubnubCrypto.py delete mode 100644 python/3.2/Pubnub.py delete mode 100755 python/3.2/history-example.py delete mode 100755 python/3.2/publish-example.py delete mode 100755 python/3.2/subscribe-example.py delete mode 100755 python/3.2/unit-test.py delete mode 100644 python/3.3/Pubnub.py delete mode 100755 python/3.3/detailed-history-unit-test.py delete mode 100644 python/3.3/here-now-example.py delete mode 100755 python/3.3/history-example.py delete mode 100755 python/3.3/publish-example.py delete mode 100755 python/3.3/subscribe-example.py delete mode 100755 python/3.3/unit-test.py create mode 100644 python/Pubnub.py create mode 100755 python/examples/detailed-history-unit-test.py create mode 100644 python/examples/here-now-example.py create mode 100755 python/examples/history-example.py create mode 100755 python/examples/publish-example.py create mode 100755 python/examples/subscribe-example.py create mode 100755 python/tests/unit-test.py diff --git a/PubnubBase.py b/PubnubBase.py deleted file mode 100644 index 07dd27f..0000000 --- a/PubnubBase.py +++ /dev/null @@ -1,404 +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.0 Real-time Push Cloud API -## ----------------------------------- - -try: import json -except ImportError: import simplejson as json - -import time -import hashlib -import urllib2 -import uuid -from PubnubCrypto import PubnubCrypto - -class PubnubBase(object): - 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 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 - pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) - - """ - 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 - - 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 ) : - """ - #** - #* Publish - #* - #* Send a message to a channel. - #* - #* @param array args with channel and message. - #* @return array success information. - #** - - ## Publish Example - info = pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { - 'some_text' : 'Hello my World' - } - }) - print(info) - - """ - ## Fail if bad input. - if not (args['channel'] and args['message']) : - return [ 0, 'Missing Channel or Message' ] - - ## Capture User Input - channel = str(args['channel']) - - ## Capture Callback - if args.has_key('callback') : - callback = args['callback'] - else : - callback = None - - #message = json.dumps(args['message'], separators=(',',':')) - message = self.encrypt(args['message']) - - signature = self.sign(channel, message) - - ## Send Message - return self._request({"urlcomponents": [ - 'publish', - self.publish_key, - self.subscribe_key, - signature, - channel, - '0', - message - ]}, 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 = [] - count = 100 - - if args.has_key('count'): - count = int(args['count']) - - params.append('count' + '=' + str(count)) - - if args.has_key('reverse'): - params.append('reverse' + '=' + str(args['reverse']).lower()) - - if args.has_key('start'): - params.append('start' + '=' + str(args['start'])) - - if args.has_key('end'): - params.append('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([ - 'v2', - 'history', - 'sub-key', - self.subscribe_key, - 'channel', - channel, - ],params=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([ - '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"].items()]) - return url diff --git a/PubnubCore.py b/PubnubCore.py deleted file mode 100644 index 4bf143b..0000000 --- a/PubnubCore.py +++ /dev/null @@ -1,135 +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.0 Real-time Push Cloud API -## ----------------------------------- - -try: import json -except ImportError: import simplejson as json - -import time -import hashlib -import urllib2 -import uuid -from PubnubBase import PubnubBase - -class PubnubCore(PubnubBase): - 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 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 - pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) - - """ - super(PubnubCore, 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.4' - self.accept_encoding = 'gzip' - - - - def subscribe( self, args ) : - """ - #** - #* Subscribe - #* - #* This is BLOCKING. - #* Listen for a message on a channel. - #* - #* @param array args with channel and callback. - #* @return false on fail, array on success. - #** - - ## Subscribe Example - def receive(message) : - print(message) - return True - - pubnub.subscribe({ - '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 - - ## Begin Subscribe - while True : - - timetoken = 'timetoken' in args and args['timetoken'] or 0 - try : - ## Wait for Message - response = self._request(self._encode([ - 'subscribe', - subscribe_key, - channel, - '0', - str(timetoken) - ])+['?uuid='+self.uuid], encode=False) - - messages = response[0] - args['timetoken'] = response[1] - - ## If it was a timeout - if not len(messages) : - continue - - ## Run user Callback and Reconnect if user permits. - for message in messages : - if not callback(message) : - return - - except Exception: - time.sleep(1) - - return True diff --git a/PubnubCoreAsync.py b/PubnubCoreAsync.py deleted file mode 100644 index 9c53c6e..0000000 --- a/PubnubCoreAsync.py +++ /dev/null @@ -1,190 +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 -## ----------------------------------- -import sys -import json -import time -import hashlib -import urllib2 -import uuid -try: - from hashlib import sha256 - digestmod = sha256 -except ImportError: - import Crypto.Hash.SHA256 as digestmod - sha256 = digestmod.new -import hmac -from PubnubCrypto import PubnubCrypto -from PubnubBase import PubnubBase - -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.4' - self.accept_encoding = 'gzip' - - def subscribe( self, args ) : - """ - #** - #* Subscribe - #* - #* This is NON-BLOCKING. - #* Listen for a message on a channel. - #* - #* @param array args with channel and message. - #* @return false on fail, array on success. - #** - - ## Subscribe Example - def receive(message) : - print(message) - return True - - ## On Connect Callback - def connected() : - pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { 'some_var' : 'text' } - }) - - ## Subscribe - pubnub.subscribe({ - 'channel' : 'hello_world', - 'connect' : connected, - 'callback' : receive - }) - - """ - ## Fail if missing channel - if not 'channel' in args : - return 'Missing Channel.' - - ## Fail if missing callback - if not 'callback' in args : - return 'Missing Callback.' - - ## Capture User Input - channel = str(args['channel']) - callback = args['callback'] - connectcb = args['connect'] - - if 'errorback' in args: - errorback = args['errorback'] - else: - errorback = lambda x: x - - ## New Channel? - if not (channel in self.subscriptions) : - self.subscriptions[channel] = { - 'first' : False, - 'connected' : False, - } - - ## Ensure Single Connection - if self.subscriptions[channel]['connected'] : - return "Already Connected" - - self.subscriptions[channel]['connected'] = 1 - ## SUBSCRIPTION RECURSION - def _subscribe(): - ## STOP CONNECTION? - if not self.subscriptions[channel]['connected']: - return - - def sub_callback(response): - print response - response = json.loads(response) - ## 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: - self.timeout( 1, _subscribe ) - return errorback("Lost Network Connection") - else: - self.timeout( 1, _subscribe) - - ## ENSURE CONNECTED (Call Time Function) - return self.time({ 'callback' : time_callback }) - - self.timetoken = response[1] - _subscribe() - - pc = PubnubCrypto() - out = [] - for message in response[0]: - callback(self.decrypt(message)) - - ## CONNECT TO PUBNUB SUBSCRIBE SERVERS - try: - self._request( { "urlcomponents" : [ - 'subscribe', - self.subscribe_key, - channel, - '0', - str(self.timetoken) - ], "urlparams" : {"uuid":self.uuid} }, sub_callback ) - except : - self.timeout( 1, _subscribe) - return - - ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) - _subscribe() diff --git a/PubnubCrypto.py b/PubnubCrypto.py deleted file mode 100644 index b7a57a1..0000000 --- a/PubnubCrypto.py +++ /dev/null @@ -1,93 +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. - #** - """ - 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])] - - def getSecret( self, key ): - """ - #** - #* getSecret - #* - #* hases the key to MD5 - #* @return key in MD5 format - #** - """ - return hashlib.sha256(key).hexdigest() - - 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)))) - diff --git a/common/PubnubBase.py b/common/PubnubBase.py new file mode 100644 index 0000000..07dd27f --- /dev/null +++ b/common/PubnubBase.py @@ -0,0 +1,404 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +try: import json +except ImportError: import simplejson as json + +import time +import hashlib +import urllib2 +import uuid +from PubnubCrypto import PubnubCrypto + +class PubnubBase(object): + 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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + 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 + + 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 ) : + """ + #** + #* Publish + #* + #* Send a message to a channel. + #* + #* @param array args with channel and message. + #* @return array success information. + #** + + ## Publish Example + info = pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { + 'some_text' : 'Hello my World' + } + }) + print(info) + + """ + ## Fail if bad input. + if not (args['channel'] and args['message']) : + return [ 0, 'Missing Channel or Message' ] + + ## Capture User Input + channel = str(args['channel']) + + ## Capture Callback + if args.has_key('callback') : + callback = args['callback'] + else : + callback = None + + #message = json.dumps(args['message'], separators=(',',':')) + message = self.encrypt(args['message']) + + signature = self.sign(channel, message) + + ## Send Message + return self._request({"urlcomponents": [ + 'publish', + self.publish_key, + self.subscribe_key, + signature, + channel, + '0', + message + ]}, 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 = [] + count = 100 + + if args.has_key('count'): + count = int(args['count']) + + params.append('count' + '=' + str(count)) + + if args.has_key('reverse'): + params.append('reverse' + '=' + str(args['reverse']).lower()) + + if args.has_key('start'): + params.append('start' + '=' + str(args['start'])) + + if args.has_key('end'): + params.append('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([ + 'v2', + 'history', + 'sub-key', + self.subscribe_key, + 'channel', + channel, + ],params=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([ + '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"].items()]) + return url diff --git a/common/PubnubCore.py b/common/PubnubCore.py new file mode 100644 index 0000000..4bf143b --- /dev/null +++ b/common/PubnubCore.py @@ -0,0 +1,135 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +try: import json +except ImportError: import simplejson as json + +import time +import hashlib +import urllib2 +import uuid +from PubnubBase import PubnubBase + +class PubnubCore(PubnubBase): + 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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + super(PubnubCore, 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.4' + self.accept_encoding = 'gzip' + + + + def subscribe( self, args ) : + """ + #** + #* Subscribe + #* + #* This is BLOCKING. + #* Listen for a message on a channel. + #* + #* @param array args with channel and callback. + #* @return false on fail, array on success. + #** + + ## Subscribe Example + def receive(message) : + print(message) + return True + + pubnub.subscribe({ + '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 + + ## Begin Subscribe + while True : + + timetoken = 'timetoken' in args and args['timetoken'] or 0 + try : + ## Wait for Message + response = self._request(self._encode([ + 'subscribe', + subscribe_key, + channel, + '0', + str(timetoken) + ])+['?uuid='+self.uuid], encode=False) + + messages = response[0] + args['timetoken'] = response[1] + + ## If it was a timeout + if not len(messages) : + continue + + ## Run user Callback and Reconnect if user permits. + for message in messages : + if not callback(message) : + return + + except Exception: + time.sleep(1) + + return True diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py new file mode 100644 index 0000000..9c53c6e --- /dev/null +++ b/common/PubnubCoreAsync.py @@ -0,0 +1,190 @@ +## 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 json +import time +import hashlib +import urllib2 +import uuid +try: + from hashlib import sha256 + digestmod = sha256 +except ImportError: + import Crypto.Hash.SHA256 as digestmod + sha256 = digestmod.new +import hmac +from PubnubCrypto import PubnubCrypto +from PubnubBase import PubnubBase + +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.4' + self.accept_encoding = 'gzip' + + def subscribe( self, args ) : + """ + #** + #* Subscribe + #* + #* This is NON-BLOCKING. + #* Listen for a message on a channel. + #* + #* @param array args with channel and message. + #* @return false on fail, array on success. + #** + + ## Subscribe Example + def receive(message) : + print(message) + return True + + ## On Connect Callback + def connected() : + pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { 'some_var' : 'text' } + }) + + ## Subscribe + pubnub.subscribe({ + 'channel' : 'hello_world', + 'connect' : connected, + 'callback' : receive + }) + + """ + ## Fail if missing channel + if not 'channel' in args : + return 'Missing Channel.' + + ## Fail if missing callback + if not 'callback' in args : + return 'Missing Callback.' + + ## Capture User Input + channel = str(args['channel']) + callback = args['callback'] + connectcb = args['connect'] + + if 'errorback' in args: + errorback = args['errorback'] + else: + errorback = lambda x: x + + ## New Channel? + if not (channel in self.subscriptions) : + self.subscriptions[channel] = { + 'first' : False, + 'connected' : False, + } + + ## Ensure Single Connection + if self.subscriptions[channel]['connected'] : + return "Already Connected" + + self.subscriptions[channel]['connected'] = 1 + ## SUBSCRIPTION RECURSION + def _subscribe(): + ## STOP CONNECTION? + if not self.subscriptions[channel]['connected']: + return + + def sub_callback(response): + print response + response = json.loads(response) + ## 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: + self.timeout( 1, _subscribe ) + return errorback("Lost Network Connection") + else: + self.timeout( 1, _subscribe) + + ## ENSURE CONNECTED (Call Time Function) + return self.time({ 'callback' : time_callback }) + + self.timetoken = response[1] + _subscribe() + + pc = PubnubCrypto() + out = [] + for message in response[0]: + callback(self.decrypt(message)) + + ## CONNECT TO PUBNUB SUBSCRIBE SERVERS + try: + self._request( { "urlcomponents" : [ + 'subscribe', + self.subscribe_key, + channel, + '0', + str(self.timetoken) + ], "urlparams" : {"uuid":self.uuid} }, sub_callback ) + except : + self.timeout( 1, _subscribe) + return + + ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) + _subscribe() diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py new file mode 100644 index 0000000..b7a57a1 --- /dev/null +++ b/common/PubnubCrypto.py @@ -0,0 +1,93 @@ +## 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. + #** + """ + 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])] + + def getSecret( self, key ): + """ + #** + #* getSecret + #* + #* hases the key to MD5 + #* @return key in MD5 format + #** + """ + return hashlib.sha256(key).hexdigest() + + 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)))) + diff --git a/python/3.2/Pubnub.py b/python/3.2/Pubnub.py deleted file mode 100644 index 79086cf..0000000 --- a/python/3.2/Pubnub.py +++ /dev/null @@ -1,345 +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.0 Real-time Push Cloud API -## ----------------------------------- - -try: import json -except ImportError: import simplejson as json - -import time -import hashlib -import urllib2 -import uuid - -class Pubnub(): - def __init__( - self, - publish_key, - subscribe_key, - secret_key = False, - ssl_on = False, - origin = 'pubsub.pubnub.com', - pres_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 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 - pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) - - """ - self.origin = origin - self.limit = 1800 - self.publish_key = publish_key - self.subscribe_key = subscribe_key - self.secret_key = secret_key - self.ssl = ssl_on - - if self.ssl : - self.origin = 'https://' + self.origin - else : - self.origin = 'http://' + self.origin - - self.uuid = pres_uuid or str(uuid.uuid4()) - - if not isinstance(self.uuid, basestring): - raise AttributeError("pres_uuid must be a string") - - def publish( self, args ) : - """ - #** - #* Publish - #* - #* Send a message to a channel. - #* - #* @param array args with channel and message. - #* @return array success information. - #** - - ## Publish Example - info = pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { - 'some_text' : 'Hello my World' - } - }) - print(info) - - """ - ## Fail if bad input. - if not (args['channel'] and args['message']) : - return [ 0, 'Missing Channel or Message' ] - - ## Capture User Input - channel = str(args['channel']) - message = json.dumps(args['message'], separators=(',',':')) - - ## 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' - - ## Send Message - return self._request([ - 'publish', - self.publish_key, - self.subscribe_key, - signature, - channel, - '0', - message - ]) - - - def subscribe( self, args ) : - """ - #** - #* Subscribe - #* - #* This is BLOCKING. - #* Listen for a message on a channel. - #* - #* @param array args with channel and callback. - #* @return false on fail, array on success. - #** - - ## Subscribe Example - def receive(message) : - print(message) - return True - - pubnub.subscribe({ - '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 - - ## Begin Subscribe - while True : - - timetoken = 'timetoken' in args and args['timetoken'] or 0 - try : - ## Wait for Message - response = self._request(self._encode([ - 'subscribe', - subscribe_key, - channel, - '0', - str(timetoken) - ])+['?uuid='+self.uuid], encode=False) - - messages = response[0] - args['timetoken'] = response[1] - - ## If it was a timeout - if not len(messages) : - continue - - ## Run user Callback and Reconnect if user permits. - for message in messages : - if not callback(message) : - return - - except Exception: - time.sleep(1) - - return True - - 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']) - - ## Fail if bad input. - if not channel : - raise Exception('Missing Channel') - return False - - ## Get Presence Here Now - return self._request([ - 'v2','presence', - 'sub_key', self.subscribe_key, - 'channel', channel - ]); - - - 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 - - ## Get History - return self._request([ - 'history', - self.subscribe_key, - channel, - '0', - str(limit) - ]); - - - def time(self) : - """ - #** - #* Time - #* - #* Timestamp from PubNub Cloud. - #* - #* @return int timestamp. - #* - - ## PubNub Server Time Example - timestamp = pubnub.time() - print(timestamp) - - """ - return self._request([ - 'time', - '0' - ])[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 _request( self, request, origin = None, encode = True ) : - ## Build URL - url = (origin or self.origin) + '/' + "/".join( - encode and self._encode(request) or request - ) - - ## Send Request Expecting JSONP Response - try: - try: usock = urllib2.urlopen( url, None, 200 ) - except TypeError: usock = urllib2.urlopen( url, None ) - response = usock.read() - usock.close() - return json.loads( response ) - except: - return None - diff --git a/python/3.2/history-example.py b/python/3.2/history-example.py deleted file mode 100755 index cedf69e..0000000 --- a/python/3.2/history-example.py +++ /dev/null @@ -1,12 +0,0 @@ -from Pubnub import Pubnub - -## Initiat Class -pubnub = Pubnub( 'demo', 'demo', None, False ) - -## History Example -history = pubnub.history({ - 'channel' : 'hello_world', - 'limit' : 1 -}) -print(history) - diff --git a/python/3.2/publish-example.py b/python/3.2/publish-example.py deleted file mode 100755 index 725df0b..0000000 --- a/python/3.2/publish-example.py +++ /dev/null @@ -1,14 +0,0 @@ -from Pubnub import Pubnub - -## Initiate Class -pubnub = Pubnub( 'demo', 'demo', None, False ) - -## Publish Example -info = pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { - 'some_text' : 'Hello my World' - } -}) -print(info) - diff --git a/python/3.2/subscribe-example.py b/python/3.2/subscribe-example.py deleted file mode 100755 index e458e2b..0000000 --- a/python/3.2/subscribe-example.py +++ /dev/null @@ -1,64 +0,0 @@ -import sys -import threading -import time -import random -import string -from Pubnub import Pubnub - -## Initiate Class -pubnub = Pubnub( 'demo', 'demo', None, False ) - -print("My UUID is: "+pubnub.uuid) - -channel = ''.join(random.choice(string.ascii_letters + string.digits) for x in range(20)) - -## Subscribe Example -def receive(message) : - print(message) - return False - -def pres_event(message): - print(message) - return False - -def subscribe(): - print("Listening for messages on '%s' channel..." % channel) - pubnub.subscribe({ - 'channel' : channel, - 'callback' : receive - }) - -def presence(): - print("Listening for presence events on '%s' channel..." % channel) - pubnub.presence({ - 'channel' : channel, - 'callback' : pres_event - }) - -def publish(): - print("Publishing a test message on '%s' channel..." % channel) - pubnub.publish({ - 'channel' : channel, - 'message' : { 'text':'foo bar' } - }) - -pres_thread = threading.Thread(target=presence) -pres_thread.daemon=True -pres_thread.start() - -sub_thread = threading.Thread(target=subscribe) -sub_thread.daemon=True -sub_thread.start() - -time.sleep(3) - -publish() - - -print("waiting for subscribes and presence") -pres_thread.join() - -print pubnub.here_now({'channel':channel}) - -sub_thread.join() - diff --git a/python/3.2/unit-test.py b/python/3.2/unit-test.py deleted file mode 100755 index 88391a0..0000000 --- a/python/3.2/unit-test.py +++ /dev/null @@ -1,77 +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.0 Real-time Push Cloud API -## ----------------------------------- - -from Pubnub import Pubnub -import sys - -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 -ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False - - -## ----------------------------------------------------------------------- -## Initiat Class -## ----------------------------------------------------------------------- - -pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on ) -crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' - -## --------------------------------------------------------------------------- -## Unit Test Function -## --------------------------------------------------------------------------- -def test( trial, name ) : - if trial : - print( 'PASS: ' + name ) - else : - print( 'FAIL: ' + name ) - -## ----------------------------------------------------------------------- -## Publish Example -## ----------------------------------------------------------------------- -pubish_success = pubnub.publish({ - 'channel' : crazy, - 'message' : crazy -}) -test( pubish_success[0] == 1, 'Publish First Message Success' ) - -## ----------------------------------------------------------------------- -## History Example -## ----------------------------------------------------------------------- -history = pubnub.history({ - 'channel' : crazy, - 'limit' : 1 -}) -test( - history[0].encode('utf-8') == crazy, - 'History Message: ' + history[0] -) -test( len(history) == 1, 'History Message Count' ) - -## ----------------------------------------------------------------------- -## PubNub Server Time Example -## ----------------------------------------------------------------------- -timestamp = pubnub.time() -test( timestamp > 0, 'PubNub Server Time: ' + str(timestamp) ) - -## ----------------------------------------------------------------------- -## Subscribe Example -## ----------------------------------------------------------------------- -def receive(message) : - print(message) - return True - -pubnub.subscribe({ - 'channel' : crazy, - 'callback' : receive -}) - - diff --git a/python/3.3/Pubnub.py b/python/3.3/Pubnub.py deleted file mode 100644 index e806f9b..0000000 --- a/python/3.3/Pubnub.py +++ /dev/null @@ -1,57 +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.0 Real-time Push Cloud API -## ----------------------------------- - -try: import json -except ImportError: import simplejson as json -import sys -import time -import hashlib -import urllib2 -import uuid -from PubnubCore import PubnubCore - -class Pubnub(PubnubCore): - def __init__( - self, - publish_key, - subscribe_key, - secret_key = False, - cipher_key = False, - ssl_on = False, - origin = 'pubsub.pubnub.com', - pres_uuid = None - ) : - 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, - uuid = pres_uuid - ) - - def _request( self, request, callback = None ) : - ## Build URL - url = self.getUrl(request) - - ## Send Request Expecting JSONP Response - try: - try: usock = urllib2.urlopen( url, None, 200 ) - except TypeError: usock = urllib2.urlopen( url, None ) - response = usock.read() - usock.close() - if (callback): - callback(json.loads(response)) - else: - return json.loads( response ) - except: - return None diff --git a/python/3.3/detailed-history-unit-test.py b/python/3.3/detailed-history-unit-test.py deleted file mode 100755 index 2169e52..0000000 --- a/python/3.3/detailed-history-unit-test.py +++ /dev/null @@ -1,134 +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.0 Real-time Push Cloud API -## ----------------------------------- - -from Pubnub import Pubnub -import unittest2 as unittest -import sys - - -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 -ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False -pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on) -crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' - - -class TestDetailedHistory(unittest.TestCase): - total_msg = 10 - channel = pubnub.time() - starttime = None - inputs = [] - endtime = None - slice_a = 8 - slice_b = 2 - slice_size = slice_a - slice_b - - @classmethod - def publish_msg(cls, start, end, offset): - print 'Publishing messages' - inputs = [] - for i in range(start + offset, end + offset): - message = str(i) + " " + crazy - success = pubnub.publish({ - 'channel': cls.channel, - 'message': message, - }) - t = pubnub.time() - inputs.append({'timestamp': t, 'message': message}) - print 'Message # ', i, ' published' - return inputs - - @classmethod - def setUpClass(cls): - print 'Setting up context for Detailed History tests. Please wait ...' - cls.starttime = pubnub.time() - cls.inputs = cls.inputs + cls.publish_msg(0, cls.total_msg / 2, 0) - cls.midtime = pubnub.time() - cls.inputs = cls.inputs + cls.publish_msg( - 0, cls.total_msg / 2, cls.total_msg / 2) - cls.endtime = pubnub.time() - print 'Context setup for Detailed History tests. Now running tests' - - def test_begin_to_end_count(self): - count = 5 - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.starttime, - 'end': self.__class__.endtime, - 'count': count - })[0] - self.assertTrue(len(history) == count and history[-1].encode( - 'utf-8') == self.__class__.inputs[count - 1]['message']) - - def test_end_to_begin_count(self): - count = 5 - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.endtime, - 'end': self.__class__.starttime, - 'count': count - })[0] - self.assertTrue(len(history) == count and history[-1] - .encode('utf-8') == self.__class__.inputs[-1]['message']) - - def test_start_reverse_true(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.midtime, - 'reverse': True - })[0] - self.assertTrue(len(history) == self.__class__.total_msg / 2) - expected_msg = self.__class__.inputs[-1]['message'] - self.assertTrue(history[-1].encode('utf-8') == expected_msg) - - def test_start_reverse_false(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.midtime, - })[0] - self.assertTrue(history[0].encode('utf-8') - == self.__class__.inputs[0]['message']) - - def test_end_reverse_true(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'end': self.__class__.midtime, - 'reverse': True - })[0] - self.assertTrue(history[0].encode('utf-8') - == self.__class__.inputs[0]['message']) - - def test_end_reverse_false(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'end': self.__class__.midtime, - })[0] - self.assertTrue(len(history) == self.__class__.total_msg / 2) - self.assertTrue(history[-1].encode('utf-8') - == self.__class__.inputs[-1]['message']) - - def test_count(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'count': 5 - })[0] - self.assertTrue(len(history) == 5) - - def test_count_zero(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'count': 0 - })[0] - self.assertTrue(len(history) == 0) - -if __name__ == '__main__': - unittest.main() diff --git a/python/3.3/here-now-example.py b/python/3.3/here-now-example.py deleted file mode 100644 index 261500a..0000000 --- a/python/3.3/here-now-example.py +++ /dev/null @@ -1,33 +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 -## ----------------------------------- - -import sys -from twisted.internet import reactor -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=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -crazy = 'hello_world' - - -print pubnub.here_now( { - 'channel' : crazy -}) - diff --git a/python/3.3/history-example.py b/python/3.3/history-example.py deleted file mode 100755 index cedf69e..0000000 --- a/python/3.3/history-example.py +++ /dev/null @@ -1,12 +0,0 @@ -from Pubnub import Pubnub - -## Initiat Class -pubnub = Pubnub( 'demo', 'demo', None, False ) - -## History Example -history = pubnub.history({ - 'channel' : 'hello_world', - 'limit' : 1 -}) -print(history) - diff --git a/python/3.3/publish-example.py b/python/3.3/publish-example.py deleted file mode 100755 index c97034b..0000000 --- a/python/3.3/publish-example.py +++ /dev/null @@ -1,14 +0,0 @@ -from Pubnub import Pubnub - -## Initiate Class -pubnub = Pubnub( publish_key='demo', subscribe_key='demo', ssl_on=False ) - -## Publish Example -info = pubnub.publish({ - 'channel' : 'hello_world', - 'message' : { - 'some_text' : 'Hello my World' - } -}) -print(info) - diff --git a/python/3.3/subscribe-example.py b/python/3.3/subscribe-example.py deleted file mode 100755 index e458e2b..0000000 --- a/python/3.3/subscribe-example.py +++ /dev/null @@ -1,64 +0,0 @@ -import sys -import threading -import time -import random -import string -from Pubnub import Pubnub - -## Initiate Class -pubnub = Pubnub( 'demo', 'demo', None, False ) - -print("My UUID is: "+pubnub.uuid) - -channel = ''.join(random.choice(string.ascii_letters + string.digits) for x in range(20)) - -## Subscribe Example -def receive(message) : - print(message) - return False - -def pres_event(message): - print(message) - return False - -def subscribe(): - print("Listening for messages on '%s' channel..." % channel) - pubnub.subscribe({ - 'channel' : channel, - 'callback' : receive - }) - -def presence(): - print("Listening for presence events on '%s' channel..." % channel) - pubnub.presence({ - 'channel' : channel, - 'callback' : pres_event - }) - -def publish(): - print("Publishing a test message on '%s' channel..." % channel) - pubnub.publish({ - 'channel' : channel, - 'message' : { 'text':'foo bar' } - }) - -pres_thread = threading.Thread(target=presence) -pres_thread.daemon=True -pres_thread.start() - -sub_thread = threading.Thread(target=subscribe) -sub_thread.daemon=True -sub_thread.start() - -time.sleep(3) - -publish() - - -print("waiting for subscribes and presence") -pres_thread.join() - -print pubnub.here_now({'channel':channel}) - -sub_thread.join() - diff --git a/python/3.3/unit-test.py b/python/3.3/unit-test.py deleted file mode 100755 index 88391a0..0000000 --- a/python/3.3/unit-test.py +++ /dev/null @@ -1,77 +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.0 Real-time Push Cloud API -## ----------------------------------- - -from Pubnub import Pubnub -import sys - -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 -ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False - - -## ----------------------------------------------------------------------- -## Initiat Class -## ----------------------------------------------------------------------- - -pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on ) -crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' - -## --------------------------------------------------------------------------- -## Unit Test Function -## --------------------------------------------------------------------------- -def test( trial, name ) : - if trial : - print( 'PASS: ' + name ) - else : - print( 'FAIL: ' + name ) - -## ----------------------------------------------------------------------- -## Publish Example -## ----------------------------------------------------------------------- -pubish_success = pubnub.publish({ - 'channel' : crazy, - 'message' : crazy -}) -test( pubish_success[0] == 1, 'Publish First Message Success' ) - -## ----------------------------------------------------------------------- -## History Example -## ----------------------------------------------------------------------- -history = pubnub.history({ - 'channel' : crazy, - 'limit' : 1 -}) -test( - history[0].encode('utf-8') == crazy, - 'History Message: ' + history[0] -) -test( len(history) == 1, 'History Message Count' ) - -## ----------------------------------------------------------------------- -## PubNub Server Time Example -## ----------------------------------------------------------------------- -timestamp = pubnub.time() -test( timestamp > 0, 'PubNub Server Time: ' + str(timestamp) ) - -## ----------------------------------------------------------------------- -## Subscribe Example -## ----------------------------------------------------------------------- -def receive(message) : - print(message) - return True - -pubnub.subscribe({ - 'channel' : crazy, - 'callback' : receive -}) - - diff --git a/python/Pubnub.py b/python/Pubnub.py new file mode 100644 index 0000000..e806f9b --- /dev/null +++ b/python/Pubnub.py @@ -0,0 +1,57 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +try: import json +except ImportError: import simplejson as json +import sys +import time +import hashlib +import urllib2 +import uuid +from PubnubCore import PubnubCore + +class Pubnub(PubnubCore): + def __init__( + self, + publish_key, + subscribe_key, + secret_key = False, + cipher_key = False, + ssl_on = False, + origin = 'pubsub.pubnub.com', + pres_uuid = None + ) : + 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, + uuid = pres_uuid + ) + + def _request( self, request, callback = None ) : + ## Build URL + url = self.getUrl(request) + + ## Send Request Expecting JSONP Response + try: + try: usock = urllib2.urlopen( url, None, 200 ) + except TypeError: usock = urllib2.urlopen( url, None ) + response = usock.read() + usock.close() + if (callback): + callback(json.loads(response)) + else: + return json.loads( response ) + except: + return None diff --git a/python/examples/detailed-history-unit-test.py b/python/examples/detailed-history-unit-test.py new file mode 100755 index 0000000..2169e52 --- /dev/null +++ b/python/examples/detailed-history-unit-test.py @@ -0,0 +1,134 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +from Pubnub import Pubnub +import unittest2 as unittest +import sys + + +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 +ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False +pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on) +crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' + + +class TestDetailedHistory(unittest.TestCase): + total_msg = 10 + channel = pubnub.time() + starttime = None + inputs = [] + endtime = None + slice_a = 8 + slice_b = 2 + slice_size = slice_a - slice_b + + @classmethod + def publish_msg(cls, start, end, offset): + print 'Publishing messages' + inputs = [] + for i in range(start + offset, end + offset): + message = str(i) + " " + crazy + success = pubnub.publish({ + 'channel': cls.channel, + 'message': message, + }) + t = pubnub.time() + inputs.append({'timestamp': t, 'message': message}) + print 'Message # ', i, ' published' + return inputs + + @classmethod + def setUpClass(cls): + print 'Setting up context for Detailed History tests. Please wait ...' + cls.starttime = pubnub.time() + cls.inputs = cls.inputs + cls.publish_msg(0, cls.total_msg / 2, 0) + cls.midtime = pubnub.time() + cls.inputs = cls.inputs + cls.publish_msg( + 0, cls.total_msg / 2, cls.total_msg / 2) + cls.endtime = pubnub.time() + print 'Context setup for Detailed History tests. Now running tests' + + def test_begin_to_end_count(self): + count = 5 + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.starttime, + 'end': self.__class__.endtime, + 'count': count + })[0] + self.assertTrue(len(history) == count and history[-1].encode( + 'utf-8') == self.__class__.inputs[count - 1]['message']) + + def test_end_to_begin_count(self): + count = 5 + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.endtime, + 'end': self.__class__.starttime, + 'count': count + })[0] + self.assertTrue(len(history) == count and history[-1] + .encode('utf-8') == self.__class__.inputs[-1]['message']) + + def test_start_reverse_true(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.midtime, + 'reverse': True + })[0] + self.assertTrue(len(history) == self.__class__.total_msg / 2) + expected_msg = self.__class__.inputs[-1]['message'] + self.assertTrue(history[-1].encode('utf-8') == expected_msg) + + def test_start_reverse_false(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.midtime, + })[0] + self.assertTrue(history[0].encode('utf-8') + == self.__class__.inputs[0]['message']) + + def test_end_reverse_true(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'end': self.__class__.midtime, + 'reverse': True + })[0] + self.assertTrue(history[0].encode('utf-8') + == self.__class__.inputs[0]['message']) + + def test_end_reverse_false(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'end': self.__class__.midtime, + })[0] + self.assertTrue(len(history) == self.__class__.total_msg / 2) + self.assertTrue(history[-1].encode('utf-8') + == self.__class__.inputs[-1]['message']) + + def test_count(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'count': 5 + })[0] + self.assertTrue(len(history) == 5) + + def test_count_zero(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'count': 0 + })[0] + self.assertTrue(len(history) == 0) + +if __name__ == '__main__': + unittest.main() diff --git a/python/examples/here-now-example.py b/python/examples/here-now-example.py new file mode 100644 index 0000000..261500a --- /dev/null +++ b/python/examples/here-now-example.py @@ -0,0 +1,33 @@ +## 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 +from twisted.internet import reactor +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=publish_key, subscribe_key=subscribe_key, + secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) +crazy = 'hello_world' + + +print pubnub.here_now( { + 'channel' : crazy +}) + diff --git a/python/examples/history-example.py b/python/examples/history-example.py new file mode 100755 index 0000000..cedf69e --- /dev/null +++ b/python/examples/history-example.py @@ -0,0 +1,12 @@ +from Pubnub import Pubnub + +## Initiat Class +pubnub = Pubnub( 'demo', 'demo', None, False ) + +## History Example +history = pubnub.history({ + 'channel' : 'hello_world', + 'limit' : 1 +}) +print(history) + diff --git a/python/examples/publish-example.py b/python/examples/publish-example.py new file mode 100755 index 0000000..c97034b --- /dev/null +++ b/python/examples/publish-example.py @@ -0,0 +1,14 @@ +from Pubnub import Pubnub + +## Initiate Class +pubnub = Pubnub( publish_key='demo', subscribe_key='demo', ssl_on=False ) + +## Publish Example +info = pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { + 'some_text' : 'Hello my World' + } +}) +print(info) + diff --git a/python/examples/subscribe-example.py b/python/examples/subscribe-example.py new file mode 100755 index 0000000..e458e2b --- /dev/null +++ b/python/examples/subscribe-example.py @@ -0,0 +1,64 @@ +import sys +import threading +import time +import random +import string +from Pubnub import Pubnub + +## Initiate Class +pubnub = Pubnub( 'demo', 'demo', None, False ) + +print("My UUID is: "+pubnub.uuid) + +channel = ''.join(random.choice(string.ascii_letters + string.digits) for x in range(20)) + +## Subscribe Example +def receive(message) : + print(message) + return False + +def pres_event(message): + print(message) + return False + +def subscribe(): + print("Listening for messages on '%s' channel..." % channel) + pubnub.subscribe({ + 'channel' : channel, + 'callback' : receive + }) + +def presence(): + print("Listening for presence events on '%s' channel..." % channel) + pubnub.presence({ + 'channel' : channel, + 'callback' : pres_event + }) + +def publish(): + print("Publishing a test message on '%s' channel..." % channel) + pubnub.publish({ + 'channel' : channel, + 'message' : { 'text':'foo bar' } + }) + +pres_thread = threading.Thread(target=presence) +pres_thread.daemon=True +pres_thread.start() + +sub_thread = threading.Thread(target=subscribe) +sub_thread.daemon=True +sub_thread.start() + +time.sleep(3) + +publish() + + +print("waiting for subscribes and presence") +pres_thread.join() + +print pubnub.here_now({'channel':channel}) + +sub_thread.join() + diff --git a/python/tests/unit-test.py b/python/tests/unit-test.py new file mode 100755 index 0000000..88391a0 --- /dev/null +++ b/python/tests/unit-test.py @@ -0,0 +1,77 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +from Pubnub import Pubnub +import sys + +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 +ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False + + +## ----------------------------------------------------------------------- +## Initiat Class +## ----------------------------------------------------------------------- + +pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on ) +crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' + +## --------------------------------------------------------------------------- +## Unit Test Function +## --------------------------------------------------------------------------- +def test( trial, name ) : + if trial : + print( 'PASS: ' + name ) + else : + print( 'FAIL: ' + name ) + +## ----------------------------------------------------------------------- +## Publish Example +## ----------------------------------------------------------------------- +pubish_success = pubnub.publish({ + 'channel' : crazy, + 'message' : crazy +}) +test( pubish_success[0] == 1, 'Publish First Message Success' ) + +## ----------------------------------------------------------------------- +## History Example +## ----------------------------------------------------------------------- +history = pubnub.history({ + 'channel' : crazy, + 'limit' : 1 +}) +test( + history[0].encode('utf-8') == crazy, + 'History Message: ' + history[0] +) +test( len(history) == 1, 'History Message Count' ) + +## ----------------------------------------------------------------------- +## PubNub Server Time Example +## ----------------------------------------------------------------------- +timestamp = pubnub.time() +test( timestamp > 0, 'PubNub Server Time: ' + str(timestamp) ) + +## ----------------------------------------------------------------------- +## Subscribe Example +## ----------------------------------------------------------------------- +def receive(message) : + print(message) + return True + +pubnub.subscribe({ + 'channel' : crazy, + 'callback' : receive +}) + + -- cgit v1.2.3 From a7f8ca862adfc012ca7c593f1305101de8e73d3c Mon Sep 17 00:00:00 2001 From: Devendra Date: Fri, 5 Jul 2013 22:27:05 +0530 Subject: changed version in python files --- common/PubnubBase.py | 2 +- common/PubnubCore.py | 2 +- common/PubnubCoreAsync.py | 2 +- common/PubnubCrypto.py | 2 +- python-tornado/Pubnub.py | 2 +- python-twisted/Pubnub.py | 2 +- python/Pubnub.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/PubnubBase.py b/common/PubnubBase.py index 07dd27f..0691a87 100644 --- a/common/PubnubBase.py +++ b/common/PubnubBase.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.0 Real-time Push Cloud API +## PubNub 3.3.2 Real-time Push Cloud API ## ----------------------------------- try: import json diff --git a/common/PubnubCore.py b/common/PubnubCore.py index 4bf143b..9b32de7 100644 --- a/common/PubnubCore.py +++ b/common/PubnubCore.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.0 Real-time Push Cloud API +## PubNub 3.3.2 Real-time Push Cloud API ## ----------------------------------- try: import json diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py index 9c53c6e..9dcad4b 100644 --- a/common/PubnubCoreAsync.py +++ b/common/PubnubCoreAsync.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.1 Real-time Push Cloud API +## PubNub 3.3.2 Real-time Push Cloud API ## ----------------------------------- import sys import json diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py index b7a57a1..b452765 100644 --- a/common/PubnubCrypto.py +++ b/common/PubnubCrypto.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.1 Real-time Push Cloud API +## PubNub 3.3.2 Real-time Push Cloud API ## ----------------------------------- from Crypto.Cipher import AES diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index eba2a0f..0d78a86 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.1 Real-time Push Cloud API +## PubNub 3.3.2 Real-time Push Cloud API ## ----------------------------------- import sys from PubnubCoreAsync import PubnubCoreAsync diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index b0541c9..247c4ff 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.1 Real-time Push Cloud API +## PubNub 3.3.2 Real-time Push Cloud API ## ----------------------------------- import sys import json diff --git a/python/Pubnub.py b/python/Pubnub.py index e806f9b..6143b0b 100644 --- a/python/Pubnub.py +++ b/python/Pubnub.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.0 Real-time Push Cloud API +## PubNub 3.3.2 Real-time Push Cloud API ## ----------------------------------- try: import json -- cgit v1.2.3 From dd2e5481c7b0f96d8caae5a613db0c407711999d Mon Sep 17 00:00:00 2001 From: Devendra Date: Fri, 5 Jul 2013 22:34:00 +0530 Subject: adding change_version script and VERSION file --- VERSION | 1 + change_version.sh | 1 + 2 files changed, 2 insertions(+) create mode 100644 VERSION create mode 100644 change_version.sh diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..4772543 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3.3.2 diff --git a/change_version.sh b/change_version.sh new file mode 100644 index 0000000..5ea7a63 --- /dev/null +++ b/change_version.sh @@ -0,0 +1 @@ +find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ `cat VERSION`/g" -- cgit v1.2.3 From e65cc45e333cc33d19b97b5f93e69121ca2beffa Mon Sep 17 00:00:00 2001 From: Devendra Date: Wed, 10 Jul 2013 10:39:58 +0530 Subject: adding makefiles for version updates --- Makefile | 19 ++++ Makefile.inc | 3 + VERSION | 2 +- common/Makefile | 16 +++ common/PubnubBase.py | 20 ++-- common/PubnubCoreAsync.py | 9 ++ python-tornado/Makefile | 17 ++++ python-tornado/Pubnub.py | 1 - python-tornado/tests/benchmark.py | 2 + python-tornado/tests/unit-test.py | 2 + python-twisted/Makefile | 18 ++++ python-twisted/Pubnub.py | 1 - python-twisted/tests/unit-test-full.py | 2 + python-twisted/tests/unit-test.py | 15 ++- python/Makefile | 19 ++++ python/Pubnub.py | 2 +- python/examples/detailed-history-unit-test.py | 134 ------------------------- python/tests/detailed-history-unit-test.py | 137 ++++++++++++++++++++++++++ python/tests/unit-test.py | 25 ++--- 19 files changed, 275 insertions(+), 169 deletions(-) create mode 100644 Makefile create mode 100644 Makefile.inc create mode 100644 common/Makefile create mode 100644 python-tornado/Makefile create mode 100644 python-twisted/Makefile create mode 100644 python/Makefile delete mode 100755 python/examples/detailed-history-unit-test.py create mode 100755 python/tests/detailed-history-unit-test.py diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..dbe0d95 --- /dev/null +++ b/Makefile @@ -0,0 +1,19 @@ +SUBDIRS = common python python-twisted python-tornado + +.PHONY: all +all: + for dir in $(SUBDIRS); do \ + $(MAKE) -C $$dir; \ + done + +.PHONY: clean +clean: + for dir in $(SUBDIRS); do \ + $(MAKE) clean -C $$dir; \ + done + +.PHONY: test +test: + for dir in $(SUBDIRS); do \ + $(MAKE) test -C $$dir; \ + done diff --git a/Makefile.inc b/Makefile.inc new file mode 100644 index 0000000..68a78c6 --- /dev/null +++ b/Makefile.inc @@ -0,0 +1,3 @@ +REPOS_DIR=.. +VERSION=$(shell cat $(REPOS_DIR)/VERSION) +ECHO=/bin/echo diff --git a/VERSION b/VERSION index 4772543..a0891f5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.2 +3.3.4 diff --git a/common/Makefile b/common/Makefile new file mode 100644 index 0000000..1be6f8c --- /dev/null +++ b/common/Makefile @@ -0,0 +1,16 @@ +include ../Makefile.inc + + +.PHONY: all +all: build + +.PHONY: build +build: + find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g" + + +.PHONY: clean +clean: + +.PHONY: test +test: diff --git a/common/PubnubBase.py b/common/PubnubBase.py index 0691a87..b5da9fa 100644 --- a/common/PubnubBase.py +++ b/common/PubnubBase.py @@ -319,22 +319,22 @@ class PubnubBase(object): ## Capture User Input channel = str(args['channel']) - params = [] + params = dict() count = 100 if args.has_key('count'): count = int(args['count']) - params.append('count' + '=' + str(count)) + params['count'] = str(count) if args.has_key('reverse'): - params.append('reverse' + '=' + str(args['reverse']).lower()) + params['reverse'] = str(args['reverse']).lower() if args.has_key('start'): - params.append('start' + '=' + str(args['start'])) + params['start'] = str(args['start']) if args.has_key('end'): - params.append('end' + '=' + str(args['end'])) + params['end'] = str(args['end']) ## Fail if bad input. if not channel : @@ -348,14 +348,14 @@ class PubnubBase(object): callback = None ## Get History - return self._request([ + return self._request({ 'urlcomponents' : [ 'v2', 'history', 'sub-key', self.subscribe_key, 'channel', channel, - ],params=params , callback=callback); + ],'urlparams' : params }, callback=callback); def time(self, args = None) : """ @@ -377,10 +377,10 @@ class PubnubBase(object): callback = args['callback'] else : callback = None - time = self._request([ + time = self._request({'urlcomponents' : [ 'time', '0' - ], callback) + ]}, callback) if time != None: return time[0] @@ -400,5 +400,5 @@ class PubnubBase(object): 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"].items()]) + url = url + '?' + "&".join([ x + "=" + y for x,y in request["urlparams"].iteritems()]) return url diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py index 9dcad4b..5b8d130 100644 --- a/common/PubnubCoreAsync.py +++ b/common/PubnubCoreAsync.py @@ -188,3 +188,12 @@ class PubnubCoreAsync(PubnubBase): ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) _subscribe() + def unsubscribe( self, args ): + channel = str(args['channel']) + if not (channel in self.subscriptions): + return False + + ## DISCONNECT + self.subscriptions[channel]['connected'] = 0 + self.subscriptions[channel]['timetoken'] = 0 + self.subscriptions[channel]['first'] = False diff --git a/python-tornado/Makefile b/python-tornado/Makefile new file mode 100644 index 0000000..2c33cf3 --- /dev/null +++ b/python-tornado/Makefile @@ -0,0 +1,17 @@ +include ../Makefile.inc + + +.PHONY: all +all: build + +.PHONY: build +build: + find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g" + + +.PHONY: clean +clean: + +.PHONY: test +test: + diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index 0d78a86..55ca7ca 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -63,7 +63,6 @@ class Pubnub(PubnubCoreAsync): def _request( self, request, callback ) : url = self.getUrl(request) - print url ## Send Request Expecting JSON Response #print self.headers request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=310, request_timeout=310 ) 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 index f593d11..c5940af 100644 --- a/python-tornado/tests/unit-test.py +++ b/python-tornado/tests/unit-test.py @@ -19,6 +19,8 @@ import sys 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-twisted/Makefile b/python-twisted/Makefile new file mode 100644 index 0000000..4cd9305 --- /dev/null +++ b/python-twisted/Makefile @@ -0,0 +1,18 @@ +include ../Makefile.inc + + +.PHONY: all +all: build + +.PHONY: build +build: + find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g" + + +.PHONY: clean +clean: + +.PHONY: test +test: + python tests/unit-test.py + diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index 247c4ff..e317a9c 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -81,7 +81,6 @@ class Pubnub(PubnubCoreAsync): contextFactory = WebClientContextFactory(), pool = self.ssl and None or pnconn_pool )), [('gzip', GzipDecoder)]) - print url request = agent.request( 'GET', url, Headers(self.headers), None ) def received(response): diff --git a/python-twisted/tests/unit-test-full.py b/python-twisted/tests/unit-test-full.py index f593d11..c5940af 100644 --- a/python-twisted/tests/unit-test-full.py +++ b/python-twisted/tests/unit-test-full.py @@ -19,6 +19,8 @@ import sys 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-twisted/tests/unit-test.py b/python-twisted/tests/unit-test.py index 843f939..ed7fcd5 100644 --- a/python-twisted/tests/unit-test.py +++ b/python-twisted/tests/unit-test.py @@ -11,6 +11,8 @@ import sys 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' @@ -23,7 +25,7 @@ ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False ## Initiat Class ## ----------------------------------------------------------------------- pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on ) -crazy = ' ~`!@#$%^&*( 顶顅 Ȓ)+=[]\\{}|;\':",./<>?abcd' +crazy = 'python-twisted-test-channel' ## --------------------------------------------------------------------------- ## Unit Test Function @@ -90,10 +92,17 @@ def message_received(message): 'callback' : dumpster }) + def connected() : + ch = crazy + def dump_message( msg): + print ch, msg + pubnub.unsubscribe({'channel':ch}) + pubnub.stop() pubnub.publish({ - 'channel' : crazy, - 'message' : { 'Info' : 'Connected!' } + 'channel' : ch, + 'message' : { 'Info' : 'Connected!' }, + 'callback' : dump_message }) pubnub.subscribe({ diff --git a/python/Makefile b/python/Makefile new file mode 100644 index 0000000..9551bb7 --- /dev/null +++ b/python/Makefile @@ -0,0 +1,19 @@ +include ../Makefile.inc + + +.PHONY: all +all: build + +.PHONY: build +build: + find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g" + + +.PHONY: clean +clean: + +.PHONY: test +test: + python tests/detailed-history-unit-test.py + python tests/unit-test.py + diff --git a/python/Pubnub.py b/python/Pubnub.py index 6143b0b..0a6d877 100644 --- a/python/Pubnub.py +++ b/python/Pubnub.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.3.2 Real-time Push Cloud API +## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- try: import json diff --git a/python/examples/detailed-history-unit-test.py b/python/examples/detailed-history-unit-test.py deleted file mode 100755 index 2169e52..0000000 --- a/python/examples/detailed-history-unit-test.py +++ /dev/null @@ -1,134 +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.0 Real-time Push Cloud API -## ----------------------------------- - -from Pubnub import Pubnub -import unittest2 as unittest -import sys - - -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 -ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False -pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on) -crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' - - -class TestDetailedHistory(unittest.TestCase): - total_msg = 10 - channel = pubnub.time() - starttime = None - inputs = [] - endtime = None - slice_a = 8 - slice_b = 2 - slice_size = slice_a - slice_b - - @classmethod - def publish_msg(cls, start, end, offset): - print 'Publishing messages' - inputs = [] - for i in range(start + offset, end + offset): - message = str(i) + " " + crazy - success = pubnub.publish({ - 'channel': cls.channel, - 'message': message, - }) - t = pubnub.time() - inputs.append({'timestamp': t, 'message': message}) - print 'Message # ', i, ' published' - return inputs - - @classmethod - def setUpClass(cls): - print 'Setting up context for Detailed History tests. Please wait ...' - cls.starttime = pubnub.time() - cls.inputs = cls.inputs + cls.publish_msg(0, cls.total_msg / 2, 0) - cls.midtime = pubnub.time() - cls.inputs = cls.inputs + cls.publish_msg( - 0, cls.total_msg / 2, cls.total_msg / 2) - cls.endtime = pubnub.time() - print 'Context setup for Detailed History tests. Now running tests' - - def test_begin_to_end_count(self): - count = 5 - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.starttime, - 'end': self.__class__.endtime, - 'count': count - })[0] - self.assertTrue(len(history) == count and history[-1].encode( - 'utf-8') == self.__class__.inputs[count - 1]['message']) - - def test_end_to_begin_count(self): - count = 5 - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.endtime, - 'end': self.__class__.starttime, - 'count': count - })[0] - self.assertTrue(len(history) == count and history[-1] - .encode('utf-8') == self.__class__.inputs[-1]['message']) - - def test_start_reverse_true(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.midtime, - 'reverse': True - })[0] - self.assertTrue(len(history) == self.__class__.total_msg / 2) - expected_msg = self.__class__.inputs[-1]['message'] - self.assertTrue(history[-1].encode('utf-8') == expected_msg) - - def test_start_reverse_false(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'start': self.__class__.midtime, - })[0] - self.assertTrue(history[0].encode('utf-8') - == self.__class__.inputs[0]['message']) - - def test_end_reverse_true(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'end': self.__class__.midtime, - 'reverse': True - })[0] - self.assertTrue(history[0].encode('utf-8') - == self.__class__.inputs[0]['message']) - - def test_end_reverse_false(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'end': self.__class__.midtime, - })[0] - self.assertTrue(len(history) == self.__class__.total_msg / 2) - self.assertTrue(history[-1].encode('utf-8') - == self.__class__.inputs[-1]['message']) - - def test_count(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'count': 5 - })[0] - self.assertTrue(len(history) == 5) - - def test_count_zero(self): - history = pubnub.detailedHistory({ - 'channel': self.__class__.channel, - 'count': 0 - })[0] - self.assertTrue(len(history) == 0) - -if __name__ == '__main__': - unittest.main() diff --git a/python/tests/detailed-history-unit-test.py b/python/tests/detailed-history-unit-test.py new file mode 100755 index 0000000..31bdef8 --- /dev/null +++ b/python/tests/detailed-history-unit-test.py @@ -0,0 +1,137 @@ +## 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.0 Real-time Push Cloud API +## ----------------------------------- + +import sys +sys.path.append('.') +sys.path.append('..') +sys.path.append('../common') +from Pubnub import Pubnub +import unittest2 as unittest + + +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 +ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False +pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on) +crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' + + +class TestDetailedHistory(unittest.TestCase): + total_msg = 10 + channel = pubnub.time() + starttime = None + inputs = [] + endtime = None + slice_a = 8 + slice_b = 2 + slice_size = slice_a - slice_b + + @classmethod + def publish_msg(cls, start, end, offset): + print 'Publishing messages' + inputs = [] + for i in range(start + offset, end + offset): + message = str(i) + " " + crazy + success = pubnub.publish({ + 'channel': cls.channel, + 'message': message, + }) + t = pubnub.time() + inputs.append({'timestamp': t, 'message': message}) + print 'Message # ', i, ' published' + return inputs + + @classmethod + def setUpClass(cls): + print 'Setting up context for Detailed History tests. Please wait ...' + cls.starttime = pubnub.time() + cls.inputs = cls.inputs + cls.publish_msg(0, cls.total_msg / 2, 0) + cls.midtime = pubnub.time() + cls.inputs = cls.inputs + cls.publish_msg( + 0, cls.total_msg / 2, cls.total_msg / 2) + cls.endtime = pubnub.time() + print 'Context setup for Detailed History tests. Now running tests' + + def test_begin_to_end_count(self): + count = 5 + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.starttime, + 'end': self.__class__.endtime, + 'count': count + })[0] + self.assertTrue(len(history) == count and history[-1].encode( + 'utf-8') == self.__class__.inputs[count - 1]['message']) + + def test_end_to_begin_count(self): + count = 5 + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.endtime, + 'end': self.__class__.starttime, + 'count': count + })[0] + self.assertTrue(len(history) == count and history[-1] + .encode('utf-8') == self.__class__.inputs[-1]['message']) + + def test_start_reverse_true(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.midtime, + 'reverse': True + })[0] + self.assertTrue(len(history) == self.__class__.total_msg / 2) + expected_msg = self.__class__.inputs[-1]['message'] + self.assertTrue(history[-1].encode('utf-8') == expected_msg) + + def test_start_reverse_false(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'start': self.__class__.midtime, + })[0] + self.assertTrue(history[0].encode('utf-8') + == self.__class__.inputs[0]['message']) + + def test_end_reverse_true(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'end': self.__class__.midtime, + 'reverse': True + })[0] + self.assertTrue(history[0].encode('utf-8') + == self.__class__.inputs[0]['message']) + + def test_end_reverse_false(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'end': self.__class__.midtime, + })[0] + self.assertTrue(len(history) == self.__class__.total_msg / 2) + self.assertTrue(history[-1].encode('utf-8') + == self.__class__.inputs[-1]['message']) + + def test_count(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'count': 5 + })[0] + self.assertTrue(len(history) == 5) + + def test_count_zero(self): + history = pubnub.detailedHistory({ + 'channel': self.__class__.channel, + 'count': 0 + })[0] + self.assertTrue(len(history) == 0) + +if __name__ == '__main__': + unittest.main() diff --git a/python/tests/unit-test.py b/python/tests/unit-test.py index 88391a0..1737ace 100755 --- a/python/tests/unit-test.py +++ b/python/tests/unit-test.py @@ -9,8 +9,11 @@ ## PubNub 3.0 Real-time Push Cloud API ## ----------------------------------- -from Pubnub import Pubnub import sys +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' @@ -23,7 +26,7 @@ ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False ## ----------------------------------------------------------------------- pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on ) -crazy = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' +crazy = 'demo' ## --------------------------------------------------------------------------- ## Unit Test Function @@ -37,11 +40,11 @@ def test( trial, name ) : ## ----------------------------------------------------------------------- ## Publish Example ## ----------------------------------------------------------------------- -pubish_success = pubnub.publish({ +publish_success = pubnub.publish({ 'channel' : crazy, 'message' : crazy }) -test( pubish_success[0] == 1, 'Publish First Message Success' ) +test( publish_success[0] == 1, 'Publish First Message Success' ) ## ----------------------------------------------------------------------- ## History Example @@ -61,17 +64,3 @@ test( len(history) == 1, 'History Message Count' ) ## ----------------------------------------------------------------------- timestamp = pubnub.time() test( timestamp > 0, 'PubNub Server Time: ' + str(timestamp) ) - -## ----------------------------------------------------------------------- -## Subscribe Example -## ----------------------------------------------------------------------- -def receive(message) : - print(message) - return True - -pubnub.subscribe({ - 'channel' : crazy, - 'callback' : receive -}) - - -- cgit v1.2.3 From 523802043bf1ce3616d3bac382f166e34984d5bf Mon Sep 17 00:00:00 2001 From: Devendra Date: Fri, 12 Jul 2013 10:11:07 +0530 Subject: adding common test from tornado and twisted --- common/unit-test-async.py | 143 ++++++++++++++++++++++++ python-tornado/tests/unit-test.py | 226 -------------------------------------- python-twisted/tests/unit-test.py | 116 ------------------- 3 files changed, 143 insertions(+), 342 deletions(-) create mode 100644 common/unit-test-async.py delete mode 100644 python-tornado/tests/unit-test.py delete mode 100644 python-twisted/tests/unit-test.py diff --git a/common/unit-test-async.py b/common/unit-test-async.py new file mode 100644 index 0000000..258bf6a --- /dev/null +++ b/common/unit-test-async.py @@ -0,0 +1,143 @@ +## 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 time +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 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 + +## ----------------------------------------------------------------------- +## Initiat Class +## ----------------------------------------------------------------------- +pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on ) +crazy = 'python-async-test-channel' +expect = 0 +done = 0 +failures = 0 +passes = 0 + +def stop(): + global done + global count + pubnub.stop() + print "============================" + print 'Total\t:\t' , failures + passes + print 'PASS\t:\t' , passes + print 'FAIL\t:\t', failures + print "============================" + +## --------------------------------------------------------------------------- +## Unit Test Function +## --------------------------------------------------------------------------- +def test( trial, name ) : + global failures + global passes + global done + done += 1 + #print trial + if trial == False: + print 'FAIL : ', name + failures += 1 + else: + print 'PASS : ', name + passes += 1 + if done == expect: + stop() + +def test_publish(): + def publish_cb(messages): + test(messages[0] == 1, "Publish Test") + + pubnub.publish({ + 'channel' : crazy, + 'message' : {'one': 'Hello World! --> ɂ顶@#$%^&*()!', 'two': 'hello2'}, + 'callback' : publish_cb + }) + + +def test_history(): + def history_cb(messages): + test(len(messages) <= 1, "History Test") + pubnub.history({ + 'channel' : crazy, + 'limit' : 1, + 'callback' : history_cb + }) + + + +def test_subscribe(): + message = "Testing Subscribe" + def subscribe_connect_cb(): + def publish_cb(response): + test(response[0] == 1, 'Publish Test in subscribe Connect Callback') + pubnub.publish({ + 'channel' : crazy, + 'message' : message, + 'callback' : publish_cb + }) + def subscribe_cb(response): + print response + test(response == message , 'Subscribe Receive Test in subscribe Callback') + pubnub.subscribe({ + 'channel' : crazy, + 'connect' : subscribe_connect_cb, + 'callback': subscribe_cb + }) + + +def test_here_now(): + channel = crazy + '-here-now' + message = "Testing Subscribe" + def subscribe_connect_cb(): + def here_now_cb(response): + test(response["occupancy"] > 0, 'Here Now Test') + def publish_cb(response): + test(response[0] == 1, 'Here Now Test: Publish Test in subscribe Connect Callback') + pubnub.publish({ + 'channel' : channel, + 'message' : message, + 'callback' : publish_cb + }) + time.sleep(5) + pubnub.here_now({ + 'channel' : channel, + 'callback' : here_now_cb + }) + + + def subscribe_cb(response): + test(response == message , 'Here Now Test: Subscribe Receive Test in subscribe Callback') + pubnub.subscribe({ + 'channel' : channel, + 'connect' : subscribe_connect_cb, + 'callback': subscribe_cb + }) + +expect = 7 +test_publish() +test_history() +test_subscribe() +test_here_now() + + + +pubnub.start() +if failures > 0: + raise Exception('Fail', failures) diff --git a/python-tornado/tests/unit-test.py b/python-tornado/tests/unit-test.py deleted file mode 100644 index c5940af..0000000 --- a/python-tornado/tests/unit-test.py +++ /dev/null @@ -1,226 +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('../') -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 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-twisted/tests/unit-test.py b/python-twisted/tests/unit-test.py deleted file mode 100644 index ed7fcd5..0000000 --- a/python-twisted/tests/unit-test.py +++ /dev/null @@ -1,116 +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 -## ----------------------------------- - -import sys -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) -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -## ----------------------------------------------------------------------- -## Initiat Class -## ----------------------------------------------------------------------- -pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on ) -crazy = 'python-twisted-test-channel' - -## --------------------------------------------------------------------------- -## Unit Test Function -## --------------------------------------------------------------------------- -def test( trial, name ) : - if trial : - print( 'PASS: ' + name ) - else : - print( 'FAIL: ' + name ) - -## ----------------------------------------------------------------------- -## Time Example -## ----------------------------------------------------------------------- -def time_complete(timestamp): - print(timestamp) - -pubnub.time({ 'callback' : time_complete }) - -## ----------------------------------------------------------------------- -## History Example -## ----------------------------------------------------------------------- -def history_complete(messages): - print(messages) - -pubnub.history( { - 'channel' : crazy, - 'limit' : 10, - 'callback' : history_complete -}) - -## ----------------------------------------------------------------------- -## Publish Example -## ----------------------------------------------------------------------- -def publish_complete(info): - print(info) - -pubnub.publish({ - 'channel' : crazy, - 'message' : {'one': 'Hello World! --> ɂ顶@#$%^&*()!', 'two': 'hello2'}, - 'callback' : publish_complete -}) - -## ----------------------------------------------------------------------- -## Subscribe Example -## ----------------------------------------------------------------------- -def message_received(message): - print(message) - print('Disconnecting...') - pubnub.unsubscribe({ 'channel' : crazy }) - - def done() : - print('final connection, done :)') - pubnub.unsubscribe({ 'channel' : crazy }) - pubnub.stop() - - def dumpster(message) : - print('never see this') - print(message) - - print('reconnecting...') - pubnub.subscribe({ - 'channel' : crazy, - 'connect' : done, - 'callback' : dumpster - }) - - -def connected() : - ch = crazy - def dump_message( msg): - print ch, msg - pubnub.unsubscribe({'channel':ch}) - pubnub.stop() - pubnub.publish({ - 'channel' : ch, - 'message' : { 'Info' : 'Connected!' }, - 'callback' : dump_message - }) - -pubnub.subscribe({ - 'channel' : crazy, - 'connect' : connected, - 'callback' : message_received -}) -## ----------------------------------------------------------------------- -## IO Event Loop -## ----------------------------------------------------------------------- -pubnub.start() -- cgit v1.2.3 From 6616acbec40ac039b7bdabf7e8b3581e68c0b2cb Mon Sep 17 00:00:00 2001 From: Devendra Date: Fri, 12 Jul 2013 10:14:21 +0530 Subject: adding common test from tornado and twisted --- Makefile | 24 +++++++++--------------- common/PubnubBase.py | 2 +- common/PubnubCore.py | 2 +- common/PubnubCoreAsync.py | 13 ++++++------- common/PubnubCrypto.py | 2 +- common/unit-test-async.py | 1 - python-tornado/Makefile | 1 + python-tornado/Pubnub.py | 4 ++-- python-twisted/Makefile | 2 +- python-twisted/Pubnub.py | 5 ++--- 10 files changed, 24 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index dbe0d95..5a6fc63 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,13 @@ SUBDIRS = common python python-twisted python-tornado -.PHONY: all -all: - for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir; \ - done +.PHONY: all test +all test: $(SUBDIRS) -.PHONY: clean -clean: - for dir in $(SUBDIRS); do \ - $(MAKE) clean -C $$dir; \ - done +all: TARG=all +test: TARG=test -.PHONY: test -test: - for dir in $(SUBDIRS); do \ - $(MAKE) test -C $$dir; \ - done +$(SUBDIRS): force + @ $(MAKE) -C $@ $(TARG) + +.PHONY: force +force :; diff --git a/common/PubnubBase.py b/common/PubnubBase.py index b5da9fa..0c4efef 100644 --- a/common/PubnubBase.py +++ b/common/PubnubBase.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.3.2 Real-time Push Cloud API +## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- try: import json diff --git a/common/PubnubCore.py b/common/PubnubCore.py index 9b32de7..5965740 100644 --- a/common/PubnubCore.py +++ b/common/PubnubCore.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.3.2 Real-time Push Cloud API +## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- try: import json diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py index 5b8d130..8150bde 100644 --- a/common/PubnubCoreAsync.py +++ b/common/PubnubCoreAsync.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.3.2 Real-time Push Cloud API +## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- import sys import json @@ -142,16 +142,15 @@ class PubnubCoreAsync(PubnubBase): return def sub_callback(response): - print response - response = json.loads(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: diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py index b452765..b91e2d9 100644 --- a/common/PubnubCrypto.py +++ b/common/PubnubCrypto.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.3.2 Real-time Push Cloud API +## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- from Crypto.Cipher import AES diff --git a/common/unit-test-async.py b/common/unit-test-async.py index 258bf6a..89a828e 100644 --- a/common/unit-test-async.py +++ b/common/unit-test-async.py @@ -93,7 +93,6 @@ def test_subscribe(): 'callback' : publish_cb }) def subscribe_cb(response): - print response test(response == message , 'Subscribe Receive Test in subscribe Callback') pubnub.subscribe({ 'channel' : crazy, diff --git a/python-tornado/Makefile b/python-tornado/Makefile index 2c33cf3..13a5e5a 100644 --- a/python-tornado/Makefile +++ b/python-tornado/Makefile @@ -14,4 +14,5 @@ clean: .PHONY: test test: + python ../common/unit-test-async.py diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index 55ca7ca..f22aecc 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.3.2 Real-time Push Cloud API +## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- import sys from PubnubCoreAsync import PubnubCoreAsync @@ -67,7 +67,7 @@ class Pubnub(PubnubCoreAsync): #print self.headers request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=310, request_timeout=310 ) def responseCallback(response): - callback(response._get_body()) + callback(eval(response._get_body())) self.http.fetch( request, diff --git a/python-twisted/Makefile b/python-twisted/Makefile index 4cd9305..13a5e5a 100644 --- a/python-twisted/Makefile +++ b/python-twisted/Makefile @@ -14,5 +14,5 @@ clean: .PHONY: test test: - python tests/unit-test.py + python ../common/unit-test-async.py diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index e317a9c..8b29236 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -6,7 +6,7 @@ ## http://www.pubnub.com/ ## ----------------------------------- -## PubNub 3.3.2 Real-time Push Cloud API +## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- import sys import json @@ -84,13 +84,12 @@ class Pubnub(PubnubCoreAsync): request = agent.request( 'GET', url, Headers(self.headers), None ) def received(response): - #print response finished = Deferred() response.deliverBody(PubNubResponse(finished)) return finished def complete(data): - callback(data) + callback(eval(data)) request.addCallback(received) request.addBoth(complete) -- cgit v1.2.3 From 2c77bdb1d0725d7203ce7ce94ec675de750974b0 Mon Sep 17 00:00:00 2001 From: Devendra Date: Fri, 12 Jul 2013 16:56:21 +0530 Subject: changing async unit tests to use separate channel for each test --- common/unit-test-async.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/common/unit-test-async.py b/common/unit-test-async.py index 89a828e..f95c759 100644 --- a/common/unit-test-async.py +++ b/common/unit-test-async.py @@ -11,6 +11,7 @@ import sys import time +import random sys.path.append('../') sys.path.append('./') sys.path.append('../common/') @@ -26,7 +27,7 @@ ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False ## Initiat Class ## ----------------------------------------------------------------------- pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on ) -crazy = 'python-async-test-channel' +ch = 'python-async-test-channel-' expect = 0 done = 0 failures = 0 @@ -61,21 +62,23 @@ def test( trial, name ) : stop() def test_publish(): + channel = ch + str(random.random()) def publish_cb(messages): test(messages[0] == 1, "Publish Test") pubnub.publish({ - 'channel' : crazy, + 'channel' : channel, 'message' : {'one': 'Hello World! --> ɂ顶@#$%^&*()!', 'two': 'hello2'}, 'callback' : publish_cb }) def test_history(): + channel = ch + str(random.random()) def history_cb(messages): test(len(messages) <= 1, "History Test") pubnub.history({ - 'channel' : crazy, + 'channel' : channel, 'limit' : 1, 'callback' : history_cb }) @@ -83,26 +86,27 @@ def test_history(): def test_subscribe(): - message = "Testing Subscribe" + message = "Testing Subscribe " + str(random.random()) + channel = ch + str(random.random()) def subscribe_connect_cb(): def publish_cb(response): test(response[0] == 1, 'Publish Test in subscribe Connect Callback') pubnub.publish({ - 'channel' : crazy, - 'message' : message, + 'channel' : channel, + 'message' : message, 'callback' : publish_cb }) def subscribe_cb(response): test(response == message , 'Subscribe Receive Test in subscribe Callback') pubnub.subscribe({ - 'channel' : crazy, + 'channel' : channel, 'connect' : subscribe_connect_cb, 'callback': subscribe_cb }) def test_here_now(): - channel = crazy + '-here-now' + channel = ch + str(random.random()) message = "Testing Subscribe" def subscribe_connect_cb(): def here_now_cb(response): @@ -110,8 +114,8 @@ def test_here_now(): def publish_cb(response): test(response[0] == 1, 'Here Now Test: Publish Test in subscribe Connect Callback') pubnub.publish({ - 'channel' : channel, - 'message' : message, + 'channel' : channel, + 'message' : message, 'callback' : publish_cb }) time.sleep(5) -- cgit v1.2.3 From 09d6ea1fa20f87dc648740ffb2a70f67e7e4efa9 Mon Sep 17 00:00:00 2001 From: Devendra Date: Wed, 25 Sep 2013 13:51:19 +0530 Subject: combining into Pubnub.py, added common async unit test method --- Makefile | 6 + common/LICENSE_HEADER | 10 + common/PubnubBase.py | 12 - common/PubnubCore.py | 20 - common/PubnubCoreAsync.py | 18 - common/PubnubCrypto.py | 12 - common/PubnubUnitTest.py | 36 ++ python-tornado/Makefile | 12 +- python-tornado/Pubnub.py | 663 ++++++++++++++++++++++++++++++++- python-tornado/tests/unit-tests.py | 73 ++++ python-tornado/unassembled/Platform.py | 58 +++ python-twisted/Makefile | 12 +- python-twisted/Pubnub.py | 657 +++++++++++++++++++++++++++++++- python-twisted/tests/unit-tests.py | 107 ++++++ python-twisted/unassembled/Platform.py | 83 +++++ python/Makefile | 10 + python/Pubnub.py | 593 ++++++++++++++++++++++++++++- python/examples/history-example.py | 2 + python/unassembled/Platform.py | 38 ++ 19 files changed, 2345 insertions(+), 77 deletions(-) create mode 100644 common/LICENSE_HEADER create mode 100644 common/PubnubUnitTest.py create mode 100644 python-tornado/tests/unit-tests.py create mode 100644 python-tornado/unassembled/Platform.py create mode 100644 python-twisted/tests/unit-tests.py create mode 100644 python-twisted/unassembled/Platform.py create mode 100644 python/unassembled/Platform.py diff --git a/Makefile b/Makefile index 5a6fc63..b82c77b 100644 --- a/Makefile +++ b/Makefile @@ -9,5 +9,11 @@ test: TARG=test $(SUBDIRS): force @ $(MAKE) -C $@ $(TARG) +.PHONY: clean +clean: + for dir in $(SUBDIRS); do \ + $(MAKE) clean -C $$dir; \ + done + .PHONY: force force :; diff --git a/common/LICENSE_HEADER b/common/LICENSE_HEADER new file mode 100644 index 0000000..a83793d --- /dev/null +++ b/common/LICENSE_HEADER @@ -0,0 +1,10 @@ +## 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.3.4 Real-time Push Cloud API +## ----------------------------------- diff --git a/common/PubnubBase.py b/common/PubnubBase.py index 0c4efef..64d43ed 100644 --- a/common/PubnubBase.py +++ b/common/PubnubBase.py @@ -1,14 +1,3 @@ -## 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.3.4 Real-time Push Cloud API -## ----------------------------------- - try: import json except ImportError: import simplejson as json @@ -16,7 +5,6 @@ import time import hashlib import urllib2 import uuid -from PubnubCrypto import PubnubCrypto class PubnubBase(object): def __init__( diff --git a/common/PubnubCore.py b/common/PubnubCore.py index 5965740..9f79dc8 100644 --- a/common/PubnubCore.py +++ b/common/PubnubCore.py @@ -1,23 +1,3 @@ -## 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.3.4 Real-time Push Cloud API -## ----------------------------------- - -try: import json -except ImportError: import simplejson as json - -import time -import hashlib -import urllib2 -import uuid -from PubnubBase import PubnubBase - class PubnubCore(PubnubBase): def __init__( self, diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py index 8150bde..e844b96 100644 --- a/common/PubnubCoreAsync.py +++ b/common/PubnubCoreAsync.py @@ -1,19 +1,3 @@ -## 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.3.4 Real-time Push Cloud API -## ----------------------------------- -import sys -import json -import time -import hashlib -import urllib2 -import uuid try: from hashlib import sha256 digestmod = sha256 @@ -21,8 +5,6 @@ except ImportError: import Crypto.Hash.SHA256 as digestmod sha256 = digestmod.new import hmac -from PubnubCrypto import PubnubCrypto -from PubnubBase import PubnubBase class PubnubCoreAsync(PubnubBase): diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py index b91e2d9..df7cb8d 100644 --- a/common/PubnubCrypto.py +++ b/common/PubnubCrypto.py @@ -1,14 +1,3 @@ -## 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.3.4 Real-time Push Cloud API -## ----------------------------------- - from Crypto.Cipher import AES from Crypto.Hash import MD5 from base64 import encodestring, decodestring @@ -90,4 +79,3 @@ class PubnubCrypto() : Initial16bytes='0123456789012345' cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes) return self.depad((cipher.decrypt(decodestring(msg)))) - diff --git a/common/PubnubUnitTest.py b/common/PubnubUnitTest.py new file mode 100644 index 0000000..2f9d28c --- /dev/null +++ b/common/PubnubUnitTest.py @@ -0,0 +1,36 @@ + +import time + +class Suite(): + def __init__(self, pubnub, expected): + self.pubnub = pubnub + self.total = expected + self.passed = 0 + self.failed = 0 + self.started = False + + def test(self, condition , name, message = None, response = None): + + if condition: + self.passed += 1 + msg = "PASS : " + name + if message: + msg += ", " + message + if response: + msg += ", " + response + print msg + else: + self.failed += 1 + msg = "FAIL : " + name + if message: + msg += ", " + message + if response: + msg += ", " + response + print msg + + if self.total == self.failed + self.passed: + print "\n======== RESULT ========" + print "Total\t:\t", self.total + print "Passed\t:\t", self.passed + print "Failed\t:\t", self.failed + self.pubnub.stop() diff --git a/python-tornado/Makefile b/python-tornado/Makefile index 13a5e5a..bf23137 100644 --- a/python-tornado/Makefile +++ b/python-tornado/Makefile @@ -6,13 +6,23 @@ 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 ../common/unit-test-async.py + python tests/unit-tests.py diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index f22aecc..8f94000 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -8,15 +8,668 @@ ## ----------------------------------- ## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- -import sys -from PubnubCoreAsync import PubnubCoreAsync -import json + + +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. + #** + """ + 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])] + + def getSecret( self, key ): + """ + #** + #* getSecret + #* + #* hases the key to MD5 + #* @return key in MD5 format + #** + """ + return hashlib.sha256(key).hexdigest() + + 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, + 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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + 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 + + 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 ) : + """ + #** + #* Publish + #* + #* Send a message to a channel. + #* + #* @param array args with channel and message. + #* @return array success information. + #** + + ## Publish Example + info = pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { + 'some_text' : 'Hello my World' + } + }) + print(info) + + """ + ## Fail if bad input. + if not (args['channel'] and args['message']) : + return [ 0, 'Missing Channel or Message' ] + + ## Capture User Input + channel = str(args['channel']) + + ## Capture Callback + if args.has_key('callback') : + callback = args['callback'] + else : + callback = None + + #message = json.dumps(args['message'], separators=(',',':')) + message = self.encrypt(args['message']) + + signature = self.sign(channel, message) + + ## Send Message + return self._request({"urlcomponents": [ + 'publish', + self.publish_key, + self.subscribe_key, + signature, + channel, + '0', + message + ]}, 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.4' + self.accept_encoding = 'gzip' + + def subscribe( self, args ) : + """ + #** + #* Subscribe + #* + #* This is NON-BLOCKING. + #* Listen for a message on a channel. + #* + #* @param array args with channel and message. + #* @return false on fail, array on success. + #** + + ## Subscribe Example + def receive(message) : + print(message) + return True + + ## On Connect Callback + def connected() : + pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { 'some_var' : 'text' } + }) + + ## Subscribe + pubnub.subscribe({ + 'channel' : 'hello_world', + 'connect' : connected, + 'callback' : receive + }) + + """ + ## Fail if missing channel + if not 'channel' in args : + return 'Missing Channel.' + + ## Fail if missing callback + if not 'callback' in args : + return 'Missing Callback.' + + ## Capture User Input + channel = str(args['channel']) + callback = args['callback'] + connectcb = args['connect'] + + if 'errorback' in args: + errorback = args['errorback'] + else: + errorback = lambda x: x + + ## New Channel? + if not (channel in self.subscriptions) : + self.subscriptions[channel] = { + 'first' : False, + 'connected' : False, + } + + ## Ensure Single Connection + if self.subscriptions[channel]['connected'] : + return "Already Connected" + + self.subscriptions[channel]['connected'] = 1 + ## SUBSCRIPTION RECURSION + 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 + + + + ## PROBLEM? + if not response: + def time_callback(_time): + if not _time: + self.timeout( 1, _subscribe ) + return errorback("Lost Network Connection") + else: + self.timeout( 1, _subscribe) + + ## ENSURE CONNECTED (Call Time Function) + return self.time({ 'callback' : time_callback }) + + self.timetoken = response[1] + _subscribe() + + pc = PubnubCrypto() + out = [] + for message in response[0]: + callback(self.decrypt(message)) + + ## CONNECT TO PUBNUB SUBSCRIBE SERVERS + try: + self._request( { "urlcomponents" : [ + 'subscribe', + self.subscribe_key, + channel, + '0', + str(self.timetoken) + ], "urlparams" : {"uuid":self.uuid} }, sub_callback ) + except : + self.timeout( 1, _subscribe) + return + + ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) + _subscribe() + def unsubscribe( self, args ): + channel = str(args['channel']) + if not (channel in self.subscriptions): + return False + + ## DISCONNECT + self.subscriptions[channel]['connected'] = 0 + self.subscriptions[channel]['timetoken'] = 0 + self.subscriptions[channel]['first'] = False + + import tornado.httpclient -import sys -import uuid try: from hashlib import sha256 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..618927e --- /dev/null +++ b/python-tornado/unassembled/Platform.py @@ -0,0 +1,58 @@ +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 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=310, request_timeout=310 ) + def responseCallback(response): + callback(eval(response._get_body())) + + self.http.fetch( + request, + callback=responseCallback, + ) + diff --git a/python-twisted/Makefile b/python-twisted/Makefile index 13a5e5a..bf23137 100644 --- a/python-twisted/Makefile +++ b/python-twisted/Makefile @@ -6,13 +6,23 @@ 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 ../common/unit-test-async.py + python tests/unit-tests.py diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index 8b29236..9a89aee 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -8,13 +8,485 @@ ## ----------------------------------- ## PubNub 3.3.4 Real-time Push Cloud API ## ----------------------------------- -import sys -import json + + +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. + #** + """ + 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])] + + def getSecret( self, key ): + """ + #** + #* getSecret + #* + #* hases the key to MD5 + #* @return key in MD5 format + #** + """ + return hashlib.sha256(key).hexdigest() + + 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 -from PubnubCoreAsync import PubnubCoreAsync +import uuid + +class PubnubBase(object): + 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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + 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 + + 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 ) : + """ + #** + #* Publish + #* + #* Send a message to a channel. + #* + #* @param array args with channel and message. + #* @return array success information. + #** + + ## Publish Example + info = pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { + 'some_text' : 'Hello my World' + } + }) + print(info) + + """ + ## Fail if bad input. + if not (args['channel'] and args['message']) : + return [ 0, 'Missing Channel or Message' ] + + ## Capture User Input + channel = str(args['channel']) + + ## Capture Callback + if args.has_key('callback') : + callback = args['callback'] + else : + callback = None + + #message = json.dumps(args['message'], separators=(',',':')) + message = self.encrypt(args['message']) + + signature = self.sign(channel, message) + + ## Send Message + return self._request({"urlcomponents": [ + 'publish', + self.publish_key, + self.subscribe_key, + signature, + channel, + '0', + message + ]}, 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 @@ -22,6 +494,181 @@ 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.4' + self.accept_encoding = 'gzip' + + def subscribe( self, args ) : + """ + #** + #* Subscribe + #* + #* This is NON-BLOCKING. + #* Listen for a message on a channel. + #* + #* @param array args with channel and message. + #* @return false on fail, array on success. + #** + + ## Subscribe Example + def receive(message) : + print(message) + return True + + ## On Connect Callback + def connected() : + pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { 'some_var' : 'text' } + }) + + ## Subscribe + pubnub.subscribe({ + 'channel' : 'hello_world', + 'connect' : connected, + 'callback' : receive + }) + + """ + ## Fail if missing channel + if not 'channel' in args : + return 'Missing Channel.' + + ## Fail if missing callback + if not 'callback' in args : + return 'Missing Callback.' + + ## Capture User Input + channel = str(args['channel']) + callback = args['callback'] + connectcb = args['connect'] + + if 'errorback' in args: + errorback = args['errorback'] + else: + errorback = lambda x: x + + ## New Channel? + if not (channel in self.subscriptions) : + self.subscriptions[channel] = { + 'first' : False, + 'connected' : False, + } + + ## Ensure Single Connection + if self.subscriptions[channel]['connected'] : + return "Already Connected" + + self.subscriptions[channel]['connected'] = 1 + ## SUBSCRIPTION RECURSION + 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 + + + + ## PROBLEM? + if not response: + def time_callback(_time): + if not _time: + self.timeout( 1, _subscribe ) + return errorback("Lost Network Connection") + else: + self.timeout( 1, _subscribe) + + ## ENSURE CONNECTED (Call Time Function) + return self.time({ 'callback' : time_callback }) + + self.timetoken = response[1] + _subscribe() + + pc = PubnubCrypto() + out = [] + for message in response[0]: + callback(self.decrypt(message)) + + ## CONNECT TO PUBNUB SUBSCRIBE SERVERS + try: + self._request( { "urlcomponents" : [ + 'subscribe', + self.subscribe_key, + channel, + '0', + str(self.timetoken) + ], "urlparams" : {"uuid":self.uuid} }, sub_callback ) + except : + self.timeout( 1, _subscribe) + return + + ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) + _subscribe() + def unsubscribe( self, args ): + channel = str(args['channel']) + if not (channel in self.subscriptions): + return False + + ## DISCONNECT + self.subscriptions[channel]['connected'] = 0 + self.subscriptions[channel]['timetoken'] = 0 + self.subscriptions[channel]['first'] = False + + from twisted.web.client import getPage from twisted.internet import reactor from twisted.internet.defer import Deferred @@ -29,8 +676,8 @@ from twisted.internet.protocol import Protocol from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDecoder from twisted.web.client import HTTPConnectionPool from twisted.web.http_headers import Headers -from PubnubCrypto import PubnubCrypto from twisted.internet.ssl import ClientContextFactory +from twisted.internet.task import LoopingCall pnconn_pool = HTTPConnectionPool(reactor, persistent=True) pnconn_pool.maxPersistentPerHost = 100 diff --git a/python-twisted/tests/unit-tests.py b/python-twisted/tests/unit-tests.py new file mode 100644 index 0000000..f143a3a --- /dev/null +++ b/python-twisted/tests/unit-tests.py @@ -0,0 +1,107 @@ + +import sys +import time + +sys.path.append('../../common') +sys.path.append('../common') +sys.path.append('..') +sys.path.append('.') + +from PubnubUnitTest import Suite +from Pubnub import Pubnub + +pubnub = Pubnub("demo","demo") + +tests_count = 1 + 2 + 1 +test_suite = Suite(pubnub,tests_count) + +tests = [] + + + +def test_publish(): + channel = "hello" + str(time.time()) + 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" + str(time.time()) + name = "Subscribe Publish Test" + publish_msg = "This is Pubnub Python-Twisted" + def connect(): + #print '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) +#""" + +def test_here_now(): + channel = "hello12" #+ str(time.time()) + name = "Here Now Test" + + def connect(): + print 'connect' + def call_here_now(): + print 'call_here_now' + def success(r): + test_suite.test(r['occupancy'] == 1, name, "Here Now success") + + def fail(e): + test_suite.test(False, name , "Here Now Failed", e) + + pubnub.here_now({ + 'channel' : channel, + 'callback' : success, + 'error' : fail + }) + pubnub.timeout(5, call_here_now) + + def callback(r): + pass + print 'Subscribe' + pubnub.subscribe({ + 'channel' : channel, + 'callback' : callback, + 'connect' : connect + }) +tests.append(test_here_now) + + + + +for t in tests: t() + +pubnub.start() diff --git a/python-twisted/unassembled/Platform.py b/python-twisted/unassembled/Platform.py new file mode 100644 index 0000000..e4ae680 --- /dev/null +++ b/python-twisted/unassembled/Platform.py @@ -0,0 +1,83 @@ +from twisted.web.client import getPage +from twisted.internet import reactor +from twisted.internet.defer import Deferred +from twisted.internet.protocol import Protocol +from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDecoder +from twisted.web.client import HTTPConnectionPool +from twisted.web.http_headers import Headers +from twisted.internet.ssl import ClientContextFactory +from twisted.internet.task import LoopingCall + +pnconn_pool = HTTPConnectionPool(reactor, persistent=True) +pnconn_pool.maxPersistentPerHost = 100 +pnconn_pool.cachedConnectionTimeout = 310 + +class Pubnub(PubnubCoreAsync): + + def start(self): reactor.run() + def stop(self): reactor.stop() + def timeout( self, delay, callback ): + reactor.callLater( 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, + ssl_on=ssl_on, + origin=origin, + ) + self.headers = {} + self.headers['User-Agent'] = ['Python-Twisted'] + #self.headers['Accept-Encoding'] = [self.accept_encoding] + self.headers['V'] = [self.version] + + def _request( self, request, callback ) : + global pnconn_pool + + ## 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]) + ''' + url = self.getUrl(request) + agent = ContentDecoderAgent(RedirectAgent(Agent( + reactor, + contextFactory = WebClientContextFactory(), + pool = self.ssl and None or pnconn_pool + )), [('gzip', GzipDecoder)]) + request = agent.request( 'GET', url, Headers(self.headers), None ) + + def received(response): + finished = Deferred() + response.deliverBody(PubNubResponse(finished)) + return finished + + def complete(data): + callback(eval(data)) + + request.addCallback(received) + request.addBoth(complete) + +class WebClientContextFactory(ClientContextFactory): + def getContext(self, hostname, port): + return ClientContextFactory.getContext(self) + +class PubNubResponse(Protocol): + def __init__( self, finished ): + self.finished = finished + + def dataReceived( self, bytes ): + self.finished.callback(bytes) + diff --git a/python/Makefile b/python/Makefile index 9551bb7..5eb9e2f 100644 --- a/python/Makefile +++ b/python/Makefile @@ -6,11 +6,21 @@ 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/PubnubCore.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: diff --git a/python/Pubnub.py b/python/Pubnub.py index 0a6d877..2eb0440 100644 --- a/python/Pubnub.py +++ b/python/Pubnub.py @@ -9,14 +9,601 @@ ## PubNub 3.3.4 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. + #** + """ + 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])] + + def getSecret( self, key ): + """ + #** + #* getSecret + #* + #* hases the key to MD5 + #* @return key in MD5 format + #** + """ + return hashlib.sha256(key).hexdigest() + + 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 sys + import time import hashlib import urllib2 -import uuid -from PubnubCore import PubnubCore +import uuid + +class PubnubBase(object): + 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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + 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 + + 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 ) : + """ + #** + #* Publish + #* + #* Send a message to a channel. + #* + #* @param array args with channel and message. + #* @return array success information. + #** + + ## Publish Example + info = pubnub.publish({ + 'channel' : 'hello_world', + 'message' : { + 'some_text' : 'Hello my World' + } + }) + print(info) + + """ + ## Fail if bad input. + if not (args['channel'] and args['message']) : + return [ 0, 'Missing Channel or Message' ] + + ## Capture User Input + channel = str(args['channel']) + + ## Capture Callback + if args.has_key('callback') : + callback = args['callback'] + else : + callback = None + + #message = json.dumps(args['message'], separators=(',',':')) + message = self.encrypt(args['message']) + + signature = self.sign(channel, message) + + ## Send Message + return self._request({"urlcomponents": [ + 'publish', + self.publish_key, + self.subscribe_key, + signature, + channel, + '0', + message + ]}, 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 + + +class PubnubCore(PubnubBase): + 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 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 + pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False ) + + """ + super(PubnubCore, 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.4' + self.accept_encoding = 'gzip' + + + + def subscribe( self, args ) : + """ + #** + #* Subscribe + #* + #* This is BLOCKING. + #* Listen for a message on a channel. + #* + #* @param array args with channel and callback. + #* @return false on fail, array on success. + #** + + ## Subscribe Example + def receive(message) : + print(message) + return True + + pubnub.subscribe({ + '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 + + ## Begin Subscribe + while True : + + timetoken = 'timetoken' in args and args['timetoken'] or 0 + try : + ## Wait for Message + response = self._request(self._encode([ + 'subscribe', + subscribe_key, + channel, + '0', + str(timetoken) + ])+['?uuid='+self.uuid], encode=False) + + messages = response[0] + args['timetoken'] = response[1] + + ## If it was a timeout + if not len(messages) : + continue + + ## Run user Callback and Reconnect if user permits. + for message in messages : + if not callback(message) : + return + + except Exception: + time.sleep(1) + + return True + + class Pubnub(PubnubCore): def __init__( diff --git a/python/examples/history-example.py b/python/examples/history-example.py index cedf69e..c7c9547 100755 --- a/python/examples/history-example.py +++ b/python/examples/history-example.py @@ -1,3 +1,5 @@ +import sys +sys.path.append('../') from Pubnub import Pubnub ## Initiat Class diff --git a/python/unassembled/Platform.py b/python/unassembled/Platform.py new file mode 100644 index 0000000..ef69473 --- /dev/null +++ b/python/unassembled/Platform.py @@ -0,0 +1,38 @@ + +class Pubnub(PubnubCore): + def __init__( + self, + publish_key, + subscribe_key, + secret_key = False, + cipher_key = False, + ssl_on = False, + origin = 'pubsub.pubnub.com', + pres_uuid = None + ) : + 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, + uuid = pres_uuid + ) + + def _request( self, request, callback = None ) : + ## Build URL + url = self.getUrl(request) + + ## Send Request Expecting JSONP Response + try: + try: usock = urllib2.urlopen( url, None, 200 ) + except TypeError: usock = urllib2.urlopen( url, None ) + response = usock.read() + usock.close() + if (callback): + callback(json.loads(response)) + else: + return json.loads( response ) + except: + return None -- cgit v1.2.3 From 7ec3bbe414abe58072fda63f4f9c801f77b292e1 Mon Sep 17 00:00:00 2001 From: Devendra Date: Sun, 6 Oct 2013 14:39:59 +0530 Subject: changing timeout from 200 to 310 s, changed exception handling to not silently eat execeptions in callback --- common/PubnubCoreAsync.py | 2 +- python-tornado/Pubnub.py | 15 ++++++++++++--- python-tornado/examples/here-now-example.py | 6 ++++-- python-tornado/unassembled/Platform.py | 13 +++++++++++-- python-twisted/Pubnub.py | 2 +- python/Pubnub.py | 12 +++++++----- python/examples/here-now-example.py | 8 ++++++-- python/unassembled/Platform.py | 12 +++++++----- 8 files changed, 49 insertions(+), 21 deletions(-) diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py index e844b96..a7fbb7d 100644 --- a/common/PubnubCoreAsync.py +++ b/common/PubnubCoreAsync.py @@ -52,7 +52,7 @@ class PubnubCoreAsync(PubnubBase): self.subscriptions = {} self.timetoken = 0 - self.version = '3.4' + self.version = '3.3.4' self.accept_encoding = 'gzip' def subscribe( self, args ) : diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index 8f94000..a65b2b3 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -541,7 +541,7 @@ class PubnubCoreAsync(PubnubBase): self.subscriptions = {} self.timetoken = 0 - self.version = '3.4' + self.version = '3.3.4' self.accept_encoding = 'gzip' def subscribe( self, args ) : @@ -680,6 +680,7 @@ except ImportError: import hmac import tornado.ioloop +from tornado.stack_context import ExceptionStackContext from PubnubCrypto import PubnubCrypto ioloop = tornado.ioloop.IOLoop.instance() @@ -718,9 +719,17 @@ class Pubnub(PubnubCoreAsync): url = self.getUrl(request) ## Send Request Expecting JSON Response #print self.headers - request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=310, request_timeout=310 ) + + request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=10, request_timeout=310 ) + def responseCallback(response): - callback(eval(response._get_body())) + def handle_exc(*args): + return True + if response.error is not None: + with ExceptionStackContext(handle_exc): + response.rethrow() + else: + callback(eval(response._get_body())) self.http.fetch( request, diff --git a/python-tornado/examples/here-now-example.py b/python-tornado/examples/here-now-example.py index 4105776..85e3432 100644 --- a/python-tornado/examples/here-now-example.py +++ b/python-tornado/examples/here-now-example.py @@ -11,6 +11,8 @@ 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' @@ -30,7 +32,7 @@ crazy = 'hello_world' ## ----------------------------------------------------------------------- def here_now_complete(messages): print(messages) - tornado.ioloop.IOLoop.instance().stop() + pubnub.stop() pubnub.here_now( { 'channel' : crazy, @@ -40,4 +42,4 @@ pubnub.here_now( { ## ----------------------------------------------------------------------- ## IO Event Loop ## ----------------------------------------------------------------------- -tornado.ioloop.IOLoop.instance().start() +pubnub.start() diff --git a/python-tornado/unassembled/Platform.py b/python-tornado/unassembled/Platform.py index 618927e..4df04b3 100644 --- a/python-tornado/unassembled/Platform.py +++ b/python-tornado/unassembled/Platform.py @@ -9,6 +9,7 @@ except ImportError: import hmac import tornado.ioloop +from tornado.stack_context import ExceptionStackContext from PubnubCrypto import PubnubCrypto ioloop = tornado.ioloop.IOLoop.instance() @@ -47,9 +48,17 @@ class Pubnub(PubnubCoreAsync): url = self.getUrl(request) ## Send Request Expecting JSON Response #print self.headers - request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=310, request_timeout=310 ) + + request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=10, request_timeout=310 ) + def responseCallback(response): - callback(eval(response._get_body())) + def handle_exc(*args): + return True + if response.error is not None: + with ExceptionStackContext(handle_exc): + response.rethrow() + else: + callback(eval(response._get_body())) self.http.fetch( request, diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py index 9a89aee..283e121 100644 --- a/python-twisted/Pubnub.py +++ b/python-twisted/Pubnub.py @@ -541,7 +541,7 @@ class PubnubCoreAsync(PubnubBase): self.subscriptions = {} self.timetoken = 0 - self.version = '3.4' + self.version = '3.3.4' self.accept_encoding = 'gzip' def subscribe( self, args ) : diff --git a/python/Pubnub.py b/python/Pubnub.py index 2eb0440..b1d1777 100644 --- a/python/Pubnub.py +++ b/python/Pubnub.py @@ -632,13 +632,15 @@ class Pubnub(PubnubCore): ## Send Request Expecting JSONP Response try: - try: usock = urllib2.urlopen( url, None, 200 ) + try: usock = urllib2.urlopen( url, None, 310 ) except TypeError: usock = urllib2.urlopen( url, None ) response = usock.read() usock.close() - if (callback): - callback(json.loads(response)) - else: - return json.loads( response ) + resp_json = json.loads(response) except: return None + + if (callback): + callback(resp_json) + else: + return resp_json diff --git a/python/examples/here-now-example.py b/python/examples/here-now-example.py index 261500a..d2ca9bd 100644 --- a/python/examples/here-now-example.py +++ b/python/examples/here-now-example.py @@ -10,6 +10,7 @@ ## ----------------------------------- import sys +sys.path.append('../') from twisted.internet import reactor from Pubnub import Pubnub @@ -26,8 +27,11 @@ pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) crazy = 'hello_world' +def print_cb(message): + print message -print pubnub.here_now( { - 'channel' : crazy +pubnub.here_now( { + 'channel' : crazy, + 'callback' : print_cb }) diff --git a/python/unassembled/Platform.py b/python/unassembled/Platform.py index ef69473..f598a98 100644 --- a/python/unassembled/Platform.py +++ b/python/unassembled/Platform.py @@ -26,13 +26,15 @@ class Pubnub(PubnubCore): ## Send Request Expecting JSONP Response try: - try: usock = urllib2.urlopen( url, None, 200 ) + try: usock = urllib2.urlopen( url, None, 310 ) except TypeError: usock = urllib2.urlopen( url, None ) response = usock.read() usock.close() - if (callback): - callback(json.loads(response)) - else: - return json.loads( response ) + resp_json = json.loads(response) except: return None + + if (callback): + callback(resp_json) + else: + return resp_json -- cgit v1.2.3 From 52c51378b4647911a64c8d4b1c759756d4930d4b Mon Sep 17 00:00:00 2001 From: Devendra Date: Sun, 6 Oct 2013 17:38:16 +0530 Subject: included changes of pull request # 4 --- python-tornado/Pubnub.py | 2 +- python-tornado/examples/publish-example.py | 1 + python-tornado/unassembled/Platform.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py index a65b2b3..268cd6a 100644 --- a/python-tornado/Pubnub.py +++ b/python-tornado/Pubnub.py @@ -728,7 +728,7 @@ class Pubnub(PubnubCoreAsync): if response.error is not None: with ExceptionStackContext(handle_exc): response.rethrow() - else: + elif callback: callback(eval(response._get_body())) self.http.fetch( diff --git a/python-tornado/examples/publish-example.py b/python-tornado/examples/publish-example.py index 72f2586..b9eaa15 100644 --- a/python-tornado/examples/publish-example.py +++ b/python-tornado/examples/publish-example.py @@ -13,6 +13,7 @@ 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' diff --git a/python-tornado/unassembled/Platform.py b/python-tornado/unassembled/Platform.py index 4df04b3..7565fd2 100644 --- a/python-tornado/unassembled/Platform.py +++ b/python-tornado/unassembled/Platform.py @@ -57,7 +57,7 @@ class Pubnub(PubnubCoreAsync): if response.error is not None: with ExceptionStackContext(handle_exc): response.rethrow() - else: + elif callback: callback(eval(response._get_body())) self.http.fetch( -- cgit v1.2.3