fix: undoing fix #1

[ci skip]
MatrixAI · Sep 15, 2023 · 5e65aef · 5e65aef
1 parent 54e7d41
commit 5e65aef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/src/utils/middleware.ts b/src/utils/middleware.ts
@@ -32,7 +32,8 @@ function binaryToJsonMessageStream<T extends JSONRPCMessage>(
   let bytesWritten: number = 0;
 
   return new TransformStream<Uint8Array, T>({
-    flush: async (controller) => {
+    flush: async () => {
+      // Avoid potential race conditions by allowing parser to end first
       const waitP = promise();
       parser.onEnd = () => waitP.resolveP();
       parser.end();
@@ -41,14 +42,11 @@ function binaryToJsonMessageStream<T extends JSONRPCMessage>(
     start: (controller) => {
       parser.onValue = (value) => {
         const jsonMessage = messageParser(value.value);
-        const jsonMessageString = JSON.stringify(jsonMessage);
-        const jsonMessageWithNewline = jsonMessageString + '\n';
-        const jsonMessageObject: T = JSON.parse(jsonMessageWithNewline) as T;
-        controller.enqueue(jsonMessageObject);
+        controller.enqueue(jsonMessage);
         bytesWritten = 0;
       };
     },
-    transform: (chunk, controller) => {
+    transform: (chunk) => {
       try {
         bytesWritten += chunk.byteLength;
         parser.write(chunk);

diff --git a/tests/utils/middleware.test.ts b/tests/utils/middleware.test.ts
@@ -18,36 +18,19 @@ describe('Middleware tests', () => {
     .noShrink();
 
   testProp(
-    'can parse json stream and are human readable',
+    'can parse json stream',
     [rpcTestUtils.jsonMessagesArb],
     async (messages) => {
-      let captured = '';
-
-      const captureStream = new TransformStream<
-        JSONRPCMessage<JSONValue>,
-        JSONRPCMessage<JSONValue>
-      >({
-        transform(chunk, controller) {
-          captured += JSON.stringify(chunk) + '\n'; // Assuming chunk can be serialized to JSON
-          controller.enqueue(chunk);
-        },
-      });
-
       const parsedStream = rpcTestUtils
         .messagesToReadableStream(messages)
         .pipeThrough(
           rpcUtilsMiddleware.binaryToJsonMessageStream(
             rpcUtils.parseJSONRPCMessage,
           ),
-        )
-        .pipeThrough(captureStream); // Converting back.
+        ); // Converting back.
 
       const asd = await AsyncIterable.as(parsedStream).toArray();
       expect(asd).toEqual(messages);
-
-      // Check readibility
-
-      expect(captured).toContain('\n');
     },
     { numRuns: 1000 },
   );