new file mode 100644

@@ -0,0 +1,26 @@

+from twisted.internet import reactor, ssl

+from twisted.web import server

+

+from .server import ServerEvents, JSON_RPC

+

+class JSONRPCTest(ServerEvents):

+	def callmethod(self, request, method, kwargs, args, **kw):

+		if method in set(['add', 'subtract']):

+			return getattr(self, method)(*args, **kwargs)

+

+	def subtract(self, a, b):

+		return a-b

+

+	def add(self, a, b):

+		return a+b

+

+root = JSON_RPC().customize(JSONRPCTest)

+site = server.Site(root)

+

+

+# 8007 is the port you want to run under. Choose something >1024

+reactor.listenTCP(8007, site)

+reactor.run()

+

+

+__version__ = "$Revision: 1.8 $".split(":")[1][:-1].strip()

@@ -196,14 +196,14 @@ class JSONRPCProxy(object):

 		return p(*args, **kwargs)

-	def batch_call(self, names, *params):

+	def batch_call(self, methods):

 		'''call several methods at once, return a list of (result, error) pairs

-		:param names: a list of method names

-		:param \\*params: a list of (arg,kwarg) pairs corresponding to each method name

+		:param names: a dictionary { method: (args, kwargs) }

+		:returns: a list of pairs (result, error) where only one is not None

 		'''

-		methods = ( (getattr(self, name),param) for name,param in itertools.izip(names, params) )

-		data = (method._get_postdata(*params) for method, params in methods)

+		if hasattr(methods, 'items'): methods = methods.items()

+		data = [ getattr(self, k)._get_postdata(*v) for k, v in methods ]

 		postdata = '[%s]' % ','.join(data)

 		respdata = urllib.urlopen(self.serviceURL, postdata).read()

 		resp = jsonrpc.jsonutil.decode(respdata)

@@ -1,24 +1,24 @@

 # $Id: server.py,v 1.8 2011/05/26 19:34:19 edwlan Exp $

-#  

+#

 #  Copyright (c) 2011 Edward Langley

 #  All rights reserved.

-#  

+#

 #  Redistribution and use in source and binary forms, with or without

 #  modification, are permitted provided that the following conditions

 #  are met:

-#  

+#

 #  Redistributions of source code must retain the above copyright notice,

 #  this list of conditions and the following disclaimer.

-#  

+#

 #  Redistributions in binary form must reproduce the above copyright

 #  notice, this list of conditions and the following disclaimer in the

 #  documentation and/or other materials provided with the distribution.

-#  

+#

 #  Neither the name of the project's author nor the names of its

 #  contributors may be used to endorse or promote products derived from

 #  this software without specific prior written permission.

-#  

+#

 #  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 #  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 #  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

@@ -30,10 +30,12 @@

 #  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#  

+#

 #

 import cgi

+import copy

 import time

+import itertools

 import jsonrpc.jsonutil

 # Twisted imports

@@ -60,7 +62,7 @@ class ServerEvents(object):

 		'''Override to implement custom handling of the method result and request'''

 		return result

-	def logerror(self, result, request):

+	def log(self, result, request):

 		'''Override to implement custom error handling'''

 		pass

@@ -107,43 +109,34 @@ class JSON_RPC(Resource):

 		request.write(result)

 		request.finish()

+	def _ebRender(self, result, request, id, finish=True):

+		self.eventhandler.log(result, request)

-	def _ebRender(self, result, request, content, *args, **kwargs):

-		result_template = dict(

-			jsonrpc='2.0',

-			error= dict(

-				code=0,

-				message='Stub Message',

-				data = 'Stub Data'

-		))

+		err = None

+		if not isinstance(result, BaseException):

+			try: result.raiseException()

+			except BaseException, e:

+				err = e

+		else: err = result

+		err = self.render_error(err, id)

-		try:

-			request.setHeader("X-Error", result.getErrorMessage())

-			result_template['error'].update(

-					code=0,

-					message=' '.join(str(x) for x in result.value),

-					data=content

-			)

-			if isinstance(content, list):

-				result_template['id'] = content[0].get('id', '<NULL>')

-				result_template = [result]

-			else: result_template['id'] = content.get('id')

-		except Exception, e:

-			result_template['error'].update(

-				code = 0,

-				message = 'Error in errorpage: %s' % e,

-				data = ''

-			)

-

-		result = result_template

-		result['error']['message'] = cgi.escape(result['error']['message'])

-		result = jsonrpc.jsonutil.encode(result)

-		result = result.encode('utf-8')

+		request.setHeader("content-type", 'application/json')

+		request.setResponseCode(200)

+		result = jsonrpc.jsonutil.encode(err).encode('utf-8')

 		request.setHeader("content-length", len(result))

-		request.setResponseCode(500)

-		self.eventhandler.logerror(result, request)

 		request.write(result)

-		request.finish()

+		if finish: request.finish()

+

+

+	def get_result(method_result, content, template):

+		template['error'].update(

+				code=0,

+				message=cgi.escape(' '.join(str(x) for x in method_result.value)),

+				data=content

+		)

+		template['id'] = content.get(id)

+		return template

+

 	def render(self, request):

@@ -151,12 +144,28 @@ class JSON_RPC(Resource):

 		host = request.getClientIP()

 		request.content.seek(0, 0)

-		content = jsonrpc.jsonutil.decode(request.content.read())

-		d = threads.deferToThread(self._action, request, content, ctxid=ctxid, host=host)

-		d.addCallback(self._cbRender, request)

-		d.addErrback(self._ebRender, request, content)

+		try:

+			content = jsonrpc.jsonutil.decode(request.content.read())

+			d = threads.deferToThread(self._action, request, content, ctxid=ctxid, host=host)

+			d.addCallback(self._cbRender, request)

+			d.addErrback(self._ebRender, request, content.get('id') if hasattr(content, 'get') else None)

+		except BaseException, e:

+			self._ebRender(e, request, None)

+

 		return server.NOT_DONE_YET

+	def render_error(self, e, id):

+		err = dict(

+			jsonrpc='2.0',

+			id = id,

+			error= dict(

+				code=0,

+				message=str(e),

+				data = e.args

+		))

+		return err

+

+

 	def _action(self, request, contents, **kw):

 		result = []

@@ -165,19 +174,23 @@ class JSON_RPC(Resource):

 			contents = [contents]

 		for content in contents:

-			res = dict(

-				jsonrpc = '2.0',

-				id = content.get('id'),

-				result = self.eventhandler.callmethod(request, *self._parse_data(content), **kw)

-			)

+			try:

+				res = dict(

+					jsonrpc = '2.0',

+					id = content.get('id'),

+					result = self.eventhandler.callmethod(request, *self._parse_data(content), **kw)

+				)

-			res = self.eventhandler.processrequest(res, request.args)

+				res = self.eventhandler.processrequest(res, request.args)

-			result.append(res)

+				result.append(res)

+			except Exception, e:

+				err = self.render_error(e, content.get('id'))

+				result.append(err)

-		return ( result if ol else result[0] )

+		self.eventhandler.log(result, request)

+		return ( result if ol else result[0] )

-__version__ = "$Revision: 1.8 $".split(":")[1][:-1].strip()