@toon-protocol/rig 4.6.0 → 4.7.0

package/dist/{chunk-X232W4TG.js → chunk-J6Y3U645.js}

@@ -52,9 +52,14 @@ import {
   updateRef,
   writeGitObjects,
   writeToonConfig
-} from "./chunk-DCGV6ALH.js";
+} from "./chunk-3IVO2MSZ.js";
+import {
+  PREFERRED_GATEWAY,
+  mirrorGatewaysFor,
+  readGateways,
+  shaResolverFor
+} from "./chunk-XQ2AWNHQ.js";
 import {
-  ARWEAVE_GATEWAYS,
   COMMENT_KIND,
   DEFAULT_KEYSTORE_PASSWORD,
   LEGACY_COMMENT_KIND,
@@ -77,7 +82,7 @@ import {
   readClientConfigFile,
   resolveAccountIndex,
   resolveIdentity
-} from "./chunk-JBFBD7HV.js";
+} from "./chunk-S3KKQ4IC.js";
 import {
   ChannelMapStore,
   channelStatus,
@@ -90,21 +95,6 @@ import {
   uploadChargeFor
 } from "./chunk-U5A7MHBP.js";
 
-// src/gateway-preference.ts
-var TESTNET_GATEWAY = /(^|\.)ar-io\.dev$/i;
-function isMainnetGateway(url) {
-  try {
-    return !TESTNET_GATEWAY.test(new URL(url).hostname);
-  } catch {
-    return false;
-  }
-}
-var PREFERRED_GATEWAY = ARWEAVE_GATEWAYS.find(isMainnetGateway) ?? "https://arweave.net";
-function mirrorGatewaysFor(primary) {
-  const p = primary.replace(/\/+$/, "");
-  return ARWEAVE_GATEWAYS.filter((g) => g.replace(/\/+$/, "") !== p);
-}
-
 // src/cli/render.ts
 function describeAnnouncementDiff(diff) {
   return [
@@ -320,7 +310,7 @@ function loadPaidSession(deps, relayUrl) {
   });
 }
 var defaultLoadStandalone = async (options) => {
-  const mod = await import("./standalone-mode-UQSP4677.js");
+  const mod = await import("./standalone-mode-FY3XVQQK.js");
   return mod.createStandaloneContext(options);
 };
 function identityReport(ctx) {
@@ -2485,7 +2475,7 @@ async function runCi(args, deps) {
     case "status":
       return runCiStatus(rest, deps);
     case "serve":
-      return (await import("./ci-serve-AYFZOY4O.js")).runCiServe(rest, deps);
+      return (await import("./ci-serve-T33FCQVT.js")).runCiServe(rest, deps);
     case "--help":
     case "-h":
     case "help":
@@ -2525,6 +2515,11 @@ from Arweave gateways. A clone right after a push may report missing
 objects \u2014 retry after propagation.
 
 Options:
+  --gateway <url>      gateway to read objects through FIRST, on its raw-bytes
+                       route <url>/raw/<txId>, ahead of the public gateway
+                       list \u2014 name a private, local or air-gapped gateway to
+                       clone a repo the public ones do not carry
+                       (env RIG_ARWEAVE_GATEWAY also sets it)
   --concurrency <n>    parallel gateway downloads (default 8)
   --json               machine-readable result envelope
   -h, --help           show this help`;
@@ -2551,6 +2546,7 @@ function parseCloneArgs(args) {
     options: {
       json: { type: "boolean", default: false },
       concurrency: { type: "string" },
+      gateway: { type: "string" },
       help: { type: "boolean", short: "h", default: false }
     },
     allowPositionals: true
@@ -2586,6 +2582,7 @@ function parseCloneArgs(args) {
     repoId,
     dir,
     concurrency,
+    gateway: values.gateway,
     json: values.json === true
   };
 }
@@ -2634,7 +2631,9 @@ async function runClone(args, deps) {
       ownerPubkey: owner,
       repoId,
       ...deps.webSocketFactory ? { webSocketFactory: deps.webSocketFactory } : {},
-      ...deps.resolveSha ? { resolveSha: deps.resolveSha } : {}
+      // The GraphQL fallback for SHAs the map does not cover asks the SAME
+      // permaweb the objects are read from (#183).
+      resolveSha: deps.resolveSha ?? shaResolverFor(parsed.gateway, deps.env)
     });
     if (!remoteState.announced && remoteState.refsEvent === null) {
       throw new RepoNotFoundError(relayUrl, owner, repoId);
@@ -2659,6 +2658,8 @@ async function runClone(args, deps) {
       tips,
       shaToTxId: remoteState.shaToTxId,
       resolveMissing: (shas) => remoteState.resolveMissing(shas),
+      // `--gateway` / RIG_ARWEAVE_GATEWAY first, public list behind it (#176).
+      gateways: readGateways(parsed.gateway, deps.env),
       ...deps.fetchFn ? { fetchFn: deps.fetchFn } : {},
       ...parsed.concurrency !== void 0 ? { concurrency: parsed.concurrency } : {}
     });
@@ -4256,6 +4257,11 @@ Options:
   --repo-id <id>       repository id / NIP-34 d-tag (default: git config)
   --owner <pubkey>     repository owner (npub or 64-char hex; default: git config)
   --relay <url>        ad-hoc relay override \u2014 bypasses the remote's URL
+  --gateway <url>      gateway to read objects through FIRST, on its raw-bytes
+                       route <url>/raw/<txId>, ahead of the public gateway
+                       list \u2014 name a private, local or air-gapped gateway to
+                       fetch objects the public ones do not carry
+                       (env RIG_ARWEAVE_GATEWAY also sets it)
   --concurrency <n>    parallel gateway downloads (default 8)
   --json               machine-readable result envelope
   -h, --help           show this help`;
@@ -4288,6 +4294,7 @@ async function runFetch(args, deps) {
   let relayFlag;
   let repoIdFlag;
   let ownerFlag;
+  let gatewayFlag;
   let concurrency;
   try {
     const { values, positionals } = parseArgs10({
@@ -4297,6 +4304,7 @@ async function runFetch(args, deps) {
         relay: { type: "string" },
         "repo-id": { type: "string" },
         owner: { type: "string" },
+        gateway: { type: "string" },
         concurrency: { type: "string" },
         help: { type: "boolean", short: "h", default: false }
       },
@@ -4316,6 +4324,7 @@ async function runFetch(args, deps) {
     relayFlag = values.relay;
     repoIdFlag = values["repo-id"];
     ownerFlag = values.owner !== void 0 ? ownerToHex(values.owner) : void 0;
+    gatewayFlag = values.gateway;
     if (values.concurrency !== void 0) {
       concurrency = Number.parseInt(values.concurrency, 10);
       if (!Number.isSafeInteger(concurrency) || concurrency < 1) {
@@ -4354,7 +4363,9 @@ async function runFetch(args, deps) {
       ownerPubkey: owner,
       repoId,
       ...deps.webSocketFactory ? { webSocketFactory: deps.webSocketFactory } : {},
-      ...deps.resolveSha ? { resolveSha: deps.resolveSha } : {}
+      // The GraphQL fallback for SHAs the map does not cover asks the SAME
+      // permaweb the objects are read from (#183).
+      resolveSha: deps.resolveSha ?? shaResolverFor(gatewayFlag, deps.env)
     });
     const planned = [];
     for (const [refname, sha] of remoteState.refs) {
@@ -4381,6 +4392,8 @@ async function runFetch(args, deps) {
       shaToTxId: remoteState.shaToTxId,
       resolveMissing: (shas) => remoteState.resolveMissing(shas),
       presentLocally,
+      // `--gateway` / RIG_ARWEAVE_GATEWAY first, public list behind it (#176).
+      gateways: readGateways(gatewayFlag, deps.env),
       ...deps.fetchFn ? { fetchFn: deps.fetchFn } : {},
       ...concurrency !== void 0 ? { concurrency } : {}
     });
@@ -7967,7 +7980,6 @@ async function dispatch(argv, deps) {
 }
 
 export {
-  PREFERRED_GATEWAY,
   renderIdentityLine,
   withForcedStandalone,
   loadPaidSession,
@@ -7976,4 +7988,4 @@ export {
   rigVersion,
   dispatch
 };
-//# sourceMappingURL=chunk-X232W4TG.js.map
+//# sourceMappingURL=chunk-J6Y3U645.js.map