@xyo-network/archivist-mongodb 5.1.22 → 5.1.24

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/validByType.ts","../../src/ArchivistV2.ts","../../src/index.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { ArchivistInsertQuerySchema, ArchivistNextQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport type {\n  Payload, Schema, Sequence, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport { ObjectId } from 'mongodb'\n\nimport { validByType } from './lib/index.js'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override queries = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _$hash: hash }))\n      if (dataBw) {\n        return dataBw\n      } else {\n        const payload = (await this.payloads.findOne({ _hash: hash }))\n        if (payload) {\n          return payload\n        } else {\n          const bw = (await this.boundWitnesses.findOne({ _hash: hash }))\n          return bw ?? undefined\n        }\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _sequence: sequence }))\n      return dataBw\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const dataBws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(\n      _dataHash => this.boundWitnesses.findOne({ _dataHash }),\n    ))).filter(exists)\n\n    const dataBwsHashes = new Set(dataBws.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataBwsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = new Set(payloads.map(payload => payload._hash))\n    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))\n\n    const bws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(_hash => this.boundWitnesses.findOne({ _hash })))).filter(exists)\n    const bwsHashes = new Set(bws.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !bwsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    // console.log(`getHandler: ${JSON.stringify(hashes, null, 2)}:${JSON.stringify(result, null, 2)}`)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithExternalMeta = p.map(value => toDbRepresentation(value))\n    if (payloadsWithExternalMeta.length > 0) {\n      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)\n      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)\n        throw new Error('MongoDBArchivist: Error inserting Payloads')\n    }\n\n    const boundWitnessesWithExternalMeta = bw.map(value => toDbRepresentation(value))\n    if (boundWitnessesWithExternalMeta.length > 0) {\n      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)\n      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)\n        throw new Error('MongoDBArchivist: Error inserting BoundWitnesses')\n    }\n\n    return [...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let id: ObjectId | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) id = payload._id\n    } else {\n      id = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? ObjectId.createFromTime(0)\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : ObjectId.createFromTime((Date.now() + 10_000) / 1000)\n    }\n    if (!id) return []\n\n    // Create aggregate criteria\n    const sort = order === 'asc' ? 1 : -1\n    // TODO: How to handle random component of ID across multiple collections\n    // to ensure we don't skip some payloads\n    const match = order === 'asc' ? (open ? { _id: { $gte: id } } : { _id: { $gt: id } }) : (open ? { _id: { $lte: id } } : { _id: { $lt: id } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _id\n          { $sort: { _id: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n          // Combine with filtered boundWitnesses collection\n          {\n            $unionWith: {\n              coll: this.boundWitnessSdkConfig.collection,\n              pipeline: [\n                { $match: match }, // Pre-filter boundWitnesses\n                { $sort: { _id: sort } }, // Sort boundWitnesses by _id\n                { $limit: limit }, // Limit boundWitnesses to the first N boundWitnesses\n              ],\n            },\n          },\n          // Sort the combined result by _id\n          { $sort: { _id: sort } },\n          // Limit the final result to N documents\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n  }\n}\n","import type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { Payload, WithStorageMeta } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: WithStorageMeta<Payload>[] = []) => {\n  const results: [WithStorageMeta<BoundWitness>[], WithStorageMeta<Payload>[]] = [[], []]\n  await Promise.all(\n    payloads.map(async (payload) => {\n      if (isBoundWitness(payload)) {\n        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper\n        const bw = wrapper.parse(payload)\n        if (await bw.getValid()) {\n          results[0].push(payload)\n        } else {\n          const errors = await bw.getErrors()\n          console.log(`validByType.Error: ${JSON.stringify(errors, null, 2)}`)\n        }\n      } else {\n        const payloadWrapper = PayloadWrapper.wrap(payload)\n        if (await payloadWrapper.getValid()) {\n          results[1].push(payload)\n        }\n      }\n    }),\n  )\n  return results\n}\n","import { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { ArchivistInsertQuerySchema, ArchivistNextQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { MongoDBModuleMixinV2 } from '@xyo-network/module-abstract-mongodb'\nimport {\n  type Payload, type Schema, type Sequence, SequenceConstants,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport type { MongoError } from 'mongodb'\n\nconst MongoDBArchivistBaseV2 = MongoDBModuleMixinV2(AbstractArchivist)\n\nconst MONGODB_DUPLICATE_KEY_ERROR = 11_000\n\nexport class MongoDBArchivistV2 extends MongoDBArchivistBaseV2 {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override readonly queries: string[] = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const payload = (await this.payloads.findOne({ _hash: hash }))\n      if (payload) {\n        return payload\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = new Set(payloads.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...payloads] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const payloadsWithExternalMeta = payloads.map(value => toDbRepresentation(value))\n    if (payloadsWithExternalMeta.length > 0) {\n      try {\n        const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta, { ordered: false })\n        if (!payloadsResult.acknowledged) throw new Error('MongoDBArchivist: Error inserting Payloads')\n      } catch (error) {\n        const mongoError = error as MongoError\n        // NOTE: Intentional coercive equality since Mongo error codes are\n        // of type string | number\n        if (mongoError?.code != MONGODB_DUPLICATE_KEY_ERROR) throw error\n      }\n    }\n    return [...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open = true,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let sequence: Sequence | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) sequence = payload._sequence\n    } else {\n      sequence = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? SequenceConstants.minLocalSequence\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : SequenceConstants.maxLocalSequence\n    }\n    if (!sequence) return []\n\n    // Create find criteria\n    const sort = order === 'asc' ? 1 : -1\n\n    const match = order === 'asc'\n      ? (open\n          ? { _sequence: { $gt: sequence } }\n          : { _sequence: { $gte: sequence } })\n      : (open\n          ? { _sequence: { $lt: sequence } }\n          : { _sequence: { $lte: sequence } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _sequence\n          { $sort: { _sequence: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureCollection()\n  }\n}\n","export * from './Archivist.js'\nexport * from './ArchivistV2.ts'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":"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","names":["exists","AbstractArchivist","ArchivistInsertQuerySchema","ArchivistNextQuerySchema","MongoDBArchivistConfigSchema","fromDbRepresentation","toDbRepresentation"]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/validByType.ts","../../src/ArchivistV2.ts","../../src/index.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { ArchivistInsertQuerySchema, ArchivistNextQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport type {\n  Payload, Schema, Sequence, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport { ObjectId } from 'mongodb'\n\nimport { validByType } from './lib/index.js'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override queries = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _$hash: hash }))\n      if (dataBw) {\n        return dataBw\n      } else {\n        const payload = (await this.payloads.findOne({ _hash: hash }))\n        if (payload) {\n          return payload\n        } else {\n          const bw = (await this.boundWitnesses.findOne({ _hash: hash }))\n          return bw ?? undefined\n        }\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _sequence: sequence }))\n      return dataBw\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const dataBws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(\n      _dataHash => this.boundWitnesses.findOne({ _dataHash }),\n    ))).filter(exists)\n\n    const dataBwsHashes = new Set(dataBws.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataBwsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = new Set(payloads.map(payload => payload._hash))\n    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))\n\n    const bws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(_hash => this.boundWitnesses.findOne({ _hash })))).filter(exists)\n    const bwsHashes = new Set(bws.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !bwsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    // console.log(`getHandler: ${JSON.stringify(hashes, null, 2)}:${JSON.stringify(result, null, 2)}`)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithExternalMeta = p.map(value => toDbRepresentation(value))\n    if (payloadsWithExternalMeta.length > 0) {\n      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)\n      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)\n        throw new Error('MongoDBArchivist: Error inserting Payloads')\n    }\n\n    const boundWitnessesWithExternalMeta = bw.map(value => toDbRepresentation(value))\n    if (boundWitnessesWithExternalMeta.length > 0) {\n      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)\n      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)\n        throw new Error('MongoDBArchivist: Error inserting BoundWitnesses')\n    }\n\n    return [...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let id: ObjectId | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) id = payload._id\n    } else {\n      id = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? ObjectId.createFromTime(0)\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : ObjectId.createFromTime((Date.now() + 10_000) / 1000)\n    }\n    if (!id) return []\n\n    // Create aggregate criteria\n    const sort = order === 'asc' ? 1 : -1\n    // TODO: How to handle random component of ID across multiple collections\n    // to ensure we don't skip some payloads\n    const match = order === 'asc' ? (open ? { _id: { $gte: id } } : { _id: { $gt: id } }) : (open ? { _id: { $lte: id } } : { _id: { $lt: id } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _id\n          { $sort: { _id: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n          // Combine with filtered boundWitnesses collection\n          {\n            $unionWith: {\n              coll: this.boundWitnessSdkConfig.collection,\n              pipeline: [\n                { $match: match }, // Pre-filter boundWitnesses\n                { $sort: { _id: sort } }, // Sort boundWitnesses by _id\n                { $limit: limit }, // Limit boundWitnesses to the first N boundWitnesses\n              ],\n            },\n          },\n          // Sort the combined result by _id\n          { $sort: { _id: sort } },\n          // Limit the final result to N documents\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n  }\n}\n","import type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { Payload, WithStorageMeta } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: WithStorageMeta<Payload>[] = []) => {\n  const results: [WithStorageMeta<BoundWitness>[], WithStorageMeta<Payload>[]] = [[], []]\n  await Promise.all(\n    payloads.map(async (payload) => {\n      if (isBoundWitness(payload)) {\n        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper\n        const bw = wrapper.parse(payload)\n        if (await bw.getValid()) {\n          results[0].push(payload)\n        } else {\n          const errors = await bw.getErrors()\n          console.log(`validByType.Error: ${JSON.stringify(errors, null, 2)}`)\n        }\n      } else {\n        const payloadWrapper = PayloadWrapper.wrap(payload)\n        if (await payloadWrapper.getValid()) {\n          results[1].push(payload)\n        }\n      }\n    }),\n  )\n  return results\n}\n","import { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { ArchivistInsertQuerySchema, ArchivistNextQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { MongoDBModuleMixinV2 } from '@xyo-network/module-abstract-mongodb'\nimport {\n  type Payload, type Schema, type Sequence, SequenceConstants,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport type { MongoError } from 'mongodb'\n\nconst MongoDBArchivistBaseV2 = MongoDBModuleMixinV2(AbstractArchivist)\n\nconst MONGODB_DUPLICATE_KEY_ERROR = 11_000\n\nexport class MongoDBArchivistV2 extends MongoDBArchivistBaseV2 {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override readonly queries: string[] = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const payload = (await this.payloads.findOne({ _hash: hash }))\n      if (payload) {\n        return payload\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = new Set(payloads.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...payloads] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const payloadsWithExternalMeta = payloads.map(value => toDbRepresentation(value))\n    if (payloadsWithExternalMeta.length > 0) {\n      try {\n        const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta, { ordered: false })\n        if (!payloadsResult.acknowledged) throw new Error('MongoDBArchivist: Error inserting Payloads')\n      } catch (error) {\n        const mongoError = error as MongoError\n        // Intentional coercive equality since Mongo error codes are\n        // of type string | number\n        if (mongoError?.code != MONGODB_DUPLICATE_KEY_ERROR) throw error\n      }\n    }\n    return [...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open = true,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let sequence: Sequence | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) sequence = payload._sequence\n    } else {\n      sequence = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? SequenceConstants.minLocalSequence\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : SequenceConstants.maxLocalSequence\n    }\n    if (!sequence) return []\n\n    // Create find criteria\n    const sort = order === 'asc' ? 1 : -1\n\n    const match = order === 'asc'\n      ? (open\n          ? { _sequence: { $gt: sequence } }\n          : { _sequence: { $gte: sequence } })\n      : (open\n          ? { _sequence: { $lt: sequence } }\n          : { _sequence: { $lte: sequence } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _sequence\n          { $sort: { _sequence: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureCollection()\n  }\n}\n","export * from './Archivist.js'\nexport * from './ArchivistV2.ts'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":"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","names":["exists","AbstractArchivist","ArchivistInsertQuerySchema","ArchivistNextQuerySchema","MongoDBArchivistConfigSchema","fromDbRepresentation","toDbRepresentation"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/archivist-mongodb",
-  "version": "5.1.22",
+  "version": "5.1.24",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -33,35 +33,38 @@
   "types": "dist/node/index.d.ts",
   "files": [
     "dist",
-    "src"
+    "src",
+    "!**/*.bench.*",
+    "!**/*.spec.*",
+    "!**/*.test.*"
   ],
   "dependencies": {
-    "@xylabs/exists": "~5.0.24",
-    "@xylabs/hex": "~5.0.24",
-    "@xyo-network/archivist-abstract": "~5.1.22",
-    "@xyo-network/archivist-model": "~5.1.22",
-    "@xyo-network/archivist-model-mongodb": "~5.1.22",
-    "@xyo-network/boundwitness-model": "~5.1.22",
-    "@xyo-network/boundwitness-wrapper": "~5.1.22",
-    "@xyo-network/module-abstract-mongodb": "~5.1.22",
-    "@xyo-network/payload-model": "~5.1.22",
-    "@xyo-network/payload-mongodb": "~5.1.22",
-    "@xyo-network/payload-wrapper": "~5.1.22",
+    "@xylabs/exists": "~5.0.37",
+    "@xylabs/hex": "~5.0.37",
+    "@xyo-network/archivist-abstract": "~5.1.24",
+    "@xyo-network/archivist-model": "~5.1.24",
+    "@xyo-network/archivist-model-mongodb": "~5.1.24",
+    "@xyo-network/boundwitness-model": "~5.1.24",
+    "@xyo-network/boundwitness-wrapper": "~5.1.24",
+    "@xyo-network/module-abstract-mongodb": "~5.1.24",
+    "@xyo-network/payload-model": "~5.1.24",
+    "@xyo-network/payload-mongodb": "~5.1.24",
+    "@xyo-network/payload-wrapper": "~5.1.24",
     "mongodb": "~6.20.0"
   },
   "devDependencies": {
-    "@xylabs/delay": "~5.0.24",
-    "@xylabs/mongo": "~5.0.24",
+    "@xylabs/delay": "~5.0.37",
+    "@xylabs/mongo": "~5.0.37",
     "@xylabs/ts-scripts-yarn3": "~7.2.8",
     "@xylabs/tsconfig": "~7.2.8",
-    "@xylabs/vitest-extended": "~5.0.24",
-    "@xyo-network/account": "~5.1.22",
-    "@xyo-network/archivist-acceptance-tests": "~5.1.22",
-    "@xyo-network/archivist-wrapper": "~5.1.22",
-    "@xyo-network/boundwitness-builder": "~5.1.22",
-    "@xyo-network/payload-builder": "~5.1.22",
+    "@xylabs/vitest-extended": "~5.0.37",
+    "@xyo-network/account": "~5.1.24",
+    "@xyo-network/archivist-acceptance-tests": "~5.1.24",
+    "@xyo-network/archivist-wrapper": "~5.1.24",
+    "@xyo-network/boundwitness-builder": "~5.1.24",
+    "@xyo-network/payload-builder": "~5.1.24",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.8"
+    "vitest": "~4.0.10"
   },
   "engines": {
     "node": ">=16"

package/src/ArchivistV2.ts

@@ -72,7 +72,7 @@ export class MongoDBArchivistV2 extends MongoDBArchivistBaseV2 {
         if (!payloadsResult.acknowledged) throw new Error('MongoDBArchivist: Error inserting Payloads')
       } catch (error) {
         const mongoError = error as MongoError
-        // NOTE: Intentional coercive equality since Mongo error codes are
+        // Intentional coercive equality since Mongo error codes are
         // of type string | number
         if (mongoError?.code != MONGODB_DUPLICATE_KEY_ERROR) throw error
       }

package/dist/node/lib/spec/validByType.spec.d.ts

@@ -1,2 +0,0 @@
-import '@xylabs/vitest-extended';
-//# sourceMappingURL=validByType.spec.d.ts.map

package/dist/node/lib/spec/validByType.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validByType.spec.d.ts","sourceRoot":"","sources":["../../../../src/lib/spec/validByType.spec.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAA"}

package/dist/node/spec/Archivist.spec.d.ts

@@ -1,2 +0,0 @@
-import '@xylabs/vitest-extended';
-//# sourceMappingURL=Archivist.spec.d.ts.map

package/dist/node/spec/Archivist.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Archivist.spec.d.ts","sourceRoot":"","sources":["../../../src/spec/Archivist.spec.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAA"}

package/dist/node/spec/ArchivistV2.spec.d.ts

@@ -1,2 +0,0 @@
-import '@xylabs/vitest-extended';
-//# sourceMappingURL=ArchivistV2.spec.d.ts.map

package/dist/node/spec/ArchivistV2.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ArchivistV2.spec.d.ts","sourceRoot":"","sources":["../../../src/spec/ArchivistV2.spec.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAA"}

package/src/lib/spec/validByType.spec.ts

@@ -1,91 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import { Account } from '@xyo-network/account'
-import type { ArchivistInsertQuery } from '@xyo-network/archivist-model'
-import { ArchivistInsertQuerySchema } from '@xyo-network/archivist-model'
-import { BoundWitnessBuilder, QueryBoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { Payload } from '@xyo-network/payload-model'
-import type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'
-import {
-  beforeAll, describe, expect, it,
-} from 'vitest'
-
-import { validByType } from '../validByType.js'
-
-type DebugPayloadWithMongoMeta = Partial<PayloadWithMongoMeta<{ nonce: string; schema: string }>> & { schema: string }
-
-describe('validByType', () => {
-  const account = Account.random()
-  describe('QueryBoundWitness with Payloads & nested BoundWitnesses', () => {
-    let result: [BoundWitness[], Payload[]]
-    beforeAll(async () => {
-      const payload1 = new PayloadBuilder<DebugPayloadWithMongoMeta>({ schema: 'network.xyo.debug' }).fields({ nonce: '1' }).build()
-      const payload2 = new PayloadBuilder<DebugPayloadWithMongoMeta>({ schema: 'network.xyo.debug' }).fields({ nonce: '2' }).build()
-      const [innerBw] = await (new BoundWitnessBuilder().signer(await account).payload(payload2)).build()
-      const outer = await (new BoundWitnessBuilder().signer(await account).payloads([payload1, innerBw as Payload])).build()
-      const queryPayload: ArchivistInsertQuery = { schema: ArchivistInsertQuerySchema }
-      const query = await (new QueryBoundWitnessBuilder().signer(await account).query(queryPayload)).build()
-      const values = await PayloadBuilder.addStorageMeta([query[0], outer[0], innerBw as Payload, payload1, payload2])
-      result = await validByType(values)
-    })
-    it('extracts the BoundWitnesses', () => {
-      expect(result).toBeArray()
-      expect(result?.[0]).toBeArrayOfSize(3)
-    })
-    it('extracts the Payloads', () => {
-      expect(result?.[1]).toBeArrayOfSize(2)
-    })
-  })
-  describe('BoundWitness with Payloads & nested BoundWitnesses', () => {
-    let result: [BoundWitness[], Payload[]]
-    beforeAll(async () => {
-      const payload1 = new PayloadBuilder<DebugPayloadWithMongoMeta>({ schema: 'network.xyo.debug' }).fields({ nonce: '1' }).build()
-      const payload2 = new PayloadBuilder<DebugPayloadWithMongoMeta>({ schema: 'network.xyo.debug' }).fields({ nonce: '2' }).build()
-      const [innerBw] = await (new BoundWitnessBuilder().signer(await account).payload(payload2)).build()
-      const outer = await (new BoundWitnessBuilder().signer(await account).payloads([payload1, innerBw as Payload])).build()
-      const values = await PayloadBuilder.addStorageMeta([outer[0], innerBw as Payload, payload1, payload2])
-      result = await validByType(values)
-    })
-    it('extracts the BoundWitnesses', () => {
-      expect(result).toBeArray()
-      expect(result?.[0]).toBeArrayOfSize(2)
-    })
-    it('extracts the Payloads', () => {
-      expect(result?.[1]).toBeArrayOfSize(2)
-    })
-  })
-  describe('BoundWitness with Payloads', () => {
-    let result: [BoundWitness[], Payload[]]
-    beforeAll(async () => {
-      const payload1 = new PayloadBuilder<DebugPayloadWithMongoMeta>({ schema: 'network.xyo.debug' }).fields({ nonce: '1' }).build()
-      const payload2 = new PayloadBuilder<DebugPayloadWithMongoMeta>({ schema: 'network.xyo.debug' }).fields({ nonce: '2' }).build()
-      const outer = await new BoundWitnessBuilder().signer(await account).payloads([payload1, payload2]).build()
-      const values = await PayloadBuilder.addStorageMeta([outer[0], payload1, payload2])
-      result = await validByType(values)
-    })
-    it('extracts the BoundWitnesses', () => {
-      expect(result).toBeArray()
-      expect(result?.[0]).toBeArrayOfSize(1)
-    })
-    it('extracts the Payloads', () => {
-      expect(result?.[1]).toBeArrayOfSize(2)
-    })
-  })
-  describe('BoundWitness without Payloads', () => {
-    let result: [BoundWitness[], Payload[]]
-    beforeAll(async () => {
-      const outer = await new BoundWitnessBuilder().signer(await account).build()
-      const values = await PayloadBuilder.addStorageMeta([outer[0]])
-      result = await validByType(values)
-    })
-    it('extracts the BoundWitnesses', () => {
-      expect(result).toBeArray()
-      expect(result?.[0]).toBeArrayOfSize(1)
-    })
-    it('extracts the Payloads', () => {
-      expect(result?.[1]).toBeArrayOfSize(0)
-    })
-  })
-})

package/src/spec/Archivist.spec.ts

@@ -1,159 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import { delay } from '@xylabs/delay'
-import type { BaseMongoSdkConfig } from '@xylabs/mongo'
-import { Account } from '@xyo-network/account'
-import type { ArchivistNextOptions } from '@xyo-network/archivist-model'
-import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
-import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { COLLECTIONS, hasMongoDBConfig } from '@xyo-network/module-abstract-mongodb'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { PayloadWrapperBase } from '@xyo-network/payload-wrapper'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-import {
-  beforeAll,
-  describe, expect, it,
-} from 'vitest'
-
-import { MongoDBArchivist } from '../Archivist.js'
-
-type TestDataGetter<T> = () => T
-
-describe.runIf(hasMongoDBConfig())('Archivist', () => {
-  const boundWitnessesConfig: BaseMongoSdkConfig = { collection: COLLECTIONS.BoundWitnesses }
-  const payloadsConfig: BaseMongoSdkConfig = { collection: COLLECTIONS.Payloads }
-
-  const payloadWrappers: PayloadWrapper[] = []
-  const boundWitnessWrappers: BoundWitnessWrapper[] = []
-  let archivist: ArchivistWrapper
-  beforeAll(async () => {
-    boundWitnessesConfig.dbConnectionString = process.env.MONGO_CONNECTION_STRING
-    payloadsConfig.dbConnectionString = process.env.MONGO_CONNECTION_STRING
-
-    const mod = await MongoDBArchivist.create({
-      account: 'random',
-      boundWitnessSdkConfig: boundWitnessesConfig,
-      config: { schema: MongoDBArchivist.defaultConfigSchema },
-      payloadSdkConfig: payloadsConfig,
-    })
-    archivist = new ArchivistWrapper({ mod: mod, account: await Account.random() })
-    const payload1 = { nonce: Date.now(), schema: 'network.xyo.debug' }
-    await delay(2)
-    const payload2 = { nonce: Date.now(), schema: 'network.xyo.test' }
-    await delay(2)
-    const payload3 = { nonce: Date.now(), schema: 'network.xyo.debug' }
-    await delay(2)
-    const payload4 = { nonce: Date.now(), schema: 'network.xyo.test' }
-    await delay(2)
-    const payloadWrapper1 = PayloadWrapper.wrap(payload1)
-    const payloadWrapper2 = PayloadWrapper.wrap(payload2)
-    const payloadWrapper3 = PayloadWrapper.wrap(payload3)
-    const payloadWrapper4 = PayloadWrapper.wrap(payload4)
-    payloadWrappers.push(payloadWrapper1, payloadWrapper2, payloadWrapper3, payloadWrapper4)
-    const signer = await Account.random()
-    const boundWitness1 = (await new BoundWitnessBuilder().payload(payloadWrapper1.payload).signer(signer).build())[0]
-    await delay(2)
-    const boundWitness2 = (await new BoundWitnessBuilder().payload(payloadWrapper2.payload).signer(signer).build())[0]
-    await delay(2)
-    const boundWitness3 = (
-      await new BoundWitnessBuilder().payloads([payloadWrapper3.payload, payloadWrapper4.payload]).signer(signer).build()
-    )[0]
-    const boundWitnessWrapper1 = BoundWitnessWrapper.parse(boundWitness1, [payload1])
-    const boundWitnessWrapper2 = BoundWitnessWrapper.parse(boundWitness2, [payload2])
-    const boundWitnessWrapper3 = BoundWitnessWrapper.parse(boundWitness3, [payload3, payload4])
-    boundWitnessWrappers.push(boundWitnessWrapper1, boundWitnessWrapper2, boundWitnessWrapper3)
-  })
-
-  describe('discover', () => {
-    it('discovers module', async () => {
-      const result = await archivist.state()
-      expect(result).toBeArray()
-      expect(result.length).toBeGreaterThan(0)
-    })
-  })
-  describe('insert', () => {
-    const cases: [string, TestDataGetter<PayloadWrapperBase[]>][] = [
-      ['inserts single payload', () => [payloadWrappers[0]]],
-      ['inserts multiple payloads', () => [payloadWrappers[1], payloadWrappers[2]]],
-      ['inserts single boundwitness', () => [boundWitnessWrappers[0]]],
-      ['inserts multiple boundwitness', () => [boundWitnessWrappers[1], boundWitnessWrappers[2]]],
-    ]
-    it.each(cases)('%s', async (_title, getData) => {
-      const payloads = getData()
-      const results = await archivist.insert(payloads.map(w => w.payload))
-      expect(results).toBeArrayOfSize(payloads.length)
-      for (const [i, result] of results.entries()) {
-        const payload = payloads[i]
-        expect(await PayloadBuilder.dataHash(result)).toEqual(await payload.dataHash())
-        expect(await PayloadBuilder.dataHash(result)).toEqual(await PayloadBuilder.dataHash(payload.payload))
-        expect(await PayloadBuilder.hash(result)).toEqual(await PayloadBuilder.hash(payload.payload))
-        expect(PayloadBuilder.omitStorageMeta(result)).toEqual(payload.payload)
-      }
-    })
-  })
-  describe('get', () => {
-    const cases: [string, TestDataGetter<PayloadWrapperBase[]>][] = [
-      ['gets single payload', () => [payloadWrappers[0]]],
-      ['gets multiple payloads', () => [payloadWrappers[1], payloadWrappers[2]]],
-      ['gets single boundwitness', () => [boundWitnessWrappers[0]]],
-      ['gets multiple boundwitness', () => [boundWitnessWrappers[1], boundWitnessWrappers[2]]],
-    ]
-    it.each(cases)('%s', async (_title, getData) => {
-      const payloads = getData()
-      const results = await archivist.get(await Promise.all(payloads.map(p => p.hash())))
-      for (const [i, result] of results.entries()) {
-        const payload = payloads[i]
-        expect(await PayloadBuilder.dataHash(result)).toEqual(await payload.dataHash())
-        expect(await PayloadBuilder.dataHash(result)).toEqual(await PayloadBuilder.dataHash(payload.payload))
-        expect(await PayloadBuilder.hash(result)).toEqual(await PayloadBuilder.hash(payload.payload))
-        expect(PayloadBuilder.omitStorageMeta(result)).toEqual(payload.payload)
-      }
-    })
-  })
-  // NOTE: Skipped because memory DB re-used by all tests
-  // causing these tests to be non-deterministic and fail
-  describe.skip('next', () => {
-    const payloads: BoundWitnessWrapper | PayloadWrapper[] = []
-    beforeAll(async () => {
-      for (let i = 0; i < 10; i++) {
-        const payload1 = { nonce: Date.now(), schema: 'network.xyo.debug' }
-        const payloadWrapper1 = PayloadWrapper.wrap(payload1)
-        await delay(2)
-        const payload2 = { nonce: Date.now(), schema: 'network.xyo.test' }
-        const payloadWrapper2 = PayloadWrapper.wrap(payload2)
-        await delay(2)
-        const signer = await Account.random()
-        const boundWitness = (await new BoundWitnessBuilder()
-          .payloads([payloadWrapper1, payloadWrapper2].map(p => p.payload))
-          .signer(signer)
-          .build())[0]
-        const boundWitnessWrapper = BoundWitnessWrapper.parse(boundWitness, [payload1, payload2])
-        await archivist.insert([boundWitnessWrapper.payload])
-        await delay(2)
-        await archivist.insert([payloadWrapper1.payload])
-        await delay(2)
-        await archivist.insert([payloadWrapper2.payload])
-        await delay(2)
-        payloads.push(boundWitnessWrapper, payloadWrapper1, payloadWrapper2)
-      }
-    })
-    describe('desc', () => {
-      describe('with no offset', () => {
-        it('returns payloads from the last one inserted in descending order', async () => {
-          const expected = payloads
-          const options: ArchivistNextOptions = { limit: expected.length, order: 'desc' }
-          const results = await archivist.next(options)
-          expect(results).toBeArrayOfSize(expected.length)
-          for (const [i, result] of results.toReversed().entries()) {
-            const payload = expected[i]
-            expect(await PayloadBuilder.dataHash(result)).toEqual(await payload.dataHash())
-            expect(await PayloadBuilder.dataHash(result)).toEqual(await PayloadBuilder.dataHash(payload.payload))
-            expect(await PayloadBuilder.hash(result)).toEqual(await PayloadBuilder.hash(payload.payload))
-            expect(result).toEqual(payload.payload)
-          }
-        })
-      })
-    })
-  })
-})

package/src/spec/ArchivistV2.spec.ts

@@ -1,125 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import { delay } from '@xylabs/delay'
-import type { BaseMongoSdkConfig } from '@xylabs/mongo'
-import { Account } from '@xyo-network/account'
-import { generateArchivistNextTests } from '@xyo-network/archivist-acceptance-tests'
-import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
-import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { hasMongoDBConfig } from '@xyo-network/module-abstract-mongodb'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { Payload } from '@xyo-network/payload-model'
-import {
-  beforeAll,
-  describe, expect, it,
-} from 'vitest'
-
-import { MongoDBArchivistV2 } from '../ArchivistV2.ts'
-
-type TestDataGetter<T> = () => T
-
-describe.runIf(hasMongoDBConfig())('ArchivistV2', () => {
-  const payloadsConfig: BaseMongoSdkConfig = { collection: 'test' }
-  const payloads: Payload[] = []
-  const boundWitnesses: BoundWitness[] = []
-  let archivist: ArchivistWrapper
-  beforeAll(async () => {
-    payloadsConfig.dbConnectionString = process.env.MONGO_CONNECTION_STRING
-    const mod = await MongoDBArchivistV2.create({
-      account: 'random',
-      config: { schema: MongoDBArchivistV2.defaultConfigSchema },
-      payloadSdkConfig: payloadsConfig,
-    })
-    await mod.start()
-    archivist = new ArchivistWrapper({ mod: mod, account: await Account.random() })
-    const payload1: Payload = new PayloadBuilder({ schema: 'network.xyo.debug' }).fields({ nonce: Date.now() }).build()
-    await delay(2)
-    const payload2: Payload = new PayloadBuilder({ schema: 'network.xyo.test' }).fields({ nonce: Date.now() }).build()
-    await delay(2)
-    const payload3: Payload = new PayloadBuilder({ schema: 'network.xyo.debug' }).fields({ nonce: Date.now() }).build()
-    await delay(2)
-    const payload4: Payload = new PayloadBuilder({ schema: 'network.xyo.test' }).fields({ nonce: Date.now() }).build()
-    await delay(2)
-    payloads.push(payload1, payload2, payload3, payload4)
-    const signer = await Account.random()
-    const boundWitness1 = (await new BoundWitnessBuilder().payload(payload1).signer(signer).build())[0]
-    await delay(2)
-    const boundWitness2 = (await new BoundWitnessBuilder().payload(payload2).signer(signer).build())[0]
-    await delay(2)
-    const boundWitness3 = (
-      await new BoundWitnessBuilder().payloads([payload3, payload4]).signer(signer).build()
-    )[0]
-    boundWitnesses.push(boundWitness1, boundWitness2, boundWitness3)
-  }, 1_000_000)
-
-  describe('discover', () => {
-    it('discovers module', async () => {
-      const result = await archivist.state()
-      expect(result).toBeArray()
-      expect(result.length).toBeGreaterThan(0)
-    })
-  })
-  describe('insert', () => {
-    const cases: [string, TestDataGetter<Payload[]>][] = [
-      ['inserts single payload', () => [payloads[0]]],
-      ['inserts multiple payloads', () => [payloads[1], payloads[2]]],
-      ['inserts single boundwitness', () => [boundWitnesses[0]]],
-      ['inserts multiple boundwitness', () => [boundWitnesses[1], boundWitnesses[2]]],
-    ]
-    it.each(cases)('%s', async (_title, getData) => {
-      const payloads = getData()
-      const results = await archivist.insert(payloads)
-      expect(results).toBeArrayOfSize(payloads.length)
-      for (const [i, result] of results.entries()) {
-        const payload = payloads[i]
-        expect(await PayloadBuilder.dataHash(result)).toEqual(await PayloadBuilder.dataHash(payload))
-        expect(await PayloadBuilder.hash(result)).toEqual(await PayloadBuilder.hash(payload))
-        expect(PayloadBuilder.omitStorageMeta(result)).toEqual(payload)
-      }
-    })
-  })
-  describe('insert (duplicates)', () => {
-    const cases: [string, TestDataGetter<Payload[]>][] = [
-      ['inserts single payload', () => [payloads[0]]],
-      ['inserts multiple payloads', () => [payloads[1], payloads[2]]],
-      ['inserts single boundwitness', () => [boundWitnesses[0]]],
-      ['inserts multiple boundwitness', () => [boundWitnesses[1], boundWitnesses[2]]],
-    ]
-    it.each(cases)('%s', async (_title, getData) => {
-      const payloads = getData()
-      const results = await archivist.insert(payloads)
-      expect(results).toBeArrayOfSize(0)
-      for (const [i, result] of results.entries()) {
-        const payload = payloads[i]
-        expect(await PayloadBuilder.dataHash(result)).toEqual(await PayloadBuilder.dataHash(payload))
-        expect(await PayloadBuilder.hash(result)).toEqual(await PayloadBuilder.hash(payload))
-        expect(PayloadBuilder.omitStorageMeta(result)).toEqual(payload)
-      }
-    })
-  })
-  describe('get', () => {
-    const cases: [string, TestDataGetter<Payload[]>][] = [
-      ['gets single payload', () => [payloads[0]]],
-      ['gets multiple payloads', () => [payloads[1], payloads[2]]],
-      ['gets single boundwitness', () => [boundWitnesses[0]]],
-      ['gets multiple boundwitness', () => [boundWitnesses[1], boundWitnesses[2]]],
-    ]
-    it.each(cases)('%s', async (_title, getData) => {
-      const payloads = getData()
-      const hashes = await PayloadBuilder.hashes(payloads)
-      const results = await archivist.get(hashes)
-      expect(results).toBeArrayOfSize(payloads.length)
-      for (const [i, result] of results.entries()) {
-        const payload = payloads[i]
-        expect(PayloadBuilder.omitStorageMeta(result)).toEqual(payload)
-        expect(await PayloadBuilder.dataHash(result)).toEqual(await PayloadBuilder.dataHash(payload))
-        expect(await PayloadBuilder.hash(result)).toEqual(await PayloadBuilder.hash(payload))
-        expect(PayloadBuilder.omitStorageMeta(result)).toEqual(payload)
-      }
-    })
-  })
-  generateArchivistNextTests(() => {
-    return Promise.resolve(archivist)
-  })
-})