@xyo-network/archivist-indexeddb 3.15.10 → 3.16.0

package/dist/browser/index.mjs

@@ -124,12 +124,13 @@ var IndexedDbArchivist = class extends AbstractArchivist {
   async deleteHandler(hashes) {
     const uniqueHashes = [...new Set(hashes)];
     const pairs = await PayloadBuilder.hashPairs(await this.getHandler(uniqueHashes));
+    const payloadsToDelete = await Promise.all(pairs.map(([payload]) => payload));
     const hashesToDelete = (await Promise.all(pairs.map(async (pair) => {
       const dataHash0 = await PayloadBuilder.dataHash(pair[0]);
       return [dataHash0, pair[1]];
     }))).flat();
     const distinctHashes = [...new Set(hashesToDelete)];
-    return await this.useDb(async (db) => {
+    const deletedHashes = await this.useDb(async (db) => {
       const found = await Promise.all(
         distinctHashes.map(async (hash) => {
           const existing = await db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash) ?? await db.getKeyFromIndex(this.storeName, IndexedDbArchivist.dataHashIndexName, hash);
@@ -141,6 +142,7 @@ var IndexedDbArchivist = class extends AbstractArchivist {
       );
       return found.filter(exists).filter((hash) => uniqueHashes.includes(hash));
     });
+    return payloadsToDelete.filter((payload) => deletedHashes.includes(payload._hash) || deletedHashes.includes(payload._dataHash));
   }
   async getFromCursor(db, storeName, order = "asc", limit = 10, cursor, open) {
     return await withReadOnlyStore(db, storeName, async (store) => {

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["import { uniq } from '@xylabs/array'\nimport { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { Hash, Hex } from '@xylabs/hex'\nimport {\n  ObjectStore,\n  withDb,\n  withReadOnlyStore, withReadWriteStore,\n} from '@xylabs/indexed-db'\nimport { isDefined, isUndefined } from '@xylabs/typeof'\nimport { AbstractArchivist, StorageClassLabel } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  ArchivistNextOptions,\n  ArchivistNextQuerySchema,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport {\n  Payload, Schema, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport { IDBPCursorWithValue, IDBPDatabase } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config.ts'\nimport { IndexedDbArchivistParams } from './Params.ts'\n\nexport interface PayloadStore {\n  [s: string]: WithStorageMeta\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexedDbArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexedDbArchivistConfigSchema\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  static override readonly labels = { ...super.labels, [StorageClassLabel]: 'disk' }\n\n  private static readonly dataHashIndex: IndexDescription = {\n    key: { _dataHash: 1 }, multiEntry: false, unique: false,\n  }\n\n  private static readonly hashIndex: IndexDescription = {\n    key: { _hash: 1 }, multiEntry: false, unique: true,\n  }\n\n  private static readonly schemaIndex: IndexDescription = {\n    key: { schema: 1 }, multiEntry: false, unique: false,\n  }\n\n  private static readonly sequenceIndex: IndexDescription = {\n    key: { _sequence: 1 }, multiEntry: false, unique: true,\n  }\n\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly hashIndexName = buildStandardIndexName(IndexedDbArchivist.hashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly dataHashIndexName = buildStandardIndexName(IndexedDbArchivist.dataHashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly schemaIndexName = buildStandardIndexName(IndexedDbArchivist.schemaIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly sequenceIndexName = buildStandardIndexName(IndexedDbArchivist.sequenceIndex)\n\n  private _dbName?: string\n  private _dbVersion?: number\n  private _storeName?: string\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    if (isUndefined(this._dbName)) {\n      if (isDefined(this.config?.dbName)) {\n        this._dbName = this.config?.dbName\n      } else {\n        if (isDefined(this.config?.name)) {\n          this.logger?.warn('No dbName provided, using module name: ', this.config?.name)\n          this._dbName = this.config?.name\n        } else {\n          this.logger?.warn('No dbName provided, using default name: ', IndexedDbArchivist.defaultDbName)\n          this._dbName = IndexedDbArchivist.defaultDbName\n        }\n      }\n    }\n    return assertEx(this._dbName)\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    this._dbVersion = this._dbVersion ?? this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n    return this._dbVersion\n  }\n\n  override get queries() {\n    return [\n      ArchivistNextQuerySchema,\n      ArchivistAllQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistInsertQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    if (isUndefined(this._storeName)) {\n      if (isDefined(this.config?.storeName)) {\n        this._storeName = this.config?.storeName\n      } else {\n        this.logger?.warn('No storeName provided, using default name: ', IndexedDbArchivist.defaultStoreName)\n        this._storeName = IndexedDbArchivist.defaultStoreName\n      }\n    }\n    return assertEx(this._storeName)\n  }\n\n  /**\n   * The indexes to create on the store\n   */\n  private get indexes() {\n    return [\n      IndexedDbArchivist.dataHashIndex,\n      IndexedDbArchivist.hashIndex,\n      IndexedDbArchivist.schemaIndex,\n      IndexedDbArchivist.sequenceIndex,\n      ...(this.config?.storage?.indexes ?? []),\n    ]\n  }\n\n  protected override async allHandler(): Promise<WithStorageMeta<Payload>[]> {\n    // Get all payloads from the store\n    const payloads = await this.useDb(db => db.getAll(this.storeName))\n    // Remove any metadata before returning to the client\n    return payloads\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.useDb(db => db.clear(this.storeName))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    // Filter duplicates to prevent unnecessary DB queries\n    const uniqueHashes = [...new Set(hashes)]\n    const pairs = await PayloadBuilder.hashPairs(await this.getHandler(uniqueHashes))\n    const hashesToDelete = (await Promise.all(pairs.map(async (pair) => {\n      const dataHash0 = await PayloadBuilder.dataHash(pair[0])\n      return [dataHash0, pair[1]]\n    }))).flat()\n    // Remove any duplicates\n    const distinctHashes = [...new Set(hashesToDelete)]\n    return await this.useDb(async (db) => {\n      // Only return hashes that were successfully deleted\n      const found = await Promise.all(\n        distinctHashes.map(async (hash) => {\n          // Check if the hash exists\n          const existing\n            = (await db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash))\n              ?? (await db.getKeyFromIndex(this.storeName, IndexedDbArchivist.dataHashIndexName, hash))\n          // If it does exist\n          if (isDefined(existing)) {\n            // Delete it\n            await db.delete(this.storeName, existing)\n            // Return the hash so it gets added to the list of deleted hashes\n            return hash\n          }\n        }),\n      )\n      return found.filter(exists).filter(hash => uniqueHashes.includes(hash))\n    })\n  }\n\n  protected async getFromCursor(\n    db: IDBPDatabase<ObjectStore>,\n    storeName: string,\n      order: 'asc' | 'desc' = 'asc',\n      limit: number = 10,\n      cursor?: Hex,\n      open?: boolean,\n  ): Promise<WithStorageMeta[]> {\n    // TODO: We have to handle the case where the cursor is not found, and then find the correct cursor to start with (thunked cursor)\n\n    return await withReadOnlyStore(db, storeName, async (store) => {\n      const sequenceIndex = assertEx(store?.index(IndexedDbArchivist.sequenceIndexName), () => 'Failed to get sequence index')\n      let sequenceCursor: IDBPCursorWithValue<ObjectStore, [string]> | null | undefined\n      const parsedCursor = isDefined(cursor)\n        ? order === 'asc'\n          ? IDBKeyRange.lowerBound(cursor, open)\n          : IDBKeyRange.upperBound(cursor, open)\n        : null\n\n      sequenceCursor = await sequenceIndex.openCursor(\n        parsedCursor,\n        order === 'desc' ? 'prev' : 'next',\n      )\n\n      let remaining = limit\n      const result: WithStorageMeta[] = []\n      while (remaining > 0) {\n        const value = sequenceCursor?.value\n        if (value) {\n          result.push(value)\n        }\n        try {\n          sequenceCursor = await sequenceCursor?.advance(1)\n        } catch {\n          break\n        }\n        if (sequenceCursor === null) {\n          break\n        }\n        remaining--\n      }\n      return result\n    })\n  }\n\n  /**\n   * Uses an index to get a payload by the index value, but returns the value with the primary key (from the root store)\n   * @param db The db instance to use\n   * @param storeName The name of the store to use\n   * @param indexName The index to use\n   * @param key The key to get from the index\n   * @returns The primary key and the payload, or undefined if not found\n   */\n  protected async getFromIndexWithPrimaryKey(\n    db: IDBPDatabase<ObjectStore>,\n    storeName: string,\n    indexName: string,\n    key: IDBValidKey,\n  ): Promise<[number, WithStorageMeta] | undefined> {\n    return await withReadOnlyStore(db, storeName, async (store) => {\n      if (store) {\n        const index = store.index(indexName)\n        const cursor = await index.openCursor(key)\n        if (cursor) {\n          const singleValue = cursor.value\n          // NOTE: It's known to be a number because we are using IndexedDB supplied auto-incrementing keys\n          if (typeof cursor.primaryKey !== 'number') {\n            throw new TypeError('primaryKey must be a number')\n          }\n\n          return [cursor.primaryKey, singleValue]\n        }\n      }\n    })\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<WithStorageMeta[]> {\n    const payloads = await this.useDb(db =>\n      Promise.all(\n        // Filter duplicates to prevent unnecessary DB queries\n        uniq(hashes).map(async (hash) => {\n          // Find by hash\n          const payload = await this.getFromIndexWithPrimaryKey(db, this.storeName, IndexedDbArchivist.hashIndexName, hash)\n          // If found, return\n          if (payload) return payload\n          // Otherwise, find by data hash\n          return this.getFromIndexWithPrimaryKey(db, this.storeName, IndexedDbArchivist.dataHashIndexName, hash)\n        }),\n      ))\n\n    const found = new Set<string>()\n    return (\n      payloads\n        // Filter out not found\n        .filter(exists)\n        // Sort by primary key\n        .sort((a, b) => a![0] - b![0])\n        // Filter out duplicates by hash\n        .filter(([_key, payload]) => {\n          if (found.has(payload._hash)) {\n            return false\n          } else {\n            found.add(payload._hash)\n            return true\n          }\n        })\n        // Return just the payloads\n        .map(([_key, payload]) => payload)\n    )\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    return await this.useDb(async (db) => {\n      // Perform all inserts via a single transaction to ensure atomicity\n      // with respect to checking for the pre-existence of the hash.\n      // This is done to prevent duplicate root hashes due to race\n      // conditions between checking vs insertion.\n      return await withReadWriteStore(db, this.storeName, async (store) => {\n        // Return only the payloads that were successfully inserted\n        if (store) {\n          const inserted: WithStorageMeta<Payload>[] = []\n          await Promise.all(\n            payloads.map(async (payload) => {\n            // only insert if hash does not already exist\n              if (!await store.index(IndexedDbArchivist.hashIndexName).get(payload._hash)) {\n                // Insert the payload\n                await store.put(payload)\n                // Add it to the inserted list\n                inserted.push(payload)\n              }\n            }),\n          )\n          return inserted\n        } else {\n          throw new Error('Failed to get store')\n        }\n      })\n    })\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    const {\n      limit, cursor, order, open = true,\n    } = options ?? {}\n    return await this.useDb(async (db) => {\n      return await this.getFromCursor(db, this.storeName, order, limit ?? 10, cursor, open)\n    })\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    await this.useDb(() => {})\n    return true\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async useDb<T>(callback: (db: IDBPDatabase<ObjectStore>) => Promise<T> | T): Promise<T> {\n    return await withDb<ObjectStore, T>(this.dbName, async (db) => {\n      return await callback(db)\n    }, { [this.storeName]: this.indexes }, this.logger)\n  }\n}\n","export const IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb' as const\nexport type IndexedDbArchivistSchema = typeof IndexedDbArchivistSchema\n","import type { ArchivistConfig } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema.ts'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig<TStoreName extends string = string> = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The name of the object store\n   */\n  storeName?: TStoreName\n}>\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["import { uniq } from '@xylabs/array'\nimport { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { Hash, Hex } from '@xylabs/hex'\nimport {\n  ObjectStore,\n  withDb,\n  withReadOnlyStore, withReadWriteStore,\n} from '@xylabs/indexed-db'\nimport { isDefined, isUndefined } from '@xylabs/typeof'\nimport { AbstractArchivist, StorageClassLabel } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  ArchivistNextOptions,\n  ArchivistNextQuerySchema,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport {\n  Payload, Schema, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport { IDBPCursorWithValue, IDBPDatabase } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config.ts'\nimport { IndexedDbArchivistParams } from './Params.ts'\n\nexport interface PayloadStore {\n  [s: string]: WithStorageMeta\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexedDbArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexedDbArchivistConfigSchema\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  static override readonly labels = { ...super.labels, [StorageClassLabel]: 'disk' }\n\n  private static readonly dataHashIndex: IndexDescription = {\n    key: { _dataHash: 1 }, multiEntry: false, unique: false,\n  }\n\n  private static readonly hashIndex: IndexDescription = {\n    key: { _hash: 1 }, multiEntry: false, unique: true,\n  }\n\n  private static readonly schemaIndex: IndexDescription = {\n    key: { schema: 1 }, multiEntry: false, unique: false,\n  }\n\n  private static readonly sequenceIndex: IndexDescription = {\n    key: { _sequence: 1 }, multiEntry: false, unique: true,\n  }\n\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly hashIndexName = buildStandardIndexName(IndexedDbArchivist.hashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly dataHashIndexName = buildStandardIndexName(IndexedDbArchivist.dataHashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly schemaIndexName = buildStandardIndexName(IndexedDbArchivist.schemaIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly sequenceIndexName = buildStandardIndexName(IndexedDbArchivist.sequenceIndex)\n\n  private _dbName?: string\n  private _dbVersion?: number\n  private _storeName?: string\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    if (isUndefined(this._dbName)) {\n      if (isDefined(this.config?.dbName)) {\n        this._dbName = this.config?.dbName\n      } else {\n        if (isDefined(this.config?.name)) {\n          this.logger?.warn('No dbName provided, using module name: ', this.config?.name)\n          this._dbName = this.config?.name\n        } else {\n          this.logger?.warn('No dbName provided, using default name: ', IndexedDbArchivist.defaultDbName)\n          this._dbName = IndexedDbArchivist.defaultDbName\n        }\n      }\n    }\n    return assertEx(this._dbName)\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    this._dbVersion = this._dbVersion ?? this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n    return this._dbVersion\n  }\n\n  override get queries() {\n    return [\n      ArchivistNextQuerySchema,\n      ArchivistAllQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistInsertQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    if (isUndefined(this._storeName)) {\n      if (isDefined(this.config?.storeName)) {\n        this._storeName = this.config?.storeName\n      } else {\n        this.logger?.warn('No storeName provided, using default name: ', IndexedDbArchivist.defaultStoreName)\n        this._storeName = IndexedDbArchivist.defaultStoreName\n      }\n    }\n    return assertEx(this._storeName)\n  }\n\n  /**\n   * The indexes to create on the store\n   */\n  private get indexes() {\n    return [\n      IndexedDbArchivist.dataHashIndex,\n      IndexedDbArchivist.hashIndex,\n      IndexedDbArchivist.schemaIndex,\n      IndexedDbArchivist.sequenceIndex,\n      ...(this.config?.storage?.indexes ?? []),\n    ]\n  }\n\n  protected override async allHandler(): Promise<WithStorageMeta<Payload>[]> {\n    // Get all payloads from the store\n    const payloads = await this.useDb(db => db.getAll(this.storeName))\n    // Remove any metadata before returning to the client\n    return payloads\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.useDb(db => db.clear(this.storeName))\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    // Filter duplicates to prevent unnecessary DB queries\n    const uniqueHashes = [...new Set(hashes)]\n    const pairs = await PayloadBuilder.hashPairs(await this.getHandler(uniqueHashes))\n    const payloadsToDelete = await Promise.all(pairs.map(([payload]) => payload))\n    const hashesToDelete = (await Promise.all(pairs.map(async (pair) => {\n      const dataHash0 = await PayloadBuilder.dataHash(pair[0])\n      return [dataHash0, pair[1]]\n    }))).flat()\n    // Remove any duplicates\n    const distinctHashes = [...new Set(hashesToDelete)]\n    const deletedHashes = await this.useDb(async (db) => {\n      // Only return hashes that were successfully deleted\n      const found = await Promise.all(\n        distinctHashes.map(async (hash) => {\n          // Check if the hash exists\n          const existing\n            = (await db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash))\n              ?? (await db.getKeyFromIndex(this.storeName, IndexedDbArchivist.dataHashIndexName, hash))\n          // If it does exist\n          if (isDefined(existing)) {\n            // Delete it\n            await db.delete(this.storeName, existing)\n            // Return the hash so it gets added to the list of deleted hashes\n            return hash\n          }\n        }),\n      )\n      return found.filter(exists).filter(hash => uniqueHashes.includes(hash))\n    })\n    return payloadsToDelete.filter(payload => deletedHashes.includes(payload._hash) || deletedHashes.includes(payload._dataHash))\n  }\n\n  protected async getFromCursor(\n    db: IDBPDatabase<ObjectStore>,\n    storeName: string,\n      order: 'asc' | 'desc' = 'asc',\n      limit: number = 10,\n      cursor?: Hex,\n      open?: boolean,\n  ): Promise<WithStorageMeta[]> {\n    // TODO: We have to handle the case where the cursor is not found, and then find the correct cursor to start with (thunked cursor)\n\n    return await withReadOnlyStore(db, storeName, async (store) => {\n      const sequenceIndex = assertEx(store?.index(IndexedDbArchivist.sequenceIndexName), () => 'Failed to get sequence index')\n      let sequenceCursor: IDBPCursorWithValue<ObjectStore, [string]> | null | undefined\n      const parsedCursor = isDefined(cursor)\n        ? order === 'asc'\n          ? IDBKeyRange.lowerBound(cursor, open)\n          : IDBKeyRange.upperBound(cursor, open)\n        : null\n\n      sequenceCursor = await sequenceIndex.openCursor(\n        parsedCursor,\n        order === 'desc' ? 'prev' : 'next',\n      )\n\n      let remaining = limit\n      const result: WithStorageMeta[] = []\n      while (remaining > 0) {\n        const value = sequenceCursor?.value\n        if (value) {\n          result.push(value)\n        }\n        try {\n          sequenceCursor = await sequenceCursor?.advance(1)\n        } catch {\n          break\n        }\n        if (sequenceCursor === null) {\n          break\n        }\n        remaining--\n      }\n      return result\n    })\n  }\n\n  /**\n   * Uses an index to get a payload by the index value, but returns the value with the primary key (from the root store)\n   * @param db The db instance to use\n   * @param storeName The name of the store to use\n   * @param indexName The index to use\n   * @param key The key to get from the index\n   * @returns The primary key and the payload, or undefined if not found\n   */\n  protected async getFromIndexWithPrimaryKey(\n    db: IDBPDatabase<ObjectStore>,\n    storeName: string,\n    indexName: string,\n    key: IDBValidKey,\n  ): Promise<[number, WithStorageMeta] | undefined> {\n    return await withReadOnlyStore(db, storeName, async (store) => {\n      if (store) {\n        const index = store.index(indexName)\n        const cursor = await index.openCursor(key)\n        if (cursor) {\n          const singleValue = cursor.value\n          // NOTE: It's known to be a number because we are using IndexedDB supplied auto-incrementing keys\n          if (typeof cursor.primaryKey !== 'number') {\n            throw new TypeError('primaryKey must be a number')\n          }\n\n          return [cursor.primaryKey, singleValue]\n        }\n      }\n    })\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<WithStorageMeta[]> {\n    const payloads = await this.useDb(db =>\n      Promise.all(\n        // Filter duplicates to prevent unnecessary DB queries\n        uniq(hashes).map(async (hash) => {\n          // Find by hash\n          const payload = await this.getFromIndexWithPrimaryKey(db, this.storeName, IndexedDbArchivist.hashIndexName, hash)\n          // If found, return\n          if (payload) return payload\n          // Otherwise, find by data hash\n          return this.getFromIndexWithPrimaryKey(db, this.storeName, IndexedDbArchivist.dataHashIndexName, hash)\n        }),\n      ))\n\n    const found = new Set<string>()\n    return (\n      payloads\n        // Filter out not found\n        .filter(exists)\n        // Sort by primary key\n        .sort((a, b) => a![0] - b![0])\n        // Filter out duplicates by hash\n        .filter(([_key, payload]) => {\n          if (found.has(payload._hash)) {\n            return false\n          } else {\n            found.add(payload._hash)\n            return true\n          }\n        })\n        // Return just the payloads\n        .map(([_key, payload]) => payload)\n    )\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    return await this.useDb(async (db) => {\n      // Perform all inserts via a single transaction to ensure atomicity\n      // with respect to checking for the pre-existence of the hash.\n      // This is done to prevent duplicate root hashes due to race\n      // conditions between checking vs insertion.\n      return await withReadWriteStore(db, this.storeName, async (store) => {\n        // Return only the payloads that were successfully inserted\n        if (store) {\n          const inserted: WithStorageMeta<Payload>[] = []\n          await Promise.all(\n            payloads.map(async (payload) => {\n            // only insert if hash does not already exist\n              if (!await store.index(IndexedDbArchivist.hashIndexName).get(payload._hash)) {\n                // Insert the payload\n                await store.put(payload)\n                // Add it to the inserted list\n                inserted.push(payload)\n              }\n            }),\n          )\n          return inserted\n        } else {\n          throw new Error('Failed to get store')\n        }\n      })\n    })\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    const {\n      limit, cursor, order, open = true,\n    } = options ?? {}\n    return await this.useDb(async (db) => {\n      return await this.getFromCursor(db, this.storeName, order, limit ?? 10, cursor, open)\n    })\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    await this.useDb(() => {})\n    return true\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async useDb<T>(callback: (db: IDBPDatabase<ObjectStore>) => Promise<T> | T): Promise<T> {\n    return await withDb<ObjectStore, T>(this.dbName, async (db) => {\n      return await callback(db)\n    }, { [this.storeName]: this.indexes }, this.logger)\n  }\n}\n","export const IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb' as const\nexport type IndexedDbArchivistSchema = typeof IndexedDbArchivistSchema\n","import type { ArchivistConfig } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema.ts'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig<TStoreName extends string = string> = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The name of the object store\n   */\n  storeName?: TStoreName\n}>\n"],"mappings":"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","names":[]}

package/dist/types/Archivist.d.ts

@@ -52,7 +52,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     private get indexes();
     protected allHandler(): Promise<WithStorageMeta<Payload>[]>;
     protected clearHandler(): Promise<void>;
-    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]>;
     protected getFromCursor(db: IDBPDatabase<ObjectStore>, storeName: string, order?: 'asc' | 'desc', limit?: number, cursor?: Hex, open?: boolean): Promise<WithStorageMeta[]>;
     /**
      * Uses an index to get a payload by the index value, but returns the value with the primary key (from the root store)

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

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EACL,WAAW,EAGZ,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,iBAAiB,EAAqB,MAAM,iCAAiC,CAAA;AACtF,OAAO,EAKL,wBAAwB,EACxB,oBAAoB,EAIrB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EACL,OAAO,EAAE,MAAM,EAAE,eAAe,EACjC,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAuB,YAAY,EAAE,MAAM,KAAK,CAAA;AAGvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAEtD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,eAAe,CAAA;CAC7B;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAA2D;IAC3G,gBAAyB,mBAAmB,EAAE,MAAM,CAAiC;IACrF,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,gBAAyB,MAAM;;MAAmD;IAElF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAEpC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAEhC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAElC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAEpC;IAGD,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAuD;IAEpF,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAA2D;IAE5F,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAyD;IAExF,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAA2D;IAE5F,OAAO,CAAC,OAAO,CAAC,CAAQ;IACxB,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B;;;;;;OAMG;IACH,IAAI,MAAM,WAeT;IAED;;OAEG;IACH,IAAI,SAAS,WAGZ;IAED,IAAa,OAAO,aASnB;IAED;;;OAGG;IACH,IAAI,SAAS,WAUZ;IAED;;OAEG;IACH,OAAO,KAAK,OAAO,GAQlB;cAEwB,UAAU,IAAI,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAOjD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cA+BvD,aAAa,CAC3B,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,EAC7B,SAAS,EAAE,MAAM,EACf,KAAK,GAAE,KAAK,GAAG,MAAc,EAC7B,KAAK,GAAE,MAAW,EAClB,MAAM,CAAC,EAAE,GAAG,EACZ,IAAI,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,eAAe,EAAE,CAAC;IAsC7B;;;;;;;OAOG;cACa,0BAA0B,CACxC,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,WAAW,GACf,OAAO,CAAC,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,SAAS,CAAC;cAkBxB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;cAmCxD,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cA6BxF,WAAW,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAShF,YAAY;IAQrC;;;;OAIG;YACW,KAAK;CAKpB"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/archivist-indexeddb",
-  "version": "3.15.10",
+  "version": "3.16.0",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -35,11 +35,11 @@
     "@xylabs/hex": "^4.9.18",
     "@xylabs/indexed-db": "^4.9.18",
     "@xylabs/typeof": "^4.9.18",
-    "@xyo-network/archivist-abstract": "^3.15.10",
-    "@xyo-network/archivist-model": "^3.15.10",
-    "@xyo-network/module-model": "^3.15.10",
-    "@xyo-network/payload-builder": "^3.15.10",
-    "@xyo-network/payload-model": "^3.15.10",
+    "@xyo-network/archivist-abstract": "^3.16.0",
+    "@xyo-network/archivist-model": "^3.16.0",
+    "@xyo-network/module-model": "^3.16.0",
+    "@xyo-network/payload-builder": "^3.16.0",
+    "@xyo-network/payload-model": "^3.16.0",
     "idb": "^8.0.3"
   },
   "devDependencies": {
@@ -47,11 +47,11 @@
     "@xylabs/object": "^4.9.18",
     "@xylabs/ts-scripts-yarn3": "^6.5.6",
     "@xylabs/tsconfig": "^6.5.6",
-    "@xyo-network/account": "^3.15.10",
-    "@xyo-network/account-model": "^3.15.10",
-    "@xyo-network/archivist-acceptance-tests": "^3.15.10",
-    "@xyo-network/id-payload-plugin": "^3.15.10",
-    "@xyo-network/payload-wrapper": "^3.15.10",
+    "@xyo-network/account": "^3.16.0",
+    "@xyo-network/account-model": "^3.16.0",
+    "@xyo-network/archivist-acceptance-tests": "^3.16.0",
+    "@xyo-network/id-payload-plugin": "^3.16.0",
+    "@xyo-network/payload-wrapper": "^3.16.0",
     "fake-indexeddb": "^6.0.1",
     "typescript": "^5.8.3",
     "uuid": "^11.1.0",

package/src/Archivist.ts

@@ -158,17 +158,18 @@ export class IndexedDbArchivist<
     await this.useDb(db => db.clear(this.storeName))
   }
 
-  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {
+  protected override async deleteHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {
     // Filter duplicates to prevent unnecessary DB queries
     const uniqueHashes = [...new Set(hashes)]
     const pairs = await PayloadBuilder.hashPairs(await this.getHandler(uniqueHashes))
+    const payloadsToDelete = await Promise.all(pairs.map(([payload]) => payload))
     const hashesToDelete = (await Promise.all(pairs.map(async (pair) => {
       const dataHash0 = await PayloadBuilder.dataHash(pair[0])
       return [dataHash0, pair[1]]
     }))).flat()
     // Remove any duplicates
     const distinctHashes = [...new Set(hashesToDelete)]
-    return await this.useDb(async (db) => {
+    const deletedHashes = await this.useDb(async (db) => {
       // Only return hashes that were successfully deleted
       const found = await Promise.all(
         distinctHashes.map(async (hash) => {
@@ -187,6 +188,7 @@ export class IndexedDbArchivist<
       )
       return found.filter(exists).filter(hash => uniqueHashes.includes(hash))
     })
+    return payloadsToDelete.filter(payload => deletedHashes.includes(payload._hash) || deletedHashes.includes(payload._dataHash))
   }
 
   protected async getFromCursor(