@xyo-network/archivist 2.64.9 → 2.65.0
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/ArchivingModule.js +4 -3
- package/dist/cjs/ArchivingModule.js.map +1 -1
- package/dist/cjs/CookieArchivist.js +7 -7
- package/dist/cjs/CookieArchivist.js.map +1 -1
- package/dist/cjs/StorageArchivist.js +41 -41
- package/dist/cjs/StorageArchivist.js.map +1 -1
- package/dist/esm/ArchivingModule.js +4 -3
- package/dist/esm/ArchivingModule.js.map +1 -1
- package/dist/esm/CookieArchivist.js +8 -8
- package/dist/esm/CookieArchivist.js.map +1 -1
- package/dist/esm/StorageArchivist.js +31 -31
- package/dist/esm/StorageArchivist.js.map +1 -1
- package/dist/types/ArchivingModule.d.ts +4 -4
- package/dist/types/ArchivingModule.d.ts.map +1 -1
- package/dist/types/CookieArchivist.d.ts +8 -8
- package/dist/types/CookieArchivist.d.ts.map +1 -1
- package/dist/types/StorageArchivist.d.ts +9 -9
- package/dist/types/StorageArchivist.d.ts.map +1 -1
- package/package.json +17 -17
- package/src/ArchivingModule.ts +7 -8
- package/src/CookieArchivist.ts +8 -8
- package/src/StorageArchivist.ts +34 -34
- package/src/spec/testArchivist.ts +3 -3
- package/dist/docs.json +0 -96016
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ArchivingModule = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const archivist_model_1 = require("@xyo-network/archivist-model");
|
|
5
6
|
const archivist_wrapper_1 = require("@xyo-network/archivist-wrapper");
|
|
6
7
|
const module_1 = require("@xyo-network/module");
|
|
7
8
|
const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
|
|
@@ -18,16 +19,16 @@ class ArchivingModule extends module_1.AbstractModule {
|
|
|
18
19
|
});
|
|
19
20
|
}
|
|
20
21
|
resolveArchivists() {
|
|
21
|
-
var _a, _b
|
|
22
|
+
var _a, _b;
|
|
22
23
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
return (0, compact_1.default)(yield Promise.all((
|
|
24
|
+
return (0, compact_1.default)((yield Promise.all((_b = (yield this.resolve({ address: (_a = this.config.archivists) !== null && _a !== void 0 ? _a : [] }))) !== null && _b !== void 0 ? _b : [])).map((module) => (0, archivist_model_1.asArchivistModule)(module)));
|
|
24
25
|
});
|
|
25
26
|
}
|
|
26
27
|
storeToArchivists(payloads) {
|
|
27
28
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
28
29
|
const archivists = yield this.resolveArchivists();
|
|
29
30
|
return (yield Promise.all(archivists.map((archivist) => {
|
|
30
|
-
return archivist.insert(payloads);
|
|
31
|
+
return (0, archivist_model_1.isArchivistInstance)(archivist) ? archivist.insert(payloads) : archivist_wrapper_1.IndirectArchivistWrapper.wrap(archivist, this.account).insert(payloads);
|
|
31
32
|
}))).map(([bw]) => bw);
|
|
32
33
|
});
|
|
33
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchivingModule.js","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"ArchivingModule.js","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":";;;;AACA,kEAAsG;AACtG,sEAAyE;AAGzE,gDAA4H;AAG5H,qEAAoC;AAQpC,qBAAqB;AACrB,MAAsB,eAIpB,SAAQ,uBAAmC;IAGlB,eAAe,CACtC,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,gBAA+B,EAAE;;;;;YAEjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,OAAM,eAAe,YAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;YAC5G,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACvD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC5B,CAAC;KAAA;IAEe,iBAAiB;;;YAC/B,OAAO,IAAA,iBAAO,EACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAA,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,mCAAI,EAAE,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,mCAAiB,EAAC,MAAM,CAAC,CAAC,CACtI,CAAA;;KACF;IAEe,iBAAiB,CAAC,QAAmB;;YACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;YACjD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC3B,OAAO,IAAA,qCAAmB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,4CAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC9I,CAAC,CAAC,CACH,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;QACrB,CAAC;KAAA;CACF;AAlCD,0CAkCC"}
|
|
@@ -11,7 +11,7 @@ const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
|
|
|
11
11
|
const js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
|
|
12
12
|
const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
|
|
13
13
|
exports.CookieArchivistConfigSchema = 'network.xyo.archivist.cookie.config';
|
|
14
|
-
class CookieArchivist extends abstract_archivist_1.
|
|
14
|
+
class CookieArchivist extends abstract_archivist_1.AbstractDirectArchivist {
|
|
15
15
|
get domain() {
|
|
16
16
|
var _a;
|
|
17
17
|
return (_a = this.config) === null || _a === void 0 ? void 0 : _a.domain;
|
|
@@ -40,7 +40,7 @@ class CookieArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
40
40
|
...super.queries,
|
|
41
41
|
];
|
|
42
42
|
}
|
|
43
|
-
|
|
43
|
+
allHandler() {
|
|
44
44
|
try {
|
|
45
45
|
return Object.entries(js_cookie_1.default.get())
|
|
46
46
|
.filter(([key]) => key.startsWith(`${this.namespace}-`))
|
|
@@ -51,7 +51,7 @@ class CookieArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
51
51
|
throw ex;
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
-
|
|
54
|
+
clearHandler() {
|
|
55
55
|
try {
|
|
56
56
|
Object.entries(js_cookie_1.default.get()).map(([key]) => {
|
|
57
57
|
if (key.startsWith(`${this.namespace}-`)) {
|
|
@@ -64,7 +64,7 @@ class CookieArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
64
64
|
throw ex;
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
-
|
|
67
|
+
commitHandler() {
|
|
68
68
|
var _a, _b;
|
|
69
69
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
70
70
|
try {
|
|
@@ -88,7 +88,7 @@ class CookieArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
88
88
|
}
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
|
-
|
|
91
|
+
deleteHandler(hashes) {
|
|
92
92
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
93
93
|
try {
|
|
94
94
|
const found = hashes.map((hash) => {
|
|
@@ -104,7 +104,7 @@ class CookieArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
104
104
|
}
|
|
105
105
|
});
|
|
106
106
|
}
|
|
107
|
-
|
|
107
|
+
getHandler(hashes) {
|
|
108
108
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
109
109
|
try {
|
|
110
110
|
return yield Promise.all(hashes.map((hash) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -119,7 +119,7 @@ class CookieArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
119
119
|
}
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
|
-
|
|
122
|
+
insertHandler(payloads) {
|
|
123
123
|
var _a;
|
|
124
124
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
125
125
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CookieArchivist.js","sourceRoot":"","sources":["../../src/CookieArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,6CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"CookieArchivist.js","sourceRoot":"","sources":["../../src/CookieArchivist.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
|
|
|
12
12
|
const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
|
|
13
13
|
const store2_1 = tslib_1.__importDefault(require("store2"));
|
|
14
14
|
exports.StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config';
|
|
15
|
-
class StorageArchivist extends abstract_archivist_1.
|
|
15
|
+
class StorageArchivist extends abstract_archivist_1.AbstractDirectArchivist {
|
|
16
16
|
get maxEntries() {
|
|
17
17
|
var _a, _b;
|
|
18
18
|
return (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.maxEntries) !== null && _b !== void 0 ? _b : 1000;
|
|
@@ -55,18 +55,50 @@ class StorageArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
55
55
|
this._storage = (_a = this._storage) !== null && _a !== void 0 ? _a : store2_1.default[this.type].namespace(this.namespace);
|
|
56
56
|
return this._storage;
|
|
57
57
|
}
|
|
58
|
-
|
|
58
|
+
loadAccount(account, persistAccount, privateStorage, _logger) {
|
|
59
|
+
const _super = Object.create(null, {
|
|
60
|
+
loadAccount: { get: () => super.loadAccount }
|
|
61
|
+
});
|
|
62
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
63
|
+
if (!this._account) {
|
|
64
|
+
if (persistAccount) {
|
|
65
|
+
const privateKey = privateStorage === null || privateStorage === void 0 ? void 0 : privateStorage.get('privateKey');
|
|
66
|
+
if (privateKey) {
|
|
67
|
+
try {
|
|
68
|
+
this._account = yield account_1.Account.create({ privateKey });
|
|
69
|
+
return this._account;
|
|
70
|
+
}
|
|
71
|
+
catch (ex) {
|
|
72
|
+
console.error(`Error reading Account from storage [${ex}] - Recreating Account`);
|
|
73
|
+
privateStorage === null || privateStorage === void 0 ? void 0 : privateStorage.remove('privateKey');
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return yield _super.loadAccount.call(this);
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
start() {
|
|
82
|
+
const _super = Object.create(null, {
|
|
83
|
+
start: { get: () => super.start }
|
|
84
|
+
});
|
|
85
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
86
|
+
yield _super.start.call(this);
|
|
87
|
+
this.saveAccount();
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
allHandler() {
|
|
59
91
|
var _a;
|
|
60
92
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
|
|
61
93
|
return Object.entries(this.storage.getAll()).map(([, value]) => value);
|
|
62
94
|
}
|
|
63
|
-
|
|
95
|
+
clearHandler() {
|
|
64
96
|
var _a;
|
|
65
97
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
|
|
66
98
|
this.storage.clear();
|
|
67
99
|
return this.emit('cleared', { module: this });
|
|
68
100
|
}
|
|
69
|
-
|
|
101
|
+
commitHandler() {
|
|
70
102
|
var _a, _b, _c;
|
|
71
103
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
72
104
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
|
|
@@ -86,7 +118,7 @@ class StorageArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
86
118
|
return (0, compact_1.default)(settled.filter(promise_1.fulfilled).map((result) => result.value));
|
|
87
119
|
});
|
|
88
120
|
}
|
|
89
|
-
|
|
121
|
+
deleteHandler(hashes) {
|
|
90
122
|
var _a;
|
|
91
123
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
92
124
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.log(`delete: hashes.length: ${hashes.length}`);
|
|
@@ -98,16 +130,16 @@ class StorageArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
98
130
|
return found;
|
|
99
131
|
});
|
|
100
132
|
}
|
|
101
|
-
|
|
133
|
+
getHandler(hashes) {
|
|
102
134
|
const _super = Object.create(null, {
|
|
103
|
-
|
|
135
|
+
getHandler: { get: () => super.getHandler }
|
|
104
136
|
});
|
|
105
137
|
var _a;
|
|
106
138
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
107
139
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.log(`get: hashes.length: ${hashes.length}`);
|
|
108
140
|
return yield Promise.all(hashes.map((hash) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
109
141
|
var _b, _c;
|
|
110
|
-
const payload = (_c = (_b = this.storage.get(hash)) !== null && _b !== void 0 ? _b : (yield _super.
|
|
142
|
+
const payload = (_c = (_b = this.storage.get(hash)) !== null && _b !== void 0 ? _b : (yield _super.getHandler.call(this, [hash]))[0]) !== null && _c !== void 0 ? _c : null;
|
|
111
143
|
if (this.storeParentReads) {
|
|
112
144
|
this.storage.set(hash, payload);
|
|
113
145
|
}
|
|
@@ -115,7 +147,7 @@ class StorageArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
115
147
|
})));
|
|
116
148
|
});
|
|
117
149
|
}
|
|
118
|
-
|
|
150
|
+
insertHandler(payloads) {
|
|
119
151
|
var _a;
|
|
120
152
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
121
153
|
const resultPayloads = yield Promise.all(payloads.map((payload) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -139,38 +171,6 @@ class StorageArchivist extends abstract_archivist_1.AbstractArchivist {
|
|
|
139
171
|
return boundWitnesses;
|
|
140
172
|
});
|
|
141
173
|
}
|
|
142
|
-
loadAccount(account, persistAccount, privateStorage, _logger) {
|
|
143
|
-
const _super = Object.create(null, {
|
|
144
|
-
loadAccount: { get: () => super.loadAccount }
|
|
145
|
-
});
|
|
146
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
147
|
-
if (!this._account) {
|
|
148
|
-
if (persistAccount) {
|
|
149
|
-
const privateKey = privateStorage === null || privateStorage === void 0 ? void 0 : privateStorage.get('privateKey');
|
|
150
|
-
if (privateKey) {
|
|
151
|
-
try {
|
|
152
|
-
this._account = yield account_1.Account.create({ privateKey });
|
|
153
|
-
return this._account;
|
|
154
|
-
}
|
|
155
|
-
catch (ex) {
|
|
156
|
-
console.error(`Error reading Account from storage [${ex}] - Recreating Account`);
|
|
157
|
-
privateStorage === null || privateStorage === void 0 ? void 0 : privateStorage.remove('privateKey');
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
return yield _super.loadAccount.call(this);
|
|
163
|
-
});
|
|
164
|
-
}
|
|
165
|
-
start() {
|
|
166
|
-
const _super = Object.create(null, {
|
|
167
|
-
start: { get: () => super.start }
|
|
168
|
-
});
|
|
169
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
170
|
-
yield _super.start.call(this);
|
|
171
|
-
this.saveAccount();
|
|
172
|
-
});
|
|
173
|
-
}
|
|
174
174
|
saveAccount() {
|
|
175
175
|
var _a;
|
|
176
176
|
if (this.persistAccount) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.js","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,6CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"StorageArchivist.js","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { asArchivistModule, isArchivistInstance } from '@xyo-network/archivist-model';
|
|
2
|
+
import { IndirectArchivistWrapper } from '@xyo-network/archivist-wrapper';
|
|
2
3
|
import { AbstractModule } from '@xyo-network/module';
|
|
3
4
|
import compact from 'lodash/compact';
|
|
4
5
|
// @creatableModule()
|
|
@@ -9,12 +10,12 @@ export class ArchivingModule extends AbstractModule {
|
|
|
9
10
|
return [result, witnesses];
|
|
10
11
|
}
|
|
11
12
|
async resolveArchivists() {
|
|
12
|
-
return compact(await Promise.all((await this.resolve({ address: this.config.archivists ?? [] }))
|
|
13
|
+
return compact((await Promise.all((await this.resolve({ address: this.config.archivists ?? [] })) ?? [])).map((module) => asArchivistModule(module)));
|
|
13
14
|
}
|
|
14
15
|
async storeToArchivists(payloads) {
|
|
15
16
|
const archivists = await this.resolveArchivists();
|
|
16
17
|
return (await Promise.all(archivists.map((archivist) => {
|
|
17
|
-
return archivist.insert(payloads);
|
|
18
|
+
return isArchivistInstance(archivist) ? archivist.insert(payloads) : IndirectArchivistWrapper.wrap(archivist, this.account).insert(payloads);
|
|
18
19
|
}))).map(([bw]) => bw);
|
|
19
20
|
}
|
|
20
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchivingModule.js","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ArchivingModule.js","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACtG,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AAGzE,OAAO,EAAE,cAAc,EAA0E,MAAM,qBAAqB,CAAA;AAG5H,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAQpC,qBAAqB;AACrB,MAAM,OAAgB,eAIpB,SAAQ,cAAmC;IAGxB,KAAK,CAAC,eAAe,CACtC,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,gBAA+B,EAAE;QAEjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;QAC5G,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC5B,CAAC;IAES,KAAK,CAAC,iBAAiB;QAC/B,OAAO,OAAO,CACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CACtI,CAAA;IACH,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAmB;QACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACjD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3B,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC9I,CAAC,CAAC,CACH,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;IACrB,CAAC;CACF"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { fulfilled } from '@xylabs/promise';
|
|
3
|
-
import {
|
|
3
|
+
import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
|
|
4
4
|
import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-model';
|
|
5
5
|
import { PayloadHasher } from '@xyo-network/core';
|
|
6
6
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
7
7
|
import Cookies from 'js-cookie';
|
|
8
8
|
import compact from 'lodash/compact';
|
|
9
9
|
export const CookieArchivistConfigSchema = 'network.xyo.archivist.cookie.config';
|
|
10
|
-
export class CookieArchivist extends
|
|
10
|
+
export class CookieArchivist extends AbstractDirectArchivist {
|
|
11
11
|
static configSchemas = [CookieArchivistConfigSchema];
|
|
12
12
|
get domain() {
|
|
13
13
|
return this.config?.domain;
|
|
@@ -33,7 +33,7 @@ export class CookieArchivist extends AbstractArchivist {
|
|
|
33
33
|
...super.queries,
|
|
34
34
|
];
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
allHandler() {
|
|
37
37
|
try {
|
|
38
38
|
return Object.entries(Cookies.get())
|
|
39
39
|
.filter(([key]) => key.startsWith(`${this.namespace}-`))
|
|
@@ -44,7 +44,7 @@ export class CookieArchivist extends AbstractArchivist {
|
|
|
44
44
|
throw ex;
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
clearHandler() {
|
|
48
48
|
try {
|
|
49
49
|
Object.entries(Cookies.get()).map(([key]) => {
|
|
50
50
|
if (key.startsWith(`${this.namespace}-`)) {
|
|
@@ -57,7 +57,7 @@ export class CookieArchivist extends AbstractArchivist {
|
|
|
57
57
|
throw ex;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
async
|
|
60
|
+
async commitHandler() {
|
|
61
61
|
try {
|
|
62
62
|
const payloads = await this.all();
|
|
63
63
|
assertEx(payloads.length > 0, 'Nothing to commit');
|
|
@@ -77,7 +77,7 @@ export class CookieArchivist extends AbstractArchivist {
|
|
|
77
77
|
throw ex;
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
-
async
|
|
80
|
+
async deleteHandler(hashes) {
|
|
81
81
|
try {
|
|
82
82
|
const found = hashes.map((hash) => {
|
|
83
83
|
Cookies.remove(this.keyFromHash(hash));
|
|
@@ -91,7 +91,7 @@ export class CookieArchivist extends AbstractArchivist {
|
|
|
91
91
|
throw ex;
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
|
-
async
|
|
94
|
+
async getHandler(hashes) {
|
|
95
95
|
try {
|
|
96
96
|
return await Promise.all(hashes.map(async (hash) => {
|
|
97
97
|
const cookieString = Cookies.get(this.keyFromHash(hash));
|
|
@@ -103,7 +103,7 @@ export class CookieArchivist extends AbstractArchivist {
|
|
|
103
103
|
throw ex;
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
-
async
|
|
106
|
+
async insertHandler(payloads) {
|
|
107
107
|
try {
|
|
108
108
|
const resultPayloads = await Promise.all(payloads.map(async (payload) => {
|
|
109
109
|
const wrapper = PayloadWrapper.wrap(payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CookieArchivist.js","sourceRoot":"","sources":["../../src/CookieArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"CookieArchivist.js","sourceRoot":"","sources":["../../src/CookieArchivist.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { fulfilled } from '@xylabs/promise';
|
|
3
|
-
import {
|
|
3
|
+
import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
|
|
4
4
|
import { Account } from '@xyo-network/account';
|
|
5
5
|
import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-model';
|
|
6
6
|
import { PayloadHasher } from '@xyo-network/core';
|
|
@@ -8,7 +8,7 @@ import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
|
8
8
|
import compact from 'lodash/compact';
|
|
9
9
|
import store from 'store2';
|
|
10
10
|
export const StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config';
|
|
11
|
-
export class StorageArchivist extends
|
|
11
|
+
export class StorageArchivist extends AbstractDirectArchivist {
|
|
12
12
|
static configSchemas = [StorageArchivistConfigSchema];
|
|
13
13
|
_privateStorage;
|
|
14
14
|
_storage;
|
|
@@ -47,16 +47,38 @@ export class StorageArchivist extends AbstractArchivist {
|
|
|
47
47
|
this._storage = this._storage ?? store[this.type].namespace(this.namespace);
|
|
48
48
|
return this._storage;
|
|
49
49
|
}
|
|
50
|
-
|
|
50
|
+
async loadAccount(account, persistAccount, privateStorage, _logger) {
|
|
51
|
+
if (!this._account) {
|
|
52
|
+
if (persistAccount) {
|
|
53
|
+
const privateKey = privateStorage?.get('privateKey');
|
|
54
|
+
if (privateKey) {
|
|
55
|
+
try {
|
|
56
|
+
this._account = await Account.create({ privateKey });
|
|
57
|
+
return this._account;
|
|
58
|
+
}
|
|
59
|
+
catch (ex) {
|
|
60
|
+
console.error(`Error reading Account from storage [${ex}] - Recreating Account`);
|
|
61
|
+
privateStorage?.remove('privateKey');
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return await super.loadAccount();
|
|
67
|
+
}
|
|
68
|
+
async start() {
|
|
69
|
+
await super.start();
|
|
70
|
+
this.saveAccount();
|
|
71
|
+
}
|
|
72
|
+
allHandler() {
|
|
51
73
|
this.logger?.log(`this.storage.length: ${this.storage.length}`);
|
|
52
74
|
return Object.entries(this.storage.getAll()).map(([, value]) => value);
|
|
53
75
|
}
|
|
54
|
-
|
|
76
|
+
clearHandler() {
|
|
55
77
|
this.logger?.log(`this.storage.length: ${this.storage.length}`);
|
|
56
78
|
this.storage.clear();
|
|
57
79
|
return this.emit('cleared', { module: this });
|
|
58
80
|
}
|
|
59
|
-
async
|
|
81
|
+
async commitHandler() {
|
|
60
82
|
this.logger?.log(`this.storage.length: ${this.storage.length}`);
|
|
61
83
|
const payloads = await this.all();
|
|
62
84
|
assertEx(payloads.length > 0, 'Nothing to commit');
|
|
@@ -72,7 +94,7 @@ export class StorageArchivist extends AbstractArchivist {
|
|
|
72
94
|
await this.clear();
|
|
73
95
|
return compact(settled.filter(fulfilled).map((result) => result.value));
|
|
74
96
|
}
|
|
75
|
-
async
|
|
97
|
+
async deleteHandler(hashes) {
|
|
76
98
|
this.logger?.log(`delete: hashes.length: ${hashes.length}`);
|
|
77
99
|
const found = hashes.map((hash) => {
|
|
78
100
|
this.storage.remove(hash);
|
|
@@ -81,17 +103,17 @@ export class StorageArchivist extends AbstractArchivist {
|
|
|
81
103
|
await this.emit('deleted', { found, hashes, module: this });
|
|
82
104
|
return found;
|
|
83
105
|
}
|
|
84
|
-
async
|
|
106
|
+
async getHandler(hashes) {
|
|
85
107
|
this.logger?.log(`get: hashes.length: ${hashes.length}`);
|
|
86
108
|
return await Promise.all(hashes.map(async (hash) => {
|
|
87
|
-
const payload = this.storage.get(hash) ?? (await super.
|
|
109
|
+
const payload = this.storage.get(hash) ?? (await super.getHandler([hash]))[0] ?? null;
|
|
88
110
|
if (this.storeParentReads) {
|
|
89
111
|
this.storage.set(hash, payload);
|
|
90
112
|
}
|
|
91
113
|
return payload;
|
|
92
114
|
}));
|
|
93
115
|
}
|
|
94
|
-
async
|
|
116
|
+
async insertHandler(payloads) {
|
|
95
117
|
const resultPayloads = await Promise.all(payloads.map(async (payload) => {
|
|
96
118
|
const wrapper = PayloadWrapper.wrap(payload);
|
|
97
119
|
const hash = await wrapper.hashAsync();
|
|
@@ -112,28 +134,6 @@ export class StorageArchivist extends AbstractArchivist {
|
|
|
112
134
|
await this.emit('inserted', { boundWitnesses, module: this });
|
|
113
135
|
return boundWitnesses;
|
|
114
136
|
}
|
|
115
|
-
async loadAccount(account, persistAccount, privateStorage, _logger) {
|
|
116
|
-
if (!this._account) {
|
|
117
|
-
if (persistAccount) {
|
|
118
|
-
const privateKey = privateStorage?.get('privateKey');
|
|
119
|
-
if (privateKey) {
|
|
120
|
-
try {
|
|
121
|
-
this._account = await Account.create({ privateKey });
|
|
122
|
-
return this._account;
|
|
123
|
-
}
|
|
124
|
-
catch (ex) {
|
|
125
|
-
console.error(`Error reading Account from storage [${ex}] - Recreating Account`);
|
|
126
|
-
privateStorage?.remove('privateKey');
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
return await super.loadAccount();
|
|
132
|
-
}
|
|
133
|
-
async start() {
|
|
134
|
-
await super.start();
|
|
135
|
-
this.saveAccount();
|
|
136
|
-
}
|
|
137
137
|
saveAccount() {
|
|
138
138
|
if (this.persistAccount) {
|
|
139
139
|
const account = this.account;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.js","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"StorageArchivist.js","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { AccountInstance } from '@xyo-network/account-model';
|
|
2
|
-
import {
|
|
2
|
+
import { ArchivistModule } from '@xyo-network/archivist-model';
|
|
3
3
|
import { BoundWitness } from '@xyo-network/boundwitness-model';
|
|
4
4
|
import { AnyObject } from '@xyo-network/core';
|
|
5
|
-
import { AbstractModule, Module, ModuleConfig,
|
|
6
|
-
import { Payload } from '@xyo-network/payload-model';
|
|
5
|
+
import { AbstractModule, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module';
|
|
6
|
+
import { ModuleError, Payload, Query } from '@xyo-network/payload-model';
|
|
7
7
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
8
8
|
export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfig<{
|
|
9
9
|
archivists?: string[];
|
|
@@ -11,7 +11,7 @@ export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfi
|
|
|
11
11
|
} & T>;
|
|
12
12
|
export declare abstract class ArchivingModule<TParams extends ModuleParams<ArchivingModuleConfig> = ModuleParams<ArchivingModuleConfig>, TEventData extends ModuleEventData = ModuleEventData> extends AbstractModule<TParams, TEventData> implements Module<TParams, TEventData> {
|
|
13
13
|
protected bindQueryResult<T extends Query | PayloadWrapper<Query>>(query: T, payloads: Payload[], additionalWitnesses?: AccountInstance[], errorPayloads?: ModuleError[]): Promise<[ModuleQueryResult, AccountInstance[]]>;
|
|
14
|
-
protected resolveArchivists(): Promise<
|
|
14
|
+
protected resolveArchivists(): Promise<ArchivistModule[]>;
|
|
15
15
|
protected storeToArchivists(payloads: Payload[]): Promise<BoundWitness[]>;
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=ArchivingModule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchivingModule.d.ts","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ArchivingModule.d.ts","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAA0C,MAAM,8BAA8B,CAAA;AAEtG,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC5H,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAG7D,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI,YAAY,CAC/E;IACE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,CAAC,CACN,CAAA;AAED,8BAAsB,eAAe,CACjC,OAAO,SAAS,YAAY,CAAC,qBAAqB,CAAC,GAAG,YAAY,CAAC,qBAAqB,CAAC,EACzF,UAAU,SAAS,eAAe,GAAG,eAAe,CAEtD,SAAQ,cAAc,CAAC,OAAO,EAAE,UAAU,CAC1C,YAAW,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;cAEb,eAAe,CAAC,CAAC,SAAS,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EAC9E,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,OAAO,EAAE,EACnB,mBAAmB,GAAE,eAAe,EAAO,EAC3C,aAAa,GAAE,WAAW,EAAO,GAChC,OAAO,CAAC,CAAC,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC;cAMlC,iBAAiB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;cAM/C,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAUhF"}
|