@xyo-network/api 2.41.11 → 2.42.0

package/src/Diviner/AddressHistoryDiviner/XyoRemoteAddressHistoryDiviner.spec.ts

@@ -1,7 +1,7 @@
-import { XyoAccount } from '@xyo-network/account'
+import { Account } from '@xyo-network/account'
 import { XyoApiConfig } from '@xyo-network/api-models'
 import { BoundWitnessWrapper, XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness'
-import { AddressHistoryQuerySchema, DivinerWrapper } from '@xyo-network/diviner'
+import { AddressHistoryQueryPayload, AddressHistoryQuerySchema, DivinerWrapper } from '@xyo-network/diviner'
 import { XyoPayloadBuilder } from '@xyo-network/payload'
 
 import { XyoArchivistApi } from '../../Api'
@@ -9,14 +9,14 @@ import { XyoRemoteDivinerConfigSchema } from '../XyoRemoteDivinerConfig'
 import { XyoRemoteAddressHistoryDiviner } from './XyoRemoteAddressHistoryDiviner'
 
 const configData: XyoApiConfig = {
-  apiDomain: process.env.API_DOMAIN || 'https://beta.api.archivist.xyo.network',
-  onError: (error) => console.error(`Error: ${JSON.stringify(error)}`),
-  onFailure: (response) => response, //console.error(`Failure: ${response.statusText} [${response.status}] [${JSON.stringify(response.data)}]`),
-  onSuccess: (response) => response, //console.log(`Success: ${response.statusText} [${response.status}] [${JSON.stringify(response.data)}]`),
+  apiDomain: process.env.API_DOMAIN || 'http://locahost:8080',
+  onError: (error) => error,
+  onFailure: (response) => response,
+  onSuccess: (response) => response,
 }
 
 describe('XyoRemoteAddressHistoryDiviner', () => {
-  const address = new XyoAccount({ phrase: 'test' }).addressValue.hex
+  const address = new Account({ phrase: 'test' }).addressValue.hex
   const api = new XyoArchivistApi(configData)
   let diviner: XyoRemoteAddressHistoryDiviner
   beforeAll(async () => {
@@ -26,7 +26,7 @@ describe('XyoRemoteAddressHistoryDiviner', () => {
   describe('with valid address returns', () => {
     let result: XyoBoundWitness[]
     beforeAll(async () => {
-      const source = new XyoPayloadBuilder({ schema: AddressHistoryQuerySchema }).fields({ address }).build()
+      const source = new XyoPayloadBuilder<AddressHistoryQueryPayload>({ schema: AddressHistoryQuerySchema }).fields({ address }).build()
       result = (await new DivinerWrapper(diviner).divine([source])) as XyoBoundWitness[]
       expect(result.length).toBeGreaterThan(0)
     })
@@ -46,11 +46,11 @@ describe('XyoRemoteAddressHistoryDiviner', () => {
     let result: XyoBoundWitness[]
     let hash: string
     beforeAll(async () => {
-      let source = new XyoPayloadBuilder({ schema: AddressHistoryQuerySchema }).fields({ address }).build()
+      let source = new XyoPayloadBuilder<AddressHistoryQueryPayload>({ schema: AddressHistoryQuerySchema }).fields({ address }).build()
       result = (await new DivinerWrapper(diviner).divine([source])) as XyoBoundWitness[]
       expect(result.length).toBeGreaterThan(0)
       hash = new BoundWitnessWrapper(result?.[0]).hash
-      source = new XyoPayloadBuilder({ schema: AddressHistoryQuerySchema }).fields({ address, offset: hash }).build()
+      source = new XyoPayloadBuilder<AddressHistoryQueryPayload>({ schema: AddressHistoryQuerySchema }).fields({ address, offset: hash }).build()
       result = (await new DivinerWrapper(diviner).divine([source])) as XyoBoundWitness[]
       expect(result.length).toBeGreaterThan(0)
     })
@@ -62,7 +62,7 @@ describe('XyoRemoteAddressHistoryDiviner', () => {
     const limit = 1
     let result: XyoBoundWitness[]
     beforeAll(async () => {
-      const source = new XyoPayloadBuilder({ schema: AddressHistoryQuerySchema }).fields({ address, limit }).build()
+      const source = new XyoPayloadBuilder<AddressHistoryQueryPayload>({ schema: AddressHistoryQuerySchema }).fields({ address, limit }).build()
       result = (await new DivinerWrapper(diviner).divine([source])) as XyoBoundWitness[]
       expect(result.length).toBeGreaterThan(0)
     })
@@ -72,7 +72,7 @@ describe('XyoRemoteAddressHistoryDiviner', () => {
   })
   describe('with non-existent address', () => {
     it('returns empty array', async () => {
-      const source = new XyoPayloadBuilder({ schema: AddressHistoryQuerySchema }).fields({ address: 'foo' }).build()
+      const source = new XyoPayloadBuilder<AddressHistoryQueryPayload>({ schema: AddressHistoryQuerySchema }).fields({ address: 'foo' }).build()
       const result = await new DivinerWrapper(diviner).divine([source])
       expect(result.length).toBe(0)
     })

package/src/Diviner/ArchiveListApiDiviner/ArchiveListApiDiviner.spec.ts

@@ -5,21 +5,14 @@ import { ArchiveListApiDiviner } from './ArchiveListApiDiviner'
 import { XyoArchiveListApiDivinerConfigSchema, XyoArchiveSchema } from './ArchiveListApiDivinerConfig'
 
 const configData: XyoApiConfig = {
-  apiDomain: process.env.API_DOMAIN || 'https://beta.api.archivist.xyo.network',
+  apiDomain: process.env.API_DOMAIN || 'http://locahost:8080',
 }
 
 test('ArchiveListApiDiviner', async () => {
   const api = new XyoArchivistApi(configData)
-  const diviner = await ArchiveListApiDiviner.create({
-    api,
-    config: { schema: XyoArchiveListApiDivinerConfigSchema },
-    logger: console,
-  })
-
+  const diviner = await ArchiveListApiDiviner.create({ api, config: { schema: XyoArchiveListApiDivinerConfigSchema } })
   expect(diviner).toBeDefined()
-
   const result = await diviner.divine()
-
   expect(result.length).toBeGreaterThan(0)
   expect(result[0].schema).toBe(XyoArchiveSchema)
 })

package/src/Diviner/LocationDiviner/LocationDivinerApi.spec.ts

@@ -1,5 +1,4 @@
 import { XyoApiConfig } from '@xyo-network/api-models'
-import { AxiosError } from 'axios'
 
 import { ApiConfig } from './ApiConfig'
 import { XyoLocationDivinerApi } from './LocationDivinerApi'
@@ -11,8 +10,10 @@ import {
 } from './Queries'
 import { LocationWitnessSchema } from './Witnesses'
 
-const config: ApiConfig = {
-  apiDomain: process.env.LOCATION_API_DOMAIN || 'http://localhost:8082',
+const getLocationApiConfig = (): ApiConfig => {
+  return {
+    apiDomain: process.env.LOCATION_API_DOMAIN || 'http://localhost:8082',
+  }
 }
 
 const getArchiveConfig = (): XyoApiConfig => {
@@ -59,48 +60,30 @@ const describeSkipIfNoDiviner = process.env.LOCATION_API_DOMAIN ? describe : des
 describeSkipIfNoDiviner('XyoLocationDivinerApi', () => {
   describe('constructor', () => {
     it('returns a new XyoLocationDivinerApi', () => {
-      const api = new XyoLocationDivinerApi(config)
+      const api = new XyoLocationDivinerApi(getLocationApiConfig())
       expect(api).toBeDefined()
     })
   })
   describe('postLocationQuery', () => {
     it('posts a location heatmap query', async () => {
-      const api = new XyoLocationDivinerApi(config)
-      try {
-        const locationQuery = await api.postLocationQuery(getLocationHeatmapQueryCreationRequest())
-        const response = await api.getLocationQuery(locationQuery.hash)
-        expect(response.queryHash).toBe(locationQuery.hash)
-      } catch (ex) {
-        const error = ex as AxiosError
-        console.log(JSON.stringify(error.response?.data, null, 2))
-        expect(error === undefined)
-      }
+      const api = new XyoLocationDivinerApi(getLocationApiConfig())
+      const locationQuery = await api.postLocationQuery(getLocationHeatmapQueryCreationRequest())
+      const response = await api.getLocationQuery(locationQuery.hash)
+      expect(response.queryHash).toBe(locationQuery.hash)
     })
     it('posts a location time range query', async () => {
-      const api = new XyoLocationDivinerApi(config)
-      try {
-        const locationQuery = await api.postLocationQuery(getLocationTimeRangeQueryCreationRequest())
-        const response = await api.getLocationQuery(locationQuery.hash)
-        expect(response.queryHash).toBe(locationQuery.hash)
-      } catch (ex) {
-        const error = ex as AxiosError
-        console.log(JSON.stringify(error.response?.data, null, 2))
-        expect(error === undefined)
-      }
+      const api = new XyoLocationDivinerApi(getLocationApiConfig())
+      const locationQuery = await api.postLocationQuery(getLocationTimeRangeQueryCreationRequest())
+      const response = await api.getLocationQuery(locationQuery.hash)
+      expect(response.queryHash).toBe(locationQuery.hash)
     })
   })
   describe('getLocationQuery', function () {
     it('gets the status of a previously posted location query', async () => {
-      const api = new XyoLocationDivinerApi(config)
-      try {
-        const locationQuery = await api.postLocationQuery(getLocationTimeRangeQueryCreationRequest())
-        const response = await api.getLocationQuery(locationQuery.hash)
-        expect(response.queryHash).toBe(locationQuery.hash)
-      } catch (ex) {
-        const error = ex as AxiosError
-        console.log(JSON.stringify(error.response?.data, null, 2))
-        expect(error === undefined)
-      }
+      const api = new XyoLocationDivinerApi(getLocationApiConfig())
+      const locationQuery = await api.postLocationQuery(getLocationTimeRangeQueryCreationRequest())
+      const response = await api.getLocationQuery(locationQuery.hash)
+      expect(response.queryHash).toBe(locationQuery.hash)
     })
   })
 })

package/src/Diviner/SchemaListApiDiviner/SchemaListApiDiviner.spec.ts

@@ -5,7 +5,7 @@ import { SchemaListApiDiviner } from './SchemaListApiDiviner'
 import { XyoSchemaListApiDivinerConfigSchema } from './SchemaListApiDivinerConfig'
 
 const configData: XyoApiConfig = {
-  apiDomain: process.env.API_DOMAIN || 'https://beta.api.archivist.xyo.network',
+  apiDomain: process.env.API_DOMAIN || 'http://locahost:8080',
 }
 
 test('SchemaListApiDiviner', async () => {
@@ -13,12 +13,8 @@ test('SchemaListApiDiviner', async () => {
   const diviner = await SchemaListApiDiviner.create({
     api,
     config: { archive: 'temp', schema: XyoSchemaListApiDivinerConfigSchema },
-    logger: console,
   })
-
   expect(diviner).toBeDefined()
-
   const result = await diviner.divine()
-
   expect(result.length).toBeGreaterThan(0)
 })

package/src/Diviner/SchemaStatsApiDiviner/SchemaStatsApiDiviner.spec.ts

@@ -5,20 +5,13 @@ import { SchemaStatsApiDiviner } from './SchemaStatsApiDiviner'
 import { XyoSchemaStatsApiDivinerConfigSchema } from './SchemaStatsApiDivinerConfig'
 
 const configData: XyoApiConfig = {
-  apiDomain: process.env.API_DOMAIN || 'https://beta.api.archivist.xyo.network',
+  apiDomain: process.env.API_DOMAIN || 'http://locahost:8080',
 }
 
 test('SchemaStatsApiDiviner', async () => {
   const api = new XyoArchivistApi(configData)
-  const diviner = await SchemaStatsApiDiviner.create({
-    api,
-    config: { archive: 'temp', schema: XyoSchemaStatsApiDivinerConfigSchema },
-    logger: console,
-  })
-
+  const diviner = await SchemaStatsApiDiviner.create({ api, config: { archive: 'temp', schema: XyoSchemaStatsApiDivinerConfigSchema } })
   expect(diviner).toBeDefined()
-
   const result = await diviner.divine()
-
   expect(result.length).toBeGreaterThan(0)
 })

package/src/User/Api.spec.ts

@@ -1,4 +1,4 @@
-import { XyoApiConfig, XyoApiError } from '@xyo-network/api-models'
+import { XyoApiConfig } from '@xyo-network/api-models'
 import { typeOf } from '@xyo-network/typeof'
 
 import { XyoArchivistApi } from '../Api'
@@ -21,15 +21,9 @@ describe('XyoAuthApi', () => {
       'returns a nonce',
       async () => {
         const api = new XyoArchivistApi(config)
-        try {
-          const response = await api.account('0xfEf40940e776A3686Cb29eC712d60859EA9f99F7').challenge.post()
-          expect(response?.state).toBeDefined()
-          expect(typeOf(response?.state)).toBe('string')
-        } catch (ex) {
-          const error = ex as XyoApiError
-          console.log(JSON.stringify(error.response?.data, null, 2))
-          expect(error === undefined)
-        }
+        const response = await api.account('0xfEf40940e776A3686Cb29eC712d60859EA9f99F7').challenge.post()
+        expect(response?.state).toBeDefined()
+        expect(typeOf(response?.state)).toBe('string')
       },
       timeout,
     )

package/typedoc.json

@@ -4,7 +4,7 @@
     "XyoPayload",
     "XyoPayloadFull",
     "XyoBoundWitness",
-    "XyoDataLike",
+    "DataLike",
     "Huri",
     "XyoSchemaPayload"
   ]

package/dist/cjs/Api/Addresses/ModuleDescription.d.ts

@@ -1,5 +0,0 @@
-export interface ModuleDescription {
-    address: string;
-    queries: string[];
-}
-//# sourceMappingURL=ModuleDescription.d.ts.map

package/dist/cjs/Api/Addresses/ModuleDescription.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleDescription.d.ts","sourceRoot":"","sources":["../../../../src/Api/Addresses/ModuleDescription.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB"}

package/dist/cjs/Api/Addresses/ModuleDescription.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=ModuleDescription.js.map

package/dist/cjs/Api/Addresses/ModuleDescription.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleDescription.js","sourceRoot":"","sources":["../../../../src/Api/Addresses/ModuleDescription.ts"],"names":[],"mappings":""}

package/dist/cjs/Api/Addresses/NodeModuleDescription.d.ts

@@ -1,5 +0,0 @@
-import { ModuleDescription } from './ModuleDescription';
-export interface NodeModuleDescription extends ModuleDescription {
-    url: string;
-}
-//# sourceMappingURL=NodeModuleDescription.d.ts.map

package/dist/cjs/Api/Addresses/NodeModuleDescription.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NodeModuleDescription.d.ts","sourceRoot":"","sources":["../../../../src/Api/Addresses/NodeModuleDescription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,GAAG,EAAE,MAAM,CAAA;CACZ"}

package/dist/cjs/Api/Addresses/NodeModuleDescription.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=NodeModuleDescription.js.map

package/dist/cjs/Api/Addresses/NodeModuleDescription.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NodeModuleDescription.js","sourceRoot":"","sources":["../../../../src/Api/Addresses/NodeModuleDescription.ts"],"names":[],"mappings":""}

package/dist/esm/Api/Addresses/ModuleDescription.d.ts

@@ -1,5 +0,0 @@
-export interface ModuleDescription {
-    address: string;
-    queries: string[];
-}
-//# sourceMappingURL=ModuleDescription.d.ts.map

package/dist/esm/Api/Addresses/ModuleDescription.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleDescription.d.ts","sourceRoot":"","sources":["../../../../src/Api/Addresses/ModuleDescription.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB"}

package/dist/esm/Api/Addresses/ModuleDescription.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ModuleDescription.js.map

package/dist/esm/Api/Addresses/ModuleDescription.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleDescription.js","sourceRoot":"","sources":["../../../../src/Api/Addresses/ModuleDescription.ts"],"names":[],"mappings":""}

package/dist/esm/Api/Addresses/NodeModuleDescription.d.ts

@@ -1,5 +0,0 @@
-import { ModuleDescription } from './ModuleDescription';
-export interface NodeModuleDescription extends ModuleDescription {
-    url: string;
-}
-//# sourceMappingURL=NodeModuleDescription.d.ts.map

package/dist/esm/Api/Addresses/NodeModuleDescription.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NodeModuleDescription.d.ts","sourceRoot":"","sources":["../../../../src/Api/Addresses/NodeModuleDescription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,GAAG,EAAE,MAAM,CAAA;CACZ"}

package/dist/esm/Api/Addresses/NodeModuleDescription.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=NodeModuleDescription.js.map

package/dist/esm/Api/Addresses/NodeModuleDescription.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NodeModuleDescription.js","sourceRoot":"","sources":["../../../../src/Api/Addresses/NodeModuleDescription.ts"],"names":[],"mappings":""}

package/src/Api/Addresses/ModuleDescription.ts

@@ -1,4 +0,0 @@
-export interface ModuleDescription {
-  address: string
-  queries: string[]
-}

package/src/Api/Addresses/NodeModuleDescription.ts

@@ -1,5 +0,0 @@
-import { ModuleDescription } from './ModuleDescription'
-
-export interface NodeModuleDescription extends ModuleDescription {
-  url: string
-}