@xyo-network/archivist-abstract 3.9.2 → 3.9.3

package/dist/neutral/index.d.ts

@@ -1,4 +1,3 @@
-import * as _xylabs_object from '@xylabs/object';
 import { Hash } from '@xylabs/hex';
 import { PromisableArray, Promisable } from '@xylabs/promise';
 import { AccountInstance } from '@xyo-network/account-model';
@@ -54,9 +53,7 @@ declare abstract class AbstractArchivist<TParams extends ArchivistParams = Archi
     protected getHandler(_hashes: Hash[]): Promisable<WithStorageMeta<Payload>[]>;
     protected getWithConfig(hashes: Hash[], _config?: InsertConfig): Promise<WithStorageMeta<Payload>[]>;
     protected insertHandler(_payloads: WithStorageMeta<Payload>[]): Promisable<WithStorageMeta<Payload>[]>;
-    protected insertQueryHandler<T extends QueryBoundWitnessWrapper = QueryBoundWitnessWrapper>(query: T, payloads?: Payload[]): Promise<WithStorageMeta<_xylabs_object.DeepRestrictToStringKeys<{
-        schema: Schema;
-    }>>[]>;
+    protected insertQueryHandler<T extends QueryBoundWitnessWrapper = QueryBoundWitnessWrapper>(query: T, payloads?: Payload[]): Promise<WithStorageMeta<Payload>[]>;
     protected insertWithConfig(payloads: Payload[], config?: InsertConfig): Promise<WithStorageMeta<Payload>[]>;
     protected nextHandler(_options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]>;
     protected nextWithConfig(options?: ArchivistNextOptions, _config?: InsertConfig): Promise<WithStorageMeta<Payload>[]>;
@@ -64,6 +61,7 @@ declare abstract class AbstractArchivist<TParams extends ArchivistParams = Archi
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
     protected writeToParent(parent: ArchivistInstance, payloads: Payload[]): Promise<Payload[]>;
     protected writeToParents(payloads: Payload[]): Promise<Payload[]>;
+    private omitClientMetaForDataHashes;
     private resolveArchivists;
 }
 

package/dist/neutral/index.mjs

@@ -189,7 +189,10 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
     if (this.storeParentReads) {
       await this.insertWithConfig(parentFoundPayloads);
     }
-    return PayloadBuilder.omitPrivateStorageMeta([...foundPayloads, ...parentFoundPayloads]).sort(PayloadBuilder.compareStorageMeta);
+    return this.omitClientMetaForDataHashes(
+      hashes,
+      PayloadBuilder.omitPrivateStorageMeta([...foundPayloads, ...parentFoundPayloads]).toSorted(PayloadBuilder.compareStorageMeta)
+    );
   }
   insertHandler(_payloads) {
     throw new Error(NOT_IMPLEMENTED);
@@ -302,6 +305,17 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       })
     )).filter(exists).flat();
   }
+  omitClientMetaForDataHashes(hashes, payloads) {
+    return payloads.map((payload) => {
+      if (hashes.includes(payload._dataHash) && !hashes.includes(payload._hash)) {
+        const result = PayloadBuilder.omitClientMeta(payload);
+        result._hash = result._dataHash;
+        return result;
+      } else {
+        return payload;
+      }
+    });
+  }
   async resolveArchivists(archivists = [], archivistInstances) {
     const archivistModules = (await Promise.all(archivists.map((archivist) => this.resolve(archivist)))).filter(exists).filter(duplicateModules);
     assertEx(

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/AbstractArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { globallyUnique } from '@xylabs/object'\nimport type { Promisable, PromisableArray } from '@xylabs/promise'\nimport { difference } from '@xylabs/set'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  ArchivistAllQuery,\n  ArchivistClearQuery,\n  ArchivistCommitQuery,\n  ArchivistDeleteQuery,\n  ArchivistGetQuery,\n  ArchivistInsertQuery,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistNextOptions,\n  ArchivistNextQuery,\n  ArchivistParams,\n  ArchivistQueries,\n  AttachableArchivistInstance,\n  ReadArchivist,\n} from '@xyo-network/archivist-model'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfigSchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistGetQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistNextQuerySchema,\n  asArchivistInstance,\n  isArchivistInstance,\n} from '@xyo-network/archivist-model'\nimport type { BoundWitness, QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport type {\n  ModuleConfig, ModuleIdentifier, ModuleQueryHandlerResult, ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { duplicateModules } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  Payload, Schema, WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nconst NOT_IMPLEMENTED = 'Not implemented' as const\n\nexport interface ActionConfig {\n  emitEvents?: boolean\n}\n\nexport interface InsertConfig extends ActionConfig {\n  writeToParents?: boolean\n}\n\ninterface ArchivistParentInstanceMap {\n  commit?: Record<string, ArchivistInstance>\n  read?: Record<string, ArchivistInstance>\n  write?: Record<string, ArchivistInstance>\n}\n\nexport abstract class AbstractArchivist<\n  TParams extends ArchivistParams = ArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements AttachableArchivistInstance<TParams, TEventData, Payload> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, ArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = ArchivistConfigSchema\n  static override readonly uniqueName = globallyUnique('AbstractArchivist', AbstractArchivist, 'xyo')\n\n  // override this if a specialized archivist should have a different default next limit\n  protected static defaultNextLimitSetting = 100\n\n  private _parentArchivists?: ArchivistParentInstanceMap\n\n  // do not override this!  It is meant to get the this.defaultNextLimitSetting and work if it is overridden\n  static get defaultNextLimit() {\n    return this.defaultNextLimitSetting\n  }\n\n  override get queries(): string[] {\n    return [ArchivistGetQuerySchema, ...super.queries]\n  }\n\n  get requireAllParents() {\n    return this.config.requireAllParents ?? false\n  }\n\n  protected get storeParentReads() {\n    return !!this.config?.storeParentReads\n  }\n\n  all(): PromisableArray<WithStorageMeta<Payload>> {\n    this._noOverride('all')\n    return this.busy(async () => {\n      await this.started('throw')\n      return PayloadBuilder.omitPrivateStorageMeta(await this.allHandler())\n    })\n  }\n\n  async allQuery(account: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistAllQuery = { schema: ArchivistAllQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  clear(): Promisable<void> {\n    this._noOverride('clear')\n    return this.busy(async () => {\n      await this.started('throw')\n      return await this.clearHandler()\n    })\n  }\n\n  async clearQuery(account: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistClearQuery = { schema: ArchivistClearQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  commit(): Promisable<BoundWitness[]> {\n    this._noOverride('commit')\n    return this.busy(async () => {\n      await this.started('throw')\n      return await this.commitHandler()\n    })\n  }\n\n  async commitQuery(account: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistCommitQuery = { schema: ArchivistCommitQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  async delete(hashes: Hash[]): Promise<Hash[]> {\n    this._noOverride('delete')\n    return await this.busy(async () => {\n      await this.started('throw')\n      return await this.deleteWithConfig(hashes)\n    })\n  }\n\n  async deleteQuery(hashes: Hash[], account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistDeleteQuery = { hashes, schema: ArchivistDeleteQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  async get(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    this._noOverride('get')\n    return await this.busy(async () => {\n      await this.started('throw')\n      return await this.getWithConfig(hashes)\n    })\n  }\n\n  async getQuery(hashes: Hash[], account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistGetQuery = { hashes, schema: ArchivistGetQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  async insert(payloads: Payload[]): Promise<WithStorageMeta<Payload>[]> {\n    this._noOverride('insert')\n    return await this.busy(async () => {\n      await this.started('throw')\n      return await this.insertWithConfig(PayloadBuilder.omitStorageMeta(payloads))\n    })\n  }\n\n  async insertQuery(payloads: Payload[], account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistInsertQuery = { schema: ArchivistInsertQuerySchema }\n    return await this.sendQueryRaw(queryPayload, payloads, account)\n  }\n\n  async next(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    this._noOverride('next')\n    return await this.busy(async () => {\n      await this.started('throw')\n      const { limit = AbstractArchivist.defaultNextLimit, ...otherOptions } = options ?? {}\n      return await this.nextWithConfig({ limit, ...otherOptions })\n    })\n  }\n\n  async nextQuery(options?: ArchivistNextOptions, account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistNextQuery = { schema: ArchivistNextQuerySchema, ...options }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  protected allHandler(): PromisableArray<WithStorageMeta<Payload>> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected clearHandler(): Promisable<void> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected commitHandler(): Promisable<BoundWitness[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected deleteHandler(_hashes: Hash[]): PromisableArray<Hash> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async deleteWithConfig(hashes: Hash[], config?: ActionConfig): Promise<Hash[]> {\n    const emitEvents = config?.emitEvents ?? true\n\n    const deletedHashes = await this.deleteHandler(hashes)\n\n    if (emitEvents) {\n      await this.emit('deleted', { hashes: deletedHashes, mod: this })\n    }\n\n    return deletedHashes\n  }\n\n  protected async getFromParent(hashes: Hash[], archivist: ReadArchivist): Promise<[WithStorageMeta<Payload>[], Hash[]]> {\n    const foundPairs = (await PayloadBuilder.dataHashPairs(await archivist.get(hashes))).filter(([, hash]) => {\n      const askedFor = hashes.includes(hash)\n      if (!askedFor) {\n        console.warn(`Parent returned payload with hash not asked for: ${hash}`)\n        // throw Error(`Parent returned payload with hash not asked for: ${hash}`)\n      }\n      return askedFor\n    })\n\n    const foundHashes = new Set(foundPairs.map(([, hash]) => hash))\n    const foundPayloads = foundPairs.map(([payload]) => payload)\n\n    const notfound = hashes.filter(hash => !foundHashes.has(hash))\n    return [foundPayloads, notfound]\n  }\n\n  protected async getFromParents(hashes: Hash[]): Promise<[WithStorageMeta<Payload>[], Hash[]]> {\n    const parents = Object.values((await this.parentArchivists())?.read ?? {})\n    let remainingHashes = [...hashes]\n    let parentIndex = 0\n    let result: WithStorageMeta<Payload>[] = []\n\n    // NOTE: intentionally doing this serially\n    while (parentIndex < parents.length && remainingHashes.length > 0) {\n      const [found, notfound] = await this.getFromParent(remainingHashes, parents[parentIndex])\n      result = [...result, ...found]\n      remainingHashes = notfound\n      parentIndex++\n    }\n    return [result, remainingHashes]\n  }\n\n  protected getHandler(_hashes: Hash[]): Promisable<WithStorageMeta<Payload>[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async getWithConfig(hashes: Hash[], _config?: InsertConfig): Promise<WithStorageMeta<Payload>[]> {\n    // Filter out duplicates\n    const requestedHashes = new Set(hashes)\n\n    // Attempt to find the payloads in the store\n    const gotten = await this.getHandler([...requestedHashes])\n\n    // Do not just blindly return what the archivist told us but\n    // ensure to only return requested payloads and keep track of\n    // the ones it did not find so we can ask the parents.\n    const foundPayloads: WithStorageMeta<Payload>[] = []\n    const foundHashes = new Set<Hash>()\n\n    // NOTE: We are iterating over the returned result from the archivist\n    // (not the array of hashes passed in) to preserve the natural order of the\n    // hashes as returned by the archivist as that should loosely\n    // correspond to the order when iterated and the symmetry will\n    // be helpful for debugging\n    for (const payload of gotten) {\n      // Compute the hashes for this payload\n      const map = await PayloadBuilder.toAllHashMap([payload])\n      for (const [key, payload] of Object.entries(map)) {\n        let requestedPayloadFound = false\n        const hash = key as Hash // NOTE: Required cast as Object.entries always returns string keys\n        // If this hash was requested\n        if (\n          requestedHashes.has(hash) // Indicate that we found it (but do not insert it yet). Since\n          // one payload could satisfy two requested hashes (vit its dataHash\n          // & rootHash) we only want to insert that payload once but we want\n          // to keep track of all the hashes it satisfies so we can ask th\n          // parents for the ones we did not find\n          && !foundHashes.has(hash)\n        ) {\n          requestedPayloadFound = true\n          // Add it to the list of found hashes\n          foundHashes.add(hash)\n        }\n        if (requestedPayloadFound) foundPayloads.push(payload)\n      }\n    }\n    // For all the hashes we did not find, ask the parents\n    const notFoundHashes = [...difference(requestedHashes, foundHashes)]\n    const [parentFoundPayloads] = await this.getFromParents(notFoundHashes)\n\n    if (this.storeParentReads) {\n      await this.insertWithConfig(parentFoundPayloads)\n    }\n    return PayloadBuilder.omitPrivateStorageMeta([...foundPayloads, ...parentFoundPayloads]).sort(PayloadBuilder.compareStorageMeta)\n  }\n\n  protected insertHandler(_payloads: WithStorageMeta<Payload>[]): Promisable<WithStorageMeta<Payload>[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async insertQueryHandler<T extends QueryBoundWitnessWrapper = QueryBoundWitnessWrapper>(query: T, payloads?: Payload[]) {\n    assertEx(payloads, () => `Missing payloads: ${JSON.stringify(query.payload, null, 2)}`)\n    const resolvedPayloads = await PayloadBuilder.filterIncludeByEitherHash(payloads, query.payloadHashes)\n    assertEx(\n      resolvedPayloads.length === query.payloadHashes.length,\n      () => `Could not find some passed hashes [${resolvedPayloads.length} != ${query.payloadHashes.length}]`,\n    )\n    const queryPayload = await query.getQuery()\n    const payloadsWithoutQuery = await PayloadBuilder.filterExclude(resolvedPayloads, await PayloadBuilder.dataHash(queryPayload))\n    const result = await this.insertWithConfig(payloadsWithoutQuery)\n    return result\n  }\n\n  protected async insertWithConfig(payloads: Payload[], config?: InsertConfig): Promise<WithStorageMeta<Payload>[]> {\n    const emitEvents = config?.emitEvents ?? true\n    const writeToParents = config?.writeToParents ?? true\n\n    // remove the existing payloads\n    const withStorageMeta = await PayloadBuilder.addStorageMeta(payloads)\n    const hashes = withStorageMeta.map(p => p._hash)\n    const existingPayloads = await this.getWithConfig(hashes)\n    const existingHashes = new Set(existingPayloads.map(p => p._hash))\n    const payloadsToInsert = withStorageMeta.filter(p => !existingHashes.has(p._hash))\n\n    const insertedPayloads = await this.insertHandler(payloadsToInsert)\n\n    if (writeToParents) {\n      await this.writeToParents(insertedPayloads)\n    }\n    if (emitEvents) {\n      await this.emit('inserted', { mod: this, payloads: insertedPayloads })\n    }\n\n    return PayloadBuilder.omitPrivateStorageMeta(insertedPayloads)\n  }\n\n  protected nextHandler(_options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async nextWithConfig(options?: ArchivistNextOptions, _config?: InsertConfig): Promise<WithStorageMeta<Payload>[]> {\n    const foundPayloads = await this.nextHandler(options)\n    return PayloadBuilder.omitPrivateStorageMeta(foundPayloads)\n  }\n\n  protected async parentArchivists() {\n    this._parentArchivists = this._parentArchivists ?? {\n      commit: { ...await this.resolveArchivists(this.config?.parents?.commit, this.params.parents?.commit) },\n      read: { ...await this.resolveArchivists(this.config?.parents?.read) },\n      write: { ...await this.resolveArchivists(this.config?.parents?.write) },\n    }\n    return assertEx(this._parentArchivists)\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const sanitizedQuery = PayloadBuilder.omitStorageMeta(query)\n    const sanitizedPayloads = PayloadBuilder.omitStorageMeta(payloads)\n    const wrappedQuery = QueryBoundWitnessWrapper.parseQuery<ArchivistQueries>(sanitizedQuery, sanitizedPayloads)\n    const queryPayload = await wrappedQuery.getQuery()\n    assertEx(await this.queryable(sanitizedQuery, sanitizedPayloads, queryConfig))\n    const resultPayloads: Payload[] = []\n\n    switch (queryPayload.schema) {\n      case ArchivistAllQuerySchema: {\n        resultPayloads.push(...(await this.allHandler()))\n        break\n      }\n      case ArchivistClearQuerySchema: {\n        await this.clearHandler()\n        break\n      }\n      case ArchivistCommitQuerySchema: {\n        resultPayloads.push(...(await this.commitHandler()))\n        break\n      }\n      case ArchivistDeleteQuerySchema: {\n        const resultPayload: ArchivistDeleteQuery = {\n          hashes: [...(await this.deleteWithConfig(queryPayload.hashes))],\n          schema: ArchivistDeleteQuerySchema,\n        }\n        resultPayloads.push(await PayloadBuilder.addStorageMeta(resultPayload))\n        break\n      }\n      case ArchivistGetQuerySchema: {\n        resultPayloads.push(...(await this.getWithConfig(queryPayload.hashes ?? [])))\n        break\n      }\n      case ArchivistInsertQuerySchema: {\n        resultPayloads.push(...(await this.insertQueryHandler(wrappedQuery, sanitizedPayloads)))\n        break\n      }\n      case ArchivistNextQuerySchema: {\n        resultPayloads.push(...(await this.nextHandler(queryPayload)))\n        break\n      }\n      default: {\n        const result = await super.queryHandler(sanitizedQuery, sanitizedPayloads)\n        if (this.config.storeQueries) {\n          await this.insertWithConfig([sanitizedQuery])\n        }\n        return PayloadBuilder.omitPrivateStorageMeta(result)\n      }\n    }\n    if (this.config.storeQueries) {\n      await this.insertWithConfig([sanitizedQuery])\n    }\n    return PayloadBuilder.omitPrivateStorageMeta(resultPayloads)\n  }\n\n  protected async writeToParent(parent: ArchivistInstance, payloads: Payload[]): Promise<Payload[]> {\n    return await parent.insert(PayloadBuilder.omitStorageMeta(payloads))\n  }\n\n  protected async writeToParents(payloads: Payload[]): Promise<Payload[]> {\n    const parents = await this.parentArchivists()\n    return (\n      await Promise.all(\n        Object.values(parents.write ?? {}).map(async (parent) => {\n          return parent ? await this.writeToParent(parent, payloads) : undefined\n        }),\n      )\n    ).filter(exists).flat()\n  }\n\n  private async resolveArchivists(archivists: ModuleIdentifier[] = [], archivistInstances?: ArchivistInstance[]) {\n    const archivistModules = (await Promise.all(archivists.map(archivist => this.resolve(archivist)))).filter(exists).filter(duplicateModules)\n\n    assertEx(\n      !this.requireAllParents || archivistModules.length === archivists.length,\n      () =>\n        `Failed to find some archivists (set allRequired to false if ok): [${archivists.filter(archivist =>\n          archivistModules.map(mod => !(mod.address === archivist || mod.modName === archivist)))}]`,\n    )\n\n    const archivistInstancesMap: Record<Address, ArchivistInstance> = {}\n    for (let archivistInstance of archivistInstances ?? []) {\n      archivistInstancesMap[archivistInstance.address] = archivistInstance\n    }\n\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return archivistModules.reduce<Record<Address, ArchivistInstance>>((prev, mod) => {\n      prev[mod.address] = asArchivistInstance(mod, () => {\n        isArchivistInstance(mod, { log: console })\n        return `Unable to cast resolved module to an archivist: [${mod.address}, ${mod.modName}, ${mod.config.schema})}]`\n      })\n\n      return prev\n    }, archivistInstancesMap)\n  }\n}\n"],"mappings":"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","names":["payload"]}
+{"version":3,"sources":["../../src/AbstractArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { globallyUnique } from '@xylabs/object'\nimport type { Promisable, PromisableArray } from '@xylabs/promise'\nimport { difference } from '@xylabs/set'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  ArchivistAllQuery,\n  ArchivistClearQuery,\n  ArchivistCommitQuery,\n  ArchivistDeleteQuery,\n  ArchivistGetQuery,\n  ArchivistInsertQuery,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistNextOptions,\n  ArchivistNextQuery,\n  ArchivistParams,\n  ArchivistQueries,\n  AttachableArchivistInstance,\n  ReadArchivist,\n} from '@xyo-network/archivist-model'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfigSchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistGetQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistNextQuerySchema,\n  asArchivistInstance,\n  isArchivistInstance,\n} from '@xyo-network/archivist-model'\nimport type { BoundWitness, QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport type {\n  ModuleConfig, ModuleIdentifier, ModuleQueryHandlerResult, ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { duplicateModules } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  Payload, Schema, WithStorageMeta,\n} from '@xyo-network/payload-model'\n\nconst NOT_IMPLEMENTED = 'Not implemented' as const\n\nexport interface ActionConfig {\n  emitEvents?: boolean\n}\n\nexport interface InsertConfig extends ActionConfig {\n  writeToParents?: boolean\n}\n\ninterface ArchivistParentInstanceMap {\n  commit?: Record<string, ArchivistInstance>\n  read?: Record<string, ArchivistInstance>\n  write?: Record<string, ArchivistInstance>\n}\n\nexport abstract class AbstractArchivist<\n  TParams extends ArchivistParams = ArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements AttachableArchivistInstance<TParams, TEventData, Payload> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, ArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = ArchivistConfigSchema\n  static override readonly uniqueName = globallyUnique('AbstractArchivist', AbstractArchivist, 'xyo')\n\n  // override this if a specialized archivist should have a different default next limit\n  protected static defaultNextLimitSetting = 100\n\n  private _parentArchivists?: ArchivistParentInstanceMap\n\n  // do not override this!  It is meant to get the this.defaultNextLimitSetting and work if it is overridden\n  static get defaultNextLimit() {\n    return this.defaultNextLimitSetting\n  }\n\n  override get queries(): string[] {\n    return [ArchivistGetQuerySchema, ...super.queries]\n  }\n\n  get requireAllParents() {\n    return this.config.requireAllParents ?? false\n  }\n\n  protected get storeParentReads() {\n    return !!this.config?.storeParentReads\n  }\n\n  all(): PromisableArray<WithStorageMeta<Payload>> {\n    this._noOverride('all')\n    return this.busy(async () => {\n      await this.started('throw')\n      return PayloadBuilder.omitPrivateStorageMeta(await this.allHandler())\n    })\n  }\n\n  async allQuery(account: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistAllQuery = { schema: ArchivistAllQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  clear(): Promisable<void> {\n    this._noOverride('clear')\n    return this.busy(async () => {\n      await this.started('throw')\n      return await this.clearHandler()\n    })\n  }\n\n  async clearQuery(account: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistClearQuery = { schema: ArchivistClearQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  commit(): Promisable<BoundWitness[]> {\n    this._noOverride('commit')\n    return this.busy(async () => {\n      await this.started('throw')\n      return await this.commitHandler()\n    })\n  }\n\n  async commitQuery(account: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistCommitQuery = { schema: ArchivistCommitQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  async delete(hashes: Hash[]): Promise<Hash[]> {\n    this._noOverride('delete')\n    return await this.busy(async () => {\n      await this.started('throw')\n      return await this.deleteWithConfig(hashes)\n    })\n  }\n\n  async deleteQuery(hashes: Hash[], account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistDeleteQuery = { hashes, schema: ArchivistDeleteQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  async get(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    this._noOverride('get')\n    return await this.busy(async () => {\n      await this.started('throw')\n      return await this.getWithConfig(hashes)\n    })\n  }\n\n  async getQuery(hashes: Hash[], account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistGetQuery = { hashes, schema: ArchivistGetQuerySchema }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  async insert(payloads: Payload[]): Promise<WithStorageMeta<Payload>[]> {\n    this._noOverride('insert')\n    return await this.busy(async () => {\n      await this.started('throw')\n      return await this.insertWithConfig(PayloadBuilder.omitStorageMeta(payloads))\n    })\n  }\n\n  async insertQuery(payloads: Payload[], account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistInsertQuery = { schema: ArchivistInsertQuerySchema }\n    return await this.sendQueryRaw(queryPayload, payloads, account)\n  }\n\n  async next(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    this._noOverride('next')\n    return await this.busy(async () => {\n      await this.started('throw')\n      const { limit = AbstractArchivist.defaultNextLimit, ...otherOptions } = options ?? {}\n      return await this.nextWithConfig({ limit, ...otherOptions })\n    })\n  }\n\n  async nextQuery(options?: ArchivistNextOptions, account?: AccountInstance): Promise<ModuleQueryResult> {\n    const queryPayload: ArchivistNextQuery = { schema: ArchivistNextQuerySchema, ...options }\n    return await this.sendQueryRaw(queryPayload, undefined, account)\n  }\n\n  protected allHandler(): PromisableArray<WithStorageMeta<Payload>> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected clearHandler(): Promisable<void> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected commitHandler(): Promisable<BoundWitness[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected deleteHandler(_hashes: Hash[]): PromisableArray<Hash> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async deleteWithConfig(hashes: Hash[], config?: ActionConfig): Promise<Hash[]> {\n    const emitEvents = config?.emitEvents ?? true\n\n    const deletedHashes = await this.deleteHandler(hashes)\n\n    if (emitEvents) {\n      await this.emit('deleted', { hashes: deletedHashes, mod: this })\n    }\n\n    return deletedHashes\n  }\n\n  protected async getFromParent(hashes: Hash[], archivist: ReadArchivist): Promise<[WithStorageMeta<Payload>[], Hash[]]> {\n    const foundPairs = (await PayloadBuilder.dataHashPairs(await archivist.get(hashes))).filter(([, hash]) => {\n      const askedFor = hashes.includes(hash)\n      if (!askedFor) {\n        console.warn(`Parent returned payload with hash not asked for: ${hash}`)\n        // throw Error(`Parent returned payload with hash not asked for: ${hash}`)\n      }\n      return askedFor\n    })\n\n    const foundHashes = new Set(foundPairs.map(([, hash]) => hash))\n    const foundPayloads = foundPairs.map(([payload]) => payload)\n\n    const notfound = hashes.filter(hash => !foundHashes.has(hash))\n    return [foundPayloads, notfound]\n  }\n\n  protected async getFromParents(hashes: Hash[]): Promise<[WithStorageMeta<Payload>[], Hash[]]> {\n    const parents = Object.values((await this.parentArchivists())?.read ?? {})\n    let remainingHashes = [...hashes]\n    let parentIndex = 0\n    let result: WithStorageMeta<Payload>[] = []\n\n    // NOTE: intentionally doing this serially\n    while (parentIndex < parents.length && remainingHashes.length > 0) {\n      const [found, notfound] = await this.getFromParent(remainingHashes, parents[parentIndex])\n      result = [...result, ...found]\n      remainingHashes = notfound\n      parentIndex++\n    }\n    return [result, remainingHashes]\n  }\n\n  protected getHandler(_hashes: Hash[]): Promisable<WithStorageMeta<Payload>[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async getWithConfig(hashes: Hash[], _config?: InsertConfig): Promise<WithStorageMeta<Payload>[]> {\n    // Filter out duplicates\n    const requestedHashes = new Set(hashes)\n\n    // Attempt to find the payloads in the store\n    const gotten = await this.getHandler([...requestedHashes])\n\n    // Do not just blindly return what the archivist told us but\n    // ensure to only return requested payloads and keep track of\n    // the ones it did not find so we can ask the parents.\n    const foundPayloads: WithStorageMeta<Payload>[] = []\n    const foundHashes = new Set<Hash>()\n\n    // NOTE: We are iterating over the returned result from the archivist\n    // (not the array of hashes passed in) to preserve the natural order of the\n    // hashes as returned by the archivist as that should loosely\n    // correspond to the order when iterated and the symmetry will\n    // be helpful for debugging\n    for (const payload of gotten) {\n      // Compute the hashes for this payload\n      const map = await PayloadBuilder.toAllHashMap([payload])\n      for (const [key, payload] of Object.entries(map)) {\n        let requestedPayloadFound = false\n        const hash = key as Hash // NOTE: Required cast as Object.entries always returns string keys\n        // If this hash was requested\n        if (\n          requestedHashes.has(hash) // Indicate that we found it (but do not insert it yet). Since\n          // one payload could satisfy two requested hashes (vit its dataHash\n          // & rootHash) we only want to insert that payload once but we want\n          // to keep track of all the hashes it satisfies so we can ask th\n          // parents for the ones we did not find\n          && !foundHashes.has(hash)\n        ) {\n          requestedPayloadFound = true\n          // Add it to the list of found hashes\n          foundHashes.add(hash)\n        }\n        if (requestedPayloadFound) foundPayloads.push(payload)\n      }\n    }\n    // For all the hashes we did not find, ask the parents\n    const notFoundHashes = [...difference(requestedHashes, foundHashes)]\n    const [parentFoundPayloads] = await this.getFromParents(notFoundHashes)\n\n    if (this.storeParentReads) {\n      await this.insertWithConfig(parentFoundPayloads)\n    }\n    return this.omitClientMetaForDataHashes(\n      hashes,\n      PayloadBuilder.omitPrivateStorageMeta([...foundPayloads, ...parentFoundPayloads]).toSorted(PayloadBuilder.compareStorageMeta),\n    )\n  }\n\n  protected insertHandler(_payloads: WithStorageMeta<Payload>[]): Promisable<WithStorageMeta<Payload>[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async insertQueryHandler<T extends QueryBoundWitnessWrapper = QueryBoundWitnessWrapper>(query: T, payloads?: Payload[]) {\n    assertEx(payloads, () => `Missing payloads: ${JSON.stringify(query.payload, null, 2)}`)\n    const resolvedPayloads = await PayloadBuilder.filterIncludeByEitherHash(payloads, query.payloadHashes)\n    assertEx(\n      resolvedPayloads.length === query.payloadHashes.length,\n      () => `Could not find some passed hashes [${resolvedPayloads.length} != ${query.payloadHashes.length}]`,\n    )\n    const queryPayload = await query.getQuery()\n    const payloadsWithoutQuery = await PayloadBuilder.filterExclude(resolvedPayloads, await PayloadBuilder.dataHash(queryPayload))\n    const result = await this.insertWithConfig(payloadsWithoutQuery)\n    return result\n  }\n\n  protected async insertWithConfig(payloads: Payload[], config?: InsertConfig): Promise<WithStorageMeta<Payload>[]> {\n    const emitEvents = config?.emitEvents ?? true\n    const writeToParents = config?.writeToParents ?? true\n\n    // remove the existing payloads\n    const withStorageMeta = await PayloadBuilder.addStorageMeta(payloads)\n    const hashes = withStorageMeta.map(p => p._hash)\n    const existingPayloads = await this.getWithConfig(hashes)\n    const existingHashes = new Set(existingPayloads.map(p => p._hash))\n    const payloadsToInsert = withStorageMeta.filter(p => !existingHashes.has(p._hash))\n\n    const insertedPayloads = await this.insertHandler(payloadsToInsert)\n\n    if (writeToParents) {\n      await this.writeToParents(insertedPayloads)\n    }\n    if (emitEvents) {\n      await this.emit('inserted', { mod: this, payloads: insertedPayloads })\n    }\n\n    return PayloadBuilder.omitPrivateStorageMeta(insertedPayloads)\n  }\n\n  protected nextHandler(_options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n    throw new Error(NOT_IMPLEMENTED)\n  }\n\n  protected async nextWithConfig(options?: ArchivistNextOptions, _config?: InsertConfig): Promise<WithStorageMeta<Payload>[]> {\n    const foundPayloads = await this.nextHandler(options)\n    return PayloadBuilder.omitPrivateStorageMeta(foundPayloads)\n  }\n\n  protected async parentArchivists() {\n    this._parentArchivists = this._parentArchivists ?? {\n      commit: { ...await this.resolveArchivists(this.config?.parents?.commit, this.params.parents?.commit) },\n      read: { ...await this.resolveArchivists(this.config?.parents?.read) },\n      write: { ...await this.resolveArchivists(this.config?.parents?.write) },\n    }\n    return assertEx(this._parentArchivists)\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const sanitizedQuery = PayloadBuilder.omitStorageMeta(query)\n    const sanitizedPayloads = PayloadBuilder.omitStorageMeta(payloads)\n    const wrappedQuery = QueryBoundWitnessWrapper.parseQuery<ArchivistQueries>(sanitizedQuery, sanitizedPayloads)\n    const queryPayload = await wrappedQuery.getQuery()\n    assertEx(await this.queryable(sanitizedQuery, sanitizedPayloads, queryConfig))\n    const resultPayloads: Payload[] = []\n\n    switch (queryPayload.schema) {\n      case ArchivistAllQuerySchema: {\n        resultPayloads.push(...(await this.allHandler()))\n        break\n      }\n      case ArchivistClearQuerySchema: {\n        await this.clearHandler()\n        break\n      }\n      case ArchivistCommitQuerySchema: {\n        resultPayloads.push(...(await this.commitHandler()))\n        break\n      }\n      case ArchivistDeleteQuerySchema: {\n        const resultPayload: ArchivistDeleteQuery = {\n          hashes: [...(await this.deleteWithConfig(queryPayload.hashes))],\n          schema: ArchivistDeleteQuerySchema,\n        }\n        resultPayloads.push(await PayloadBuilder.addStorageMeta(resultPayload))\n        break\n      }\n      case ArchivistGetQuerySchema: {\n        resultPayloads.push(...(await this.getWithConfig(queryPayload.hashes ?? [])))\n        break\n      }\n      case ArchivistInsertQuerySchema: {\n        resultPayloads.push(...(await this.insertQueryHandler(wrappedQuery, sanitizedPayloads)))\n        break\n      }\n      case ArchivistNextQuerySchema: {\n        resultPayloads.push(...(await this.nextHandler(queryPayload)))\n        break\n      }\n      default: {\n        const result = await super.queryHandler(sanitizedQuery, sanitizedPayloads)\n        if (this.config.storeQueries) {\n          await this.insertWithConfig([sanitizedQuery])\n        }\n        return PayloadBuilder.omitPrivateStorageMeta(result)\n      }\n    }\n    if (this.config.storeQueries) {\n      await this.insertWithConfig([sanitizedQuery])\n    }\n    return PayloadBuilder.omitPrivateStorageMeta(resultPayloads)\n  }\n\n  protected async writeToParent(parent: ArchivistInstance, payloads: Payload[]): Promise<Payload[]> {\n    return await parent.insert(PayloadBuilder.omitStorageMeta(payloads))\n  }\n\n  protected async writeToParents(payloads: Payload[]): Promise<Payload[]> {\n    const parents = await this.parentArchivists()\n    return (\n      await Promise.all(\n        Object.values(parents.write ?? {}).map(async (parent) => {\n          return parent ? await this.writeToParent(parent, payloads) : undefined\n        }),\n      )\n    ).filter(exists).flat()\n  }\n\n  private omitClientMetaForDataHashes<T extends Payload>(hashes: Hash[], payloads: WithStorageMeta<T>[]): WithStorageMeta<T>[] {\n    return payloads.map((payload) => {\n      // if retrieved by dataHash and not hash (both could have been specified)\n      if (hashes.includes(payload._dataHash) && !hashes.includes(payload._hash)) {\n        // scrub client meta\n        const result = PayloadBuilder.omitClientMeta(payload) as WithStorageMeta<T>\n        // we also scrub the _hash\n        result._hash = result._dataHash\n        return result\n      } else {\n        return payload\n      }\n    })\n  }\n\n  private async resolveArchivists(archivists: ModuleIdentifier[] = [], archivistInstances?: ArchivistInstance[]) {\n    const archivistModules = (await Promise.all(archivists.map(archivist => this.resolve(archivist)))).filter(exists).filter(duplicateModules)\n\n    assertEx(\n      !this.requireAllParents || archivistModules.length === archivists.length,\n      () =>\n        `Failed to find some archivists (set allRequired to false if ok): [${archivists.filter(archivist =>\n          archivistModules.map(mod => !(mod.address === archivist || mod.modName === archivist)))}]`,\n    )\n\n    const archivistInstancesMap: Record<Address, ArchivistInstance> = {}\n    for (let archivistInstance of archivistInstances ?? []) {\n      archivistInstancesMap[archivistInstance.address] = archivistInstance\n    }\n\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return archivistModules.reduce<Record<Address, ArchivistInstance>>((prev, mod) => {\n      prev[mod.address] = asArchivistInstance(mod, () => {\n        isArchivistInstance(mod, { log: console })\n        return `Unable to cast resolved module to an archivist: [${mod.address}, ${mod.modName}, ${mod.config.schema})}]`\n      })\n\n      return prev\n    }, archivistInstancesMap)\n  }\n}\n"],"mappings":"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","names":["payload"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/archivist-abstract",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -35,14 +35,14 @@
     "@xylabs/object": "^4.5.1",
     "@xylabs/promise": "^4.5.1",
     "@xylabs/set": "^4.5.1",
-    "@xyo-network/account-model": "^3.9.2",
-    "@xyo-network/archivist-model": "^3.9.2",
-    "@xyo-network/boundwitness-model": "^3.9.2",
-    "@xyo-network/boundwitness-wrapper": "^3.9.2",
-    "@xyo-network/module-abstract": "^3.9.2",
-    "@xyo-network/module-model": "^3.9.2",
-    "@xyo-network/payload-builder": "^3.9.2",
-    "@xyo-network/payload-model": "^3.9.2"
+    "@xyo-network/account-model": "^3.9.3",
+    "@xyo-network/archivist-model": "^3.9.3",
+    "@xyo-network/boundwitness-model": "^3.9.3",
+    "@xyo-network/boundwitness-wrapper": "^3.9.3",
+    "@xyo-network/module-abstract": "^3.9.3",
+    "@xyo-network/module-model": "^3.9.3",
+    "@xyo-network/payload-builder": "^3.9.3",
+    "@xyo-network/payload-model": "^3.9.3"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^5.0.24",

package/src/AbstractArchivist.ts

@@ -297,7 +297,10 @@ export abstract class AbstractArchivist<
     if (this.storeParentReads) {
       await this.insertWithConfig(parentFoundPayloads)
     }
-    return PayloadBuilder.omitPrivateStorageMeta([...foundPayloads, ...parentFoundPayloads]).sort(PayloadBuilder.compareStorageMeta)
+    return this.omitClientMetaForDataHashes(
+      hashes,
+      PayloadBuilder.omitPrivateStorageMeta([...foundPayloads, ...parentFoundPayloads]).toSorted(PayloadBuilder.compareStorageMeta),
+    )
   }
 
   protected insertHandler(_payloads: WithStorageMeta<Payload>[]): Promisable<WithStorageMeta<Payload>[]> {
@@ -432,6 +435,21 @@ export abstract class AbstractArchivist<
     ).filter(exists).flat()
   }
 
+  private omitClientMetaForDataHashes<T extends Payload>(hashes: Hash[], payloads: WithStorageMeta<T>[]): WithStorageMeta<T>[] {
+    return payloads.map((payload) => {
+      // if retrieved by dataHash and not hash (both could have been specified)
+      if (hashes.includes(payload._dataHash) && !hashes.includes(payload._hash)) {
+        // scrub client meta
+        const result = PayloadBuilder.omitClientMeta(payload) as WithStorageMeta<T>
+        // we also scrub the _hash
+        result._hash = result._dataHash
+        return result
+      } else {
+        return payload
+      }
+    })
+  }
+
   private async resolveArchivists(archivists: ModuleIdentifier[] = [], archivistInstances?: ArchivistInstance[]) {
     const archivistModules = (await Promise.all(archivists.map(archivist => this.resolve(archivist)))).filter(exists).filter(duplicateModules)