@solidjs/start 0.4.8 → 0.4.9

package/config/server-runtime.jsx

@@ -13,54 +13,100 @@ import {
 } from 'seroval-plugins/web';
 import { createIslandReference } from "../server/islands";
 
-async function deserializeStream(id, response) {
-  if (!response.body) {
-    throw new Error("missing body");
+class ChunkReader {
+  constructor(stream) {
+    this.reader = stream.getReader();
+    this.buffer = '';
+    this.done = false;
   }
-  const reader = response.body.getReader();
-
-  async function pop() {
-    const result = await reader.read();
-    if (!result.done) {
-      const serialized = new TextDecoder().decode(result.value);
-      const splits = serialized.split("\n");
-      for (const split of splits) {
-        if (split !== "") {
-          deserialize(split);
-        }
-      }
-      await pop();
+
+  async readChunk() {
+    // if there's no chunk, read again
+    const chunk = await this.reader.read();
+    if (!chunk.done) {
+      // repopulate the buffer
+      this.buffer += new TextDecoder().decode(chunk.value);
+    } else {
+      this.done = true;
     }
   }
 
-  const result = await reader.read();
-  if (result.done) {
-    throw new Error("Unexpected end of body");
+  async nextValue() {
+    // Check if the buffer is empty
+    if (this.buffer === '') {
+      // if we are already one...
+      if (this.done) {
+        return {
+          done: true,
+          value: undefined,
+        };
+      }
+      // Otherwise, read a new chunk
+      await this.readChunk();
+    }
+    // Get the first valid seroval chunk
+    const [first, ...rest] = this.buffer.split('\n');
+    // Deserialize the seroval chunk
+    const result = {
+      done: false,
+      value: deserialize(first),
+    };
+    // if it succeeds, remove the first valid chunk
+    // from the buffer
+    this.buffer = rest.join('\n');
+    return result;
   }
-  const serialized = new TextDecoder().decode(result.value);
-  let pending = true;
-  let revived;
-  const splits = serialized.split("\n");
-  for (const split of splits) {
-    if (split !== "") {
-      const current = deserialize(split);
-      if (pending) {
-        revived = current;
-        pending = false;
+
+  async next() {
+    try {
+      // Attempt to read a valid seroval chunk
+      return await this.nextValue();
+    } catch (error) {
+      // If it happens that there's an error again
+      // and we are done reading the buffer
+      // then the whole stream is invalid.
+      if (this.done) {
+        throw new Error('Malformed server function stream.');
       }
+      // Since it's invalid (some syntax-related issue)
+      // we read a new chunk, and hope there's a valid
+      // seroval chunk there
+      await this.readChunk();
+      // Retry again
+      return await this.next();
     }
   }
 
-  pop().then(
-    () => {
-      delete $R[id];
-    },
-    () => {
-      // no-op
+  async drain() {
+    while (true) {
+      const result = await this.next();
+      if (result.done) {
+        break;
+      }
     }
-  );
+  }
+}
+
+async function deserializeStream(id, response) {
+  if (!response.body) {
+    throw new Error("missing body");
+  }
+  const reader = new ChunkReader(response.body);
+
+  const result = await reader.next();
+
+  if (!result.done) {
+    reader.drain().then(
+      () => {
+        delete $R[id];
+      },
+      () => {
+        // no-op
+      }
+    );
+  }
 
-  return revived;
+  return result.value;
 }
 
 let INSTANCE = 0;
@@ -108,7 +154,7 @@ async function fetchServerFunction(base, id, args) {
   let result;
   if (contentType && contentType.startsWith("text/plain")) {
     result = await response.text();
-  } else if(contentType && contentType.startsWith("application/json")) {
+  } else if (contentType && contentType.startsWith("application/json")) {
     result = await response.json();
   } else {
     result = deserializeStream(instance, response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -43,8 +43,8 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.10",
-    "vinxi": "0.1.1"
+    "solid-js": "^1.8.11",
+    "vinxi": "^0.1.2"
   },
   "dependencies": {
     "@vinxi/plugin-directives": "^0.1.0",