@xyo-network/api 2.22.5 → 2.22.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,6 +13,6 @@ export interface XyoAccountVerify {
13
13
  token?: string;
14
14
  }
15
15
  export declare class XyoAccountApi extends XyoApiBase {
16
- get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
17
- get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
16
+ get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../models/Api/Config").XyoApiConfig>;
17
+ get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../models/Api/Config").XyoApiConfig>;
18
18
  }
@@ -13,14 +13,14 @@ export declare class XyoArchivistApi extends XyoApiBase {
13
13
  private _archives?;
14
14
  get archives(): XyoArchivistArchivesApi;
15
15
  private _stats?;
16
- get stats(): XyoApiSimple<unknown[], unknown[], import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
16
+ get stats(): XyoApiSimple<unknown[], unknown[], import("@xyo-network/archivist").XyoPayloadFindFilter, import("../models/Api/Config").XyoApiConfig>;
17
17
  private _user?;
18
18
  get user(): XyoUserApi;
19
19
  archive(archive?: string): XyoArchivistArchiveApi;
20
20
  /** @deprecated use account instead */
21
21
  wallet(address: XyoDataLike): XyoAccountApi;
22
22
  account(address: XyoDataLike): XyoAccountApi;
23
- huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
23
+ huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../models/Api/Config").XyoApiConfig>;
24
24
  /**
25
25
  * Issues commands/queries as XyoBoundWitness wrapped XyoPayloads against a Node in the network
26
26
  * @param archive Optional, the archive to issue the requests against
@@ -1,5 +1,5 @@
1
1
  import { XyoArchiveKey } from '../../../../models';
2
2
  import { XyoApiSimple } from '../../../../Simple';
3
3
  export declare class XyoArchivistArchiveSettingsKeyApi extends XyoApiSimple<XyoArchiveKey[]> {
4
- key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, import("@xyo-network/payload").XyoPayloadBase, import("../../../../models/Api/Config").XyoApiConfig>;
4
+ key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../../../models/Api/Config").XyoApiConfig>;
5
5
  }
@@ -44,25 +44,25 @@ class XyoArchivistPayloadApi extends Simple_1.XyoApiSimple {
44
44
  /** @deprecated use find */
45
45
  findBefore(timestamp, limit = 20) {
46
46
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
47
- return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
47
+ return yield this.find({ limit, order: 'desc', timestamp });
48
48
  });
49
49
  }
50
50
  /** @deprecated use findBefore */
51
51
  getBefore(timestamp, limit = 20) {
52
52
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
53
- return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
53
+ return yield this.find({ limit, order: 'desc', timestamp });
54
54
  });
55
55
  }
56
56
  /** @deprecated use find */
57
57
  findAfter(timestamp, limit = 20) {
58
58
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
59
- return yield this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
59
+ return yield this.find({ limit, order: 'asc', timestamp });
60
60
  });
61
61
  }
62
62
  /** @deprecated use find */
63
63
  getAfter(timestamp, limit = 20) {
64
64
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
65
- return yield this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
65
+ return yield this.find({ limit, order: 'asc', timestamp });
66
66
  });
67
67
  }
68
68
  /** @deprecated use find */
@@ -70,13 +70,13 @@ class XyoArchivistPayloadApi extends Simple_1.XyoApiSimple {
70
70
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
71
71
  (0, sdk_js_1.assertEx)(limit > 0, 'min limit = 1');
72
72
  (0, sdk_js_1.assertEx)(limit <= 100, 'max limit = 100');
73
- return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
73
+ return yield this.find({ limit, order: 'desc', timestamp: 999999999999 });
74
74
  });
75
75
  }
76
76
  /** @deprecated use find */
77
77
  getMostRecent(limit = 20) {
78
78
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
79
- return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
79
+ return yield this.find({ limit, order: 'desc', timestamp: 999999999999 });
80
80
  });
81
81
  }
82
82
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,5 @@ export interface XyoArchivistArchivePayloadSchemaStats {
4
4
  }
5
5
  export declare class XyoArchivistArchivePayloadSchemaApi extends XyoApiSimple<string[]> {
6
6
  private _stats?;
7
- get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, import("@xyo-network/payload").XyoPayloadBase, import("../../../models/Api/Config").XyoApiConfig>;
7
+ get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../../models/Api/Config").XyoApiConfig>;
8
8
  }
@@ -1,12 +1,12 @@
1
1
  import { XyoAccount } from '@xyo-network/account';
2
- import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist';
2
+ import { XyoArchivist, XyoArchivistBase, XyoPayloadFindQuery } from '@xyo-network/archivist';
3
3
  import { XyoPayload } from '@xyo-network/payload';
4
4
  import { XyoArchivistApi } from './Api';
5
5
  export declare class XyoRemoteArchivist extends XyoArchivistBase {
6
6
  protected api: XyoArchivistApi;
7
7
  protected archive: string;
8
8
  constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
9
- get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase | undefined>;
9
+ get(hashes: string[]): Promise<(import("@xyo-network/payload").XyoPayloadBase | null)[]>;
10
10
  insert(payloads: XyoPayload[]): Promise<import("@xyo-network/payload").XyoPayloadBase[]>;
11
- find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
11
+ find<R extends XyoPayload = XyoPayload>(query: XyoPayloadFindQuery): Promise<R[]>;
12
12
  }
@@ -11,10 +11,13 @@ class XyoRemoteArchivist extends archivist_1.XyoArchivistBase {
11
11
  this.api = api;
12
12
  this.archive = archive;
13
13
  }
14
- get(hash) {
14
+ get(hashes) {
15
15
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
16
- const [payloads] = yield this.api.archive(this.archive).payload.hash(hash).get('tuple');
17
- return payloads === null || payloads === void 0 ? void 0 : payloads.pop();
16
+ return yield Promise.all(hashes.map((hash) => tslib_1.__awaiter(this, void 0, void 0, function* () {
17
+ var _a;
18
+ const [payloads] = yield this.api.archive(this.archive).payload.hash(hash).get('tuple');
19
+ return (_a = payloads === null || payloads === void 0 ? void 0 : payloads.pop()) !== null && _a !== void 0 ? _a : null;
20
+ })));
18
21
  });
19
22
  }
20
23
  insert(payloads) {
@@ -41,11 +44,11 @@ class XyoRemoteArchivist extends archivist_1.XyoArchivistBase {
41
44
  return payloads;
42
45
  });
43
46
  }
44
- find(filter) {
47
+ find(query) {
45
48
  var _a, _b;
46
49
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
47
- const [payloads = []] = (_a = (yield this.api.archive(this.archive).payload.find(filter, 'tuple'))) !== null && _a !== void 0 ? _a : [];
48
- const [blocks = []] = (_b = (yield this.api.archive(this.archive).block.find(filter, 'tuple'))) !== null && _b !== void 0 ? _b : [];
50
+ const [payloads = []] = (_a = (yield this.api.archive(this.archive).payload.find(query.filter, 'tuple'))) !== null && _a !== void 0 ? _a : [];
51
+ const [blocks = []] = (_b = (yield this.api.archive(this.archive).block.find(query.filter, 'tuple'))) !== null && _b !== void 0 ? _b : [];
49
52
  return payloads.concat(blocks);
50
53
  });
51
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,sDAA6F;AAE7F,kDAAoE;AAIpE,MAAa,kBAAmB,SAAQ,4BAAgB;IAGtD,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEY,GAAG,CAAC,IAAY;;YAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACvF,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,EAAE,CAAA;QACxB,CAAC;KAAA;IAEY,MAAM,CAAC,QAAsB;;YACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAqC,CAAA;YACjI,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;gBACtC,YAAY,CAAC,SAAS;oBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;wBAC1B,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;wBAChD,OAAO,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;oBACnD,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,IAAI,KAAK,GAAG,KAAK,CAAA;gBACjB,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;gBAChD,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;oBACxC,IAAI,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBAChD,KAAK,GAAG,IAAI,CAAA;qBACb;gBACH,CAAC,CAAC,CAAA;gBACF,IAAA,iBAAQ,EAAC,KAAK,EAAE,sCAAsC,CAAC,CAAA;YACzD,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YAC/D,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEY,IAAI,CAAC,MAA4B;;;YAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;;KAC/B;CACF;AA1CD,gDA0CC"}
1
+ {"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,sDAA4F;AAE5F,kDAAoE;AAIpE,MAAa,kBAAmB,SAAQ,4BAAgB;IAGtD,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEY,GAAG,CAAC,MAAgB;;YAC/B,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;;gBACxB,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBACvF,OAAO,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,EAAE,mCAAI,IAAI,CAAA;YAChC,CAAC,CAAA,CAAC,CACH,CAAA;QACH,CAAC;KAAA;IAEY,MAAM,CAAC,QAAsB;;YACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAqC,CAAA;YACjI,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;gBACtC,YAAY,CAAC,SAAS;oBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;wBAC1B,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;wBAChD,OAAO,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;oBACnD,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,IAAI,KAAK,GAAG,KAAK,CAAA;gBACjB,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;gBAChD,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;oBACxC,IAAI,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBAChD,KAAK,GAAG,IAAI,CAAA;qBACb;gBACH,CAAC,CAAC,CAAA;gBACF,IAAA,iBAAQ,EAAC,KAAK,EAAE,sCAAsC,CAAC,CAAA;YACzD,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YAC/D,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEY,IAAI,CAAoC,KAA0B;;;YAC7E,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YACxG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YACpG,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAQ,CAAA;;KACtC;CACF;AA9CD,gDA8CC"}
@@ -1,8 +1,8 @@
1
- import { EmptyObject } from '@xyo-network/core';
1
+ import { XyoPayloadFindFilter } from '@xyo-network/archivist';
2
2
  import { XyoPayload } from '@xyo-network/payload';
3
3
  import { XyoApiBase } from './Base';
4
4
  import { XyoApiConfig, XyoApiResponseBody, XyoApiResponseTuple } from './models';
5
- export declare type XyoApiSimpleQuery<T extends EmptyObject = EmptyObject> = XyoPayload<T>;
5
+ export declare type XyoApiSimpleQuery = XyoPayloadFindFilter;
6
6
  export declare class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = XyoApiSimpleQuery, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
7
7
  get(): Promise<XyoApiResponseBody<T>>;
8
8
  get(responseType?: 'body'): Promise<XyoApiResponseBody<T>>;
@@ -11,8 +11,8 @@ export interface XyoUserLogin {
11
11
  export declare class XyoUserApi extends XyoApiBase {
12
12
  get authenticated(): boolean;
13
13
  get headers(): Record<string, string>;
14
- get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
15
- get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, {
14
+ get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../models/Api/Config").XyoApiConfig>;
15
+ get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/archivist").XyoPayloadFindFilter, {
16
16
  root: string;
17
17
  apiDomain: string; /** @field Password of the user [in] */
18
18
  userid?: string | undefined;
@@ -13,6 +13,6 @@ export interface XyoAccountVerify {
13
13
  token?: string;
14
14
  }
15
15
  export declare class XyoAccountApi extends XyoApiBase {
16
- get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
17
- get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
16
+ get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../models/Api/Config").XyoApiConfig>;
17
+ get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../models/Api/Config").XyoApiConfig>;
18
18
  }
@@ -13,14 +13,14 @@ export declare class XyoArchivistApi extends XyoApiBase {
13
13
  private _archives?;
14
14
  get archives(): XyoArchivistArchivesApi;
15
15
  private _stats?;
16
- get stats(): XyoApiSimple<unknown[], unknown[], import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
16
+ get stats(): XyoApiSimple<unknown[], unknown[], import("@xyo-network/archivist").XyoPayloadFindFilter, import("../models/Api/Config").XyoApiConfig>;
17
17
  private _user?;
18
18
  get user(): XyoUserApi;
19
19
  archive(archive?: string): XyoArchivistArchiveApi;
20
20
  /** @deprecated use account instead */
21
21
  wallet(address: XyoDataLike): XyoAccountApi;
22
22
  account(address: XyoDataLike): XyoAccountApi;
23
- huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
23
+ huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../models/Api/Config").XyoApiConfig>;
24
24
  /**
25
25
  * Issues commands/queries as XyoBoundWitness wrapped XyoPayloads against a Node in the network
26
26
  * @param archive Optional, the archive to issue the requests against
@@ -1,5 +1,5 @@
1
1
  import { XyoArchiveKey } from '../../../../models';
2
2
  import { XyoApiSimple } from '../../../../Simple';
3
3
  export declare class XyoArchivistArchiveSettingsKeyApi extends XyoApiSimple<XyoArchiveKey[]> {
4
- key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, import("@xyo-network/payload").XyoPayloadBase, import("../../../../models/Api/Config").XyoApiConfig>;
4
+ key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../../../models/Api/Config").XyoApiConfig>;
5
5
  }
@@ -40,29 +40,29 @@ export class XyoArchivistPayloadApi extends XyoApiSimple {
40
40
  }
41
41
  /** @deprecated use find */
42
42
  async findBefore(timestamp, limit = 20) {
43
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
43
+ return await this.find({ limit, order: 'desc', timestamp });
44
44
  }
45
45
  /** @deprecated use findBefore */
46
46
  async getBefore(timestamp, limit = 20) {
47
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
47
+ return await this.find({ limit, order: 'desc', timestamp });
48
48
  }
49
49
  /** @deprecated use find */
50
50
  async findAfter(timestamp, limit = 20) {
51
- return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
51
+ return await this.find({ limit, order: 'asc', timestamp });
52
52
  }
53
53
  /** @deprecated use find */
54
54
  async getAfter(timestamp, limit = 20) {
55
- return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
55
+ return await this.find({ limit, order: 'asc', timestamp });
56
56
  }
57
57
  /** @deprecated use find */
58
58
  async findMostRecent(limit = 20) {
59
59
  assertEx(limit > 0, 'min limit = 1');
60
60
  assertEx(limit <= 100, 'max limit = 100');
61
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
61
+ return await this.find({ limit, order: 'desc', timestamp: 999999999999 });
62
62
  }
63
63
  /** @deprecated use find */
64
64
  async getMostRecent(limit = 20) {
65
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
65
+ return await this.find({ limit, order: 'desc', timestamp: 999999999999 });
66
66
  }
67
67
  }
68
68
  //# sourceMappingURL=Api.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,5 @@ export interface XyoArchivistArchivePayloadSchemaStats {
4
4
  }
5
5
  export declare class XyoArchivistArchivePayloadSchemaApi extends XyoApiSimple<string[]> {
6
6
  private _stats?;
7
- get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, import("@xyo-network/payload").XyoPayloadBase, import("../../../models/Api/Config").XyoApiConfig>;
7
+ get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../../../models/Api/Config").XyoApiConfig>;
8
8
  }
@@ -1,12 +1,12 @@
1
1
  import { XyoAccount } from '@xyo-network/account';
2
- import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist';
2
+ import { XyoArchivist, XyoArchivistBase, XyoPayloadFindQuery } from '@xyo-network/archivist';
3
3
  import { XyoPayload } from '@xyo-network/payload';
4
4
  import { XyoArchivistApi } from './Api';
5
5
  export declare class XyoRemoteArchivist extends XyoArchivistBase {
6
6
  protected api: XyoArchivistApi;
7
7
  protected archive: string;
8
8
  constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
9
- get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase | undefined>;
9
+ get(hashes: string[]): Promise<(import("@xyo-network/payload").XyoPayloadBase | null)[]>;
10
10
  insert(payloads: XyoPayload[]): Promise<import("@xyo-network/payload").XyoPayloadBase[]>;
11
- find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
11
+ find<R extends XyoPayload = XyoPayload>(query: XyoPayloadFindQuery): Promise<R[]>;
12
12
  }
@@ -7,9 +7,11 @@ export class XyoRemoteArchivist extends XyoArchivistBase {
7
7
  this.api = api;
8
8
  this.archive = archive;
9
9
  }
10
- async get(hash) {
11
- const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple');
12
- return payloads?.pop();
10
+ async get(hashes) {
11
+ return await Promise.all(hashes.map(async (hash) => {
12
+ const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple');
13
+ return payloads?.pop() ?? null;
14
+ }));
13
15
  }
14
16
  async insert(payloads) {
15
17
  const boundwitnesses = payloads.filter((payload) => payload.schema === 'network.xyo.payload');
@@ -33,9 +35,9 @@ export class XyoRemoteArchivist extends XyoArchivistBase {
33
35
  await this.api.archive(this.archive).block.post(boundwitnesses);
34
36
  return payloads;
35
37
  }
36
- async find(filter) {
37
- const [payloads = []] = (await this.api.archive(this.archive).payload.find(filter, 'tuple')) ?? [];
38
- const [blocks = []] = (await this.api.archive(this.archive).block.find(filter, 'tuple')) ?? [];
38
+ async find(query) {
39
+ const [payloads = []] = (await this.api.archive(this.archive).payload.find(query.filter, 'tuple')) ?? [];
40
+ const [blocks = []] = (await this.api.archive(this.archive).block.find(query.filter, 'tuple')) ?? [];
39
41
  return payloads.concat(blocks);
40
42
  }
41
43
  }
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAgB,gBAAgB,EAAwB,MAAM,wBAAwB,CAAA;AAE7F,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIpE,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;IAGtD,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,IAAY;QAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACvF,OAAO,QAAQ,EAAE,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAqC,CAAA;QACjI,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACtC,YAAY,CAAC,SAAS;gBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC1B,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;oBAChD,OAAO,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACnD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,KAAK,GAAG,KAAK,CAAA;YACjB,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;YAChD,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACxC,IAAI,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAChD,KAAK,GAAG,IAAI,CAAA;iBACb;YACH,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,KAAK,EAAE,sCAAsC,CAAC,CAAA;QACzD,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC/D,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAA4B;QAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF"}
1
+ {"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
- import { EmptyObject } from '@xyo-network/core';
1
+ import { XyoPayloadFindFilter } from '@xyo-network/archivist';
2
2
  import { XyoPayload } from '@xyo-network/payload';
3
3
  import { XyoApiBase } from './Base';
4
4
  import { XyoApiConfig, XyoApiResponseBody, XyoApiResponseTuple } from './models';
5
- export declare type XyoApiSimpleQuery<T extends EmptyObject = EmptyObject> = XyoPayload<T>;
5
+ export declare type XyoApiSimpleQuery = XyoPayloadFindFilter;
6
6
  export declare class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = XyoApiSimpleQuery, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
7
7
  get(): Promise<XyoApiResponseBody<T>>;
8
8
  get(responseType?: 'body'): Promise<XyoApiResponseBody<T>>;
@@ -11,8 +11,8 @@ export interface XyoUserLogin {
11
11
  export declare class XyoUserApi extends XyoApiBase {
12
12
  get authenticated(): boolean;
13
13
  get headers(): Record<string, string>;
14
- get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
15
- get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, {
14
+ get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, import("@xyo-network/archivist").XyoPayloadFindFilter, import("../models/Api/Config").XyoApiConfig>;
15
+ get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/archivist").XyoPayloadFindFilter, {
16
16
  root: string;
17
17
  apiDomain: string; /** @field Password of the user [in] */
18
18
  userid?: string | undefined;
package/package.json CHANGED
@@ -10,12 +10,12 @@
10
10
  },
11
11
  "dependencies": {
12
12
  "@xylabs/sdk-js": "^2.6.2",
13
- "@xyo-network/account": "^2.22.5",
14
- "@xyo-network/archivist": "^2.22.5",
15
- "@xyo-network/boundwitness": "^2.22.5",
16
- "@xyo-network/core": "^2.22.5",
17
- "@xyo-network/payload": "^2.22.5",
18
- "@xyo-network/typeof": "^2.22.5",
13
+ "@xyo-network/account": "^2.22.8",
14
+ "@xyo-network/archivist": "^2.22.8",
15
+ "@xyo-network/boundwitness": "^2.22.8",
16
+ "@xyo-network/core": "^2.22.8",
17
+ "@xyo-network/payload": "^2.22.8",
18
+ "@xyo-network/typeof": "^2.22.8",
19
19
  "axios": "^0.27.2",
20
20
  "lru-cache": "^7.13.1",
21
21
  "pako": "^2.0.4",
@@ -62,6 +62,6 @@
62
62
  },
63
63
  "sideEffects": true,
64
64
  "types": "dist/esm/index.d.ts",
65
- "version": "2.22.5",
65
+ "version": "2.22.8",
66
66
  "packageManager": "yarn@3.1.1"
67
67
  }
@@ -61,33 +61,33 @@ export class XyoArchivistPayloadApi<
61
61
 
62
62
  /** @deprecated use find */
63
63
  public async findBefore(timestamp: number, limit = 20) {
64
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp })
64
+ return await this.find({ limit, order: 'desc', timestamp })
65
65
  }
66
66
 
67
67
  /** @deprecated use findBefore */
68
68
  public async getBefore(timestamp: number, limit = 20) {
69
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp })
69
+ return await this.find({ limit, order: 'desc', timestamp })
70
70
  }
71
71
 
72
72
  /** @deprecated use find */
73
73
  public async findAfter(timestamp: number, limit = 20) {
74
- return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp })
74
+ return await this.find({ limit, order: 'asc', timestamp })
75
75
  }
76
76
 
77
77
  /** @deprecated use find */
78
78
  public async getAfter(timestamp: number, limit = 20) {
79
- return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp })
79
+ return await this.find({ limit, order: 'asc', timestamp })
80
80
  }
81
81
 
82
82
  /** @deprecated use find */
83
83
  public async findMostRecent(limit = 20) {
84
84
  assertEx(limit > 0, 'min limit = 1')
85
85
  assertEx(limit <= 100, 'max limit = 100')
86
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 })
86
+ return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
87
87
  }
88
88
 
89
89
  /** @deprecated use find */
90
90
  public async getMostRecent(limit = 20) {
91
- return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 })
91
+ return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
92
92
  }
93
93
  }
@@ -1,6 +1,6 @@
1
1
  import { assertEx } from '@xylabs/sdk-js'
2
2
  import { XyoAccount } from '@xyo-network/account'
3
- import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist'
3
+ import { XyoArchivist, XyoArchivistBase, XyoPayloadFindQuery } from '@xyo-network/archivist'
4
4
  import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness'
5
5
  import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
6
6
 
@@ -15,9 +15,13 @@ export class XyoRemoteArchivist extends XyoArchivistBase {
15
15
  this.archive = archive
16
16
  }
17
17
 
18
- public async get(hash: string) {
19
- const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
20
- return payloads?.pop()
18
+ public async get(hashes: string[]) {
19
+ return await Promise.all(
20
+ hashes.map(async (hash) => {
21
+ const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
22
+ return payloads?.pop() ?? null
23
+ })
24
+ )
21
25
  }
22
26
 
23
27
  public async insert(payloads: XyoPayload[]) {
@@ -43,9 +47,9 @@ export class XyoRemoteArchivist extends XyoArchivistBase {
43
47
  return payloads
44
48
  }
45
49
 
46
- public async find(filter: XyoPayloadFindFilter) {
47
- const [payloads = []] = (await this.api.archive(this.archive).payload.find(filter, 'tuple')) ?? []
48
- const [blocks = []] = (await this.api.archive(this.archive).block.find(filter, 'tuple')) ?? []
49
- return payloads.concat(blocks)
50
+ public async find<R extends XyoPayload = XyoPayload>(query: XyoPayloadFindQuery): Promise<R[]> {
51
+ const [payloads = []] = (await this.api.archive(this.archive).payload.find(query.filter, 'tuple')) ?? []
52
+ const [blocks = []] = (await this.api.archive(this.archive).block.find(query.filter, 'tuple')) ?? []
53
+ return payloads.concat(blocks) as R[]
50
54
  }
51
55
  }
package/src/Simple.ts CHANGED
@@ -1,11 +1,11 @@
1
- import { EmptyObject } from '@xyo-network/core'
1
+ import { XyoPayloadFindFilter } from '@xyo-network/archivist'
2
2
  import { XyoPayload } from '@xyo-network/payload'
3
3
 
4
4
  import { XyoApiBase } from './Base'
5
5
  import { XyoApiConfig, XyoApiResponseBody, XyoApiResponseTuple, XyoApiResponseTupleOrBody, XyoApiResponseType } from './models'
6
6
  import { objToQuery } from './objToQuery'
7
7
 
8
- export type XyoApiSimpleQuery<T extends EmptyObject = EmptyObject> = XyoPayload<T>
8
+ export type XyoApiSimpleQuery = XyoPayloadFindFilter
9
9
 
10
10
  export class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = XyoApiSimpleQuery, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
11
11
  public async get(): Promise<XyoApiResponseBody<T>>