@sd-jwt/sd-jwt-vc 0.9.2-next.1 → 0.9.2-next.3

package/README.md

@@ -97,7 +97,7 @@ const sdjwt = new SDJwtVcInstance({
   signAlg: 'EdDSA',
   verifier,
   hasher: digest,
-  hashAlg: 'SHA-256',
+  hashAlg: 'sha-256',
   saltGenerator: generateSalt,
   loadTypeMetadataFormat: true,
 });

package/dist/index.d.mts

@@ -27,6 +27,7 @@ type SDJWTVCConfig = SDJWTConfig & {
     statusValidator?: StatusValidator;
     vctFetcher?: VcTFetcher;
     loadTypeMetadataFormat?: boolean;
+    timeout?: number;
 };
 
 interface SDJWTVCStatusReference {

package/dist/index.d.ts

@@ -27,6 +27,7 @@ type SDJWTVCConfig = SDJWTConfig & {
     statusValidator?: StatusValidator;
     vctFetcher?: VcTFetcher;
     loadTypeMetadataFormat?: boolean;
+    timeout?: number;
 };
 
 interface SDJWTVCStatusReference {

package/dist/index.js

@@ -178,17 +178,29 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends import_core.SDJwtInstance {
    */
   fetch(url, integrity) {
     return __async(this, null, function* () {
+      var _a;
       const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), 1e4);
+      const timeoutId = setTimeout(
+        () => controller.abort(),
+        (_a = this.userConfig.timeout) != null ? _a : 1e4
+      );
       try {
         const response = yield fetch(url, {
           signal: controller.signal
         });
         if (!response.ok) {
-          throw new Error(yield response.text());
+          const errorText = yield response.text();
+          throw new Error(
+            `Error fetching ${url}: ${response.status} ${response.statusText} - ${errorText}`
+          );
         }
         yield this.validateIntegrity(response.clone(), url, integrity);
         return response.json();
+      } catch (error) {
+        if (error instanceof DOMException && error.name === "AbortError") {
+          throw new Error(`Request to ${url} timed out`);
+        }
+        throw error;
       } finally {
         clearTimeout(timeoutId);
       }

package/dist/index.mjs

@@ -146,17 +146,29 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends SDJwtInstance {
    */
   fetch(url, integrity) {
     return __async(this, null, function* () {
+      var _a;
       const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), 1e4);
+      const timeoutId = setTimeout(
+        () => controller.abort(),
+        (_a = this.userConfig.timeout) != null ? _a : 1e4
+      );
       try {
         const response = yield fetch(url, {
           signal: controller.signal
         });
         if (!response.ok) {
-          throw new Error(yield response.text());
+          const errorText = yield response.text();
+          throw new Error(
+            `Error fetching ${url}: ${response.status} ${response.statusText} - ${errorText}`
+          );
         }
         yield this.validateIntegrity(response.clone(), url, integrity);
         return response.json();
+      } catch (error) {
+        if (error instanceof DOMException && error.name === "AbortError") {
+          throw new Error(`Request to ${url} timed out`);
+        }
+        throw error;
       } finally {
         clearTimeout(timeoutId);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sd-jwt/sd-jwt-vc",
-  "version": "0.9.2-next.1+d6f70c3",
+  "version": "0.9.2-next.3+06e3319",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -39,15 +39,15 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@sd-jwt/core": "0.9.2-next.1+d6f70c3",
-    "@sd-jwt/jwt-status-list": "0.9.2-next.1+d6f70c3",
-    "@sd-jwt/utils": "0.9.2-next.1+d6f70c3",
+    "@sd-jwt/core": "0.9.2-next.3+06e3319",
+    "@sd-jwt/jwt-status-list": "0.9.2-next.3+06e3319",
+    "@sd-jwt/utils": "0.9.2-next.3+06e3319",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1"
   },
   "devDependencies": {
-    "@sd-jwt/crypto-nodejs": "0.9.2-next.1+d6f70c3",
-    "@sd-jwt/types": "0.9.2-next.1+d6f70c3",
+    "@sd-jwt/crypto-nodejs": "0.9.2-next.3+06e3319",
+    "@sd-jwt/types": "0.9.2-next.3+06e3319",
     "jose": "^5.2.2",
     "msw": "^2.3.5"
   },
@@ -67,5 +67,5 @@
       "esm"
     ]
   },
-  "gitHead": "d6f70c37efaafe5123b7ffd1115069ba6e0e4e6e"
+  "gitHead": "06e3319e4293845cd830fbe41d3607fee4e493f8"
 }

package/src/sd-jwt-vc-config.ts

@@ -16,4 +16,6 @@ export type SDJWTVCConfig = SDJWTConfig & {
   vctFetcher?: VcTFetcher;
   // if set to true, it will load the metadata format based on the vct value. If not provided, it will default to false.
   loadTypeMetadataFormat?: boolean;
+  // timeout value in milliseconds when to abort the fetch request. If not provided, it will default to 10000.
+  timeout?: number;
 };

package/src/sd-jwt-vc-instance.ts

@@ -166,18 +166,31 @@ export class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
    * @param url
    * @returns
    */
-  private async fetch<T>(url: string, integrity?: string) {
+  private async fetch<T>(url: string, integrity?: string): Promise<T> {
     const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 10000);
+    const timeoutId = setTimeout(
+      () => controller.abort(),
+      this.userConfig.timeout ?? 10000,
+    );
+
     try {
       const response = await fetch(url, {
         signal: controller.signal,
       });
+
       if (!response.ok) {
-        throw new Error(await response.text());
+        const errorText = await response.text();
+        throw new Error(
+          `Error fetching ${url}: ${response.status} ${response.statusText} - ${errorText}`,
+        );
       }
       await this.validateIntegrity(response.clone(), url, integrity);
       return response.json() as Promise<T>;
+    } catch (error) {
+      if (error instanceof DOMException && error.name === 'AbortError') {
+        throw new Error(`Request to ${url} timed out`);
+      }
+      throw error;
     } finally {
       clearTimeout(timeoutId);
     }

package/src/test/index.spec.ts

@@ -67,7 +67,7 @@ describe('App', () => {
       signAlg: 'EdDSA',
       verifier,
       hasher: digest,
-      hashAlg: 'SHA-256',
+      hashAlg: 'sha-256',
       saltGenerator: generateSalt,
     });
 
@@ -94,7 +94,7 @@ describe('Revocation', () => {
     signAlg: 'EdDSA',
     verifier,
     hasher: digest,
-    hashAlg: 'SHA-256',
+    hashAlg: 'sha-256',
     saltGenerator: generateSalt,
     statusListFetcher(uri: string) {
       // we emulate fetching the status list from the uri. Validation of the JWT is not done here in the test but should be done in the implementation.

package/src/test/vct.spec.ts

@@ -97,7 +97,7 @@ describe('App', () => {
       signAlg: 'EdDSA',
       verifier,
       hasher: digest,
-      hashAlg: 'SHA-256',
+      hashAlg: 'sha-256',
       saltGenerator: generateSalt,
       loadTypeMetadataFormat: true,
     });

package/test/app-e2e.spec.ts

@@ -40,7 +40,7 @@ describe('App', () => {
       signAlg: 'EdDSA',
       verifier,
       hasher: digest,
-      hashAlg: 'SHA-256',
+      hashAlg: 'sha-256',
       saltGenerator: generateSalt,
     });
 
@@ -222,7 +222,7 @@ async function JSONtest(filename: string) {
     signAlg: 'EdDSA',
     verifier,
     hasher: digest,
-    hashAlg: 'SHA-256',
+    hashAlg: 'sha-256',
     saltGenerator: generateSalt,
   });