wip

Author: kuhe

packages/core/src/submodules/cbor/ByteVector.ts

@@ -1,5 +1,7 @@
 import { fromUtf8 } from "@smithy/util-utf8";
 
+import { alloc } from "./cbor-types";
+
 const USE_BUFFER = typeof Buffer !== "undefined";
 const USE_TEXT_ENCODER = typeof TextEncoder !== "undefined";
 
@@ -13,8 +15,8 @@ type BufferWithUtf8Write = Buffer & {
  *
  */
 export class ByteVector {
-  private data: Uint8Array = new Uint8Array();
-  private dataView: DataView = new DataView(this.data.buffer, 0, 0);
+  private data: Uint8Array = alloc(0);
+  private dataView: DataView = new DataView(this.data.buffer, this.data.byteOffset, this.data.byteLength);
   private cursor: number = 0;
   private textEncoder: TextEncoder | null = USE_TEXT_ENCODER ? new TextEncoder() : null;
 
@@ -88,12 +90,13 @@ export class ByteVector {
   }
 
   public toUint8Array(): Uint8Array {
-    const out = new Uint8Array(this.cursor);
+    const out = alloc(this.cursor);
     out.set(this.data.subarray(0, this.cursor), 0);
     this.cursor = 0;
     if (this.data.length > this.initialSize) {
-      this.data = new Uint8Array(this.initialSize);
-      this.dataView = new DataView(this.data.buffer, 0, this.initialSize);
+      this.data = alloc(this.initialSize);
+      const { buffer, byteOffset, byteLength } = this.data;
+      this.dataView = new DataView(buffer, byteOffset, byteLength);
     }
     return out;
   }
@@ -109,11 +112,12 @@ export class ByteVector {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   private resize(size: number) {
     const data = this.data;
-    this.data = USE_BUFFER ? Buffer.allocUnsafeSlow(size) : new Uint8Array(size);
+    this.data = alloc(size);
     if (data) {
       this.data.set(data, 0);
     }
-    this.dataView = new DataView(this.data.buffer, 0, size);
+    const { buffer, byteOffset, byteLength } = this.data;
+    this.dataView = new DataView(buffer, byteOffset, byteLength);
   }
 }
 

packages/core/src/submodules/cbor/DecodeView.ts

@@ -1,13 +1,15 @@
 import { toUtf8 } from "@smithy/util-utf8";
 
+import { alloc } from "./cbor-types";
+
 const USE_TEXT_DECODER = typeof TextDecoder !== "undefined";
 
 /**
  * Data container for synchronous decoding.
  */
 export class DecodeView {
-  public payload = new Uint8Array();
-  public dataView = new DataView(this.payload.buffer, 0, this.payload.length);
+  public payload = alloc(0);
+  public dataView = new DataView(this.payload.buffer, this.payload.byteOffset, this.payload.byteLength);
   private textDecoder = USE_TEXT_DECODER ? new TextDecoder() : null;
 
   public constructor(payload: Uint8Array) {
@@ -16,7 +18,8 @@ export class DecodeView {
 
   public set(payload: Uint8Array) {
     this.payload = payload;
-    this.dataView = new DataView(this.payload.buffer, 0, this.payload.length);
+    const { buffer, byteOffset, byteLength } = this.payload;
+    this.dataView = new DataView(buffer, byteOffset, byteLength);
   }
 
   public toUtf8(bytes: Uint8Array, at: number, to: number): string {
@@ -27,4 +30,4 @@ export class DecodeView {
   }
 }
 
-export const decodeView = new DecodeView(new Uint8Array());
+export const decodeView = new DecodeView(alloc(0));