replace @tls/struct with @aicone/byte

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/enum",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]
@@ -17,11 +17,11 @@
     }
   },
   "imports": {
+    "@aicone/byte": "jsr:@aicone/byte@^0.7.9",
     "@noble/curves": "npm:@noble/curves@^1.8.1",
     "@noble/hashes": "jsr:@noble/hashes@^1.7.1",
     "@peculiar/x509": "npm:@peculiar/x509@^1.12.3",
     "@std/assert": "jsr:@std/assert@^1.0.12",
-    "@tls/struct": "jsr:@tls/struct@^0.4.1",
     "ec-key": "npm:ec-key@^0.0.6",
     "elliptic": "npm:elliptic@^6.6.1"
   }

src/cipher.js

@@ -42,8 +42,7 @@ export class Cipher extends Enum {
       return Cipher.fromValue(copy)
    }
 
-   get Uint16() { return Uint16.fromValue(this.value); }
-   get byte() { return this.Uint16 }
+   get byte() { return Uint16.fromValue(+this) }
    get length() { return 2 }
 
    get hashLength() {

src/contentype.js

@@ -1,7 +1,6 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/contentype.d.ts"
 
-import { Uint8 } from "./dep.ts";
 import { Enum } from "./enum.js";
 
 /**
@@ -28,10 +27,7 @@ export class ContentType extends Enum {
       return ContentType.fromValue(octet[0]) ?? Error(`Unknown ${octet[0]} ContentType type`);
    }
 
-   get Uint8() {
-      return Uint8.fromValue(+this)
-   }
-   get byte() { return this.Uint8 }
+   get byte() { return Uint8Array.of(+this) }
    get length(){ return 1 }
 
    /**return 8 */

src/dep.ts

@@ -1,4 +1,4 @@
-export * from "@tls/struct"
+export * from "@aicone/byte"
 export { p256 } from '@noble/curves/p256'
 export { p384 } from '@noble/curves/p384'
 export { p521 } from '@noble/curves/p521'

src/extensiontype.js

@@ -206,10 +206,7 @@ export class ExtensionType extends Enum {
       return ExtensionType.fromValue(value) ?? Error(`Unknown ${value} extension type`);
    }
 
-   get Uint16() {
-      return Uint16.fromValue(+this)
-   }
-   get byte() { return this.Uint16 }
+   get byte() { return Uint16.fromValue(+this) }
 
    /**
     * Bit 16

src/handshaketype.js

@@ -1,8 +1,6 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/handshaketype.d.ts"
 import { Enum } from "./enum.js";
-import { Uint8 } from "./dep.ts";
-
 
 /**
  * Represents TLS 1.3 Handshake message types as defined in RFC 8446 Section 4
@@ -101,8 +99,7 @@ export class HandshakeType extends Enum {
    /**return 8 */
    get bit() { return 8 }
    get length() { return 1 }
-   get Uint8() { return Uint8.fromValue(+this) }
-   get byte() { return this.Uint8 }
+   get byte() { return Uint8Array.of(+this) }
 }
 
 

src/namedgroup.js

@@ -1,7 +1,7 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/namedgroup.d.ts"
 
-import { p256, p384, p521, x25519, x448, Uint16, Constrained, Struct, safeuint8array } from "./dep.ts";
+import { p256, p384, p521, x25519, x448, Uint16 } from "./dep.ts";
 import { Enum } from "./enum.js";
 
 /**
@@ -58,13 +58,7 @@ export class NamedGroup extends Enum {
 
    }
 
-   /**
-    * Converts the NamedGroup to a Uint16 representation.
-    * 
-    * @returns {Uint16} The Uint16 representation of the NamedGroup.
-    */
-   get Uint16() { return Uint16.fromValue(+this); }
-   get byte() { return this.Uint16 }
+   get byte() { return Uint16.fromValue(+this) }
 
    /**
     * Gets the key generation algorithm associated with the NamedGroup.
@@ -122,20 +116,6 @@ export class NamedGroup extends Enum {
       return sharedKey;
    }
 
-   /**
-    * Creates a key share entry from the NamedGroup.
-    * 
-    * @returns {KeyShareEntry} A new KeyShareEntry instance.
-    */
-   async keyShareEntryAsync() {
-      const key_exchange = KeyExchange.fromKey(await this.exportPublicKey()).key_exchange;
-      return KeyShareEntry.fromGroupKey(this, key_exchange);
-   }
-
-   keyShareEntry() {
-      return KeyShareEntry.fromGroupKey(this, this.publicKey);
-   }
-
    async keyPair() {
       if (this.#keyPair) return this.#keyPair
       let algo
@@ -187,117 +167,4 @@ export class NamedGroup extends Enum {
    }
 }
 
-/**
- * Represents a key exchange mechanism.
- */
-export class KeyExchange_0 extends Constrained {
-
-   static fromKey(octet) { return new KeyExchange_0(octet); }
-
-   static from(array) {
-      const copy = Uint8Array.from(array);
-      const lengthOf = Uint16.from(copy.subarray(0, 2)).value;
-      const octet = copy.subarray(2, 2 + lengthOf);
-      return new KeyExchange_0(octet);
-   }
-
-   constructor(octet) {
-      super(1, 65535, octet);
-      this.key_exchange = octet;
-   }
-}
-
-export class KeyExchange extends Uint8Array {
-   #lengthOf
-   #key_exchange
-   static sanitize(array) {
-      if (isUint8Array(array) == false) throw Error(`Expected Uint8Array`)
-      const lengthOf = Uint16.from(array).value;
-      if (lengthOf < 1) throw Error(`Minimum length is 1`)
-      if (lengthOf > 2 ** 16 - 1) throw Error(`Minimum length is 2**16-1`)
-      return [array.slice(0, 2 + lengthOf)]
-   }
-   static fromKey(key) {
-      if (isUint8Array(key) == false) throw Error(`Expected Uint8Array`)
-      const lengthOf = Uint16.fromValue(key.length)
-      return new KeyExchange(
-         safeuint8array(lengthOf, key)
-      );
-   }
-
-   static from(array) {
-      return new KeyExchange(array);
-   }
-
-   constructor(...args) {
-      args = isUint8Array(args[0]) ? KeyExchange.sanitize(args[0]) : args;
-      super(...args);
-   }
-
-   get lengthOf() {
-      if (this.#lengthOf) return this.#lengthOf
-      this.#lengthOf ||= Uint16.from(this.subarray(0, 2)).value;
-      return this.#lengthOf;
-   }
-
-   get key_exchange() {
-      if (this.#key_exchange) return this.#key_exchange;
-      this.#key_exchange ||= this.subarray(2, 2 + this.lengthOf);
-      return this.#key_exchange
-   }
-}
-
-/**
- * Represents a key share entry.
- */
-export class KeyShareEntry_0 extends Struct {
-
-   static from(array) {
-      const copy = Uint8Array.from(array);
-      const group = NamedGroup.from(copy.subarray(0, 2));
-      const key_exchange = KeyExchange.from(copy.subarray(2));
-      return new KeyShareEntry_0(group, key_exchange);
-   }
-
-   constructor(group, key_exchange) {
-      super(group.Uint16, key_exchange);
-      this.group = group;
-      this.key_exchange = key_exchange.key_exchange;
-   }
-}
-
-export class KeyShareEntry extends Uint8Array {
-   #group;
-   #key_exchange;
-   static fromGroupKey(group, key_exchange){
-      return KeyShareEntry.from(
-         safeuint8array(group.byte, KeyExchange.fromKey(key_exchange))
-      )
-   }
-   static from(array){ return new KeyShareEntry(array) }
-   constructor(...args) {
-      super(...args)
-   }
-   get group() {
-      if (this.#group) return this.#group;
-      this.#group ||= NamedGroup.from(this.subarray(0, 2));
-      return this.#group;
-   }
-   get key_exchange() {
-      if (this.#key_exchange) return this.#key_exchange;
-      this.#key_exchange ||= KeyExchange.from(this.subarray(2)).key_exchange;
-      return this.#key_exchange;
-   }
-}
-
-async function generateKey(algo) {
-   return await crypto.subtle.generateKey(
-      algo,
-      true,
-      ["deriveKey", "deriveBits"]
-   );
-}
-
-const isUint8Array = v => v instanceof Uint8Array
-
 // npx -p typescript tsc ./src/namedgroup.js --declaration --allowJs --emitDeclarationOnly --lib ESNext --outDir ./dist

src/pskmode.js

@@ -6,35 +6,34 @@ import { Enum } from "./enum.js";
 /**
  * PskKeyExchangeMode - @see https://datatracker.ietf.org/doc/html/rfc8446#section-4.4.2
  */
-export class PskKeyExchangeMode  extends Enum {
-   
-   
-   /**
-    * PSK-only key establishment
-    * In this mode, the server
-      MUST NOT supply a "key_share" value.
-    */
-   static PSK_KE = new PskKeyExchangeMode('PSK_KE', 0);
-
-   
-   /**
-    * PSK with (EC)DHE key establishment
-    * In this mode, the
-      client and server MUST supply "key_share" values as described in
-      Section 4.2.8.
-    */
-   static PSK_DHE_KE = new PskKeyExchangeMode('PSK_DHE_KE', 1);
-
-   static from(octet) {
-      return PskKeyExchangeMode.fromValue(octet[0]) ?? Error(`Unknown ${octet[0]} PskKeyExchangeMode type`);
-   }
-
-   /**return 8 */
-   get bit() { return 8 }
-   get length() { return 1 }
-
-   get Uint8() { return Uint8Array.of(+this)}
-   get byte() { return this.Uint8 }
+export class PskKeyExchangeMode extends Enum {
+
+
+  /**
+   * PSK-only key establishment
+   * In this mode, the server
+     MUST NOT supply a "key_share" value.
+   */
+  static PSK_KE = new PskKeyExchangeMode('PSK_KE', 0);
+
+
+  /**
+   * PSK with (EC)DHE key establishment
+   * In this mode, the
+     client and server MUST supply "key_share" values as described in
+     Section 4.2.8.
+   */
+  static PSK_DHE_KE = new PskKeyExchangeMode('PSK_DHE_KE', 1);
+
+  static from(octet) {
+    return PskKeyExchangeMode.fromValue(octet[0]) ?? Error(`Unknown ${octet[0]} PskKeyExchangeMode type`);
+  }
+
+  /**return 8 */
+  get bit() { return 8 }
+  get length() { return 1 }
+
+  get byte() { return Uint8Array.of(+this) }
 
 }
 

src/signaturescheme.js

@@ -72,13 +72,7 @@ export class SignatureScheme extends Enum {
    get bit() { return 16; }
    get length() { return 2; }
 
-   /**
-    * Converts the SignatureScheme to a Uint16 representation.
-    * 
-    * @returns {Uint16} The Uint16 representation of the SignatureScheme.
-    */
-   get Uint16() { return Uint16.fromValue(+this); }
-   get byte() { return this.Uint16 }
+   get byte() { return Uint16.fromValue(+this);  }
 
    get algo() {
       switch (this) {

src/version.js

@@ -68,8 +68,7 @@ export class Version extends Enum {
    get bit() { return 16 }
    get length(){ return 2 }
 
-   get Uint16() { return Uint16.fromValue(+this); }
-   get byte(){ return this.Uint16 }
+   get byte(){ return Uint16.fromValue(+this); }
 
 }