@xyo-network/archivist 2.34.0 → 2.35.0

package/src/XyoArchivistWrapper.ts

@@ -1,6 +1,6 @@
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
 import { XyoModuleWrapper } from '@xyo-network/module'
-import { XyoPayload } from '@xyo-network/payload'
+import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 
 import { PayloadArchivist } from './Archivist'
 import {
@@ -41,9 +41,17 @@ export class XyoArchivistWrapper extends XyoModuleWrapper implements PayloadArch
   }
 
   public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness> {
-    const query: XyoArchivistInsertQuery = { payloads, schema: XyoArchivistInsertQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[0]
+    const query: XyoArchivistInsertQuery = {
+      payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+      schema: XyoArchivistInsertQuerySchema,
+    }
+
+    const bw = (await this.bindPayloads([query, ...payloads]))[0]
+    const result = await this.module.query(bw, query, payloads)
+
+    console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+    return result[1][0] as XyoBoundWitness
   }
 
   public async find(filter?: XyoPayloadFindFilter): Promise<(XyoPayload | null)[]> {
@@ -58,9 +66,9 @@ export class XyoArchivistWrapper extends XyoModuleWrapper implements PayloadArch
     return (await this.module.query(bw, query))[1]
   }
 
-  public async commit(): Promise<XyoBoundWitness> {
+  public async commit(): Promise<XyoBoundWitness[]> {
     const query: XyoArchivistCommitQuery = { schema: XyoArchivistCommitQuerySchema }
     const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[0]
+    return (await this.module.query(bw, query))[1] as XyoBoundWitness[]
   }
 }

package/src/XyoCookieArchivist.ts

@@ -160,22 +160,28 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
     }
   }
 
-  public override async commit(): Promise<XyoBoundWitness> {
+  public override async commit(): Promise<XyoBoundWitness[]> {
     try {
       const payloads = await this.all()
       assertEx(payloads.length > 0, 'Nothing to commit')
-      const [block] = await this.bindPayloads(payloads)
-      await Promise.allSettled(
+      const settled = await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
-            const query: XyoArchivistInsertQuery = { payloads: [block, ...payloads], schema: XyoArchivistInsertQuerySchema }
+            const query: XyoArchivistInsertQuery = {
+              payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+              schema: XyoArchivistInsertQuerySchema,
+            }
             const bw = (await this.bindPayloads([query]))[0]
             return await parent?.query(bw, query)
           }),
         ),
       )
       await this.clear()
-      return block
+      return compact(
+        settled.map((result) => {
+          return result.status === 'fulfilled' ? result.value?.[0] : null
+        }),
+      )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('commit', ex, 'unexpected')

package/src/XyoMemoryArchivist.ts

@@ -140,21 +140,27 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
     }
   }
 
-  public override async commit(): Promise<XyoBoundWitness> {
+  public override async commit(): Promise<XyoBoundWitness[]> {
     try {
       const payloads = assertEx(await this.all(), 'Nothing to commit')
-      const [block] = await this.bindPayloads(payloads)
-      await Promise.allSettled(
+      const settled = await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
-            const query: XyoArchivistInsertQuery = { payloads: [block, ...payloads], schema: XyoArchivistInsertQuerySchema }
+            const query: XyoArchivistInsertQuery = {
+              payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+              schema: XyoArchivistInsertQuerySchema,
+            }
             const bw = (await this.bindPayloads([query]))[0]
             return await parent?.query(bw, query)
           }),
         ),
       )
       await this.clear()
-      return block
+      return compact(
+        settled.map((result) => {
+          return result.status === 'fulfilled' ? result.value?.[0] : null
+        }),
+      )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('commit', ex, 'unexpected')

package/src/XyoStorageArchivist.ts

@@ -151,22 +151,28 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     }
   }
 
-  public override async commit(): Promise<XyoBoundWitness> {
+  public override async commit(): Promise<XyoBoundWitness[]> {
     try {
       const payloads = await this.all()
       assertEx(payloads.length > 0, 'Nothing to commit')
-      const [block] = await this.bindPayloads(payloads)
-      await Promise.allSettled(
+      const settled = await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
-            const query: XyoArchivistInsertQuery = { payloads: [block, ...payloads], schema: XyoArchivistInsertQuerySchema }
+            const query: XyoArchivistInsertQuery = {
+              payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+              schema: XyoArchivistInsertQuerySchema,
+            }
             const bw = (await this.bindPayloads([query]))[0]
             return await parent?.query(bw, query)
           }),
         ),
       )
       await this.clear()
-      return block
+      return compact(
+        settled.map((result) => {
+          return result.status === 'fulfilled' ? result.value?.[0] : null
+        }),
+      )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('commit', ex, 'unexpected')

package/src/test.spec.test/testArchivist.ts

@@ -11,13 +11,15 @@ import { XyoArchivistWrapper } from '../XyoArchivistWrapper'
 export const testArchivistRoundTrip = (archivist: XyoArchivist, name: string) => {
   test(`XyoArchivist [${name}]`, async () => {
     const idPayload: XyoPayload<{ salt: string }> = {
-      salt: 'test',
+      salt: Date.now().toString(),
       schema: 'network.xyo.id',
     }
     const payloadWrapper = new PayloadWrapper(idPayload)
+
     const archivistWrapper = new XyoArchivistWrapper(archivist)
     const insertResult = await archivistWrapper.insert([idPayload])
     expect(insertResult).toBeDefined()
+
     expect(insertResult.payload_hashes.find((hash) => hash === payloadWrapper.hash)).toBeDefined()
     const getResult = await archivistWrapper.get([payloadWrapper.hash])
     expect(getResult).toBeDefined()
@@ -33,16 +35,16 @@ export const testArchivistRoundTrip = (archivist: XyoArchivist, name: string) =>
 export const testArchivistAll = (archivist: XyoArchivist, name: string) => {
   test(`XyoArchivist [${name}]`, async () => {
     const idPayload = {
-      salt: 'test',
+      salt: Date.now().toString(),
       schema: 'network.xyo.id',
     }
     const archivistWrapper = new XyoArchivistWrapper(archivist)
     for (let x = 0; x < 10; x++) {
-      await archivistWrapper.insert([{ ...idPayload, salt: Date.now().toString() } as XyoPayload<{ salt: string }>])
+      await archivistWrapper.insert([idPayload])
       await delay(10)
     }
     const getResult = await archivistWrapper.all()
     expect(getResult).toBeDefined()
-    expect(getResult.length).toBe(11)
+    expect(getResult.length).toBe(2)
   })
 }