@xyo-network/archivist-storage 3.0.4 → 3.0.6

package/dist/neutral/index.d.ts

@@ -12,7 +12,6 @@ type StorageArchivistConfig = ArchivistConfig<{
     maxEntries?: number;
     maxEntrySize?: number;
     namespace?: string;
-    persistAccount?: boolean;
     schema: StorageArchivistConfigSchema;
     type?: 'local' | 'session' | 'page';
 }>;
@@ -25,7 +24,6 @@ declare class StorageArchivist<TParams extends StorageArchivistParams = StorageA
     get maxEntries(): number;
     get maxEntrySize(): number;
     get namespace(): string;
-    get persistAccount(): boolean;
     get queries(): string[];
     get type(): "local" | "session" | "page";
     private get privateStorage();
@@ -36,7 +34,6 @@ declare class StorageArchivist<TParams extends StorageArchivistParams = StorageA
     protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
     protected getHandler(hashes: string[]): Promisable<PayloadWithMeta[]>;
     protected insertHandler(payloads: Payload[]): Promise<PayloadWithMeta[]>;
-    protected saveAccount(): void;
     protected startHandler(): Promise<boolean>;
 }
 

package/dist/neutral/index.mjs

@@ -31,9 +31,6 @@ var StorageArchivist = class extends AbstractArchivist {
   get namespace() {
     return this.config?.namespace ?? "xyo-archivist";
   }
-  get persistAccount() {
-    return this.config?.persistAccount ?? false;
-  }
   get queries() {
     return [
       ArchivistAllQuerySchema,
@@ -136,16 +133,8 @@ var StorageArchivist = class extends AbstractArchivist {
       return payload;
     });
   }
-  saveAccount() {
-    if (this.persistAccount) {
-      const account = this.account;
-      this.logger?.log(account.address);
-      this.privateStorage.set("privateKey", account.private.hex);
-    }
-  }
   async startHandler() {
     await super.startHandler();
-    this.saveAccount();
     return true;
   }
 };

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport type { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport type { Promisable, PromisableArray } from '@xylabs/promise'\nimport { fulfilled } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type {\n  ArchivistConfig,\n  ArchivistInsertQuery,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams } from '@xyo-network/archivist-model'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n} from '@xyo-network/archivist-model'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport type { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport type { StoreBase, StoreType } from 'store2'\nimport store from 'store2'\n\nconst storeTypes = store as unknown as StoreType\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  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 ?? storeTypes[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 ?? storeTypes[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    return compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\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    return 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  }\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,SAASA,gBAAgB;AAEzB,SAASC,eAAe;AAExB,SAASC,iBAAiB;AAC1B,SAASC,yBAAyB;AAOlC,SACEC,yBACAC,2BACAC,4BACAC,4BACAC,kCACK;AAGP,SAASC,sBAAsB;AAG/B,OAAOC,WAAW;AAElB,IAAMC,aAAaC;AAGZ,IAAMC,+BAA6D;AAYnE,IAAMC,mBAAN,cAIGC,kBAAAA;EA7CV,OA6CUA;;;EAER,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,YAAYR,WAAW,KAAKoB,IAAI,EAAER,UAAU,GAAG,KAAKA,SAAS,UAAU;AACnG,WAAO,KAAKL;EACd;;EAGA,IAAYe,UAAqB;AAC/B,SAAKd,WAAW,KAAKA,YAAYR,WAAW,KAAKoB,IAAI,EAAER,UAAU,KAAKA,SAAS;AAC/E,WAAO,KAAKJ;EACd;;;;;;;;;;;;;;;;;;EAoBmBe,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,KAAK;IAAK,CAAA;EAC1C;EAEA,MAAyBC,gBAAmD;AAC1E,SAAKjB,QAAQC,IAAI,wBAAwB,KAAKL,QAAQM,MAAM,EAAE;AAC9D,UAAMgB,WAAW,MAAM,KAAKC,IAAG;AAC/BC,aAASF,SAAShB,SAAS,GAAG,MAAM,mBAAA;AACpC,UAAMmB,UAAU,MAAMC,QAAQC,WAC5BC,QACErB,OAAOsB,QAAQ,MAAM,KAAKC,iBAAgB,GAAIC,UAAU,CAAA,CAAE,GAAGrB,IAAI,OAAOsB,WAAAA;AACtE,YAAMC,eAAqC;QACzCC,QAAQtC;MACV;AACA,YAAMuC,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,WAAOU,QAAQH,QAAQb,OAAOyB,SAAAA,EAAW3B,IAAI4B,CAAAA,WAAUA,OAAO3B,KAAK,CAAA;EACrE;EAEA,MAAyB4B,cAAcC,QAAiC;AACtE,WAAOZ,QACL,MAAMF,QAAQH,IACZiB,OAAO9B,IAAI,CAAC+B,SAAAA;AACV,WAAKzC,QAAQ0C,OAAOD,IAAAA;AACpB,aAAOA;IACT,CAAA,CAAA,CAAA;EAGN;EAEmBE,WAAWH,QAAiD;AAC7E,UAAMtC,QAAQ,oBAAIC,IAAAA;AAClB,WAAOyB,QACLY,OAAO9B,IAAI,CAAC+B,SAAAA;AACV,aAAO,KAAKzC,QAAQ4C,IAAIH,IAAAA;IAC1B,CAAA,CAAA,EACA7B,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,MAAyB8B,cAAcvB,UAAiD;AACtF,UAAMwB,QAAQ,MAAMC,eAAeC,UAAU1B,QAAAA;AAC7C,WAAOwB,MAAMpC,IAAI,CAAC,CAACG,SAAS4B,IAAAA,MAAK;AAC/B,YAAM9B,QAAQsC,KAAKC,UAAUrC,OAAAA;AAC7BW,eAASb,MAAML,SAAS,KAAKjB,cAAc,MAAM,sBAAsBoD,IAAAA,KAAS9B,MAAML,MAAM,GAAG;AAC/F,WAAKN,QAAQmD,IAAIV,MAAM5B,OAAAA;AACvB,WAAKb,QAAQmD,IAAItC,QAAQE,OAAOF,OAAAA;AAChC,aAAOA;IACT,CAAA;EACF;EAEUuC,cAAc;AACtB,QAAI,KAAK7D,gBAAgB;AACvB,YAAM8D,UAAU,KAAKA;AACrB,WAAKjD,QAAQC,IAAIgD,QAAQC,OAAO;AAChC,WAAKvD,eAAeoD,IAAI,cAAcE,QAAQE,QAAQC,GAAG;IAC3D;EACF;EAEA,MAAyBC,eAAe;AACtC,UAAM,MAAMA,aAAAA;AACZ,SAAKL,YAAW;AAChB,WAAO;EACT;AACF;","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","storeTypes","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","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","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler"]}
+{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport type { Hash } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport type { Promisable, PromisableArray } from '@xylabs/promise'\nimport { fulfilled } from '@xylabs/promise'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type {\n  ArchivistConfig,\n  ArchivistInsertQuery,\n  ArchivistInstance,\n  ArchivistModuleEventData,\n  ArchivistParams } from '@xyo-network/archivist-model'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n} from '@xyo-network/archivist-model'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport type { AnyConfigSchema } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { Payload, PayloadWithMeta, Schema, WithMeta } from '@xyo-network/payload-model'\nimport type { StoreBase, StoreType } from 'store2'\nimport store from 'store2'\n\nconst storeTypes = store as unknown as StoreType\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  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  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  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 ?? storeTypes[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 ?? storeTypes[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    return compact(\n      await Promise.all(\n        hashes.map((hash) => {\n          this.storage.remove(hash)\n          return hash\n        }),\n      ),\n    )\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    return 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  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    return true\n  }\n}\n"],"mappings":"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","names":["assertEx","compact","fulfilled","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistCommitQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","PayloadBuilder","store","storeTypes","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","defaultConfigSchema","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","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","hash","remove","getHandler","get","insertHandler","pairs","PayloadBuilder","hashPairs","JSON","stringify","set","startHandler"]}

package/package.json

@@ -14,24 +14,24 @@
     "@xylabs/hex": "^4.0.2",
     "@xylabs/lodash": "^4.0.2",
     "@xylabs/promise": "^4.0.2",
-    "@xyo-network/archivist-abstract": "^3.0.4",
-    "@xyo-network/archivist-model": "^3.0.4",
-    "@xyo-network/boundwitness-model": "^3.0.4",
-    "@xyo-network/module-model": "^3.0.4",
-    "@xyo-network/payload-builder": "^3.0.4",
-    "@xyo-network/payload-model": "^3.0.4",
+    "@xyo-network/archivist-abstract": "^3.0.6",
+    "@xyo-network/archivist-model": "^3.0.6",
+    "@xyo-network/boundwitness-model": "^3.0.6",
+    "@xyo-network/module-model": "^3.0.6",
+    "@xyo-network/payload-builder": "^3.0.6",
+    "@xyo-network/payload-model": "^3.0.6",
     "store2": "^2.14.3"
   },
   "devDependencies": {
     "@xylabs/delay": "^4.0.2",
-    "@xylabs/ts-scripts-yarn3": "^4.0.0-rc.20",
-    "@xylabs/tsconfig": "^4.0.0-rc.20",
-    "@xyo-network/account": "^3.0.4",
-    "@xyo-network/archivist-memory": "^3.0.4",
-    "@xyo-network/boundwitness-wrapper": "^3.0.4",
-    "@xyo-network/id-payload-plugin": "^3.0.4",
-    "@xyo-network/node-memory": "^3.0.4",
-    "@xyo-network/payload-wrapper": "^3.0.4",
+    "@xylabs/ts-scripts-yarn3": "^4.0.0-rc.30",
+    "@xylabs/tsconfig": "^4.0.0-rc.30",
+    "@xyo-network/account": "^3.0.6",
+    "@xyo-network/archivist-memory": "^3.0.6",
+    "@xyo-network/boundwitness-wrapper": "^3.0.6",
+    "@xyo-network/id-payload-plugin": "^3.0.6",
+    "@xyo-network/node-memory": "^3.0.6",
+    "@xyo-network/payload-wrapper": "^3.0.6",
     "typescript": "^5.5.4"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -54,6 +54,6 @@
     "url": "git+https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "3.0.4",
+  "version": "3.0.6",
   "type": "module"
 }

package/src/StorageArchivist.ts

@@ -33,7 +33,6 @@ export type StorageArchivistConfig = ArchivistConfig<{
   maxEntries?: number
   maxEntrySize?: number
   namespace?: string
-  persistAccount?: boolean
   schema: StorageArchivistConfigSchema
   type?: 'local' | 'session' | 'page'
 }>
@@ -63,10 +62,6 @@ export class StorageArchivist<
     return this.config?.namespace ?? 'xyo-archivist'
   }
 
-  get persistAccount() {
-    return this.config?.persistAccount ?? false
-  }
-
   override get queries(): string[] {
     return [
       ArchivistAllQuerySchema,
@@ -191,17 +186,8 @@ export class StorageArchivist<
     })
   }
 
-  protected saveAccount() {
-    if (this.persistAccount) {
-      const account = this.account
-      this.logger?.log(account.address)
-      this.privateStorage.set('privateKey', account.private.hex)
-    }
-  }
-
   protected override async startHandler() {
     await super.startHandler()
-    this.saveAccount()
     return true
   }
 }