use Map in KeyShareClientHello

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/extension",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]

src/keyshare.js

@@ -1,31 +1,29 @@
 //@ts-self-types = "../type/keyshare.d.ts"
 import { Constrained, Uint16, NamedGroup, KeyShareEntry } from "./dep.ts";
+import { parseItems } from "./utils.js";
 
 /**
  * Represents a KeyShare extension in the ClientHello message in TLS handshake.
  * This class holds multiple KeyShareEntry instances and manages their constraints.
  */
 export class KeyShareClientHello extends Constrained {
-   
+   keyShareEntries = new Map
    static fromKeyShareEntries(...keyShareEntries) {
       return new KeyShareClientHello(...keyShareEntries)
    }
 
    static from(array) {
       const copy = Uint8Array.from(array);
-      const l = Uint16.from(copy.subarray(0, 2)).value;
-      const keyShareEntries = []
-      for (let offset = 2; offset < l;) {
-         const keyShareEntry = KeyShareEntry.from(copy.subarray(offset));
-         keyShareEntries.push(keyShareEntry);
-         offset += keyShareEntry.length
-      }
+      const lengthOf = Uint16.from(copy.subarray(0, 2)).value;
+      const keyShareEntries = parseItems(copy, 2, lengthOf, KeyShareEntry);
       return new KeyShareClientHello(...keyShareEntries);
    }
 
    constructor(...keyShareEntries) {
       super(0, 65535, ...keyShareEntries)
-      this.keyShareEntries = new Set(keyShareEntries)
+      for(const {group, key_exchange} of keyShareEntries){
+         this.keyShareEntries.set(group, key_exchange);
+      }
    }
 }
 
@@ -34,7 +32,7 @@ export class KeyShareClientHello extends Constrained {
  * This class manages the NamedGroup for key share negotiation.
  */
 export class KeyShareHelloRetryRequest extends Uint16 {
-   
+
    static fromGroup(group) { return new KeyShareHelloRetryRequest(group) }
 
    static from(array) {

test/keyshare_test.js

@@ -1,8 +1,14 @@
+import { KeyShareClientHello } from "../src/keyshare.js";
 import { KeyShareServerHello } from "../src/keyshare.js";
+import { NamedGroup } from "../src/dep.ts";
 import { assertEquals } from "@std/assert";
 
 Deno.test("KeyShareServerHello", () => {
    const x25519 = Uint8Array.of(0, 29, 0, 32, 201, 130, 136, 118, 17, 32, 149, 254, 102, 118, 43, 219, 247, 198, 114, 225, 86, 214, 204, 37, 59, 131, 61, 241, 221, 105, 177, 176, 78, 117, 31, 15);
    const back = KeyShareServerHello.from(x25519)
    assertEquals(x25519.toString(), back.toString())
 })
+
+const keyShareClientHello = Uint8Array.of(0,36,0,29,0,32,153,56,29,229,96,228,189,67,210,61,142,67,90,125,186,254,179,192,110,81,193,60,174,77,84,19,105,30,82,154,175,44);
+
+const back = KeyShareClientHello.from(keyShareClientHello);