aboutsummaryrefslogtreecommitdiffstats
path: root/python-twisted
diff options
context:
space:
mode:
Diffstat (limited to 'python-twisted')
-rw-r--r--python-twisted/Makefile28
-rw-r--r--python-twisted/Pubnub.py787
-rw-r--r--python-twisted/PubnubCrypto.py92
-rw-r--r--python-twisted/examples/here-now-example.py43
-rw-r--r--python-twisted/examples/history-example.py1
-rw-r--r--python-twisted/examples/publish-example.py6
-rw-r--r--python-twisted/examples/subscribe-example.py8
-rw-r--r--python-twisted/tests/unit-test-full.py2
-rw-r--r--python-twisted/tests/unit-test.py107
-rw-r--r--python-twisted/tests/unit-tests.py107
-rw-r--r--python-twisted/unassembled/Platform.py83
11 files changed, 799 insertions, 465 deletions
diff --git a/python-twisted/Makefile b/python-twisted/Makefile
new file mode 100644
index 0000000..bf23137
--- /dev/null
+++ b/python-twisted/Makefile
@@ -0,0 +1,28 @@
+include ../Makefile.inc
+
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build:
+ cat ../common/LICENSE_HEADER > ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ../common/PubnubCrypto.py >> ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ../common/PubnubBase.py >> ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ../common/PubnubCoreAsync.py >> ./Pubnub.py
+ echo "\n" >> ./Pubnub.py
+ cat ./unassembled/Platform.py >> ./Pubnub.py
+ find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g"
+
+
+.PHONY: clean
+clean:
+ rm -f Pubnub.py*
+
+.PHONY: test
+test:
+ python tests/unit-tests.py
+
diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 3c3f4b1..283e121 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -6,42 +6,102 @@
## http://www.pubnub.com/
## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
+## PubNub 3.3.4 Real-time Push Cloud API
## -----------------------------------
-import sys
-import json
-import time
+
+
+from Crypto.Cipher import AES
+from Crypto.Hash import MD5
+from base64 import encodestring, decodestring
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 PubnubCrypto() :
+ """
+ #**
+ #* PubnubCrypto
+ #*
+ #**
-class Pubnub():
+ ## Initiate Class
+ pc = PubnubCrypto
- def start(self): reactor.run()
- def stop(self): reactor.stop()
- def timeout( self, callback, delay ):
- reactor.callLater( delay, callback )
+ """
+
+ 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,
@@ -49,7 +109,8 @@ class Pubnub():
secret_key = False,
cipher_key = False,
ssl_on = False,
- origin = 'pubsub.pubnub.com'
+ origin = 'pubsub.pubnub.com',
+ UUID = None
) :
"""
#**
@@ -59,9 +120,10 @@ class Pubnub():
#*
#* @param string publish_key required key to send messages.
#* @param string subscribe_key required key to receive messages.
- #* @param string secret_key required key to sign messages.
+ #* @param string secret_key optional key to sign messages.
#* @param boolean ssl required for 2048 bit encrypted messages.
#* @param string origin PUBNUB Server Origin.
+ #* @param string pres_uuid optional identifier for presence (auto-generated if not supplied)
#**
## Initiat Class
@@ -69,17 +131,79 @@ class Pubnub():
"""
self.origin = origin
+ self.limit = 1800
self.publish_key = publish_key
self.subscribe_key = subscribe_key
self.secret_key = secret_key
self.cipher_key = cipher_key
self.ssl = ssl_on
- self.subscriptions = {}
if self.ssl :
self.origin = 'https://' + self.origin
else :
self.origin = 'http://' + self.origin
+
+ self.uuid = UUID or str(uuid.uuid4())
+
+ if not isinstance(self.uuid, basestring):
+ raise AttributeError("pres_uuid must be a string")
+
+ def sign(self, channel, message):
+ ## Sign Message
+ if self.secret_key:
+ signature = hashlib.md5('/'.join([
+ self.publish_key,
+ self.subscribe_key,
+ self.secret_key,
+ channel,
+ message
+ ])).hexdigest()
+ else:
+ signature = '0'
+ return signature
+
+ def encrypt(self, message):
+ if self.cipher_key:
+ pc = PubnubCrypto()
+ out = []
+ if type( message ) == type(list()):
+ for item in message:
+ encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
+ out.append(encryptItem)
+ message = json.dumps(out)
+ elif type( message ) == type(dict()):
+ outdict = {}
+ for k, item in message.iteritems():
+ encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
+ outdict[k] = encryptItem
+ out.append(outdict)
+ message = json.dumps(out[0])
+ else:
+ message = json.dumps(pc.encrypt(self.cipher_key, json.dumps(message)).replace('\n',''))
+ else :
+ message = json.dumps(message)
+
+ return message;
+
+ def decrypt(self, message):
+ if self.cipher_key:
+ pc = PubnubCrypto()
+ if type( message ) == type(list()):
+ for item in message:
+ encryptItem = pc.decrypt(self.cipher_key, item )
+ out.append(encryptItem)
+ message = out
+ elif type( message ) == type(dict()):
+ outdict = {}
+ for k, item in message.iteritems():
+ encryptItem = pc.decrypt(self.cipher_key, item )
+ outdict[k] = encryptItem
+ out.append(outdict)
+ message = out[0]
+ else:
+ message = pc.decrypt(self.cipher_key, message)
+
+ return message
def publish( self, args ) :
@@ -94,72 +218,35 @@ class Pubnub():
#**
## Publish Example
- def publish_complete(info):
- print(info)
-
- pubnub.publish({
+ info = pubnub.publish({
'channel' : 'hello_world',
'message' : {
'some_text' : 'Hello my World'
- },
- 'callback' : publish_complete
+ }
})
+ print(info)
"""
- ## 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
+ if not (args['channel'] and args['message']) :
+ return [ 0, 'Missing Channel or Message' ]
## Capture User Input
channel = str(args['channel'])
- message = args['message']
- if self.cipher_key :
- pc = PubnubCrypto()
- out = []
- if type( message ) == type(list()):
- for item in message:
- encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
- out.append(encryptItem)
- message = json.dumps(out)
- elif type( message ) == type(dict()):
- outdict = {}
- for k, item in message.iteritems():
- encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
- outdict[k] = encryptItem
- out.append(outdict)
- message = json.dumps(out[0])
- else:
- message = json.dumps(pc.encrypt(self.cipher_key, message).replace('\n',''))
+ ## Capture Callback
+ if args.has_key('callback') :
+ callback = args['callback']
else :
- message = json.dumps(args['message'])
+ callback = None
- def publish_response(info):
- callback(info or [0, 'Disconnected', 0]);
+ #message = json.dumps(args['message'], separators=(',',':'))
+ message = self.encrypt(args['message'])
- ## Sign Message
- if self.secret_key :
- hashObject = sha256()
- hashObject.update(self.secret_key)
- hashedSecret = hashObject.hexdigest()
- hash = hmac.HMAC(hashedSecret, '/'.join([
- self.publish_key,
- self.subscribe_key,
- self.secret_key,
- channel,
- message
- ]), digestmod=digestmod)
- signature = hash.hexdigest()
- else :
- signature = '0'
+ signature = self.sign(channel, message)
## Send Message
- return self._request([
+ return self._request({"urlcomponents": [
'publish',
self.publish_key,
self.subscribe_key,
@@ -167,8 +254,295 @@ class Pubnub():
channel,
'0',
message
- ], publish_response )
+ ]}, callback)
+
+ def presence( self, args ) :
+ """
+ #**
+ #* presence
+ #*
+ #* This is BLOCKING.
+ #* Listen for presence events on a channel.
+ #*
+ #* @param array args with channel and callback.
+ #* @return false on fail, array on success.
+ #**
+
+ ## Presence Example
+ def pres_event(message) :
+ print(message)
+ return True
+
+ pubnub.presence({
+ 'channel' : 'hello_world',
+ 'callback' : receive
+ })
+ """
+
+ ## Fail if missing channel
+ if not 'channel' in args :
+ raise Exception('Missing Channel.')
+ return False
+
+ ## Fail if missing callback
+ if not 'callback' in args :
+ raise Exception('Missing Callback.')
+ return False
+
+ ## Capture User Input
+ channel = str(args['channel'])
+ callback = args['callback']
+ subscribe_key = args.get('subscribe_key') or self.subscribe_key
+
+ return self.subscribe({'channel': channel+'-pnpres', 'subscribe_key':subscribe_key, 'callback': callback})
+
+
+ def here_now( self, args ) :
+ """
+ #**
+ #* Here Now
+ #*
+ #* Load current occupancy from a channel.
+ #*
+ #* @param array args with 'channel'.
+ #* @return mixed false on fail, array on success.
+ #*
+
+ ## Presence Example
+ here_now = pubnub.here_now({
+ 'channel' : 'hello_world',
+ })
+ print(here_now['occupancy'])
+ print(here_now['uuids'])
+
+ """
+ channel = str(args['channel'])
+
+ ## Capture Callback
+ if args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+
+ ## Fail if bad input.
+ if not channel :
+ raise Exception('Missing Channel')
+ return False
+
+ ## Get Presence Here Now
+ return self._request({"urlcomponents": [
+ 'v2','presence',
+ 'sub_key', self.subscribe_key,
+ 'channel', channel
+ ]}, callback);
+
+
+ def history( self, args ) :
+ """
+ #**
+ #* History
+ #*
+ #* Load history from a channel.
+ #*
+ #* @param array args with 'channel' and 'limit'.
+ #* @return mixed false on fail, array on success.
+ #*
+
+ ## History Example
+ history = pubnub.history({
+ 'channel' : 'hello_world',
+ 'limit' : 1
+ })
+ print(history)
+
+ """
+ ## Capture User Input
+ limit = args.has_key('limit') and int(args['limit']) or 10
+ channel = str(args['channel'])
+
+ ## Fail if bad input.
+ if not channel :
+ raise Exception('Missing Channel')
+ return False
+
+ ## Capture Callback
+ if args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+
+ ## Get History
+ return self._request({ "urlcomponents" : [
+ 'history',
+ self.subscribe_key,
+ channel,
+ '0',
+ str(limit)
+ ] }, callback);
+ def detailedHistory(self, args) :
+ """
+ #**
+ #* Detailed History
+ #*
+ #* Load Detailed history from a channel.
+ #*
+ #* @param array args with 'channel', optional: 'start', 'end', 'reverse', 'count'
+ #* @return mixed false on fail, array on success.
+ #*
+
+ ## History Example
+ history = pubnub.detailedHistory({
+ 'channel' : 'hello_world',
+ 'count' : 5
+ })
+ print(history)
+
+ """
+ ## Capture User Input
+ channel = str(args['channel'])
+
+ params = dict()
+ count = 100
+
+ if args.has_key('count'):
+ count = int(args['count'])
+
+ params['count'] = str(count)
+
+ if args.has_key('reverse'):
+ params['reverse'] = str(args['reverse']).lower()
+
+ if args.has_key('start'):
+ params['start'] = str(args['start'])
+
+ if args.has_key('end'):
+ params['end'] = str(args['end'])
+
+ ## Fail if bad input.
+ if not channel :
+ raise Exception('Missing Channel')
+ return False
+
+ ## Capture Callback
+ if args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+
+ ## Get History
+ return self._request({ 'urlcomponents' : [
+ 'v2',
+ 'history',
+ 'sub-key',
+ self.subscribe_key,
+ 'channel',
+ channel,
+ ],'urlparams' : params }, callback=callback);
+
+ def time(self, args = None) :
+ """
+ #**
+ #* Time
+ #*
+ #* Timestamp from PubNub Cloud.
+ #*
+ #* @return int timestamp.
+ #*
+
+ ## PubNub Server Time Example
+ timestamp = pubnub.time()
+ print(timestamp)
+
+ """
+ ## Capture Callback
+ if args and args.has_key('callback') :
+ callback = args['callback']
+ else :
+ callback = None
+ time = self._request({'urlcomponents' : [
+ 'time',
+ '0'
+ ]}, callback)
+ if time != None:
+ return time[0]
+
+
+ def _encode( self, request ) :
+ return [
+ "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+ hex(ord(ch)).replace( '0x', '%' ).upper() or
+ ch for ch in list(bit)
+ ]) for bit in request]
+
+ def getUrl(self,request):
+ ## Build URL
+ url = self.origin + '/' + "/".join([
+ "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+ hex(ord(ch)).replace( '0x', '%' ).upper() or
+ ch for ch in list(bit)
+ ]) for bit in request["urlcomponents"]])
+ if (request.has_key("urlparams")):
+ url = url + '?' + "&".join([ x + "=" + y for x,y in request["urlparams"].iteritems()])
+ return url
+
+
+try:
+ from hashlib import sha256
+ digestmod = sha256
+except ImportError:
+ import Crypto.Hash.SHA256 as digestmod
+ sha256 = digestmod.new
+import hmac
+
+class PubnubCoreAsync(PubnubBase):
+
+ def start(self): pass
+ def stop(self): pass
+ def timeout( self, delay, callback ):
+ pass
+
+ def __init__(
+ self,
+ publish_key,
+ subscribe_key,
+ secret_key = False,
+ cipher_key = False,
+ ssl_on = False,
+ origin = 'pubsub.pubnub.com',
+ uuid = None
+ ) :
+ """
+ #**
+ #* Pubnub
+ #*
+ #* Init the Pubnub Client API
+ #*
+ #* @param string publish_key required key to send messages.
+ #* @param string subscribe_key required key to receive messages.
+ #* @param string secret_key required key to sign messages.
+ #* @param boolean ssl required for 2048 bit encrypted messages.
+ #* @param string origin PUBNUB Server Origin.
+ #**
+
+ ## Initiat Class
+ pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False )
+
+ """
+ super(PubnubCoreAsync, self).__init__(
+ publish_key=publish_key,
+ subscribe_key=subscribe_key,
+ secret_key=secret_key,
+ cipher_key=cipher_key,
+ ssl_on=ssl_on,
+ origin=origin,
+ UUID=uuid
+ )
+
+ self.subscriptions = {}
+ self.timetoken = 0
+ self.version = '3.3.4'
+ self.accept_encoding = 'gzip'
def subscribe( self, args ) :
"""
@@ -224,8 +598,7 @@ class Pubnub():
if not (channel in self.subscriptions) :
self.subscriptions[channel] = {
'first' : False,
- 'connected' : 0,
- 'timetoken' : '0'
+ 'connected' : False,
}
## Ensure Single Connection
@@ -233,78 +606,58 @@ class Pubnub():
return "Already Connected"
self.subscriptions[channel]['connected'] = 1
-
## SUBSCRIPTION RECURSION
- def substabizel():
+ def _subscribe():
## STOP CONNECTION?
if not self.subscriptions[channel]['connected']:
return
-
+
def sub_callback(response):
+ if not self.subscriptions[channel]['first'] :
+ self.subscriptions[channel]['first'] = True
+ connectcb()
+
## STOP CONNECTION?
if not self.subscriptions[channel]['connected']:
return
- ## CONNECTED CALLBACK
- if not self.subscriptions[channel]['first'] :
- self.subscriptions[channel]['first'] = True
- connectcb()
+
## PROBLEM?
if not response:
def time_callback(_time):
if not _time:
- reactor.callLater( 1, substabizel )
+ self.timeout( 1, _subscribe )
return errorback("Lost Network Connection")
else:
- reactor.callLater( 1, substabizel )
+ self.timeout( 1, _subscribe)
## ENSURE CONNECTED (Call Time Function)
return self.time({ 'callback' : time_callback })
- self.subscriptions[channel]['timetoken'] = response[1]
- substabizel()
+ self.timetoken = response[1]
+ _subscribe()
pc = PubnubCrypto()
out = []
for message in response[0]:
- if self.cipher_key :
- if type( message ) == type(list()):
- for item in message:
- encryptItem = pc.decrypt(self.cipher_key, item )
- out.append(encryptItem)
- message = out
- elif type( message ) == type(dict()):
- outdict = {}
- for k, item in message.iteritems():
- encryptItem = pc.decrypt(self.cipher_key, item )
- outdict[k] = encryptItem
- out.append(outdict)
- message = out[0]
- else:
- message = pc.decrypt(self.cipher_key, message )
- else :
- message
-
- callback(message)
+ callback(self.decrypt(message))
## CONNECT TO PUBNUB SUBSCRIBE SERVERS
- try :
- self._request( [
+ try:
+ self._request( { "urlcomponents" : [
'subscribe',
self.subscribe_key,
channel,
'0',
- str(self.subscriptions[channel]['timetoken'])
- ], sub_callback )
+ str(self.timetoken)
+ ], "urlparams" : {"uuid":self.uuid} }, sub_callback )
except :
- reactor.callLater( 1, substabizel )
+ self.timeout( 1, _subscribe)
return
## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES)
- substabizel()
-
-
+ _subscribe()
def unsubscribe( self, args ):
channel = str(args['channel'])
if not (channel in self.subscriptions):
@@ -316,168 +669,82 @@ class Pubnub():
self.subscriptions[channel]['first'] = False
- def history( self, args ) :
- """
- #**
- #* History
- #*
- #* Load history from a channel.
- #*
- #* @param array args with 'channel' and 'limit'.
- #* @return mixed false on fail, array on success.
- #*
-
- ## History Example
- history = pubnub.history({
- 'channel' : 'hello_world',
- 'limit' : 1
- })
- print(history)
-
- """
- ## Capture User Input
- limit = args.has_key('limit') and int(args['limit']) or 10
- channel = str(args['channel'])
-
- ## Fail if bad input.
- if not channel :
- 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)
+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
- """
- def complete(response) :
- if not response: return 0
- args['callback'](response[0])
+pnconn_pool = HTTPConnectionPool(reactor, persistent=True)
+pnconn_pool.maxPersistentPerHost = 100
+pnconn_pool.cachedConnectionTimeout = 310
- self._request( [
- 'time',
- '0'
- ], complete )
+class Pubnub(PubnubCoreAsync):
- def uuid(self) :
- """
- #**
- #* uuid
- #*
- #* Generate a UUID
- #*
- #* @return UUID.
- #*
+ def start(self): reactor.run()
+ def stop(self): reactor.stop()
+ def timeout( self, delay, callback ):
+ reactor.callLater( delay, callback )
- ## PubNub UUID Example
- uuid = pubnub.uuid()
- print(uuid)
- """
- return uuid.uuid1()
+ def __init__(
+ self,
+ publish_key,
+ subscribe_key,
+ secret_key = False,
+ cipher_key = False,
+ ssl_on = False,
+ origin = 'pubsub.pubnub.com'
+ ) :
+ super(Pubnub, self).__init__(
+ publish_key=publish_key,
+ subscribe_key=subscribe_key,
+ secret_key=secret_key,
+ 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])
-
- requestType = request[0]
- agent = Agent(
+ '''
+ url = self.getUrl(request)
+ agent = ContentDecoderAgent(RedirectAgent(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]
+ 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):
- 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)
+ 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
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))))
-
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 4a5baf6..d09ad8d 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'
@@ -47,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-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
deleted file mode 100644
index 843f939..0000000
--- a/python-twisted/tests/unit-test.py
+++ /dev/null
@@ -1,107 +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('../')
-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 = ' ~`!@#$%^&*( 顶顅 Ȓ)+=[]\\{}|;\':",./<>?abcd'
-
-## ---------------------------------------------------------------------------
-## 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() :
- pubnub.publish({
- 'channel' : crazy,
- 'message' : { 'Info' : 'Connected!' }
- })
-
-pubnub.subscribe({
- 'channel' : crazy,
- 'connect' : connected,
- 'callback' : message_received
-})
-## -----------------------------------------------------------------------
-## IO Event Loop
-## -----------------------------------------------------------------------
-pubnub.start()
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)
+