@scrypted/server 0.7.97 → 0.7.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.97",
+  "version": "0.7.99",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",

package/python/rpc_reader.py

@@ -5,10 +5,10 @@ import base64
 import json
 import os
 import threading
+from concurrent.futures import ThreadPoolExecutor
 from asyncio.events import AbstractEventLoop
 from typing import List, Any
 import multiprocessing.connection
-import aiofiles
 import rpc
 import concurrent.futures
 import json
@@ -52,29 +52,39 @@ class RpcTransport:
 
 
 class RpcFileTransport(RpcTransport):
-    reader: asyncio.StreamReader
+    executor: ThreadPoolExecutor
 
     def __init__(self, readFd: int, writeFd: int) -> None:
         super().__init__()
         self.readFd = readFd
         self.writeFd = writeFd
-        self.reader = None
-
-    async def prepare(self):
-        await super().prepare()
-        self.reader = await aiofiles.open(self.readFd, mode='rb')
-
-    async def read(self):
-        lengthBytes = await self.reader.read(4)
-        typeBytes = await self.reader.read(1)
+        self.executor = ThreadPoolExecutor(1, 'rpc-read')
+
+    def osReadExact(self, size: int):
+        b = bytes(0)
+        while size:
+            got = os.read(self.readFd, size)
+            if not len(got):
+                self.executor.shutdown(False)
+                raise Exception('rpc end of stream reached')
+            size -= len(got)
+            b += got
+        return b
+
+    def readMessageInternal(self):
+        lengthBytes = self.osReadExact(4)
+        typeBytes = self.osReadExact(1)
         type = typeBytes[0]
         length = int.from_bytes(lengthBytes, 'big')
-        data = await self.reader.read(length - 1)
+        data = self.osReadExact(length - 1)
         if type == 1:
             return data
         message = json.loads(data)
         return message
 
+    async def read(self):
+        return await asyncio.get_event_loop().run_in_executor(self.executor, lambda: self.readMessageInternal())
+
     def writeMessage(self, type: int, buffer, reject):
         length = len(buffer) + 1
         lb = length.to_bytes(4, 'big')