Merge pull request #318 from ravendb/315

Fixing multi-byte characters parsing from the server

Author: gregolsky

src/Http/RavenCommandResponsePipeline.ts

@@ -172,19 +172,27 @@ export class RavenCommandResponsePipeline<TStreamResult> extends EventEmitter {
                 streams.push(...opts.jsonAsync.filters);
             }
         } else if (opts.jsonSync) {
-            const jsonChunks = [];
+            const bytesChunks = [];
             const parseJsonSyncTransform = new stream.Transform({
                 readableObjectMode: true,
                 transform(chunk, enc, callback) {
-                    jsonChunks.push(chunk.toString("utf8"));
+                    bytesChunks.push(chunk);
                     callback();
                 },
                 flush(callback) {
+                    let str = null;
                     try {
-                        callback(null, JSON.parse(jsonChunks.join("")));
+                        str = Buffer.concat(bytesChunks).toString('utf-8');
+                    } catch(err){
+                        callback(
+                            getError("InvalidDataException", `Failed to concat / decode server response`, err));
+                        return;
+                    }
+                    try {
+                        callback(null, JSON.parse(str));
                     } catch (err) {
                         callback(
-                            getError("InvalidOperationException", `Error parsing response: '${jsonChunks.join("")}'.`, err));
+                            getError("InvalidOperationException", `Error parsing response: '${str}'.`, err));
                     }
                 }
             });

src/Utility/StreamUtil.ts

@@ -33,7 +33,7 @@ export async function readToEnd(readable: stream.Readable | stream.Stream): Prom
     readable.on("data", chunk => chunks.push(chunk));
 
     await finishedAsync(readable);
-    return chunks.join("");
+    return Buffer.concat(chunks).toString('utf-8');
 }
 
 export function bufferToReadable(b: Buffer) {

test/Issues/Github_315.ts

@@ -0,0 +1,42 @@
+import * as assert from "assert";
+import { testContext, disposeTestDocumentStore } from "../Utils/TestUtil";
+
+import {
+    IDocumentStore,
+} from "../../src";
+
+describe("Issue #315", function () {
+
+    let store: IDocumentStore;
+
+    beforeEach(async function () {
+        store = await testContext.getDocumentStore();
+    });
+
+    afterEach(async () =>
+        await disposeTestDocumentStore(store));
+
+    it("can use complex multi byte characters on load", async () => {
+
+        const str = '🐛'.repeat(50_000);
+        {
+            const session = store.openSession();
+            const doc = {'str': str};
+            await session.store(doc, "items/1");
+            await session.saveChanges();
+        }
+
+        {
+            const session = store.openSession();
+            const item = await session.load("items/1");
+            assert.ok(item);
+            assert.strictEqual(item['str'], str);
+        }
+
+        {
+            const session = store.openSession();
+            const item = (await session.advanced.rawQuery("from @all_docs").all())[0];
+            assert.strictEqual(item['str'], str);
+        }
+    });
+});

test/Ported/Issues/RavenDB_15497.ts

@@ -54,9 +54,9 @@ describe("RavenDB_15497", function () {
 
             await assertThrows(() => session.saveChanges(), e => {
                 assertThat(e.name)
-                    .isEqualTo("TimeoutException");
+                    .isEqualTo("RavenTimeoutException");
                 assertThat(e.message)
-                    .contains("System.TimeoutException");
+                    .contains("RavenTimeoutException");
                 assertThat(e.message)
                     .contains("could not verify that");
             });

test/Ported/Server/LogsConfigurationTest.ts

@@ -24,9 +24,9 @@ describe("LogsConfigurationTest", function () {
         let logsConfig = await store.maintenance.server.send(getOperation);
 
         assertThat(logsConfig.currentMode)
-            .isEqualTo("Operations");
+            .isEqualTo("None");
         assertThat(logsConfig.mode)
-            .isEqualTo("Operations");
+            .isEqualTo("None");
 
         // now try to set mode to operations and info
 
@@ -46,7 +46,7 @@ describe("LogsConfigurationTest", function () {
             assertThat(logsConfig.currentMode)
                 .isEqualTo("Information");
             assertThat(logsConfig.mode)
-                .isEqualTo("Operations");
+                .isEqualTo("None");
         } finally {
             // try to clean up
 

test/TestDriver/RavenServerRunner.ts

@@ -35,6 +35,7 @@ export abstract class RavenServerRunner {
             "--RunInMemory=true",
             "--License.Eula.Accepted=true",
             "--Setup.Mode=None",
+            "--Logs.Mode=None",
             `--Testing.ParentProcessId=${ process.pid }`,
             ...locator.getCommandArguments()
         ];