@xyo-network/archivist-storage 8.1.2 → 9.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -15,7 +15,11 @@ export declare const StorageArchivistConfigZod: z.ZodMiniObject<Omit<(typeof Arc
|
|
|
15
15
|
maxEntrySize: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
|
|
16
16
|
namespace: z.ZodMiniOptional<z.ZodMiniString<string>>;
|
|
17
17
|
schema: z.ZodMiniLiteral<StorageArchivistConfigSchema>;
|
|
18
|
-
type: z.ZodMiniOptional<z.ZodMiniUnion<readonly [
|
|
18
|
+
type: z.ZodMiniOptional<z.ZodMiniUnion<readonly [
|
|
19
|
+
z.ZodMiniLiteral<'local'>,
|
|
20
|
+
z.ZodMiniLiteral<'session'>,
|
|
21
|
+
z.ZodMiniLiteral<'page'>
|
|
22
|
+
]>>;
|
|
19
23
|
}, z.core.$strip>;
|
|
20
24
|
export type StorageArchivistConfigBase = z.infer<typeof StorageArchivistConfigZod>;
|
|
21
25
|
export declare const isStorageArchivistConfig: ReturnType<typeof zodIsFactory<StorageArchivistConfigBase>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,
|
|
1
|
+
{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"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"}
|
package/dist/neutral/index.mjs
CHANGED
|
@@ -26,7 +26,11 @@ var StorageArchivistConfigZod = z.extend(ArchivistConfigZod, {
|
|
|
26
26
|
maxEntrySize: z.optional(z.number()),
|
|
27
27
|
namespace: z.optional(z.string()),
|
|
28
28
|
schema: z.literal(StorageArchivistConfigSchema),
|
|
29
|
-
type: z.optional(z.union([
|
|
29
|
+
type: z.optional(z.union([
|
|
30
|
+
z.literal("local"),
|
|
31
|
+
z.literal("session"),
|
|
32
|
+
z.literal("page")
|
|
33
|
+
]))
|
|
30
34
|
});
|
|
31
35
|
var isStorageArchivistConfig = zodIsFactory(StorageArchivistConfigZod);
|
|
32
36
|
var asStorageArchivistConfig = zodAsFactory(StorageArchivistConfigZod, "asStorageArchivistConfig");
|
|
@@ -119,7 +123,11 @@ var StorageArchivist = class extends AbstractArchivist {
|
|
|
119
123
|
for (const parent of parents) {
|
|
120
124
|
const queryPayload = { schema: ArchivistInsertQuerySchema };
|
|
121
125
|
const query = await this.bindQuery(queryPayload, payloads);
|
|
122
|
-
const [
|
|
126
|
+
const [
|
|
127
|
+
receipt,
|
|
128
|
+
inserted,
|
|
129
|
+
errors
|
|
130
|
+
] = await parent.query(query[0], query[1]);
|
|
123
131
|
if (errors.length > 0) {
|
|
124
132
|
everyParentCommitted = false;
|
|
125
133
|
continue;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/StorageArchivist.ts"],
|
|
4
|
-
"sourcesContent": ["import type {\n Hash, Hex, Promisable, PromisableArray,\n} from '@ariestools/sdk'\nimport {\n assertEx, exists,\n zodAsFactory, zodIsFactory, zodToFactory,\n} from '@ariestools/sdk'\nimport { AbstractArchivist, StorageClassLabel } from '@xyo-network/sdk/archivist-abstract'\nimport type {\n ArchivistConfig,\n ArchivistInsertQuery,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistNextOptions,\n ArchivistParams,\n} from '@xyo-network/sdk/archivist-model'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfigZod,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistNextQuerySchema,\n} from '@xyo-network/sdk/archivist-model'\nimport type { AnyConfigSchema } from '@xyo-network/sdk/module-model'\nimport type {\n BoundWitness, Payload, Schema, WithStorageMeta,\n} from '@xyo-network/sdk-protocol'\nimport { asSchema, PayloadBuilder } from '@xyo-network/sdk-protocol'\nimport type { StoreBase, StoreType } from 'store2'\nimport store from 'store2'\nimport * as z from 'zod/mini'\n\nconst storeTypes = store as unknown as StoreType\n\nexport const StorageArchivistConfigSchema: 'network.xyo.archivist.storage.config' & {\n readonly __schema: true\n} = asSchema('network.xyo.archivist.storage.config', true)\nexport type StorageArchivistConfigSchema = typeof StorageArchivistConfigSchema\n\nexport const StorageArchivistConfigZod: z.ZodMiniObject<\n & Omit<(typeof ArchivistConfigZod)['shape'], 'schema'>\n & {\n maxEntries: z.ZodMiniOptional<z.ZodMiniNumber<number>>\n maxEntrySize: z.ZodMiniOptional<z.ZodMiniNumber<number>>\n namespace: z.ZodMiniOptional<z.ZodMiniString<string>>\n schema: z.ZodMiniLiteral<StorageArchivistConfigSchema>\n type: z.ZodMiniOptional<z.ZodMiniUnion<readonly [z.ZodMiniLiteral<'local'>, z.ZodMiniLiteral<'session'>, z.ZodMiniLiteral<'page'>]>>\n },\n z.core.$strip\n> = z.extend(ArchivistConfigZod, {\n maxEntries: z.optional(z.number()),\n maxEntrySize: z.optional(z.number()),\n namespace: z.optional(z.string()),\n schema: z.literal(StorageArchivistConfigSchema),\n type: z.optional(z.union([z.literal('local'), z.literal('session'), z.literal('page')])),\n})\n\nexport type StorageArchivistConfigBase = z.infer<typeof StorageArchivistConfigZod>\n\nexport const isStorageArchivistConfig: ReturnType<typeof zodIsFactory<StorageArchivistConfigBase>> = zodIsFactory(StorageArchivistConfigZod)\nexport const asStorageArchivistConfig: ReturnType<typeof zodAsFactory<StorageArchivistConfigBase>> = zodAsFactory(StorageArchivistConfigZod, 'asStorageArchivistConfig')\nexport const toStorageArchivistConfig: ReturnType<typeof zodToFactory<StorageArchivistConfigBase>> = zodToFactory(StorageArchivistConfigZod, 'toStorageArchivistConfig')\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n type?: 'local' | 'session' | 'page'\n}, StorageArchivistConfigSchema>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\n\ninterface CommitAcknowledgement {\n hash: Hash\n keys: Hash[]\n}\n\nasync function commitAcknowledgement(payload: Payload): Promise<CommitAcknowledgement> {\n const canonical = PayloadBuilder.omitStorageMeta(payload)\n const [hash, dataHash] = await Promise.all([\n PayloadBuilder.hash(canonical),\n PayloadBuilder.dataHash(canonical),\n ])\n return { hash, keys: hash === dataHash ? [hash] : [hash, dataHash] }\n}\n\nfunction intersectAcknowledgements(\n current: ReadonlyMap<Hash, Hash[]>,\n next: ReadonlyMap<Hash, Hash[]>,\n): Map<Hash, Hash[]> {\n const intersection = new Map<Hash, Hash[]>()\n for (const [hash, keys] of current) {\n if (next.has(hash)) intersection.set(hash, keys)\n }\n return intersection\n}\n\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n static override readonly labels: {\n 'network.xyo.storage.class': string\n } = { ...super.labels, [StorageClassLabel]: 'disk' }\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries(): number {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize(): number {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace(): string {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n override get queries(): Schema[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistNextQuerySchema,\n ...super.queries,\n ]\n }\n\n get type(): 'local' | 'session' | 'page' {\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 ?? storeTypes[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 ??= storeTypes[this.type].namespace(this.namespace)\n return this._storage\n }\n\n protected override allHandler(): PromisableArray<WithStorageMeta<Payload>> {\n const found = new Set<string>()\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n const entries: [string, WithStorageMeta<Payload>][] = Object.entries(this.storage.getAll())\n return entries\n .map(([, value]) => value)\n .filter((payload) => {\n if (found.has(payload._dataHash)) {\n return false\n }\n found.add(payload._dataHash)\n return true\n })\n .toSorted(PayloadBuilder.compareStorageMeta)\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', { mod: 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.next({ limit: Number.MAX_SAFE_INTEGER })\n assertEx(payloads.length > 0, () => 'Nothing to commit')\n const pending = new Map<Hash, Hash[]>()\n for (const payload of payloads) {\n const acknowledgement = await commitAcknowledgement(payload)\n pending.set(acknowledgement.hash, acknowledgement.keys)\n }\n const archivistParents = await this.parentArchivists()\n const parents = Object.values(archivistParents.commit ?? {}).filter(exists)\n const receipts: BoundWitness[] = []\n let committed: Map<Hash, Hash[]> | undefined\n let everyParentCommitted = parents.length > 0\n for (const parent of parents) {\n const queryPayload: ArchivistInsertQuery = { schema: ArchivistInsertQuerySchema }\n const query = await this.bindQuery(queryPayload, payloads)\n const [receipt, inserted, errors] = await parent.query(query[0], query[1])\n if (errors.length > 0) {\n everyParentCommitted = false\n continue\n }\n receipts.push(receipt)\n const returned = new Map<Hash, Hash[]>()\n for (const payload of inserted) {\n const acknowledgement = await commitAcknowledgement(payload)\n const keys = pending.get(acknowledgement.hash)\n if (keys) returned.set(acknowledgement.hash, keys)\n }\n committed = committed === undefined ? returned : intersectAcknowledgements(committed, returned)\n }\n if (everyParentCommitted && committed !== undefined && committed.size > 0) {\n await this.deleteWithConfig([...new Set(committed.values().toArray().flat())])\n }\n return receipts\n }\n\n protected override deleteHandler(hashes: Hash[]): WithStorageMeta<Payload>[] {\n return hashes.map((hash) => {\n const payload = this.storage.get(hash) as WithStorageMeta<Payload> | undefined\n if (payload) {\n this.storage.remove(hash)\n }\n return payload\n }).filter(exists)\n }\n\n protected getFromCursor(\n order: 'asc' | 'desc' = 'asc',\n limit = 10,\n cursor?: Hex,\n open?: boolean,\n ): WithStorageMeta[] {\n // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n const all: WithStorageMeta[] = Object.values(this.storage.getAll())\n const payloads: WithStorageMeta[] = all\n .map(value => value)\n .toSorted((item1, item2) => {\n return order === 'asc' ? PayloadBuilder.compareStorageMeta(item1, item2) : PayloadBuilder.compareStorageMeta(item2, item1)\n })\n const index = payloads.findIndex(payload => payload._sequence === cursor)\n if (index !== -1) {\n const offset = open === true ? 1 : 0\n return payloads.slice(index + offset, index + offset + limit)\n }\n return payloads.slice(0, limit)\n }\n\n protected override getHandler(hashes: string[]): Promisable<WithStorageMeta<Payload>[]> {\n return hashes\n .map(hash => this.storage.get(hash) as WithStorageMeta<Payload> | undefined)\n .filter(exists)\n }\n\n protected override insertHandler(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[] {\n return payloads.map((payload) => {\n const value = JSON.stringify(payload)\n // console.log('insert.storagePayloads:', storagePayload)\n assertEx(value.length < this.maxEntrySize, () => `Payload too large [${payload._hash}, ${value.length}]`)\n this.storage.set(payload._hash, payload)\n this.storage.set(payload._dataHash, payload)\n return payload\n })\n }\n\n protected override nextHandler(options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n const {\n limit = 10, cursor, order, open = true,\n } = options ?? {}\n return this.getFromCursor(order, limit, cursor, open)\n }\n\n protected override async startHandler(): Promise<void> {\n await super.startHandler()\n }\n}\n"],
|
|
5
|
-
"mappings": ";
|
|
4
|
+
"sourcesContent": ["import type {\n Hash,\n Hex,\n Promisable,\n PromisableArray,\n} from '@ariestools/sdk'\nimport {\n assertEx,\n exists,\n zodAsFactory,\n zodIsFactory,\n zodToFactory,\n} from '@ariestools/sdk'\nimport { AbstractArchivist, StorageClassLabel } from '@xyo-network/sdk/archivist-abstract'\nimport type {\n ArchivistConfig,\n ArchivistInsertQuery,\n ArchivistInstance,\n ArchivistModuleEventData,\n ArchivistNextOptions,\n ArchivistParams,\n} from '@xyo-network/sdk/archivist-model'\nimport {\n ArchivistAllQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistConfigZod,\n ArchivistDeleteQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistNextQuerySchema,\n} from '@xyo-network/sdk/archivist-model'\nimport type { AnyConfigSchema } from '@xyo-network/sdk/module-model'\nimport type {\n BoundWitness,\n Payload,\n Schema,\n WithStorageMeta,\n} from '@xyo-network/sdk-protocol'\nimport { asSchema, PayloadBuilder } from '@xyo-network/sdk-protocol'\nimport type { StoreBase, StoreType } from 'store2'\nimport store from 'store2'\nimport * as z from 'zod/mini'\n\nconst storeTypes = store as unknown as StoreType\n\nexport const StorageArchivistConfigSchema: 'network.xyo.archivist.storage.config' & {\n readonly __schema: true\n} = asSchema('network.xyo.archivist.storage.config', true)\nexport type StorageArchivistConfigSchema = typeof StorageArchivistConfigSchema\n\nexport const StorageArchivistConfigZod: z.ZodMiniObject<\n & Omit<(typeof ArchivistConfigZod)['shape'], 'schema'>\n & {\n maxEntries: z.ZodMiniOptional<z.ZodMiniNumber<number>>\n maxEntrySize: z.ZodMiniOptional<z.ZodMiniNumber<number>>\n namespace: z.ZodMiniOptional<z.ZodMiniString<string>>\n schema: z.ZodMiniLiteral<StorageArchivistConfigSchema>\n type: z.ZodMiniOptional<z.ZodMiniUnion<readonly [\n z.ZodMiniLiteral<'local'>,\n z.ZodMiniLiteral<'session'>,\n z.ZodMiniLiteral<'page'>,\n ]>>\n },\n z.core.$strip\n> = z.extend(ArchivistConfigZod, {\n maxEntries: z.optional(z.number()),\n maxEntrySize: z.optional(z.number()),\n namespace: z.optional(z.string()),\n schema: z.literal(StorageArchivistConfigSchema),\n type: z.optional(z.union([\n z.literal('local'),\n z.literal('session'),\n z.literal('page'),\n ])),\n})\n\nexport type StorageArchivistConfigBase = z.infer<typeof StorageArchivistConfigZod>\n\nexport const isStorageArchivistConfig: ReturnType<typeof zodIsFactory<StorageArchivistConfigBase>> = zodIsFactory(StorageArchivistConfigZod)\nexport const asStorageArchivistConfig: ReturnType<typeof zodAsFactory<StorageArchivistConfigBase>> = zodAsFactory(StorageArchivistConfigZod, 'asStorageArchivistConfig')\nexport const toStorageArchivistConfig: ReturnType<typeof zodToFactory<StorageArchivistConfigBase>> = zodToFactory(StorageArchivistConfigZod, 'toStorageArchivistConfig')\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n maxEntries?: number\n maxEntrySize?: number\n namespace?: string\n type?: 'local' | 'session' | 'page'\n}, StorageArchivistConfigSchema>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\n\ninterface CommitAcknowledgement {\n hash: Hash\n keys: Hash[]\n}\n\nasync function commitAcknowledgement(payload: Payload): Promise<CommitAcknowledgement> {\n const canonical = PayloadBuilder.omitStorageMeta(payload)\n const [hash, dataHash] = await Promise.all([\n PayloadBuilder.hash(canonical),\n PayloadBuilder.dataHash(canonical),\n ])\n return { hash, keys: hash === dataHash ? [hash] : [hash, dataHash] }\n}\n\nfunction intersectAcknowledgements(\n current: ReadonlyMap<Hash, Hash[]>,\n next: ReadonlyMap<Hash, Hash[]>,\n): Map<Hash, Hash[]> {\n const intersection = new Map<Hash, Hash[]>()\n for (const [hash, keys] of current) {\n if (next.has(hash)) intersection.set(hash, keys)\n }\n return intersection\n}\n\nexport class StorageArchivist<\n TParams extends StorageArchivistParams = StorageArchivistParams,\n TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n extends AbstractArchivist<TParams, TEventData>\n implements ArchivistInstance {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n static override readonly labels: {\n 'network.xyo.storage.class': string\n } = { ...super.labels, [StorageClassLabel]: 'disk' }\n\n private _privateStorage: StoreBase | undefined\n private _storage: StoreBase | undefined\n\n get maxEntries(): number {\n return this.config?.maxEntries ?? 1000\n }\n\n get maxEntrySize(): number {\n return this.config?.maxEntrySize ?? 16_000\n }\n\n get namespace(): string {\n return this.config?.namespace ?? 'xyo-archivist'\n }\n\n override get queries(): Schema[] {\n return [\n ArchivistAllQuerySchema,\n ArchivistDeleteQuerySchema,\n ArchivistClearQuerySchema,\n ArchivistInsertQuerySchema,\n ArchivistCommitQuerySchema,\n ArchivistNextQuerySchema,\n ...super.queries,\n ]\n }\n\n get type(): 'local' | 'session' | 'page' {\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 ?? storeTypes[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 ??= storeTypes[this.type].namespace(this.namespace)\n return this._storage\n }\n\n protected override allHandler(): PromisableArray<WithStorageMeta<Payload>> {\n const found = new Set<string>()\n this.logger?.log(`this.storage.length: ${this.storage.length}`)\n // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n const entries: [string, WithStorageMeta<Payload>][] = Object.entries(this.storage.getAll())\n return entries\n .map(([, value]) => value)\n .filter((payload) => {\n if (found.has(payload._dataHash)) {\n return false\n }\n found.add(payload._dataHash)\n return true\n })\n .toSorted(PayloadBuilder.compareStorageMeta)\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', { mod: 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.next({ limit: Number.MAX_SAFE_INTEGER })\n assertEx(payloads.length > 0, () => 'Nothing to commit')\n const pending = new Map<Hash, Hash[]>()\n for (const payload of payloads) {\n const acknowledgement = await commitAcknowledgement(payload)\n pending.set(acknowledgement.hash, acknowledgement.keys)\n }\n const archivistParents = await this.parentArchivists()\n const parents = Object.values(archivistParents.commit ?? {}).filter(exists)\n const receipts: BoundWitness[] = []\n let committed: Map<Hash, Hash[]> | undefined\n let everyParentCommitted = parents.length > 0\n for (const parent of parents) {\n const queryPayload: ArchivistInsertQuery = { schema: ArchivistInsertQuerySchema }\n const query = await this.bindQuery(queryPayload, payloads)\n const [\n receipt,\n inserted,\n errors,\n ] = await parent.query(query[0], query[1])\n if (errors.length > 0) {\n everyParentCommitted = false\n continue\n }\n receipts.push(receipt)\n const returned = new Map<Hash, Hash[]>()\n for (const payload of inserted) {\n const acknowledgement = await commitAcknowledgement(payload)\n const keys = pending.get(acknowledgement.hash)\n if (keys) returned.set(acknowledgement.hash, keys)\n }\n committed = committed === undefined ? returned : intersectAcknowledgements(committed, returned)\n }\n if (everyParentCommitted && committed !== undefined && committed.size > 0) {\n await this.deleteWithConfig([...new Set(committed.values().toArray().flat())])\n }\n return receipts\n }\n\n protected override deleteHandler(hashes: Hash[]): WithStorageMeta<Payload>[] {\n return hashes.map((hash) => {\n const payload = this.storage.get(hash) as WithStorageMeta<Payload> | undefined\n if (payload) {\n this.storage.remove(hash)\n }\n return payload\n }).filter(exists)\n }\n\n protected getFromCursor(\n order: 'asc' | 'desc' = 'asc',\n limit = 10,\n cursor?: Hex,\n open?: boolean,\n ): WithStorageMeta[] {\n // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n const all: WithStorageMeta[] = Object.values(this.storage.getAll())\n const payloads: WithStorageMeta[] = all\n .map(value => value)\n .toSorted((item1, item2) => {\n return order === 'asc' ? PayloadBuilder.compareStorageMeta(item1, item2) : PayloadBuilder.compareStorageMeta(item2, item1)\n })\n const index = payloads.findIndex(payload => payload._sequence === cursor)\n if (index !== -1) {\n const offset = open === true ? 1 : 0\n return payloads.slice(index + offset, index + offset + limit)\n }\n return payloads.slice(0, limit)\n }\n\n protected override getHandler(hashes: string[]): Promisable<WithStorageMeta<Payload>[]> {\n return hashes\n .map(hash => this.storage.get(hash) as WithStorageMeta<Payload> | undefined)\n .filter(exists)\n }\n\n protected override insertHandler(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[] {\n return payloads.map((payload) => {\n const value = JSON.stringify(payload)\n // console.log('insert.storagePayloads:', storagePayload)\n assertEx(value.length < this.maxEntrySize, () => `Payload too large [${payload._hash}, ${value.length}]`)\n this.storage.set(payload._hash, payload)\n this.storage.set(payload._dataHash, payload)\n return payload\n })\n }\n\n protected override nextHandler(options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n const {\n limit = 10,\n cursor,\n order,\n open = true,\n } = options ?? {}\n return this.getFromCursor(order, limit, cursor, open)\n }\n\n protected override async startHandler(): Promise<void> {\n await super.startHandler()\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xyo-network/archivist-storage",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "9.0.0",
|
|
4
4
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
5
5
|
"homepage": "https://xyo.network",
|
|
6
6
|
"bugs": {
|
|
@@ -34,28 +34,28 @@
|
|
|
34
34
|
"README.md"
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@xyo-network/sdk": "~
|
|
37
|
+
"@xyo-network/sdk": "~9.0.0",
|
|
38
38
|
"store2": "~2.14.4"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@ariestools/sdk": "~
|
|
42
|
-
"@ariestools/testing": "~
|
|
43
|
-
"@ariestools/toolchain": "~
|
|
44
|
-
"@ariestools/tsconfig": "~
|
|
41
|
+
"@ariestools/sdk": "~10.0.1",
|
|
42
|
+
"@ariestools/testing": "~10.0.1",
|
|
43
|
+
"@ariestools/toolchain": "~11.0.2",
|
|
44
|
+
"@ariestools/tsconfig": "~11.0.2",
|
|
45
45
|
"@opentelemetry/api": "~1.10.0",
|
|
46
|
-
"@xyo-network/archivist-acceptance-tests": "~
|
|
47
|
-
"@xyo-network/sdk-protocol": "~
|
|
48
|
-
"eslint": "~10.
|
|
46
|
+
"@xyo-network/archivist-acceptance-tests": "~9.0.0",
|
|
47
|
+
"@xyo-network/sdk-protocol": "~9.0.0",
|
|
48
|
+
"eslint": "~10.15.0",
|
|
49
49
|
"eslint-import-resolver-typescript": "~4.4.5",
|
|
50
50
|
"typescript": "~6.0.3",
|
|
51
51
|
"uuid": "~14.0.3",
|
|
52
|
-
"vite": "~8.3.
|
|
53
|
-
"vitest": "~5.1.
|
|
52
|
+
"vite": "~8.3.8",
|
|
53
|
+
"vitest": "~5.1.1",
|
|
54
54
|
"zod": "~4.6.7"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
|
-
"@ariestools/sdk": "^
|
|
58
|
-
"@xyo-network/sdk-protocol": "^
|
|
57
|
+
"@ariestools/sdk": "^10.0",
|
|
58
|
+
"@xyo-network/sdk-protocol": "^9.0",
|
|
59
59
|
"zod": "^4.6"
|
|
60
60
|
},
|
|
61
61
|
"engines": {
|