remove jsr:@tls/struct replaced wih jsr:@aicone/byte

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/param",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]
@@ -13,9 +13,9 @@
     }
   },
   "imports": {
-    "@std/assert": "jsr:@std/assert@^1.0.2",
-    "@tls/enum": "jsr:@tls/enum@^0.9.0",
-    "@tls/extension": "jsr:@tls/extension@^0.4.7",
-    "@tls/struct": "jsr:@tls/struct@^0.3.8"
+    "@aicone/byte": "jsr:@aicone/byte@^0.7.9",
+    "@std/assert": "jsr:@std/assert@^1.0.12",
+    "@tls/enum": "jsr:@tls/enum@^0.9.3",
+    "@tls/extension": "jsr:@tls/extension@^0.5.5"
   }
 }

deno.lock

@@ -1,7 +1,7 @@
 //@ts-self-types="../type/certificatereq.d.ts" 
 
-import { Uint16, Extension, parseItems } from "./dep.ts";
-import { parseExtension } from "./utils.js";
+import { Uint16, Extension } from "./dep.ts";
+import { parseExtension, parseItems } from "./utils.js";
 
 /* class Extensions extends Constrained {
    static from(array) {

src/certificatereq.js

@@ -1,3 +1,3 @@
-export * from "@tls/struct"
 export * from "@tls/extension"
-export * from "@tls/enum"
+export * from "@tls/enum"
+export * from "@aicone/byte"

src/dep.ts

@@ -1,8 +1,8 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/encrypted.d.ts" 
-import { Uint16, parseItems } from "./dep.ts";
+import { Uint16 } from "./dep.ts";
 import { Extension } from "./dep.ts"
-import { parseExtension } from "./utils.js";
+import { parseExtension, parseItems } from "./utils.js";
 
 export class EncryptedExtensions extends Uint8Array {
    #extensions

src/encrypted.js

@@ -2,7 +2,7 @@ import {
    ExtensionType,
    NamedGroupList, RecordSizeLimit,
    KeyShareClientHello, ServerNameList, PskKeyExchangeModes,
-   Cookie, Supported_signature_algorithms,
+   Cookie, SignatureSchemeList,
    OfferedPsks,
    EarlyDataIndication,
    Padding,
@@ -21,7 +21,7 @@ export function parseExtension(extension) {
          extension.parser = Versions; break;
       }
       case ExtensionType.SIGNATURE_ALGORITHMS: {
-         extension.parser = Supported_signature_algorithms; break;
+         extension.parser = SignatureSchemeList; break;
       }
       case ExtensionType.SERVER_NAME: {
          extension.parser = extension.data.length ? ServerNameList : extension.data; break;
@@ -47,4 +47,25 @@ export function parseExtension(extension) {
       default:
          break;
    }
+}
+
+
+export function parseItems(copy, start, lengthOf, Fn, option = {}) {
+   if (start + lengthOf > copy.length) {
+      throw new RangeError("Specified length exceeds available data.");
+   }
+   const { parser= null, store= new Set(), storeset = (store, data)=>{store.set(data.key, data.value)} } = option
+   if (!(store instanceof Set || store instanceof Map || store instanceof Array)) {
+      throw new TypeError("store must be an instance of Set, Map, or Array.");
+   }
+
+   let offset = start;
+   while ((offset < lengthOf + start) && (offset < copy.length)) {
+      const item = Fn.from(copy.subarray(offset)); offset += item.length;
+      if (parser) parser(item)
+      if (store instanceof Set) store.add(item);
+      else if (store instanceof Map) storeset(store, item);
+      else store.push(item)
+   }
+   return store
 }

src/utils.js

@@ -1,29 +1,29 @@
-import { HexaDecimal } from "../src/dep.ts";
+import { Byte } from "../src/dep.ts";
 import { EncryptedExtensions } from "../src/encrypted.js";
 import { assertEquals } from "jsr:@std/assert";
 
 /* Deno.test("EncryptedExtension", ()=>{
-   const test = HexaDecimal.fromString(`08 00 00 28 00 26 00 0a 00 14 00
+   const test = Byte.fromHex(`08 00 00 28 00 26 00 0a 00 14 00
       12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 1c
-      00 02 40 01 00 00 00 00 00 2a 00 00`).byte
+      00 02 40 01 00 00 00 00 00 2a 00 00`)
 
    const back = EncryptedExtensions.fromHandshake(encryptedExtensionMsg).handshake;
    assertEquals(test.toString(), back.toString())
 }) */
 
-/* const encryptedExtensionMsg = HexaDecimal.fromString(`08 00 00 28 00 26 00 0a 00 14 00
+/* const encryptedExtensionMsg = Byte.fromHex(`08 00 00 28 00 26 00 0a 00 14 00
          12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 1c
-         00 02 40 01 00 00 00 00 00 2a 00 00`).byte
+         00 02 40 01 00 00 00 00 00 2a 00 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 test_1 = HexaDecimal.fromString(`00 26 00 0a 00 14 00
+const test_1 = Byte.fromHex(`00 26 00 0a 00 14 00
       12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 1c
-      00 02 40 01 00 00 00 00 00 2a 00 00`).byte
+      00 02 40 01 00 00 00 00 00 2a 00 00`)
 const back_1 = EncryptedExtensions.from(test_1)
 
 const _n = null;