@xyo-network/api-call-witness 2.91.8 → 2.91.9

package/package.json

@@ -10,26 +10,26 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.0.25",
-    "@xylabs/axios": "^3.0.25",
-    "@xylabs/hex": "^3.0.25",
-    "@xylabs/object": "^3.0.25",
-    "@xyo-network/abstract-witness": "^2.94.23",
-    "@xyo-network/hash": "^2.94.23",
-    "@xyo-network/payload-builder": "^2.94.23",
-    "@xyo-network/payload-model": "^2.94.23",
-    "@xyo-network/witness-model": "^2.94.23",
+    "@xylabs/assert": "^3.1.7",
+    "@xylabs/axios": "^3.1.7",
+    "@xylabs/hex": "^3.1.7",
+    "@xylabs/object": "^3.1.7",
+    "@xyo-network/abstract-witness": "^2.94.25",
+    "@xyo-network/hash": "^2.94.25",
+    "@xyo-network/payload-builder": "^2.94.25",
+    "@xyo-network/payload-model": "^2.94.25",
+    "@xyo-network/witness-model": "^2.94.25",
     "base64-js": "^1.5.1",
-    "es6-template-strings": "^2.0.1"
+    "es6-dynamic-template": "^2.0.0"
   },
   "devDependencies": {
-    "@xylabs/jest-helpers": "^3.0.25",
+    "@xylabs/jest-helpers": "^3.1.7",
     "@xylabs/ts-scripts-yarn3": "^3.9.0",
     "@xylabs/tsconfig": "^3.9.0",
-    "@xyo-network/account": "^2.94.23",
-    "@xyo-network/manifest": "^2.94.23",
-    "@xyo-network/module-model": "^2.94.23",
-    "@xyo-network/sentinel-model": "^2.94.23",
+    "@xyo-network/account": "^2.94.25",
+    "@xyo-network/manifest": "^2.94.25",
+    "@xyo-network/module-model": "^2.94.25",
+    "@xyo-network/sentinel-model": "^2.94.25",
     "ethers": "^6.11.1",
     "jest": "^29.7.0",
     "typescript": "^5.4.4"
@@ -73,6 +73,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.91.8",
+  "version": "2.91.9",
   "type": "module"
 }

package/src/Config.ts

@@ -23,7 +23,7 @@ export type ApiUriCallWitnessConfig = WitnessConfig<
 
 export type ApiUriTemplateCallWitnessConfig = WitnessConfig<
   ApiCallWitnessConfigBase & {
-    params?: Record<string, unknown>
+    params?: Record<string, string>
     uriTemplate: ApiUriTemplateCall['uriTemplate']
   }
 >

package/src/Payload.ts

@@ -24,7 +24,7 @@ export const asApiUriCall = AsObjectFactory.create(isApiUriCall)
 
 export type ApiUriTemplateCall = Payload<
   ApiCallFields & {
-    params?: Record<string, unknown>
+    params?: Record<string, string>
     uriTemplate?: string
   },
   ApiCallSchema

package/src/Witness.ts

@@ -1,3 +1,4 @@
+/* eslint-disable max-statements */
 import { assertEx } from '@xylabs/assert'
 import { Axios, AxiosError, AxiosJson } from '@xylabs/axios'
 import { Hash } from '@xylabs/hex'
@@ -7,7 +8,7 @@ import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import { WitnessParams } from '@xyo-network/witness-model'
 import { fromByteArray } from 'base64-js'
-import template from 'es6-template-strings'
+import fillTemplate from 'es6-dynamic-template'
 
 import { ApiCallWitnessConfig, ApiCallWitnessConfigSchema, asApiUriCallWitnessConfig, asApiUriTemplateCallWitnessConfig } from './Config'
 import { checkIpfsUrl } from './lib'
@@ -60,11 +61,11 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
     if (callUri) {
       url = new URL(callUri)
     } else if (callUriTemplate) {
-      url = new URL(template(callUriTemplate, params))
+      url = new URL(fillTemplate(callUriTemplate, params))
     } else if (configUri) {
       url = new URL(configUri)
     } else if (configUriTemplate) {
-      url = new URL(template(configUriTemplate, params))
+      url = new URL(fillTemplate(configUriTemplate, params))
     }
 
     if (url) {
@@ -116,7 +117,7 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
     try {
       switch (this.accept) {
         case 'application/json': {
-          const axios = new AxiosJson({ headers: this.params.headers, timeout: this.timeout })
+          const axios = new AxiosJson({ headers: { ...this.params.headers, Accept: 'application/json' }, timeout: this.timeout })
           const response = await axios.get<ApiCallJsonResultType>(url)
           if (response.status >= 200 && response.status < 300) {
             const jsonResult = result as ApiCallJsonResult

package/src/spec/tzero-marketdata-sandbox-price-history.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/a5a229a767e3998e13cce8160fd1c2b027317424/packages/manifest/src/schema.json",
+  "nodes": [
+    {
+      "config": {
+        "accountPath": "0",
+        "name": "ApiCall",
+        "schema": "network.xyo.node.config"
+      },
+      "modules": {
+        "public": [
+          {
+            "config": {
+              "accountPath": "0/0",
+              "language": "javascript",
+              "name": "ApiCallWitness",
+              "schema": "network.xyo.api.call.witness.config",
+              "uriTemplate": "https://gateway-web-markets-staging.tzero.com/mdt/public-pricehistory/${symbol}"
+            }
+          },
+          {
+            "config": {
+              "accountPath": "1/0",
+              "language": "javascript",
+              "name": "ApiCallSentinel",
+              "schema": "network.xyo.sentinel.config",
+              "synchronous": "true",
+              "tasks": [
+                {
+                  "input": true,
+                  "module": "ApiCallWitness"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "schema": "network.xyo.manifest"
+}

package/src/spec/tzero-marketdata-sandbox-snapshots-symbol.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/a5a229a767e3998e13cce8160fd1c2b027317424/packages/manifest/src/schema.json",
+  "nodes": [
+    {
+      "config": {
+        "accountPath": "0",
+        "name": "ApiCall",
+        "schema": "network.xyo.node.config"
+      },
+      "modules": {
+        "public": [
+          {
+            "config": {
+              "accountPath": "0/0",
+              "language": "javascript",
+              "name": "ApiCallWitness",
+              "schema": "network.xyo.api.call.witness.config",
+              "uriTemplate": "https://gateway-web-markets-staging.tzero.com/mdt/public-snapshots/${symbol}"
+            }
+          },
+          {
+            "config": {
+              "accountPath": "1/0",
+              "language": "javascript",
+              "name": "ApiCallSentinel",
+              "schema": "network.xyo.sentinel.config",
+              "synchronous": "true",
+              "tasks": [
+                {
+                  "input": true,
+                  "module": "ApiCallWitness"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "schema": "network.xyo.manifest"
+}

package/src/spec/tzero-marketdata-sandbox-snapshots.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/a5a229a767e3998e13cce8160fd1c2b027317424/packages/manifest/src/schema.json",
+  "nodes": [
+    {
+      "config": {
+        "accountPath": "0",
+        "name": "ApiCall",
+        "schema": "network.xyo.node.config"
+      },
+      "modules": {
+        "public": [
+          {
+            "config": {
+              "accountPath": "0/0",
+              "language": "javascript",
+              "name": "ApiCallWitness",
+              "schema": "network.xyo.api.call.witness.config",
+              "uriTemplate": "https://gateway-web-markets-staging.tzero.com/mdt/public-snapshots"
+            }
+          },
+          {
+            "config": {
+              "accountPath": "0/1",
+              "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

@@ -1 +1 @@
-declare module 'es6-template-strings'
+declare module 'es6-dynamic-template'