@speckle/objectloader2 2.26.0 → 2.26.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonjs/core/objectLoader2.d.ts.map +1 -1
- package/dist/commonjs/core/objectLoader2.js +1 -9
- package/dist/commonjs/core/objectLoader2.js.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.d.ts +7 -2
- package/dist/commonjs/core/objectLoader2Factory.d.ts.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.js +14 -4
- package/dist/commonjs/core/objectLoader2Factory.js.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.test.d.ts +2 -0
- package/dist/commonjs/core/objectLoader2Factory.test.d.ts.map +1 -0
- package/dist/commonjs/core/objectLoader2Factory.test.js +106 -0
- package/dist/commonjs/core/objectLoader2Factory.test.js.map +1 -0
- package/dist/commonjs/core/options.d.ts +2 -0
- package/dist/commonjs/core/options.d.ts.map +1 -1
- package/dist/commonjs/core/stages/cacheReader.d.ts +2 -2
- package/dist/commonjs/core/stages/cacheReader.d.ts.map +1 -1
- package/dist/commonjs/core/stages/cacheReader.js.map +1 -1
- package/dist/commonjs/core/stages/cacheWriter.d.ts +2 -2
- package/dist/commonjs/core/stages/cacheWriter.d.ts.map +1 -1
- package/dist/commonjs/core/stages/cacheWriter.js +4 -4
- package/dist/commonjs/core/stages/cacheWriter.js.map +1 -1
- package/dist/commonjs/core/stages/serverDownloader.d.ts +2 -1
- package/dist/commonjs/core/stages/serverDownloader.d.ts.map +1 -1
- package/dist/commonjs/core/stages/serverDownloader.js +3 -2
- package/dist/commonjs/core/stages/serverDownloader.js.map +1 -1
- package/dist/commonjs/deferment/defermentManager.d.ts +18 -2
- package/dist/commonjs/deferment/defermentManager.d.ts.map +1 -1
- package/dist/commonjs/deferment/defermentManager.js +30 -3
- package/dist/commonjs/deferment/defermentManager.js.map +1 -1
- package/dist/commonjs/deferment/defermentManager.test.js +11 -11
- package/dist/commonjs/deferment/defermentManager.test.js.map +1 -1
- package/dist/commonjs/queues/batchingQueue.d.ts +0 -2
- package/dist/commonjs/queues/batchingQueue.d.ts.map +1 -1
- package/dist/commonjs/queues/batchingQueue.dispose.test.js +1 -3
- package/dist/commonjs/queues/batchingQueue.dispose.test.js.map +1 -1
- package/dist/commonjs/queues/batchingQueue.js +4 -3
- package/dist/commonjs/queues/batchingQueue.js.map +1 -1
- package/dist/commonjs/types/types.d.ts +5 -0
- package/dist/commonjs/types/types.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2.js +1 -9
- package/dist/esm/core/objectLoader2.js.map +1 -1
- package/dist/esm/core/objectLoader2Factory.d.ts +7 -2
- package/dist/esm/core/objectLoader2Factory.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2Factory.js +14 -4
- package/dist/esm/core/objectLoader2Factory.js.map +1 -1
- package/dist/esm/core/objectLoader2Factory.test.d.ts +2 -0
- package/dist/esm/core/objectLoader2Factory.test.d.ts.map +1 -0
- package/dist/esm/core/objectLoader2Factory.test.js +104 -0
- package/dist/esm/core/objectLoader2Factory.test.js.map +1 -0
- package/dist/esm/core/options.d.ts +2 -0
- package/dist/esm/core/options.d.ts.map +1 -1
- package/dist/esm/core/stages/cacheReader.d.ts +2 -2
- package/dist/esm/core/stages/cacheReader.d.ts.map +1 -1
- package/dist/esm/core/stages/cacheReader.js.map +1 -1
- package/dist/esm/core/stages/cacheWriter.d.ts +2 -2
- package/dist/esm/core/stages/cacheWriter.d.ts.map +1 -1
- package/dist/esm/core/stages/cacheWriter.js +4 -4
- package/dist/esm/core/stages/cacheWriter.js.map +1 -1
- package/dist/esm/core/stages/serverDownloader.d.ts +2 -1
- package/dist/esm/core/stages/serverDownloader.d.ts.map +1 -1
- package/dist/esm/core/stages/serverDownloader.js +3 -2
- package/dist/esm/core/stages/serverDownloader.js.map +1 -1
- package/dist/esm/deferment/defermentManager.d.ts +18 -2
- package/dist/esm/deferment/defermentManager.d.ts.map +1 -1
- package/dist/esm/deferment/defermentManager.js +28 -2
- package/dist/esm/deferment/defermentManager.js.map +1 -1
- package/dist/esm/deferment/defermentManager.test.js +11 -11
- package/dist/esm/deferment/defermentManager.test.js.map +1 -1
- package/dist/esm/queues/batchingQueue.d.ts +0 -2
- package/dist/esm/queues/batchingQueue.d.ts.map +1 -1
- package/dist/esm/queues/batchingQueue.dispose.test.js +1 -3
- package/dist/esm/queues/batchingQueue.dispose.test.js.map +1 -1
- package/dist/esm/queues/batchingQueue.js +4 -3
- package/dist/esm/queues/batchingQueue.js.map +1 -1
- package/dist/esm/types/types.d.ts +5 -0
- package/dist/esm/types/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/core/objectLoader2.ts +3 -13
- package/src/core/objectLoader2Factory.test.ts +135 -0
- package/src/core/objectLoader2Factory.ts +29 -6
- package/src/core/options.ts +2 -0
- package/src/core/stages/cacheReader.ts +3 -3
- package/src/core/stages/cacheWriter.ts +5 -5
- package/src/core/stages/serverDownloader.ts +7 -4
- package/src/deferment/defermentManager.test.ts +11 -11
- package/src/deferment/defermentManager.ts +39 -3
- package/src/queues/batchingQueue.dispose.test.ts +1 -3
- package/src/queues/batchingQueue.ts +3 -5
- package/src/types/types.ts +5 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Deferment } from '../../deferment/defermentManager.js';
|
|
2
2
|
import Queue from '../../queues/queue.js';
|
|
3
3
|
import { CustomLogger } from '../../types/functions.js';
|
|
4
4
|
import { Item } from '../../types/types.js';
|
|
@@ -6,7 +6,7 @@ import { Database } from '../interfaces.js';
|
|
|
6
6
|
import { CacheOptions } from '../options.js';
|
|
7
7
|
export declare class CacheWriter implements Queue<Item> {
|
|
8
8
|
#private;
|
|
9
|
-
constructor(database: Database, logger: CustomLogger,
|
|
9
|
+
constructor(database: Database, logger: CustomLogger, deferment: Deferment, options: CacheOptions, requestItem: (id: string) => void);
|
|
10
10
|
add(item: Item): void;
|
|
11
11
|
writeAll(items: Item[]): Promise<void>;
|
|
12
12
|
disposeAsync(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheWriter.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cacheWriter.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAE/D,OAAO,KAAK,MAAM,uBAAuB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,qBAAa,WAAY,YAAW,KAAK,CAAC,IAAI,CAAC;;gBAU3C,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI;IASnC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAcf,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC,IAAI,UAAU,IAAI,OAAO,CAExB;CACF"}
|
|
@@ -2,16 +2,16 @@ import BatchingQueue from '../../queues/batchingQueue.js';
|
|
|
2
2
|
export class CacheWriter {
|
|
3
3
|
#writeQueue;
|
|
4
4
|
#database;
|
|
5
|
-
#
|
|
5
|
+
#deferment;
|
|
6
6
|
#requestItem;
|
|
7
7
|
#logger;
|
|
8
8
|
#options;
|
|
9
9
|
#disposed = false;
|
|
10
|
-
constructor(database, logger,
|
|
10
|
+
constructor(database, logger, deferment, options, requestItem) {
|
|
11
11
|
this.#database = database;
|
|
12
12
|
this.#options = options;
|
|
13
13
|
this.#logger = logger;
|
|
14
|
-
this.#
|
|
14
|
+
this.#deferment = deferment;
|
|
15
15
|
this.#requestItem = requestItem;
|
|
16
16
|
}
|
|
17
17
|
add(item) {
|
|
@@ -25,7 +25,7 @@ export class CacheWriter {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
this.#writeQueue.add(item.baseId, item);
|
|
28
|
-
this.#
|
|
28
|
+
this.#deferment.undefer(item, this.#requestItem);
|
|
29
29
|
}
|
|
30
30
|
async writeAll(items) {
|
|
31
31
|
const start = performance.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheWriter.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,+BAA+B,CAAA;AAOzD,MAAM,OAAO,WAAW;IACtB,WAAW,CAAiC;IAC5C,SAAS,CAAU;IACnB,
|
|
1
|
+
{"version":3,"file":"cacheWriter.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,+BAA+B,CAAA;AAOzD,MAAM,OAAO,WAAW;IACtB,WAAW,CAAiC;IAC5C,SAAS,CAAU;IACnB,UAAU,CAAW;IACrB,YAAY,CAAsB;IAClC,OAAO,CAAc;IACrB,QAAQ,CAAc;IACtB,SAAS,GAAG,KAAK,CAAA;IAEjB,YACE,QAAkB,EAClB,MAAoB,EACpB,SAAoB,EACpB,OAAqB,EACrB,WAAiC;QAEjC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;IACjC,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,CAAC;gBACnC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB;gBAC1C,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB;gBACjD,eAAe,EAAE,KAAK,EAAE,KAAa,EAAiB,EAAE;oBACtD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC5B,CAAC;aACF,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa;QAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAClC,IAAI,CAAC,OAAO,CACV,qBAAqB,KAAK,CAAC,MAAM,UAC/B,WAAW,CAAC,GAAG,EAAE,GAAG,KACtB,YAAY,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CACxC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,MAAM,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,CAAA;IACxC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import Queue from '../../queues/queue.js';
|
|
2
2
|
import { CustomLogger, Fetcher } from '../../types/functions.js';
|
|
3
|
-
import { Item } from '../../types/types.js';
|
|
3
|
+
import { Item, ObjectAttributeMask } from '../../types/types.js';
|
|
4
4
|
import { Downloader } from '../interfaces.js';
|
|
5
5
|
export interface ServerDownloaderOptions {
|
|
6
6
|
serverUrl: string;
|
|
@@ -10,6 +10,7 @@ export interface ServerDownloaderOptions {
|
|
|
10
10
|
headers?: Headers;
|
|
11
11
|
logger: CustomLogger;
|
|
12
12
|
fetch?: Fetcher;
|
|
13
|
+
attributeMask?: ObjectAttributeMask;
|
|
13
14
|
}
|
|
14
15
|
export default class ServerDownloader implements Downloader {
|
|
15
16
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverDownloader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,uBAAuB,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAyB,MAAM,0BAA0B,CAAA;AACvF,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"serverDownloader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,uBAAuB,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAyB,MAAM,0BAA0B,CAAA;AACvF,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,aAAa,CAAC,EAAE,mBAAmB,CAAA;CACpC;AAID,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,UAAU;;gBAiB7C,OAAO,EAAE,uBAAuB;IA6B5C,UAAU,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACpB,KAAK,EAAE,MAAM,CAAA;QACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;KAC9B,GAAG,IAAI;IAgBR,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAWrB,WAAW,CAAC,WAAW,EAAE,UAAU,GAAG,MAAM;IAWtC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,aAAa,CAAC,MAAM,EAAE;QAC1B,KAAK,EAAE,MAAM,EAAE,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;QACX,OAAO,EAAE,WAAW,CAAA;KACrB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+HX,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BtC"}
|
|
@@ -31,7 +31,7 @@ export default class ServerDownloader {
|
|
|
31
31
|
if (this.#options.token) {
|
|
32
32
|
this.#headers['Authorization'] = `Bearer ${this.#options.token}`;
|
|
33
33
|
}
|
|
34
|
-
this.#requestUrlChildren = `${this.#options.serverUrl}/api/
|
|
34
|
+
this.#requestUrlChildren = `${this.#options.serverUrl}/api/v2/projects/${this.#options.streamId}/object-stream/`;
|
|
35
35
|
this.#requestUrlRootObj = `${this.#options.serverUrl}/objects/${this.#options.streamId}/${this.#options.objectId}/single`;
|
|
36
36
|
const encoder = new TextEncoder();
|
|
37
37
|
this.#rawEncoding = encoder.encode(this.#rawString);
|
|
@@ -77,11 +77,12 @@ export default class ServerDownloader {
|
|
|
77
77
|
const { batch, url, headers } = params;
|
|
78
78
|
const start = performance.now();
|
|
79
79
|
this.#logger(`Downloading batch of ${batch.length} items...`);
|
|
80
|
+
const attributeMask = this.#options.attributeMask;
|
|
80
81
|
const keys = new Set(batch);
|
|
81
82
|
const response = await this.#fetch(url, {
|
|
82
83
|
method: 'POST',
|
|
83
84
|
headers: { ...headers, 'Content-Type': 'application/json' },
|
|
84
|
-
body: JSON.stringify({
|
|
85
|
+
body: JSON.stringify({ objectIds: batch, attributeMask })
|
|
85
86
|
});
|
|
86
87
|
this.#validateResponse(response);
|
|
87
88
|
if (!response.body) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverDownloader.js","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,+BAA+B,CAAA;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAyB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"serverDownloader.js","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,28 @@
|
|
|
1
1
|
import { CustomLogger } from '../types/functions.js';
|
|
2
2
|
import { Item, Base } from '../types/types.js';
|
|
3
3
|
import { MemoryCache } from './MemoryCache.js';
|
|
4
|
-
export
|
|
4
|
+
export interface Deferment {
|
|
5
|
+
defer(params: {
|
|
6
|
+
id: string;
|
|
7
|
+
}): [Promise<Base>, boolean];
|
|
8
|
+
undefer(item: Item, requestItem: (id: string) => void): void;
|
|
9
|
+
dispose(): void;
|
|
10
|
+
}
|
|
11
|
+
export declare class MemoryOnlyDeferment implements Deferment {
|
|
12
|
+
private items;
|
|
13
|
+
constructor(items: Map<string, Base>);
|
|
14
|
+
defer(params: {
|
|
15
|
+
id: string;
|
|
16
|
+
}): [Promise<Base>, boolean];
|
|
17
|
+
undefer(): void;
|
|
18
|
+
dispose(): void;
|
|
19
|
+
}
|
|
20
|
+
export declare class DefermentManager implements Deferment {
|
|
5
21
|
private outstanding;
|
|
6
22
|
private logger;
|
|
7
23
|
private disposed;
|
|
8
24
|
private cache;
|
|
9
|
-
constructor(
|
|
25
|
+
constructor(logger: CustomLogger, cache?: MemoryCache);
|
|
10
26
|
defer(params: {
|
|
11
27
|
id: string;
|
|
12
28
|
}): [Promise<Base>, boolean];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defermentManager.d.ts","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,qBAAa,
|
|
1
|
+
{"version":3,"file":"defermentManager.d.ts","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;IACvD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAA;IAC5D,OAAO,IAAI,IAAI,CAAA;CAChB;AAED,qBAAa,mBAAoB,YAAW,SAAS;IACnD,OAAO,CAAC,KAAK,CAAmB;gBAEpB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC;IAGpC,KAAK,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAOvD,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;CAGhB;AAED,qBAAa,gBAAiB,YAAW,SAAS;IAChD,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,KAAK,CAAa;gBAEd,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,WAAW;IAarD,KAAK,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAevD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAqB5D,OAAO,IAAI,IAAI;CAOhB"}
|
|
@@ -1,12 +1,37 @@
|
|
|
1
1
|
import { DeferredBase } from './deferredBase.js';
|
|
2
|
+
import { MemoryCache } from './MemoryCache.js';
|
|
3
|
+
export class MemoryOnlyDeferment {
|
|
4
|
+
items;
|
|
5
|
+
constructor(items) {
|
|
6
|
+
this.items = items;
|
|
7
|
+
}
|
|
8
|
+
defer(params) {
|
|
9
|
+
const item = this.items.get(params.id);
|
|
10
|
+
if (item) {
|
|
11
|
+
return [Promise.resolve(item), true];
|
|
12
|
+
}
|
|
13
|
+
return [Promise.reject(new Error('Not found in cache: ' + params.id)), false];
|
|
14
|
+
}
|
|
15
|
+
undefer() {
|
|
16
|
+
//no-op
|
|
17
|
+
}
|
|
18
|
+
dispose() {
|
|
19
|
+
//no-op
|
|
20
|
+
}
|
|
21
|
+
}
|
|
2
22
|
export class DefermentManager {
|
|
3
23
|
outstanding = new Map();
|
|
4
24
|
logger;
|
|
5
25
|
disposed = false;
|
|
6
26
|
cache;
|
|
7
|
-
constructor(
|
|
8
|
-
this.cache = cache;
|
|
27
|
+
constructor(logger, cache) {
|
|
9
28
|
this.logger = logger;
|
|
29
|
+
this.cache =
|
|
30
|
+
cache ||
|
|
31
|
+
new MemoryCache({
|
|
32
|
+
maxSizeInMb: 500, // 500 MB
|
|
33
|
+
ttlms: 5_000 // 5 seconds
|
|
34
|
+
}, logger);
|
|
10
35
|
}
|
|
11
36
|
defer(params) {
|
|
12
37
|
if (this.disposed)
|
|
@@ -49,6 +74,7 @@ export class DefermentManager {
|
|
|
49
74
|
this.disposed = true;
|
|
50
75
|
this.logger('cleared deferments, left', this.outstanding.size);
|
|
51
76
|
this.outstanding.clear();
|
|
77
|
+
this.cache.dispose();
|
|
52
78
|
}
|
|
53
79
|
}
|
|
54
80
|
//# sourceMappingURL=defermentManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defermentManager.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"defermentManager.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ describe('DefermentManager', () => {
|
|
|
7
7
|
get: vi.fn(),
|
|
8
8
|
add: vi.fn()
|
|
9
9
|
};
|
|
10
|
-
const defermentManager = new DefermentManager(
|
|
10
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
11
11
|
expect(defermentManager).toBeDefined();
|
|
12
12
|
});
|
|
13
13
|
describe('defer', () => {
|
|
@@ -19,7 +19,7 @@ describe('DefermentManager', () => {
|
|
|
19
19
|
get,
|
|
20
20
|
add
|
|
21
21
|
};
|
|
22
|
-
const defermentManager = new DefermentManager(
|
|
22
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
23
23
|
const item = {
|
|
24
24
|
// eslint-disable-next-line camelcase
|
|
25
25
|
base: { id: 'testId', speckle_type: 'Base' },
|
|
@@ -40,7 +40,7 @@ describe('DefermentManager', () => {
|
|
|
40
40
|
get,
|
|
41
41
|
add
|
|
42
42
|
};
|
|
43
|
-
const defermentManager = new DefermentManager(
|
|
43
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
44
44
|
const [promise1, wasInCache1] = defermentManager.defer({ id: 'testId' });
|
|
45
45
|
const [promise2, wasInCache2] = defermentManager.defer({ id: 'testId' });
|
|
46
46
|
expect(wasInCache1).toBe(false);
|
|
@@ -55,7 +55,7 @@ describe('DefermentManager', () => {
|
|
|
55
55
|
get,
|
|
56
56
|
add
|
|
57
57
|
};
|
|
58
|
-
const defermentManager = new DefermentManager(
|
|
58
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
59
59
|
const [promise, wasInCache] = defermentManager.defer({ id: 'testId' });
|
|
60
60
|
expect(wasInCache).toBe(false);
|
|
61
61
|
expect(promise).toBeInstanceOf(Promise);
|
|
@@ -68,7 +68,7 @@ describe('DefermentManager', () => {
|
|
|
68
68
|
get,
|
|
69
69
|
add
|
|
70
70
|
};
|
|
71
|
-
const defermentManager = new DefermentManager(
|
|
71
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
72
72
|
defermentManager.dispose();
|
|
73
73
|
expect(() => defermentManager.defer({ id: 'testId' })).toThrow('DefermentManager is disposed');
|
|
74
74
|
});
|
|
@@ -82,7 +82,7 @@ describe('DefermentManager', () => {
|
|
|
82
82
|
get,
|
|
83
83
|
add
|
|
84
84
|
};
|
|
85
|
-
const defermentManager = new DefermentManager(
|
|
85
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
86
86
|
const requestItem = vi.fn();
|
|
87
87
|
const [promise] = defermentManager.defer({ id: 'testId' });
|
|
88
88
|
const item = {
|
|
@@ -102,7 +102,7 @@ describe('DefermentManager', () => {
|
|
|
102
102
|
get,
|
|
103
103
|
add
|
|
104
104
|
};
|
|
105
|
-
const defermentManager = new DefermentManager(
|
|
105
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
106
106
|
const requestItem = vi.fn();
|
|
107
107
|
const item = { baseId: 'testId' };
|
|
108
108
|
defermentManager.undefer(item, requestItem);
|
|
@@ -116,7 +116,7 @@ describe('DefermentManager', () => {
|
|
|
116
116
|
get,
|
|
117
117
|
add
|
|
118
118
|
};
|
|
119
|
-
const defermentManager = new DefermentManager(
|
|
119
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
120
120
|
const requestItem = vi.fn();
|
|
121
121
|
const item = {
|
|
122
122
|
// eslint-disable-next-line camelcase
|
|
@@ -139,7 +139,7 @@ describe('DefermentManager', () => {
|
|
|
139
139
|
get,
|
|
140
140
|
add
|
|
141
141
|
};
|
|
142
|
-
const defermentManager = new DefermentManager(
|
|
142
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
143
143
|
const requestItem = vi.fn();
|
|
144
144
|
defermentManager.dispose();
|
|
145
145
|
const item = {
|
|
@@ -159,7 +159,7 @@ describe('DefermentManager', () => {
|
|
|
159
159
|
get,
|
|
160
160
|
add
|
|
161
161
|
};
|
|
162
|
-
const defermentManager = new DefermentManager(
|
|
162
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
163
163
|
void defermentManager.defer({ id: 'testId' });
|
|
164
164
|
defermentManager.dispose();
|
|
165
165
|
// @ts-expect-error - accessing private property for testing
|
|
@@ -173,7 +173,7 @@ describe('DefermentManager', () => {
|
|
|
173
173
|
get,
|
|
174
174
|
add
|
|
175
175
|
};
|
|
176
|
-
const defermentManager = new DefermentManager(
|
|
176
|
+
const defermentManager = new DefermentManager(mockLogger, mockCache);
|
|
177
177
|
defermentManager.dispose();
|
|
178
178
|
// @ts-expect-error - accessing private property for testing
|
|
179
179
|
const outstanding = defermentManager.outstanding;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defermentManager.test.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAKxD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,UAAU,GAAiB,EAAE,CAAC,EAAE,EAAE,CAAA;QACxC,MAAM,SAAS,GAAG;YAChB,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;YACZ,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;SACa,CAAA;QAC3B,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"defermentManager.test.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { CustomLogger } from '../types/functions.js';
|
|
2
1
|
export default class BatchingQueue<T> {
|
|
3
2
|
#private;
|
|
4
3
|
constructor(params: {
|
|
5
4
|
batchSize: number;
|
|
6
5
|
maxWaitTime: number;
|
|
7
6
|
processFunction: (batch: T[]) => Promise<void>;
|
|
8
|
-
logger?: CustomLogger;
|
|
9
7
|
});
|
|
10
8
|
disposeAsync(): Promise<void>;
|
|
11
9
|
add(key: string, item: T): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchingQueue.d.ts","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"batchingQueue.d.ts","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,CAAC;;gBA6BtB,MAAM,EAAE;QAClB,SAAS,EAAE,MAAM,CAAA;QACjB,WAAW,EAAE,MAAM,CAAA;QACnB,eAAe,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAC/C;IAMK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBnC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAM/B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI;IA8CxC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAI9B,KAAK,IAAI,MAAM;IAIf,UAAU,IAAI,OAAO;CAOtB"}
|
|
@@ -12,7 +12,7 @@ describe('BatchingQueue disposal', () => {
|
|
|
12
12
|
items.forEach((item) => queue.add(item.id, item));
|
|
13
13
|
expect(queue.count()).toBe(3);
|
|
14
14
|
await queue.disposeAsync();
|
|
15
|
-
expect(processFunction).
|
|
15
|
+
expect(processFunction).not.toHaveBeenCalled();
|
|
16
16
|
expect(queue.count()).toBe(0);
|
|
17
17
|
expect(queue.isDisposed()).toBe(true);
|
|
18
18
|
});
|
|
@@ -38,8 +38,6 @@ describe('BatchingQueue disposal', () => {
|
|
|
38
38
|
expect(queue.isDisposed()).toBe(true);
|
|
39
39
|
resolveProcess();
|
|
40
40
|
await disposePromise;
|
|
41
|
-
expect(processFunction).toHaveBeenCalledTimes(2);
|
|
42
|
-
expect(processFunction).toHaveBeenCalledWith(items2);
|
|
43
41
|
expect(queue.count()).toBe(0);
|
|
44
42
|
expect(queue.isDisposed()).toBe(true);
|
|
45
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchingQueue.dispose.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.dispose.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AACnD,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;QAC5D,MAAM,KAAK,GAAG,IAAI,aAAa,CAAiB;YAC9C,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,IAAI;YACjB,eAAe;SAChB,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACxE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAA;QAEjD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE7B,MAAM,KAAK,CAAC,YAAY,EAAE,CAAA;QAE1B,MAAM,CAAC,eAAe,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"batchingQueue.dispose.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.dispose.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ export default class BatchingQueue {
|
|
|
10
10
|
#processFunction;
|
|
11
11
|
#timeoutId = null;
|
|
12
12
|
#isProcessing = false;
|
|
13
|
-
#logger;
|
|
14
13
|
#disposed = false;
|
|
15
14
|
#batchTimeout;
|
|
16
15
|
// Helper methods for cross-environment timeout handling
|
|
@@ -34,7 +33,6 @@ export default class BatchingQueue {
|
|
|
34
33
|
this.#batchSize = params.batchSize;
|
|
35
34
|
this.#processFunction = params.processFunction;
|
|
36
35
|
this.#batchTimeout = params.maxWaitTime;
|
|
37
|
-
this.#logger = params.logger || (() => { });
|
|
38
36
|
}
|
|
39
37
|
async disposeAsync() {
|
|
40
38
|
this.#disposed = true;
|
|
@@ -90,11 +88,14 @@ export default class BatchingQueue {
|
|
|
90
88
|
}
|
|
91
89
|
this.#isProcessing = true;
|
|
92
90
|
const batchToProcess = this.#getBatch(this.#batchSize);
|
|
91
|
+
if (this.#disposed)
|
|
92
|
+
return;
|
|
93
93
|
try {
|
|
94
94
|
await this.#processFunction(batchToProcess);
|
|
95
95
|
}
|
|
96
96
|
catch (error) {
|
|
97
|
-
|
|
97
|
+
console.error('Batch processing failed:', error);
|
|
98
|
+
this.#disposed = true;
|
|
98
99
|
}
|
|
99
100
|
finally {
|
|
100
101
|
this.#isProcessing = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchingQueue.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"batchingQueue.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAU,SAAQ,IAAI;IACrC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;CACd"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAU,SAAQ,IAAI;IACrC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;CACd;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GACrB;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GACrB,SAAS,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@speckle/objectloader2",
|
|
3
|
-
"version": "2.26.
|
|
3
|
+
"version": "2.26.2",
|
|
4
4
|
"description": "This is an updated objectloader for the Speckle viewer written in typescript",
|
|
5
5
|
"main": "./dist/commonjs/index.js",
|
|
6
6
|
"module": "./dist/esm/index.js",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"author": "AEC Systems",
|
|
34
34
|
"license": "Apache-2.0",
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@speckle/shared": "^2.26.
|
|
36
|
+
"@speckle/shared": "^2.26.2"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/lodash": "^4.17.5",
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { DefermentManager } from '../deferment/defermentManager.js'
|
|
1
|
+
import { Deferment } from '../deferment/defermentManager.js'
|
|
3
2
|
import AggregateQueue from '../queues/aggregateQueue.js'
|
|
4
3
|
import AsyncGeneratorQueue from '../queues/asyncGeneratorQueue.js'
|
|
5
4
|
import { CustomLogger, take } from '../types/functions.js'
|
|
@@ -23,8 +22,7 @@ export class ObjectLoader2 {
|
|
|
23
22
|
#cacheReader: CacheReader
|
|
24
23
|
#cacheWriter: CacheWriter
|
|
25
24
|
|
|
26
|
-
#deferments:
|
|
27
|
-
#cache: MemoryCache
|
|
25
|
+
#deferments: Deferment
|
|
28
26
|
|
|
29
27
|
#gathered: AsyncGeneratorQueue<Item>
|
|
30
28
|
|
|
@@ -48,14 +46,7 @@ export class ObjectLoader2 {
|
|
|
48
46
|
this.#gathered = new AsyncGeneratorQueue()
|
|
49
47
|
|
|
50
48
|
this.#database = options.database
|
|
51
|
-
this.#
|
|
52
|
-
{
|
|
53
|
-
maxSizeInMb: 500, // 500 MB
|
|
54
|
-
ttlms: 5_000 // 5 seconds
|
|
55
|
-
},
|
|
56
|
-
this.#logger
|
|
57
|
-
)
|
|
58
|
-
this.#deferments = new DefermentManager(this.#cache, this.#logger)
|
|
49
|
+
this.#deferments = options.deferments
|
|
59
50
|
this.#downloader = options.downloader
|
|
60
51
|
this.#cacheReader = new CacheReader(
|
|
61
52
|
this.#database,
|
|
@@ -83,7 +74,6 @@ export class ObjectLoader2 {
|
|
|
83
74
|
this.#cacheReader.disposeAsync()
|
|
84
75
|
])
|
|
85
76
|
this.#deferments.dispose()
|
|
86
|
-
this.#cache.dispose()
|
|
87
77
|
}
|
|
88
78
|
|
|
89
79
|
async getRootObject(): Promise<Item | undefined> {
|