@xyo-network/archivist 2.36.6 → 2.36.7
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.
- package/dist/cjs/Config.d.ts +4 -5
- package/dist/cjs/Config.d.ts.map +1 -1
- package/dist/cjs/XyoArchivist.d.ts +8 -2
- package/dist/cjs/XyoArchivist.d.ts.map +1 -1
- package/dist/cjs/XyoArchivist.js +19 -10
- package/dist/cjs/XyoArchivist.js.map +1 -1
- package/dist/cjs/XyoStorageArchivist.d.ts.map +1 -1
- package/dist/cjs/XyoStorageArchivist.js +7 -2
- package/dist/cjs/XyoStorageArchivist.js.map +1 -1
- package/dist/docs.json +3009 -2411
- package/dist/esm/Config.d.ts +4 -5
- package/dist/esm/Config.d.ts.map +1 -1
- package/dist/esm/XyoArchivist.d.ts +8 -2
- package/dist/esm/XyoArchivist.d.ts.map +1 -1
- package/dist/esm/XyoArchivist.js +13 -4
- package/dist/esm/XyoArchivist.js.map +1 -1
- package/dist/esm/XyoStorageArchivist.d.ts.map +1 -1
- package/dist/esm/XyoStorageArchivist.js +4 -1
- package/dist/esm/XyoStorageArchivist.js.map +1 -1
- package/package.json +6 -6
- package/src/Config.ts +4 -6
- package/src/XyoArchivist.ts +22 -7
- package/src/XyoStorageArchivist.ts +4 -1
package/dist/esm/Config.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { XyoModuleConfig } from '@xyo-network/module';
|
|
1
|
+
import { AddressString, XyoModuleConfig } from '@xyo-network/module';
|
|
2
2
|
import { XyoPayload } from '@xyo-network/payload';
|
|
3
|
-
import { PayloadArchivist } from './Archivist';
|
|
4
3
|
export interface XyoArchivistParents {
|
|
5
|
-
read?:
|
|
6
|
-
write?:
|
|
7
|
-
commit?:
|
|
4
|
+
read?: AddressString[];
|
|
5
|
+
write?: AddressString[];
|
|
6
|
+
commit?: AddressString[];
|
|
8
7
|
}
|
|
9
8
|
export declare type XyoArchivistConfig<TConfig extends XyoPayload = XyoPayload> = XyoModuleConfig<{
|
|
10
9
|
/** @field address of one or more parent archivists to read from */
|
package/dist/esm/Config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,aAAa,EAAE,CAAA;IACtB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAA;IACvB,MAAM,CAAC,EAAE,aAAa,EAAE,CAAA;CACzB;AAED,oBAAY,kBAAkB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CACvF;IACE,mEAAmE;IACnE,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,GAAG,OAAO,CACZ,CAAA"}
|
|
@@ -3,8 +3,14 @@ import { ModuleQueryResult, XyoModule, XyoQueryBoundWitness } from '@xyo-network
|
|
|
3
3
|
import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
|
|
4
4
|
import { NullablePromisableArray, Promisable, PromisableArray } from '@xyo-network/promise';
|
|
5
5
|
import { PayloadArchivist } from './Archivist';
|
|
6
|
-
import { XyoArchivistConfig
|
|
6
|
+
import { XyoArchivistConfig } from './Config';
|
|
7
|
+
import { XyoArchivistWrapper } from './XyoArchivistWrapper';
|
|
7
8
|
import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
|
|
9
|
+
export interface XyoArchivistParentWrappers {
|
|
10
|
+
read?: Record<string, XyoArchivistWrapper>;
|
|
11
|
+
write?: Record<string, XyoArchivistWrapper>;
|
|
12
|
+
commit?: Record<string, XyoArchivistWrapper>;
|
|
13
|
+
}
|
|
8
14
|
export declare abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload> extends XyoModule<XyoArchivistConfig<TConfig>> implements PayloadArchivist {
|
|
9
15
|
queries(): string[];
|
|
10
16
|
get cacheParentReads(): boolean;
|
|
@@ -26,6 +32,6 @@ export declare abstract class XyoArchivist<TConfig extends XyoPayload = XyoPaylo
|
|
|
26
32
|
}>;
|
|
27
33
|
protected writeToParents(payloads: XyoPayload[]): Promise<XyoBoundWitness[]>;
|
|
28
34
|
private _parents?;
|
|
29
|
-
get parents():
|
|
35
|
+
get parents(): XyoArchivistParentWrappers;
|
|
30
36
|
}
|
|
31
37
|
//# sourceMappingURL=XyoArchivist.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyoArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAGT,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAkB,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAG3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"XyoArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAGT,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAkB,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAG3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAa7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,WAAW,0BAA0B;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;CAC7C;AAED,8BAAsB,YAAY,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,CACxE,SAAQ,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAC7C,YAAW,gBAAgB;IAEX,OAAO;IAUvB,IAAW,gBAAgB,YAE1B;IAED,IAAW,YAAY,YAEtB;IAEM,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC;IAIlC,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC;IAIzB,MAAM,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;IAIvC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC;IAInD,IAAI,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,eAAe,CAAC,UAAU,CAAC;IAIxE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC,UAAU,CAAC;IAEnE,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,eAAe,CAAC;IAEtD,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACxE,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAyCzC,OAAO,CAAC,iBAAiB;cAeT,cAAc,CAAC,IAAI,EAAE,MAAM;;;cAkB3B,aAAa,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE;;;cAW9D,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAWlF,OAAO,CAAC,QAAQ,CAAC,CAA4B;IAC7C,IAAI,OAAO,+BAOV;CACF"}
|
package/dist/esm/XyoArchivist.js
CHANGED
|
@@ -4,6 +4,7 @@ import { QueryBoundWitnessWrapper, XyoModule, XyoModuleInitializeQuerySchema, Xy
|
|
|
4
4
|
import { PayloadWrapper } from '@xyo-network/payload';
|
|
5
5
|
import compact from 'lodash/compact';
|
|
6
6
|
import { XyoArchivistAllQuerySchema, XyoArchivistClearQuerySchema, XyoArchivistCommitQuerySchema, XyoArchivistDeleteQuerySchema, XyoArchivistFindQuerySchema, XyoArchivistGetQuerySchema, XyoArchivistInsertQuerySchema, } from './Queries';
|
|
7
|
+
import { XyoArchivistWrapper } from './XyoArchivistWrapper';
|
|
7
8
|
export class XyoArchivist extends XyoModule {
|
|
8
9
|
queries() {
|
|
9
10
|
return [
|
|
@@ -71,16 +72,22 @@ export class XyoArchivist extends XyoModule {
|
|
|
71
72
|
default:
|
|
72
73
|
return super.query(query, payloads);
|
|
73
74
|
}
|
|
75
|
+
this.log?.('Query', wrapper.schemaName);
|
|
74
76
|
return this.bindResult(resultPayloads, queryAccount);
|
|
75
77
|
}
|
|
76
78
|
resolveArchivists(archivists) {
|
|
77
|
-
const
|
|
79
|
+
const resolvedWrappers = {};
|
|
78
80
|
if (archivists) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
+
archivists.map((archivist) => {
|
|
82
|
+
if (resolvedWrappers[archivist] === undefined) {
|
|
83
|
+
const module = this.resolver?.(archivist);
|
|
84
|
+
if (module) {
|
|
85
|
+
resolvedWrappers[archivist] = new XyoArchivistWrapper(module);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
81
88
|
});
|
|
82
89
|
}
|
|
83
|
-
return
|
|
90
|
+
return resolvedWrappers;
|
|
84
91
|
}
|
|
85
92
|
async getFromParents(hash) {
|
|
86
93
|
return compact(await Promise.all(Object.values(this.parents?.read ?? {}).map(async (parent) => {
|
|
@@ -96,6 +103,7 @@ export class XyoArchivist extends XyoModule {
|
|
|
96
103
|
})))[0];
|
|
97
104
|
}
|
|
98
105
|
async writeToParent(parent, payloads) {
|
|
106
|
+
this.log?.('Write to Parent', parent.address);
|
|
99
107
|
const queryPayload = PayloadWrapper.parse({
|
|
100
108
|
payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
|
|
101
109
|
schema: XyoArchivistInsertQuerySchema,
|
|
@@ -105,6 +113,7 @@ export class XyoArchivist extends XyoModule {
|
|
|
105
113
|
return result[0];
|
|
106
114
|
}
|
|
107
115
|
async writeToParents(payloads) {
|
|
116
|
+
this.log?.('Write to Parents', this.parents?.write?.length ?? 0);
|
|
108
117
|
return compact(await Promise.all(Object.values(this.parents?.write ?? {}).map(async (parent) => {
|
|
109
118
|
return parent ? await this.writeToParent(parent, payloads) : undefined;
|
|
110
119
|
})));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAEL,wBAAwB,EACxB,SAAS,EACT,8BAA8B,EAC9B,4BAA4B,GAE7B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,cAAc,EAA2B,MAAM,sBAAsB,CAAA;AAE9E,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAIpC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAC7B,6BAA6B,EAC7B,2BAA2B,EAE3B,0BAA0B,EAE1B,6BAA6B,GAE9B,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAEL,wBAAwB,EACxB,SAAS,EACT,8BAA8B,EAC9B,4BAA4B,GAE7B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,cAAc,EAA2B,MAAM,sBAAsB,CAAA;AAE9E,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAIpC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAC7B,6BAA6B,EAC7B,2BAA2B,EAE3B,0BAA0B,EAE1B,6BAA6B,GAE9B,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAS3D,MAAM,OAAgB,YACpB,SAAQ,SAAsC;IAG9B,OAAO;QACrB,OAAO;YACL,8BAA8B;YAC9B,4BAA4B;YAC5B,0BAA0B;YAC1B,6BAA6B;YAC7B,GAAG,KAAK,CAAC,OAAO,EAAE;SACnB,CAAA;IACH,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACxC,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAA;IACpC,CAAC;IAEM,GAAG;QACR,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,MAAM;QACX,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,MAAM,CAAC,OAAiB;QAC7B,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,IAAI,CAAC,OAA8B;QACxC,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAMQ,KAAK,CAAC,KAAK,CAClB,KAAQ,EACR,QAAsB;QAEtB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAoB,KAAK,EAAE,QAAQ,CAAC,CAAA;QACvF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;QACxC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;QAE9D,MAAM,cAAc,GAA0B,EAAE,CAAA;QAChD,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,0BAA0B;gBAC7B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;gBAC1C,MAAK;YACP,KAAK,4BAA4B;gBAC/B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;gBAClB,MAAK;YACP,KAAK,6BAA6B;gBAChC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;gBAC7C,MAAK;YACP,KAAK,6BAA6B;gBAChC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;gBACpC,MAAK;YACP,KAAK,2BAA2B;gBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBAC5D,MAAK;YACP,KAAK,0BAA0B;gBAC7B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBAC3D,MAAK;YACP,KAAK,6BAA6B,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;gBAChF,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,qBAAqB,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;gBACzF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;gBACjG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,KAAK,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAA;gBACrG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC/F,MAAK;aACN;YACD;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;SACtC;QACD,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACvC,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;IACtD,CAAC;IAEO,iBAAiB,CAAC,UAAqB;QAC7C,MAAM,gBAAgB,GAAwC,EAAE,CAAA;QAChE,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC3B,IAAI,gBAAgB,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;oBAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAA;oBACzC,IAAI,MAAM,EAAE;wBACV,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAA;qBAC9D;iBACF;YACH,CAAC,CAAC,CAAA;SACH;QACD,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,IAAY;QACzC,OAAO,OAAO,CACZ,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAuB,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAAA;YACvH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;YAChD,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YACpE,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAC7E,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE;gBACpC,OAAO,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,OAAO,yCAAyC,IAAI,OAAO,OAAO,CAAC,IAAI,GAAG,CAAC,CAAA;gBAC3G,OAAO,IAAI,CAAA;aACZ;YACD,OAAO,OAAO,EAAE,OAAO,CAAA;QACzB,CAAC,CAAC,CACH,CACF,CAAC,CAAC,CAAC,CAAA;IACN,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,MAAwB,EAAE,QAAsB;QAC5E,IAAI,CAAC,GAAG,EAAE,CAAC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;QAC7C,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAA0B;YACjE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjE,MAAM,EAAE,6BAA6B;SACtC,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9D,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,QAAsB;QACnD,IAAI,CAAC,GAAG,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,CAAC,CAAA;QAChE,OAAO,OAAO,CACZ,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5D,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACxE,CAAC,CAAC,CACH,CACF,CAAA;IACH,CAAC;IAEO,QAAQ,CAA6B;IAC7C,IAAI,OAAO;QACT,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI;YAC/B,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;YAC5D,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC;YACxD,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;SAC3D,CAAA;QACD,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyoStorageArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoStorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAkB,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAUxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,oBAAY,+BAA+B,GAAG,6CAA6C,CAAA;AAC3F,eAAO,MAAM,+BAA+B,EAAE,+BAA+E,CAAA;AAE7H,oBAAY,yBAAyB,GAAG,kBAAkB,CAAC;IACzD,MAAM,EAAE,+BAA+B,CAAA;IACvC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;IACnC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAC,CAAA;AAQF,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,yBAAyB,CAAC;IAC9E,IAAW,IAAI,iCAEd;IAED,IAAW,SAAS,WAEnB;IAED,IAAW,UAAU,WAEpB;IAED,IAAW,YAAY,WAEtB;IAED,IAAW,cAAc,YAExB;IAEe,OAAO;IAYvB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,KAAK,OAAO,GAGlB;IAGD,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,KAAK,cAAc,GAGzB;gBAEW,MAAM,CAAC,EAAE,sBAAsB,CAAC,yBAAyB,CAAC;cAKnD,WAAW;
|
|
1
|
+
{"version":3,"file":"XyoStorageArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoStorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAkB,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAUxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,oBAAY,+BAA+B,GAAG,6CAA6C,CAAA;AAC3F,eAAO,MAAM,+BAA+B,EAAE,+BAA+E,CAAA;AAE7H,oBAAY,yBAAyB,GAAG,kBAAkB,CAAC;IACzD,MAAM,EAAE,+BAA+B,CAAA;IACvC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;IACnC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAC,CAAA;AAQF,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,yBAAyB,CAAC;IAC9E,IAAW,IAAI,iCAEd;IAED,IAAW,SAAS,WAEnB;IAED,IAAW,UAAU,WAEpB;IAED,IAAW,YAAY,WAEtB;IAED,IAAW,cAAc,YAExB;IAEe,OAAO;IAYvB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,KAAK,OAAO,GAGlB;IAGD,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,KAAK,cAAc,GAGzB;gBAEW,MAAM,CAAC,EAAE,sBAAsB,CAAC,yBAAyB,CAAC;cAKnD,WAAW;IAiB9B,SAAS,CAAC,WAAW;IAOL,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC;IAYlD,KAAK,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAShC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;IAcrD,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAuBjD,IAAI,CAAC,MAAM,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAehE,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC;IAS5B,MAAM,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CA2B3D"}
|
|
@@ -58,7 +58,9 @@ export class XyoStorageArchivist extends XyoArchivist {
|
|
|
58
58
|
const privateKey = this.privateStorage.get('privateKey');
|
|
59
59
|
if (privateKey) {
|
|
60
60
|
try {
|
|
61
|
-
|
|
61
|
+
const account = new XyoAccount({ privateKey });
|
|
62
|
+
this.log?.('Load Account', account.addressValue.hex);
|
|
63
|
+
return account;
|
|
62
64
|
}
|
|
63
65
|
catch {
|
|
64
66
|
console.error(`Error reading Account from storage [${this.type}] - Recreating Account`);
|
|
@@ -70,6 +72,7 @@ export class XyoStorageArchivist extends XyoArchivist {
|
|
|
70
72
|
}
|
|
71
73
|
saveAccount() {
|
|
72
74
|
if (this.persistAccount) {
|
|
75
|
+
this.log?.('Load Account', this.account.addressValue.hex);
|
|
73
76
|
this.privateStorage.set('privateKey', this.account.private.hex);
|
|
74
77
|
}
|
|
75
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyoStorageArchivist.js","sourceRoot":"","sources":["../../src/XyoStorageArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,cAAc,EAAc,MAAM,sBAAsB,CAAA;AAEjE,OAAO,OAAO,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAoB,MAAM,QAAQ,CAAA;AAIzC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAC7B,6BAA6B,EAC7B,2BAA2B,EAE3B,6BAA6B,GAC9B,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAI7C,MAAM,CAAC,MAAM,+BAA+B,GAAoC,6CAA6C,CAAA;AAW7H,MAAM,qBAAsB,SAAQ,KAAK;IACvC,YAAY,MAAc,EAAE,KAAqB,EAAE,OAAgB;QACjE,KAAK,CAAC,sBAAsB,MAAM,WAAW,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IAClG,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,YAAuC;IAC9E,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,OAAO,CAAA;IACrC,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,SAAS,IAAI,eAAe,CAAA;IAClD,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,IAAI,CAAA;IACxC,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,KAAK,CAAA;IACzC,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,MAAM,EAAE,cAAc,IAAI,KAAK,CAAA;IAC7C,CAAC;IAEe,OAAO;QACrB,OAAO;YACL,0BAA0B;YAC1B,6BAA6B;YAC7B,4BAA4B;YAC5B,2BAA2B;YAC3B,6BAA6B;YAC7B,GAAG,KAAK,CAAC,OAAO,EAAE;SACnB,CAAA;IACH,CAAC;IAED,0EAA0E;IAClE,QAAQ,CAAuB;IACvC,IAAY,OAAO;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC3E,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,0EAA0E;IAClE,eAAe,CAAuB;IAC9C,IAAY,cAAc;QACxB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,UAAU,CAAC,CAAA;QAC/F,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;IAED,YAAY,MAA0D;QACpE,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC,CAAA;QAC7D,IAAI,CAAC,WAAW,EAAE,CAAA;IACpB,CAAC;IAEkB,WAAW;QAC5B,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACxD,IAAI,UAAU,EAAE;gBACd,IAAI;oBACF,OAAO,IAAI,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"XyoStorageArchivist.js","sourceRoot":"","sources":["../../src/XyoStorageArchivist.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@xylabs/assert": "^2.6.9",
|
|
13
|
-
"@xyo-network/account": "^2.36.
|
|
14
|
-
"@xyo-network/boundwitness": "^2.36.
|
|
15
|
-
"@xyo-network/module": "^2.36.
|
|
16
|
-
"@xyo-network/payload": "^2.36.
|
|
17
|
-
"@xyo-network/promise": "^2.36.
|
|
13
|
+
"@xyo-network/account": "^2.36.7",
|
|
14
|
+
"@xyo-network/boundwitness": "^2.36.7",
|
|
15
|
+
"@xyo-network/module": "^2.36.7",
|
|
16
|
+
"@xyo-network/payload": "^2.36.7",
|
|
17
|
+
"@xyo-network/promise": "^2.36.7",
|
|
18
18
|
"js-cookie": "^3.0.1",
|
|
19
19
|
"lodash": "^4.17.21",
|
|
20
20
|
"lru-cache": "^7.14.0",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
},
|
|
59
59
|
"sideEffects": false,
|
|
60
60
|
"types": "dist/esm/index.d.ts",
|
|
61
|
-
"version": "2.36.
|
|
61
|
+
"version": "2.36.7"
|
|
62
62
|
}
|
package/src/Config.ts
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { XyoModuleConfig } from '@xyo-network/module'
|
|
1
|
+
import { AddressString, XyoModuleConfig } from '@xyo-network/module'
|
|
2
2
|
import { XyoPayload } from '@xyo-network/payload'
|
|
3
3
|
|
|
4
|
-
import { PayloadArchivist } from './Archivist'
|
|
5
|
-
|
|
6
4
|
export interface XyoArchivistParents {
|
|
7
|
-
read?:
|
|
8
|
-
write?:
|
|
9
|
-
commit?:
|
|
5
|
+
read?: AddressString[]
|
|
6
|
+
write?: AddressString[]
|
|
7
|
+
commit?: AddressString[]
|
|
10
8
|
}
|
|
11
9
|
|
|
12
10
|
export type XyoArchivistConfig<TConfig extends XyoPayload = XyoPayload> = XyoModuleConfig<
|
package/src/XyoArchivist.ts
CHANGED
|
@@ -14,7 +14,7 @@ import { NullablePromisableArray, Promisable, PromisableArray } from '@xyo-netwo
|
|
|
14
14
|
import compact from 'lodash/compact'
|
|
15
15
|
|
|
16
16
|
import { PayloadArchivist } from './Archivist'
|
|
17
|
-
import { XyoArchivistConfig
|
|
17
|
+
import { XyoArchivistConfig } from './Config'
|
|
18
18
|
import {
|
|
19
19
|
XyoArchivistAllQuerySchema,
|
|
20
20
|
XyoArchivistClearQuerySchema,
|
|
@@ -27,8 +27,15 @@ import {
|
|
|
27
27
|
XyoArchivistInsertQuerySchema,
|
|
28
28
|
XyoArchivistQuery,
|
|
29
29
|
} from './Queries'
|
|
30
|
+
import { XyoArchivistWrapper } from './XyoArchivistWrapper'
|
|
30
31
|
import { XyoPayloadFindFilter } from './XyoPayloadFindFilter'
|
|
31
32
|
|
|
33
|
+
export interface XyoArchivistParentWrappers {
|
|
34
|
+
read?: Record<string, XyoArchivistWrapper>
|
|
35
|
+
write?: Record<string, XyoArchivistWrapper>
|
|
36
|
+
commit?: Record<string, XyoArchivistWrapper>
|
|
37
|
+
}
|
|
38
|
+
|
|
32
39
|
export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
|
|
33
40
|
extends XyoModule<XyoArchivistConfig<TConfig>>
|
|
34
41
|
implements PayloadArchivist
|
|
@@ -115,17 +122,23 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
|
|
|
115
122
|
default:
|
|
116
123
|
return super.query(query, payloads)
|
|
117
124
|
}
|
|
125
|
+
this.log?.('Query', wrapper.schemaName)
|
|
118
126
|
return this.bindResult(resultPayloads, queryAccount)
|
|
119
127
|
}
|
|
120
128
|
|
|
121
|
-
private resolveArchivists(archivists?:
|
|
122
|
-
const
|
|
129
|
+
private resolveArchivists(archivists?: string[]) {
|
|
130
|
+
const resolvedWrappers: Record<string, XyoArchivistWrapper> = {}
|
|
123
131
|
if (archivists) {
|
|
124
|
-
|
|
125
|
-
|
|
132
|
+
archivists.map((archivist) => {
|
|
133
|
+
if (resolvedWrappers[archivist] === undefined) {
|
|
134
|
+
const module = this.resolver?.(archivist)
|
|
135
|
+
if (module) {
|
|
136
|
+
resolvedWrappers[archivist] = new XyoArchivistWrapper(module)
|
|
137
|
+
}
|
|
138
|
+
}
|
|
126
139
|
})
|
|
127
140
|
}
|
|
128
|
-
return
|
|
141
|
+
return resolvedWrappers
|
|
129
142
|
}
|
|
130
143
|
|
|
131
144
|
protected async getFromParents(hash: string) {
|
|
@@ -147,6 +160,7 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
|
|
|
147
160
|
}
|
|
148
161
|
|
|
149
162
|
protected async writeToParent(parent: PayloadArchivist, payloads: XyoPayload[]) {
|
|
163
|
+
this.log?.('Write to Parent', parent.address)
|
|
150
164
|
const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
|
|
151
165
|
payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
|
|
152
166
|
schema: XyoArchivistInsertQuerySchema,
|
|
@@ -157,6 +171,7 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
|
|
|
157
171
|
}
|
|
158
172
|
|
|
159
173
|
protected async writeToParents(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
|
|
174
|
+
this.log?.('Write to Parents', this.parents?.write?.length ?? 0)
|
|
160
175
|
return compact(
|
|
161
176
|
await Promise.all(
|
|
162
177
|
Object.values(this.parents?.write ?? {}).map(async (parent) => {
|
|
@@ -166,7 +181,7 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
|
|
|
166
181
|
)
|
|
167
182
|
}
|
|
168
183
|
|
|
169
|
-
private _parents?:
|
|
184
|
+
private _parents?: XyoArchivistParentWrappers
|
|
170
185
|
get parents() {
|
|
171
186
|
this._parents = this._parents ?? {
|
|
172
187
|
commit: this.resolveArchivists(this.config?.parents?.commit),
|
|
@@ -94,7 +94,9 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
|
|
|
94
94
|
const privateKey = this.privateStorage.get('privateKey')
|
|
95
95
|
if (privateKey) {
|
|
96
96
|
try {
|
|
97
|
-
|
|
97
|
+
const account = new XyoAccount({ privateKey })
|
|
98
|
+
this.log?.('Load Account', account.addressValue.hex)
|
|
99
|
+
return account
|
|
98
100
|
} catch {
|
|
99
101
|
console.error(`Error reading Account from storage [${this.type}] - Recreating Account`)
|
|
100
102
|
this.privateStorage.remove('privateKey')
|
|
@@ -106,6 +108,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
|
|
|
106
108
|
|
|
107
109
|
protected saveAccount() {
|
|
108
110
|
if (this.persistAccount) {
|
|
111
|
+
this.log?.('Load Account', this.account.addressValue.hex)
|
|
109
112
|
this.privateStorage.set('privateKey', this.account.private.hex)
|
|
110
113
|
}
|
|
111
114
|
}
|