@calimero-network/mero-js 7.0.4 → 7.0.5

package/dist/index.cjs

@@ -749,23 +749,61 @@ function unwrap(response) {
   return response?.data;
 }
 function compareSemver(a, b) {
-  const pa = a.split(".");
-  const pb = b.split(".");
-  const n = Math.max(pa.length, pb.length);
+  const [coreA, preA] = splitVersion(a);
+  const [coreB, preB] = splitVersion(b);
+  const na = coreA.split(".");
+  const nb = coreB.split(".");
+  const n = Math.max(na.length, nb.length);
   for (let i = 0; i < n; i++) {
-    const sa = pa[i] ?? "0";
-    const sb = pb[i] ?? "0";
-    const na = Number.parseInt(sa, 10);
-    const nb = Number.parseInt(sb, 10);
-    if (Number.isNaN(na) || Number.isNaN(nb)) {
-      const c = sa.localeCompare(sb);
-      if (c !== 0) return c;
-    } else if (na !== nb) {
-      return na - nb;
-    }
+    const c = compareSemverId(na[i] ?? "0", nb[i] ?? "0");
+    if (c !== 0) return c;
+  }
+  if (preA === void 0 && preB === void 0) return 0;
+  if (preA === void 0) return 1;
+  if (preB === void 0) return -1;
+  const pa = preA.split(".");
+  const pb = preB.split(".");
+  const m = Math.max(pa.length, pb.length);
+  for (let i = 0; i < m; i++) {
+    if (i >= pa.length) return -1;
+    if (i >= pb.length) return 1;
+    const c = compareSemverId(pa[i], pb[i]);
+    if (c !== 0) return c;
   }
   return 0;
 }
+function splitVersion(v) {
+  const core = v.split("+", 1)[0];
+  const dash = core.indexOf("-");
+  return dash === -1 ? [core, void 0] : [core.slice(0, dash), core.slice(dash + 1)];
+}
+function compareSemverId(a, b) {
+  const na = /^\d+$/.test(a);
+  const nb = /^\d+$/.test(b);
+  if (na && nb) {
+    const d = Number(a) - Number(b);
+    return d < 0 ? -1 : d > 0 ? 1 : 0;
+  }
+  if (na) return -1;
+  if (nb) return 1;
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+async function fetchRegistry(url, kind, context) {
+  return withRetry(
+    async () => {
+      const resp = await fetch(url, { signal: AbortSignal.timeout(1e4) });
+      if (!resp.ok) {
+        const err = new Error(
+          `registry ${kind} fetch failed (${resp.status}) for ${context}`
+        );
+        err.status = resp.status;
+        throw err;
+      }
+      return resp;
+    },
+    { attempts: 3 }
+  );
+}
 var AdminApiClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
@@ -795,12 +833,7 @@ var AdminApiClient = class {
       `/api/v2/bundles/${encodeURIComponent(packageName)}/${encodeURIComponent(version)}`,
       base
     ).toString();
-    const resp = await fetch(manifestUrl);
-    if (!resp.ok) {
-      throw new Error(
-        `registry manifest fetch failed (${resp.status}) for ${packageName}@${version}`
-      );
-    }
+    const resp = await fetchRegistry(manifestUrl, "manifest", `${packageName}@${version}`);
     const bundle = await resp.json();
     const pkg = encodeURIComponent(bundle.package);
     const ver = encodeURIComponent(bundle.appVersion);
@@ -823,12 +856,7 @@ var AdminApiClient = class {
   async getRegistryVersions(registryUrl, packageName) {
     const url = new URL("/api/v2/bundles", new URL(registryUrl).origin);
     url.searchParams.set("package", packageName);
-    const resp = await fetch(url.toString());
-    if (!resp.ok) {
-      throw new Error(
-        `registry versions fetch failed (${resp.status}) for ${packageName}`
-      );
-    }
+    const resp = await fetchRegistry(url.toString(), "versions", packageName);
     const bundles = await resp.json();
     return (Array.isArray(bundles) ? bundles : []).map((b) => b.appVersion).filter((v) => typeof v === "string").sort((a, b) => compareSemver(b, a));
   }