feat(json-pack): 🎸 add verbatim string encoding

streamich · Dec 10, 2023 · f83e440 · f83e440
1 parent 039b7f8
commit f83e440
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 39 deletions.
diff --git a/src/json-pack/resp/Resp2Encoder.ts b/src/json-pack/resp/Resp2Encoder.ts
@@ -156,6 +156,27 @@ export class Resp2Encoder<W extends IWriter & IWriterGrowable = IWriter & IWrite
     else this.writeBulkStr(str);
   }
 
+  public writeVerbatimStr(encoding: string, str: string): void {
+    const writer = this.writer;
+    writer.u8(61); // =
+    writer.ascii(str.length + '');
+    writer.u16(rn); // \r\n
+    writer.u32(
+      (encoding.charCodeAt(0) * 0x1000000) +
+      (encoding.charCodeAt(1) << 16) +
+      (encoding.charCodeAt(2) << 8) +
+      58 // :
+    );
+    writer.ascii(str);
+    writer.u16(rn); // \r\n
+  }
+
+  public writeErr(str: string): void {
+    const isSimple = !REG_RN.test(str);
+    if (isSimple) this.writeSimpleErr(str);
+    else this.writeBulkErr(str);
+  }
+
   public writeSimpleErr(str: string): void {
     const writer = this.writer;
     writer.u8(45); // -
@@ -172,12 +193,6 @@ export class Resp2Encoder<W extends IWriter & IWriterGrowable = IWriter & IWrite
     writer.u16(rn); // \r\n
   }
 
-  public writeErr(str: string): void {
-    const isSimple = !REG_RN.test(str);
-    if (isSimple) this.writeSimpleErr(str);
-    else this.writeBulkErr(str);
-  }
-
   public writeArr(arr: unknown[]): void {
     const writer = this.writer;
     const length = arr.length;

diff --git a/src/json-pack/resp/__tests__/Resp2Encoder.spec.ts b/src/json-pack/resp/__tests__/Resp2Encoder.spec.ts
@@ -24,39 +24,57 @@ const toStr = (uint8: Uint8Array): string => {
   return Buffer.from(uint8).toString();
 };
 
-describe('.writeSimpleStr()', () => {
-  test('empty string', () => {
-    const encoder = new Resp2Encoder();
-    encoder.writeSimpleStr('');
-    const encoded = encoder.writer.flush();
-    expect(toStr(encoded)).toBe('+\r\n');
-    expect(parse(encoded)).toBe('');
-  });
-
-  test('short string', () => {
-    const encoder = new Resp2Encoder();
-    encoder.writeSimpleStr('abc!');
-    const encoded = encoder.writer.flush();
-    expect(toStr(encoded)).toBe('+abc!\r\n');
-    expect(parse(encoded)).toBe('abc!');
-  });
-});
-
-describe('.writeBulkStr()', () => {
-  test('empty string', () => {
-    const encoder = new Resp2Encoder();
-    encoder.writeBulkStr('');
-    const encoded = encoder.writer.flush();
-    expect(toStr(encoded)).toBe('$0\r\n\r\n');
-    expect(parse(encoded)).toBe('');
-  });
-
-  test('short string', () => {
-    const encoder = new Resp2Encoder();
-    encoder.writeBulkStr('abc!');
-    const encoded = encoder.writer.flush();
-    expect(toStr(encoded)).toBe('$4\r\nabc!\r\n');
-    expect(parse(encoded)).toBe('abc!');
+describe('strings', () => {
+  describe('.writeSimpleStr()', () => {
+    test('empty string', () => {
+      const encoder = new Resp2Encoder();
+      encoder.writeSimpleStr('');
+      const encoded = encoder.writer.flush();
+      expect(toStr(encoded)).toBe('+\r\n');
+      expect(parse(encoded)).toBe('');
+    });
+
+    test('short string', () => {
+      const encoder = new Resp2Encoder();
+      encoder.writeSimpleStr('abc!');
+      const encoded = encoder.writer.flush();
+      expect(toStr(encoded)).toBe('+abc!\r\n');
+      expect(parse(encoded)).toBe('abc!');
+    });
+  });
+
+  describe('.writeBulkStr()', () => {
+    test('empty string', () => {
+      const encoder = new Resp2Encoder();
+      encoder.writeBulkStr('');
+      const encoded = encoder.writer.flush();
+      expect(toStr(encoded)).toBe('$0\r\n\r\n');
+      expect(parse(encoded)).toBe('');
+    });
+
+    test('short string', () => {
+      const encoder = new Resp2Encoder();
+      encoder.writeBulkStr('abc!');
+      const encoded = encoder.writer.flush();
+      expect(toStr(encoded)).toBe('$4\r\nabc!\r\n');
+      expect(parse(encoded)).toBe('abc!');
+    });
+  });
+
+  describe('.writeVerbatimStr()', () => {
+    test('empty string', () => {
+      const encoder = new Resp2Encoder();
+      encoder.writeVerbatimStr('txt', '');
+      const encoded = encoder.writer.flush();
+      expect(toStr(encoded)).toBe('=0\r\ntxt:\r\n');
+    });
+
+    // test('empty string', () => {
+    //   const encoder = new Resp2Encoder();
+    //   encoder.writeVerbatimStr('txt', '');
+    //   const encoded = encoder.writer.flush();
+    //   expect(toStr(encoded)).toBe('=0\r\ntxt:\r\n');
+    // });
   });
 });