@xyo-network/archivist-storage 2.88.2 → 2.89.0-rc.1
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/browser/StorageArchivist.d.cts.map +1 -1
- package/dist/browser/StorageArchivist.d.mts.map +1 -1
- package/dist/browser/StorageArchivist.d.ts.map +1 -1
- package/dist/browser/index.cjs +26 -10
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +26 -10
- package/dist/browser/index.js.map +1 -1
- package/dist/node/StorageArchivist.d.cts.map +1 -1
- package/dist/node/StorageArchivist.d.mts.map +1 -1
- package/dist/node/StorageArchivist.d.ts.map +1 -1
- package/dist/node/index.cjs +26 -10
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.js +26 -10
- package/dist/node/index.js.map +1 -1
- package/package.json +19 -18
- package/src/StorageArchivist.ts +29 -13
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
|
package/dist/browser/index.cjs
CHANGED
|
@@ -43,7 +43,7 @@ var import_promise = require("@xylabs/promise");
|
|
|
43
43
|
var import_archivist_abstract = require("@xyo-network/archivist-abstract");
|
|
44
44
|
var import_archivist_model = require("@xyo-network/archivist-model");
|
|
45
45
|
var import_hash = require("@xyo-network/hash");
|
|
46
|
-
var
|
|
46
|
+
var import_payload_builder = require("@xyo-network/payload-builder");
|
|
47
47
|
var import_store2 = __toESM(require("store2"), 1);
|
|
48
48
|
var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
|
|
49
49
|
var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist {
|
|
@@ -108,8 +108,16 @@ var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist
|
|
|
108
108
|
return await super.loadAccount()
|
|
109
109
|
}*/
|
|
110
110
|
allHandler() {
|
|
111
|
+
const found = /* @__PURE__ */ new Set();
|
|
111
112
|
this.logger?.log(`this.storage.length: ${this.storage.length}`);
|
|
112
|
-
return Object.entries(this.storage.getAll()).map(([, value]) => value)
|
|
113
|
+
return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
|
|
114
|
+
if (found.has(payload.$hash)) {
|
|
115
|
+
return false;
|
|
116
|
+
} else {
|
|
117
|
+
found.add(payload.$hash);
|
|
118
|
+
return true;
|
|
119
|
+
}
|
|
120
|
+
});
|
|
113
121
|
}
|
|
114
122
|
clearHandler() {
|
|
115
123
|
this.logger?.log(`this.storage.length: ${this.storage.length}`);
|
|
@@ -147,19 +155,27 @@ var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist
|
|
|
147
155
|
return deletedPairs.map(([hash]) => hash);
|
|
148
156
|
}
|
|
149
157
|
getHandler(hashes) {
|
|
158
|
+
const found = /* @__PURE__ */ new Set();
|
|
150
159
|
return (0, import_lodash.compact)(hashes.map((hash) => {
|
|
151
160
|
return this.storage.get(hash);
|
|
152
|
-
}))
|
|
161
|
+
})).filter((payload) => {
|
|
162
|
+
if (found.has(payload.$hash)) {
|
|
163
|
+
return false;
|
|
164
|
+
} else {
|
|
165
|
+
found.add(payload.$hash);
|
|
166
|
+
return true;
|
|
167
|
+
}
|
|
168
|
+
});
|
|
153
169
|
}
|
|
154
170
|
async insertHandler(payloads) {
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
const
|
|
158
|
-
const value = JSON.stringify(wrapper.payload());
|
|
171
|
+
const pairs = await import_payload_builder.PayloadBuilder.hashPairs(payloads);
|
|
172
|
+
const resultPayloads = pairs.map(([payload, hash]) => {
|
|
173
|
+
const value = JSON.stringify(payload);
|
|
159
174
|
(0, import_assert.assertEx)(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
|
|
160
|
-
this.storage.set(hash,
|
|
161
|
-
|
|
162
|
-
|
|
175
|
+
this.storage.set(hash, payload);
|
|
176
|
+
this.storage.set(payload.$hash, payload);
|
|
177
|
+
return payload;
|
|
178
|
+
});
|
|
163
179
|
return resultPayloads;
|
|
164
180
|
}
|
|
165
181
|
saveAccount() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll()).map(([, value]) => value)\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n )\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const resultPayloads = await Promise.all(\n payloads.map(async (payload) => {\n const wrapper = PayloadWrapper.wrap(payload)\n const hash = await wrapper.hashAsync()\n const value = JSON.stringify(wrapper.payload())\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, wrapper.payload())\n return wrapper.payload()\n }),\n )\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":"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","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n const found = new Set<string>()\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll())\n .map(([, value]) => value)\n .filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n const found = new Set<string>()\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n ).filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const pairs = await PayloadBuilder.hashPairs(payloads)\n const resultPayloads = pairs.map(([payload, hash]) => {\n const value = JSON.stringify(payload)\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, payload)\n this.storage.set(payload.$hash, payload)\n return payload\n })\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;ACAA,oBAAyB;AACzB,oBAAwB;AACxB,qBAAuD;AACvD,gCAAkC;AAClC,6BAWO;AAEP,kBAA8B;AAE9B,6BAA+B;AAE/B,oBAAiC;AAG1B,IAAMA,+BAA6D;AAYnE,IAAMC,mBAAN,cAIGC,4CAAAA;EAxCV,OAwCUA;;;EAGR,OAAgBC,gBAAgB;IAACH;;EAEzBI;EACAC;EAER,IAAIC,aAAa;AACf,WAAO,KAAKC,QAAQD,cAAc;EACpC;EAEA,IAAIE,eAAe;AACjB,WAAO,KAAKD,QAAQC,gBAAgB;EACtC;EAEA,IAAIC,YAAY;AACd,WAAO,KAAKF,QAAQE,aAAa;EACnC;EAEA,IAAIC,iBAAiB;AACnB,WAAO,KAAKH,QAAQG,kBAAkB;EACxC;EAEA,IAAaC,UAAoB;AAC/B,WAAO;MACLC;MACAC;MACAC;MACAC;MACAC;SACG,MAAML;;EAEb;EAEA,IAAIM,OAAO;AACT,WAAO,KAAKV,QAAQU,QAAQ;EAC9B;;EAGA,IAAYC,iBAA4B;AACtC,SAAKd,kBAAkB,KAAKC,YAAYc,cAAAA,QAAM,KAAKF,IAAI,EAAER,UAAU,GAAG,KAAKA,SAAS,UAAU;AAC9F,WAAO,KAAKL;EACd;;EAGA,IAAYgB,UAAqB;AAC/B,SAAKf,WAAW,KAAKA,YAAYc,cAAAA,QAAM,KAAKF,IAAI,EAAER,UAAU,KAAKA,SAAS;AAC1E,WAAO,KAAKJ;EACd;;;;;;;;;;;;;;;;;;EAoBmBgB,aAAuC;AACxD,UAAMC,QAAQ,oBAAIC,IAAAA;AAClB,SAAKC,QAAQC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM,EAAE;AAC9D,WAAOC,OAAOC,QAAQ,KAAKR,QAAQS,OAAM,CAAA,EACtCC,IAAI,CAAC,CAAA,EAAGC,KAAAA,MAAWA,KAAAA,EACnBC,OAAO,CAACC,YAAAA;AACP,UAAIX,MAAMY,IAAID,QAAQE,KAAK,GAAG;AAC5B,eAAO;MACT,OAAO;AACLb,cAAMc,IAAIH,QAAQE,KAAK;AACvB,eAAO;MACT;IACF,CAAA;EACJ;EAEmBE,eAAqC;AACtD,SAAKb,QAAQC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM,EAAE;AAC9D,SAAKN,QAAQkB,MAAK;AAClB,WAAO,KAAKC,KAAK,WAAW;MAAEC,QAAQ;IAAK,CAAA;EAC7C;EAEA,MAAyBC,gBAAyC;AAChE,SAAKjB,QAAQC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM,EAAE;AAC9D,UAAMgB,WAAW,MAAM,KAAKC,IAAG;AAC/BC,gCAASF,SAAShB,SAAS,GAAG,mBAAA;AAC9B,UAAMmB,UAAU,MAAMC,QAAQC,eAC5BC,uBACErB,OAAOsB,QAAQ,MAAM,KAAKC,QAAO,GAAIC,UAAU,CAAA,CAAE,GAAGrB,IAAI,OAAOsB,WAAAA;AAC7D,YAAMC,eAAqC;QACzCC,QAAQvC;MACV;AACA,YAAMwC,QAAQ,MAAM,KAAKC,UAAUH,cAAcX,QAAAA;AACjD,cAAQ,MAAMU,QAAQG,MAAMA,MAAM,CAAA,GAAIA,MAAM,CAAA,CAAE,KAAK,CAAA;IACrD,CAAA,CAAA,CAAA;AAIJ,UAAM,KAAKjB,MAAK;AAChB,eAAOU,uBAAQH,QAAQb,OAAOyB,wBAAAA,EAAW3B,IAAI,CAAC4B,WAAWA,OAAO3B,KAAK,CAAA;EACvE;EAEA,MAAyB4B,cAAcC,QAAqC;AAC1E,UAAMC,eAAoC,MAAMf,QAAQH,KACrD,MAAM,KAAKmB,IAAIF,MAAAA,GAAS9B,IAAgC,OAAOG,YAAY;MAAC,MAAM8B,0BAAcC,UAAU/B,OAAAA;MAAUA;KAAQ,CAAA;AAE/H,UAAMgC,mBAAoCjB,uBACxC,MAAMF,QAAQH,IACZkB,aAAa/B,IAAmC,CAAC,CAACoC,MAAMjC,OAAAA,MAAQ;AAC9D,WAAKb,QAAQ+C,OAAOD,IAAAA;AACpB,aAAO;QAACA;QAAMjC;;IAChB,CAAA,CAAA,CAAA;AAGJ,WAAOgC,aAAanC,IAAI,CAAC,CAACoC,IAAAA,MAAUA,IAAAA;EACtC;EAEmBE,WAAWR,QAAyC;AACrE,UAAMtC,QAAQ,oBAAIC,IAAAA;AAClB,eAAOyB,uBACLY,OAAO9B,IAAI,CAACoC,SAAAA;AACV,aAAO,KAAK9C,QAAQ0C,IAAII,IAAAA;IAC1B,CAAA,CAAA,EACAlC,OAAO,CAACC,YAAAA;AACR,UAAIX,MAAMY,IAAID,QAAQE,KAAK,GAAG;AAC5B,eAAO;MACT,OAAO;AACLb,cAAMc,IAAIH,QAAQE,KAAK;AACvB,eAAO;MACT;IACF,CAAA;EACF;EAEA,MAAyBkC,cAAc3B,UAAyC;AAC9E,UAAM4B,QAAQ,MAAMC,sCAAeC,UAAU9B,QAAAA;AAC7C,UAAM+B,iBAAiBH,MAAMxC,IAAI,CAAC,CAACG,SAASiC,IAAAA,MAAK;AAC/C,YAAMnC,QAAQ2C,KAAKC,UAAU1C,OAAAA;AAC7BW,kCAASb,MAAML,SAAS,KAAKlB,cAAc,sBAAsB0D,IAAAA,KAASnC,MAAML,MAAM,GAAG;AACzF,WAAKN,QAAQwD,IAAIV,MAAMjC,OAAAA;AACvB,WAAKb,QAAQwD,IAAI3C,QAAQE,OAAOF,OAAAA;AAChC,aAAOA;IACT,CAAA;AACA,WAAOwC;EACT;EAEUI,cAAc;AACtB,QAAI,KAAKnE,gBAAgB;AACvB,YAAMoE,UAAU,KAAKA;AACrB,WAAKtD,QAAQC,IAAIqD,QAAQC,OAAO;AAChC,WAAK7D,eAAe0D,IAAI,cAAcE,QAAQE,QAAQC,GAAG;IAC3D;EACF;EAEA,MAAyBC,eAAe;AACtC,UAAM,MAAMA,aAAAA;AACZ,SAAKL,YAAW;AAChB,WAAO;EACT;AACF;","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","payloadPairs","get","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
|
package/dist/browser/index.js
CHANGED
|
@@ -8,7 +8,7 @@ import { fulfilled } from "@xylabs/promise";
|
|
|
8
8
|
import { AbstractArchivist } from "@xyo-network/archivist-abstract";
|
|
9
9
|
import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema } from "@xyo-network/archivist-model";
|
|
10
10
|
import { PayloadHasher } from "@xyo-network/hash";
|
|
11
|
-
import {
|
|
11
|
+
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
12
12
|
import store from "store2";
|
|
13
13
|
var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
|
|
14
14
|
var StorageArchivist = class extends AbstractArchivist {
|
|
@@ -73,8 +73,16 @@ var StorageArchivist = class extends AbstractArchivist {
|
|
|
73
73
|
return await super.loadAccount()
|
|
74
74
|
}*/
|
|
75
75
|
allHandler() {
|
|
76
|
+
const found = /* @__PURE__ */ new Set();
|
|
76
77
|
this.logger?.log(`this.storage.length: ${this.storage.length}`);
|
|
77
|
-
return Object.entries(this.storage.getAll()).map(([, value]) => value)
|
|
78
|
+
return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
|
|
79
|
+
if (found.has(payload.$hash)) {
|
|
80
|
+
return false;
|
|
81
|
+
} else {
|
|
82
|
+
found.add(payload.$hash);
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
85
|
+
});
|
|
78
86
|
}
|
|
79
87
|
clearHandler() {
|
|
80
88
|
this.logger?.log(`this.storage.length: ${this.storage.length}`);
|
|
@@ -112,19 +120,27 @@ var StorageArchivist = class extends AbstractArchivist {
|
|
|
112
120
|
return deletedPairs.map(([hash]) => hash);
|
|
113
121
|
}
|
|
114
122
|
getHandler(hashes) {
|
|
123
|
+
const found = /* @__PURE__ */ new Set();
|
|
115
124
|
return compact(hashes.map((hash) => {
|
|
116
125
|
return this.storage.get(hash);
|
|
117
|
-
}))
|
|
126
|
+
})).filter((payload) => {
|
|
127
|
+
if (found.has(payload.$hash)) {
|
|
128
|
+
return false;
|
|
129
|
+
} else {
|
|
130
|
+
found.add(payload.$hash);
|
|
131
|
+
return true;
|
|
132
|
+
}
|
|
133
|
+
});
|
|
118
134
|
}
|
|
119
135
|
async insertHandler(payloads) {
|
|
120
|
-
const
|
|
121
|
-
|
|
122
|
-
const
|
|
123
|
-
const value = JSON.stringify(wrapper.payload());
|
|
136
|
+
const pairs = await PayloadBuilder.hashPairs(payloads);
|
|
137
|
+
const resultPayloads = pairs.map(([payload, hash]) => {
|
|
138
|
+
const value = JSON.stringify(payload);
|
|
124
139
|
assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
|
|
125
|
-
this.storage.set(hash,
|
|
126
|
-
|
|
127
|
-
|
|
140
|
+
this.storage.set(hash, payload);
|
|
141
|
+
this.storage.set(payload.$hash, payload);
|
|
142
|
+
return payload;
|
|
143
|
+
});
|
|
128
144
|
return resultPayloads;
|
|
129
145
|
}
|
|
130
146
|
saveAccount() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll()).map(([, value]) => value)\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n )\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const resultPayloads = await Promise.all(\n payloads.map(async (payload) => {\n const wrapper = PayloadWrapper.wrap(payload)\n const hash = await wrapper.hashAsync()\n const value = JSON.stringify(wrapper.payload())\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, wrapper.payload())\n return wrapper.payload()\n }),\n )\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadHasher","PayloadWrapper","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
|
|
1
|
+
{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n const found = new Set<string>()\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll())\n .map(([, value]) => value)\n .filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n const found = new Set<string>()\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n ).filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const pairs = await PayloadBuilder.hashPairs(payloads)\n const resultPayloads = pairs.map(([payload, hash]) => {\n const value = JSON.stringify(payload)\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, payload)\n this.storage.set(payload.$hash, payload)\n return payload\n })\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadHasher","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","payloadPairs","get","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
|
package/dist/node/index.cjs
CHANGED
|
@@ -48,7 +48,7 @@ var import_promise = require("@xylabs/promise");
|
|
|
48
48
|
var import_archivist_abstract = require("@xyo-network/archivist-abstract");
|
|
49
49
|
var import_archivist_model = require("@xyo-network/archivist-model");
|
|
50
50
|
var import_hash = require("@xyo-network/hash");
|
|
51
|
-
var
|
|
51
|
+
var import_payload_builder = require("@xyo-network/payload-builder");
|
|
52
52
|
var import_store2 = __toESM(require("store2"), 1);
|
|
53
53
|
var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
|
|
54
54
|
var _StorageArchivist = class _StorageArchivist extends import_archivist_abstract.AbstractArchivist {
|
|
@@ -113,8 +113,16 @@ var _StorageArchivist = class _StorageArchivist extends import_archivist_abstrac
|
|
|
113
113
|
}*/
|
|
114
114
|
allHandler() {
|
|
115
115
|
var _a;
|
|
116
|
+
const found = /* @__PURE__ */ new Set();
|
|
116
117
|
(_a = this.logger) == null ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
|
|
117
|
-
return Object.entries(this.storage.getAll()).map(([, value]) => value)
|
|
118
|
+
return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
|
|
119
|
+
if (found.has(payload.$hash)) {
|
|
120
|
+
return false;
|
|
121
|
+
} else {
|
|
122
|
+
found.add(payload.$hash);
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
});
|
|
118
126
|
}
|
|
119
127
|
clearHandler() {
|
|
120
128
|
var _a;
|
|
@@ -155,19 +163,27 @@ var _StorageArchivist = class _StorageArchivist extends import_archivist_abstrac
|
|
|
155
163
|
return deletedPairs.map(([hash]) => hash);
|
|
156
164
|
}
|
|
157
165
|
getHandler(hashes) {
|
|
166
|
+
const found = /* @__PURE__ */ new Set();
|
|
158
167
|
return (0, import_lodash.compact)(hashes.map((hash) => {
|
|
159
168
|
return this.storage.get(hash);
|
|
160
|
-
}))
|
|
169
|
+
})).filter((payload) => {
|
|
170
|
+
if (found.has(payload.$hash)) {
|
|
171
|
+
return false;
|
|
172
|
+
} else {
|
|
173
|
+
found.add(payload.$hash);
|
|
174
|
+
return true;
|
|
175
|
+
}
|
|
176
|
+
});
|
|
161
177
|
}
|
|
162
178
|
async insertHandler(payloads) {
|
|
163
|
-
const
|
|
164
|
-
|
|
165
|
-
const
|
|
166
|
-
const value = JSON.stringify(wrapper.payload());
|
|
179
|
+
const pairs = await import_payload_builder.PayloadBuilder.hashPairs(payloads);
|
|
180
|
+
const resultPayloads = pairs.map(([payload, hash]) => {
|
|
181
|
+
const value = JSON.stringify(payload);
|
|
167
182
|
(0, import_assert.assertEx)(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
|
|
168
|
-
this.storage.set(hash,
|
|
169
|
-
|
|
170
|
-
|
|
183
|
+
this.storage.set(hash, payload);
|
|
184
|
+
this.storage.set(payload.$hash, payload);
|
|
185
|
+
return payload;
|
|
186
|
+
});
|
|
171
187
|
return resultPayloads;
|
|
172
188
|
}
|
|
173
189
|
saveAccount() {
|
package/dist/node/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll()).map(([, value]) => value)\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n )\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const resultPayloads = await Promise.all(\n payloads.map(async (payload) => {\n const wrapper = PayloadWrapper.wrap(payload)\n const hash = await wrapper.hashAsync()\n const value = JSON.stringify(wrapper.payload())\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, wrapper.payload())\n return wrapper.payload()\n }),\n )\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":"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","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","_a","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas"]}
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n const found = new Set<string>()\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll())\n .map(([, value]) => value)\n .filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n const found = new Set<string>()\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n ).filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const pairs = await PayloadBuilder.hashPairs(payloads)\n const resultPayloads = pairs.map(([payload, hash]) => {\n const value = JSON.stringify(payload)\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, payload)\n this.storage.set(payload.$hash, payload)\n return payload\n })\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":"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","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","_a","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","payloadPairs","get","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas"]}
|
package/dist/node/index.js
CHANGED
|
@@ -13,7 +13,7 @@ import { fulfilled } from "@xylabs/promise";
|
|
|
13
13
|
import { AbstractArchivist } from "@xyo-network/archivist-abstract";
|
|
14
14
|
import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema } from "@xyo-network/archivist-model";
|
|
15
15
|
import { PayloadHasher } from "@xyo-network/hash";
|
|
16
|
-
import {
|
|
16
|
+
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
17
17
|
import store from "store2";
|
|
18
18
|
var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
|
|
19
19
|
var _StorageArchivist = class _StorageArchivist extends AbstractArchivist {
|
|
@@ -78,8 +78,16 @@ var _StorageArchivist = class _StorageArchivist extends AbstractArchivist {
|
|
|
78
78
|
}*/
|
|
79
79
|
allHandler() {
|
|
80
80
|
var _a;
|
|
81
|
+
const found = /* @__PURE__ */ new Set();
|
|
81
82
|
(_a = this.logger) == null ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
|
|
82
|
-
return Object.entries(this.storage.getAll()).map(([, value]) => value)
|
|
83
|
+
return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
|
|
84
|
+
if (found.has(payload.$hash)) {
|
|
85
|
+
return false;
|
|
86
|
+
} else {
|
|
87
|
+
found.add(payload.$hash);
|
|
88
|
+
return true;
|
|
89
|
+
}
|
|
90
|
+
});
|
|
83
91
|
}
|
|
84
92
|
clearHandler() {
|
|
85
93
|
var _a;
|
|
@@ -120,19 +128,27 @@ var _StorageArchivist = class _StorageArchivist extends AbstractArchivist {
|
|
|
120
128
|
return deletedPairs.map(([hash]) => hash);
|
|
121
129
|
}
|
|
122
130
|
getHandler(hashes) {
|
|
131
|
+
const found = /* @__PURE__ */ new Set();
|
|
123
132
|
return compact(hashes.map((hash) => {
|
|
124
133
|
return this.storage.get(hash);
|
|
125
|
-
}))
|
|
134
|
+
})).filter((payload) => {
|
|
135
|
+
if (found.has(payload.$hash)) {
|
|
136
|
+
return false;
|
|
137
|
+
} else {
|
|
138
|
+
found.add(payload.$hash);
|
|
139
|
+
return true;
|
|
140
|
+
}
|
|
141
|
+
});
|
|
126
142
|
}
|
|
127
143
|
async insertHandler(payloads) {
|
|
128
|
-
const
|
|
129
|
-
|
|
130
|
-
const
|
|
131
|
-
const value = JSON.stringify(wrapper.payload());
|
|
144
|
+
const pairs = await PayloadBuilder.hashPairs(payloads);
|
|
145
|
+
const resultPayloads = pairs.map(([payload, hash]) => {
|
|
146
|
+
const value = JSON.stringify(payload);
|
|
132
147
|
assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
|
|
133
|
-
this.storage.set(hash,
|
|
134
|
-
|
|
135
|
-
|
|
148
|
+
this.storage.set(hash, payload);
|
|
149
|
+
this.storage.set(payload.$hash, payload);
|
|
150
|
+
return payload;
|
|
151
|
+
});
|
|
136
152
|
return resultPayloads;
|
|
137
153
|
}
|
|
138
154
|
saveAccount() {
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll()).map(([, value]) => value)\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n )\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const resultPayloads = await Promise.all(\n payloads.map(async (payload) => {\n const wrapper = PayloadWrapper.wrap(payload)\n const hash = await wrapper.hashAsync()\n const value = JSON.stringify(wrapper.payload())\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, wrapper.payload())\n return wrapper.payload()\n }),\n )\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadHasher","PayloadWrapper","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","_a","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas"]}
|
|
1
|
+
{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfig,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuery,\n ArchivistInsertQuerySchema,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n persistAccount?: boolean\n schema: StorageArchivistConfigSchema\n type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n >\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance\n{\n static override configSchemas = [StorageArchivistConfigSchema]\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries() {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize() {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace() {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n get persistAccount() {\n return this.config?.persistAccount ?? false\n }\n\n override get queries(): string[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ...super.queries,\n ]\n }\n\n get type() {\n return this.config?.type ?? 'local'\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get privateStorage(): StoreBase {\n this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n return this._privateStorage\n }\n\n /* This has to be a getter so that it can access it during construction */\n private get storage(): StoreBase {\n this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n return this._storage\n }\n\n /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n if (!this._account) {\n if (persistAccount) {\n const privateKey = privateStorage?.get('privateKey')\n if (privateKey) {\n try {\n this._account = await Account.create({ privateKey })\n return this._account\n } catch (ex) {\n console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n privateStorage?.remove('privateKey')\n }\n }\n }\n }\n return await super.loadAccount()\n }*/\n\n protected override allHandler(): PromisableArray<Payload> {\n const found = new Set<string>()\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n return Object.entries(this.storage.getAll())\n .map(([, value]) => value)\n .filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override clearHandler(): void | Promise<void> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n this.storage.clear()\n return this.emit('cleared', { module: this })\n }\n\n protected override async commitHandler(): Promise<BoundWitness[]> {\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n const payloads = await this.all()\n assertEx(payloads.length > 0, 'Nothing to commit')\n const settled = await Promise.allSettled(\n compact(\n Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {\n const queryPayload: ArchivistInsertQuery = {\n schema: ArchivistInsertQuerySchema,\n }\n const query = await this.bindQuery(queryPayload, payloads)\n return (await parent?.query(query[0], query[1]))?.[0]\n }),\n ),\n )\n // TODO - rather than clear, delete the payloads that come back as successfully inserted\n await this.clear()\n return compact(settled.filter(fulfilled).map((result) => result.value))\n }\n\n protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n const payloadPairs: [string, Payload][] = await Promise.all(\n (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n const deletedPairs: [string, Payload][] = compact(\n await Promise.all(\n payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n this.storage.remove(hash)\n return [hash, payload]\n }),\n ),\n )\n return deletedPairs.map(([hash]) => hash)\n }\n\n protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n const found = new Set<string>()\n return compact(\n hashes.map((hash) => {\n return this.storage.get(hash)\n }),\n ).filter((payload) => {\n if (found.has(payload.$hash)) {\n return false\n } else {\n found.add(payload.$hash)\n return true\n }\n })\n }\n\n protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n const pairs = await PayloadBuilder.hashPairs(payloads)\n const resultPayloads = pairs.map(([payload, hash]) => {\n const value = JSON.stringify(payload)\n assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n this.storage.set(hash, payload)\n this.storage.set(payload.$hash, payload)\n return payload\n })\n return resultPayloads\n }\n\n protected saveAccount() {\n if (this.persistAccount) {\n const account = this.account\n this.logger?.log(account.address)\n this.privateStorage.set('privateKey', account.private.hex)\n }\n }\n\n protected override async startHandler() {\n await super.startHandler()\n this.saveAccount()\n return true\n }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadHasher","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","_a","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","payloadPairs","get","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas"]}
|
package/package.json
CHANGED
|
@@ -10,27 +10,27 @@
|
|
|
10
10
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@xylabs/assert": "^2.13.
|
|
14
|
-
"@xylabs/lodash": "^2.13.
|
|
15
|
-
"@xylabs/promise": "^2.13.
|
|
16
|
-
"@xyo-network/archivist-abstract": "~2.
|
|
17
|
-
"@xyo-network/archivist-model": "~2.
|
|
18
|
-
"@xyo-network/boundwitness-model": "~2.
|
|
19
|
-
"@xyo-network/hash": "~2.
|
|
20
|
-
"@xyo-network/module-model": "~2.
|
|
21
|
-
"@xyo-network/payload-
|
|
22
|
-
"@xyo-network/payload-
|
|
13
|
+
"@xylabs/assert": "^2.13.29",
|
|
14
|
+
"@xylabs/lodash": "^2.13.29",
|
|
15
|
+
"@xylabs/promise": "^2.13.29",
|
|
16
|
+
"@xyo-network/archivist-abstract": "~2.89.0-rc.1",
|
|
17
|
+
"@xyo-network/archivist-model": "~2.89.0-rc.1",
|
|
18
|
+
"@xyo-network/boundwitness-model": "~2.89.0-rc.1",
|
|
19
|
+
"@xyo-network/hash": "~2.89.0-rc.1",
|
|
20
|
+
"@xyo-network/module-model": "~2.89.0-rc.1",
|
|
21
|
+
"@xyo-network/payload-builder": "~2.89.0-rc.1",
|
|
22
|
+
"@xyo-network/payload-model": "~2.89.0-rc.1",
|
|
23
23
|
"store2": "^2.14.2"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@xylabs/delay": "^2.13.
|
|
26
|
+
"@xylabs/delay": "^2.13.29",
|
|
27
27
|
"@xylabs/ts-scripts-yarn3": "^3.2.42",
|
|
28
28
|
"@xylabs/tsconfig": "^3.2.42",
|
|
29
|
-
"@xyo-network/account": "~2.
|
|
30
|
-
"@xyo-network/archivist-memory": "~2.
|
|
31
|
-
"@xyo-network/boundwitness-builder": "~2.
|
|
32
|
-
"@xyo-network/id-payload-plugin": "~2.
|
|
33
|
-
"@xyo-network/node-memory": "~2.
|
|
29
|
+
"@xyo-network/account": "~2.89.0-rc.1",
|
|
30
|
+
"@xyo-network/archivist-memory": "~2.89.0-rc.1",
|
|
31
|
+
"@xyo-network/boundwitness-builder": "~2.89.0-rc.1",
|
|
32
|
+
"@xyo-network/id-payload-plugin": "~2.89.0-rc.1",
|
|
33
|
+
"@xyo-network/node-memory": "~2.89.0-rc.1",
|
|
34
34
|
"typescript": "^5.3.3"
|
|
35
35
|
},
|
|
36
36
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
@@ -72,6 +72,7 @@
|
|
|
72
72
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
|
|
73
73
|
},
|
|
74
74
|
"sideEffects": false,
|
|
75
|
-
"version": "2.
|
|
76
|
-
"type": "module"
|
|
75
|
+
"version": "2.89.0-rc.1",
|
|
76
|
+
"type": "module",
|
|
77
|
+
"stableVersion": "2.88.3"
|
|
77
78
|
}
|
package/src/StorageArchivist.ts
CHANGED
|
@@ -17,8 +17,8 @@ import {
|
|
|
17
17
|
import { BoundWitness } from '@xyo-network/boundwitness-model'
|
|
18
18
|
import { PayloadHasher } from '@xyo-network/hash'
|
|
19
19
|
import { AnyConfigSchema } from '@xyo-network/module-model'
|
|
20
|
+
import { PayloadBuilder } from '@xyo-network/payload-builder'
|
|
20
21
|
import { Payload } from '@xyo-network/payload-model'
|
|
21
|
-
import { PayloadWrapper } from '@xyo-network/payload-wrapper'
|
|
22
22
|
import store, { StoreBase } from 'store2'
|
|
23
23
|
|
|
24
24
|
export type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'
|
|
@@ -108,8 +108,18 @@ export class StorageArchivist<
|
|
|
108
108
|
}*/
|
|
109
109
|
|
|
110
110
|
protected override allHandler(): PromisableArray<Payload> {
|
|
111
|
+
const found = new Set<string>()
|
|
111
112
|
this.logger?.log(`this.storage.length: ${this.storage.length}`)
|
|
112
|
-
return Object.entries(this.storage.getAll())
|
|
113
|
+
return Object.entries(this.storage.getAll())
|
|
114
|
+
.map(([, value]) => value)
|
|
115
|
+
.filter((payload) => {
|
|
116
|
+
if (found.has(payload.$hash)) {
|
|
117
|
+
return false
|
|
118
|
+
} else {
|
|
119
|
+
found.add(payload.$hash)
|
|
120
|
+
return true
|
|
121
|
+
}
|
|
122
|
+
})
|
|
113
123
|
}
|
|
114
124
|
|
|
115
125
|
protected override clearHandler(): void | Promise<void> {
|
|
@@ -154,24 +164,30 @@ export class StorageArchivist<
|
|
|
154
164
|
}
|
|
155
165
|
|
|
156
166
|
protected override getHandler(hashes: string[]): Promisable<Payload[]> {
|
|
167
|
+
const found = new Set<string>()
|
|
157
168
|
return compact(
|
|
158
169
|
hashes.map((hash) => {
|
|
159
170
|
return this.storage.get(hash)
|
|
160
171
|
}),
|
|
161
|
-
)
|
|
172
|
+
).filter((payload) => {
|
|
173
|
+
if (found.has(payload.$hash)) {
|
|
174
|
+
return false
|
|
175
|
+
} else {
|
|
176
|
+
found.add(payload.$hash)
|
|
177
|
+
return true
|
|
178
|
+
}
|
|
179
|
+
})
|
|
162
180
|
}
|
|
163
181
|
|
|
164
182
|
protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {
|
|
165
|
-
const
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
}),
|
|
174
|
-
)
|
|
183
|
+
const pairs = await PayloadBuilder.hashPairs(payloads)
|
|
184
|
+
const resultPayloads = pairs.map(([payload, hash]) => {
|
|
185
|
+
const value = JSON.stringify(payload)
|
|
186
|
+
assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)
|
|
187
|
+
this.storage.set(hash, payload)
|
|
188
|
+
this.storage.set(payload.$hash, payload)
|
|
189
|
+
return payload
|
|
190
|
+
})
|
|
175
191
|
return resultPayloads
|
|
176
192
|
}
|
|
177
193
|
|