@xyo-network/archivist-storage 2.88.3 → 2.89.0-rc.2

package/dist/browser/StorageArchivist.d.cts

@@ -1,3 +1,4 @@
+import { Hash } from '@xylabs/hex';
 import { Promisable, PromisableArray } from '@xylabs/promise';
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
 import { ArchivistConfig, ArchivistInstance, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
@@ -30,7 +31,7 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     protected allHandler(): PromisableArray<Payload>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
-    protected deleteHandler(hashes: string[]): Promise<string[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
     protected getHandler(hashes: string[]): Promisable<Payload[]>;
     protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     protected saveAccount(): void;

package/dist/browser/StorageArchivist.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAYpD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}

package/dist/browser/StorageArchivist.d.mts

@@ -1,3 +1,4 @@
+import { Hash } from '@xylabs/hex';
 import { Promisable, PromisableArray } from '@xylabs/promise';
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
 import { ArchivistConfig, ArchivistInstance, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
@@ -30,7 +31,7 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     protected allHandler(): PromisableArray<Payload>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
-    protected deleteHandler(hashes: string[]): Promise<string[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
     protected getHandler(hashes: string[]): Promisable<Payload[]>;
     protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     protected saveAccount(): void;

package/dist/browser/StorageArchivist.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAYpD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}

package/dist/browser/StorageArchivist.d.ts

@@ -1,3 +1,4 @@
+import { Hash } from '@xylabs/hex';
 import { Promisable, PromisableArray } from '@xylabs/promise';
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
 import { ArchivistConfig, ArchivistInstance, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
@@ -30,7 +31,7 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     protected allHandler(): PromisableArray<Payload>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
-    protected deleteHandler(hashes: string[]): Promise<string[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
     protected getHandler(hashes: string[]): Promisable<Payload[]>;
     protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     protected saveAccount(): void;

package/dist/browser/StorageArchivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAYpD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}

package/dist/browser/index.cjs

@@ -42,8 +42,7 @@ var import_lodash = require("@xylabs/lodash");
 var import_promise = require("@xylabs/promise");
 var import_archivist_abstract = require("@xyo-network/archivist-abstract");
 var import_archivist_model = require("@xyo-network/archivist-model");
-var import_hash = require("@xyo-network/hash");
-var import_payload_wrapper = require("@xyo-network/payload-wrapper");
+var import_payload_builder = require("@xyo-network/payload-builder");
 var import_store2 = __toESM(require("store2"), 1);
 var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
 var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist {
@@ -108,8 +107,16 @@ var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist
     return await super.loadAccount()
   }*/
   allHandler() {
+    const found = /* @__PURE__ */ new Set();
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
-    return Object.entries(this.storage.getAll()).map(([, value]) => value);
+    return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   clearHandler() {
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
@@ -133,33 +140,34 @@ var StorageArchivist = class extends import_archivist_abstract.AbstractArchivist
     return (0, import_lodash.compact)(settled.filter(import_promise.fulfilled).map((result) => result.value));
   }
   async deleteHandler(hashes) {
-    const payloadPairs = await Promise.all((await this.get(hashes)).map(async (payload) => [
-      await import_hash.PayloadHasher.hashAsync(payload),
-      payload
-    ]));
-    const deletedPairs = (0, import_lodash.compact)(await Promise.all(payloadPairs.map(([hash, payload]) => {
+    const deletedHashes = (0, import_lodash.compact)(await Promise.all(hashes.map((hash) => {
       this.storage.remove(hash);
-      return [
-        hash,
-        payload
-      ];
+      return hash;
     })));
-    return deletedPairs.map(([hash]) => hash);
+    return deletedHashes;
   }
   getHandler(hashes) {
+    const found = /* @__PURE__ */ new Set();
     return (0, import_lodash.compact)(hashes.map((hash) => {
       return this.storage.get(hash);
-    }));
+    })).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   async insertHandler(payloads) {
-    const resultPayloads = await Promise.all(payloads.map(async (payload) => {
-      const wrapper = import_payload_wrapper.PayloadWrapper.wrap(payload);
-      const hash = await wrapper.hashAsync();
-      const value = JSON.stringify(wrapper.payload());
+    const pairs = await import_payload_builder.PayloadBuilder.hashPairs(payloads);
+    const resultPayloads = pairs.map(([payload, hash]) => {
+      const value = JSON.stringify(payload);
       (0, import_assert.assertEx)(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
-      this.storage.set(hash, wrapper.payload());
-      return wrapper.payload();
-    }));
+      this.storage.set(hash, payload);
+      this.storage.set(payload.$hash, payload);
+      return payload;
+    });
     return resultPayloads;
   }
   saveAccount() {

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 { 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 { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\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 configSchemas = [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<Payload> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll()).map(([, value]) => value)\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<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.parents()).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: string[]): Promise<string[]> {\n    const payloadPairs: [string, Payload][] = await Promise.all(\n      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n    )\n    const deletedPairs: [string, Payload][] = compact(\n      await Promise.all(\n        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n          this.storage.remove(hash)\n          return [hash, payload]\n        }),\n      ),\n    )\n    return deletedPairs.map(([hash]) => hash)\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    )\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const resultPayloads = await Promise.all(\n      payloads.map(async (payload) => {\n        const wrapper = PayloadWrapper.wrap(payload)\n        const hash = await wrapper.hashAsync()\n        const value = JSON.stringify(wrapper.payload())\n        assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n        this.storage.set(hash, wrapper.payload())\n        return wrapper.payload()\n      }),\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","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","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 } 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 configSchemas = [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<Payload> {\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<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.parents()).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<Payload[]> {\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<Payload[]> {\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","_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","parents","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

@@ -7,8 +7,7 @@ import { compact } from "@xylabs/lodash";
 import { fulfilled } from "@xylabs/promise";
 import { AbstractArchivist } from "@xyo-network/archivist-abstract";
 import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema } from "@xyo-network/archivist-model";
-import { PayloadHasher } from "@xyo-network/hash";
-import { PayloadWrapper } from "@xyo-network/payload-wrapper";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
 import store from "store2";
 var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
 var StorageArchivist = class extends AbstractArchivist {
@@ -73,8 +72,16 @@ var StorageArchivist = class extends AbstractArchivist {
     return await super.loadAccount()
   }*/
   allHandler() {
+    const found = /* @__PURE__ */ new Set();
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
-    return Object.entries(this.storage.getAll()).map(([, value]) => value);
+    return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   clearHandler() {
     this.logger?.log(`this.storage.length: ${this.storage.length}`);
@@ -98,33 +105,34 @@ var StorageArchivist = class extends AbstractArchivist {
     return compact(settled.filter(fulfilled).map((result) => result.value));
   }
   async deleteHandler(hashes) {
-    const payloadPairs = await Promise.all((await this.get(hashes)).map(async (payload) => [
-      await PayloadHasher.hashAsync(payload),
-      payload
-    ]));
-    const deletedPairs = compact(await Promise.all(payloadPairs.map(([hash, payload]) => {
+    const deletedHashes = compact(await Promise.all(hashes.map((hash) => {
       this.storage.remove(hash);
-      return [
-        hash,
-        payload
-      ];
+      return hash;
     })));
-    return deletedPairs.map(([hash]) => hash);
+    return deletedHashes;
   }
   getHandler(hashes) {
+    const found = /* @__PURE__ */ new Set();
     return compact(hashes.map((hash) => {
       return this.storage.get(hash);
-    }));
+    })).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   async insertHandler(payloads) {
-    const resultPayloads = await Promise.all(payloads.map(async (payload) => {
-      const wrapper = PayloadWrapper.wrap(payload);
-      const hash = await wrapper.hashAsync();
-      const value = JSON.stringify(wrapper.payload());
+    const pairs = await PayloadBuilder.hashPairs(payloads);
+    const resultPayloads = pairs.map(([payload, hash]) => {
+      const value = JSON.stringify(payload);
       assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
-      this.storage.set(hash, wrapper.payload());
-      return wrapper.payload();
-    }));
+      this.storage.set(hash, payload);
+      this.storage.set(payload.$hash, payload);
+      return payload;
+    });
     return resultPayloads;
   }
   saveAccount() {

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\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 { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\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 configSchemas = [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<Payload> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll()).map(([, value]) => value)\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<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.parents()).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: string[]): Promise<string[]> {\n    const payloadPairs: [string, Payload][] = await Promise.all(\n      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n    )\n    const deletedPairs: [string, Payload][] = compact(\n      await Promise.all(\n        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n          this.storage.remove(hash)\n          return [hash, payload]\n        }),\n      ),\n    )\n    return deletedPairs.map(([hash]) => hash)\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    )\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const resultPayloads = await Promise.all(\n      payloads.map(async (payload) => {\n        const wrapper = PayloadWrapper.wrap(payload)\n        const hash = await wrapper.hashAsync()\n        const value = JSON.stringify(wrapper.payload())\n        assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n        this.storage.set(hash, wrapper.payload())\n        return wrapper.payload()\n      }),\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,SAASA,gBAAgB;AACzB,SAASC,eAAe;AACxB,SAASC,iBAA8C;AACvD,SAASC,yBAAyB;AAClC,SACEC,yBACAC,2BACAC,4BAEAC,4BAEAC,kCAIK;AAEP,SAASC,qBAAqB;AAG9B,SAASC,sBAAsB;AAC/B,OAAOC,WAA0B;AAG1B,IAAMC,+BAA6D;AAYnE,IAAMC,mBAAN,cAIGC,kBAAAA;EAxCV,OAwCUA;;;EAGR,OAAgBC,gBAAgB;IAACH;;EAEzBI;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,MAAM,KAAKF,IAAI,EAAER,UAAU,GAAG,KAAKA,SAAS,UAAU;AAC9F,WAAO,KAAKL;EACd;;EAGA,IAAYgB,UAAqB;AAC/B,SAAKf,WAAW,KAAKA,YAAYc,MAAM,KAAKF,IAAI,EAAER,UAAU,KAAKA,SAAS;AAC1E,WAAO,KAAKJ;EACd;;;;;;;;;;;;;;;;;;EAoBmBgB,aAAuC;AACxD,SAAKC,QAAQC,IAAI,wBAAwB,KAAKH,QAAQI,MAAM,EAAE;AAC9D,WAAOC,OAAOC,QAAQ,KAAKN,QAAQO,OAAM,CAAA,EAAIC,IAAI,CAAC,CAAA,EAAGC,KAAAA,MAAWA,KAAAA;EAClE;EAEmBC,eAAqC;AACtD,SAAKR,QAAQC,IAAI,wBAAwB,KAAKH,QAAQI,MAAM,EAAE;AAC9D,SAAKJ,QAAQW,MAAK;AAClB,WAAO,KAAKC,KAAK,WAAW;MAAEC,QAAQ;IAAK,CAAA;EAC7C;EAEA,MAAyBC,gBAAyC;AAChE,SAAKZ,QAAQC,IAAI,wBAAwB,KAAKH,QAAQI,MAAM,EAAE;AAC9D,UAAMW,WAAW,MAAM,KAAKC,IAAG;AAC/BC,aAASF,SAASX,SAAS,GAAG,mBAAA;AAC9B,UAAMc,UAAU,MAAMC,QAAQC,WAC5BC,QACEhB,OAAOiB,QAAQ,MAAM,KAAKC,QAAO,GAAIC,UAAU,CAAA,CAAE,GAAGhB,IAAI,OAAOiB,WAAAA;AAC7D,YAAMC,eAAqC;QACzCC,QAAQhC;MACV;AACA,YAAMiC,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,QAAQY,OAAOC,SAAAA,EAAWvB,IAAI,CAACwB,WAAWA,OAAOvB,KAAK,CAAA;EACvE;EAEA,MAAyBwB,cAAcC,QAAqC;AAC1E,UAAMC,eAAoC,MAAMhB,QAAQH,KACrD,MAAM,KAAKoB,IAAIF,MAAAA,GAAS1B,IAAgC,OAAO6B,YAAY;MAAC,MAAMC,cAAcC,UAAUF,OAAAA;MAAUA;KAAQ,CAAA;AAE/H,UAAMG,eAAoCnB,QACxC,MAAMF,QAAQH,IACZmB,aAAa3B,IAAmC,CAAC,CAACiC,MAAMJ,OAAAA,MAAQ;AAC9D,WAAKrC,QAAQ0C,OAAOD,IAAAA;AACpB,aAAO;QAACA;QAAMJ;;IAChB,CAAA,CAAA,CAAA;AAGJ,WAAOG,aAAahC,IAAI,CAAC,CAACiC,IAAAA,MAAUA,IAAAA;EACtC;EAEmBE,WAAWT,QAAyC;AACrE,WAAOb,QACLa,OAAO1B,IAAI,CAACiC,SAAAA;AACV,aAAO,KAAKzC,QAAQoC,IAAIK,IAAAA;IAC1B,CAAA,CAAA;EAEJ;EAEA,MAAyBG,cAAc7B,UAAyC;AAC9E,UAAM8B,iBAAiB,MAAM1B,QAAQH,IACnCD,SAASP,IAAI,OAAO6B,YAAAA;AAClB,YAAMS,UAAUC,eAAeC,KAAKX,OAAAA;AACpC,YAAMI,OAAO,MAAMK,QAAQP,UAAS;AACpC,YAAM9B,QAAQwC,KAAKC,UAAUJ,QAAQT,QAAO,CAAA;AAC5CpB,eAASR,MAAML,SAAS,KAAKhB,cAAc,sBAAsBqD,IAAAA,KAAShC,MAAML,MAAM,GAAG;AACzF,WAAKJ,QAAQmD,IAAIV,MAAMK,QAAQT,QAAO,CAAA;AACtC,aAAOS,QAAQT,QAAO;IACxB,CAAA,CAAA;AAEF,WAAOQ;EACT;EAEUO,cAAc;AACtB,QAAI,KAAK9D,gBAAgB;AACvB,YAAM+D,UAAU,KAAKA;AACrB,WAAKnD,QAAQC,IAAIkD,QAAQC,OAAO;AAChC,WAAKxD,eAAeqD,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","PayloadHasher","PayloadWrapper","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","configSchemas","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","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 } 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 configSchemas = [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<Payload> {\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<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.parents()).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<Payload[]> {\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<Payload[]> {\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","_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","parents","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/StorageArchivist.d.cts

@@ -1,3 +1,4 @@
+import { Hash } from '@xylabs/hex';
 import { Promisable, PromisableArray } from '@xylabs/promise';
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
 import { ArchivistConfig, ArchivistInstance, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
@@ -30,7 +31,7 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     protected allHandler(): PromisableArray<Payload>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
-    protected deleteHandler(hashes: string[]): Promise<string[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
     protected getHandler(hashes: string[]): Promisable<Payload[]>;
     protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     protected saveAccount(): void;

package/dist/node/StorageArchivist.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAYpD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}

package/dist/node/StorageArchivist.d.mts

@@ -1,3 +1,4 @@
+import { Hash } from '@xylabs/hex';
 import { Promisable, PromisableArray } from '@xylabs/promise';
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
 import { ArchivistConfig, ArchivistInstance, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
@@ -30,7 +31,7 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     protected allHandler(): PromisableArray<Payload>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
-    protected deleteHandler(hashes: string[]): Promise<string[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
     protected getHandler(hashes: string[]): Promisable<Payload[]>;
     protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     protected saveAccount(): void;

package/dist/node/StorageArchivist.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAYpD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}

package/dist/node/StorageArchivist.d.ts

@@ -1,3 +1,4 @@
+import { Hash } from '@xylabs/hex';
 import { Promisable, PromisableArray } from '@xylabs/promise';
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
 import { ArchivistConfig, ArchivistInstance, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
@@ -30,7 +31,7 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     protected allHandler(): PromisableArray<Payload>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
-    protected deleteHandler(hashes: string[]): Promise<string[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
     protected getHandler(hashes: string[]): Promisable<Payload[]>;
     protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     protected saveAccount(): void;

package/dist/node/StorageArchivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAexD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAa,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAetC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAoBxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAYpD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAgB7C,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAY/E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}

package/dist/node/index.cjs

@@ -47,8 +47,7 @@ var import_lodash = require("@xylabs/lodash");
 var import_promise = require("@xylabs/promise");
 var import_archivist_abstract = require("@xyo-network/archivist-abstract");
 var import_archivist_model = require("@xyo-network/archivist-model");
-var import_hash = require("@xyo-network/hash");
-var import_payload_wrapper = require("@xyo-network/payload-wrapper");
+var import_payload_builder = require("@xyo-network/payload-builder");
 var import_store2 = __toESM(require("store2"), 1);
 var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
 var _StorageArchivist = class _StorageArchivist extends import_archivist_abstract.AbstractArchivist {
@@ -113,8 +112,16 @@ var _StorageArchivist = class _StorageArchivist extends import_archivist_abstrac
   }*/
   allHandler() {
     var _a;
+    const found = /* @__PURE__ */ new Set();
     (_a = this.logger) == null ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
-    return Object.entries(this.storage.getAll()).map(([, value]) => value);
+    return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   clearHandler() {
     var _a;
@@ -141,33 +148,34 @@ var _StorageArchivist = class _StorageArchivist extends import_archivist_abstrac
     return (0, import_lodash.compact)(settled.filter(import_promise.fulfilled).map((result) => result.value));
   }
   async deleteHandler(hashes) {
-    const payloadPairs = await Promise.all((await this.get(hashes)).map(async (payload) => [
-      await import_hash.PayloadHasher.hashAsync(payload),
-      payload
-    ]));
-    const deletedPairs = (0, import_lodash.compact)(await Promise.all(payloadPairs.map(([hash, payload]) => {
+    const deletedHashes = (0, import_lodash.compact)(await Promise.all(hashes.map((hash) => {
       this.storage.remove(hash);
-      return [
-        hash,
-        payload
-      ];
+      return hash;
     })));
-    return deletedPairs.map(([hash]) => hash);
+    return deletedHashes;
   }
   getHandler(hashes) {
+    const found = /* @__PURE__ */ new Set();
     return (0, import_lodash.compact)(hashes.map((hash) => {
       return this.storage.get(hash);
-    }));
+    })).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   async insertHandler(payloads) {
-    const resultPayloads = await Promise.all(payloads.map(async (payload) => {
-      const wrapper = import_payload_wrapper.PayloadWrapper.wrap(payload);
-      const hash = await wrapper.hashAsync();
-      const value = JSON.stringify(wrapper.payload());
+    const pairs = await import_payload_builder.PayloadBuilder.hashPairs(payloads);
+    const resultPayloads = pairs.map(([payload, hash]) => {
+      const value = JSON.stringify(payload);
       (0, import_assert.assertEx)(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
-      this.storage.set(hash, wrapper.payload());
-      return wrapper.payload();
-    }));
+      this.storage.set(hash, payload);
+      this.storage.set(payload.$hash, payload);
+      return payload;
+    });
     return resultPayloads;
   }
   saveAccount() {

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 { 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 { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\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 configSchemas = [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<Payload> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll()).map(([, value]) => value)\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<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.parents()).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: string[]): Promise<string[]> {\n    const payloadPairs: [string, Payload][] = await Promise.all(\n      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n    )\n    const deletedPairs: [string, Payload][] = compact(\n      await Promise.all(\n        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n          this.storage.remove(hash)\n          return [hash, payload]\n        }),\n      ),\n    )\n    return deletedPairs.map(([hash]) => hash)\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    )\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const resultPayloads = await Promise.all(\n      payloads.map(async (payload) => {\n        const wrapper = PayloadWrapper.wrap(payload)\n        const hash = await wrapper.hashAsync()\n        const value = JSON.stringify(wrapper.payload())\n        assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n        this.storage.set(hash, wrapper.payload())\n        return wrapper.payload()\n      }),\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","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","_a","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas"]}
+{"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 } 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 configSchemas = [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<Payload> {\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<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.parents()).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<Payload[]> {\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<Payload[]> {\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","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","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"]}

package/dist/node/index.js

@@ -12,8 +12,7 @@ import { compact } from "@xylabs/lodash";
 import { fulfilled } from "@xylabs/promise";
 import { AbstractArchivist } from "@xyo-network/archivist-abstract";
 import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema } from "@xyo-network/archivist-model";
-import { PayloadHasher } from "@xyo-network/hash";
-import { PayloadWrapper } from "@xyo-network/payload-wrapper";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
 import store from "store2";
 var StorageArchivistConfigSchema = "network.xyo.archivist.storage.config";
 var _StorageArchivist = class _StorageArchivist extends AbstractArchivist {
@@ -78,8 +77,16 @@ var _StorageArchivist = class _StorageArchivist extends AbstractArchivist {
   }*/
   allHandler() {
     var _a;
+    const found = /* @__PURE__ */ new Set();
     (_a = this.logger) == null ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
-    return Object.entries(this.storage.getAll()).map(([, value]) => value);
+    return Object.entries(this.storage.getAll()).map(([, value]) => value).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   clearHandler() {
     var _a;
@@ -106,33 +113,34 @@ var _StorageArchivist = class _StorageArchivist extends AbstractArchivist {
     return compact(settled.filter(fulfilled).map((result) => result.value));
   }
   async deleteHandler(hashes) {
-    const payloadPairs = await Promise.all((await this.get(hashes)).map(async (payload) => [
-      await PayloadHasher.hashAsync(payload),
-      payload
-    ]));
-    const deletedPairs = compact(await Promise.all(payloadPairs.map(([hash, payload]) => {
+    const deletedHashes = compact(await Promise.all(hashes.map((hash) => {
       this.storage.remove(hash);
-      return [
-        hash,
-        payload
-      ];
+      return hash;
     })));
-    return deletedPairs.map(([hash]) => hash);
+    return deletedHashes;
   }
   getHandler(hashes) {
+    const found = /* @__PURE__ */ new Set();
     return compact(hashes.map((hash) => {
       return this.storage.get(hash);
-    }));
+    })).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false;
+      } else {
+        found.add(payload.$hash);
+        return true;
+      }
+    });
   }
   async insertHandler(payloads) {
-    const resultPayloads = await Promise.all(payloads.map(async (payload) => {
-      const wrapper = PayloadWrapper.wrap(payload);
-      const hash = await wrapper.hashAsync();
-      const value = JSON.stringify(wrapper.payload());
+    const pairs = await PayloadBuilder.hashPairs(payloads);
+    const resultPayloads = pairs.map(([payload, hash]) => {
+      const value = JSON.stringify(payload);
       assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`);
-      this.storage.set(hash, wrapper.payload());
-      return wrapper.payload();
-    }));
+      this.storage.set(hash, payload);
+      this.storage.set(payload.$hash, payload);
+      return payload;
+    });
     return resultPayloads;
   }
   saveAccount() {

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/StorageArchivist.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\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 { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\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 configSchemas = [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<Payload> {\n    this.logger?.log(`this.storage.length: ${this.storage.length}`)\n    return Object.entries(this.storage.getAll()).map(([, value]) => value)\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<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.parents()).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: string[]): Promise<string[]> {\n    const payloadPairs: [string, Payload][] = await Promise.all(\n      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n    )\n    const deletedPairs: [string, Payload][] = compact(\n      await Promise.all(\n        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {\n          this.storage.remove(hash)\n          return [hash, payload]\n        }),\n      ),\n    )\n    return deletedPairs.map(([hash]) => hash)\n  }\n\n  protected override getHandler(hashes: string[]): Promisable<Payload[]> {\n    return compact(\n      hashes.map((hash) => {\n        return this.storage.get(hash)\n      }),\n    )\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const resultPayloads = await Promise.all(\n      payloads.map(async (payload) => {\n        const wrapper = PayloadWrapper.wrap(payload)\n        const hash = await wrapper.hashAsync()\n        const value = JSON.stringify(wrapper.payload())\n        assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)\n        this.storage.set(hash, wrapper.payload())\n        return wrapper.payload()\n      }),\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","PayloadHasher","PayloadWrapper","store","StorageArchivistConfigSchema","StorageArchivist","AbstractArchivist","_privateStorage","_storage","maxEntries","config","maxEntrySize","namespace","persistAccount","queries","ArchivistAllQuerySchema","ArchivistDeleteQuerySchema","ArchivistClearQuerySchema","ArchivistInsertQuerySchema","ArchivistCommitQuerySchema","type","privateStorage","store","storage","allHandler","logger","log","length","Object","entries","getAll","map","value","clearHandler","clear","emit","module","commitHandler","payloads","all","assertEx","settled","Promise","allSettled","compact","values","parents","commit","parent","_a","queryPayload","schema","query","bindQuery","filter","fulfilled","result","deleteHandler","hashes","payloadPairs","get","payload","PayloadHasher","hashAsync","deletedPairs","hash","remove","getHandler","insertHandler","resultPayloads","wrapper","PayloadWrapper","wrap","JSON","stringify","set","saveAccount","account","address","private","hex","startHandler","configSchemas"]}
+{"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 } 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 configSchemas = [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<Payload> {\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<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.parents()).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<Payload[]> {\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<Payload[]> {\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","parents","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"]}

package/package.json

@@ -11,26 +11,27 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.13.29",
+    "@xylabs/hex": "^2.13.29",
     "@xylabs/lodash": "^2.13.29",
     "@xylabs/promise": "^2.13.29",
-    "@xyo-network/archivist-abstract": "~2.88.3",
-    "@xyo-network/archivist-model": "~2.88.3",
-    "@xyo-network/boundwitness-model": "~2.88.3",
-    "@xyo-network/hash": "~2.88.3",
-    "@xyo-network/module-model": "~2.88.3",
-    "@xyo-network/payload-model": "~2.88.3",
-    "@xyo-network/payload-wrapper": "~2.88.3",
+    "@xyo-network/archivist-abstract": "~2.89.0-rc.2",
+    "@xyo-network/archivist-model": "~2.89.0-rc.2",
+    "@xyo-network/boundwitness-model": "~2.89.0-rc.2",
+    "@xyo-network/module-model": "~2.89.0-rc.2",
+    "@xyo-network/payload-builder": "~2.89.0-rc.2",
+    "@xyo-network/payload-model": "~2.89.0-rc.2",
     "store2": "^2.14.2"
   },
   "devDependencies": {
     "@xylabs/delay": "^2.13.29",
     "@xylabs/ts-scripts-yarn3": "^3.2.42",
     "@xylabs/tsconfig": "^3.2.42",
-    "@xyo-network/account": "~2.88.3",
-    "@xyo-network/archivist-memory": "~2.88.3",
-    "@xyo-network/boundwitness-builder": "~2.88.3",
-    "@xyo-network/id-payload-plugin": "~2.88.3",
-    "@xyo-network/node-memory": "~2.88.3",
+    "@xyo-network/account": "~2.89.0-rc.2",
+    "@xyo-network/archivist-memory": "~2.89.0-rc.2",
+    "@xyo-network/boundwitness-builder": "~2.89.0-rc.2",
+    "@xyo-network/id-payload-plugin": "~2.89.0-rc.2",
+    "@xyo-network/node-memory": "~2.89.0-rc.2",
+    "@xyo-network/payload-wrapper": "~2.89.0-rc.2",
     "typescript": "^5.3.3"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -72,6 +73,7 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.88.3",
-  "type": "module"
+  "version": "2.89.0-rc.2",
+  "type": "module",
+  "stableVersion": "2.88.3"
 }

package/src/StorageArchivist.ts

@@ -1,4 +1,5 @@
 import { assertEx } from '@xylabs/assert'
+import { Hash } from '@xylabs/hex'
 import { compact } from '@xylabs/lodash'
 import { fulfilled, Promisable, PromisableArray } from '@xylabs/promise'
 import { AbstractArchivist } from '@xyo-network/archivist-abstract'
@@ -15,10 +16,9 @@ import {
   ArchivistParams,
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
-import { PayloadHasher } from '@xyo-network/hash'
 import { AnyConfigSchema } from '@xyo-network/module-model'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import store, { StoreBase } from 'store2'
 
 export type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config'
@@ -108,8 +108,18 @@ export class StorageArchivist<
   }*/
 
   protected override allHandler(): PromisableArray<Payload> {
+    const found = new Set<string>()
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
-    return Object.entries(this.storage.getAll()).map(([, value]) => value)
+    return Object.entries(this.storage.getAll())
+      .map(([, value]) => value)
+      .filter((payload) => {
+        if (found.has(payload.$hash)) {
+          return false
+        } else {
+          found.add(payload.$hash)
+          return true
+        }
+      })
   }
 
   protected override clearHandler(): void | Promise<void> {
@@ -138,40 +148,43 @@ export class StorageArchivist<
     return compact(settled.filter(fulfilled).map((result) => result.value))
   }
 
-  protected override async deleteHandler(hashes: string[]): Promise<string[]> {
-    const payloadPairs: [string, Payload][] = await Promise.all(
-      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),
-    )
-    const deletedPairs: [string, Payload][] = compact(
+  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {
+    const deletedHashes = compact(
       await Promise.all(
-        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {
+        hashes.map((hash) => {
           this.storage.remove(hash)
-          return [hash, payload]
+          return hash
         }),
       ),
     )
-    return deletedPairs.map(([hash]) => hash)
+    return deletedHashes
   }
 
   protected override getHandler(hashes: string[]): Promisable<Payload[]> {
+    const found = new Set<string>()
     return compact(
       hashes.map((hash) => {
         return this.storage.get(hash)
       }),
-    )
+    ).filter((payload) => {
+      if (found.has(payload.$hash)) {
+        return false
+      } else {
+        found.add(payload.$hash)
+        return true
+      }
+    })
   }
 
   protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {
-    const resultPayloads = await Promise.all(
-      payloads.map(async (payload) => {
-        const wrapper = PayloadWrapper.wrap(payload)
-        const hash = await wrapper.hashAsync()
-        const value = JSON.stringify(wrapper.payload())
-        assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)
-        this.storage.set(hash, wrapper.payload())
-        return wrapper.payload()
-      }),
-    )
+    const pairs = await PayloadBuilder.hashPairs(payloads)
+    const resultPayloads = pairs.map(([payload, hash]) => {
+      const value = JSON.stringify(payload)
+      assertEx(value.length < this.maxEntrySize, `Payload too large [${hash}, ${value.length}]`)
+      this.storage.set(hash, payload)
+      this.storage.set(payload.$hash, payload)
+      return payload
+    })
     return resultPayloads
   }