Parse resize payload early

asciinema · Jan 19, 2025 · 0506708 · 0506708
1 parent 026d8c8
commit 0506708
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/buffer.js b/src/buffer.js
@@ -44,8 +44,7 @@ function executeEvent(feed, resize) {
     if (code === "o") {
       feed(data);
     } else if (code === "r") {
-      const [cols, rows] = data.split("x");
-      resize(cols, rows);
+      resize(data.cols, data.rows);
     }
   }
 }

diff --git a/src/driver/websocket/alis.js b/src/driver/websocket/alis.js
@@ -73,7 +73,7 @@ function alisHandler(buffer) {
         const cols = view.getUint16(5, true);
         const rows = view.getUint16(7, true);
 
-        return [time, "r", `${cols}x${rows}`];
+        return [time, "r", { cols, rows }];
       } else if (type === 0x6d) {
         // 'm' - marker
         const time = view.getFloat32(1, true);

diff --git a/src/driver/websocket/json.js b/src/driver/websocket/json.js
@@ -7,7 +7,20 @@ function jsonHandler(buffer) {
 
   const meta = { cols: header.width, rows: header.height, time: 0.0 };
 
-  return { meta, handler: JSON.parse };
+  return {
+    meta,
+
+    handler: function(buffer) {
+      const event = JSON.parse(buffer);
+
+      if (event[1] === "r") {
+        const [cols, rows] = event[2].split("x");
+        return [event[0], "r", { cols, rows }];
+      } else {
+        return event;
+      }
+    }
+  }
 }
 
 export { jsonHandler };