@xyo-network/archivist-storage 2.107.5 → 2.108.0

package/dist/browser/index.cjs

@@ -124,7 +124,7 @@ var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
     this.storage.clear();
     return this.emit("cleared", {
-      module: this
+      mod: this
     });
   }
   async commitHandler() {

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { module: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;ACAA,oBAAyB;AAEzB,oBAAwB;AACxB,qBAAuD;AACvD,gCAAkC;AAClC,6BAWO;AAGP,6BAA+B;AAE/B,oBAAiC;AAG1B,IAAMA,+BAA6D;AAYnE,IAAMC,mBAAN,cAIGC,4CAAAA;EAxCV,OAwCUA;;;EAGR,OAAyBC,gBAA0B;OAAI,MAAMA;IAAeH;;EAC5E,OAAyBI,sBAA8BJ;EAE/CK;EACAC;EAER,IAAIC,aAAa;AACf,WAAO,KAAKC,QAAQD,cAAc;EACpC;EAEA,IAAIE,eAAe;AACjB,WAAO,KAAKD,QAAQC,gBAAgB;EACtC;EAEA,IAAIC,YAAY;AACd,WAAO,KAAKF,QAAQE,aAAa;EACnC;EAEA,IAAIC,iBAAiB;AACnB,WAAO,KAAKH,QAAQG,kBAAkB;EACxC;EAEA,IAAaC,UAAoB;AAC/B,WAAO;MACLC;MACAC;MACAC;MACAC;MACAC;SACG,MAAML;;EAEb;EAEA,IAAIM,OAAO;AACT,WAAO,KAAKV,QAAQU,QAAQ;EAC9B;;EAGA,IAAYC,iBAA4B;AACtC,SAAKd,kBAAkB,KAAKC,YAAYc,cAAAA,QAAM,KAAKF,IAAI,EAAER,UAAU,GAAG,KAAKA,SAAS,UAAU;AAC9F,WAAO,KAAKL;EACd;;EAGA,IAAYgB,UAAqB;AAC/B,SAAKf,WAAW,KAAKA,YAAYc,cAAAA,QAAM,KAAKF,IAAI,EAAER,UAAU,KAAKA,SAAS;AAC1E,WAAO,KAAKJ;EACd;;;;;;;;;;;;;;;;;;EAoBmBgB,aAA+C;AAChE,UAAMC,QAAQ,oBAAIC,IAAAA;AAClB,SAAKC,QAAQC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM,EAAE;AAC9D,WAAOC,OAAOC,QAAQ,KAAKR,QAAQS,OAAM,CAAA,EACtCC,IAAI,CAAC,CAAA,EAAGC,KAAAA,MAAWA,KAAAA,EACnBC,OAAO,CAACC,YAAAA;AACP,UAAIX,MAAMY,IAAID,QAAQE,KAAK,GAAG;AAC5B,eAAO;MACT,OAAO;AACLb,cAAMc,IAAIH,QAAQE,KAAK;AACvB,eAAO;MACT;IACF,CAAA;EACJ;EAEmBE,eAAqC;AACtD,SAAKb,QAAQC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM,EAAE;AAC9D,SAAKN,QAAQkB,MAAK;AAClB,WAAO,KAAKC,KAAK,WAAW;MAAEC,QAAQ;IAAK,CAAA;EAC7C;EAEA,MAAyBC,gBAAmD;AAC1E,SAAKjB,QAAQC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM,EAAE;AAC9D,UAAMgB,WAAW,MAAM,KAAKC,IAAG;AAC/BC,gCAASF,SAAShB,SAAS,GAAG,MAAM,mBAAA;AACpC,UAAMmB,UAAU,MAAMC,QAAQC,eAC5BC,uBACErB,OAAOsB,QAAQ,MAAM,KAAKC,iBAAgB,GAAIC,UAAU,CAAA,CAAE,GAAGrB,IAAI,OAAOsB,WAAAA;AACtE,YAAMC,eAAqC;QACzCC,QAAQvC;MACV;AACA,YAAMwC,QAAQ,MAAM,KAAKC,UAAUH,cAAcX,QAAAA;AACjD,cAAQ,MAAMU,QAAQG,MAAMA,MAAM,CAAA,GAAIA,MAAM,CAAA,CAAE,KAAK,CAAA;IACrD,CAAA,CAAA,CAAA;AAIJ,UAAM,KAAKjB,MAAK;AAChB,eAAOU,uBAAQH,QAAQb,OAAOyB,wBAAAA,EAAW3B,IAAI,CAAC4B,WAAWA,OAAO3B,KAAK,CAAA;EACvE;EAEA,MAAyB4B,cAAcC,QAAiC;AACtE,UAAMC,oBAAgBb,uBACpB,MAAMF,QAAQH,IACZiB,OAAO9B,IAAI,CAACgC,SAAAA;AACV,WAAK1C,QAAQ2C,OAAOD,IAAAA;AACpB,aAAOA;IACT,CAAA,CAAA,CAAA;AAGJ,WAAOD;EACT;EAEmBG,WAAWJ,QAAiD;AAC7E,UAAMtC,QAAQ,oBAAIC,IAAAA;AAClB,eAAOyB,uBACLY,OAAO9B,IAAI,CAACgC,SAAAA;AACV,aAAO,KAAK1C,QAAQ6C,IAAIH,IAAAA;IAC1B,CAAA,CAAA,EACA9B,OAAO,CAACC,YAAAA;AACR,UAAIX,MAAMY,IAAID,QAAQE,KAAK,GAAG;AAC5B,eAAO;MACT,OAAO;AACLb,cAAMc,IAAIH,QAAQE,KAAK;AACvB,eAAO;MACT;IACF,CAAA;EACF;EAEA,MAAyB+B,cAAcxB,UAAiD;AACtF,UAAMyB,QAAQ,MAAMC,sCAAeC,UAAU3B,QAAAA;AAC7C,UAAM4B,iBAAiBH,MAAMrC,IAAI,CAAC,CAACG,SAAS6B,IAAAA,MAAK;AAC/C,YAAM/B,QAAQwC,KAAKC,UAAUvC,OAAAA;AAC7BW,kCAASb,MAAML,SAAS,KAAKlB,cAAc,MAAM,sBAAsBsD,IAAAA,KAAS/B,MAAML,MAAM,GAAG;AAC/F,WAAKN,QAAQqD,IAAIX,MAAM7B,OAAAA;AACvB,WAAKb,QAAQqD,IAAIxC,QAAQE,OAAOF,OAAAA;AAChC,aAAOA;IACT,CAAA;AACA,WAAOqC;EACT;EAEUI,cAAc;AACtB,QAAI,KAAKhE,gBAAgB;AACvB,YAAMiE,UAAU,KAAKA;AACrB,WAAKnD,QAAQC,IAAIkD,QAAQC,OAAO;AAChC,WAAK1D,eAAeuD,IAAI,cAAcE,QAAQE,QAAQC,GAAG;IAC3D;EACF;EAEA,MAAyBC,eAAe;AACtC,UAAM,MAAMA,aAAAA;AACZ,SAAKL,YAAW;AAChB,WAAO;EACT;AACF;","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
+{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","mod","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}

package/dist/browser/index.js

@@ -89,7 +89,7 @@ var StorageArchivist = class extends AbstractArchivist {
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
     this.storage.clear();
     return this.emit("cleared", {
-      module: this
+      mod: this
     });
   }
   async commitHandler() {

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { module: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
+{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","mod","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}

package/dist/neutral/index.cjs

@@ -124,7 +124,7 @@ var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
     this.storage.clear();
     return this.emit("cleared", {
-      module: this
+      mod: this
     });
   }
   async commitHandler() {

package/dist/neutral/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { module: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
+{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","mod","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}

package/dist/neutral/index.js

@@ -89,7 +89,7 @@ var StorageArchivist = class extends AbstractArchivist {
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
     this.storage.clear();
     return this.emit("cleared", {
-      module: this
+      mod: this
     });
   }
   async commitHandler() {

package/dist/neutral/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { module: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
+{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","mod","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}

package/dist/node/index.cjs

@@ -127,7 +127,7 @@ var _StorageArchivist = class _StorageArchivist extends import_archivist_abstrac
     (_a = this.logger) == null ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
     this.storage.clear();
     return this.emit("cleared", {
-      module: this
+      mod: this
     });
   }
   async commitHandler() {

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { module: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;ACAA,oBAAyB;AAEzB,oBAAwB;AACxB,qBAAuD;AACvD,gCAAkC;AAClC,6BAWO;AAGP,6BAA+B;AAE/B,oBAAiC;AAG1B,IAAMA,+BAA6D;AAYnE,IAAMC,oBAAN,MAAMA,0BAIHC,4CAAAA;EAMAC;EACAC;EAER,IAAIC,aAAa;AAjDnB;AAkDI,aAAO,UAAKC,WAAL,mBAAaD,eAAc;EACpC;EAEA,IAAIE,eAAe;AArDrB;AAsDI,aAAO,UAAKD,WAAL,mBAAaC,iBAAgB;EACtC;EAEA,IAAIC,YAAY;AAzDlB;AA0DI,aAAO,UAAKF,WAAL,mBAAaE,cAAa;EACnC;EAEA,IAAIC,iBAAiB;AA7DvB;AA8DI,aAAO,UAAKH,WAAL,mBAAaG,mBAAkB;EACxC;EAEA,IAAaC,UAAoB;AAC/B,WAAO;MACLC;MACAC;MACAC;MACAC;MACAC;SACG,MAAML;;EAEb;EAEA,IAAIM,OAAO;AA5Eb;AA6EI,aAAO,UAAKV,WAAL,mBAAaU,SAAQ;EAC9B;;EAGA,IAAYC,iBAA4B;AACtC,SAAKd,kBAAkB,KAAKC,YAAYc,cAAAA,QAAM,KAAKF,IAAI,EAAER,UAAU,GAAG,KAAKA,SAAS,UAAU;AAC9F,WAAO,KAAKL;EACd;;EAGA,IAAYgB,UAAqB;AAC/B,SAAKf,WAAW,KAAKA,YAAYc,cAAAA,QAAM,KAAKF,IAAI,EAAER,UAAU,KAAKA,SAAS;AAC1E,WAAO,KAAKJ;EACd;;;;;;;;;;;;;;;;;;EAoBmBgB,aAA+C;AA9GpE;AA+GI,UAAMC,QAAQ,oBAAIC,IAAAA;AAClB,eAAKC,WAAL,mBAAaC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM;AAC5D,WAAOC,OAAOC,QAAQ,KAAKR,QAAQS,OAAM,CAAA,EACtCC,IAAI,CAAC,CAAA,EAAGC,KAAAA,MAAWA,KAAAA,EACnBC,OAAO,CAACC,YAAAA;AACP,UAAIX,MAAMY,IAAID,QAAQE,KAAK,GAAG;AAC5B,eAAO;MACT,OAAO;AACLb,cAAMc,IAAIH,QAAQE,KAAK;AACvB,eAAO;MACT;IACF,CAAA;EACJ;EAEmBE,eAAqC;AA7H1D;AA8HI,eAAKb,WAAL,mBAAaC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM;AAC5D,SAAKN,QAAQkB,MAAK;AAClB,WAAO,KAAKC,KAAK,WAAW;MAAEC,QAAQ;IAAK,CAAA;EAC7C;EAEA,MAAyBC,gBAAmD;AAnI9E;AAoII,eAAKjB,WAAL,mBAAaC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM;AAC5D,UAAMgB,WAAW,MAAM,KAAKC,IAAG;AAC/BC,gCAASF,SAAShB,SAAS,GAAG,MAAM,mBAAA;AACpC,UAAMmB,UAAU,MAAMC,QAAQC,eAC5BC,wBACErB,YAAOsB,QAAQ,MAAM,KAAKC,iBAAgB,GAAIC,UAAU,CAAA,CAAE,MAA1DxB,mBAA6DG,IAAI,OAAOsB,WAAAA;AAzIhF,UAAAC;AA0IU,YAAMC,eAAqC;QACzCC,QAAQxC;MACV;AACA,YAAMyC,QAAQ,MAAM,KAAKC,UAAUH,cAAcZ,QAAAA;AACjD,cAAQW,MAAA,OAAMD,iCAAQI,MAAMA,MAAM,CAAA,GAAIA,MAAM,CAAA,QAApC,gBAAAH,IAA2C;IACrD,EAAA,CAAA;AAIJ,UAAM,KAAKf,MAAK;AAChB,eAAOU,uBAAQH,QAAQb,OAAO0B,wBAAAA,EAAW5B,IAAI,CAAC6B,WAAWA,OAAO5B,KAAK,CAAA;EACvE;EAEA,MAAyB6B,cAAcC,QAAiC;AACtE,UAAMC,oBAAgBd,uBACpB,MAAMF,QAAQH,IACZkB,OAAO/B,IAAI,CAACiC,SAAAA;AACV,WAAK3C,QAAQ4C,OAAOD,IAAAA;AACpB,aAAOA;IACT,CAAA,CAAA,CAAA;AAGJ,WAAOD;EACT;EAEmBG,WAAWJ,QAAiD;AAC7E,UAAMvC,QAAQ,oBAAIC,IAAAA;AAClB,eAAOyB,uBACLa,OAAO/B,IAAI,CAACiC,SAAAA;AACV,aAAO,KAAK3C,QAAQ8C,IAAIH,IAAAA;IAC1B,CAAA,CAAA,EACA/B,OAAO,CAACC,YAAAA;AACR,UAAIX,MAAMY,IAAID,QAAQE,KAAK,GAAG;AAC5B,eAAO;MACT,OAAO;AACLb,cAAMc,IAAIH,QAAQE,KAAK;AACvB,eAAO;MACT;IACF,CAAA;EACF;EAEA,MAAyBgC,cAAczB,UAAiD;AACtF,UAAM0B,QAAQ,MAAMC,sCAAeC,UAAU5B,QAAAA;AAC7C,UAAM6B,iBAAiBH,MAAMtC,IAAI,CAAC,CAACG,SAAS8B,IAAAA,MAAK;AAC/C,YAAMhC,QAAQyC,KAAKC,UAAUxC,OAAAA;AAC7BW,kCAASb,MAAML,SAAS,KAAKlB,cAAc,MAAM,sBAAsBuD,IAAAA,KAAShC,MAAML,MAAM,GAAG;AAC/F,WAAKN,QAAQsD,IAAIX,MAAM9B,OAAAA;AACvB,WAAKb,QAAQsD,IAAIzC,QAAQE,OAAOF,OAAAA;AAChC,aAAOA;IACT,CAAA;AACA,WAAOsC;EACT;EAEUI,cAAc;AA/L1B;AAgMI,QAAI,KAAKjE,gBAAgB;AACvB,YAAMkE,UAAU,KAAKA;AACrB,iBAAKpD,WAAL,mBAAaC,IAAImD,QAAQC;AACzB,WAAK3D,eAAewD,IAAI,cAAcE,QAAQE,QAAQC,GAAG;IAC3D;EACF;EAEA,MAAyBC,eAAe;AACtC,UAAM,MAAMA,aAAAA;AACZ,SAAKL,YAAW;AAChB,WAAO;EACT;AACF;AApKUxE;AAGR,cAPWD,mBAOc+E,iBAA0B;KAAI,iDAAMA;EAAehF;;AAC5E,cARWC,mBAQcgF,uBAA8BjF;AARlD,IAAMC,mBAAN;","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","_a","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas","defaultConfigSchema"]}
+{"version":3,"sources":["../../src/index.ts","../../src/StorageArchivist.ts"],"sourcesContent":["export * from './StorageArchivist'\n","import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","mod","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","_a","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas","defaultConfigSchema"]}

package/dist/node/index.js

@@ -93,7 +93,7 @@ var _StorageArchivist = class _StorageArchivist extends AbstractArchivist {
     (_a = this.logger) == null ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
     this.storage.clear();
     return this.emit("cleared", {
-      module: this
+      mod: this
     });
   }
   async commitHandler() {

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { module: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","_a","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas","defaultConfigSchema"]}
+{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistConfig,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport store, { StoreBase } from 'store2'\n\nexport type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\nexport const StorageArchivistConfigSchema: StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'\n\nexport type StorageArchivistConfig = ArchivistConfig<{\n  maxEntries?: number\n  maxEntrySize?: number\n  namespace?: string\n  persistAccount?: boolean\n  schema: StorageArchivistConfigSchema\n  type?: 'local' | 'session' | 'page'\n}>\n\nexport type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>\nexport class StorageArchivist<\n    TParams extends StorageArchivistParams = StorageArchivistParams,\n    TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n  >\n  extends AbstractArchivist<TParams, TEventData>\n  implements ArchivistInstance\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, StorageArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = StorageArchivistConfigSchema\n\n  private _privateStorage: StoreBase | undefined\n  private _storage: StoreBase | undefined\n\n  get maxEntries() {\n    return this.config?.maxEntries ?? 1000\n  }\n\n  get maxEntrySize() {\n    return this.config?.maxEntrySize ?? 16_000\n  }\n\n  get namespace() {\n    return this.config?.namespace ?? 'xyo-archivist'\n  }\n\n  get persistAccount() {\n    return this.config?.persistAccount ?? false\n  }\n\n  override get queries(): string[] {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  get type() {\n    return this.config?.type ?? 'local'\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get privateStorage(): StoreBase {\n    this._privateStorage = this._storage ?? store[this.type].namespace(`${this.namespace}|private`)\n    return this._privateStorage\n  }\n\n  /* This has to be a getter so that it can access it during construction */\n  private get storage(): StoreBase {\n    this._storage = this._storage ?? store[this.type].namespace(this.namespace)\n    return this._storage\n  }\n\n  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {\n    if (!this._account) {\n      if (persistAccount) {\n        const privateKey = privateStorage?.get('privateKey')\n        if (privateKey) {\n          try {\n            this._account = await Account.create({ privateKey })\n            return this._account\n          } catch (ex) {\n            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)\n            privateStorage?.remove('privateKey')\n          }\n        }\n      }\n    }\n    return await super.loadAccount()\n  }*/\n\n  protected override allHandler(): PromisableArray<PayloadWithMeta> {\n    const found = new Set<string>()\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll())\n      .map(([, value]) => value)\n      .filter((payload) => {\n        if (found.has(payload.$hash)) {\n          return false\n        } else {\n          found.add(payload.$hash)\n          return true\n        }\n      })\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    this.storage.clear()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    const payloads = await this.all()\n    assertEx(payloads.length > 0, () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      compact(\n        Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n          const queryPayload: ArchivistInsertQuery = {\n            schema: ArchivistInsertQuerySchema,\n          }\n          const query = await this.bindQuery(queryPayload, payloads)\n          return (await parent?.query(query[0], query[1]))?.[0]\n        }),\n      ),\n    )\n    // TODO - rather than clear, delete the payloads that come back as successfully inserted\n    await this.clear()\n    return compact(settled.filter(fulfilled).map((result) => result.value))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes = compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<PayloadWithMeta[]> {\n    const found = new Set<string>()\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    ).filter((payload) => {\n      if (found.has(payload.$hash)) {\n        return false\n      } else {\n        found.add(payload.$hash)\n        return true\n      }\n    })\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]> {\n    const pairs = await PayloadBuilder.hashPairs(payloads)\n    const resultPayloads = pairs.map(([payload, hash]) => {\n      const value = JSON.stringify(payload)\n      assertEx(value.length < this.maxEntrySize, () => `Payload too large [${hash}, ${value.length}]`)\n      this.storage.set(hash, payload)\n      this.storage.set(payload.$hash, payload)\n      return payload\n    })\n    return resultPayloads\n  }\n\n  protected saveAccount() {\n    if (this.persistAccount) {\n      const account = this.account\n      this.logger?.log(account.address)\n      this.privateStorage.set('privateKey', account.private.hex)\n    }\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.saveAccount()\n    return true\n  }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","found","Set","logger","log","length","Object","entries","getAll","map","value","filter","payload","has","$hash","add","clearHandler","clear","emit","mod","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parentArchivists","commit","parent","_a","queryPayload","schema","query","bindQuery","fulfilled","result","deleteHandler","hashes","deletedHashes","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","resultPayloads","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas","defaultConfigSchema"]}

package/package.json

@@ -10,29 +10,29 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.5.1",
-    "@xylabs/hex": "^3.5.1",
-    "@xylabs/lodash": "^3.5.1",
-    "@xylabs/promise": "^3.5.1",
-    "@xyo-network/archivist-abstract": "~2.107.5",
-    "@xyo-network/archivist-model": "~2.107.5",
-    "@xyo-network/boundwitness-model": "~2.107.5",
-    "@xyo-network/module-model": "~2.107.5",
-    "@xyo-network/payload-builder": "~2.107.5",
-    "@xyo-network/payload-model": "~2.107.5",
+    "@xylabs/assert": "^3.5.2",
+    "@xylabs/hex": "^3.5.2",
+    "@xylabs/lodash": "^3.5.2",
+    "@xylabs/promise": "^3.5.2",
+    "@xyo-network/archivist-abstract": "^2.108.0",
+    "@xyo-network/archivist-model": "^2.108.0",
+    "@xyo-network/boundwitness-model": "^2.108.0",
+    "@xyo-network/module-model": "^2.108.0",
+    "@xyo-network/payload-builder": "^2.108.0",
+    "@xyo-network/payload-model": "^2.108.0",
     "store2": "^2.14.3"
   },
   "devDependencies": {
-    "@xylabs/delay": "^3.5.1",
-    "@xylabs/ts-scripts-yarn3": "^3.11.10",
-    "@xylabs/tsconfig": "^3.11.10",
-    "@xyo-network/account": "~2.107.5",
-    "@xyo-network/archivist-memory": "~2.107.5",
-    "@xyo-network/boundwitness-wrapper": "~2.107.5",
-    "@xyo-network/id-payload-plugin": "~2.107.5",
-    "@xyo-network/node-memory": "~2.107.5",
-    "@xyo-network/payload-wrapper": "~2.107.5",
-    "typescript": "^5.5.2"
+    "@xylabs/delay": "^3.5.2",
+    "@xylabs/ts-scripts-yarn3": "^3.11.12",
+    "@xylabs/tsconfig": "^3.11.12",
+    "@xyo-network/account": "^2.108.0",
+    "@xyo-network/archivist-memory": "^2.108.0",
+    "@xyo-network/boundwitness-wrapper": "^2.108.0",
+    "@xyo-network/id-payload-plugin": "^2.108.0",
+    "@xyo-network/node-memory": "^2.108.0",
+    "@xyo-network/payload-wrapper": "^2.108.0",
+    "typescript": "^5.5.3"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "types": "dist/node/index.d.ts",
@@ -73,6 +73,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.107.5",
+  "version": "2.108.0",
   "type": "module"
 }

package/src/StorageArchivist.ts

@@ -126,7 +126,7 @@ export class StorageArchivist<
   protected override clearHandler(): void | Promise<void> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
     this.storage.clear()
-    return this.emit('cleared', { module: this })
+    return this.emit('cleared', { mod: this })
   }
 
   protected override async commitHandler(): Promise<WithMeta<BoundWitness>[]> {