michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-06-20 16:40:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: fix mediaobject polymorphism

Browse Source
This commit is contained in:
Koushik Dutta
2023-03-10 19:46:38 -08:00
parent 44f083ca23
commit 2bd3592aad
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/python/rpc.py
View File

@@ -106,7 +106,7 @@ class RpcPeer:
serializationContext: Dict = {}
serializedArgs = []
for arg in args:
serializedArgs.append(self.serialize(arg, False, serializationContext))
serializedArgs.append(self.serialize(arg, serializationContext))
rpcApply = {
'type': 'apply',
@@ -184,8 +184,11 @@ class RpcPeer:
}
return props
def serialize(self, value, requireProxy, serializationContext: Dict):
if (not value or (not requireProxy and type(value) in jsonSerializable)):
def isTransportSafe(value: any):
return not value or (type(value) in jsonSerializable)
def serialize(self, value, serializationContext: Dict):
if (RpcPeer.isTransportSafe(value)):
return value
__remote_constructor_name = 'Function' if callable(value) else value.__proxy_constructor if hasattr(
@@ -332,8 +335,7 @@ class RpcPeer:
try:
value = self.params.get(message['param'], None)
value = await maybe_await(value)
result['result'] = self.serialize(
value, message.get('requireProxy', None), serializationContext)
result['result'] = self.serialize(value, serializationContext)
except Exception as e:
tb = traceback.format_exc()
self.createErrorResult(
@@ -370,7 +372,7 @@ class RpcPeer:
else:
value = await maybe_await(target(*args))
result['result'] = self.serialize(value, False, serializationContext)
result['result'] = self.serialize(value, serializationContext)
except StopAsyncIteration as e:
self.createErrorResult(result, e)
except Exception as e: