@twin.org/web 0.0.1-next.42 → 0.0.1-next.44

package/dist/cjs/index.cjs

@@ -727,21 +727,16 @@ class Jwk {
      */
     static async fromEd25519Private(privateKey) {
         core.Guards.uint8Array(Jwk._CLASS_NAME, "privateKey", privateKey);
-        try {
-            const publicKey = crypto.Ed25519.publicKeyFromPrivateKey(privateKey);
-            const jwk = {
-                kty: "OKP",
-                use: "sig",
-                alg: "EdDSA",
-                crv: "Ed25519",
-                x: core.Converter.bytesToBase64Url(publicKey),
-                d: core.Converter.bytesToBase64Url(privateKey)
-            };
-            return (await jose.importJWK(jwk));
-        }
-        catch (err) {
-            throw new core.GeneralError(Jwk._CLASS_NAME, "jwkImportFailed", undefined, err);
-        }
+        const publicKey = crypto.Ed25519.publicKeyFromPrivateKey(privateKey);
+        const jwk = {
+            kty: "OKP",
+            use: "enc",
+            alg: "EdDSA",
+            crv: "Ed25519",
+            x: core.Converter.bytesToBase64Url(publicKey),
+            d: core.Converter.bytesToBase64Url(privateKey)
+        };
+        return jwk;
     }
     /**
      * Convert the Ed25519 public key to a crypto key.
@@ -750,19 +745,34 @@ class Jwk {
      */
     static async fromEd25519Public(publicKey) {
         core.Guards.uint8Array(Jwk._CLASS_NAME, "publicKey", publicKey);
-        try {
-            const jwk = {
-                kty: "OKP",
-                use: "sig",
-                alg: "EdDSA",
-                crv: "Ed25519",
-                x: core.Converter.bytesToBase64Url(publicKey)
-            };
-            return (await jose.importJWK(jwk));
+        const jwk = {
+            kty: "OKP",
+            use: "sig",
+            alg: "EdDSA",
+            crv: "Ed25519",
+            x: core.Converter.bytesToBase64Url(publicKey)
+        };
+        return jwk;
+    }
+    /**
+     * Convert the JWK to raw keys.
+     * @param jwk The JWK to convert to raw.
+     * @returns The crypto key.
+     */
+    static async toRaw(jwk) {
+        core.Guards.object(Jwk._CLASS_NAME, "jwk", jwk);
+        let publicKey;
+        let privateKey;
+        if (core.Is.stringBase64Url(jwk.x)) {
+            publicKey = core.Converter.base64UrlToBytes(jwk.x);
         }
-        catch (err) {
-            throw new core.GeneralError(Jwk._CLASS_NAME, "jwkImportFailed", undefined, err);
+        if (core.Is.stringBase64Url(jwk.d)) {
+            privateKey = core.Converter.base64UrlToBytes(jwk.d);
         }
+        return {
+            publicKey,
+            privateKey
+        };
     }
 }
 
@@ -781,15 +791,16 @@ class Jws {
      * Create a signature.
      * @param privateKey The private key to use.
      * @param hash The hash to sign.
+     * @param algOverride An optional algorithm override.
      * @returns The signature.
      */
-    static async create(privateKey, hash) {
+    static async create(privateKey, hash, algOverride) {
         core.Guards.defined(Jws._CLASS_NAME, "privateKey", privateKey);
         core.Guards.uint8Array(Jws._CLASS_NAME, "hash", hash);
         try {
             const jws = await new jose.CompactSign(hash)
                 .setProtectedHeader({
-                alg: privateKey.algorithm.name,
+                alg: core.Is.uint8Array(privateKey) ? (algOverride ?? "EdDSA") : privateKey.algorithm.name,
                 b64: false,
                 crit: ["b64"]
             })
@@ -949,7 +960,7 @@ class Jwt {
         let finalKey = key;
         if (header.alg === "EdDSA" && core.Is.uint8Array(key)) {
             // Jose does not support Ed25519 keys in raw format, so we need to convert it to PKCS8.
-            finalKey = await crypto.Ed25519.privateKeyToPKCS8(key);
+            finalKey = await crypto.Ed25519.privateKeyToPkcs8(key);
         }
         return signer.sign(finalKey);
     }

package/dist/esm/index.mjs

@@ -725,21 +725,16 @@ class Jwk {
      */
     static async fromEd25519Private(privateKey) {
         Guards.uint8Array(Jwk._CLASS_NAME, "privateKey", privateKey);
-        try {
-            const publicKey = Ed25519.publicKeyFromPrivateKey(privateKey);
-            const jwk = {
-                kty: "OKP",
-                use: "sig",
-                alg: "EdDSA",
-                crv: "Ed25519",
-                x: Converter.bytesToBase64Url(publicKey),
-                d: Converter.bytesToBase64Url(privateKey)
-            };
-            return (await importJWK(jwk));
-        }
-        catch (err) {
-            throw new GeneralError(Jwk._CLASS_NAME, "jwkImportFailed", undefined, err);
-        }
+        const publicKey = Ed25519.publicKeyFromPrivateKey(privateKey);
+        const jwk = {
+            kty: "OKP",
+            use: "enc",
+            alg: "EdDSA",
+            crv: "Ed25519",
+            x: Converter.bytesToBase64Url(publicKey),
+            d: Converter.bytesToBase64Url(privateKey)
+        };
+        return jwk;
     }
     /**
      * Convert the Ed25519 public key to a crypto key.
@@ -748,19 +743,34 @@ class Jwk {
      */
     static async fromEd25519Public(publicKey) {
         Guards.uint8Array(Jwk._CLASS_NAME, "publicKey", publicKey);
-        try {
-            const jwk = {
-                kty: "OKP",
-                use: "sig",
-                alg: "EdDSA",
-                crv: "Ed25519",
-                x: Converter.bytesToBase64Url(publicKey)
-            };
-            return (await importJWK(jwk));
+        const jwk = {
+            kty: "OKP",
+            use: "sig",
+            alg: "EdDSA",
+            crv: "Ed25519",
+            x: Converter.bytesToBase64Url(publicKey)
+        };
+        return jwk;
+    }
+    /**
+     * Convert the JWK to raw keys.
+     * @param jwk The JWK to convert to raw.
+     * @returns The crypto key.
+     */
+    static async toRaw(jwk) {
+        Guards.object(Jwk._CLASS_NAME, "jwk", jwk);
+        let publicKey;
+        let privateKey;
+        if (Is.stringBase64Url(jwk.x)) {
+            publicKey = Converter.base64UrlToBytes(jwk.x);
         }
-        catch (err) {
-            throw new GeneralError(Jwk._CLASS_NAME, "jwkImportFailed", undefined, err);
+        if (Is.stringBase64Url(jwk.d)) {
+            privateKey = Converter.base64UrlToBytes(jwk.d);
         }
+        return {
+            publicKey,
+            privateKey
+        };
     }
 }
 
@@ -779,15 +789,16 @@ class Jws {
      * Create a signature.
      * @param privateKey The private key to use.
      * @param hash The hash to sign.
+     * @param algOverride An optional algorithm override.
      * @returns The signature.
      */
-    static async create(privateKey, hash) {
+    static async create(privateKey, hash, algOverride) {
         Guards.defined(Jws._CLASS_NAME, "privateKey", privateKey);
         Guards.uint8Array(Jws._CLASS_NAME, "hash", hash);
         try {
             const jws = await new CompactSign(hash)
                 .setProtectedHeader({
-                alg: privateKey.algorithm.name,
+                alg: Is.uint8Array(privateKey) ? (algOverride ?? "EdDSA") : privateKey.algorithm.name,
                 b64: false,
                 crit: ["b64"]
             })
@@ -947,7 +958,7 @@ class Jwt {
         let finalKey = key;
         if (header.alg === "EdDSA" && Is.uint8Array(key)) {
             // Jose does not support Ed25519 keys in raw format, so we need to convert it to PKCS8.
-            finalKey = await Ed25519.privateKeyToPKCS8(key);
+            finalKey = await Ed25519.privateKeyToPkcs8(key);
         }
         return signer.sign(finalKey);
     }

package/dist/types/utils/jwk.d.ts

@@ -15,11 +15,20 @@ export declare class Jwk {
      * @param privateKey The private key to use.
      * @returns The crypto key.
      */
-    static fromEd25519Private(privateKey: Uint8Array): Promise<CryptoKey>;
+    static fromEd25519Private(privateKey: Uint8Array): Promise<IJwk>;
     /**
      * Convert the Ed25519 public key to a crypto key.
      * @param publicKey The private key to use.
      * @returns The crypto key.
      */
-    static fromEd25519Public(publicKey: Uint8Array): Promise<CryptoKey>;
+    static fromEd25519Public(publicKey: Uint8Array): Promise<IJwk>;
+    /**
+     * Convert the JWK to raw keys.
+     * @param jwk The JWK to convert to raw.
+     * @returns The crypto key.
+     */
+    static toRaw(jwk: IJwk): Promise<{
+        publicKey?: Uint8Array;
+        privateKey?: Uint8Array;
+    }>;
 }

package/dist/types/utils/jws.d.ts

@@ -1,3 +1,4 @@
+import type { JwkCryptoKey } from "../models/jwkCryptoKey";
 /**
  * Class to handle JSON Web Signatures.
  */
@@ -6,9 +7,10 @@ export declare class Jws {
      * Create a signature.
      * @param privateKey The private key to use.
      * @param hash The hash to sign.
+     * @param algOverride An optional algorithm override.
      * @returns The signature.
      */
-    static create(privateKey: CryptoKey, hash: Uint8Array): Promise<string>;
+    static create(privateKey: JwkCryptoKey, hash: Uint8Array, algOverride?: string): Promise<string>;
     /**
      * Verify a signature.
      * @param jws The signature to verify.
@@ -16,5 +18,5 @@ export declare class Jws {
      * @param hash The hash to verify.
      * @returns True if the signature was verified.
      */
-    static verify(jws: string, publicKey: CryptoKey, hash: Uint8Array): Promise<boolean>;
+    static verify(jws: string, publicKey: JwkCryptoKey, hash: Uint8Array): Promise<boolean>;
 }

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/web - Changelog
 
-## 0.0.1-next.42
+## 0.0.1-next.44
 
 - Initial Release

package/docs/reference/classes/Jwk.md

@@ -38,7 +38,7 @@ The crypto key.
 
 ### fromEd25519Private()
 
-> `static` **fromEd25519Private**(`privateKey`): `Promise`\<`CryptoKey`\>
+> `static` **fromEd25519Private**(`privateKey`): `Promise`\<[`IJwk`](../interfaces/IJwk.md)\>
 
 Convert the Ed25519 private key to a crypto key.
 
@@ -52,7 +52,7 @@ The private key to use.
 
 #### Returns
 
-`Promise`\<`CryptoKey`\>
+`Promise`\<[`IJwk`](../interfaces/IJwk.md)\>
 
 The crypto key.
 
@@ -60,7 +60,7 @@ The crypto key.
 
 ### fromEd25519Public()
 
-> `static` **fromEd25519Public**(`publicKey`): `Promise`\<`CryptoKey`\>
+> `static` **fromEd25519Public**(`publicKey`): `Promise`\<[`IJwk`](../interfaces/IJwk.md)\>
 
 Convert the Ed25519 public key to a crypto key.
 
@@ -74,6 +74,28 @@ The private key to use.
 
 #### Returns
 
-`Promise`\<`CryptoKey`\>
+`Promise`\<[`IJwk`](../interfaces/IJwk.md)\>
+
+The crypto key.
+
+***
+
+### toRaw()
+
+> `static` **toRaw**(`jwk`): `Promise`\<\{ `publicKey`: `Uint8Array`; `privateKey`: `Uint8Array`; \}\>
+
+Convert the JWK to raw keys.
+
+#### Parameters
+
+##### jwk
+
+[`IJwk`](../interfaces/IJwk.md)
+
+The JWK to convert to raw.
+
+#### Returns
+
+`Promise`\<\{ `publicKey`: `Uint8Array`; `privateKey`: `Uint8Array`; \}\>
 
 The crypto key.

package/docs/reference/classes/Jws.md

@@ -16,7 +16,7 @@ Class to handle JSON Web Signatures.
 
 ### create()
 
-> `static` **create**(`privateKey`, `hash`): `Promise`\<`string`\>
+> `static` **create**(`privateKey`, `hash`, `algOverride`?): `Promise`\<`string`\>
 
 Create a signature.
 
@@ -24,7 +24,7 @@ Create a signature.
 
 ##### privateKey
 
-`CryptoKey`
+[`JwkCryptoKey`](../type-aliases/JwkCryptoKey.md)
 
 The private key to use.
 
@@ -34,6 +34,12 @@ The private key to use.
 
 The hash to sign.
 
+##### algOverride?
+
+`string`
+
+An optional algorithm override.
+
 #### Returns
 
 `Promise`\<`string`\>
@@ -58,7 +64,7 @@ The signature to verify.
 
 ##### publicKey
 
-`CryptoKey`
+[`JwkCryptoKey`](../type-aliases/JwkCryptoKey.md)
 
 The public key to verify the signature with.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/web",
-	"version": "0.0.1-next.42",
+	"version": "0.0.1-next.44",
 	"description": "Contains classes for use with web operations",
 	"repository": {
 		"type": "git",
@@ -14,8 +14,8 @@
 		"node": ">=20.0.0"
 	},
 	"dependencies": {
-		"@twin.org/core": "0.0.1-next.42",
-		"@twin.org/crypto": "0.0.1-next.42",
+		"@twin.org/core": "0.0.1-next.44",
+		"@twin.org/crypto": "0.0.1-next.44",
 		"@twin.org/nameof": "next",
 		"jose": "6.0.8"
 	},