api.raw_eval and better error reporting

neumond · neumond · commit ad09602b01b9 · 2020-06-27T19:41:50.000+03:00
diff --git a/computercraft/back.lua b/computercraft/back.lua
@@ -6,6 +6,9 @@ local url = 'http://127.0.0.1:4343/'
 local tasks = {}
 
 ws = http.websocket(url..'ws/')
+if ws == false then
+    error('unable to connect to server '..url..'ws/')
+end
 ws.send(textutils.serializeJSON{
     action='run',
     computer=os.getComputerID(),
diff --git a/computercraft/server.py b/computercraft/server.py
@@ -74,18 +74,24 @@ def __init__(self, nid, program, cleanup_callback):
         self.window = WindowAPI(self)  # TODO: unimplemented
 
         async def prog_wrap():
+            err = None
             try:
                 await program(self)
             except asyncio.CancelledError:
                 print('program {} cancelled'.format(self._id))
                 print_exc()
+                err = 'program has been cancelled'
             except Exception as e:
                 print('program {} crashed: {} {}'.format(self._id, type(e), e))
                 print_exc()
+                err = type(e).__name__ + ': ' + str(e)
             else:
                 print('program {} finished'.format(self._id))
             finally:
-                await self._cmd.put({'action': 'close'})
+                c = {'action': 'close'}
+                if err is not None:
+                    c['error'] = err
+                await self._cmd.put(c)
                 cleanup_callback()
 
         self._task = asyncio.create_task(prog_wrap())
@@ -95,17 +101,20 @@ def _new_task_id(self):
         self._task_autoid += 1
         return task_id
 
-    async def _send_cmd(self, lua):
+    async def raw_eval(self, lua_code):
         task_id = self._new_task_id()
         self._result_locks[task_id] = asyncio.Event()
         await self._cmd.put({
             'action': 'task',
             'task_id': task_id,
-            'code': lua,
+            'code': lua_code,
         })
         await self._result_locks[task_id].wait()
         del self._result_locks[task_id]
-        result = self._result_values.pop(task_id)
+        return self._result_values.pop(task_id)
+
+    async def _send_cmd(self, lua):
+        result = await self.raw_eval(lua)
         print('{} → {}'.format(lua, result))
         if not result[0]:
             raise LuaException(*result[1:])
