@ar.io/sdk 3.12.0-beta.4 → 3.12.0-beta.6

package/lib/cjs/common/wayfinder/verification/trusted.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrustedGatewaysHashProvider = void 0;
+const wayfinder_js_1 = require("../wayfinder.js");
 const arioGatewayHeaders = {
     digest: 'x-ar-io-digest',
     verified: 'x-ar-io-verified',
@@ -25,17 +26,32 @@ class TrustedGatewaysHashProvider {
         const hashResults = [];
         const gateways = await this.gatewaysProvider.getGateways();
         const hashes = await Promise.all(gateways.map(async (gateway) => {
-            const response = await fetch(`${gateway.toString()}${txId}`, {
-                method: 'HEAD',
-                redirect: 'follow',
-            });
-            if (!response.ok) {
-                // skip this gateway
-                return undefined;
+            const sandbox = (0, wayfinder_js_1.sandboxFromId)(txId);
+            const urlWithSandbox = `${gateway.protocol}//${sandbox}.${gateway.hostname}/${txId}/`;
+            let txIdHash;
+            /**
+             * This is a problem because we're not able to verify the hash of the data item if the gateway doesn't have the data in its cache.
+             * We should add the ability to send a HEAD request to trigger a GET request to hydrate the cache on the trusted gateway via a header.
+             * For now, we'll just do a GET request to hydrate the cache if the HEAD request doesn't contain the digest.
+             */
+            for (const method of ['HEAD', 'GET']) {
+                const response = await fetch(urlWithSandbox, {
+                    method,
+                    redirect: 'follow',
+                    mode: 'cors',
+                });
+                if (!response.ok) {
+                    // skip this gateway if the request failed
+                    break;
+                }
+                const fetchedTxIdHash = response.headers.get(arioGatewayHeaders.digest);
+                if (fetchedTxIdHash !== null && fetchedTxIdHash !== undefined) {
+                    txIdHash = fetchedTxIdHash;
+                    break;
+                }
             }
-            const txIdHash = response.headers.get(arioGatewayHeaders.digest);
-            if (txIdHash === null || txIdHash === undefined) {
-                // skip this gateway
+            if (txIdHash === undefined) {
+                // skip this gateway if we didn't get a hash
                 return undefined;
             }
             hashResults.push({

package/lib/cjs/common/wayfinder/wayfinder.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Wayfinder = exports.createWayfinderClient = exports.WayfinderEmitter = exports.resolveWayfinderUrl = exports.txIdRegex = exports.arnsRegex = void 0;
 exports.tapAndVerifyStream = tapAndVerifyStream;
+exports.sandboxFromId = sandboxFromId;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -22,6 +23,7 @@ exports.tapAndVerifyStream = tapAndVerifyStream;
  */
 const node_events_1 = __importDefault(require("node:events"));
 const node_stream_1 = require("node:stream");
+const rfc4648_1 = require("rfc4648");
 const io_js_1 = require("../io.js");
 const logger_js_1 = require("../logger.js");
 const network_js_1 = require("./gateways/network.js");
@@ -57,7 +59,8 @@ const resolveWayfinderUrl = ({ originalUrl, selectedGateway, logger, }) => {
         const [firstPart, ...rest] = path.split('/');
         // TODO: this breaks 43 character named arns names - we should check a a local name cache list before resolving raw transaction ids
         if (exports.txIdRegex.test(firstPart)) {
-            return new URL(`${firstPart}${rest.length > 0 ? '/' + rest.join('/') : ''}`, selectedGateway);
+            const sandbox = sandboxFromId(firstPart);
+            return new URL(`${firstPart}${rest.length > 0 ? '/' + rest.join('/') : ''}`, `${selectedGateway.protocol}//${sandbox}.${selectedGateway.hostname}`);
         }
         if (exports.arnsRegex.test(firstPart)) {
             // TODO: tests to ensure arns names support query params and paths
@@ -245,6 +248,14 @@ function tapAndVerifyStream({ originalStream, contentLength, verifyData, txId, e
     }
     throw new Error('Unsupported body type for cloning');
 }
+/**
+ * Gets the sandbox hash for a given transaction id
+ */
+function sandboxFromId(id) {
+    return rfc4648_1.base32
+        .stringify(Buffer.from(id, 'base64'), { pad: false })
+        .toLowerCase();
+}
 /**
  * Creates a wrapped fetch function that supports ar:// protocol
  *
@@ -305,9 +316,11 @@ const createWayfinderClient = ({ resolveUrl, verifyData, selectGateway, emitter
                 });
                 // Make the request to the target gateway
                 const response = await fetch(redirectUrl.toString(), {
-                    ...init,
                     // follow redirects as gateways use sandboxing on /txId requests
                     redirect: 'follow',
+                    mode: 'cors',
+                    // allow requestor to override and any additional request configuration
+                    ...init,
                 });
                 // TODO: update any caching we use for the request and gateway response
                 logger?.debug(`Successfully routed request to gateway`, {

package/lib/cjs/version.js

@@ -17,4 +17,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-exports.version = '3.12.0-beta.4';
+exports.version = '3.12.0-beta.6';

package/lib/esm/common/wayfinder/verification/trusted.js

@@ -1,3 +1,4 @@
+import { sandboxFromId } from '../wayfinder.js';
 const arioGatewayHeaders = {
     digest: 'x-ar-io-digest',
     verified: 'x-ar-io-verified',
@@ -22,17 +23,32 @@ export class TrustedGatewaysHashProvider {
         const hashResults = [];
         const gateways = await this.gatewaysProvider.getGateways();
         const hashes = await Promise.all(gateways.map(async (gateway) => {
-            const response = await fetch(`${gateway.toString()}${txId}`, {
-                method: 'HEAD',
-                redirect: 'follow',
-            });
-            if (!response.ok) {
-                // skip this gateway
-                return undefined;
+            const sandbox = sandboxFromId(txId);
+            const urlWithSandbox = `${gateway.protocol}//${sandbox}.${gateway.hostname}/${txId}/`;
+            let txIdHash;
+            /**
+             * This is a problem because we're not able to verify the hash of the data item if the gateway doesn't have the data in its cache.
+             * We should add the ability to send a HEAD request to trigger a GET request to hydrate the cache on the trusted gateway via a header.
+             * For now, we'll just do a GET request to hydrate the cache if the HEAD request doesn't contain the digest.
+             */
+            for (const method of ['HEAD', 'GET']) {
+                const response = await fetch(urlWithSandbox, {
+                    method,
+                    redirect: 'follow',
+                    mode: 'cors',
+                });
+                if (!response.ok) {
+                    // skip this gateway if the request failed
+                    break;
+                }
+                const fetchedTxIdHash = response.headers.get(arioGatewayHeaders.digest);
+                if (fetchedTxIdHash !== null && fetchedTxIdHash !== undefined) {
+                    txIdHash = fetchedTxIdHash;
+                    break;
+                }
             }
-            const txIdHash = response.headers.get(arioGatewayHeaders.digest);
-            if (txIdHash === null || txIdHash === undefined) {
-                // skip this gateway
+            if (txIdHash === undefined) {
+                // skip this gateway if we didn't get a hash
                 return undefined;
             }
             hashResults.push({

package/lib/esm/common/wayfinder/wayfinder.js

@@ -15,6 +15,7 @@
  */
 import EventEmitter from 'node:events';
 import { PassThrough, Readable } from 'node:stream';
+import { base32 } from 'rfc4648';
 import { ARIO } from '../io.js';
 import { Logger } from '../logger.js';
 import { NetworkGatewaysProvider } from './gateways/network.js';
@@ -50,7 +51,8 @@ export const resolveWayfinderUrl = ({ originalUrl, selectedGateway, logger, }) =
         const [firstPart, ...rest] = path.split('/');
         // TODO: this breaks 43 character named arns names - we should check a a local name cache list before resolving raw transaction ids
         if (txIdRegex.test(firstPart)) {
-            return new URL(`${firstPart}${rest.length > 0 ? '/' + rest.join('/') : ''}`, selectedGateway);
+            const sandbox = sandboxFromId(firstPart);
+            return new URL(`${firstPart}${rest.length > 0 ? '/' + rest.join('/') : ''}`, `${selectedGateway.protocol}//${sandbox}.${selectedGateway.hostname}`);
         }
         if (arnsRegex.test(firstPart)) {
             // TODO: tests to ensure arns names support query params and paths
@@ -236,6 +238,14 @@ export function tapAndVerifyStream({ originalStream, contentLength, verifyData,
     }
     throw new Error('Unsupported body type for cloning');
 }
+/**
+ * Gets the sandbox hash for a given transaction id
+ */
+export function sandboxFromId(id) {
+    return base32
+        .stringify(Buffer.from(id, 'base64'), { pad: false })
+        .toLowerCase();
+}
 /**
  * Creates a wrapped fetch function that supports ar:// protocol
  *
@@ -296,9 +306,11 @@ export const createWayfinderClient = ({ resolveUrl, verifyData, selectGateway, e
                 });
                 // Make the request to the target gateway
                 const response = await fetch(redirectUrl.toString(), {
-                    ...init,
                     // follow redirects as gateways use sandboxing on /txId requests
                     redirect: 'follow',
+                    mode: 'cors',
+                    // allow requestor to override and any additional request configuration
+                    ...init,
                 });
                 // TODO: update any caching we use for the request and gateway response
                 logger?.debug(`Successfully routed request to gateway`, {

package/lib/esm/version.js

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '3.12.0-beta.4';
+export const version = '3.12.0-beta.6';

package/lib/types/common/wayfinder/wayfinder.d.ts

@@ -98,6 +98,10 @@ export declare function tapAndVerifyStream<T extends Readable | ReadableStream>(
     emitter?: WayfinderEmitter;
     strict?: boolean;
 }): T extends Readable ? PassThrough : T;
+/**
+ * Gets the sandbox hash for a given transaction id
+ */
+export declare function sandboxFromId(id: string): string;
 /**
  * Creates a wrapped fetch function that supports ar:// protocol
  *

package/lib/types/version.d.ts

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare const version = "3.12.0-beta.3";
+export declare const version = "3.12.0-beta.5";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ar.io/sdk",
-  "version": "3.12.0-beta.4",
+  "version": "3.12.0-beta.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ar-io/ar-io-sdk.git"
@@ -136,6 +136,7 @@
     "eventemitter3": "^5.0.1",
     "plimit-lit": "^3.0.1",
     "prompts": "^2.4.2",
+    "rfc4648": "^1.5.4",
     "winston": "^3.13.0",
     "zod": "^3.23.8"
   },