revise EncryptedExtension

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/param",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]
@@ -14,8 +14,8 @@
   },
   "imports": {
     "@std/assert": "jsr:@std/assert@^1.0.2",
-    "@tls/enum": "jsr:@tls/enum@^0.6.5",
+    "@tls/enum": "jsr:@tls/enum@^0.6.6",
     "@tls/extension": "jsr:@tls/extension@^0.2.9",
-    "@tls/struct": "jsr:@tls/struct@^0.3.6"
+    "@tls/struct": "jsr:@tls/struct@^0.3.7"
   }
 }

deno.lock

@@ -1,7 +1,7 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/encrypted.d.ts" 
 import { ContentType, HandshakeType } from "./dep.ts";
-import { Uint16, Constrained, Uint24 } from "./dep.ts";
+import { Uint16, Constrained, Uint24, parseItems } from "./dep.ts";
 import {
    Extension, ExtensionType,
    NamedGroupList, RecordSizeLimit,
@@ -19,16 +19,19 @@ export class EncryptedExtensions extends Constrained {
    ext = new Set;
    static fromExtensions(...extensions) { return new EncryptedExtensions(...extensions) }
    static fromHandshake(array) {
-      const copy = array.slice();
-      const _type = HandshakeType.from(copy);
-      const _lengthOf = Uint24.from(copy.subarray(1)).value;
+      const copy = Uint8Array.from(array);
+      const type = HandshakeType.from(copy);
+      if (type !== HandshakeType.ENCRYPTED_EXTENSIONS) return TypeError(`Expected EncryptedExtension`)
+      const lengthOf = Uint24.from(copy.subarray(1)).value;
+      if (lengthOf == 2) return new EncryptedExtensions
       return EncryptedExtensions.from(copy.subarray(4))
    }
    static from(array) {
       const copy = Uint8Array.from(array)
-      if (copy.length == 0) return new EncryptedExtensions
-      const extensions = Extensions.from(copy.subarray());
-      return new EncryptedExtensions(...extensions.extensions)
+      const lengthOf = Uint16.from(copy).value;
+      if (lengthOf == 0) return new EncryptedExtensions
+      const extensions = parseItems(copy, 2, lengthOf, Extension);//_Extensions.from(copy.subarray());
+      return new EncryptedExtensions(...extensions)
    }
 
    constructor(...extensions) {
@@ -45,22 +48,22 @@ export class EncryptedExtensions extends Constrained {
    }
 }
 
-class Extensions extends Constrained {
-   static fromExtension(...extensions) { return new Extensions(...extensions) }
+class _Extensions extends Constrained {
+   static fromExtension(...extensions) { return new _Extensions(...extensions) }
    static from(array) {
       const copy = Uint8Array.from(array);
       const _lengthOf = Uint16.from(copy).value;
       const extensions = [];
       let offset = 2;
       //for (let offset = 2; offset < lengthOf + 2;) {
-         //if (offset > copy.length - 2) break;
-      while(true){
+      //if (offset > copy.length - 2) break;
+      while (true) {
          const extension = Extension.from(copy.subarray(offset)); offset += extension.length
          parseExtension(extension);
          extensions.push(extension)
          if (offset >= copy.length - 2) break;
       }
-      return new Extensions(...extensions)
+      return new _Extensions(...extensions)
    }
    constructor(...extensions) {
       super(0, 2 ** 16 - 1, ...extensions)

src/encrypted.js

@@ -18,5 +18,9 @@ const encryptedExtensionMsg = HexaDecimal.fromString(`08 00 00 28 00 26 00 0a 00
 
 const back = EncryptedExtensions.fromHandshake(encryptedExtensionMsg).handshake;
 
+const test = Uint8Array.of(8,0,0,2,0,0);
+const back_0 = EncryptedExtensions.fromHandshake(test);
+const back_1 = EncryptedExtensions.from(test.subarray(4))
+
 const _n = null;