no more mountLayoutWithWebSocket

rmorshea · rmorshea · commit 220682d42389 · 2021-01-11T23:45:44.000-08:00
also remove pre-mature header/body fields
diff --git a/idom/client/app/index.html b/idom/client/app/index.html
@@ -8,7 +8,7 @@
   <body>
     <div id="app"></div>
     <script type="module">
-      import { mountLayoutWithWebSocket } from "idom-client-react";
+      import { mountLayout } from "idom-client-react";
 
       const uri = document.location.hostname + ":" + document.location.port;
       const url = (uri + document.location.pathname).split("/").slice(0, -1);
@@ -24,9 +24,23 @@
 
       let endpoint = protocol + "//" + url.join("/") + window.location.search;
 
-      mountLayoutWithWebSocket(
+      const ws = new WebSocket(endpoint);
+
+      function saveUpdateHook(update) {
+        ws.onmessage = (event) => {
+          const [pathPrefix, patch] = JSON.parse(event.data);
+          update(pathPrefix, patch);
+        };
+      }
+
+      function sendCallback(event) {
+        ws.send(JSON.stringify(event));
+      }
+
+      mountLayout(
         document.getElementById("app"),
-        endpoint,
+        saveUpdateHook,
+        sendCallback,
         "../web_modules/"
       );
     </script>
diff --git a/idom/client/app/package.json b/idom/client/app/package.json
@@ -23,7 +23,12 @@
     "react-dom": "^16.13.1"
   },
   "snowpack": {
-    "install": ["htm", "react", "react-dom", "idom-client-react"],
+    "install": [
+      "htm",
+      "react",
+      "react-dom",
+      "idom-client-react"
+    ],
     "installOptions": {
       "polyfillNode": true
     }
diff --git a/idom/server/sanic.py b/idom/server/sanic.py
@@ -84,8 +84,7 @@ async def sock_send(value: Any) -> None:
                 await socket.send(json.dumps(value))
 
             async def sock_recv() -> LayoutEvent:
-                message = json.loads(await socket.recv())
-                event = message["body"]["event"]
+                event = json.loads(await socket.recv())
                 return LayoutEvent(event["target"], event["data"])
 
             element_params = {k: request.args.get(k) for k in request.args}
diff --git a/sys b/sys
