@@ -37,6 +37,7 @@ import copy

 import time

 import itertools

 import jsonrpc.jsonutil

+import json

 # Twisted imports

 from twisted.web import server

@@ -55,8 +56,15 @@ class ServerEvents(object):

 		self.server = jsonrpc

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

-		'''Override to implement the methods the server will make available'''

-		return 'Test Result'

+		'''Finds the method and calls it with the specified args'''

+		method = self.findmethod(method)

+		if method is None: raise MethodNotFound

+

+		return method(*args, **kwargs)

+

+	def findmethod(self, method):

+		'''Override to allow server to define methods'''

+		return lambda *a, **kw: 'Test Data'

 	def processrequest(self, result, args):

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

@@ -66,8 +74,32 @@ class ServerEvents(object):

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

 		pass

+	def processcontent(self, content, request):

+		'''Given the freshly decoded content of the request, return what content should be used'''

+		return content

+

+

+class ServerError(Exception):

+	code = 0

+	msg = ""

+	id = None

+	def json_equivalent(self):

+		return dict(jsonrpc="2.0", error=dict(code=self.code, message=self.msg), id=self.id)

+	def __str__(self):

+		return jsonrpc.jsonutil.encode(self)

+class InvalidRequest(ServerError):

+	code = -32600

+	msg = "Invalid Request."

+

+class MethodNotFound(ServerError):

+	code = -32601

+	msg = "Procedure not found."

+

+class ParseError(ServerError):

+	code = -32700

+	msg = "Parse error."

 ## Base class providing a JSON-RPC 2.0 implementation with 2 customizable hooks

 class JSON_RPC(Resource):

@@ -87,26 +119,34 @@ class JSON_RPC(Resource):

 		self.customize(self.eventhandler)

 		Resource.__init__(self,*args, **kwargs)

-	def _parse_data(self, content):

-		if content.get('jsonrpc') != '2.0': raise ValueError, 'wrong JSON-RPC version'

-		method = content.get('method')

-		kwargs = content.get('params', {})

-		args = ()

-		if not isinstance(kwargs, dict):

-			args = tuple(kwargs)

-			kwargs = {}

-		else:

-			args = kwargs.pop('__args', args)

-		kwargs = dict( (str(k), v) for k,v in kwargs.items() )

-		return method, kwargs, args

+

+	def render(self, request):

+		#move to emen2 event handler

+		#ctxid = request.getCookie("ctxid") or request.args.get("ctxid", [None])[0]

+		#host = request.getClientIP()

+

+		request.content.seek(0, 0)

+		try:

+			try:

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

+			except ValueError: raise ParseError

+			content = self.eventhandler.processcontent(content, request)

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

+			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 _cbRender(self, result, request):

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

-		request.setResponseCode(200)

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

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

-		request.write(result)

+		if result is not None:

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

+			request.setResponseCode(200)

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

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

+			request.write(result)

 		request.finish()

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

@@ -127,70 +167,69 @@ class JSON_RPC(Resource):

 		request.write(result)

 		if finish: request.finish()

+	def _parse_data(self, content):

+		if content.get('jsonrpc') != '2.0': raise InvalidRequest

-	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

-

+		method = content.get('method')

+		if not isinstance(method, (str, unicode)): raise InvalidRequest

+		kwargs = content.get('params', {})

+		args = ()

+		if not isinstance(kwargs, dict):

+			args = tuple(kwargs)

+			kwargs = {}

+		else:

+			args = kwargs.pop('__args', args)

+		kwargs = dict( (str(k), v) for k,v in kwargs.items() )

-	def render(self, request):

-		ctxid = request.getCookie("ctxid") or request.args.get("ctxid", [None])[0]

-		host = request.getClientIP()

+		return method, kwargs, args

-		request.content.seek(0, 0)

-		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

-		))

+		if isinstance(e, ServerError):

+			e.id = id

+			err = e.json_equivalent()

+		else:

+			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):

+	def _action(self, request, contents):

 		result = []

 		ol = (True if isinstance(contents, list) else False)

-		if not ol:

-			contents = [contents]

+		if not ol: contents = [contents]

+

+		if contents == []: raise InvalidRequest

 		for content in contents:

 			try:

-				res = dict(

-					jsonrpc = '2.0',

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

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

-				)

+				res = dict(jsonrpc='2.0', id=content.get('id'), result=self.eventhandler.callmethod(request, *self._parse_data(content)))

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

-				result.append(res)

+				if res['id'] is not None: result.append(res)

 			except Exception, e:

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

-				result.append(err)

+				if err['id'] is not None: result.append(err)

+

 		self.eventhandler.log(result, request)

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

+		if result != []:

+			if not ol: result = result[0]

+		else: result = None

+

+		return result