@xyo-network/archivist 2.38.0-rc.9 → 2.38.0

package/src/XyoArchivistWrapper.ts

@@ -25,20 +25,24 @@ export class XyoArchivistWrapper extends XyoModuleWrapper implements PayloadArch
   public async delete(hashes: string[]) {
     const queryPayload = PayloadWrapper.parse<XyoArchivistDeleteQuery>({ hashes, schema: XyoArchivistDeleteQuerySchema })
     const query = await this.bindQuery(queryPayload)
-    await this.module.query(query[0], query[1])
-    return (await this.module.query(query[0], query[1]))[0].payload_hashes.map(() => true)
+    const result = await this.module.query(query[0], query[1])
+    this.throwErrors(query, result)
+    return result[0].payload_hashes.map(() => true)
   }
 
   public async clear(): Promise<void> {
     const queryPayload = PayloadWrapper.parse<XyoArchivistClearQuery>({ schema: XyoArchivistClearQuerySchema })
     const query = await this.bindQuery(queryPayload)
-    await this.module.query(query[0], query[1])
+    const result = await this.module.query(query[0], query[1])
+    this.throwErrors(query, result)
   }
 
   public async get(hashes: string[]): Promise<(XyoPayload | null)[]> {
     const queryPayload = PayloadWrapper.parse<XyoArchivistGetQuery>({ hashes, schema: XyoArchivistGetQuerySchema })
     const query = await this.bindQuery(queryPayload)
-    return (await this.module.query(query[0], query[1]))[1]
+    const result = await this.module.query(query[0], query[1])
+    this.throwErrors(query, result)
+    return result[1]
   }
 
   public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
@@ -50,24 +54,31 @@ export class XyoArchivistWrapper extends XyoModuleWrapper implements PayloadArch
     const result = await this.module.query(query[0], [queryPayload.payload, ...payloads])
     const innerBoundWitnesses =
       result[1]?.filter<XyoBoundWitness>((payload): payload is XyoBoundWitness => payload?.schema === XyoBoundWitnessSchema) ?? []
+    this.throwErrors(query, result)
     return [result[0], ...innerBoundWitnesses]
   }
 
   public async find(filter?: XyoPayloadFindFilter): Promise<XyoPayload[]> {
     const queryPayload = PayloadWrapper.parse<XyoArchivistFindQuery>({ filter, schema: XyoArchivistFindQuerySchema })
     const query = await this.bindQuery(queryPayload)
-    return compact((await this.module.query(query[0], [queryPayload.payload]))[1])
+    const result = await this.module.query(query[0], [queryPayload.payload])
+    this.throwErrors(query, result)
+    return compact(result[1])
   }
 
   public async all(): Promise<XyoPayload[]> {
     const queryPayload = PayloadWrapper.parse<XyoArchivistAllQuery>({ schema: XyoArchivistAllQuerySchema })
     const query = await this.bindQuery(queryPayload)
-    return compact((await this.module.query(query[0], query[1]))[1])
+    const result = await this.module.query(query[0], query[1])
+    this.throwErrors(query, result)
+    return compact(result[1])
   }
 
   public async commit(): Promise<XyoBoundWitness[]> {
     const queryPayload = PayloadWrapper.parse<XyoArchivistCommitQuery>({ schema: XyoArchivistCommitQuerySchema })
     const query = await this.bindQuery(queryPayload)
-    return (await this.module.query(query[0], query[1]))[1] as XyoBoundWitness[]
+    const result = await this.module.query(query[0], query[1])
+    this.throwErrors(query, result)
+    return result[1] as XyoBoundWitness[]
   }
 }

package/src/XyoCookieArchivist.spec.ts

@@ -3,13 +3,7 @@
  */
 
 import { testArchivistAll, testArchivistRoundTrip } from './test.spec.test'
-import { XyoCookieArchivist, XyoCookieArchivistConfig, XyoCookieArchivistConfigSchema } from './XyoCookieArchivist'
+import { XyoCookieArchivist, XyoCookieArchivistConfigSchema } from './XyoCookieArchivist'
 
-testArchivistRoundTrip(
-  XyoCookieArchivist.create({ config: { namespace: 'test', schema: XyoCookieArchivistConfigSchema } as XyoCookieArchivistConfig }),
-  'cookie',
-)
-testArchivistAll(
-  XyoCookieArchivist.create({ config: { namespace: 'test', schema: XyoCookieArchivistConfigSchema } as XyoCookieArchivistConfig }),
-  'cookie',
-)
+testArchivistRoundTrip(XyoCookieArchivist.create({ config: { namespace: 'test', schema: XyoCookieArchivistConfigSchema } }), 'cookie')
+testArchivistAll(XyoCookieArchivist.create({ config: { namespace: 'test', schema: XyoCookieArchivistConfigSchema } }), 'cookie')

package/src/XyoCookieArchivist.ts

@@ -30,8 +30,8 @@ export type XyoCookieArchivistConfig = XyoArchivistConfig<{
 }>
 
 export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
-  static override async create(params?: XyoModuleParams): Promise<XyoCookieArchivist> {
-    const module = new XyoCookieArchivist(params as XyoModuleParams<XyoCookieArchivistConfig>)
+  static override async create(params?: XyoModuleParams<XyoCookieArchivistConfig>): Promise<XyoCookieArchivist> {
+    const module = new XyoCookieArchivist(params)
     await module.start()
     return module
   }

package/src/XyoMemoryArchivist.ts

@@ -16,7 +16,7 @@ import {
   XyoArchivistInsertQuery,
   XyoArchivistInsertQuerySchema,
 } from './Queries'
-import { XyoArchivist, XyoArchivistParams } from './XyoArchivist'
+import { XyoArchivist } from './XyoArchivist'
 
 export type XyoMemoryArchivistConfigSchema = 'network.xyo.module.config.archivist.memory'
 export const XyoMemoryArchivistConfigSchema: XyoMemoryArchivistConfigSchema = 'network.xyo.module.config.archivist.memory'
@@ -26,15 +26,13 @@ export type XyoMemoryArchivistConfig = XyoArchivistConfig<{
   max?: number
 }>
 
-export type XyoMemoryArchivistParams<TConfig extends XyoMemoryArchivistConfig = XyoMemoryArchivistConfig> = XyoArchivistParams<TConfig>
-
 export class XyoMemoryArchivist<TConfig extends XyoMemoryArchivistConfig = XyoMemoryArchivistConfig> extends XyoArchivist<TConfig> {
   public get max() {
     return this.config?.max ?? 10000
   }
 
-  static override async create(params?: XyoModuleParams): Promise<XyoMemoryArchivist> {
-    const module: XyoMemoryArchivist = new XyoMemoryArchivist(params as XyoMemoryArchivistParams)
+  static override async create(params?: XyoModuleParams<XyoMemoryArchivistConfig>): Promise<XyoMemoryArchivist> {
+    const module: XyoMemoryArchivist = new XyoMemoryArchivist(params)
     await module.start()
     return module
   }
@@ -52,7 +50,7 @@ export class XyoMemoryArchivist<TConfig extends XyoMemoryArchivistConfig = XyoMe
     ]
   }
 
-  protected constructor(params?: XyoMemoryArchivistParams<TConfig>) {
+  protected constructor(params?: XyoModuleParams<TConfig>) {
     super(params)
     this.cache = new LruCache<string, XyoPayload>({ max: this.max })
   }

package/src/XyoStorageArchivist.spec.ts

@@ -7,52 +7,49 @@ import { PayloadWrapper } from '@xyo-network/payload'
 
 import { testArchivistAll, testArchivistRoundTrip } from './test.spec.test'
 import { XyoMemoryArchivist } from './XyoMemoryArchivist'
-import { XyoStorageArchivist, XyoStorageArchivistConfig, XyoStorageArchivistConfigSchema } from './XyoStorageArchivist'
+import { XyoStorageArchivist, XyoStorageArchivistConfigSchema } from './XyoStorageArchivist'
 
-testArchivistRoundTrip(
-  XyoStorageArchivist.create({ config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'local' } as XyoStorageArchivistConfig }),
-  'local',
-)
+testArchivistRoundTrip(XyoStorageArchivist.create({ config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'local' } }), 'local')
 testArchivistRoundTrip(
   XyoStorageArchivist.create({
-    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'session' } as XyoStorageArchivistConfig,
+    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'session' },
   }),
   'session',
 )
 testArchivistRoundTrip(
   XyoStorageArchivist.create({
-    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'page' } as XyoStorageArchivistConfig,
+    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'page' },
   }),
   'page',
 )
 
 testArchivistAll(
   XyoStorageArchivist.create({
-    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'local' } as XyoStorageArchivistConfig,
+    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'local' },
   }),
   'local',
 )
 testArchivistAll(
   XyoStorageArchivist.create({
-    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'session' } as XyoStorageArchivistConfig,
+    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'session' },
   }),
   'session',
 )
 testArchivistAll(
   XyoStorageArchivist.create({
-    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'page' } as XyoStorageArchivistConfig,
+    config: { namespace: 'test', schema: XyoStorageArchivistConfigSchema, type: 'page' },
   }),
   'page',
 )
 
 test('XyoArchivist Private Key Save', async () => {
   const storage = await XyoStorageArchivist.create({
-    config: { namespace: 'test', persistAccount: true, schema: XyoStorageArchivistConfigSchema, type: 'local' } as XyoStorageArchivistConfig,
+    config: { namespace: 'test', persistAccount: true, schema: XyoStorageArchivistConfigSchema, type: 'local' },
     logger: console,
   })
   const address = storage.address
   const storage2 = await XyoStorageArchivist.create({
-    config: { namespace: 'test', persistAccount: true, schema: XyoStorageArchivistConfigSchema, type: 'local' } as XyoStorageArchivistConfig,
+    config: { namespace: 'test', persistAccount: true, schema: XyoStorageArchivistConfigSchema, type: 'local' },
     logger: console,
   })
   expect(storage2.address).toBe(address)
@@ -68,7 +65,7 @@ test('XyoArchivist Parent Write Through', async () => {
       persistAccount: true,
       schema: XyoStorageArchivistConfigSchema,
       type: 'local',
-    } as XyoStorageArchivistConfig,
+    },
     logger: console,
     resolver: new XyoModuleResolver().add(memory),
   })

package/src/XyoStorageArchivist.ts

@@ -17,7 +17,7 @@ import {
   XyoArchivistInsertQuery,
   XyoArchivistInsertQuerySchema,
 } from './Queries'
-import { XyoArchivist, XyoArchivistParams } from './XyoArchivist'
+import { XyoArchivist } from './XyoArchivist'
 
 export type XyoStorageArchivistConfigSchema = 'network.xyo.module.config.archivist.storage'
 export const XyoStorageArchivistConfigSchema: XyoStorageArchivistConfigSchema = 'network.xyo.module.config.archivist.storage'
@@ -32,8 +32,8 @@ export type XyoStorageArchivistConfig = XyoArchivistConfig<{
 }>
 
 export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig> {
-  static override async create(params?: XyoModuleParams): Promise<XyoStorageArchivist> {
-    const module = new XyoStorageArchivist(params as XyoModuleParams<XyoStorageArchivistConfig>)
+  static override async create(params?: XyoModuleParams<XyoStorageArchivistConfig>): Promise<XyoStorageArchivist> {
+    const module = new XyoStorageArchivist(params)
     await module.start()
     return module
   }
@@ -83,7 +83,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     return this._privateStorage
   }
 
-  constructor(params?: XyoArchivistParams<XyoStorageArchivistConfig>) {
+  constructor(params?: XyoModuleParams<XyoStorageArchivistConfig>) {
     super(params)
     this.loadAccount()
   }
@@ -100,7 +100,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       if (privateKey) {
         try {
           const account = new XyoAccount({ privateKey })
-          this.logger?.log(account.addressValue.hex, 'loadAccount')
+          this.logger?.log(account.addressValue.hex)
           return account
         } catch (ex) {
           console.error(`Error reading Account from storage [${this.type}, ${ex}] - Recreating Account`)
@@ -113,7 +113,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
 
   protected saveAccount() {
     if (this.persistAccount) {
-      this.logger?.log(this.account.addressValue.hex, 'saveAccount')
+      this.logger?.log(this.account.addressValue.hex)
       this.privateStorage.set('privateKey', this.account.private.hex)
     }
   }