@twin.org/web 0.0.1-next.53 → 0.0.1-next.55

package/dist/cjs/index.cjs

@@ -543,7 +543,7 @@ class FetchHelper {
                 if (isErr && core.Is.stringValue(err.message) && err.message.includes("Failed to fetch")) {
                     lastError = new FetchError(source, `${FetchHelper._CLASS_NAME_CAMEL_CASE}.connectivity`, HttpStatusCode.serviceUnavailable, {
                         url
-                    });
+                    }, err);
                 }
                 else {
                     const isAbort = isErr && err.name === "AbortError";
@@ -558,7 +558,7 @@ class FetchHelper {
                     if (isErr && "statusText" in err) {
                         props.statusText = err.statusText;
                     }
-                    lastError = new FetchError(source, `${FetchHelper._CLASS_NAME_CAMEL_CASE}.${isAbort ? "timeout" : "general"}`, httpStatus, props);
+                    lastError = new FetchError(source, `${FetchHelper._CLASS_NAME_CAMEL_CASE}.${isAbort ? "timeout" : "general"}`, httpStatus, props, err);
                 }
             }
             finally {
@@ -718,12 +718,13 @@ class Jwk {
     /**
      * Convert the JWK to a crypto key.
      * @param jwk The JWK to convert.
+     * @param alg The alg to be used, defaults to jwk.alg.
      * @returns The crypto key.
      */
-    static async toCryptoKey(jwk) {
+    static async toCryptoKey(jwk, alg) {
         core.Guards.object(Jwk._CLASS_NAME, "jwk", jwk);
         try {
-            return jose.importJWK(jwk);
+            return jose.importJWK(jwk, alg);
         }
         catch (err) {
             throw new core.GeneralError(Jwk._CLASS_NAME, "jwkImportFailed", undefined, err);
@@ -809,7 +810,7 @@ class Jws {
         try {
             const jws = await new jose.CompactSign(hash)
                 .setProtectedHeader({
-                alg: core.Is.uint8Array(privateKey) ? (algOverride ?? "EdDSA") : privateKey.algorithm.name,
+                alg: algOverride ?? (core.Is.uint8Array(privateKey) ? "EdDSA" : privateKey.algorithm.name),
                 b64: false,
                 crit: ["b64"]
             })

package/dist/esm/index.mjs

@@ -541,7 +541,7 @@ class FetchHelper {
                 if (isErr && Is.stringValue(err.message) && err.message.includes("Failed to fetch")) {
                     lastError = new FetchError(source, `${FetchHelper._CLASS_NAME_CAMEL_CASE}.connectivity`, HttpStatusCode.serviceUnavailable, {
                         url
-                    });
+                    }, err);
                 }
                 else {
                     const isAbort = isErr && err.name === "AbortError";
@@ -556,7 +556,7 @@ class FetchHelper {
                     if (isErr && "statusText" in err) {
                         props.statusText = err.statusText;
                     }
-                    lastError = new FetchError(source, `${FetchHelper._CLASS_NAME_CAMEL_CASE}.${isAbort ? "timeout" : "general"}`, httpStatus, props);
+                    lastError = new FetchError(source, `${FetchHelper._CLASS_NAME_CAMEL_CASE}.${isAbort ? "timeout" : "general"}`, httpStatus, props, err);
                 }
             }
             finally {
@@ -716,12 +716,13 @@ class Jwk {
     /**
      * Convert the JWK to a crypto key.
      * @param jwk The JWK to convert.
+     * @param alg The alg to be used, defaults to jwk.alg.
      * @returns The crypto key.
      */
-    static async toCryptoKey(jwk) {
+    static async toCryptoKey(jwk, alg) {
         Guards.object(Jwk._CLASS_NAME, "jwk", jwk);
         try {
-            return importJWK(jwk);
+            return importJWK(jwk, alg);
         }
         catch (err) {
             throw new GeneralError(Jwk._CLASS_NAME, "jwkImportFailed", undefined, err);
@@ -807,7 +808,7 @@ class Jws {
         try {
             const jws = await new CompactSign(hash)
                 .setProtectedHeader({
-                alg: Is.uint8Array(privateKey) ? (algOverride ?? "EdDSA") : privateKey.algorithm.name,
+                alg: algOverride ?? (Is.uint8Array(privateKey) ? "EdDSA" : privateKey.algorithm.name),
                 b64: false,
                 crit: ["b64"]
             })

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

@@ -7,9 +7,10 @@ export declare class Jwk {
     /**
      * Convert the JWK to a crypto key.
      * @param jwk The JWK to convert.
+     * @param alg The alg to be used, defaults to jwk.alg.
      * @returns The crypto key.
      */
-    static toCryptoKey(jwk: IJwk): Promise<JwkCryptoKey>;
+    static toCryptoKey(jwk: IJwk, alg?: string): Promise<JwkCryptoKey>;
     /**
      * Convert the Ed25519 private key to a crypto key.
      * @param privateKey The private key to use.

package/docs/changelog.md

@@ -1,5 +1,35 @@
 # @twin.org/web - Changelog
 
+## [0.0.1-next.55](https://github.com/twinfoundation/framework/compare/web-v0.0.1-next.54...web-v0.0.1-next.55) (2025-05-07)
+
+
+### Features
+
+* ensure the alg is the correct one when generating JWK or JWS ([#136](https://github.com/twinfoundation/framework/issues/136)) ([46a5af1](https://github.com/twinfoundation/framework/commit/46a5af127192d7048068275d14f555f09add3642))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/core bumped from 0.0.1-next.54 to 0.0.1-next.55
+    * @twin.org/crypto bumped from 0.0.1-next.54 to 0.0.1-next.55
+
+## [0.0.1-next.54](https://github.com/twinfoundation/framework/compare/web-v0.0.1-next.53...web-v0.0.1-next.54) (2025-05-06)
+
+
+### Bug Fixes
+
+* wrap inner error within FetchError / 2 ([#134](https://github.com/twinfoundation/framework/issues/134)) ([2ddb101](https://github.com/twinfoundation/framework/commit/2ddb101c3778be4e99559e37aa036cd7101585fb))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/core bumped from 0.0.1-next.53 to 0.0.1-next.54
+    * @twin.org/crypto bumped from 0.0.1-next.53 to 0.0.1-next.54
+
 ## [0.0.1-next.53](https://github.com/twinfoundation/framework/compare/web-v0.0.1-next.52...web-v0.0.1-next.53) (2025-05-01)
 
 

package/docs/reference/classes/Jwk.md

@@ -16,7 +16,7 @@ Class to handle JSON Web Keys.
 
 ### toCryptoKey()
 
-> `static` **toCryptoKey**(`jwk`): `Promise`\<[`JwkCryptoKey`](../type-aliases/JwkCryptoKey.md)\>
+> `static` **toCryptoKey**(`jwk`, `alg?`): `Promise`\<[`JwkCryptoKey`](../type-aliases/JwkCryptoKey.md)\>
 
 Convert the JWK to a crypto key.
 
@@ -28,6 +28,12 @@ Convert the JWK to a crypto key.
 
 The JWK to convert.
 
+##### alg?
+
+`string`
+
+The alg to be used, defaults to jwk.alg.
+
 #### Returns
 
 `Promise`\<[`JwkCryptoKey`](../type-aliases/JwkCryptoKey.md)\>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/web",
-	"version": "0.0.1-next.53",
+	"version": "0.0.1-next.55",
 	"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.53",
-		"@twin.org/crypto": "0.0.1-next.53",
+		"@twin.org/core": "0.0.1-next.55",
+		"@twin.org/crypto": "0.0.1-next.55",
 		"@twin.org/nameof": "next",
 		"jose": "6.0.10"
 	},