@xyo-network/archivist 2.64.10 → 2.65.1

package/src/StorageArchivist.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
-import { AbstractArchivist } from '@xyo-network/abstract-archivist'
+import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
 import { Account } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
 import {
@@ -11,9 +11,9 @@ import {
   ArchivistDeleteQuerySchema,
   ArchivistInsertQuery,
   ArchivistInsertQuerySchema,
-  ArchivistModule,
   ArchivistModuleEventData,
   ArchivistParams,
+  DirectArchivistModule,
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { Logger, PayloadHasher } from '@xyo-network/core'
@@ -41,8 +41,8 @@ export class StorageArchivist<
     TParams extends StorageArchivistParams = StorageArchivistParams,
     TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
   >
-  extends AbstractArchivist<TParams, TEventData>
-  implements ArchivistModule
+  extends AbstractDirectArchivist<TParams, TEventData>
+  implements DirectArchivistModule
 {
   static override configSchemas = [StorageArchivistConfigSchema]
 
@@ -92,18 +92,41 @@ export class StorageArchivist<
     return this._storage
   }
 
-  override all(): PromisableArray<Payload> {
+  override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
+    if (!this._account) {
+      if (persistAccount) {
+        const privateKey = privateStorage?.get('privateKey')
+        if (privateKey) {
+          try {
+            this._account = await Account.create({ privateKey })
+            return this._account
+          } catch (ex) {
+            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)
+            privateStorage?.remove('privateKey')
+          }
+        }
+      }
+    }
+    return await super.loadAccount()
+  }
+
+  override async start() {
+    await super.start()
+    this.saveAccount()
+  }
+
+  protected override allHandler(): PromisableArray<Payload> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
     return Object.entries(this.storage.getAll()).map(([, value]) => value)
   }
 
-  override clear(): void | Promise<void> {
+  protected override clearHandler(): void | Promise<void> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
     this.storage.clear()
     return this.emit('cleared', { module: this })
   }
 
-  override async commit(): Promise<BoundWitness[]> {
+  protected override async commitHandler(): Promise<BoundWitness[]> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
     const payloads = await this.all()
     assertEx(payloads.length > 0, 'Nothing to commit')
@@ -124,7 +147,7 @@ export class StorageArchivist<
     return compact(settled.filter(fulfilled).map((result) => result.value))
   }
 
-  override async delete(hashes: string[]): Promise<boolean[]> {
+  protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
     this.logger?.log(`delete: hashes.length: ${hashes.length}`)
     const found = hashes.map((hash) => {
       this.storage.remove(hash)
@@ -134,12 +157,12 @@ export class StorageArchivist<
     return found
   }
 
-  override async get(hashes: string[]): Promise<Payload[]> {
+  protected override async getHandler(hashes: string[]): Promise<Payload[]> {
     this.logger?.log(`get: hashes.length: ${hashes.length}`)
 
     return await Promise.all(
       hashes.map(async (hash) => {
-        const payload = this.storage.get(hash) ?? (await super.get([hash]))[0] ?? null
+        const payload = this.storage.get(hash) ?? (await super.getHandler([hash]))[0] ?? null
         if (this.storeParentReads) {
           this.storage.set(hash, payload)
         }
@@ -148,7 +171,7 @@ export class StorageArchivist<
     )
   }
 
-  async insert(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
     const resultPayloads = await Promise.all(
       payloads.map(async (payload) => {
         const wrapper = PayloadWrapper.wrap(payload)
@@ -172,29 +195,6 @@ export class StorageArchivist<
     return boundWitnesses
   }
 
-  override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
-    if (!this._account) {
-      if (persistAccount) {
-        const privateKey = privateStorage?.get('privateKey')
-        if (privateKey) {
-          try {
-            this._account = await Account.create({ privateKey })
-            return this._account
-          } catch (ex) {
-            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)
-            privateStorage?.remove('privateKey')
-          }
-        }
-      }
-    }
-    return await super.loadAccount()
-  }
-
-  override async start() {
-    await super.start()
-    this.saveAccount()
-  }
-
   protected saveAccount() {
     if (this.persistAccount) {
       const account = this.account

package/src/spec/testArchivist.ts

@@ -3,7 +3,7 @@
  */
 
 import { delay } from '@xylabs/delay'
-import { ArchivistModule } from '@xyo-network/archivist-model'
+import { ArchivistInstance } from '@xyo-network/archivist-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import { PayloadHasher } from '@xyo-network/core'
 import { Payload } from '@xyo-network/payload-model'
@@ -11,7 +11,7 @@ import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { IdSchema } from '@xyo-network/plugins'
 import { Promisable } from '@xyo-network/promise'
 
-export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistModule>, name: string) => {
+export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistInstance>, name: string) => {
   test(`Archivist RoundTrip [${name}]`, async () => {
     const idPayload: Payload<{ salt: string }> = {
       salt: Date.now().toString(),
@@ -37,7 +37,7 @@ export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistMod
   })
 }
 
-export const testArchivistAll = (archivist: Promisable<ArchivistModule>, name: string) => {
+export const testArchivistAll = (archivist: Promisable<ArchivistInstance>, name: string) => {
   test(`Archivist All [${name}]`, async () => {
     const idPayload = {
       salt: Date.now().toString(),