@xyo-network/api 2.38.11 → 2.38.12

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.
@@ -2,15 +2,22 @@ import { XyoArchivist } from '@xyo-network/archivist';
2
2
  import { XyoBoundWitness } from '@xyo-network/boundwitness';
3
3
  import { XyoModuleParams } from '@xyo-network/module';
4
4
  import { XyoPayload, XyoPayloadFindFilter } from '@xyo-network/payload';
5
+ import { XyoArchivistApi } from './Api';
5
6
  import { XyoRemoteArchivistConfig } from './XyoRemoteArchivistConfig';
7
+ export declare type XyoRemoteArchivistParams = XyoModuleParams<XyoRemoteArchivistConfig> & {
8
+ api?: XyoArchivistApi;
9
+ };
6
10
  /** @description Archivist Context that connects to a remote archivist using the API */
7
11
  export declare class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
12
+ protected _api?: XyoArchivistApi;
8
13
  static create(params?: XyoModuleParams<XyoRemoteArchivistConfig>): Promise<XyoRemoteArchivist>;
9
- get api(): import("./Api").XyoArchivistApi;
14
+ constructor(params?: XyoRemoteArchivistParams);
15
+ get api(): XyoArchivistApi;
10
16
  queries(): string[];
11
17
  get archive(): string | undefined;
12
18
  get(hashes: string[]): Promise<XyoPayload[]>;
13
19
  insert(payloads: XyoPayload[]): Promise<XyoBoundWitness[]>;
14
20
  find<R extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): Promise<R[]>;
21
+ static configSchema: "network.xyo.archivist.remote.config";
15
22
  }
16
23
  //# sourceMappingURL=XyoRemoteArchivist.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteArchivist.d.ts","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA+B,MAAM,wBAAwB,CAAA;AAClF,OAAO,EAA4B,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAkB,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAIvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAErE,uFAAuF;AACvF,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,wBAAwB,CAAC;WACtD,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAO7G,IAAW,GAAG,oCAEb;IAEe,OAAO;IAIvB,IAAW,OAAO,uBAEjB;IAEY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAsB5C,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA8BjD,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAsB1G"}
1
+ {"version":3,"file":"XyoRemoteArchivist.d.ts","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA+B,MAAM,wBAAwB,CAAA;AAClF,OAAO,EAA4B,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAkB,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAGvF,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,wBAAwB,EAAkC,MAAM,4BAA4B,CAAA;AAErG,oBAAY,wBAAwB,GAAG,eAAe,CAAC,wBAAwB,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,eAAe,CAAA;CAAE,CAAA;AAE5G,uFAAuF;AACvF,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,wBAAwB,CAAC;IAC5E,SAAS,CAAC,IAAI,CAAC,EAAE,eAAe,CAAA;WAEV,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;gBAIjG,MAAM,CAAC,EAAE,wBAAwB;IAK7C,IAAW,GAAG,oBAWb;IAEe,OAAO;IAIvB,IAAW,OAAO,uBAEjB;IAEY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAsB5C,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA8BjD,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAsBzG,OAAgB,YAAY,wCAAiC;CAC9D"}
@@ -1,19 +1,30 @@
1
- import { assertEx } from '@xylabs/assert';
2
1
  import { XyoArchivist, XyoArchivistFindQuerySchema } from '@xyo-network/archivist';
3
2
  import { isXyoBoundWitnessPayload } from '@xyo-network/boundwitness';
4
3
  import { PayloadWrapper } from '@xyo-network/payload';
5
4
  import compact from 'lodash/compact';
6
5
  import { RemoteArchivistError } from './RemoteArchivistError';
6
+ import { XyoRemoteArchivistConfigSchema } from './XyoRemoteArchivistConfig';
7
7
  /** @description Archivist Context that connects to a remote archivist using the API */
8
8
  export class XyoRemoteArchivist extends XyoArchivist {
9
+ _api;
9
10
  static async create(params) {
10
- params?.logger?.debug(`params: ${JSON.stringify(params, null, 2)}`);
11
- const module = new XyoRemoteArchivist(params);
12
- await module.start();
13
- return module;
11
+ return (await super.create(params));
12
+ }
13
+ constructor(params) {
14
+ super(params);
15
+ this._api = params?.api;
14
16
  }
15
17
  get api() {
16
- return assertEx(this.config?.api, 'API not defined');
18
+ if (this._api) {
19
+ return this._api;
20
+ }
21
+ // eslint-disable-next-line deprecation/deprecation
22
+ if (this.config?.api) {
23
+ this.logger?.warn('api specified in config but should be specified in params');
24
+ // eslint-disable-next-line deprecation/deprecation
25
+ return this.config?.api;
26
+ }
27
+ throw Error('No api specified');
17
28
  }
18
29
  queries() {
19
30
  return [XyoArchivistFindQuerySchema, ...super.queries()];
@@ -92,5 +103,6 @@ export class XyoRemoteArchivist extends XyoArchivist {
92
103
  throw ex;
93
104
  }
94
105
  }
106
+ static configSchema = XyoRemoteArchivistConfigSchema;
95
107
  }
96
108
  //# sourceMappingURL=XyoRemoteArchivist.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ export declare type XyoRemoteArchivistConfigSchema = 'network.xyo.archivist.remo
5
5
  export declare const XyoRemoteArchivistConfigSchema: XyoRemoteArchivistConfigSchema;
6
6
  export declare type XyoRemoteArchivistConfig<T extends XyoPayload = XyoPayload> = XyoArchivistConfig<{
7
7
  schema: XyoRemoteArchivistConfigSchema;
8
+ /** @deprecated pass api in params instead */
8
9
  api?: XyoArchivistApi;
9
10
  archive?: string;
10
11
  } & T>;
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteArchivistConfig.d.ts","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivistConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAEvC,oBAAY,8BAA8B,GAAG,qCAAqC,CAAA;AAClF,eAAO,MAAM,8BAA8B,EAAE,8BAAsE,CAAA;AAEnH,oBAAY,wBAAwB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,kBAAkB,CAC1F;IACE,MAAM,EAAE,8BAA8B,CAAA;IACtC,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,GAAG,CAAC,CACN,CAAA"}
1
+ {"version":3,"file":"XyoRemoteArchivistConfig.d.ts","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivistConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAEvC,oBAAY,8BAA8B,GAAG,qCAAqC,CAAA;AAClF,eAAO,MAAM,8BAA8B,EAAE,8BAAsE,CAAA;AAEnH,oBAAY,wBAAwB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,kBAAkB,CAC1F;IACE,MAAM,EAAE,8BAA8B,CAAA;IACtC,6CAA6C;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,GAAG,CAAC,CACN,CAAA"}
package/package.json CHANGED
@@ -11,14 +11,14 @@
11
11
  "dependencies": {
12
12
  "@xylabs/assert": "^2.6.9",
13
13
  "@xylabs/delay": "^2.6.9",
14
- "@xyo-network/account": "^2.38.11",
15
- "@xyo-network/archivist": "^2.38.11",
16
- "@xyo-network/boundwitness": "^2.38.11",
17
- "@xyo-network/core": "^2.38.11",
18
- "@xyo-network/diviner": "^2.38.11",
19
- "@xyo-network/module": "^2.38.11",
20
- "@xyo-network/payload": "^2.38.11",
21
- "@xyo-network/schema-payload-plugin": "^2.38.11",
14
+ "@xyo-network/account": "^2.38.12",
15
+ "@xyo-network/archivist": "^2.38.12",
16
+ "@xyo-network/boundwitness": "^2.38.12",
17
+ "@xyo-network/core": "^2.38.12",
18
+ "@xyo-network/diviner": "^2.38.12",
19
+ "@xyo-network/module": "^2.38.12",
20
+ "@xyo-network/payload": "^2.38.12",
21
+ "@xyo-network/schema-payload-plugin": "^2.38.12",
22
22
  "tslib": "^2.4.0"
23
23
  },
24
24
  "peerDependencies": {
@@ -65,5 +65,5 @@
65
65
  },
66
66
  "sideEffects": false,
67
67
  "types": "dist/esm/index.d.ts",
68
- "version": "2.38.11"
68
+ "version": "2.38.12"
69
69
  }
@@ -1,24 +1,39 @@
1
- import { assertEx } from '@xylabs/assert'
2
1
  import { XyoArchivist, XyoArchivistFindQuerySchema } from '@xyo-network/archivist'
3
2
  import { isXyoBoundWitnessPayload, XyoBoundWitness } from '@xyo-network/boundwitness'
4
3
  import { XyoModuleParams } from '@xyo-network/module'
5
4
  import { PayloadWrapper, XyoPayload, XyoPayloadFindFilter } from '@xyo-network/payload'
6
5
  import compact from 'lodash/compact'
7
6
 
7
+ import { XyoArchivistApi } from './Api'
8
8
  import { RemoteArchivistError } from './RemoteArchivistError'
9
- import { XyoRemoteArchivistConfig } from './XyoRemoteArchivistConfig'
9
+ import { XyoRemoteArchivistConfig, XyoRemoteArchivistConfigSchema } from './XyoRemoteArchivistConfig'
10
+
11
+ export type XyoRemoteArchivistParams = XyoModuleParams<XyoRemoteArchivistConfig> & { api?: XyoArchivistApi }
10
12
 
11
13
  /** @description Archivist Context that connects to a remote archivist using the API */
12
14
  export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
15
+ protected _api?: XyoArchivistApi
16
+
13
17
  static override async create(params?: XyoModuleParams<XyoRemoteArchivistConfig>): Promise<XyoRemoteArchivist> {
14
- params?.logger?.debug(`params: ${JSON.stringify(params, null, 2)}`)
15
- const module = new XyoRemoteArchivist(params)
16
- await module.start()
17
- return module
18
+ return (await super.create(params)) as XyoRemoteArchivist
19
+ }
20
+
21
+ constructor(params?: XyoRemoteArchivistParams) {
22
+ super(params)
23
+ this._api = params?.api
18
24
  }
19
25
 
20
26
  public get api() {
21
- return assertEx(this.config?.api, 'API not defined')
27
+ if (this._api) {
28
+ return this._api
29
+ }
30
+ // eslint-disable-next-line deprecation/deprecation
31
+ if (this.config?.api) {
32
+ this.logger?.warn('api specified in config but should be specified in params')
33
+ // eslint-disable-next-line deprecation/deprecation
34
+ return this.config?.api
35
+ }
36
+ throw Error('No api specified')
22
37
  }
23
38
 
24
39
  public override queries() {
@@ -103,4 +118,5 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
103
118
  throw ex
104
119
  }
105
120
  }
121
+ static override configSchema = XyoRemoteArchivistConfigSchema
106
122
  }
@@ -9,6 +9,7 @@ export const XyoRemoteArchivistConfigSchema: XyoRemoteArchivistConfigSchema = 'n
9
9
  export type XyoRemoteArchivistConfig<T extends XyoPayload = XyoPayload> = XyoArchivistConfig<
10
10
  {
11
11
  schema: XyoRemoteArchivistConfigSchema
12
+ /** @deprecated pass api in params instead */
12
13
  api?: XyoArchivistApi
13
14
  archive?: string
14
15
  } & T