diff --git a/packages/objectloader2/src/helpers/cachePump.spec.ts b/packages/objectloader2/src/helpers/cachePump.spec.ts index bca6a356d..d1886ff9a 100644 --- a/packages/objectloader2/src/helpers/cachePump.spec.ts +++ b/packages/objectloader2/src/helpers/cachePump.spec.ts @@ -12,7 +12,7 @@ describe('CachePump testing', () => { const i2: Item = { baseId: 'id2', base: { id: 'id', speckle_type: 'type' } } const gathered = new AsyncGeneratorQueue() - const deferments = new DefermentManager({ maxSize: 1, ttl: 1 }) + const deferments = new DefermentManager({ maxSizeInMb: 1, ttlms: 1 }) const cachePump = new CachePump(new MemoryDatabase({}), gathered, deferments, { maxCacheReadSize: 1, maxCacheWriteSize: 1, @@ -44,7 +44,7 @@ describe('CachePump testing', () => { db.set(i2.baseId, i2.base) const gathered = new AsyncGeneratorQueue() - const deferments = new DefermentManager({ maxSize: 1, ttl: 1 }) + const deferments = new DefermentManager({ maxSizeInMb: 1, ttlms: 1 }) const cachePump = new CachePump( new MemoryDatabase({ items: db }), gathered, diff --git a/packages/objectloader2/src/helpers/cacheReader.spec.ts b/packages/objectloader2/src/helpers/cacheReader.spec.ts index 19ffc4c78..6067d21a8 100644 --- a/packages/objectloader2/src/helpers/cacheReader.spec.ts +++ b/packages/objectloader2/src/helpers/cacheReader.spec.ts @@ -8,7 +8,7 @@ describe('CacheReader testing', () => { test('deferred getObject', async () => { const i1: Item = { baseId: 'id1', base: { id: 'id', speckle_type: 'type' } } - const deferments = new DefermentManager({ maxSize: 1, ttl: 1 }) + const deferments = new DefermentManager({ maxSizeInMb: 1, ttlms: 1 }) const cacheReader = new CacheReader( new MemoryDatabase({ items: new Map([[i1.baseId, i1.base]]) diff --git a/packages/objectloader2/src/operations/downloaders/serverDownloader.spec.ts b/packages/objectloader2/src/operations/downloaders/serverDownloader.spec.ts index e7d0e1bd1..7711264ef 100644 --- a/packages/objectloader2/src/operations/downloaders/serverDownloader.spec.ts +++ b/packages/objectloader2/src/operations/downloaders/serverDownloader.spec.ts @@ -27,6 +27,7 @@ describe('downloader', () => { } expect(r).toMatchSnapshot() + await downloader.disposeAsync() }) test('download batch of two', async () => { @@ -55,6 +56,7 @@ describe('downloader', () => { } expect(r).toMatchSnapshot() + await downloader.disposeAsync() }) test('download batch of three', async () => { @@ -90,6 +92,7 @@ describe('downloader', () => { } expect(r).toMatchSnapshot() + await downloader.disposeAsync() }) test('download single exists', async () => { @@ -109,6 +112,7 @@ describe('downloader', () => { }) const x = await downloader.downloadSingle() expect(x).toMatchSnapshot() + await downloader.disposeAsync() }) test('add extra header', async () => { @@ -134,5 +138,21 @@ describe('downloader', () => { }) const x = await downloader.downloadSingle() expect(x).toMatchSnapshot() + await downloader.disposeAsync() + }) + + test('can dispose used', async () => { + const fetchMocker = createFetchMock(vi) + const headers = new Headers() + const downloader = new ServerDownloader({ + serverUrl: 'http://speckle.test', + headers, + streamId: 'streamId', + objectId: 'objectId', + token: 'token', + + fetch: fetchMocker + }) + await downloader.disposeAsync() }) }) diff --git a/packages/objectloader2/src/operations/downloaders/serverDownloader.ts b/packages/objectloader2/src/operations/downloaders/serverDownloader.ts index 8abe5e5d1..084598d6f 100644 --- a/packages/objectloader2/src/operations/downloaders/serverDownloader.ts +++ b/packages/objectloader2/src/operations/downloaders/serverDownloader.ts @@ -88,7 +88,6 @@ export default class ServerDownloader implements Downloader { async disposeAsync(): Promise { await this.#downloadQueue?.disposeAsync() - await this.#getPool().disposeAsync() } #processJson(baseId: string, unparsedBase: string): Item {