@speckle/objectloader2 2.25.7 → 2.25.9

package/dist/esm/operations/objectLoader2.js

@@ -1,94 +0,0 @@
-import AsyncGeneratorQueue from '../helpers/asyncGeneratorQueue.js';
-import { DefermentManager } from '../helpers/defermentManager.js';
-import { CacheReader } from '../helpers/cacheReader.js';
-import { CachePump } from '../helpers/cachePump.js';
-import AggregateQueue from '../helpers/aggregateQueue.js';
-import { ObjectLoader2Factory } from './objectLoader2Factory.js';
-export class ObjectLoader2 {
-    #rootId;
-    #logger;
-    #database;
-    #downloader;
-    #pump;
-    #cache;
-    #deferments;
-    #gathered;
-    #root = undefined;
-    constructor(options) {
-        this.#rootId = options.rootId;
-        this.#logger = options.logger || console.log;
-        const cacheOptions = {
-            logger: this.#logger,
-            maxCacheReadSize: 10_000,
-            maxCacheWriteSize: 10_000,
-            maxWriteQueueSize: 40_000,
-            maxCacheBatchWriteWait: 3_000,
-            maxCacheBatchReadWait: 3_000
-        };
-        this.#gathered = new AsyncGeneratorQueue();
-        this.#database = options.database;
-        this.#deferments = new DefermentManager({
-            maxSizeInMb: 2_000, // 2 GBs
-            ttlms: 15_000, // 15 seconds
-            logger: this.#logger
-        });
-        this.#cache = new CacheReader(this.#database, this.#deferments, cacheOptions);
-        this.#pump = new CachePump(this.#database, this.#gathered, this.#deferments, cacheOptions);
-        this.#downloader = options.downloader;
-    }
-    async disposeAsync() {
-        await Promise.all([
-            this.#downloader.disposeAsync(),
-            this.#cache.disposeAsync(),
-            this.#pump.disposeAsync()
-        ]);
-        this.#deferments.dispose();
-    }
-    async getRootObject() {
-        if (!this.#root) {
-            this.#root = (await this.#database.getAll([this.#rootId]))[0];
-            if (!this.#root) {
-                this.#root = await this.#downloader.downloadSingle();
-            }
-        }
-        return this.#root;
-    }
-    async getObject(params) {
-        return await this.#cache.getObject({ id: params.id });
-    }
-    async getTotalObjectCount() {
-        const rootObj = await this.getRootObject();
-        const totalChildrenCount = Object.keys(rootObj?.base.__closure || {}).length;
-        return totalChildrenCount + 1; //count the root
-    }
-    async *getObjectIterator() {
-        const rootItem = await this.getRootObject();
-        if (rootItem === undefined) {
-            this.#logger('No root object found!');
-            return;
-        }
-        //only for root
-        this.#pump.add(rootItem);
-        yield rootItem.base;
-        if (!rootItem.base.__closure)
-            return;
-        //sort the closures by their values descending
-        const sortedClosures = Object.entries(rootItem.base.__closure).sort((a, b) => b[1] - a[1]);
-        const children = sortedClosures.map((x) => x[0]);
-        const total = children.length;
-        this.#downloader.initializePool({
-            results: new AggregateQueue(this.#gathered, this.#pump),
-            total
-        });
-        for await (const item of this.#pump.gather(children, this.#downloader)) {
-            yield item.base;
-        }
-    }
-    static createFromObjects(objects) {
-        return ObjectLoader2Factory.createFromObjects(objects);
-    }
-    static createFromJSON(json) {
-        return ObjectLoader2Factory.createFromJSON(json);
-    }
-}
-//# sourceMappingURL=objectLoader2.js.map

package/dist/esm/operations/objectLoader2.js.map

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

package/dist/esm/operations/objectLoader2Factory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"objectLoader2Factory.d.ts","sourceRoot":"","sources":["../../../src/operations/objectLoader2Factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,MAAM,WAAW,2BAA2B;IAC1C,cAAc,CAAC,EAAE,OAAO,CAAA;IAExB,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAC;QAAC,UAAU,EAAE,QAAQ,CAAC;QAAC,UAAU,EAAE,QAAQ,CAAA;KAAE,CAAA;IAC1E,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,qBAAa,oBAAoB;IAC/B,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa;IAcxD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAKlD,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE;QAC3B,SAAS,EAAE,MAAM,CAAA;QACjB,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,EAAE,MAAM,CAAA;QAChB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,OAAO,CAAC,EAAE,2BAA2B,CAAA;KACtC,GAAG,aAAa;CAmClB"}

package/dist/esm/operations/objectLoader2Factory.js

@@ -1,61 +0,0 @@
-import IndexedDatabase from './databases/indexedDatabase.js';
-import { MemoryDatabase } from './databases/memoryDatabase.js';
-import { MemoryDownloader } from './downloaders/memoryDownloader.js';
-import ServerDownloader from './downloaders/serverDownloader.js';
-import { ObjectLoader2 } from './objectLoader2.js';
-export class ObjectLoader2Factory {
-    static createFromObjects(objects) {
-        const root = objects[0];
-        const records = new Map();
-        objects.forEach((element) => {
-            records.set(element.id, element);
-        });
-        const loader = new ObjectLoader2({
-            rootId: root.id,
-            database: new MemoryDatabase({ items: records }),
-            downloader: new MemoryDownloader(root.id, records)
-        });
-        return loader;
-    }
-    static createFromJSON(json) {
-        const jsonObj = JSON.parse(json);
-        return this.createFromObjects(jsonObj);
-    }
-    static createFromUrl(params) {
-        let loader;
-        if (params.options?.useMemoryCache) {
-            loader = new ObjectLoader2({
-                rootId: params.objectId,
-                downloader: new ServerDownloader({
-                    serverUrl: params.serverUrl,
-                    streamId: params.streamId,
-                    objectId: params.objectId,
-                    token: params.token,
-                    headers: params.headers
-                }),
-                database: new MemoryDatabase({
-                    items: new Map()
-                })
-            });
-        }
-        else {
-            loader = new ObjectLoader2({
-                rootId: params.objectId,
-                downloader: new ServerDownloader({
-                    serverUrl: params.serverUrl,
-                    streamId: params.streamId,
-                    objectId: params.objectId,
-                    token: params.token,
-                    headers: params.headers
-                }),
-                database: new IndexedDatabase({
-                    logger: params.options?.logger,
-                    indexedDB: params.options?.indexedDB,
-                    keyRange: params.options?.keyRange
-                })
-            });
-        }
-        return loader;
-    }
-}
-//# sourceMappingURL=objectLoader2Factory.js.map

package/dist/esm/operations/objectLoader2Factory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/operations/objectLoader2Factory.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,gCAAgC,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,gBAAgB,MAAM,mCAAmC,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAUlD,MAAM,OAAO,oBAAoB;IAC/B,MAAM,CAAC,iBAAiB,CAAC,OAAe;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,OAAO,GAAsB,IAAI,GAAG,EAAgB,CAAA;QAC1D,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC;YAC/B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,QAAQ,EAAE,IAAI,cAAc,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;YAChD,UAAU,EAAE,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;SACnD,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,IAAY;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAW,CAAA;QAC1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAOpB;QACC,IAAI,MAAqB,CAAA;QACzB,IAAI,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;YACnC,MAAM,GAAG,IAAI,aAAa,CAAC;gBACzB,MAAM,EAAE,MAAM,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,gBAAgB,CAAC;oBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC;gBACF,QAAQ,EAAE,IAAI,cAAc,CAAC;oBAC3B,KAAK,EAAE,IAAI,GAAG,EAAgB;iBAC/B,CAAC;aACH,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,IAAI,aAAa,CAAC;gBACzB,MAAM,EAAE,MAAM,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,gBAAgB,CAAC;oBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC;gBACF,QAAQ,EAAE,IAAI,eAAe,CAAC;oBAC5B,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM;oBAC9B,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS;oBACpC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ;iBACnC,CAAC;aACH,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/dist/esm/operations/options.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/operations/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;CACd"}

package/dist/esm/operations/traverser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traverser.d.ts","sourceRoot":"","sources":["../../../src/operations/traverser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA4C,MAAM,mBAAmB,CAAA;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,cAAc,CAAA;AACvD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE;IAC3B,KAAK,EAAE,aAAa,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;CACd,KAAK,IAAI,CAAA;AAEV,MAAM,WAAW,gBAAgB;IAC/B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,MAAM,CAAC,OAAO,OAAO,SAAS;;gBAOhB,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,gBAAgB;IAKvD,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAehD,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5E,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAuDvE"}

package/dist/esm/operations/traverser.js.map

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

package/src/helpers/__snapshots__/cachePump.spec.ts.snap

@@ -1,31 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`CachePump testing > write two items to queue use pumpItems that are NOT found 1`] = `[]`;
-
-exports[`CachePump testing > write two items to queue use pumpItems that are NOT found 2`] = `
-[
-  "id1",
-  "id2",
-]
-`;
-
-exports[`CachePump testing > write two items to queue use pumpItems that are found 1`] = `
-[
-  {
-    "base": {
-      "id": "id",
-      "speckle_type": "type",
-    },
-    "baseId": "id1",
-  },
-  {
-    "base": {
-      "id": "id",
-      "speckle_type": "type",
-    },
-    "baseId": "id2",
-  },
-]
-`;
-
-exports[`CachePump testing > write two items to queue use pumpItems that are found 2`] = `[]`;

package/src/helpers/__snapshots__/defermentManager.spec.ts.snap

@@ -1,8 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`deferments > defer one 1`] = `
-{
-  "id": "id",
-  "speckle_type": "type",
-}
-`;

package/src/helpers/batchingQueue.ts

@@ -1,85 +0,0 @@
-import KeyedQueue from './keyedQueue.js'
-
-export default class BatchingQueue<T> {
-  #queue: KeyedQueue<string, T> = new KeyedQueue<string, T>()
-  #batchSize: number
-  #processFunction: (batch: T[]) => Promise<void>
-
-  #baseInterval: number
-  #minInterval: number
-  #maxInterval: number
-
-  #processingLoop: Promise<void>
-  #disposed = false
-
-  constructor(params: {
-    batchSize: number
-    maxWaitTime?: number
-    processFunction: (batch: T[]) => Promise<void>
-  }) {
-    this.#batchSize = params.batchSize
-    this.#baseInterval = Math.min(params.maxWaitTime ?? 200, 200) // Initial batch time (ms)
-    this.#minInterval = Math.min(params.maxWaitTime ?? 100, 100) // Minimum batch time
-    this.#maxInterval = Math.min(params.maxWaitTime ?? 3000, 3000) // Maximum batch time
-    this.#processFunction = params.processFunction
-    this.#processingLoop = this.#loop()
-  }
-
-  async disposeAsync(): Promise<void> {
-    this.#disposed = true
-    await this.#processingLoop
-  }
-
-  add(key: string, item: T): void {
-    this.#queue.enqueue(key, item)
-  }
-
-  get(id: string): T | undefined {
-    return this.#queue.get(id)
-  }
-
-  count(): number {
-    return this.#queue.size
-  }
-
-  isDisposed(): boolean {
-    return this.#disposed
-  }
-
-  #getBatch(batchSize: number): T[] {
-    return this.#queue.spliceValues(0, Math.min(batchSize, this.#queue.size))
-  }
-
-  async #loop(): Promise<void> {
-    let interval = this.#baseInterval
-    while (!this.#disposed || this.#queue.size > 0) {
-      const startTime = performance.now()
-      if (this.#queue.size > 0) {
-        const batch = this.#getBatch(this.#batchSize)
-        //console.log('running with queue size of ' + this.#queue.length)
-        await this.#processFunction(batch)
-      }
-      if (this.#queue.size < this.#batchSize / 2) {
-        //refigure interval
-        const endTime = performance.now()
-        const duration = endTime - startTime
-        if (duration > interval) {
-          interval = Math.min(interval * 1.5, this.#maxInterval) // Increase if slow or empty
-        } else {
-          interval = Math.max(interval * 0.8, this.#minInterval) // Decrease if fast
-        }
-        /*console.log(
-          'queue is waiting ' +
-            interval / 1000 +
-            ' with queue size of ' +
-            this.#queue.length
-        )*/
-        await this.#delay(interval)
-      }
-    }
-  }
-
-  #delay(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms))
-  }
-}

package/src/helpers/cachePump.disposal.spec.ts

@@ -1,51 +0,0 @@
-import { describe, expect, test } from 'vitest'
-import { CachePump } from './cachePump.js'
-import { Database } from '../operations/interfaces.js'
-import AsyncGeneratorQueue from './asyncGeneratorQueue.js'
-import { Item } from '../types/types.js'
-import { DefermentManager } from './defermentManager.js'
-
-const makeDatabase = (): Database =>
-  ({
-    cacheSaveBatch: async (): Promise<void> => {},
-    getAll: async (): Promise<(Item | undefined)[]> => Promise.resolve([]),
-    getItem: async (): Promise<Item | undefined> => Promise.resolve(undefined),
-    disposeAsync: async (): Promise<void> => {}
-  } as unknown as Database)
-const makeGathered = (): AsyncGeneratorQueue<Item> =>
-  ({
-    add: () => {},
-    async *consume() {}
-  } as unknown as AsyncGeneratorQueue<Item>)
-const makeDeferments = (): DefermentManager =>
-  ({
-    undefer: () => {}
-  } as unknown as DefermentManager)
-describe('CachePump disposal', () => {
-  test('disposeAsync is idempotent and always resolves', async () => {
-    const pump = new CachePump(makeDatabase(), makeGathered(), makeDeferments(), {
-      maxCacheWriteSize: 2,
-      maxCacheBatchWriteWait: 100,
-      maxCacheBatchReadWait: 1,
-      maxWriteQueueSize: 2,
-      maxCacheReadSize: 2
-    })
-    await pump.disposeAsync()
-    await expect(pump.disposeAsync()).resolves.toBeUndefined()
-  })
-
-  test('should not throw on add after dispose if writeQueue was never created', async () => {
-    const pump = new CachePump(makeDatabase(), makeGathered(), makeDeferments(), {
-      maxCacheWriteSize: 2,
-      maxCacheBatchWriteWait: 100,
-      maxCacheBatchReadWait: 1,
-      maxWriteQueueSize: 2,
-      maxCacheReadSize: 2
-    })
-    await pump.disposeAsync()
-    // Should not throw, but will not add anything
-    expect(() =>
-      pump.add({ baseId: 'a', base: { id: 'b', speckle_type: 'type' } })
-    ).not.toThrow()
-  })
-})

package/src/helpers/cachePump.spec.ts

@@ -1,104 +0,0 @@
-import { describe, expect, test } from 'vitest'
-import { CachePump } from './cachePump.js'
-import { Base, Item } from '../types/types.js'
-import BufferQueue from './bufferQueue.js'
-import AsyncGeneratorQueue from './asyncGeneratorQueue.js'
-import { DefermentManager } from './defermentManager.js'
-import { MemoryDatabase } from '../operations/databases/memoryDatabase.js'
-import { Database } from '../operations/interfaces.js'
-
-describe('CachePump testing', () => {
-  test('write two items to queue use pumpItems that are NOT found', async () => {
-    const i1: Item = { baseId: 'id1', base: { id: 'id', speckle_type: 'type' } }
-    const i2: Item = { baseId: 'id2', base: { id: 'id', speckle_type: 'type' } }
-
-    const gathered = new AsyncGeneratorQueue<Item>()
-    const deferments = new DefermentManager({ maxSizeInMb: 1, ttlms: 1 })
-    const cachePump = new CachePump(new MemoryDatabase({}), gathered, deferments, {
-      maxCacheReadSize: 1,
-      maxCacheWriteSize: 1,
-      maxCacheBatchWriteWait: 1,
-      maxCacheBatchReadWait: 1,
-      maxWriteQueueSize: 1
-    })
-
-    const foundItems = new BufferQueue<Item>()
-    const notFoundItems = new BufferQueue<string>()
-
-    await cachePump.pumpItems({
-      ids: [i1.baseId, i2.baseId],
-      foundItems,
-      notFoundItems
-    })
-
-    expect(foundItems.values()).toMatchSnapshot()
-    expect(notFoundItems.values()).toMatchSnapshot()
-    await cachePump.disposeAsync()
-  })
-
-  test('write two items to queue use pumpItems that are found', async () => {
-    const i1: Item = { baseId: 'id1', base: { id: 'id', speckle_type: 'type' } }
-    const i2: Item = { baseId: 'id2', base: { id: 'id', speckle_type: 'type' } }
-
-    const db = new Map<string, Base>()
-    db.set(i1.baseId, i1.base)
-    db.set(i2.baseId, i2.base)
-
-    const gathered = new AsyncGeneratorQueue<Item>()
-    const deferments = new DefermentManager({ maxSizeInMb: 1, ttlms: 1 })
-    const cachePump = new CachePump(
-      new MemoryDatabase({ items: db }),
-      gathered,
-      deferments,
-      {
-        maxCacheReadSize: 1,
-        maxCacheWriteSize: 1,
-        maxCacheBatchWriteWait: 1,
-        maxCacheBatchReadWait: 1,
-        maxWriteQueueSize: 1
-      }
-    )
-
-    const foundItems = new BufferQueue<Item>()
-    const notFoundItems = new BufferQueue<string>()
-
-    await cachePump.pumpItems({
-      ids: [i1.baseId, i2.baseId],
-      foundItems,
-      notFoundItems
-    })
-
-    expect(foundItems.values()).toMatchSnapshot()
-    expect(notFoundItems.values()).toMatchSnapshot()
-    await cachePump.disposeAsync()
-  })
-
-  test('can dispose while waiting and not wait', async () => {
-    const i1: Item = { baseId: 'id1', base: { id: 'id', speckle_type: 'type' } }
-    const i2: Item = { baseId: 'id2', base: { id: 'id', speckle_type: 'type' } }
-
-    const db: Database = {
-      getAll: async () => Promise.resolve([]),
-      disposeAsync: async (): Promise<void> => {}
-    } as unknown as Database
-    const gathered = new AsyncGeneratorQueue<Item>()
-    const deferments = new DefermentManager({ maxSizeInMb: 1, ttlms: 1 })
-    const cachePump = new CachePump(db, gathered, deferments, {
-      maxCacheReadSize: 1,
-      maxCacheWriteSize: 1,
-      maxCacheBatchWriteWait: 1,
-      maxCacheBatchReadWait: 1,
-      maxWriteQueueSize: 1
-    })
-
-    const foundItems = new BufferQueue<Item>()
-    const notFoundItems = new BufferQueue<string>()
-
-    await cachePump.disposeAsync()
-    await cachePump.pumpItems({
-      ids: [i1.baseId, i2.baseId],
-      foundItems,
-      notFoundItems
-    })
-  })
-})

package/src/helpers/cachePump.ts

@@ -1,107 +0,0 @@
-import { TIME } from '@speckle/shared'
-import { Database } from '../operations/interfaces.js'
-import { CacheOptions } from '../operations/options.js'
-import { CustomLogger, Item } from '../types/types.js'
-import BatchingQueue from './batchingQueue.js'
-import Queue from './queue.js'
-import { Downloader } from '../operations/interfaces.js'
-import { DefermentManager } from './defermentManager.js'
-import AsyncGeneratorQueue from './asyncGeneratorQueue.js'
-import { Pump } from './pump.js'
-
-export class CachePump implements Pump {
-  #writeQueue: BatchingQueue<Item> | undefined
-  #database: Database
-  #logger: CustomLogger
-  #deferments: DefermentManager
-
-  #gathered: AsyncGeneratorQueue<Item>
-
-  #options: CacheOptions
-
-  #disposed = false
-
-  constructor(
-    database: Database,
-    gathered: AsyncGeneratorQueue<Item>,
-    deferments: DefermentManager,
-    options: CacheOptions
-  ) {
-    this.#database = database
-    this.#gathered = gathered
-    this.#deferments = deferments
-    this.#options = options
-    this.#logger = options.logger || ((): void => {})
-  }
-
-  add(item: Item): void {
-    if (!this.#writeQueue) {
-      this.#writeQueue = new BatchingQueue({
-        batchSize: this.#options.maxCacheWriteSize,
-        maxWaitTime: this.#options.maxCacheBatchWriteWait,
-        processFunction: (batch: Item[]): Promise<void> =>
-          this.#database.cacheSaveBatch({ batch })
-      })
-    }
-    this.#writeQueue.add(item.baseId, item)
-  }
-
-  async disposeAsync(): Promise<void> {
-    await this.#writeQueue?.disposeAsync()
-    await this.#database.disposeAsync()
-    this.#disposed = true
-  }
-
-  get isDisposed(): boolean {
-    return this.#disposed
-  }
-
-  async pumpItems(params: {
-    ids: string[]
-    foundItems: Queue<Item>
-    notFoundItems: Queue<string>
-  }): Promise<void> {
-    const { ids, foundItems, notFoundItems } = params
-    const maxCacheReadSize = this.#options.maxCacheReadSize
-
-    for (let i = 0; i < ids.length; ) {
-      if (this.isDisposed) break
-      if ((this.#writeQueue?.count() ?? 0) > this.#options.maxWriteQueueSize) {
-        this.#logger(
-          'pausing reads (# in write queue: ' + this.#writeQueue?.count() + ')'
-        )
-        await new Promise((resolve) => setTimeout(resolve, TIME.second)) // Pause for 1 second, protects against out of memory
-        continue
-      }
-      const batch = ids.slice(i, i + maxCacheReadSize)
-      const cachedData = await this.#database.getAll(batch)
-      for (let i = 0; i < cachedData.length; i++) {
-        if (cachedData[i]) {
-          foundItems.add(cachedData[i]!)
-        } else {
-          notFoundItems.add(batch[i])
-        }
-      }
-      i += maxCacheReadSize
-    }
-  }
-
-  async *gather(ids: string[], downloader: Downloader): AsyncGenerator<Item> {
-    const total = ids.length
-    const pumpPromise = this.pumpItems({
-      ids,
-      foundItems: this.#gathered,
-      notFoundItems: downloader
-    })
-    let count = 0
-    for await (const item of this.#gathered.consume()) {
-      this.#deferments.undefer(item)
-      yield item
-      count++
-      if (count >= total) {
-        this.#gathered.dispose()
-      }
-    }
-    await pumpPromise
-  }
-}

package/src/helpers/cacheReader.ts

@@ -1,64 +0,0 @@
-import { Database } from '../operations/interfaces.js'
-import { CacheOptions } from '../operations/options.js'
-import { Base, CustomLogger, Item } from '../types/types.js'
-import BatchingQueue from './batchingQueue.js'
-import { DefermentManager } from './defermentManager.js'
-
-export class CacheReader {
-  #database: Database
-  #defermentManager: DefermentManager
-  #logger: CustomLogger
-  #options: CacheOptions
-  #readQueue: BatchingQueue<string> | undefined
-
-  constructor(
-    database: Database,
-    defermentManager: DefermentManager,
-    options: CacheOptions
-  ) {
-    this.#database = database
-    this.#defermentManager = defermentManager
-    this.#options = options
-    this.#logger = options.logger || ((): void => {})
-  }
-
-  async getObject(params: { id: string }): Promise<Base> {
-    if (!this.#defermentManager.isDeferred(params.id)) {
-      this.#getItem(params.id)
-    }
-    return await this.#defermentManager.defer({ id: params.id })
-  }
-
-  #getItem(id: string): void {
-    if (!this.#readQueue) {
-      this.#readQueue = new BatchingQueue({
-        batchSize: this.#options.maxCacheReadSize,
-        maxWaitTime: this.#options.maxCacheBatchReadWait,
-        processFunction: this.#processBatch
-      })
-    }
-    if (!this.#readQueue.get(id)) {
-      this.#readQueue.add(id, id)
-    }
-  }
-
-  async getAll(keys: string[]): Promise<(Item | undefined)[]> {
-    return this.#database.getAll(keys)
-  }
-
-  #processBatch = async (batch: string[]): Promise<void> => {
-    const items = await this.#database.getAll(batch)
-    for (let i = 0; i < items.length; i++) {
-      if (items[i]) {
-        this.#defermentManager.undefer(items[i]!)
-      } else {
-        //this is okay!
-        //this.#logger(`Item ${batch[i]} not found in cache`)
-      }
-    }
-  }
-
-  async disposeAsync(): Promise<void> {
-    await this.#readQueue?.disposeAsync()
-  }
-}