@xyo-network/api 2.38.15 → 2.38.17

package/dist/esm/Diviner/SchemaStatsApiDiviner/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Diviner/SchemaStatsApiDiviner/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,yBAAyB,CAAA"}

package/dist/esm/Diviner/XyoRemoteDivinerConfig.d.ts

@@ -1,5 +1,5 @@
 import { XyoDivinerConfig } from '@xyo-network/diviner';
-import { XyoArchivistApi } from '../Archivist';
+import { XyoArchivistApi } from '../Api';
 export declare type XyoRemoteDivinerConfigSchema = 'network.xyo.diviner.remote.config';
 export declare const XyoRemoteDivinerConfigSchema: XyoRemoteDivinerConfigSchema;
 export declare type XyoRemoteDivinerConfig = XyoDivinerConfig & {

package/dist/esm/Diviner/XyoRemoteDivinerConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoRemoteDivinerConfig.d.ts","sourceRoot":"","sources":["../../../src/Diviner/XyoRemoteDivinerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,oBAAY,4BAA4B,GAAG,mCAAmC,CAAA;AAC9E,eAAO,MAAM,4BAA4B,EAAE,4BAAkE,CAAA;AAE7G,oBAAY,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,wCAAwC;IACxC,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,4BAA4B,CAAA;CACrC,CAAA"}
+{"version":3,"file":"XyoRemoteDivinerConfig.d.ts","sourceRoot":"","sources":["../../../src/Diviner/XyoRemoteDivinerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAExC,oBAAY,4BAA4B,GAAG,mCAAmC,CAAA;AAC9E,eAAO,MAAM,4BAA4B,EAAE,4BAAkE,CAAA;AAE7G,oBAAY,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,wCAAwC;IACxC,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,4BAA4B,CAAA;CACrC,CAAA"}

package/dist/esm/Diviner/index.d.ts

@@ -1,3 +1,4 @@
 export * from './AddressHistoryDiviner';
 export * from './LocationDiviner';
+export * from './SchemaStatsApiDiviner';
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/Diviner/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Diviner/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Diviner/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}

package/dist/esm/Diviner/index.js

@@ -1,3 +1,4 @@
 export * from './AddressHistoryDiviner';
 export * from './LocationDiviner';
+export * from './SchemaStatsApiDiviner';
 //# sourceMappingURL=index.js.map

package/dist/esm/Diviner/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Diviner/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Diviner/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
-export * from './Archivist';
+export * from './Api';
 export * from './Base';
 export * from './Diviner';
 export * from './models';

package/dist/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA"}

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-export * from './Archivist';
+export * from './Api';
 export * from './Base';
 export * from './Diviner';
 export * from './models';

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA"}

package/package.json

@@ -11,14 +11,15 @@
   "dependencies": {
     "@xylabs/assert": "^2.6.9",
     "@xylabs/delay": "^2.6.9",
-    "@xyo-network/account": "^2.38.15",
-    "@xyo-network/archivist": "^2.38.15",
-    "@xyo-network/boundwitness": "^2.38.15",
-    "@xyo-network/core": "^2.38.15",
-    "@xyo-network/diviner": "^2.38.15",
-    "@xyo-network/module": "^2.38.15",
-    "@xyo-network/payload": "^2.38.15",
-    "@xyo-network/schema-payload-plugin": "^2.38.15",
+    "@xylabs/sdk-js": "^2.6.9",
+    "@xyo-network/account": "^2.38.17",
+    "@xyo-network/archivist": "^2.38.17",
+    "@xyo-network/boundwitness": "^2.38.17",
+    "@xyo-network/core": "^2.38.17",
+    "@xyo-network/diviner": "^2.38.17",
+    "@xyo-network/module": "^2.38.17",
+    "@xyo-network/payload": "^2.38.17",
+    "@xyo-network/schema-payload-plugin": "^2.38.17",
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
@@ -65,5 +66,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.38.15"
+  "version": "2.38.17"
 }

package/src/{Archivist → Api}/Api.ts

@@ -15,6 +15,10 @@ import { XyoArchivistNodeApi } from './Node'
 
 export class XyoArchivistApi extends XyoApiBase {
   private _addresses?: XyoAddressesApi
+  private _archives?: XyoArchivistArchivesApi
+  private _stats?: XyoApiSimple<unknown[]>
+  private _user?: XyoUserApi
+
   public get addresses(): XyoAddressesApi {
     this._addresses =
       this._addresses ??
@@ -25,7 +29,6 @@ export class XyoArchivistApi extends XyoApiBase {
     return this._addresses
   }
 
-  private _archives?: XyoArchivistArchivesApi
   public get archives(): XyoArchivistArchivesApi {
     this._archives =
       this._archives ??
@@ -36,7 +39,6 @@ export class XyoArchivistApi extends XyoApiBase {
     return this._archives
   }
 
-  private _stats?: XyoApiSimple<unknown[]>
   public get stats() {
     this._stats =
       this._stats ??
@@ -47,7 +49,6 @@ export class XyoArchivistApi extends XyoApiBase {
     return this._stats
   }
 
-  private _user?: XyoUserApi
   public get user(): XyoUserApi {
     this._user =
       this._user ??
@@ -58,6 +59,13 @@ export class XyoArchivistApi extends XyoApiBase {
     return this._user
   }
 
+  public account(address: XyoDataLike) {
+    return new XyoAccountApi({
+      ...this.config,
+      root: `${this.root}wallet/${new XyoAddressValue(address).hex}/`,
+    })
+  }
+
   public archive(archive = 'temp') {
     const pureArchive = archive.toLowerCase()
     return new XyoArchivistArchiveApi({
@@ -66,16 +74,21 @@ export class XyoArchivistApi extends XyoApiBase {
     })
   }
 
-  /** @deprecated use account instead */
-  public wallet(address: XyoDataLike) {
-    return this.account(address)
-  }
-
-  public account(address: XyoDataLike) {
-    return new XyoAccountApi({
-      ...this.config,
-      root: `${this.root}wallet/${new XyoAddressValue(address).hex}/`,
-    })
+  /** @deprecated use huri(huri) instead */
+  public async get(huri: Huri | string): Promise<XyoApiResponseBody<XyoPayload>>
+  /** @deprecated use huri(huri) instead */
+  public async get(huri: Huri | string, responseType?: 'body'): Promise<XyoApiResponseBody<XyoPayload>>
+  /** @deprecated use huri(huri) instead */
+  public async get(huri: Huri | string, responseType?: 'tuple'): Promise<XyoApiResponseTuple<XyoPayload>>
+  /** @deprecated use huri(huri) instead */
+  public async get(huri: Huri | string, responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<XyoPayload>> {
+    const huriObj = typeof huri === 'string' ? new Huri(huri) : huri
+    switch (responseType) {
+      case 'tuple':
+        return await this.getEndpoint(huriObj.href, 'tuple')
+      default:
+        return await this.getEndpoint(huriObj.href, 'body')
+    }
   }
 
   public huri(huri: Huri | string) {
@@ -98,20 +111,8 @@ export class XyoArchivistApi extends XyoApiBase {
     })
   }
 
-  /** @deprecated use huri(huri) instead */
-  public async get(huri: Huri | string): Promise<XyoApiResponseBody<XyoPayload>>
-  /** @deprecated use huri(huri) instead */
-  public async get(huri: Huri | string, responseType?: 'body'): Promise<XyoApiResponseBody<XyoPayload>>
-  /** @deprecated use huri(huri) instead */
-  public async get(huri: Huri | string, responseType?: 'tuple'): Promise<XyoApiResponseTuple<XyoPayload>>
-  /** @deprecated use huri(huri) instead */
-  public async get(huri: Huri | string, responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<XyoPayload>> {
-    const huriObj = typeof huri === 'string' ? new Huri(huri) : huri
-    switch (responseType) {
-      case 'tuple':
-        return await this.getEndpoint(huriObj.href, 'tuple')
-      default:
-        return await this.getEndpoint(huriObj.href, 'body')
-    }
+  /** @deprecated use account instead */
+  public wallet(address: XyoDataLike) {
+    return this.account(address)
   }
 }

package/src/{Archivist → Api}/Archive/Api.ts

@@ -8,6 +8,10 @@ import { XyoArchivistArchiveSettingsApi } from './Settings'
 
 export class XyoArchivistArchiveApi extends XyoApiSimple<XyoArchive> {
   private _block?: XyoArchivistArchiveBlockApi
+  private _payload?: XyoArchivistPayloadApi
+  private _schemas?: XyoArchivistArchiveSchemasApi
+  private _settings?: XyoArchivistArchiveSettingsApi
+
   public get block(): XyoArchivistArchiveBlockApi {
     this._block =
       this._block ??
@@ -18,7 +22,6 @@ export class XyoArchivistArchiveApi extends XyoApiSimple<XyoArchive> {
     return this._block
   }
 
-  private _payload?: XyoArchivistPayloadApi
   public get payload(): XyoArchivistPayloadApi {
     this._payload =
       this._payload ??
@@ -29,18 +32,6 @@ export class XyoArchivistArchiveApi extends XyoApiSimple<XyoArchive> {
     return this._payload
   }
 
-  private _settings?: XyoArchivistArchiveSettingsApi
-  public get settings(): XyoArchivistArchiveSettingsApi {
-    this._settings =
-      this._settings ??
-      new XyoArchivistArchiveSettingsApi({
-        ...this.config,
-        root: `${this.root}settings/`,
-      })
-    return this._settings
-  }
-
-  private _schemas?: XyoArchivistArchiveSchemasApi
   public get schemas(): XyoArchivistArchiveSchemasApi {
     this._schemas =
       this._schemas ??
@@ -51,6 +42,16 @@ export class XyoArchivistArchiveApi extends XyoApiSimple<XyoArchive> {
     return this._schemas
   }
 
+  public get settings(): XyoArchivistArchiveSettingsApi {
+    this._settings =
+      this._settings ??
+      new XyoArchivistArchiveSettingsApi({
+        ...this.config,
+        root: `${this.root}settings/`,
+      })
+    return this._settings
+  }
+
   public schema(schema: string): XyoArchivistArchiveSchemaApi {
     return new XyoArchivistArchiveSchemaApi({
       ...this.config,

package/src/{Archivist → Api}/Node/Api.ts

@@ -24,15 +24,17 @@ export class XyoArchivistNodeApi<
   C extends WithArchive<XyoApiConfig> = WithArchive<XyoApiConfig>,
 > extends XyoApiSimple<string[][], D, XyoApiSimpleQuery, C> {
   /**
-   * Get the result of a previously issued query (if available)
-   * @param queryId Query ID from a previously issued query
-   * @returns The result of the query (if available)
+   * Issue the supplied query and wait (non-blocking) for the result
+   * @param data The query to issue
+   * @param timeout The max time to wait for the query results
+   * @param retryInterval The interval to poll for query results
+   * @returns The result for the issued query
    */
-  public result<T extends XyoPayload = XyoPayload>(queryId: string): XyoApiSimple<XyoPayload> {
-    return new XyoApiSimple<T>({
-      ...this.config,
-      root: `/query/${queryId}/`,
-    })
+  public async perform<T extends Partial<XyoPayload>>(data: T, schema: string, timeout = 5000, retryInterval = 100) {
+    const payload = new XyoPayloadBuilder({ schema }).fields(data).build()
+    const [query] = new BoundWitnessBuilder({ inlinePayloads: true }).payload(payload).build()
+    const result = await this.performTransaction(query as D, timeout, retryInterval)
+    return result?.[0]?.[0]
   }
 
   /**
@@ -62,16 +64,14 @@ export class XyoArchivistNodeApi<
   }
 
   /**
-   * Issue the supplied query and wait (non-blocking) for the result
-   * @param data The query to issue
-   * @param timeout The max time to wait for the query results
-   * @param retryInterval The interval to poll for query results
-   * @returns The result for the issued query
+   * Get the result of a previously issued query (if available)
+   * @param queryId Query ID from a previously issued query
+   * @returns The result of the query (if available)
    */
-  public async perform<T extends Partial<XyoPayload>>(data: T, schema: string, timeout = 5000, retryInterval = 100) {
-    const payload = new XyoPayloadBuilder({ schema }).fields(data).build()
-    const [query] = new BoundWitnessBuilder({ inlinePayloads: true }).payload(payload).build()
-    const result = await this.performTransaction(query as D, timeout, retryInterval)
-    return result?.[0]?.[0]
+  public result<T extends XyoPayload = XyoPayload>(queryId: string): XyoApiSimple<XyoPayload> {
+    return new XyoApiSimple<T>({
+      ...this.config,
+      root: `/query/${queryId}/`,
+    })
   }
 }

package/src/{Archivist → Api}/Payload/Api.ts

@@ -14,6 +14,7 @@ export class XyoArchivistPayloadApi<
   T extends XyoPayload = XyoPayload,
   C extends WithArchive<XyoApiConfig> = WithArchive<XyoApiConfig>,
 > extends XyoApiSimple<T[], T[], XyoPayloadFindFilter, C> {
+  private _stats?: XyoApiSimple<XyoPayloadStats>
   public get schema(): XyoArchivistArchivePayloadSchemaApi {
     return new XyoArchivistArchivePayloadSchemaApi({
       ...this.config,
@@ -21,7 +22,6 @@ export class XyoArchivistPayloadApi<
     })
   }
 
-  private _stats?: XyoApiSimple<XyoPayloadStats>
   public get stats(): XyoApiSimple<XyoPayloadStats> {
     this._stats =
       this._stats ??
@@ -32,35 +32,26 @@ export class XyoArchivistPayloadApi<
     return this._stats
   }
 
-  public hash(hash: string): XyoApiSimple<XyoPayload[]> {
-    return new XyoApiSimple<XyoPayload[]>({
-      ...this.config,
-      root: `${this.root}hash/${hash}/`,
-    })
-  }
-
-  public async repair(hash: string) {
-    return await this.getEndpoint<T[]>(`hash/${hash}/repair`)
-  }
-
-  /** @deprecated use stats instead */
-  public async getStats() {
-    return await this.getEndpoint<XyoPayloadStats>('stats')
+  /** @deprecated use find */
+  public async findAfter(timestamp: number, limit = 20) {
+    return await this.find({ limit, order: 'asc', timestamp })
   }
 
-  /** @deprecated use hash */
-  public async getByHash(hash: string) {
-    return await this.getEndpoint<T[]>(`hash/${hash}`)
+  /** @deprecated use find */
+  public async findBefore(timestamp: number, limit = 20) {
+    return await this.find({ limit, order: 'desc', timestamp })
   }
 
-  /** @deprecated use repair */
-  public async repairByHash(hash: string) {
-    return await this.repair(hash)
+  /** @deprecated use find */
+  public async findMostRecent(limit = 20) {
+    assertEx(limit > 0, 'min limit = 1')
+    assertEx(limit <= 100, 'max limit = 100')
+    return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
   }
 
   /** @deprecated use find */
-  public async findBefore(timestamp: number, limit = 20) {
-    return await this.find({ limit, order: 'desc', timestamp })
+  public async getAfter(timestamp: number, limit = 20) {
+    return await this.find({ limit, order: 'asc', timestamp })
   }
 
   /** @deprecated use findBefore */
@@ -68,25 +59,34 @@ export class XyoArchivistPayloadApi<
     return await this.find({ limit, order: 'desc', timestamp })
   }
 
-  /** @deprecated use find */
-  public async findAfter(timestamp: number, limit = 20) {
-    return await this.find({ limit, order: 'asc', timestamp })
+  /** @deprecated use hash */
+  public async getByHash(hash: string) {
+    return await this.getEndpoint<T[]>(`hash/${hash}`)
   }
 
   /** @deprecated use find */
-  public async getAfter(timestamp: number, limit = 20) {
-    return await this.find({ limit, order: 'asc', timestamp })
+  public async getMostRecent(limit = 20) {
+    return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
   }
 
-  /** @deprecated use find */
-  public async findMostRecent(limit = 20) {
-    assertEx(limit > 0, 'min limit = 1')
-    assertEx(limit <= 100, 'max limit = 100')
-    return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
+  /** @deprecated use stats instead */
+  public async getStats() {
+    return await this.getEndpoint<XyoPayloadStats>('stats')
   }
 
-  /** @deprecated use find */
-  public async getMostRecent(limit = 20) {
-    return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
+  public hash(hash: string): XyoApiSimple<XyoPayload[]> {
+    return new XyoApiSimple<XyoPayload[]>({
+      ...this.config,
+      root: `${this.root}hash/${hash}/`,
+    })
+  }
+
+  public async repair(hash: string) {
+    return await this.getEndpoint<T[]>(`hash/${hash}/repair`)
+  }
+
+  /** @deprecated use repair */
+  public async repairByHash(hash: string) {
+    return await this.repair(hash)
   }
 }

package/src/{Archivist → Api}/RemoteArchivistError.ts

@@ -1,8 +1,8 @@
 export class RemoteArchivistError extends Error {
+  isRemoteArchivistError = true
   constructor(action: string, error: Error['cause'], message?: string) {
     super(`Remote Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error })
   }
-  isRemoteArchivistError = true
   static isRemoteArchivistError(error: unknown): RemoteArchivistError | undefined {
     return (error as RemoteArchivistError).isRemoteArchivistError ? (error as RemoteArchivistError) : undefined
   }

package/src/{Archivist → Api}/XyoRemoteArchivist.ts

@@ -12,12 +12,9 @@ export type XyoRemoteArchivistParams = XyoModuleParams<XyoRemoteArchivistConfig>
 
 /** @description Archivist Context that connects to a remote archivist using the API */
 export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
+  static override configSchema = XyoRemoteArchivistConfigSchema
   protected _api?: XyoArchivistApi
 
-  static override async create(params?: XyoRemoteArchivistParams): Promise<XyoRemoteArchivist> {
-    return (await super.create(params)) as XyoRemoteArchivist
-  }
-
   constructor(params?: XyoRemoteArchivistParams) {
     super(params)
     this._api = params?.api
@@ -36,14 +33,37 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
     throw Error('No api specified')
   }
 
-  public override queries() {
-    return [XyoArchivistFindQuerySchema, ...super.queries()]
-  }
-
   public get archive() {
     return this.config?.archive
   }
 
+  static override async create(params?: XyoRemoteArchivistParams): Promise<XyoRemoteArchivist> {
+    return (await super.create(params)) as XyoRemoteArchivist
+  }
+
+  public override async find<R extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): Promise<R[]> {
+    try {
+      const [payloads = [], payloadEnvelope, payloadResponse] = await this.api.archive(this.archive).payload.find(filter, 'tuple')
+      if (payloadEnvelope?.error?.length) {
+        throw new RemoteArchivistError('find', payloadEnvelope.error.shift(), 'payloads')
+      }
+      if (payloadResponse?.status >= 300) {
+        throw new RemoteArchivistError('find', `Invalid payload status [${payloadResponse.status}]`, 'payloads')
+      }
+      const [blocks = [], blockEnvelope, blockResponse] = await this.api.archive(this.archive).block.find(filter, 'tuple')
+      if (blockEnvelope?.error?.length) {
+        throw new RemoteArchivistError('find', blockEnvelope.error.shift(), 'payloads')
+      }
+      if (blockResponse?.status >= 300) {
+        throw new RemoteArchivistError('find', `Invalid block status [${blockResponse.status}]`, 'payloads')
+      }
+      return payloads.concat(blocks) as R[]
+    } catch (ex) {
+      console.error(ex)
+      throw ex
+    }
+  }
+
   public async get(hashes: string[]): Promise<XyoPayload[]> {
     return compact(
       await Promise.all(
@@ -96,27 +116,7 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
     }
   }
 
-  public override async find<R extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): Promise<R[]> {
-    try {
-      const [payloads = [], payloadEnvelope, payloadResponse] = await this.api.archive(this.archive).payload.find(filter, 'tuple')
-      if (payloadEnvelope?.error?.length) {
-        throw new RemoteArchivistError('find', payloadEnvelope.error.shift(), 'payloads')
-      }
-      if (payloadResponse?.status >= 300) {
-        throw new RemoteArchivistError('find', `Invalid payload status [${payloadResponse.status}]`, 'payloads')
-      }
-      const [blocks = [], blockEnvelope, blockResponse] = await this.api.archive(this.archive).block.find(filter, 'tuple')
-      if (blockEnvelope?.error?.length) {
-        throw new RemoteArchivistError('find', blockEnvelope.error.shift(), 'payloads')
-      }
-      if (blockResponse?.status >= 300) {
-        throw new RemoteArchivistError('find', `Invalid block status [${blockResponse.status}]`, 'payloads')
-      }
-      return payloads.concat(blocks) as R[]
-    } catch (ex) {
-      console.error(ex)
-      throw ex
-    }
+  public override queries() {
+    return [XyoArchivistFindQuerySchema, ...super.queries()]
   }
-  static override configSchema = XyoRemoteArchivistConfigSchema
 }

package/src/{Archivist → Api}/XyoRemoteArchivistConfig.ts

@@ -8,9 +8,9 @@ export const XyoRemoteArchivistConfigSchema: XyoRemoteArchivistConfigSchema = 'n
 
 export type XyoRemoteArchivistConfig<T extends XyoPayload = XyoPayload> = XyoArchivistConfig<
   {
-    schema: XyoRemoteArchivistConfigSchema
     /** @deprecated pass api in params instead */
     api?: XyoArchivistApi
     archive?: string
+    schema: XyoRemoteArchivistConfigSchema
   } & T
 >

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

@@ -3,7 +3,7 @@ import { BoundWitnessWrapper, XyoBoundWitness, XyoBoundWitnessSchema } from '@xy
 import { XyoDivinerWrapper } from '@xyo-network/diviner'
 import { XyoPayloadBuilder } from '@xyo-network/payload'
 
-import { XyoArchivistApi } from '../../Archivist'
+import { XyoArchivistApi } from '../../Api'
 import { XyoApiConfig } from '../../models'
 import { XyoRemoteDivinerConfigSchema } from '../XyoRemoteDivinerConfig'
 import { AddressHistoryQuerySchema } from './AddressHistoryDiviner'