@xyo-network/archivist-mongodb 2.83.0 → 2.84.0-rc.1

package/dist/node/index.js

@@ -8,53 +8,38 @@ var __publicField = (obj, key, value) => {
 
 // src/Archivist.ts
 import { exists } from "@xylabs/exists";
-import { fulfilledValues } from "@xylabs/promise";
 import { AbstractArchivist } from "@xyo-network/archivist-abstract";
 import { ArchivistConfigSchema, ArchivistInsertQuerySchema } from "@xyo-network/archivist-model";
 import { MongoDBArchivistConfigSchema } from "@xyo-network/archivist-model-mongodb";
 import { MongoDBModuleMixin } from "@xyo-network/module-abstract-mongodb";
-import { PayloadWrapper as PayloadWrapper3 } from "@xyo-network/payload-wrapper";
-
-// src/lib/toBoundWitnessWithMeta.ts
-var toBoundWitnessWithMeta = /* @__PURE__ */ __name(async (wrapper) => {
-  const bw = wrapper.boundwitness;
-  return {
-    ...bw,
-    _hash: await wrapper.hashAsync(),
-    _timestamp: Date.now()
-  };
-}, "toBoundWitnessWithMeta");
+import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
 
-// src/lib/toPayloadWithMeta.ts
-var toPayloadWithMeta = /* @__PURE__ */ __name(async (wrapper) => {
+// src/lib/toPayloadWithMongoMeta.ts
+import { PayloadBuilder } from "@xyo-network/payload-builder";
+var toPayloadWithMongoMeta = /* @__PURE__ */ __name(async (payload) => {
+  const built = await PayloadBuilder.build(payload);
+  const _hash = await PayloadBuilder.hash(built);
+  const { $hash, $meta, ...fields } = built;
   return {
-    ...wrapper.payload(),
-    _hash: await wrapper.hashAsync(),
+    ...fields,
+    _$hash: $hash,
+    _$meta: $meta,
+    _hash,
     _timestamp: Date.now()
   };
-}, "toPayloadWithMeta");
+}, "toPayloadWithMongoMeta");
 
 // src/lib/toReturnValue.ts
-import { PayloadWrapper } from "@xyo-network/payload-wrapper";
+import { deepOmitPrefixedFields } from "@xyo-network/hash";
 var toReturnValue = /* @__PURE__ */ __name((value) => {
-  const _signatures = value == null ? void 0 : value._signatures;
-  if (_signatures) {
-    return {
-      ...PayloadWrapper.wrap(value).body(),
-      _signatures
-    };
-  } else {
-    return {
-      ...PayloadWrapper.wrap(value).body()
-    };
-  }
+  return deepOmitPrefixedFields(value, "_");
 }, "toReturnValue");
 
 // src/lib/validByType.ts
 import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-builder";
 import { isBoundWitness, isQueryBoundWitness } from "@xyo-network/boundwitness-model";
 import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
-import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
+import { PayloadWrapper } from "@xyo-network/payload-wrapper";
 var validByType = /* @__PURE__ */ __name(async (payloads = []) => {
   const results = [
     [],
@@ -63,16 +48,20 @@ var validByType = /* @__PURE__ */ __name(async (payloads = []) => {
   await Promise.all(payloads.map(async (payload) => {
     if (isBoundWitness(payload)) {
       const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper;
-      const bw = wrapper.parse(payload);
+      const bw = await wrapper.parse(payload);
       if (await bw.getValid()) {
-        results[0].push(bw);
+        results[0].push(bw.jsonPayload());
+      } else {
+        const errors = await bw.getErrors();
+        console.log(`validByType.Error: ${JSON.stringify(errors, null, 2)}`);
       }
     } else {
-      const payloadWrapper = PayloadWrapper2.wrap(payload);
+      const payloadWrapper = await PayloadWrapper.wrap(payload);
       if (await payloadWrapper.getValid()) {
-        results[1].push(payloadWrapper);
+        results[1].push(payloadWrapper.jsonPayload());
       }
     }
+    return;
   }));
   return results;
 }, "validByType");
@@ -88,37 +77,62 @@ var _MongoDBArchivist = class _MongoDBArchivist extends MongoDBArchivistBase {
     const head = await (await this.payloads.find({})).sort({
       _timestamp: -1
     }).limit(1).toArray();
-    return head[0] ? PayloadWrapper3.wrap(head[0]).body() : void 0;
+    return head[0] ? (await PayloadWrapper2.wrap(head[0])).jsonPayload() : void 0;
   }
   async getHandler(hashes) {
-    const payloads = hashes.map((_hash) => this.payloads.findOne({
+    let remainingHashes = [
+      ...hashes
+    ];
+    const dataPayloads = (await Promise.all(remainingHashes.map((_$hash) => this.payloads.findOne({
+      _$hash
+    })))).filter(exists);
+    const dataPayloadsHashes = dataPayloads.map((payload) => payload._$hash);
+    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.includes(hash));
+    const dataBws = (await Promise.all(remainingHashes.map((_$hash) => this.boundWitnesses.findOne({
+      _$hash
+    })))).filter(exists);
+    const dataBwsHashes = dataBws.map((payload) => payload._$hash);
+    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.includes(hash));
+    const payloads = (await Promise.all(remainingHashes.map((_hash) => this.payloads.findOne({
       _hash
-    }));
-    const bws = hashes.map((_hash) => this.boundWitnesses.findOne({
+    })))).filter(exists);
+    const payloadsHashes = payloads.map((payload) => payload._hash);
+    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.includes(hash));
+    const bws = (await Promise.all(remainingHashes.map((_hash) => this.boundWitnesses.findOne({
       _hash
-    }));
-    const gets = await Promise.allSettled([
-      payloads,
-      bws
-    ].flat());
-    const succeeded = gets.reduce(fulfilledValues, []);
-    return succeeded.filter(exists).map(toReturnValue);
+    })))).filter(exists);
+    const bwsHashes = bws.map((payload) => payload._hash);
+    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.includes(hash));
+    const foundPayloads = [
+      ...dataPayloads,
+      ...dataBws,
+      ...payloads,
+      ...bws
+    ];
+    return foundPayloads.map(({ _$hash, _$meta, ...other }) => ({
+      $hash: _$hash,
+      $meta: _$meta,
+      ...other
+    })).map(toReturnValue);
   }
   async insertHandler(payloads) {
     const [bw, p] = await validByType(payloads);
-    const payloadsWithMeta = await Promise.all(p.map((x) => toPayloadWithMeta(x)));
-    if (payloadsWithMeta.length) {
-      const payloadsResult = await this.payloads.insertMany(payloadsWithMeta);
-      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithMeta.length)
+    const payloadsWithExternalMeta = await Promise.all(p.map((x) => toPayloadWithMongoMeta(x)));
+    if (payloadsWithExternalMeta.length) {
+      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta);
+      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)
         throw new Error("MongoDBDeterministicArchivist: Error inserting Payloads");
     }
-    const boundWitnesses = await Promise.all(bw.map((x) => toBoundWitnessWithMeta(x)));
-    if (boundWitnesses.length) {
-      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnesses);
-      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnesses.length)
+    const boundWitnessesWithExternalMeta = await Promise.all(bw.map((x) => toPayloadWithMongoMeta(x)));
+    if (boundWitnessesWithExternalMeta.length) {
+      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta);
+      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)
         throw new Error("MongoDBDeterministicArchivist: Error inserting BoundWitnesses");
     }
-    return payloads ?? [];
+    return [
+      ...boundWitnessesWithExternalMeta,
+      ...payloadsWithExternalMeta
+    ];
   }
   async startHandler() {
     await super.startHandler();

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/toBoundWitnessWithMeta.ts","../../src/lib/toPayloadWithMeta.ts","../../src/lib/toReturnValue.ts","../../src/lib/validByType.ts","../../src/index.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport { fulfilledValues } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport { ArchivistConfigSchema, ArchivistInsertQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWithPartialMeta } from '@xyo-network/payload-mongodb'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { toBoundWitnessWithMeta, toPayloadWithMeta, toReturnValue, validByType } from './lib'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override configSchemas = [MongoDBArchivistConfigSchema, ArchivistConfigSchema]\n\n  override readonly queries: string[] = [ArchivistInsertQuerySchema, ...super.queries]\n\n  override async head(): Promise<Payload | undefined> {\n    const head = await (await this.payloads.find({})).sort({ _timestamp: -1 }).limit(1).toArray()\n    return head[0] ? PayloadWrapper.wrap(head[0]).body() : undefined\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = hashes.map((_hash) => this.payloads.findOne({ _hash }))\n    const bws = hashes.map((_hash) => this.boundWitnesses.findOne({ _hash }))\n    const gets = await Promise.allSettled([payloads, bws].flat())\n    const succeeded = gets.reduce<(PayloadWithPartialMeta | null)[]>(fulfilledValues, []) as Payload[]\n    return succeeded.filter(exists).map(toReturnValue)\n  }\n\n  protected override async insertHandler(payloads?: Payload[]): Promise<Payload[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithMeta = await Promise.all(p.map((x) => toPayloadWithMeta(x)))\n    if (payloadsWithMeta.length) {\n      const payloadsResult = await this.payloads.insertMany(payloadsWithMeta)\n      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithMeta.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting Payloads')\n    }\n    const boundWitnesses = await Promise.all(bw.map((x) => toBoundWitnessWithMeta(x)))\n    if (boundWitnesses.length) {\n      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnesses)\n      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnesses.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting BoundWitnesses')\n    }\n    return payloads ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n    return true\n  }\n}\n","import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { BoundWitnessWithMeta } from '@xyo-network/payload-mongodb'\n\nexport const toBoundWitnessWithMeta = async (wrapper: BoundWitnessWrapper | QueryBoundWitnessWrapper): Promise<BoundWitnessWithMeta> => {\n  const bw = wrapper.boundwitness as BoundWitness\n  return { ...bw, _hash: await wrapper.hashAsync(), _timestamp: Date.now() }\n}\n","import { PayloadWithMeta } from '@xyo-network/payload-mongodb'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const toPayloadWithMeta = async (wrapper: PayloadWrapper): Promise<PayloadWithMeta> => {\n  return { ...wrapper.payload(), _hash: await wrapper.hashAsync(), _timestamp: Date.now() }\n}\n","import { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const toReturnValue = (value: Payload | BoundWitness): Payload => {\n  const _signatures = (value as BoundWitness)?._signatures\n  if (_signatures) {\n    return { ...PayloadWrapper.wrap(value).body(), _signatures } as BoundWitness\n  } else {\n    return { ...PayloadWrapper.wrap(value).body() }\n  }\n}\n","import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: Payload[] = []) => {\n  const results: [BoundWitnessWrapper[], PayloadWrapper[]] = [[], []]\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(bw)\n        }\n      } else {\n        const payloadWrapper = PayloadWrapper.wrap(payload)\n        if (await payloadWrapper.getValid()) {\n          results[1].push(payloadWrapper)\n        }\n      }\n    }),\n  )\n  return results\n}\n","export * from './Archivist'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":"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","names":["exists","fulfilledValues","AbstractArchivist","ArchivistConfigSchema","ArchivistInsertQuerySchema","MongoDBArchivistConfigSchema","MongoDBModuleMixin","PayloadWrapper","toBoundWitnessWithMeta","wrapper","bw","boundwitness","_hash","hashAsync","_timestamp","Date","now","toPayloadWithMeta","wrapper","payload","_hash","hashAsync","_timestamp","Date","now","PayloadWrapper","toReturnValue","value","_signatures","PayloadWrapper","wrap","body","QueryBoundWitnessWrapper","isBoundWitness","isQueryBoundWitness","BoundWitnessWrapper","PayloadWrapper","validByType","payloads","results","Promise","all","map","payload","isBoundWitness","wrapper","isQueryBoundWitness","QueryBoundWitnessWrapper","BoundWitnessWrapper","bw","parse","getValid","push","payloadWrapper","PayloadWrapper","wrap","MongoDBArchivistBase","MongoDBModuleMixin","AbstractArchivist","MongoDBArchivist","queries","ArchivistInsertQuerySchema","head","payloads","find","sort","_timestamp","limit","toArray","PayloadWrapper","wrap","body","undefined","getHandler","hashes","map","_hash","findOne","bws","boundWitnesses","gets","Promise","allSettled","flat","succeeded","reduce","fulfilledValues","filter","exists","toReturnValue","insertHandler","bw","p","validByType","payloadsWithMeta","all","x","toPayloadWithMeta","length","payloadsResult","insertMany","acknowledged","insertedCount","Error","toBoundWitnessWithMeta","boundWitnessesResult","startHandler","ensureIndexes","configSchemas","MongoDBArchivistConfigSchema","ArchivistConfigSchema"]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/toPayloadWithMongoMeta.ts","../../src/lib/toReturnValue.ts","../../src/lib/validByType.ts","../../src/index.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport { Hash } from '@xylabs/hex'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport { ArchivistConfigSchema, ArchivistInsertQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { toPayloadWithMongoMeta, toReturnValue, validByType } from './lib'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override configSchemas = [MongoDBArchivistConfigSchema, ArchivistConfigSchema]\n\n  override readonly queries: string[] = [ArchivistInsertQuerySchema, ...super.queries]\n\n  override async head(): Promise<Payload | undefined> {\n    const head = await (await this.payloads.find({})).sort({ _timestamp: -1 }).limit(1).toArray()\n    return head[0] ? (await PayloadWrapper.wrap(head[0])).jsonPayload() : undefined\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads = (await Promise.all(remainingHashes.map((_$hash) => this.payloads.findOne({ _$hash })))).filter(exists)\n    const dataPayloadsHashes = dataPayloads.map((payload) => payload._$hash)\n    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.includes(hash))\n\n    const dataBws = (await Promise.all(remainingHashes.map((_$hash) => this.boundWitnesses.findOne({ _$hash })))).filter(exists)\n    const dataBwsHashes = dataBws.map((payload) => payload._$hash)\n    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.includes(hash))\n\n    const payloads = (await Promise.all(remainingHashes.map((_hash) => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = payloads.map((payload) => payload._hash)\n    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.includes(hash))\n\n    const bws = (await Promise.all(remainingHashes.map((_hash) => this.boundWitnesses.findOne({ _hash })))).filter(exists)\n    const bwsHashes = bws.map((payload) => payload._hash)\n    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.includes(hash))\n\n    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload & { _$hash: Hash; _$meta?: unknown }>[]\n    return foundPayloads.map(({ _$hash, _$meta, ...other }) => ({ $hash: _$hash, $meta: _$meta, ...other })).map(toReturnValue)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithExternalMeta = await Promise.all(p.map((x) => toPayloadWithMongoMeta(x)))\n    if (payloadsWithExternalMeta.length) {\n      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)\n      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting Payloads')\n    }\n    const boundWitnessesWithExternalMeta = await Promise.all(bw.map((x) => toPayloadWithMongoMeta(x)))\n    if (boundWitnessesWithExternalMeta.length) {\n      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)\n      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting BoundWitnesses')\n    }\n\n    return [...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n    return true\n  }\n}\n","import { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\n\nexport const toPayloadWithMongoMeta = async <T extends Payload>(payload: T): Promise<PayloadWithMongoMeta<T>> => {\n  const built = await PayloadBuilder.build(payload)\n  const _hash = await PayloadBuilder.hash(built)\n  const { $hash, $meta, ...fields } = built\n  return { ...fields, _$hash: $hash, _$meta: $meta, _hash, _timestamp: Date.now() } as PayloadWithMongoMeta<T>\n}\n","import { deepOmitPrefixedFields } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport const toReturnValue = (value: Payload): Payload => {\n  return deepOmitPrefixedFields(value, '_')\n}\n","import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { BoundWitness, isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: Payload[] = []) => {\n  const results: [BoundWitness[], Payload[]] = [[], []]\n  await Promise.all(\n    payloads.map(async (payload) => {\n      if (isBoundWitness(payload)) {\n        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper\n        const bw = await wrapper.parse(payload)\n        if (await bw.getValid()) {\n          results[0].push(bw.jsonPayload())\n        } else {\n          const errors = await bw.getErrors()\n          console.log(`validByType.Error: ${JSON.stringify(errors, null, 2)}`)\n        }\n      } else {\n        const payloadWrapper = await PayloadWrapper.wrap(payload)\n        if (await payloadWrapper.getValid()) {\n          results[1].push(payloadWrapper.jsonPayload())\n        }\n      }\n      return\n    }),\n  )\n  return results\n}\n","export * from './Archivist'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":"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","names":["exists","AbstractArchivist","ArchivistConfigSchema","ArchivistInsertQuerySchema","MongoDBArchivistConfigSchema","MongoDBModuleMixin","PayloadWrapper","PayloadBuilder","toPayloadWithMongoMeta","payload","built","PayloadBuilder","build","_hash","hash","$hash","$meta","fields","_$hash","_$meta","_timestamp","Date","now","deepOmitPrefixedFields","toReturnValue","value","deepOmitPrefixedFields","QueryBoundWitnessWrapper","isBoundWitness","isQueryBoundWitness","BoundWitnessWrapper","PayloadWrapper","validByType","payloads","results","Promise","all","map","payload","isBoundWitness","wrapper","isQueryBoundWitness","QueryBoundWitnessWrapper","BoundWitnessWrapper","bw","parse","getValid","push","jsonPayload","errors","getErrors","console","log","JSON","stringify","payloadWrapper","PayloadWrapper","wrap","MongoDBArchivistBase","MongoDBModuleMixin","AbstractArchivist","MongoDBArchivist","queries","ArchivistInsertQuerySchema","head","payloads","find","sort","_timestamp","limit","toArray","PayloadWrapper","wrap","jsonPayload","undefined","getHandler","hashes","remainingHashes","dataPayloads","Promise","all","map","_$hash","findOne","filter","exists","dataPayloadsHashes","payload","hash","includes","dataBws","boundWitnesses","dataBwsHashes","_hash","payloadsHashes","bws","bwsHashes","foundPayloads","_$meta","other","$hash","$meta","toReturnValue","insertHandler","bw","p","validByType","payloadsWithExternalMeta","x","toPayloadWithMongoMeta","length","payloadsResult","insertMany","acknowledged","insertedCount","Error","boundWitnessesWithExternalMeta","boundWitnessesResult","startHandler","ensureIndexes","configSchemas","MongoDBArchivistConfigSchema","ArchivistConfigSchema"]}

package/dist/node/lib/index.d.cts

@@ -1,5 +1,4 @@
-export * from './toBoundWitnessWithMeta';
-export * from './toPayloadWithMeta';
+export * from './toPayloadWithMongoMeta';
 export * from './toReturnValue';
 export * from './validByType';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/lib/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}

package/dist/node/lib/index.d.mts

@@ -1,5 +1,4 @@
-export * from './toBoundWitnessWithMeta';
-export * from './toPayloadWithMeta';
+export * from './toPayloadWithMongoMeta';
 export * from './toReturnValue';
 export * from './validByType';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/lib/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}

package/dist/node/lib/index.d.ts

@@ -1,5 +1,4 @@
-export * from './toBoundWitnessWithMeta';
-export * from './toPayloadWithMeta';
+export * from './toPayloadWithMongoMeta';
 export * from './toReturnValue';
 export * from './validByType';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}

package/dist/node/lib/toPayloadWithMongoMeta.d.cts

@@ -0,0 +1,5 @@
+import { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb';
+export declare const toPayloadWithMongoMeta: <T extends {
+    schema: string;
+} & object>(payload: T) => Promise<PayloadWithMongoMeta<T>>;
+//# sourceMappingURL=toPayloadWithMongoMeta.d.ts.map

package/dist/node/lib/toPayloadWithMongoMeta.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toPayloadWithMongoMeta.d.ts","sourceRoot":"","sources":["../../../src/lib/toPayloadWithMongoMeta.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAEnE,eAAO,MAAM,sBAAsB;;2DAKlC,CAAA"}

package/dist/node/lib/toPayloadWithMongoMeta.d.mts

@@ -0,0 +1,5 @@
+import { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb';
+export declare const toPayloadWithMongoMeta: <T extends {
+    schema: string;
+} & object>(payload: T) => Promise<PayloadWithMongoMeta<T>>;
+//# sourceMappingURL=toPayloadWithMongoMeta.d.ts.map

package/dist/node/lib/toPayloadWithMongoMeta.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toPayloadWithMongoMeta.d.ts","sourceRoot":"","sources":["../../../src/lib/toPayloadWithMongoMeta.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAEnE,eAAO,MAAM,sBAAsB;;2DAKlC,CAAA"}

package/dist/node/lib/toPayloadWithMongoMeta.d.ts

@@ -0,0 +1,5 @@
+import { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb';
+export declare const toPayloadWithMongoMeta: <T extends {
+    schema: string;
+} & object>(payload: T) => Promise<PayloadWithMongoMeta<T>>;
+//# sourceMappingURL=toPayloadWithMongoMeta.d.ts.map

package/dist/node/lib/toPayloadWithMongoMeta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toPayloadWithMongoMeta.d.ts","sourceRoot":"","sources":["../../../src/lib/toPayloadWithMongoMeta.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAEnE,eAAO,MAAM,sBAAsB;;2DAKlC,CAAA"}

package/dist/node/lib/toReturnValue.d.cts

@@ -1,4 +1,3 @@
-import { BoundWitness } from '@xyo-network/boundwitness-model';
 import { Payload } from '@xyo-network/payload-model';
-export declare const toReturnValue: (value: Payload | BoundWitness) => Payload;
+export declare const toReturnValue: (value: Payload) => Payload;
 //# sourceMappingURL=toReturnValue.d.ts.map

package/dist/node/lib/toReturnValue.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"toReturnValue.d.ts","sourceRoot":"","sources":["../../../src/lib/toReturnValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,eAAO,MAAM,aAAa,UAAW,OAAO,GAAG,YAAY,KAAG,OAO7D,CAAA"}
+{"version":3,"file":"toReturnValue.d.ts","sourceRoot":"","sources":["../../../src/lib/toReturnValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,aAAa,UAAW,OAAO,KAAG,OAE9C,CAAA"}

package/dist/node/lib/toReturnValue.d.mts

@@ -1,4 +1,3 @@
-import { BoundWitness } from '@xyo-network/boundwitness-model';
 import { Payload } from '@xyo-network/payload-model';
-export declare const toReturnValue: (value: Payload | BoundWitness) => Payload;
+export declare const toReturnValue: (value: Payload) => Payload;
 //# sourceMappingURL=toReturnValue.d.ts.map

package/dist/node/lib/toReturnValue.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"toReturnValue.d.ts","sourceRoot":"","sources":["../../../src/lib/toReturnValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,eAAO,MAAM,aAAa,UAAW,OAAO,GAAG,YAAY,KAAG,OAO7D,CAAA"}
+{"version":3,"file":"toReturnValue.d.ts","sourceRoot":"","sources":["../../../src/lib/toReturnValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,aAAa,UAAW,OAAO,KAAG,OAE9C,CAAA"}

package/dist/node/lib/toReturnValue.d.ts

@@ -1,4 +1,3 @@
-import { BoundWitness } from '@xyo-network/boundwitness-model';
 import { Payload } from '@xyo-network/payload-model';
-export declare const toReturnValue: (value: Payload | BoundWitness) => Payload;
+export declare const toReturnValue: (value: Payload) => Payload;
 //# sourceMappingURL=toReturnValue.d.ts.map

package/dist/node/lib/toReturnValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toReturnValue.d.ts","sourceRoot":"","sources":["../../../src/lib/toReturnValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,eAAO,MAAM,aAAa,UAAW,OAAO,GAAG,YAAY,KAAG,OAO7D,CAAA"}
+{"version":3,"file":"toReturnValue.d.ts","sourceRoot":"","sources":["../../../src/lib/toReturnValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,aAAa,UAAW,OAAO,KAAG,OAE9C,CAAA"}

package/dist/node/lib/validByType.d.cts

@@ -1,11 +1,7 @@
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
 import { Payload } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare const validByType: (payloads?: Payload[]) => Promise<[BoundWitnessWrapper<import("@xyo-network/payload-model").SchemaFields & object & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
+export declare const validByType: (payloads?: Payload[]) => Promise<[(import("@xyo-network/payload-model").SchemaFields & object & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
     schema: "network.xyo.boundwitness";
-}, {
+})[], ({
     schema: string;
-} & object>[], PayloadWrapper<{
-    schema: string;
-} & object>[]]>;
+} & object)[]]>;
 //# sourceMappingURL=validByType.d.ts.map

package/dist/node/lib/validByType.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"validByType.d.ts","sourceRoot":"","sources":["../../../src/lib/validByType.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,eAAO,MAAM,WAAW,cAAoB,OAAO,EAAE;;;;;;eAmBpD,CAAA"}
+{"version":3,"file":"validByType.d.ts","sourceRoot":"","sources":["../../../src/lib/validByType.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,eAAO,MAAM,WAAW,cAAoB,OAAO,EAAE;;;;eAuBpD,CAAA"}

package/dist/node/lib/validByType.d.mts

@@ -1,11 +1,7 @@
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
 import { Payload } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare const validByType: (payloads?: Payload[]) => Promise<[BoundWitnessWrapper<import("@xyo-network/payload-model").SchemaFields & object & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
+export declare const validByType: (payloads?: Payload[]) => Promise<[(import("@xyo-network/payload-model").SchemaFields & object & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
     schema: "network.xyo.boundwitness";
-}, {
+})[], ({
     schema: string;
-} & object>[], PayloadWrapper<{
-    schema: string;
-} & object>[]]>;
+} & object)[]]>;
 //# sourceMappingURL=validByType.d.ts.map

package/dist/node/lib/validByType.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"validByType.d.ts","sourceRoot":"","sources":["../../../src/lib/validByType.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,eAAO,MAAM,WAAW,cAAoB,OAAO,EAAE;;;;;;eAmBpD,CAAA"}
+{"version":3,"file":"validByType.d.ts","sourceRoot":"","sources":["../../../src/lib/validByType.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,eAAO,MAAM,WAAW,cAAoB,OAAO,EAAE;;;;eAuBpD,CAAA"}

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

@@ -1,11 +1,7 @@
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
 import { Payload } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare const validByType: (payloads?: Payload[]) => Promise<[BoundWitnessWrapper<import("@xyo-network/payload-model").SchemaFields & object & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
+export declare const validByType: (payloads?: Payload[]) => Promise<[(import("@xyo-network/payload-model").SchemaFields & object & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
     schema: "network.xyo.boundwitness";
-}, {
+})[], ({
     schema: string;
-} & object>[], PayloadWrapper<{
-    schema: string;
-} & object>[]]>;
+} & object)[]]>;
 //# sourceMappingURL=validByType.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validByType.d.ts","sourceRoot":"","sources":["../../../src/lib/validByType.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,eAAO,MAAM,WAAW,cAAoB,OAAO,EAAE;;;;;;eAmBpD,CAAA"}
+{"version":3,"file":"validByType.d.ts","sourceRoot":"","sources":["../../../src/lib/validByType.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,eAAO,MAAM,WAAW,cAAoB,OAAO,EAAE;;;;eAuBpD,CAAA"}

package/package.json

@@ -10,29 +10,31 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/exists": "^2.13.23",
-    "@xylabs/promise": "^2.13.23",
-    "@xyo-network/archivist-abstract": "^2.86.1",
-    "@xyo-network/archivist-model": "^2.86.1",
-    "@xyo-network/archivist-model-mongodb": "~2.83.0",
-    "@xyo-network/boundwitness-builder": "^2.86.1",
-    "@xyo-network/boundwitness-model": "^2.86.1",
-    "@xyo-network/boundwitness-wrapper": "^2.86.1",
-    "@xyo-network/module-abstract-mongodb": "~2.83.0",
-    "@xyo-network/payload-model": "^2.86.1",
-    "@xyo-network/payload-mongodb": "~2.83.0",
-    "@xyo-network/payload-wrapper": "^2.86.1"
+    "@xylabs/exists": "^2.14.0",
+    "@xylabs/hex": "^2.14.0",
+    "@xyo-network/archivist-abstract": "^2.89.0-rc.12",
+    "@xyo-network/archivist-model": "^2.89.0-rc.12",
+    "@xyo-network/archivist-model-mongodb": "~2.84.0-rc.1",
+    "@xyo-network/boundwitness-builder": "^2.89.0-rc.12",
+    "@xyo-network/boundwitness-model": "^2.89.0-rc.12",
+    "@xyo-network/boundwitness-wrapper": "^2.89.0-rc.12",
+    "@xyo-network/hash": "^2.89.0-rc.12",
+    "@xyo-network/module-abstract-mongodb": "~2.84.0-rc.1",
+    "@xyo-network/payload-builder": "^2.89.0-rc.12",
+    "@xyo-network/payload-model": "^2.89.0-rc.12",
+    "@xyo-network/payload-mongodb": "~2.84.0-rc.1",
+    "@xyo-network/payload-wrapper": "^2.89.0-rc.12"
   },
   "devDependencies": {
-    "@xylabs/arraybuffer": "^2.13.23",
-    "@xylabs/jest-helpers": "^2.13.23",
-    "@xylabs/ts-scripts-yarn3": "^3.2.28",
-    "@xylabs/tsconfig": "^3.2.28",
-    "@xyo-network/account": "^2.86.1",
-    "@xyo-network/account-model": "^2.86.1",
-    "@xyo-network/archivist-wrapper": "^2.86.1",
-    "@xyo-network/payload-builder": "^2.86.1",
-    "@xyo-network/sdk-xyo-mongo-js": "~2.83.0",
+    "@xylabs/arraybuffer": "^2.14.0",
+    "@xylabs/jest-helpers": "^2.14.0",
+    "@xylabs/ts-scripts-yarn3": "^3.2.42",
+    "@xylabs/tsconfig": "^3.2.42",
+    "@xyo-network/account": "^2.89.0-rc.12",
+    "@xyo-network/account-model": "^2.89.0-rc.12",
+    "@xyo-network/archivist-wrapper": "^2.89.0-rc.12",
+    "@xyo-network/payload-builder": "^2.89.0-rc.12",
+    "@xyo-network/sdk-xyo-mongo-js": "~2.84.0-rc.1",
     "fake-indexeddb": "^4.0.2",
     "jest": "^29.7.0",
     "typescript": "^5.3.3"
@@ -76,6 +78,7 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.83.0",
-  "type": "module"
+  "version": "2.84.0-rc.1",
+  "type": "module",
+  "stableVersion": "2.83.0"
 }

package/src/Archivist.ts

@@ -1,14 +1,14 @@
 import { exists } from '@xylabs/exists'
-import { fulfilledValues } from '@xylabs/promise'
+import { Hash } from '@xylabs/hex'
 import { AbstractArchivist } from '@xyo-network/archivist-abstract'
 import { ArchivistConfigSchema, ArchivistInsertQuerySchema } from '@xyo-network/archivist-model'
 import { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'
 import { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'
 import { Payload } from '@xyo-network/payload-model'
-import { PayloadWithPartialMeta } from '@xyo-network/payload-mongodb'
+import { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
-import { toBoundWitnessWithMeta, toPayloadWithMeta, toReturnValue, validByType } from './lib'
+import { toPayloadWithMongoMeta, toReturnValue, validByType } from './lib'
 
 const MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)
 
@@ -19,32 +19,48 @@ export class MongoDBArchivist extends MongoDBArchivistBase {
 
   override async head(): Promise<Payload | undefined> {
     const head = await (await this.payloads.find({})).sort({ _timestamp: -1 }).limit(1).toArray()
-    return head[0] ? PayloadWrapper.wrap(head[0]).body() : undefined
+    return head[0] ? (await PayloadWrapper.wrap(head[0])).jsonPayload() : undefined
   }
 
   protected override async getHandler(hashes: string[]): Promise<Payload[]> {
-    const payloads = hashes.map((_hash) => this.payloads.findOne({ _hash }))
-    const bws = hashes.map((_hash) => this.boundWitnesses.findOne({ _hash }))
-    const gets = await Promise.allSettled([payloads, bws].flat())
-    const succeeded = gets.reduce<(PayloadWithPartialMeta | null)[]>(fulfilledValues, []) as Payload[]
-    return succeeded.filter(exists).map(toReturnValue)
+    let remainingHashes = [...hashes]
+
+    const dataPayloads = (await Promise.all(remainingHashes.map((_$hash) => this.payloads.findOne({ _$hash })))).filter(exists)
+    const dataPayloadsHashes = dataPayloads.map((payload) => payload._$hash)
+    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.includes(hash))
+
+    const dataBws = (await Promise.all(remainingHashes.map((_$hash) => this.boundWitnesses.findOne({ _$hash })))).filter(exists)
+    const dataBwsHashes = dataBws.map((payload) => payload._$hash)
+    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.includes(hash))
+
+    const payloads = (await Promise.all(remainingHashes.map((_hash) => this.payloads.findOne({ _hash })))).filter(exists)
+    const payloadsHashes = payloads.map((payload) => payload._hash)
+    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.includes(hash))
+
+    const bws = (await Promise.all(remainingHashes.map((_hash) => this.boundWitnesses.findOne({ _hash })))).filter(exists)
+    const bwsHashes = bws.map((payload) => payload._hash)
+    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.includes(hash))
+
+    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload & { _$hash: Hash; _$meta?: unknown }>[]
+    return foundPayloads.map(({ _$hash, _$meta, ...other }) => ({ $hash: _$hash, $meta: _$meta, ...other })).map(toReturnValue)
   }
 
-  protected override async insertHandler(payloads?: Payload[]): Promise<Payload[]> {
+  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {
     const [bw, p] = await validByType(payloads)
-    const payloadsWithMeta = await Promise.all(p.map((x) => toPayloadWithMeta(x)))
-    if (payloadsWithMeta.length) {
-      const payloadsResult = await this.payloads.insertMany(payloadsWithMeta)
-      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithMeta.length)
+    const payloadsWithExternalMeta = await Promise.all(p.map((x) => toPayloadWithMongoMeta(x)))
+    if (payloadsWithExternalMeta.length) {
+      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)
+      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)
         throw new Error('MongoDBDeterministicArchivist: Error inserting Payloads')
     }
-    const boundWitnesses = await Promise.all(bw.map((x) => toBoundWitnessWithMeta(x)))
-    if (boundWitnesses.length) {
-      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnesses)
-      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnesses.length)
+    const boundWitnessesWithExternalMeta = await Promise.all(bw.map((x) => toPayloadWithMongoMeta(x)))
+    if (boundWitnessesWithExternalMeta.length) {
+      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)
+      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)
         throw new Error('MongoDBDeterministicArchivist: Error inserting BoundWitnesses')
     }
-    return payloads ?? []
+
+    return [...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta]
   }
 
   protected override async startHandler() {

package/src/lib/index.ts

@@ -1,4 +1,3 @@
-export * from './toBoundWitnessWithMeta'
-export * from './toPayloadWithMeta'
+export * from './toPayloadWithMongoMeta'
 export * from './toReturnValue'
 export * from './validByType'

package/src/lib/toPayloadWithMongoMeta.ts

@@ -0,0 +1,10 @@
+import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { Payload } from '@xyo-network/payload-model'
+import { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'
+
+export const toPayloadWithMongoMeta = async <T extends Payload>(payload: T): Promise<PayloadWithMongoMeta<T>> => {
+  const built = await PayloadBuilder.build(payload)
+  const _hash = await PayloadBuilder.hash(built)
+  const { $hash, $meta, ...fields } = built
+  return { ...fields, _$hash: $hash, _$meta: $meta, _hash, _timestamp: Date.now() } as PayloadWithMongoMeta<T>
+}

package/src/lib/toReturnValue.ts

@@ -1,12 +1,6 @@
-import { BoundWitness } from '@xyo-network/boundwitness-model'
+import { deepOmitPrefixedFields } from '@xyo-network/hash'
 import { Payload } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
-export const toReturnValue = (value: Payload | BoundWitness): Payload => {
-  const _signatures = (value as BoundWitness)?._signatures
-  if (_signatures) {
-    return { ...PayloadWrapper.wrap(value).body(), _signatures } as BoundWitness
-  } else {
-    return { ...PayloadWrapper.wrap(value).body() }
-  }
+export const toReturnValue = (value: Payload): Payload => {
+  return deepOmitPrefixedFields(value, '_')
 }