@xyo-network/api-call-witness 2.79.5 → 2.79.6

package/dist/browser/index.cjs

@@ -42,6 +42,7 @@ var import_base64_js = require("base64-js");
 
 // src/lib/checkIpfsUrl.ts
 var import_assert = require("@xylabs/assert");
+var allowIpfsIoRepair = true;
 var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
   try {
     const url = new URL(urlToCheck);
@@ -55,14 +56,21 @@ var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
       path = url.host === "ipfs" ? `ipfs${path}` : `ipfs/${url.host}${path}`;
       const root = `${protocol}//${host}/${path}`;
       return query?.length > 0 ? `${root}?${query}` : root;
+    } else if (allowIpfsIoRepair && protocol === "https" && host === "ipfs.io") {
+      protocol = "https:";
+      host = (0, import_assert.assertEx)(ipfsGateway, "No ipfsGateway provided");
+      const pathParts = path.split("/");
+      if (pathParts[0] === "ipfs") {
+        pathParts.shift();
+      }
+      path = pathParts.join("/");
+      const root = `${protocol}//${host}/${path}`;
+      return query?.length > 0 ? `${root}?${query}` : root;
     } else {
       return urlToCheck;
     }
   } catch (ex) {
-    const error = ex;
-    console.error(`${error.name}:${error.message} [${urlToCheck}]`);
-    console.log(error.stack);
-    return void 0;
+    return urlToCheck;
   }
 };
 

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["export * from './Payload'\nexport * from './Witness'\n","import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string) => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    const error = ex as Error\n    console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    console.log(error.stack)\n    return undefined\n  }\n}\n"],"mappings":"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","names":["import_assert"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["export * from './Payload'\nexport * from './Witness'\n","import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\nconst allowIpfsIoRepair = true\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string): string => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else if (allowIpfsIoRepair && protocol === 'https' && host === 'ipfs.io') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      const pathParts = path.split('/')\n      if (pathParts[0] === 'ipfs') {\n        pathParts.shift()\n      }\n      path = pathParts.join('/')\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    //const error = ex as Error\n    //console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    //console.log(error.stack)\n    return urlToCheck\n  }\n}\n"],"mappings":"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","names":["import_assert"]}

package/dist/browser/index.js

@@ -13,6 +13,7 @@ import { fromByteArray } from "base64-js";
 
 // src/lib/checkIpfsUrl.ts
 import { assertEx } from "@xylabs/assert";
+var allowIpfsIoRepair = true;
 var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
   try {
     const url = new URL(urlToCheck);
@@ -26,14 +27,21 @@ var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
       path = url.host === "ipfs" ? `ipfs${path}` : `ipfs/${url.host}${path}`;
       const root = `${protocol}//${host}/${path}`;
       return query?.length > 0 ? `${root}?${query}` : root;
+    } else if (allowIpfsIoRepair && protocol === "https" && host === "ipfs.io") {
+      protocol = "https:";
+      host = assertEx(ipfsGateway, "No ipfsGateway provided");
+      const pathParts = path.split("/");
+      if (pathParts[0] === "ipfs") {
+        pathParts.shift();
+      }
+      path = pathParts.join("/");
+      const root = `${protocol}//${host}/${path}`;
+      return query?.length > 0 ? `${root}?${query}` : root;
     } else {
       return urlToCheck;
     }
   } catch (ex) {
-    const error = ex;
-    console.error(`${error.name}:${error.message} [${urlToCheck}]`);
-    console.log(error.stack);
-    return void 0;
+    return urlToCheck;
   }
 };
 

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string) => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    const error = ex as Error\n    console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    console.log(error.stack)\n    return undefined\n  }\n}\n"],"mappings":"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","names":["assertEx","assertEx"]}
+{"version":3,"sources":["../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\nconst allowIpfsIoRepair = true\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string): string => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else if (allowIpfsIoRepair && protocol === 'https' && host === 'ipfs.io') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      const pathParts = path.split('/')\n      if (pathParts[0] === 'ipfs') {\n        pathParts.shift()\n      }\n      path = pathParts.join('/')\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    //const error = ex as Error\n    //console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    //console.log(error.stack)\n    return urlToCheck\n  }\n}\n"],"mappings":"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","names":["assertEx","assertEx"]}

package/dist/browser/lib/checkIpfsUrl.d.cts

@@ -4,5 +4,5 @@
  * @returns If the supplied URL is an IPFS URL, it converts the URL to the
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
-export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string | undefined;
+export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string;
 //# sourceMappingURL=checkIpfsUrl.d.ts.map

package/dist/browser/lib/checkIpfsUrl.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,uBAsBpE,CAAA"}
+{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,KAAG,MAgCvE,CAAA"}

package/dist/browser/lib/checkIpfsUrl.d.mts

@@ -4,5 +4,5 @@
  * @returns If the supplied URL is an IPFS URL, it converts the URL to the
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
-export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string | undefined;
+export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string;
 //# sourceMappingURL=checkIpfsUrl.d.ts.map

package/dist/browser/lib/checkIpfsUrl.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,uBAsBpE,CAAA"}
+{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,KAAG,MAgCvE,CAAA"}

package/dist/browser/lib/checkIpfsUrl.d.ts

@@ -4,5 +4,5 @@
  * @returns If the supplied URL is an IPFS URL, it converts the URL to the
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
-export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string | undefined;
+export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string;
 //# sourceMappingURL=checkIpfsUrl.d.ts.map

package/dist/browser/lib/checkIpfsUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,uBAsBpE,CAAA"}
+{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,KAAG,MAgCvE,CAAA"}

package/dist/node/index.cjs

@@ -42,6 +42,7 @@ var import_base64_js = require("base64-js");
 
 // src/lib/checkIpfsUrl.ts
 var import_assert = require("@xylabs/assert");
+var allowIpfsIoRepair = true;
 var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
   try {
     const url = new URL(urlToCheck);
@@ -55,14 +56,21 @@ var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
       path = url.host === "ipfs" ? `ipfs${path}` : `ipfs/${url.host}${path}`;
       const root = `${protocol}//${host}/${path}`;
       return (query == null ? void 0 : query.length) > 0 ? `${root}?${query}` : root;
+    } else if (allowIpfsIoRepair && protocol === "https" && host === "ipfs.io") {
+      protocol = "https:";
+      host = (0, import_assert.assertEx)(ipfsGateway, "No ipfsGateway provided");
+      const pathParts = path.split("/");
+      if (pathParts[0] === "ipfs") {
+        pathParts.shift();
+      }
+      path = pathParts.join("/");
+      const root = `${protocol}//${host}/${path}`;
+      return (query == null ? void 0 : query.length) > 0 ? `${root}?${query}` : root;
     } else {
       return urlToCheck;
     }
   } catch (ex) {
-    const error = ex;
-    console.error(`${error.name}:${error.message} [${urlToCheck}]`);
-    console.log(error.stack);
-    return void 0;
+    return urlToCheck;
   }
 };
 

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["export * from './Payload'\nexport * from './Witness'\n","import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string) => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    const error = ex as Error\n    console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    console.log(error.stack)\n    return undefined\n  }\n}\n"],"mappings":"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","names":["import_assert"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["export * from './Payload'\nexport * from './Witness'\n","import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\nconst allowIpfsIoRepair = true\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string): string => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else if (allowIpfsIoRepair && protocol === 'https' && host === 'ipfs.io') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      const pathParts = path.split('/')\n      if (pathParts[0] === 'ipfs') {\n        pathParts.shift()\n      }\n      path = pathParts.join('/')\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    //const error = ex as Error\n    //console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    //console.log(error.stack)\n    return urlToCheck\n  }\n}\n"],"mappings":"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","names":["import_assert"]}

package/dist/node/index.js

@@ -13,6 +13,7 @@ import { fromByteArray } from "base64-js";
 
 // src/lib/checkIpfsUrl.ts
 import { assertEx } from "@xylabs/assert";
+var allowIpfsIoRepair = true;
 var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
   try {
     const url = new URL(urlToCheck);
@@ -26,14 +27,21 @@ var checkIpfsUrl = (urlToCheck, ipfsGateway) => {
       path = url.host === "ipfs" ? `ipfs${path}` : `ipfs/${url.host}${path}`;
       const root = `${protocol}//${host}/${path}`;
       return (query == null ? void 0 : query.length) > 0 ? `${root}?${query}` : root;
+    } else if (allowIpfsIoRepair && protocol === "https" && host === "ipfs.io") {
+      protocol = "https:";
+      host = assertEx(ipfsGateway, "No ipfsGateway provided");
+      const pathParts = path.split("/");
+      if (pathParts[0] === "ipfs") {
+        pathParts.shift();
+      }
+      path = pathParts.join("/");
+      const root = `${protocol}//${host}/${path}`;
+      return (query == null ? void 0 : query.length) > 0 ? `${root}?${query}` : root;
     } else {
       return urlToCheck;
     }
   } catch (ex) {
-    const error = ex;
-    console.error(`${error.name}:${error.message} [${urlToCheck}]`);
-    console.log(error.stack);
-    return void 0;
+    return urlToCheck;
   }
 };
 

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string) => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    const error = ex as Error\n    console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    console.log(error.stack)\n    return undefined\n  }\n}\n"],"mappings":"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","names":["assertEx","assertEx"]}
+{"version":3,"sources":["../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["import { Hash } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\nexport type Verb = 'get' | 'post'\n\nexport type ApiCall = Payload<\n  {\n    uri: string\n    verb?: Verb\n  },\n  ApiCallSchema\n>\n\nexport const ApiCallResultSchema = 'network.xyo.api.call.result'\nexport type ApiCallResultSchema = typeof ApiCallResultSchema\n\nexport interface HttpMeta {\n  code?: string\n  status?: number\n}\n\nexport type ApiCallJsonResult<T extends object | [] = object> = Payload<\n  {\n    call: Hash\n    contentType: 'application/json'\n    data: T\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallBase64Result = Payload<\n  {\n    call: Hash\n    contentType: Exclude<string, ApiCallJsonResult['contentType']>\n    data: string\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallErrorResult = Payload<\n  {\n    call: Hash\n    http?: HttpMeta\n  },\n  ApiCallResultSchema\n>\n\nexport type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult\n","import { assertEx } from '@xylabs/assert'\nimport { Axios, AxiosError, AxiosJson } from '@xylabs/axios'\nimport { Buffer } from '@xylabs/buffer'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Hash, PayloadHasher } from '@xyo-network/hash'\nimport { JsonArray, JsonObject } from '@xyo-network/object'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\n\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  Verb,\n} from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfig = WitnessConfig<{\n  accept: 'application/json'\n  schema: ApiCallWitnessConfigSchema\n  verb?: Verb\n}>\n\nexport type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>\n\nexport class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {\n  static override configSchemas = [ApiCallWitnessConfigSchema]\n\n  get accept() {\n    return this.config.accept\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {\n          const { uri, verb } = call\n\n          const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')\n\n          if (verb === 'get') {\n            return this.httpGet(validatedUri, uri)\n          }\n\n          const observation: ApiCallResult = {\n            call: await PayloadHasher.hashAsync(call),\n            schema: ApiCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n\n  private async httpGet(url: string, call: Hash): Promise<ApiCallResult> {\n    const result: ApiCallResult = {\n      call,\n      schema: ApiCallResultSchema,\n    }\n    try {\n      switch (this.accept) {\n        case 'application/json': {\n          const axios = new AxiosJson()\n          const response = await axios.get<JsonArray | JsonObject>(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallJsonResult\n            jsonResult.data = response.data\n            jsonResult.contentType = 'application/json'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n        default: {\n          const axios = new Axios({ responseType: 'arraybuffer' })\n          const response = await axios.get(url)\n          if (response.status >= 200 && response.status < 300) {\n            const jsonResult = result as ApiCallBase64Result\n            jsonResult.data = fromByteArray(Buffer.from(response.data, 'binary'))\n            jsonResult.contentType = response.headers['content-type']?.toString() ?? 'application/octet-stream'\n          } else {\n            const errorResult = result as ApiCallErrorResult\n            errorResult.http = {\n              status: response.status,\n            }\n          }\n          break\n        }\n      }\n    } catch (ex) {\n      const axiosError = ex as AxiosError\n      if (axiosError.isAxiosError) {\n        if (axiosError?.response?.status !== undefined) {\n          result.http = result.http ?? {}\n          result.http.status = axiosError?.response?.status\n        }\n        if (axiosError?.code !== undefined) {\n          result.http = result.http ?? {}\n          result.http.code = axiosError?.code\n        }\n        return result\n      } else {\n        throw ex\n      }\n    }\n    return result\n  }\n}\n","import { assertEx } from '@xylabs/assert'\n\nconst allowIpfsIoRepair = true\n\n/**\n * Returns the equivalent IPFS gateway URL for the supplied URL.\n * @param urlToCheck The URL to check\n * @returns If the supplied URL is an IPFS URL, it converts the URL to the\n * equivalent IPFS gateway URL. Otherwise, returns the original URL.\n */\nexport const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string): string => {\n  try {\n    const url = new URL(urlToCheck)\n    let protocol = url.protocol\n    let host = url.host\n    let path = url.pathname\n    const query = url.search\n    if (protocol === 'ipfs:') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else if (allowIpfsIoRepair && protocol === 'https' && host === 'ipfs.io') {\n      protocol = 'https:'\n      host = assertEx(ipfsGateway, 'No ipfsGateway provided')\n      const pathParts = path.split('/')\n      if (pathParts[0] === 'ipfs') {\n        pathParts.shift()\n      }\n      path = pathParts.join('/')\n      const root = `${protocol}//${host}/${path}`\n      return query?.length > 0 ? `${root}?${query}` : root\n    } else {\n      return urlToCheck\n    }\n  } catch (ex) {\n    //const error = ex as Error\n    //console.error(`${error.name}:${error.message} [${urlToCheck}]`)\n    //console.log(error.stack)\n    return urlToCheck\n  }\n}\n"],"mappings":"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","names":["assertEx","assertEx"]}

package/dist/node/lib/checkIpfsUrl.d.cts

@@ -4,5 +4,5 @@
  * @returns If the supplied URL is an IPFS URL, it converts the URL to the
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
-export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string | undefined;
+export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string;
 //# sourceMappingURL=checkIpfsUrl.d.ts.map

package/dist/node/lib/checkIpfsUrl.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,uBAsBpE,CAAA"}
+{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,KAAG,MAgCvE,CAAA"}

package/dist/node/lib/checkIpfsUrl.d.mts

@@ -4,5 +4,5 @@
  * @returns If the supplied URL is an IPFS URL, it converts the URL to the
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
-export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string | undefined;
+export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string;
 //# sourceMappingURL=checkIpfsUrl.d.ts.map

package/dist/node/lib/checkIpfsUrl.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,uBAsBpE,CAAA"}
+{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,KAAG,MAgCvE,CAAA"}

package/dist/node/lib/checkIpfsUrl.d.ts

@@ -4,5 +4,5 @@
  * @returns If the supplied URL is an IPFS URL, it converts the URL to the
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
-export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string | undefined;
+export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway?: string) => string;
 //# sourceMappingURL=checkIpfsUrl.d.ts.map

package/dist/node/lib/checkIpfsUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,uBAsBpE,CAAA"}
+{"version":3,"file":"checkIpfsUrl.d.ts","sourceRoot":"","sources":["../../../src/lib/checkIpfsUrl.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,gBAAgB,MAAM,KAAG,MAgCvE,CAAA"}

package/package.json

@@ -10,18 +10,18 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.13.8",
-    "@xylabs/axios": "^2.13.8",
-    "@xylabs/buffer": "^2.13.8",
-    "@xyo-network/abstract-witness": "~2.79.5",
-    "@xyo-network/hash": "~2.79.5",
-    "@xyo-network/object": "~2.79.5",
-    "@xyo-network/payload-model": "~2.79.5",
-    "@xyo-network/witness-model": "~2.79.5",
+    "@xylabs/assert": "^2.13.9",
+    "@xylabs/axios": "^2.13.9",
+    "@xylabs/buffer": "^2.13.9",
+    "@xyo-network/abstract-witness": "~2.79.6",
+    "@xyo-network/hash": "~2.79.6",
+    "@xyo-network/object": "~2.79.6",
+    "@xyo-network/payload-model": "~2.79.6",
+    "@xyo-network/witness-model": "~2.79.6",
     "base64-js": "^1.5.1"
   },
   "devDependencies": {
-    "@xylabs/jest-helpers": "^2.13.8",
+    "@xylabs/jest-helpers": "^2.13.9",
     "@xylabs/ts-scripts-yarn3": "^3.1.21",
     "@xylabs/tsconfig": "^3.1.21",
     "ethers": "^5.7.2",
@@ -67,6 +67,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.79.5",
+  "version": "2.79.6",
   "type": "module"
 }

package/src/lib/checkIpfsUrl.ts

@@ -1,12 +1,14 @@
 import { assertEx } from '@xylabs/assert'
 
+const allowIpfsIoRepair = true
+
 /**
  * Returns the equivalent IPFS gateway URL for the supplied URL.
  * @param urlToCheck The URL to check
  * @returns If the supplied URL is an IPFS URL, it converts the URL to the
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
-export const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string) => {
+export const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string): string => {
   try {
     const url = new URL(urlToCheck)
     let protocol = url.protocol
@@ -19,13 +21,23 @@ export const checkIpfsUrl = (urlToCheck: string, ipfsGateway?: string) => {
       path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`
       const root = `${protocol}//${host}/${path}`
       return query?.length > 0 ? `${root}?${query}` : root
+    } else if (allowIpfsIoRepair && protocol === 'https' && host === 'ipfs.io') {
+      protocol = 'https:'
+      host = assertEx(ipfsGateway, 'No ipfsGateway provided')
+      const pathParts = path.split('/')
+      if (pathParts[0] === 'ipfs') {
+        pathParts.shift()
+      }
+      path = pathParts.join('/')
+      const root = `${protocol}//${host}/${path}`
+      return query?.length > 0 ? `${root}?${query}` : root
     } else {
       return urlToCheck
     }
   } catch (ex) {
-    const error = ex as Error
-    console.error(`${error.name}:${error.message} [${urlToCheck}]`)
-    console.log(error.stack)
-    return undefined
+    //const error = ex as Error
+    //console.error(`${error.name}:${error.message} [${urlToCheck}]`)
+    //console.log(error.stack)
+    return urlToCheck
   }
 }