@otskit/client 0.7.0 → 0.7.2

package/dist/browser.js

@@ -500,7 +500,7 @@ function parseWhitelistPattern(raw) {
     return void 0;
   }
   if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return void 0;
-  const hostname = parsed.hostname.toLowerCase();
+  const hostname = parsed.hostname.toLowerCase().replaceAll("%2a", "*");
   const wildcardSuffix = hostname.startsWith("*.") ? hostname.slice(2) : void 0;
   if (hostname.includes("*") && wildcardSuffix === void 0) return void 0;
   if (wildcardSuffix !== void 0 && (wildcardSuffix.length === 0 || wildcardSuffix.includes("*"))) return void 0;
@@ -619,7 +619,29 @@ async function orchestrateStamp(hash, calendars, networkLayer, validateCalendarU
       `minimumSuccessfulSubmissions (${minimumSuccessfulSubmissions}) cannot exceed the number of calendars (${calendars.length})`
     );
   }
-  await Promise.all(calendars.map((url) => validateCalendarUrl(url)));
+  const validations = await Promise.allSettled(calendars.map((url) => validateCalendarUrl(url)));
+  const usable = [];
+  const unusable = [];
+  validations.forEach((v, i) => {
+    const calendar = calendars[i];
+    if (v.status === "fulfilled") {
+      usable.push(calendar);
+      return;
+    }
+    const error = v.reason instanceof Error ? v.reason : new Error(String(v.reason));
+    unusable.push({ calendar, error });
+    logger?.warn(`Skipping calendar ${calendar}: ${error.message}`);
+  });
+  if (usable.length === 0) {
+    throw unusable[0].error;
+  }
+  if (usable.length < minimumSuccessfulSubmissions) {
+    throw new StampError(
+      `Insufficient usable calendars (${usable.length}/${minimumSuccessfulSubmissions} required)`,
+      [],
+      unusable
+    );
+  }
   const digest = validateHash(hash);
   logger?.info(`Starting stamp for ${bytesToHex2(digest)}`);
   const detached = DetachedTimestampFile.fromHash(new OpSHA256(), digest);
@@ -627,14 +649,14 @@ async function orchestrateStamp(hash, calendars, networkLayer, validateCalendarU
   const merkleRoot = nonceAppended.add(new OpSHA256());
   const merkleTip = makeMerkleTree([merkleRoot]);
   const results = await Promise.allSettled(
-    calendars.map(
+    usable.map(
       (url) => new CalendarClient(url, networkLayer, logger).submit(merkleTip.getDigest(), signal)
     )
   );
   const successful = [];
-  const failed = [];
+  const failed = [...unusable];
   results.forEach((r, i) => {
-    const calendar = calendars[i];
+    const calendar = usable[i];
     if (r.status === "fulfilled") {
       merkleTip.merge(r.value);
       successful.push({ calendar });

package/dist/index.cjs

@@ -583,7 +583,7 @@ function parseWhitelistPattern(raw) {
     return void 0;
   }
   if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return void 0;
-  const hostname = parsed.hostname.toLowerCase();
+  const hostname = parsed.hostname.toLowerCase().replaceAll("%2a", "*");
   const wildcardSuffix = hostname.startsWith("*.") ? hostname.slice(2) : void 0;
   if (hostname.includes("*") && wildcardSuffix === void 0) return void 0;
   if (wildcardSuffix !== void 0 && (wildcardSuffix.length === 0 || wildcardSuffix.includes("*"))) return void 0;
@@ -702,7 +702,29 @@ async function orchestrateStamp(hash, calendars, networkLayer, validateCalendarU
       `minimumSuccessfulSubmissions (${minimumSuccessfulSubmissions}) cannot exceed the number of calendars (${calendars.length})`
     );
   }
-  await Promise.all(calendars.map((url) => validateCalendarUrl(url)));
+  const validations = await Promise.allSettled(calendars.map((url) => validateCalendarUrl(url)));
+  const usable = [];
+  const unusable = [];
+  validations.forEach((v, i) => {
+    const calendar = calendars[i];
+    if (v.status === "fulfilled") {
+      usable.push(calendar);
+      return;
+    }
+    const error = v.reason instanceof Error ? v.reason : new Error(String(v.reason));
+    unusable.push({ calendar, error });
+    logger?.warn(`Skipping calendar ${calendar}: ${error.message}`);
+  });
+  if (usable.length === 0) {
+    throw unusable[0].error;
+  }
+  if (usable.length < minimumSuccessfulSubmissions) {
+    throw new StampError(
+      `Insufficient usable calendars (${usable.length}/${minimumSuccessfulSubmissions} required)`,
+      [],
+      unusable
+    );
+  }
   const digest = validateHash(hash);
   logger?.info(`Starting stamp for ${bytesToHex2(digest)}`);
   const detached = import_core3.DetachedTimestampFile.fromHash(new import_core3.OpSHA256(), digest);
@@ -710,14 +732,14 @@ async function orchestrateStamp(hash, calendars, networkLayer, validateCalendarU
   const merkleRoot = nonceAppended.add(new import_core3.OpSHA256());
   const merkleTip = (0, import_core3.makeMerkleTree)([merkleRoot]);
   const results = await Promise.allSettled(
-    calendars.map(
+    usable.map(
       (url) => new CalendarClient(url, networkLayer, logger).submit(merkleTip.getDigest(), signal)
     )
   );
   const successful = [];
-  const failed = [];
+  const failed = [...unusable];
   results.forEach((r, i) => {
-    const calendar = calendars[i];
+    const calendar = usable[i];
     if (r.status === "fulfilled") {
       merkleTip.merge(r.value);
       successful.push({ calendar });
@@ -991,14 +1013,15 @@ async function orchestrateVerify(proof, networkLayer, originalDataHash, logger,
     }
   }
   const allBitcoin = detached.timestamp.allAttestations().filter(({ attestation }) => attestation.kind === "bitcoin");
-  const seenHeights = /* @__PURE__ */ new Set();
-  const deduped = allBitcoin.filter(({ attestation }) => {
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = allBitcoin.filter(({ msg, attestation }) => {
     if (attestation.kind !== "bitcoin") return false;
-    if (seenHeights.has(attestation.height)) {
+    const key = `${attestation.height}:${bytesToHex2(msg)}`;
+    if (seen.has(key)) {
       logger?.debug(`Skipping duplicate Bitcoin attestation at height ${attestation.height}`);
       return false;
     }
-    seenHeights.add(attestation.height);
+    seen.add(key);
     return true;
   });
   const bitcoinAtts = deduped.slice(0, MAX_BITCOIN_ATTESTATIONS);

package/dist/index.js

@@ -533,7 +533,7 @@ function parseWhitelistPattern(raw) {
     return void 0;
   }
   if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return void 0;
-  const hostname = parsed.hostname.toLowerCase();
+  const hostname = parsed.hostname.toLowerCase().replaceAll("%2a", "*");
   const wildcardSuffix = hostname.startsWith("*.") ? hostname.slice(2) : void 0;
   if (hostname.includes("*") && wildcardSuffix === void 0) return void 0;
   if (wildcardSuffix !== void 0 && (wildcardSuffix.length === 0 || wildcardSuffix.includes("*"))) return void 0;
@@ -652,7 +652,29 @@ async function orchestrateStamp(hash, calendars, networkLayer, validateCalendarU
       `minimumSuccessfulSubmissions (${minimumSuccessfulSubmissions}) cannot exceed the number of calendars (${calendars.length})`
     );
   }
-  await Promise.all(calendars.map((url) => validateCalendarUrl(url)));
+  const validations = await Promise.allSettled(calendars.map((url) => validateCalendarUrl(url)));
+  const usable = [];
+  const unusable = [];
+  validations.forEach((v, i) => {
+    const calendar = calendars[i];
+    if (v.status === "fulfilled") {
+      usable.push(calendar);
+      return;
+    }
+    const error = v.reason instanceof Error ? v.reason : new Error(String(v.reason));
+    unusable.push({ calendar, error });
+    logger?.warn(`Skipping calendar ${calendar}: ${error.message}`);
+  });
+  if (usable.length === 0) {
+    throw unusable[0].error;
+  }
+  if (usable.length < minimumSuccessfulSubmissions) {
+    throw new StampError(
+      `Insufficient usable calendars (${usable.length}/${minimumSuccessfulSubmissions} required)`,
+      [],
+      unusable
+    );
+  }
   const digest = validateHash(hash);
   logger?.info(`Starting stamp for ${bytesToHex2(digest)}`);
   const detached = DetachedTimestampFile.fromHash(new OpSHA256(), digest);
@@ -660,14 +682,14 @@ async function orchestrateStamp(hash, calendars, networkLayer, validateCalendarU
   const merkleRoot = nonceAppended.add(new OpSHA256());
   const merkleTip = makeMerkleTree([merkleRoot]);
   const results = await Promise.allSettled(
-    calendars.map(
+    usable.map(
       (url) => new CalendarClient(url, networkLayer, logger).submit(merkleTip.getDigest(), signal)
     )
   );
   const successful = [];
-  const failed = [];
+  const failed = [...unusable];
   results.forEach((r, i) => {
-    const calendar = calendars[i];
+    const calendar = usable[i];
     if (r.status === "fulfilled") {
       merkleTip.merge(r.value);
       successful.push({ calendar });
@@ -941,14 +963,15 @@ async function orchestrateVerify(proof, networkLayer, originalDataHash, logger,
     }
   }
   const allBitcoin = detached.timestamp.allAttestations().filter(({ attestation }) => attestation.kind === "bitcoin");
-  const seenHeights = /* @__PURE__ */ new Set();
-  const deduped = allBitcoin.filter(({ attestation }) => {
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = allBitcoin.filter(({ msg, attestation }) => {
     if (attestation.kind !== "bitcoin") return false;
-    if (seenHeights.has(attestation.height)) {
+    const key = `${attestation.height}:${bytesToHex2(msg)}`;
+    if (seen.has(key)) {
       logger?.debug(`Skipping duplicate Bitcoin attestation at height ${attestation.height}`);
       return false;
     }
-    seenHeights.add(attestation.height);
+    seen.add(key);
     return true;
   });
   const bitcoinAtts = deduped.slice(0, MAX_BITCOIN_ATTESTATIONS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otskit/client",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Official client SDK for OpenTimestamps calendars with resilience patterns",
   "author": "alexalves87",
   "license": "MIT",
@@ -67,21 +67,19 @@
     "@otskit/core": "^0.2.0"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
     "@semantic-release/changelog": "^7.0.0",
     "@semantic-release/git": "^11.0.0",
     "@types/node": "^26.1.1",
-    "@vitest/browser": "^4.1.8",
-    "@vitest/coverage-v8": "^4.1.8",
-    "@eslint/js": "^10.0.1",
+    "@vitest/coverage-v8": "^5.0.0",
     "eslint": "^10.0.1",
-    "typescript-eslint": "^8.0.0",
     "fast-check": "^4.3.0",
     "msw": "^2.11.6",
-    "playwright": "^1.56.1",
     "prettier": "^3.3.3",
     "semantic-release": "^25.0.3",
     "tsup": "^8.3.5",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.8"
+    "typescript-eslint": "^8.0.0",
+    "vitest": "^5.0.0"
   }
 }