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

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/Config.ts","../../src/Payload.ts","../../src/Witness.ts","../../src/lib/checkIpfsUrl.ts"],"sourcesContent":["import { AsObjectFactory } from '@xyo-network/object'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nimport { ApiCall, ApiUriCall, ApiUriTemplateCall } from './Payload'\n\nexport const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'\nexport type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema\n\nexport type ApiCallWitnessConfigBase = WitnessConfig<{\n  accept?: 'application/json'\n  queries?: ApiCall['queries']\n  schema: ApiCallWitnessConfigSchema\n  timeout?: number\n  verb?: ApiCall['verb']\n}>\n\nexport type ApiUriCallWitnessConfig = WitnessConfig<\n  ApiCallWitnessConfigBase & {\n    uri: ApiUriCall['uri']\n  }\n>\n\nexport type ApiUriTemplateCallWitnessConfig = WitnessConfig<\n  ApiCallWitnessConfigBase & {\n    params?: Record<string, unknown>\n    uriTemplate: ApiUriTemplateCall['uriTemplate']\n  }\n>\n\nexport type ApiCallWitnessConfig = ApiUriCallWitnessConfig | ApiUriTemplateCallWitnessConfig | ApiCallWitnessConfigBase\n\nexport const isApiCallWitnessConfig = isPayloadOfSchemaType(ApiCallWitnessConfigSchema)\nexport const asApiCallWitnessConfig = AsObjectFactory.create(isApiCallWitnessConfig)\n\nexport const isApiUriCallWitnessConfig = (payload?: Payload): payload is ApiUriCallWitnessConfig =>\n  isApiCallWitnessConfig(payload) && !!(payload as ApiUriCallWitnessConfig).uri\nexport const asApiUriCallWitnessConfig = AsObjectFactory.create(isApiUriCallWitnessConfig)\n\nexport const isApiUriTemplateCallWitnessConfig = (payload?: Payload): payload is ApiUriTemplateCallWitnessConfig =>\n  isApiCallWitnessConfig(payload) && !!(payload as ApiUriTemplateCallWitnessConfig).uriTemplate\nexport const asApiUriTemplateCallWitnessConfig = AsObjectFactory.create(isApiUriTemplateCallWitnessConfig)\n","import { Hash } from '@xyo-network/hash'\nimport { AsObjectFactory } from '@xyo-network/object'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const ApiCallSchema = 'network.xyo.api.call'\nexport type ApiCallSchema = typeof ApiCallSchema\n\ntype Verb = 'get' | 'post'\ntype Queries = Record<string, string>\n\nexport interface ApiCallFields {\n  queries?: Queries\n  verb?: Verb\n}\n\nexport type ApiUriCall = Payload<\n  ApiCallFields & {\n    uri: string\n  },\n  ApiCallSchema\n>\n\nexport type ApiUriTemplateCall = Payload<\n  ApiCallFields & {\n    params?: Record<string, unknown>\n    uriTemplate?: string\n  },\n  ApiCallSchema\n>\n\nexport type ApiCall = ApiUriCall | ApiUriTemplateCall\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\nexport const isApiCall = isPayloadOfSchemaType(ApiCallSchema)\nexport const asApiCall = AsObjectFactory.create(isApiCall)\n\nexport const isApiUriCall = (payload?: Payload): payload is ApiUriCall => isApiCall(payload) && !!(payload as ApiUriCall).uri\nexport const asApiUriCall = AsObjectFactory.create(isApiUriCall)\n\nexport const isApiUriTemplateCall = (payload?: Payload): payload is ApiUriTemplateCall =>\n  isApiCall(payload) && !!((payload as ApiUriTemplateCall).uriTemplate || (payload as ApiUriTemplateCall).params)\nexport const asApiUriTemplateCall = AsObjectFactory.create(isApiUriTemplateCall)\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 { WitnessParams } from '@xyo-network/witness-model'\nimport { fromByteArray } from 'base64-js'\nimport template from 'es6-template-strings'\n\nimport { ApiCallWitnessConfig, ApiCallWitnessConfigSchema, asApiUriCallWitnessConfig, asApiUriTemplateCallWitnessConfig } from './Config'\nimport { checkIpfsUrl } from './lib'\nimport {\n  ApiCall,\n  ApiCallBase64Result,\n  ApiCallErrorResult,\n  ApiCallJsonResult,\n  ApiCallResult,\n  ApiCallResultSchema,\n  ApiCallSchema,\n  asApiUriCall,\n  asApiUriTemplateCall,\n} from './Payload'\n\nexport type ApiCallWitnessParams = WitnessParams<\n  ApiCallWitnessConfig,\n  {\n    headers?: Record<string, string | undefined>\n    ipfsGateway?: string\n  }\n>\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 ?? 'application/json'\n  }\n\n  get ipfsGateway() {\n    return this.params.ipfsGateway\n  }\n\n  get timeout() {\n    return this.config.timeout\n  }\n\n  getFullUri(call?: ApiCall): string {\n    const { uri: callUri } = asApiUriCall(call) ?? {}\n    const { uriTemplate: callUriTemplate, params: callParams, queries: callQueries } = asApiUriTemplateCall(call) ?? {}\n    const { uri: configUri } = asApiUriCallWitnessConfig(this.config) ?? {}\n    const { uriTemplate: configUriTemplate, params: configParams, queries: configQueries } = asApiUriTemplateCallWitnessConfig(this.config) ?? {}\n\n    const params = { ...configParams, ...callParams }\n\n    let url: URL | undefined = undefined\n\n    if (callUri) {\n      url = new URL(callUri)\n    } else if (callUriTemplate) {\n      url = new URL(template(callUriTemplate, params))\n    } else if (configUri) {\n      url = new URL(configUri)\n    } else if (configUriTemplate) {\n      url = new URL(template(configUriTemplate, params))\n    }\n\n    if (url) {\n      const queries = Object.entries({ ...configQueries, ...callQueries })\n      queries.map(([key, value]) => url?.searchParams.set(key, value))\n      return url.href\n    }\n\n    throw Error('Unable to determine uri. No uri/uriTemplate specified in either the call or config.')\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 { verb: callVerb } = call\n          const { verb: configVerb } = this.config\n          const verb = callVerb ?? configVerb ?? 'get'\n          const uri = this.getFullUri(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.error(`Error [${this.config.name}]: ${error.message}`)\n      console.log(error.stack)\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({ headers: this.params.headers, timeout: this.timeout })\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({ headers: this.params.headers, responseType: 'arraybuffer', timeout: this.timeout })\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":["AsObjectFactory","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType","isPayloadOfSchemaType","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,20 +10,25 @@
     "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",
-    "base64-js": "^1.5.1"
+    "@xylabs/assert": "^2.13.9",
+    "@xylabs/axios": "^2.13.9",
+    "@xylabs/buffer": "^2.13.9",
+    "@xyo-network/abstract-witness": "~2.79.8",
+    "@xyo-network/hash": "~2.79.8",
+    "@xyo-network/object": "~2.79.8",
+    "@xyo-network/payload-model": "~2.79.8",
+    "@xyo-network/witness-model": "~2.79.8",
+    "base64-js": "^1.5.1",
+    "es6-template-strings": "^2.0.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",
+    "@xyo-network/account": "~2.79.8",
+    "@xyo-network/manifest": "~2.79.8",
+    "@xyo-network/module-model": "~2.79.8",
+    "@xyo-network/sentinel-model": "~2.79.8",
     "ethers": "^5.7.2",
     "jest": "^29.7.0",
     "typescript": "^5.2.2"
@@ -67,6 +72,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.79.5",
+  "version": "2.79.8",
   "type": "module"
 }

package/src/Config.ts

@@ -0,0 +1,42 @@
+import { AsObjectFactory } from '@xyo-network/object'
+import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'
+import { WitnessConfig } from '@xyo-network/witness-model'
+
+import { ApiCall, ApiUriCall, ApiUriTemplateCall } from './Payload'
+
+export const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'
+export type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema
+
+export type ApiCallWitnessConfigBase = WitnessConfig<{
+  accept?: 'application/json'
+  queries?: ApiCall['queries']
+  schema: ApiCallWitnessConfigSchema
+  timeout?: number
+  verb?: ApiCall['verb']
+}>
+
+export type ApiUriCallWitnessConfig = WitnessConfig<
+  ApiCallWitnessConfigBase & {
+    uri: ApiUriCall['uri']
+  }
+>
+
+export type ApiUriTemplateCallWitnessConfig = WitnessConfig<
+  ApiCallWitnessConfigBase & {
+    params?: Record<string, unknown>
+    uriTemplate: ApiUriTemplateCall['uriTemplate']
+  }
+>
+
+export type ApiCallWitnessConfig = ApiUriCallWitnessConfig | ApiUriTemplateCallWitnessConfig | ApiCallWitnessConfigBase
+
+export const isApiCallWitnessConfig = isPayloadOfSchemaType(ApiCallWitnessConfigSchema)
+export const asApiCallWitnessConfig = AsObjectFactory.create(isApiCallWitnessConfig)
+
+export const isApiUriCallWitnessConfig = (payload?: Payload): payload is ApiUriCallWitnessConfig =>
+  isApiCallWitnessConfig(payload) && !!(payload as ApiUriCallWitnessConfig).uri
+export const asApiUriCallWitnessConfig = AsObjectFactory.create(isApiUriCallWitnessConfig)
+
+export const isApiUriTemplateCallWitnessConfig = (payload?: Payload): payload is ApiUriTemplateCallWitnessConfig =>
+  isApiCallWitnessConfig(payload) && !!(payload as ApiUriTemplateCallWitnessConfig).uriTemplate
+export const asApiUriTemplateCallWitnessConfig = AsObjectFactory.create(isApiUriTemplateCallWitnessConfig)

package/src/Payload.ts

@@ -1,19 +1,35 @@
 import { Hash } from '@xyo-network/hash'
-import { Payload } from '@xyo-network/payload-model'
+import { AsObjectFactory } from '@xyo-network/object'
+import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'
 
 export const ApiCallSchema = 'network.xyo.api.call'
 export type ApiCallSchema = typeof ApiCallSchema
 
-export type Verb = 'get' | 'post'
+type Verb = 'get' | 'post'
+type Queries = Record<string, string>
 
-export type ApiCall = Payload<
-  {
+export interface ApiCallFields {
+  queries?: Queries
+  verb?: Verb
+}
+
+export type ApiUriCall = Payload<
+  ApiCallFields & {
     uri: string
-    verb?: Verb
   },
   ApiCallSchema
 >
 
+export type ApiUriTemplateCall = Payload<
+  ApiCallFields & {
+    params?: Record<string, unknown>
+    uriTemplate?: string
+  },
+  ApiCallSchema
+>
+
+export type ApiCall = ApiUriCall | ApiUriTemplateCall
+
 export const ApiCallResultSchema = 'network.xyo.api.call.result'
 export type ApiCallResultSchema = typeof ApiCallResultSchema
 
@@ -49,3 +65,13 @@ export type ApiCallErrorResult = Payload<
 >
 
 export type ApiCallResult = ApiCallBase64Result | ApiCallJsonResult | ApiCallErrorResult
+
+export const isApiCall = isPayloadOfSchemaType(ApiCallSchema)
+export const asApiCall = AsObjectFactory.create(isApiCall)
+
+export const isApiUriCall = (payload?: Payload): payload is ApiUriCall => isApiCall(payload) && !!(payload as ApiUriCall).uri
+export const asApiUriCall = AsObjectFactory.create(isApiUriCall)
+
+export const isApiUriTemplateCall = (payload?: Payload): payload is ApiUriTemplateCall =>
+  isApiCall(payload) && !!((payload as ApiUriTemplateCall).uriTemplate || (payload as ApiUriTemplateCall).params)
+export const asApiUriTemplateCall = AsObjectFactory.create(isApiUriTemplateCall)

package/src/Witness.ts

@@ -5,9 +5,11 @@ import { AbstractWitness } from '@xyo-network/abstract-witness'
 import { Hash, PayloadHasher } from '@xyo-network/hash'
 import { JsonArray, JsonObject } from '@xyo-network/object'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
-import { WitnessConfig, WitnessParams } from '@xyo-network/witness-model'
+import { WitnessParams } from '@xyo-network/witness-model'
 import { fromByteArray } from 'base64-js'
+import template from 'es6-template-strings'
 
+import { ApiCallWitnessConfig, ApiCallWitnessConfigSchema, asApiUriCallWitnessConfig, asApiUriTemplateCallWitnessConfig } from './Config'
 import { checkIpfsUrl } from './lib'
 import {
   ApiCall,
@@ -17,37 +19,71 @@ import {
   ApiCallResult,
   ApiCallResultSchema,
   ApiCallSchema,
-  Verb,
+  asApiUriCall,
+  asApiUriTemplateCall,
 } from './Payload'
 
-export const ApiCallWitnessConfigSchema = 'network.xyo.api.call.witness.config'
-export type ApiCallWitnessConfigSchema = typeof ApiCallWitnessConfigSchema
-
-export type ApiCallWitnessConfig = WitnessConfig<{
-  accept: 'application/json'
-  schema: ApiCallWitnessConfigSchema
-  verb?: Verb
-}>
-
-export type ApiCallWitnessParams = WitnessParams<ApiCallWitnessConfig, { ipfsGateway?: string }>
+export type ApiCallWitnessParams = WitnessParams<
+  ApiCallWitnessConfig,
+  {
+    headers?: Record<string, string | undefined>
+    ipfsGateway?: string
+  }
+>
 
 export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {
   static override configSchemas = [ApiCallWitnessConfigSchema]
 
   get accept() {
-    return this.config.accept
+    return this.config.accept ?? 'application/json'
   }
 
   get ipfsGateway() {
     return this.params.ipfsGateway
   }
 
+  get timeout() {
+    return this.config.timeout
+  }
+
+  getFullUri(call?: ApiCall): string {
+    const { uri: callUri } = asApiUriCall(call) ?? {}
+    const { uriTemplate: callUriTemplate, params: callParams, queries: callQueries } = asApiUriTemplateCall(call) ?? {}
+    const { uri: configUri } = asApiUriCallWitnessConfig(this.config) ?? {}
+    const { uriTemplate: configUriTemplate, params: configParams, queries: configQueries } = asApiUriTemplateCallWitnessConfig(this.config) ?? {}
+
+    const params = { ...configParams, ...callParams }
+
+    let url: URL | undefined = undefined
+
+    if (callUri) {
+      url = new URL(callUri)
+    } else if (callUriTemplate) {
+      url = new URL(template(callUriTemplate, params))
+    } else if (configUri) {
+      url = new URL(configUri)
+    } else if (configUriTemplate) {
+      url = new URL(template(configUriTemplate, params))
+    }
+
+    if (url) {
+      const queries = Object.entries({ ...configQueries, ...callQueries })
+      queries.map(([key, value]) => url?.searchParams.set(key, value))
+      return url.href
+    }
+
+    throw Error('Unable to determine uri. No uri/uriTemplate specified in either the call or config.')
+  }
+
   protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {
     await this.started('throw')
     try {
       const observations = await Promise.all(
         inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {
-          const { uri, verb } = call
+          const { verb: callVerb } = call
+          const { verb: configVerb } = this.config
+          const verb = callVerb ?? configVerb ?? 'get'
+          const uri = this.getFullUri(call)
 
           const validatedUri = assertEx(checkIpfsUrl(uri, this.ipfsGateway), 'Invalid URI')
 
@@ -65,7 +101,8 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
       return observations
     } catch (ex) {
       const error = ex as Error
-      console.log(`Error [${this.config.name}]: ${error.message}`)
+      console.error(`Error [${this.config.name}]: ${error.message}`)
+      console.log(error.stack)
       throw error
     }
   }
@@ -78,7 +115,7 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
     try {
       switch (this.accept) {
         case 'application/json': {
-          const axios = new AxiosJson()
+          const axios = new AxiosJson({ headers: this.params.headers, timeout: this.timeout })
           const response = await axios.get<JsonArray | JsonObject>(url)
           if (response.status >= 200 && response.status < 300) {
             const jsonResult = result as ApiCallJsonResult
@@ -93,7 +130,7 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
           break
         }
         default: {
-          const axios = new Axios({ responseType: 'arraybuffer' })
+          const axios = new Axios({ headers: this.params.headers, responseType: 'arraybuffer', timeout: this.timeout })
           const response = await axios.get(url)
           if (response.status >= 200 && response.status < 300) {
             const jsonResult = result as ApiCallBase64Result

package/src/index.ts

@@ -1,2 +1,3 @@
+export * from './Config'
 export * from './Payload'
 export * from './Witness'

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
   }
 }

package/src/spec/opensea.nft-call.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/main/packages/manifest/src/schema.json",
+  "nodes": [
+    {
+      "config": {
+        "name": "ApiCall",
+        "schema": "network.xyo.node.config"
+      },
+      "modules": {
+        "public": [
+          {
+            "config": {
+              "language": "javascript",
+              "name": "ApiCallWitness",
+              "queries": {
+                "limit": 1
+              },
+              "schema": "network.xyo.api.call.witness.config",
+              "uriTemplate": "https://api.opensea.io/api/v2/chain/ethereum/account/${address}/nfts"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "ApiCallSentinel",
+              "schema": "network.xyo.sentinel.config",
+              "synchronous": "true",
+              "tasks": [
+                {
+                  "input": true,
+                  "module": "ApiCallWitness"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "schema": "network.xyo.manifest"
+}

package/src/types.d.ts

@@ -0,0 +1 @@
+declare module 'es6-template-strings'