@speckle/objectloader2 2.26.1 → 2.26.3
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 +21 -16
- package/dist/commonjs/deferment/defermentManager.test.js.map +1 -1
- package/dist/commonjs/queues/batchingQueue.d.ts +2 -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 +20 -15
- package/dist/commonjs/queues/batchingQueue.js.map +1 -1
- package/dist/commonjs/queues/batchingQueue.test.js +98 -0
- package/dist/commonjs/queues/batchingQueue.test.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 +21 -16
- package/dist/esm/deferment/defermentManager.test.js.map +1 -1
- package/dist/esm/queues/batchingQueue.d.ts +2 -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 +20 -15
- package/dist/esm/queues/batchingQueue.js.map +1 -1
- package/dist/esm/queues/batchingQueue.test.js +98 -0
- package/dist/esm/queues/batchingQueue.test.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.spec.ts +10 -3
- 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.spec.ts +1 -1
- package/src/core/stages/cacheReader.ts +3 -3
- package/src/core/stages/cacheWriter.spec.ts +1 -1
- package/src/core/stages/cacheWriter.ts +5 -5
- package/src/core/stages/serverDownloader.spec.ts +122 -0
- package/src/core/stages/serverDownloader.ts +7 -4
- package/src/deferment/defermentManager.test.ts +21 -16
- package/src/deferment/defermentManager.ts +39 -3
- package/src/queues/batchingQueue.dispose.test.ts +1 -3
- package/src/queues/batchingQueue.test.ts +121 -0
- package/src/queues/batchingQueue.ts +21 -19
- package/src/types/types.ts +5 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"objectLoader2.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAE,oBAAoB,EAAgB,MAAM,cAAc,CAAA;AAOjE,qBAAa,aAAa;;gBAiBZ,OAAO,EAAE,oBAAoB;IAqCnC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7B,aAAa,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAY1C,SAAS,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC,iBAAiB,IAAI,cAAc,CAAC,IAAI,CAAC;IA4ChD,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa;IAIxD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;CAGnD"}
|
|
@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ObjectLoader2 = void 0;
|
|
7
|
-
const MemoryCache_js_1 = require("../deferment/MemoryCache.js");
|
|
8
|
-
const defermentManager_js_1 = require("../deferment/defermentManager.js");
|
|
9
7
|
const aggregateQueue_js_1 = __importDefault(require("../queues/aggregateQueue.js"));
|
|
10
8
|
const asyncGeneratorQueue_js_1 = __importDefault(require("../queues/asyncGeneratorQueue.js"));
|
|
11
9
|
const functions_js_1 = require("../types/functions.js");
|
|
@@ -22,7 +20,6 @@ class ObjectLoader2 {
|
|
|
22
20
|
#cacheReader;
|
|
23
21
|
#cacheWriter;
|
|
24
22
|
#deferments;
|
|
25
|
-
#cache;
|
|
26
23
|
#gathered;
|
|
27
24
|
#root = undefined;
|
|
28
25
|
#isRootStored = false;
|
|
@@ -40,11 +37,7 @@ class ObjectLoader2 {
|
|
|
40
37
|
};
|
|
41
38
|
this.#gathered = new asyncGeneratorQueue_js_1.default();
|
|
42
39
|
this.#database = options.database;
|
|
43
|
-
this.#
|
|
44
|
-
maxSizeInMb: 500, // 500 MB
|
|
45
|
-
ttlms: 5_000 // 5 seconds
|
|
46
|
-
}, this.#logger);
|
|
47
|
-
this.#deferments = new defermentManager_js_1.DefermentManager(this.#cache, this.#logger);
|
|
40
|
+
this.#deferments = options.deferments;
|
|
48
41
|
this.#downloader = options.downloader;
|
|
49
42
|
this.#cacheReader = new cacheReader_js_1.CacheReader(this.#database, this.#deferments, this.#logger, cacheOptions);
|
|
50
43
|
this.#cacheReader.initializeQueue(this.#gathered, this.#downloader);
|
|
@@ -60,7 +53,6 @@ class ObjectLoader2 {
|
|
|
60
53
|
this.#cacheReader.disposeAsync()
|
|
61
54
|
]);
|
|
62
55
|
this.#deferments.dispose();
|
|
63
|
-
this.#cache.dispose();
|
|
64
56
|
}
|
|
65
57
|
async getRootObject() {
|
|
66
58
|
if (!this.#root) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2.js","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"objectLoader2.js","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { CustomLogger } from '../types/functions.js';
|
|
2
|
-
import { Base } from '../types/types.js';
|
|
1
|
+
import { CustomLogger, Fetcher } from '../types/functions.js';
|
|
2
|
+
import { Base, ObjectAttributeMask } from '../types/types.js';
|
|
3
3
|
import { ObjectLoader2 } from './objectLoader2.js';
|
|
4
4
|
export interface ObjectLoader2FactoryOptions {
|
|
5
5
|
keyRange?: {
|
|
@@ -8,6 +8,10 @@ export interface ObjectLoader2FactoryOptions {
|
|
|
8
8
|
upperBound: Function;
|
|
9
9
|
};
|
|
10
10
|
indexedDB?: IDBFactory;
|
|
11
|
+
fetch?: Fetcher;
|
|
12
|
+
attributeMask?: ObjectAttributeMask;
|
|
13
|
+
useCache?: boolean;
|
|
14
|
+
debug?: boolean;
|
|
11
15
|
logger?: CustomLogger;
|
|
12
16
|
}
|
|
13
17
|
export declare class ObjectLoader2Factory {
|
|
@@ -20,6 +24,7 @@ export declare class ObjectLoader2Factory {
|
|
|
20
24
|
token?: string;
|
|
21
25
|
headers?: Headers;
|
|
22
26
|
options?: ObjectLoader2FactoryOptions;
|
|
27
|
+
attributeMask?: ObjectAttributeMask;
|
|
23
28
|
}): ObjectLoader2;
|
|
24
29
|
static getLogger(providedLogger?: CustomLogger): CustomLogger | undefined;
|
|
25
30
|
static logger: CustomLogger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2Factory.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,OAAO,EAGR,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAMlD,MAAM,WAAW,2BAA2B;IAE1C,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,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,qBAAa,oBAAoB;IAC/B,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa;IAexD,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;QACrC,aAAa,CAAC,EAAE,mBAAmB,CAAA;KACpC,GAAG,aAAa;IA8CjB,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS;IAOzE,MAAM,CAAC,MAAM,EAAE,YAAY,CAE1B;CACF"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ObjectLoader2Factory = void 0;
|
|
7
|
+
const defermentManager_js_1 = require("../deferment/defermentManager.js");
|
|
7
8
|
const functions_js_1 = require("../types/functions.js");
|
|
8
9
|
const objectLoader2_js_1 = require("./objectLoader2.js");
|
|
9
10
|
const indexedDatabase_js_1 = require("./stages/indexedDatabase.js");
|
|
@@ -19,6 +20,7 @@ class ObjectLoader2Factory {
|
|
|
19
20
|
});
|
|
20
21
|
const loader = new objectLoader2_js_1.ObjectLoader2({
|
|
21
22
|
rootId: root.id,
|
|
23
|
+
deferments: new defermentManager_js_1.MemoryOnlyDeferment(records),
|
|
22
24
|
database: new memoryDatabase_js_1.MemoryDatabase({ items: records }),
|
|
23
25
|
downloader: new memoryDownloader_js_1.MemoryDownloader(root.id, records)
|
|
24
26
|
});
|
|
@@ -31,10 +33,14 @@ class ObjectLoader2Factory {
|
|
|
31
33
|
static createFromUrl(params) {
|
|
32
34
|
const log = ObjectLoader2Factory.getLogger(params.options?.logger);
|
|
33
35
|
let database;
|
|
34
|
-
if (
|
|
36
|
+
if (params.options?.debug === true ||
|
|
37
|
+
(0, functions_js_1.getFeatureFlag)(functions_js_1.ObjectLoader2Flags.DEBUG) === 'true') {
|
|
35
38
|
this.logger('Using DEBUG mode for ObjectLoader2Factory');
|
|
36
39
|
}
|
|
37
|
-
|
|
40
|
+
const useCache = params.options?.useCache ?? true;
|
|
41
|
+
const flag = (0, functions_js_1.getFeatureFlag)(functions_js_1.ObjectLoader2Flags.USE_CACHE);
|
|
42
|
+
const flagAllowsCache = flag !== 'false';
|
|
43
|
+
if (useCache && flagAllowsCache) {
|
|
38
44
|
database = new indexedDatabase_js_1.IndexedDatabase({
|
|
39
45
|
indexedDB: params.options?.indexedDB,
|
|
40
46
|
keyRange: params.options?.keyRange
|
|
@@ -46,18 +52,22 @@ class ObjectLoader2Factory {
|
|
|
46
52
|
});
|
|
47
53
|
this.logger('Disabled persistent caching for ObjectLoader2. Using MemoryDatabase');
|
|
48
54
|
}
|
|
55
|
+
const logger = log || (() => { });
|
|
49
56
|
const loader = new objectLoader2_js_1.ObjectLoader2({
|
|
50
57
|
rootId: params.objectId,
|
|
58
|
+
deferments: new defermentManager_js_1.DefermentManager(logger),
|
|
51
59
|
downloader: new serverDownloader_js_1.default({
|
|
52
60
|
serverUrl: params.serverUrl,
|
|
53
61
|
streamId: params.streamId,
|
|
54
62
|
objectId: params.objectId,
|
|
55
63
|
token: params.token,
|
|
56
64
|
headers: params.headers,
|
|
57
|
-
|
|
65
|
+
fetch: params.options?.fetch,
|
|
66
|
+
attributeMask: params.attributeMask,
|
|
67
|
+
logger
|
|
58
68
|
}),
|
|
59
69
|
database,
|
|
60
|
-
logger
|
|
70
|
+
logger
|
|
61
71
|
});
|
|
62
72
|
return loader;
|
|
63
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.test.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/* eslint-disable camelcase */
|
|
4
|
+
const vitest_1 = require("vitest");
|
|
5
|
+
const objectLoader2Factory_js_1 = require("./objectLoader2Factory.js");
|
|
6
|
+
(0, vitest_1.describe)('ObjectLoader2Factory', () => {
|
|
7
|
+
let testObjects;
|
|
8
|
+
(0, vitest_1.beforeEach)(() => {
|
|
9
|
+
testObjects = [
|
|
10
|
+
{
|
|
11
|
+
id: 'root-id',
|
|
12
|
+
speckle_type: 'Base',
|
|
13
|
+
__closure: {
|
|
14
|
+
'child-1': 1,
|
|
15
|
+
'child-2': 2
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
id: 'child-1',
|
|
20
|
+
speckle_type: 'Base'
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
id: 'child-2',
|
|
24
|
+
speckle_type: 'Base'
|
|
25
|
+
}
|
|
26
|
+
];
|
|
27
|
+
});
|
|
28
|
+
(0, vitest_1.describe)('createFromObjects', () => {
|
|
29
|
+
(0, vitest_1.it)('should create ObjectLoader2 from array of objects', async () => {
|
|
30
|
+
const loader = objectLoader2Factory_js_1.ObjectLoader2Factory.createFromObjects(testObjects);
|
|
31
|
+
(0, vitest_1.expect)(loader).toBeDefined();
|
|
32
|
+
// Test that we can get the root object
|
|
33
|
+
const rootObject = await loader.getRootObject();
|
|
34
|
+
(0, vitest_1.expect)(rootObject?.baseId).toBe('root-id');
|
|
35
|
+
(0, vitest_1.expect)(rootObject?.base?.speckle_type).toBe('Base');
|
|
36
|
+
await loader.disposeAsync();
|
|
37
|
+
});
|
|
38
|
+
(0, vitest_1.it)('should use first object as root', async () => {
|
|
39
|
+
const loader = objectLoader2Factory_js_1.ObjectLoader2Factory.createFromObjects(testObjects);
|
|
40
|
+
const rootObject = await loader.getRootObject();
|
|
41
|
+
(0, vitest_1.expect)(rootObject?.baseId).toBe('root-id');
|
|
42
|
+
(0, vitest_1.expect)(rootObject?.base?.__closure).toEqual({
|
|
43
|
+
'child-1': 1,
|
|
44
|
+
'child-2': 2
|
|
45
|
+
});
|
|
46
|
+
await loader.disposeAsync();
|
|
47
|
+
});
|
|
48
|
+
(0, vitest_1.it)('should allow iteration over all objects', async () => {
|
|
49
|
+
const loader = objectLoader2Factory_js_1.ObjectLoader2Factory.createFromObjects(testObjects);
|
|
50
|
+
const objects = [];
|
|
51
|
+
for await (const obj of loader.getObjectIterator()) {
|
|
52
|
+
objects.push(obj);
|
|
53
|
+
}
|
|
54
|
+
(0, vitest_1.expect)(objects).toHaveLength(3);
|
|
55
|
+
(0, vitest_1.expect)(objects[0].id).toBe('root-id');
|
|
56
|
+
await loader.disposeAsync();
|
|
57
|
+
});
|
|
58
|
+
(0, vitest_1.it)('should get total object count correctly', async () => {
|
|
59
|
+
const loader = objectLoader2Factory_js_1.ObjectLoader2Factory.createFromObjects(testObjects);
|
|
60
|
+
const totalCount = await loader.getTotalObjectCount();
|
|
61
|
+
(0, vitest_1.expect)(totalCount).toBe(3); // root + 2 children
|
|
62
|
+
await loader.disposeAsync();
|
|
63
|
+
});
|
|
64
|
+
(0, vitest_1.it)('should handle empty objects array', () => {
|
|
65
|
+
(0, vitest_1.expect)(() => {
|
|
66
|
+
objectLoader2Factory_js_1.ObjectLoader2Factory.createFromObjects([]);
|
|
67
|
+
}).toThrow();
|
|
68
|
+
});
|
|
69
|
+
(0, vitest_1.it)('should get individual objects by id', async () => {
|
|
70
|
+
const loader = objectLoader2Factory_js_1.ObjectLoader2Factory.createFromObjects(testObjects);
|
|
71
|
+
const rootObj = await loader.getObject({ id: 'root-id' });
|
|
72
|
+
(0, vitest_1.expect)(rootObj.id).toBe('root-id');
|
|
73
|
+
(0, vitest_1.expect)(rootObj.speckle_type).toBe('Base');
|
|
74
|
+
const child1 = await loader.getObject({ id: 'child-1' });
|
|
75
|
+
(0, vitest_1.expect)(child1.id).toBe('child-1');
|
|
76
|
+
const child2 = await loader.getObject({ id: 'child-2' });
|
|
77
|
+
(0, vitest_1.expect)(child2.id).toBe('child-2');
|
|
78
|
+
await loader.disposeAsync();
|
|
79
|
+
});
|
|
80
|
+
(0, vitest_1.it)('should get individual objects by id that does not exist', async () => {
|
|
81
|
+
const loader = objectLoader2Factory_js_1.ObjectLoader2Factory.createFromObjects(testObjects);
|
|
82
|
+
const rootObj = await loader.getObject({ id: 'root-id' });
|
|
83
|
+
(0, vitest_1.expect)(rootObj.id).toBe('root-id');
|
|
84
|
+
(0, vitest_1.expect)(rootObj.speckle_type).toBe('Base');
|
|
85
|
+
const getObjectPromise = loader.getObject({ id: 'child-11111' });
|
|
86
|
+
await (0, vitest_1.expect)(getObjectPromise).rejects.toThrow();
|
|
87
|
+
await loader.disposeAsync();
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
(0, vitest_1.describe)('createFromJSON', () => {
|
|
91
|
+
(0, vitest_1.it)('should create ObjectLoader2 from JSON string', async () => {
|
|
92
|
+
const json = JSON.stringify(testObjects);
|
|
93
|
+
const loader = objectLoader2Factory_js_1.ObjectLoader2Factory.createFromJSON(json);
|
|
94
|
+
(0, vitest_1.expect)(loader).toBeDefined();
|
|
95
|
+
const rootObject = await loader.getRootObject();
|
|
96
|
+
(0, vitest_1.expect)(rootObject?.baseId).toBe('root-id');
|
|
97
|
+
await loader.disposeAsync();
|
|
98
|
+
});
|
|
99
|
+
(0, vitest_1.it)('should handle invalid JSON', () => {
|
|
100
|
+
(0, vitest_1.expect)(() => {
|
|
101
|
+
objectLoader2Factory_js_1.ObjectLoader2Factory.createFromJSON('invalid json');
|
|
102
|
+
}).toThrow();
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
//# sourceMappingURL=objectLoader2Factory.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.test.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { Deferment } from '../deferment/defermentManager.js';
|
|
1
2
|
import { CustomLogger } from '../types/functions.js';
|
|
2
3
|
import { Base } from '../types/types.js';
|
|
3
4
|
import { Downloader, Database } from './interfaces.js';
|
|
4
5
|
export interface ObjectLoader2Options {
|
|
5
6
|
rootId: string;
|
|
7
|
+
deferments: Deferment;
|
|
6
8
|
downloader: Downloader;
|
|
7
9
|
database: Database;
|
|
8
10
|
logger?: CustomLogger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/core/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,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"}
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/core/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,SAAS,CAAA;IACrB,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"}
|
|
@@ -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, Base } 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 CacheReader {
|
|
8
8
|
#private;
|
|
9
|
-
constructor(database: Database, defermentManager:
|
|
9
|
+
constructor(database: Database, defermentManager: Deferment, logger: CustomLogger, options: CacheOptions);
|
|
10
10
|
initializeQueue(foundQueue: Queue<Item>, notFoundQueue: Queue<string>): void;
|
|
11
11
|
getObject(params: {
|
|
12
12
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheReader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cacheReader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.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,IAAI,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,qBAAa,WAAW;;gBAUpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,SAAS,EAC3B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY;IAQvB,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAK5E,SAAS,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBhD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAO7B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAyBhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheReader.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":";;;;;;AACA,qFAAyD;AAOzD,MAAa,WAAW;IACtB,SAAS,CAAU;IACnB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"cacheReader.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|
|
@@ -8,16 +8,16 @@ const batchingQueue_js_1 = __importDefault(require("../../queues/batchingQueue.j
|
|
|
8
8
|
class CacheWriter {
|
|
9
9
|
#writeQueue;
|
|
10
10
|
#database;
|
|
11
|
-
#
|
|
11
|
+
#deferment;
|
|
12
12
|
#requestItem;
|
|
13
13
|
#logger;
|
|
14
14
|
#options;
|
|
15
15
|
#disposed = false;
|
|
16
|
-
constructor(database, logger,
|
|
16
|
+
constructor(database, logger, deferment, options, requestItem) {
|
|
17
17
|
this.#database = database;
|
|
18
18
|
this.#options = options;
|
|
19
19
|
this.#logger = logger;
|
|
20
|
-
this.#
|
|
20
|
+
this.#deferment = deferment;
|
|
21
21
|
this.#requestItem = requestItem;
|
|
22
22
|
}
|
|
23
23
|
add(item) {
|
|
@@ -31,7 +31,7 @@ class CacheWriter {
|
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
this.#writeQueue.add(item.baseId, item);
|
|
34
|
-
this.#
|
|
34
|
+
this.#deferment.undefer(item, this.#requestItem);
|
|
35
35
|
}
|
|
36
36
|
async writeAll(items) {
|
|
37
37
|
const start = performance.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheWriter.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":";;;;;;AACA,qFAAyD;AAOzD,MAAa,WAAW;IACtB,WAAW,CAAiC;IAC5C,SAAS,CAAU;IACnB,
|
|
1
|
+
{"version":3,"file":"cacheWriter.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":";;;;;;AACA,qFAAyD;AAOzD,MAAa,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,0BAAa,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;AAvDD,kCAuDC"}
|
|
@@ -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"}
|
|
@@ -36,7 +36,7 @@ class ServerDownloader {
|
|
|
36
36
|
if (this.#options.token) {
|
|
37
37
|
this.#headers['Authorization'] = `Bearer ${this.#options.token}`;
|
|
38
38
|
}
|
|
39
|
-
this.#requestUrlChildren = `${this.#options.serverUrl}/api/
|
|
39
|
+
this.#requestUrlChildren = `${this.#options.serverUrl}/api/v2/projects/${this.#options.streamId}/object-stream/`;
|
|
40
40
|
this.#requestUrlRootObj = `${this.#options.serverUrl}/objects/${this.#options.streamId}/${this.#options.objectId}/single`;
|
|
41
41
|
const encoder = new TextEncoder();
|
|
42
42
|
this.#rawEncoding = encoder.encode(this.#rawString);
|
|
@@ -82,11 +82,12 @@ class ServerDownloader {
|
|
|
82
82
|
const { batch, url, headers } = params;
|
|
83
83
|
const start = performance.now();
|
|
84
84
|
this.#logger(`Downloading batch of ${batch.length} items...`);
|
|
85
|
+
const attributeMask = this.#options.attributeMask;
|
|
85
86
|
const keys = new Set(batch);
|
|
86
87
|
const response = await this.#fetch(url, {
|
|
87
88
|
method: 'POST',
|
|
88
89
|
headers: { ...headers, 'Content-Type': 'application/json' },
|
|
89
|
-
body: JSON.stringify({
|
|
90
|
+
body: JSON.stringify({ objectIds: batch, attributeMask })
|
|
90
91
|
});
|
|
91
92
|
this.#validateResponse(response);
|
|
92
93
|
if (!response.body) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverDownloader.js","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":";;;;;AAAA,qFAAyD;AAEzD,qDAAgE;AAChE,2DAAuF;
|
|
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,15 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DefermentManager = void 0;
|
|
3
|
+
exports.DefermentManager = exports.MemoryOnlyDeferment = void 0;
|
|
4
4
|
const deferredBase_js_1 = require("./deferredBase.js");
|
|
5
|
+
const MemoryCache_js_1 = require("./MemoryCache.js");
|
|
6
|
+
class MemoryOnlyDeferment {
|
|
7
|
+
items;
|
|
8
|
+
constructor(items) {
|
|
9
|
+
this.items = items;
|
|
10
|
+
}
|
|
11
|
+
defer(params) {
|
|
12
|
+
const item = this.items.get(params.id);
|
|
13
|
+
if (item) {
|
|
14
|
+
return [Promise.resolve(item), true];
|
|
15
|
+
}
|
|
16
|
+
return [Promise.reject(new Error('Not found in cache: ' + params.id)), false];
|
|
17
|
+
}
|
|
18
|
+
undefer() {
|
|
19
|
+
//no-op
|
|
20
|
+
}
|
|
21
|
+
dispose() {
|
|
22
|
+
//no-op
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.MemoryOnlyDeferment = MemoryOnlyDeferment;
|
|
5
26
|
class DefermentManager {
|
|
6
27
|
outstanding = new Map();
|
|
7
28
|
logger;
|
|
8
29
|
disposed = false;
|
|
9
30
|
cache;
|
|
10
|
-
constructor(
|
|
11
|
-
this.cache = cache;
|
|
31
|
+
constructor(logger, cache) {
|
|
12
32
|
this.logger = logger;
|
|
33
|
+
this.cache =
|
|
34
|
+
cache ||
|
|
35
|
+
new MemoryCache_js_1.MemoryCache({
|
|
36
|
+
maxSizeInMb: 500, // 500 MB
|
|
37
|
+
ttlms: 5_000 // 5 seconds
|
|
38
|
+
}, logger);
|
|
13
39
|
}
|
|
14
40
|
defer(params) {
|
|
15
41
|
if (this.disposed)
|
|
@@ -52,6 +78,7 @@ class DefermentManager {
|
|
|
52
78
|
this.disposed = true;
|
|
53
79
|
this.logger('cleared deferments, left', this.outstanding.size);
|
|
54
80
|
this.outstanding.clear();
|
|
81
|
+
this.cache.dispose();
|
|
55
82
|
}
|
|
56
83
|
}
|
|
57
84
|
exports.DefermentManager = DefermentManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defermentManager.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":";;;AAAA,uDAAgD;
|
|
1
|
+
{"version":3,"file":"defermentManager.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"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"}
|