@xyo-network/archivist 2.32.1 → 2.33.0-rc.10

package/src/XyoCookieArchivist.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
 import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
-import { PromisableArray } from '@xyo-network/promisable'
+import { PromisableArray } from '@xyo-network/promise'
 import Cookies from 'js-cookie'
 import compact from 'lodash/compact'
 
@@ -81,6 +81,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
         return true
       })
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('delete', ex, 'unexpected')
     }
   }
@@ -93,6 +94,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
         }
       })
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('clear', ex, 'unexpected')
     }
   }
@@ -106,13 +108,14 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
         }),
       )
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('get', ex, 'unexpected')
     }
   }
 
   public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness> {
     try {
-      const storedPayloads = payloads.map((payload) => {
+      const storedPayloads: XyoPayload[] = payloads.map((payload) => {
         const wrapper = new XyoPayloadWrapper(payload)
         const key = this.keyFromHash(wrapper.hash)
         const value = JSON.stringify(wrapper.payload)
@@ -120,12 +123,13 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
         Cookies.set(key, JSON.stringify(wrapper.payload))
         return wrapper.payload
       })
-      const boundwitness = this.bindPayloads(storedPayloads)
+      const [boundwitness] = await this.bindPayloads(storedPayloads)
       if (this.writeThrough) {
         await this.writeToParents([boundwitness, ...storedPayloads])
       }
       return boundwitness
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('insert', ex, 'unexpected')
     }
   }
@@ -140,6 +144,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       })
       return x
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('find', ex, 'unexpected')
     }
   }
@@ -150,6 +155,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
         .filter(([key]) => key.startsWith(`${this.namespace}-`))
         .map(([, value]) => JSON.parse(value))
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('all', ex, 'unexpected')
     }
   }
@@ -158,7 +164,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
     try {
       const payloads = await this.all()
       assertEx(payloads.length > 0, 'Nothing to commit')
-      const block = this.bindPayloads(payloads)
+      const [block] = await this.bindPayloads(payloads)
       await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
@@ -170,6 +176,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       await this.clear()
       return block
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('commit', ex, 'unexpected')
     }
   }

package/src/XyoMemoryArchivist.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
 import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
-import { PromisableArray } from '@xyo-network/promisable'
+import { PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
 import LruCache from 'lru-cache'
 
@@ -66,6 +66,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
         return this.cache.delete(hash)
       })
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('delete', ex, 'unexpected')
     }
   }
@@ -74,6 +75,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
     try {
       this.cache.clear()
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('clear', ex, 'unexpected')
     }
   }
@@ -90,6 +92,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
         }),
       )
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('get', ex, 'unexpected')
     }
   }
@@ -102,12 +105,13 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
         this.cache.set(payloadWithmeta._hash, payloadWithmeta)
         return payloadWithmeta
       })
-      const boundwitness = this.bindPayloads(payloads)
+      const [boundwitness] = await this.bindPayloads(payloads)
       if (this.writeThrough) {
         await this.writeToParents(payloads)
       }
       return boundwitness
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('insert', ex, 'unexpected')
     }
   }
@@ -122,6 +126,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       })
       return result
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('find', ex, 'unexpected')
     }
   }
@@ -130,6 +135,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
     try {
       return this.cache.dump().map((value) => value[1].value)
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('all', ex, 'unexpected')
     }
   }
@@ -137,7 +143,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
   public async commit(): Promise<XyoBoundWitness> {
     try {
       const payloads = assertEx(await this.all(), 'Nothing to commit')
-      const block = this.bindPayloads(payloads)
+      const [block] = await this.bindPayloads(payloads)
       await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
@@ -149,6 +155,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       await this.clear()
       return block
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('commit', ex, 'unexpected')
     }
   }

package/src/XyoStorageArchivist.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
 import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
-import { PromisableArray } from '@xyo-network/promisable'
+import { PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
 import store, { StoreBase } from 'store2'
 
@@ -78,6 +78,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
         return true
       })
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('delete', ex, 'unexpected')
     }
   }
@@ -86,6 +87,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     try {
       this.storage.clear()
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('clear', ex, 'unexpected')
     }
   }
@@ -99,6 +101,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
         }),
       )
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('get', ex, 'unexpected')
     }
   }
@@ -113,12 +116,13 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
         this.storage.set(hash, wrapper.payload)
         return wrapper.payload
       })
-      const boundwitness = this.bindPayloads(storedPayloads)
+      const [boundwitness] = await this.bindPayloads(storedPayloads)
       if (this.writeThrough) {
         await this.writeToParents([boundwitness, ...storedPayloads])
       }
       return boundwitness
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('insert', ex, 'unexpected')
     }
   }
@@ -133,6 +137,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       })
       return x
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('find', ex, 'unexpected')
     }
   }
@@ -141,6 +146,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     try {
       return Object.entries(this.storage.getAll()).map(([, value]) => value)
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('all', ex, 'unexpected')
     }
   }
@@ -149,7 +155,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     try {
       const payloads = await this.all()
       assertEx(payloads.length > 0, 'Nothing to commit')
-      const block = this.bindPayloads(payloads)
+      const [block] = await this.bindPayloads(payloads)
       await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
@@ -161,6 +167,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       await this.clear()
       return block
     } catch (ex) {
+      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('commit', ex, 'unexpected')
     }
   }