@xyo-network/archivist-indexeddb 2.65.2 → 2.65.4

package/dist/esm/AbstractIndexedDbArchivist.js

@@ -0,0 +1,12 @@
+import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
+import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-model';
+export const AbstractIndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config';
+export class AbstractIndexedDbArchivist extends AbstractDirectArchivist {
+    static configSchemas = [AbstractIndexedDbArchivistConfigSchema];
+    static defaultDbName = 'archivist';
+    static defaultStoreName = 'payloads';
+    get queries() {
+        return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries];
+    }
+}
+//# sourceMappingURL=AbstractIndexedDbArchivist.js.map

package/dist/esm/AbstractIndexedDbArchivist.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractIndexedDbArchivist.js","sourceRoot":"","sources":["../../src/AbstractIndexedDbArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AACzE,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EAEzB,0BAA0B,EAC1B,0BAA0B,GAG3B,MAAM,8BAA8B,CAAA;AAIrC,MAAM,CAAC,MAAM,sCAAsC,GAA2C,wCAAwC,CAAA;AAgBtI,MAAM,OAAgB,0BAGpB,SAAQ,uBAA4C;IACpD,MAAM,CAAU,aAAa,GAAG,CAAC,sCAAsC,CAAC,CAAA;IACxE,MAAM,CAAC,aAAa,GAAG,WAAW,CAAA;IAClC,MAAM,CAAC,gBAAgB,GAAG,UAAU,CAAA;IAEpC,IAAa,OAAO;QAClB,OAAO,CAAC,uBAAuB,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;IACvI,CAAC"}

package/dist/esm/IndexedDbArchivist.js

@@ -1,18 +1,13 @@
-var IndexedDbArchivist_1;
-import { __decorate } from "tslib";
-import { assertEx } from '@xylabs/assert';
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
+import { exists } from '@xylabs/exists';
 import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-model';
 import { PayloadHasher } from '@xyo-network/core';
-import { creatableModule } from '@xyo-network/module';
-import { clear, createStore, delMany, entries, getMany, setMany } from 'idb-keyval';
+import { openDB } from 'idb';
+import { AbstractIndexedDbArchivist } from './AbstractIndexedDbArchivist';
 export const IndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config';
-export let IndexedDbArchivist = class IndexedDbArchivist extends AbstractDirectArchivist {
-    static { IndexedDbArchivist_1 = this; }
+export class IndexedDbArchivist extends AbstractIndexedDbArchivist {
+    static CurrentSchemaVersion = 1;
     static configSchemas = [IndexedDbArchivistConfigSchema];
-    static defaultDbName = 'archivist';
-    static defaultStoreName = 'payloads';
-    _db;
+    db = undefined;
     /**
      * The database name. If not supplied via config, it defaults
      * to the module name (not guaranteed to be unique) and if module
@@ -21,7 +16,7 @@ export let IndexedDbArchivist = class IndexedDbArchivist extends AbstractDirectA
      * make the most sense for 99% of use cases.
      */
     get dbName() {
-        return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist_1.defaultDbName;
+        return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName;
     }
     get queries() {
         return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries];
@@ -37,43 +32,41 @@ export let IndexedDbArchivist = class IndexedDbArchivist extends AbstractDirectA
      * https://www.npmjs.com/package/idb
      */
     get storeName() {
-        return this.config?.storeName ?? IndexedDbArchivist_1.defaultStoreName;
-    }
-    get db() {
-        return assertEx(this._db, 'DB not initialized');
+        return (this.config?.storeName ?? IndexedDbArchivist.defaultStoreName);
     }
     async start() {
         await super.start();
         // NOTE: We could defer this creation to first access but we
         // want to fail fast here in case something is wrong
-        this._db = createStore(this.dbName, this.storeName);
+        this.db = openDB(this.dbName, IndexedDbArchivist.CurrentSchemaVersion, {
+            upgrade: (db) => db.createObjectStore(this.storeName),
+        });
     }
     async allHandler() {
-        const result = await entries(this.db);
-        return result.map(([_hash, payload]) => payload);
+        return (await (await this.db)?.getAll(this.storeName)) ?? [];
     }
     async clearHandler() {
-        await clear(this.db);
+        await (await this.db)?.clear(this.storeName);
     }
     async deleteHandler(hashes) {
-        await delMany(hashes, this.db);
+        await Promise.all(hashes.map(async (hash) => {
+            await (await this.db)?.delete(this.storeName, hash);
+        }));
         return hashes.map((_) => true);
     }
     async getHandler(hashes) {
-        const result = await getMany(hashes, this.db);
-        return result;
+        const results = (await Promise.all(hashes.map(async (hash) => {
+            return await (await this.db)?.get(this.storeName, hash);
+        }))).filter(exists);
+        return results;
     }
     async insertHandler(payloads) {
-        const entries = await Promise.all(payloads.map(async (payload) => {
+        await Promise.all(payloads.map(async (payload) => {
             const hash = await PayloadHasher.hashAsync(payload);
-            return [hash, payload];
+            await (await this.db)?.put(this.storeName, payload, hash);
         }));
-        await setMany(entries, this.db);
         const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, payloads);
         return [result[0]];
     }
-};
-IndexedDbArchivist = IndexedDbArchivist_1 = __decorate([
-    creatableModule()
-], IndexedDbArchivist);
+}
 //# sourceMappingURL=IndexedDbArchivist.js.map

package/dist/esm/IndexedDbArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"IndexedDbArchivist.js","sourceRoot":"","sources":["../../src/IndexedDbArchivist.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IndexedDbArchivist.js","sourceRoot":"","sources":["../../src/IndexedDbArchivist.ts"],"names":[],"mappings":"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"}

package/dist/esm/IndexedDbArchivistSimple.js

@@ -0,0 +1,71 @@
+import { assertEx } from '@xylabs/assert';
+import { exists } from '@xylabs/exists';
+import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-model';
+import { PayloadHasher } from '@xyo-network/core';
+import { clear, createStore, delMany, entries, getMany, setMany } from 'idb-keyval';
+import { AbstractIndexedDbArchivist } from './AbstractIndexedDbArchivist';
+export const IndexedDbArchivistSimpleConfigSchema = 'network.xyo.archivist.indexeddb.config';
+export class IndexedDbArchivistSimple extends AbstractIndexedDbArchivist {
+    static configSchemas = [IndexedDbArchivistSimpleConfigSchema];
+    _db;
+    /**
+     * The database name. If not supplied via config, it defaults
+     * to the module name (not guaranteed to be unique) and if module
+     * name is not supplied, it defaults to `archivist`. This behavior
+     * biases towards a single, isolated DB per archivist which seems to
+     * make the most sense for 99% of use cases.
+     */
+    get dbName() {
+        return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivistSimple.defaultDbName;
+    }
+    get queries() {
+        return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries];
+    }
+    /**
+     * The name of the object store. If not supplied via config, it defaults
+     * to `payloads`. The limitation of the current IndexedDB wrapper we're
+     * using is that it only supports a single object store per DB. See here:
+     * https://github.com/jakearchibald/idb-keyval/blob/main/custom-stores.md#defining-a-custom-database--store-name
+     * If this becomes a problem or we need migrations/transactions, we can
+     * move to this more-flexible library, which they recommend (and who
+     * recommends them for our simple use case of key-value storage):
+     * https://www.npmjs.com/package/idb
+     */
+    get storeName() {
+        return this.config?.storeName ?? IndexedDbArchivistSimple.defaultStoreName;
+    }
+    get db() {
+        return assertEx(this._db, 'DB not initialized');
+    }
+    async start() {
+        await super.start();
+        // NOTE: We could defer this creation to first access but we
+        // want to fail fast here in case something is wrong
+        this._db = createStore(this.dbName, this.storeName);
+    }
+    async allHandler() {
+        const result = await entries(this.db);
+        return result.map(([_hash, payload]) => payload);
+    }
+    async clearHandler() {
+        await clear(this.db);
+    }
+    async deleteHandler(hashes) {
+        await delMany(hashes, this.db);
+        return hashes.map((_) => true);
+    }
+    async getHandler(hashes) {
+        const result = await getMany(hashes, this.db);
+        return result.filter(exists);
+    }
+    async insertHandler(payloads) {
+        const entries = await Promise.all(payloads.map(async (payload) => {
+            const hash = await PayloadHasher.hashAsync(payload);
+            return [hash, payload];
+        }));
+        await setMany(entries, this.db);
+        const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, payloads);
+        return [result[0]];
+    }
+}
+//# sourceMappingURL=IndexedDbArchivistSimple.js.map

package/dist/esm/IndexedDbArchivistSimple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IndexedDbArchivistSimple.js","sourceRoot":"","sources":["../../src/IndexedDbArchivistSimple.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.js

@@ -1,2 +1,3 @@
 export * from './IndexedDbArchivist';
+export * from './IndexedDbArchivistSimple';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA"}

package/dist/types/AbstractIndexedDbArchivist.d.ts

@@ -0,0 +1,32 @@
+import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
+import { ArchivistConfig, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
+import { AnyConfigSchema } from '@xyo-network/module';
+export type AbstractIndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config';
+export declare const AbstractIndexedDbArchivistConfigSchema: AbstractIndexedDbArchivistConfigSchema;
+export type AbstractIndexedDbArchivistConfig = ArchivistConfig<{
+    /**
+     * The database name
+     */
+    dbName?: string;
+    schema: AbstractIndexedDbArchivistConfigSchema;
+    /**
+     * The name of the object store
+     */
+    storeName?: string;
+}>;
+export type AbstractIndexedDbArchivistParams = ArchivistParams<AnyConfigSchema<AbstractIndexedDbArchivistConfig>>;
+export declare abstract class AbstractIndexedDbArchivist<TParams extends AbstractIndexedDbArchivistParams = AbstractIndexedDbArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractDirectArchivist<TParams, TEventData> {
+    static configSchemas: "network.xyo.archivist.indexeddb.config"[];
+    static defaultDbName: string;
+    static defaultStoreName: string;
+    get queries(): string[];
+    /**
+     * The database name.
+     */
+    abstract get dbName(): string;
+    /**
+     * The name of the object store.
+     */
+    abstract get storeName(): string;
+}
+//# sourceMappingURL=AbstractIndexedDbArchivist.d.ts.map

package/dist/types/AbstractIndexedDbArchivist.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractIndexedDbArchivist.d.ts","sourceRoot":"","sources":["../../src/AbstractIndexedDbArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AACzE,OAAO,EAGL,eAAe,EAGf,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,MAAM,MAAM,sCAAsC,GAAG,wCAAwC,CAAA;AAC7F,eAAO,MAAM,sCAAsC,EAAE,sCAAiF,CAAA;AAEtI,MAAM,MAAM,gCAAgC,GAAG,eAAe,CAAC;IAC7D;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,sCAAsC,CAAA;IAC9C;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC,CAAA;AAEF,MAAM,MAAM,gCAAgC,GAAG,eAAe,CAAC,eAAe,CAAC,gCAAgC,CAAC,CAAC,CAAA;AAEjH,8BAAsB,0BAA0B,CAC9C,OAAO,SAAS,gCAAgC,GAAG,gCAAgC,EACnF,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC;IACpD,OAAgB,aAAa,6CAA2C;IACxE,MAAM,CAAC,aAAa,SAAc;IAClC,MAAM,CAAC,gBAAgB,SAAa;IAEpC,IAAa,OAAO,aAEnB;IAED;;OAEG;IACH,QAAQ,KAAK,MAAM,IAAI,MAAM,CAAA;IAE7B;;OAEG;IACH,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAA;CACjC"}

package/dist/types/IndexedDbArchivist.d.ts

@@ -1,8 +1,9 @@
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
 import { ArchivistConfig, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
 import { BoundWitness } from '@xyo-network/boundwitness-model';
 import { AnyConfigSchema } from '@xyo-network/module';
 import { Payload } from '@xyo-network/payload-model';
+import { DBSchema } from 'idb';
+import { AbstractIndexedDbArchivist } from './AbstractIndexedDbArchivist';
 export type IndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config';
 export declare const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema;
 export type IndexedDbArchivistConfig = ArchivistConfig<{
@@ -17,11 +18,17 @@ export type IndexedDbArchivistConfig = ArchivistConfig<{
     storeName?: string;
 }>;
 export type IndexedDbArchivistParams = ArchivistParams<AnyConfigSchema<IndexedDbArchivistConfig>>;
-export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractDirectArchivist<TParams, TEventData> {
+export interface IndexedDbArchivistSchemaV1 extends DBSchema {
+    archivist: {
+        key: string;
+        value: Payload;
+    };
+}
+type StoreName = keyof Pick<IndexedDbArchivistSchemaV1, 'archivist'>;
+export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractIndexedDbArchivist<TParams, TEventData> {
+    static readonly CurrentSchemaVersion = 1;
     static configSchemas: "network.xyo.archivist.indexeddb.config"[];
-    static defaultDbName: string;
-    static defaultStoreName: string;
-    private _db;
+    private db;
     /**
      * The database name. If not supplied via config, it defaults
      * to the module name (not guaranteed to be unique) and if module
@@ -41,8 +48,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      * recommends them for our simple use case of key-value storage):
      * https://www.npmjs.com/package/idb
      */
-    get storeName(): string;
-    private get db();
+    get storeName(): StoreName;
     start(): Promise<void>;
     protected allHandler(): Promise<Payload[]>;
     protected clearHandler(): Promise<void>;
@@ -50,4 +56,5 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     protected getHandler(hashes: string[]): Promise<Payload[]>;
     protected insertHandler(payloads: Payload[]): Promise<BoundWitness[]>;
 }
+export {};
 //# sourceMappingURL=IndexedDbArchivist.d.ts.map

package/dist/types/IndexedDbArchivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IndexedDbArchivist.d.ts","sourceRoot":"","sources":["../../src/IndexedDbArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AACzE,OAAO,EAGL,eAAe,EAGf,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAmB,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,8BAA8B,GAAG,wCAAwC,CAAA;AACrF,eAAO,MAAM,8BAA8B,EAAE,8BAAyE,CAAA;AAEtH,MAAM,MAAM,wBAAwB,GAAG,eAAe,CAAC;IACrD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,8BAA8B,CAAA;IACtC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC,CAAA;AAEF,MAAM,MAAM,wBAAwB,GAAG,eAAe,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAC,CAAA;AAEjG,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC;IACpD,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,aAAa,SAAc;IAClC,MAAM,CAAC,gBAAgB,SAAa;IAEpC,OAAO,CAAC,GAAG,CAAsB;IAEjC;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED,IAAa,OAAO,aAEnB;IACD;;;;;;;;;OASG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAEc,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAOZ,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKzD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAW5E"}
+{"version":3,"file":"IndexedDbArchivist.d.ts","sourceRoot":"","sources":["../../src/IndexedDbArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,eAAe,EAGf,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAwB,MAAM,KAAK,CAAA;AAEpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAEzE,MAAM,MAAM,8BAA8B,GAAG,wCAAwC,CAAA;AACrF,eAAO,MAAM,8BAA8B,EAAE,8BAAyE,CAAA;AAEtH,MAAM,MAAM,wBAAwB,GAAG,eAAe,CAAC;IACrD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,8BAA8B,CAAA;IACtC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC,CAAA;AAEF,MAAM,MAAM,wBAAwB,GAAG,eAAe,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAC,CAAA;AAEjG,MAAM,WAAW,0BAA2B,SAAQ,QAAQ;IAC1D,SAAS,EAAE;QACT,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,EAAE,OAAO,CAAA;KACf,CAAA;CACF;AAED,KAAK,SAAS,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,WAAW,CAAC,CAAA;AAEpE,qBAAa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,0BAA0B,CAAC,OAAO,EAAE,UAAU,CAAC;IACvD,MAAM,CAAC,QAAQ,CAAC,oBAAoB,KAAI;IACxC,OAAgB,aAAa,6CAAmC;IAEhE,OAAO,CAAC,EAAE,CAA2E;IAErF;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED,IAAa,OAAO,aAEnB;IACD;;;;;;;;;OASG;IACH,IAAI,SAAS,IAAI,SAAS,CAEzB;IAEc,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cASZ,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAIhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cASnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAWzD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAU5E"}

package/dist/types/IndexedDbArchivistSimple.d.ts

@@ -0,0 +1,51 @@
+import { ArchivistConfig, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
+import { BoundWitness } from '@xyo-network/boundwitness-model';
+import { AnyConfigSchema } from '@xyo-network/module';
+import { Payload } from '@xyo-network/payload-model';
+import { AbstractIndexedDbArchivist } from './AbstractIndexedDbArchivist';
+export type IndexedDbArchivistSimpleConfigSchema = 'network.xyo.archivist.indexeddb.config';
+export declare const IndexedDbArchivistSimpleConfigSchema: IndexedDbArchivistSimpleConfigSchema;
+export type IndexedDbArchivistSimpleConfig = ArchivistConfig<{
+    /**
+     * The database name
+     */
+    dbName?: string;
+    schema: IndexedDbArchivistSimpleConfigSchema;
+    /**
+     * The name of the object store
+     */
+    storeName?: string;
+}>;
+export type IndexedDbArchivistSimpleParams = ArchivistParams<AnyConfigSchema<IndexedDbArchivistSimpleConfig>>;
+export declare class IndexedDbArchivistSimple<TParams extends IndexedDbArchivistSimpleParams = IndexedDbArchivistSimpleParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractIndexedDbArchivist<TParams, TEventData> {
+    static configSchemas: "network.xyo.archivist.indexeddb.config"[];
+    private _db;
+    /**
+     * The database name. If not supplied via config, it defaults
+     * to the module name (not guaranteed to be unique) and if module
+     * name is not supplied, it defaults to `archivist`. This behavior
+     * biases towards a single, isolated DB per archivist which seems to
+     * make the most sense for 99% of use cases.
+     */
+    get dbName(): string;
+    get queries(): string[];
+    /**
+     * The name of the object store. If not supplied via config, it defaults
+     * to `payloads`. The limitation of the current IndexedDB wrapper we're
+     * using is that it only supports a single object store per DB. See here:
+     * https://github.com/jakearchibald/idb-keyval/blob/main/custom-stores.md#defining-a-custom-database--store-name
+     * If this becomes a problem or we need migrations/transactions, we can
+     * move to this more-flexible library, which they recommend (and who
+     * recommends them for our simple use case of key-value storage):
+     * https://www.npmjs.com/package/idb
+     */
+    get storeName(): string;
+    private get db();
+    start(): Promise<void>;
+    protected allHandler(): Promise<Payload[]>;
+    protected clearHandler(): Promise<void>;
+    protected deleteHandler(hashes: string[]): Promise<boolean[]>;
+    protected getHandler(hashes: string[]): Promise<Payload[]>;
+    protected insertHandler(payloads: Payload[]): Promise<BoundWitness[]>;
+}
+//# sourceMappingURL=IndexedDbArchivistSimple.d.ts.map

package/dist/types/IndexedDbArchivistSimple.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IndexedDbArchivistSimple.d.ts","sourceRoot":"","sources":["../../src/IndexedDbArchivistSimple.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAGf,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAEzE,MAAM,MAAM,oCAAoC,GAAG,wCAAwC,CAAA;AAC3F,eAAO,MAAM,oCAAoC,EAAE,oCAA+E,CAAA;AAElI,MAAM,MAAM,8BAA8B,GAAG,eAAe,CAAC;IAC3D;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,oCAAoC,CAAA;IAC5C;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC,CAAA;AAEF,MAAM,MAAM,8BAA8B,GAAG,eAAe,CAAC,eAAe,CAAC,8BAA8B,CAAC,CAAC,CAAA;AAE7G,qBAAa,wBAAwB,CACnC,OAAO,SAAS,8BAA8B,GAAG,8BAA8B,EAC/E,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,0BAA0B,CAAC,OAAO,EAAE,UAAU,CAAC;IACvD,OAAgB,aAAa,6CAAyC;IAEtE,OAAO,CAAC,GAAG,CAAsB;IAEjC;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED,IAAa,OAAO,aAEnB;IACD;;;;;;;;;OASG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAEc,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAOZ,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKzD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAW5E"}

package/dist/types/index.d.ts

@@ -1,2 +1,3 @@
 export * from './IndexedDbArchivist';
+export * from './IndexedDbArchivistSimple';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA"}

package/package.json

@@ -11,23 +11,24 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
-    "@xyo-network/abstract-archivist": "^2.65.2",
-    "@xyo-network/archivist-model": "^2.65.2",
-    "@xyo-network/boundwitness-model": "^2.65.2",
-    "@xyo-network/core": "^2.65.2",
-    "@xyo-network/module": "^2.65.2",
-    "@xyo-network/payload-model": "^2.65.2",
-    "@xyo-network/payload-wrapper": "^2.65.2",
-    "@xyo-network/promise": "^2.65.2",
+    "@xylabs/exists": "^2.9.3",
+    "@xyo-network/abstract-archivist": "^2.65.4",
+    "@xyo-network/archivist-model": "^2.65.4",
+    "@xyo-network/boundwitness-model": "^2.65.4",
+    "@xyo-network/core": "^2.65.4",
+    "@xyo-network/module": "^2.65.4",
+    "@xyo-network/payload-model": "^2.65.4",
+    "@xyo-network/payload-wrapper": "^2.65.4",
+    "@xyo-network/promise": "^2.65.4",
+    "idb": "^7.1.1",
     "idb-keyval": "^6.2.1"
   },
   "devDependencies": {
-    "@xylabs/delay": "^2.9.3",
-    "@xylabs/ts-scripts-yarn3": "^2.18.10",
-    "@xylabs/tsconfig": "^2.18.10",
-    "@xyo-network/boundwitness-wrapper": "^2.65.2",
-    "@xyo-network/plugins": "^2.65.2",
-    "fake-indexeddb": "^4.0.1",
+    "@xylabs/ts-scripts-yarn3": "^2.18.11",
+    "@xylabs/tsconfig": "^2.18.11",
+    "@xyo-network/boundwitness-wrapper": "^2.65.4",
+    "@xyo-network/id-payload-plugin": "^2.65.4",
+    "fake-indexeddb": "^4.0.2",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -63,5 +64,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.65.2"
+  "version": "2.65.4"
 }

package/src/AbstractIndexedDbArchivist.ts

@@ -0,0 +1,51 @@
+import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
+import {
+  ArchivistAllQuerySchema,
+  ArchivistClearQuerySchema,
+  ArchivistConfig,
+  ArchivistDeleteQuerySchema,
+  ArchivistInsertQuerySchema,
+  ArchivistModuleEventData,
+  ArchivistParams,
+} from '@xyo-network/archivist-model'
+import { AnyConfigSchema } from '@xyo-network/module'
+
+export type AbstractIndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config'
+export const AbstractIndexedDbArchivistConfigSchema: AbstractIndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config'
+
+export type AbstractIndexedDbArchivistConfig = ArchivistConfig<{
+  /**
+   * The database name
+   */
+  dbName?: string
+  schema: AbstractIndexedDbArchivistConfigSchema
+  /**
+   * The name of the object store
+   */
+  storeName?: string
+}>
+
+export type AbstractIndexedDbArchivistParams = ArchivistParams<AnyConfigSchema<AbstractIndexedDbArchivistConfig>>
+
+export abstract class AbstractIndexedDbArchivist<
+  TParams extends AbstractIndexedDbArchivistParams = AbstractIndexedDbArchivistParams,
+  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
+> extends AbstractDirectArchivist<TParams, TEventData> {
+  static override configSchemas = [AbstractIndexedDbArchivistConfigSchema]
+  static defaultDbName = 'archivist'
+  static defaultStoreName = 'payloads'
+
+  override get queries() {
+    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]
+  }
+
+  /**
+   * The database name.
+   */
+  abstract get dbName(): string
+
+  /**
+   * The name of the object store.
+   */
+  abstract get storeName(): string
+}

package/src/IndexedDbArchivist.ts

@@ -1,5 +1,4 @@
-import { assertEx } from '@xylabs/assert'
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
+import { exists } from '@xylabs/exists'
 import {
   ArchivistAllQuerySchema,
   ArchivistClearQuerySchema,
@@ -11,9 +10,11 @@ import {
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { PayloadHasher } from '@xyo-network/core'
-import { AnyConfigSchema, creatableModule } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
-import { clear, createStore, delMany, entries, getMany, setMany, UseStore } from 'idb-keyval'
+import { DBSchema, IDBPDatabase, openDB } from 'idb'
+
+import { AbstractIndexedDbArchivist } from './AbstractIndexedDbArchivist'
 
 export type IndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config'
 export const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config'
@@ -32,16 +33,23 @@ export type IndexedDbArchivistConfig = ArchivistConfig<{
 
 export type IndexedDbArchivistParams = ArchivistParams<AnyConfigSchema<IndexedDbArchivistConfig>>
 
-@creatableModule()
+export interface IndexedDbArchivistSchemaV1 extends DBSchema {
+  archivist: {
+    key: string
+    value: Payload
+  }
+}
+
+type StoreName = keyof Pick<IndexedDbArchivistSchemaV1, 'archivist'>
+
 export class IndexedDbArchivist<
   TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,
   TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
-> extends AbstractDirectArchivist<TParams, TEventData> {
+> extends AbstractIndexedDbArchivist<TParams, TEventData> {
+  static readonly CurrentSchemaVersion = 1
   static override configSchemas = [IndexedDbArchivistConfigSchema]
-  static defaultDbName = 'archivist'
-  static defaultStoreName = 'payloads'
 
-  private _db: UseStore | undefined
+  private db: Promise<IDBPDatabase<IndexedDbArchivistSchemaV1>> | undefined = undefined
 
   /**
    * The database name. If not supplied via config, it defaults
@@ -67,48 +75,54 @@ export class IndexedDbArchivist<
    * recommends them for our simple use case of key-value storage):
    * https://www.npmjs.com/package/idb
    */
-  get storeName() {
-    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName
-  }
-
-  private get db(): UseStore {
-    return assertEx(this._db, 'DB not initialized')
+  get storeName(): StoreName {
+    return (this.config?.storeName ?? IndexedDbArchivist.defaultStoreName) as StoreName
   }
 
   override async start(): Promise<void> {
     await super.start()
     // NOTE: We could defer this creation to first access but we
     // want to fail fast here in case something is wrong
-    this._db = createStore(this.dbName, this.storeName)
+    this.db = openDB<IndexedDbArchivistSchemaV1>(this.dbName, IndexedDbArchivist.CurrentSchemaVersion, {
+      upgrade: (db) => db.createObjectStore(this.storeName),
+    })
   }
 
   protected override async allHandler(): Promise<Payload[]> {
-    const result = await entries<string, Payload>(this.db)
-    return result.map<Payload>(([_hash, payload]) => payload)
+    return (await (await this.db)?.getAll(this.storeName)) ?? []
   }
 
   protected override async clearHandler(): Promise<void> {
-    await clear(this.db)
+    await (await this.db)?.clear(this.storeName)
   }
 
   protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
-    await delMany(hashes, this.db)
+    await Promise.all(
+      hashes.map(async (hash) => {
+        await (await this.db)?.delete(this.storeName, hash)
+      }),
+    )
     return hashes.map((_) => true)
   }
 
   protected override async getHandler(hashes: string[]): Promise<Payload[]> {
-    const result = await getMany<Payload>(hashes, this.db)
-    return result
+    const results = (
+      await Promise.all(
+        hashes.map(async (hash) => {
+          return await (await this.db)?.get(this.storeName, hash)
+        }),
+      )
+    ).filter(exists)
+    return results
   }
 
   protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
-    const entries = await Promise.all(
-      payloads.map<Promise<[string, Payload]>>(async (payload) => {
+    await Promise.all(
+      payloads.map(async (payload) => {
         const hash = await PayloadHasher.hashAsync(payload)
-        return [hash, payload]
+        await (await this.db)?.put(this.storeName, payload, hash)
       }),
     )
-    await setMany(entries, this.db)
     const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, payloads)
     return [result[0]]
   }