@speckle/objectloader2 2.25.9 → 2.26.1
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/interfaces.d.ts +4 -6
- package/dist/commonjs/core/interfaces.d.ts.map +1 -1
- package/dist/commonjs/core/objectLoader2.js +2 -2
- package/dist/commonjs/core/objectLoader2.js.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.d.ts.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.js +4 -3
- package/dist/commonjs/core/objectLoader2Factory.js.map +1 -1
- package/dist/commonjs/core/stages/cacheWriter.js +1 -1
- package/dist/commonjs/core/stages/cacheWriter.js.map +1 -1
- package/dist/commonjs/core/stages/indexedDatabase.d.ts +20 -6
- package/dist/commonjs/core/stages/indexedDatabase.d.ts.map +1 -1
- package/dist/commonjs/core/stages/indexedDatabase.js +138 -19
- package/dist/commonjs/core/stages/indexedDatabase.js.map +1 -1
- package/dist/commonjs/core/stages/memory/memoryDatabase.d.ts +2 -4
- package/dist/commonjs/core/stages/memory/memoryDatabase.d.ts.map +1 -1
- package/dist/commonjs/core/stages/memory/memoryDatabase.js +3 -3
- package/dist/commonjs/core/stages/memory/memoryDatabase.js.map +1 -1
- package/dist/commonjs/core/stages/memory/memoryDownloader.d.ts +1 -1
- package/dist/commonjs/core/stages/memory/memoryDownloader.d.ts.map +1 -1
- package/dist/commonjs/core/stages/memory/memoryDownloader.js +1 -1
- package/dist/commonjs/core/stages/memory/memoryDownloader.js.map +1 -1
- package/dist/commonjs/core/stages/serverDownloader.d.ts +3 -2
- package/dist/commonjs/core/stages/serverDownloader.d.ts.map +1 -1
- package/dist/commonjs/core/stages/serverDownloader.js +12 -19
- package/dist/commonjs/core/stages/serverDownloader.js.map +1 -1
- package/dist/commonjs/queues/keyedQueue.test.d.ts +2 -0
- package/dist/commonjs/queues/keyedQueue.test.d.ts.map +1 -0
- package/dist/commonjs/queues/keyedQueue.test.js +118 -0
- package/dist/commonjs/queues/keyedQueue.test.js.map +1 -0
- package/dist/esm/core/interfaces.d.ts +4 -6
- package/dist/esm/core/interfaces.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2.js +2 -2
- package/dist/esm/core/objectLoader2.js.map +1 -1
- package/dist/esm/core/objectLoader2Factory.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2Factory.js +3 -2
- package/dist/esm/core/objectLoader2Factory.js.map +1 -1
- package/dist/esm/core/stages/cacheWriter.js +1 -1
- package/dist/esm/core/stages/cacheWriter.js.map +1 -1
- package/dist/esm/core/stages/indexedDatabase.d.ts +20 -6
- package/dist/esm/core/stages/indexedDatabase.d.ts.map +1 -1
- package/dist/esm/core/stages/indexedDatabase.js +140 -22
- package/dist/esm/core/stages/indexedDatabase.js.map +1 -1
- package/dist/esm/core/stages/memory/memoryDatabase.d.ts +2 -4
- package/dist/esm/core/stages/memory/memoryDatabase.d.ts.map +1 -1
- package/dist/esm/core/stages/memory/memoryDatabase.js +3 -3
- package/dist/esm/core/stages/memory/memoryDatabase.js.map +1 -1
- package/dist/esm/core/stages/memory/memoryDownloader.d.ts +1 -1
- package/dist/esm/core/stages/memory/memoryDownloader.d.ts.map +1 -1
- package/dist/esm/core/stages/memory/memoryDownloader.js +1 -1
- package/dist/esm/core/stages/memory/memoryDownloader.js.map +1 -1
- package/dist/esm/core/stages/serverDownloader.d.ts +3 -2
- package/dist/esm/core/stages/serverDownloader.d.ts.map +1 -1
- package/dist/esm/core/stages/serverDownloader.js +12 -19
- package/dist/esm/core/stages/serverDownloader.js.map +1 -1
- package/dist/esm/queues/keyedQueue.test.d.ts +2 -0
- package/dist/esm/queues/keyedQueue.test.d.ts.map +1 -0
- package/dist/esm/queues/keyedQueue.test.js +113 -0
- package/dist/esm/queues/keyedQueue.test.js.map +1 -0
- package/package.json +2 -2
- package/src/core/interfaces.ts +4 -4
- package/src/core/objectLoader2.spec.ts +1 -1
- package/src/core/objectLoader2.ts +2 -2
- package/src/core/objectLoader2Factory.ts +3 -2
- package/src/core/stages/cacheWriter.spec.ts +4 -4
- package/src/core/stages/cacheWriter.ts +1 -1
- package/src/core/stages/indexedDatabase.spec.ts +6 -6
- package/src/core/stages/indexedDatabase.ts +154 -25
- package/src/core/stages/memory/memoryDatabase.spec.ts +6 -6
- package/src/core/stages/memory/memoryDatabase.ts +3 -3
- package/src/core/stages/memory/memoryDownloader.spec.ts +2 -2
- package/src/core/stages/memory/memoryDownloader.ts +1 -1
- package/src/core/stages/serverDownloader.spec.ts +20 -12
- package/src/core/stages/serverDownloader.ts +18 -24
- package/src/queues/keyedQueue.test.ts +146 -0
- package/dist/commonjs/core/stages/ItemStore.d.ts +0 -37
- package/dist/commonjs/core/stages/ItemStore.d.ts.map +0 -1
- package/dist/commonjs/core/stages/ItemStore.js +0 -167
- package/dist/commonjs/core/stages/ItemStore.js.map +0 -1
- package/dist/commonjs/queues/batchedPool.d.ts +0 -13
- package/dist/commonjs/queues/batchedPool.d.ts.map +0 -1
- package/dist/commonjs/queues/batchedPool.js +0 -45
- package/dist/commonjs/queues/batchedPool.js.map +0 -1
- package/dist/esm/core/stages/ItemStore.d.ts +0 -37
- package/dist/esm/core/stages/ItemStore.d.ts.map +0 -1
- package/dist/esm/core/stages/ItemStore.js +0 -163
- package/dist/esm/core/stages/ItemStore.js.map +0 -1
- package/dist/esm/queues/batchedPool.d.ts +0 -13
- package/dist/esm/queues/batchedPool.d.ts.map +0 -1
- package/dist/esm/queues/batchedPool.js +0 -42
- package/dist/esm/queues/batchedPool.js.map +0 -1
- package/src/core/stages/ItemStore.ts +0 -196
- package/src/queues/batchedPool.ts +0 -58
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Queue from '../queues/queue.js';
|
|
2
2
|
import { Item } from '../types/types.js';
|
|
3
3
|
export interface Downloader extends Queue<string> {
|
|
4
|
-
|
|
4
|
+
initialize(params: {
|
|
5
5
|
results: Queue<Item>;
|
|
6
6
|
total: number;
|
|
7
7
|
maxDownloadBatchWait?: number;
|
|
@@ -10,10 +10,8 @@ export interface Downloader extends Queue<string> {
|
|
|
10
10
|
disposeAsync(): Promise<void>;
|
|
11
11
|
}
|
|
12
12
|
export interface Database {
|
|
13
|
-
getAll(
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}): Promise<void>;
|
|
17
|
-
disposeAsync(): Promise<void>;
|
|
13
|
+
getAll(ids: string[]): Promise<(Item | undefined)[]>;
|
|
14
|
+
putAll(batch: Item[]): Promise<void>;
|
|
15
|
+
dispose(): void;
|
|
18
16
|
}
|
|
19
17
|
//# sourceMappingURL=interfaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/core/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,oBAAoB,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,MAAM,WAAW,UAAW,SAAQ,KAAK,CAAC,MAAM,CAAC;IAC/C,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/core/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,oBAAoB,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,MAAM,WAAW,UAAW,SAAQ,KAAK,CAAC,MAAM,CAAC;IAC/C,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,CAAA;IACR,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAC9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC,CAAA;IACpD,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACpC,OAAO,IAAI,IAAI,CAAA;CAChB"}
|
|
@@ -97,7 +97,7 @@ class ObjectLoader2 {
|
|
|
97
97
|
this.#logger('calculated closures: ', !(0, functions_js_1.take)(sortedClosures.values(), MAX_CLOSURES_TO_TAKE).every((x) => x[1] === EXPECTED_CLOSURE_VALUE));
|
|
98
98
|
const children = sortedClosures.map((x) => x[0]);
|
|
99
99
|
const total = children.length + 1; // +1 for the root object
|
|
100
|
-
this.#downloader.
|
|
100
|
+
this.#downloader.initialize({
|
|
101
101
|
results: new aggregateQueue_js_1.default(this.#gathered, this.#cacheWriter),
|
|
102
102
|
total
|
|
103
103
|
});
|
|
@@ -113,7 +113,7 @@ class ObjectLoader2 {
|
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
if (!this.#isRootStored) {
|
|
116
|
-
await this.#database.
|
|
116
|
+
await this.#database.putAll([rootItem]);
|
|
117
117
|
this.#isRootStored = true;
|
|
118
118
|
}
|
|
119
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2.js","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"objectLoader2.js","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2Factory.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsC,MAAM,uBAAuB,CAAA;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,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,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;
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsC,MAAM,uBAAuB,CAAA;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,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,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;IAmCjB,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS;IAOzE,MAAM,CAAC,MAAM,EAAE,YAAY,CAE1B;CACF"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ObjectLoader2Factory = void 0;
|
|
7
7
|
const functions_js_1 = require("../types/functions.js");
|
|
8
8
|
const objectLoader2_js_1 = require("./objectLoader2.js");
|
|
9
|
-
const indexedDatabase_js_1 =
|
|
9
|
+
const indexedDatabase_js_1 = require("./stages/indexedDatabase.js");
|
|
10
10
|
const memoryDatabase_js_1 = require("./stages/memory/memoryDatabase.js");
|
|
11
11
|
const memoryDownloader_js_1 = require("./stages/memory/memoryDownloader.js");
|
|
12
12
|
const serverDownloader_js_1 = __importDefault(require("./stages/serverDownloader.js"));
|
|
@@ -35,7 +35,7 @@ class ObjectLoader2Factory {
|
|
|
35
35
|
this.logger('Using DEBUG mode for ObjectLoader2Factory');
|
|
36
36
|
}
|
|
37
37
|
if ((0, functions_js_1.getFeatureFlag)(functions_js_1.ObjectLoader2Flags.USE_CACHE) === 'true') {
|
|
38
|
-
database = new indexedDatabase_js_1.
|
|
38
|
+
database = new indexedDatabase_js_1.IndexedDatabase({
|
|
39
39
|
indexedDB: params.options?.indexedDB,
|
|
40
40
|
keyRange: params.options?.keyRange
|
|
41
41
|
});
|
|
@@ -53,7 +53,8 @@ class ObjectLoader2Factory {
|
|
|
53
53
|
streamId: params.streamId,
|
|
54
54
|
objectId: params.objectId,
|
|
55
55
|
token: params.token,
|
|
56
|
-
headers: params.headers
|
|
56
|
+
headers: params.headers,
|
|
57
|
+
logger: log || (() => { })
|
|
57
58
|
}),
|
|
58
59
|
database,
|
|
59
60
|
logger: log
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAwF;AAExF,yDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ class CacheWriter {
|
|
|
35
35
|
}
|
|
36
36
|
async writeAll(items) {
|
|
37
37
|
const start = performance.now();
|
|
38
|
-
await this.#database.
|
|
38
|
+
await this.#database.putAll(items);
|
|
39
39
|
this.#logger(`writeBatch: wrote ${items.length}, time ${performance.now() - start} ms left ${this.#writeQueue?.count()}`);
|
|
40
40
|
}
|
|
41
41
|
async disposeAsync() {
|
|
@@ -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,iBAAiB,CAAkB;IACnC,YAAY,CAAsB;IAClC,OAAO,CAAc;IACrB,QAAQ,CAAc;IACtB,SAAS,GAAG,KAAK,CAAA;IAEjB,YACE,QAAkB,EAClB,MAAoB,EACpB,gBAAkC,EAClC,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,iBAAiB,GAAG,gBAAgB,CAAA;QACzC,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,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa;QAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,MAAM,IAAI,CAAC,SAAS,CAAC,
|
|
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,iBAAiB,CAAkB;IACnC,YAAY,CAAsB;IAClC,OAAO,CAAc;IACrB,QAAQ,CAAc;IACtB,SAAS,GAAG,KAAK,CAAA;IAEjB,YACE,QAAkB,EAClB,MAAoB,EACpB,gBAAkC,EAClC,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,iBAAiB,GAAG,gBAAgB,CAAA;QACzC,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,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IACzD,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,5 +1,8 @@
|
|
|
1
1
|
import { Item } from '../../types/types.js';
|
|
2
2
|
import { Database } from '../interfaces.js';
|
|
3
|
+
/**
|
|
4
|
+
* A wrapper class for IndexedDB to simplify common database operations.
|
|
5
|
+
*/
|
|
3
6
|
export interface IndexedDatabaseOptions {
|
|
4
7
|
indexedDB?: IDBFactory;
|
|
5
8
|
keyRange?: {
|
|
@@ -8,13 +11,24 @@ export interface IndexedDatabaseOptions {
|
|
|
8
11
|
upperBound: Function;
|
|
9
12
|
};
|
|
10
13
|
}
|
|
11
|
-
export
|
|
14
|
+
export declare class IndexedDatabase implements Database {
|
|
12
15
|
#private;
|
|
13
16
|
constructor(options: IndexedDatabaseOptions);
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Initializes the database connection and creates the object store if needed.
|
|
19
|
+
* This must be called before any other database operations.
|
|
20
|
+
*/
|
|
21
|
+
init(): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* Inserts or updates an array of items in a single transaction.
|
|
24
|
+
* @param data The array of items to insert.
|
|
25
|
+
*/
|
|
26
|
+
putAll(data: Item[]): Promise<void>;
|
|
27
|
+
/**
|
|
28
|
+
* Retrieves an array of items from the object store based on their IDs.
|
|
29
|
+
* @param ids The array of IDs to retrieve.
|
|
30
|
+
*/
|
|
31
|
+
getAll(ids: string[]): Promise<(Item | undefined)[]>;
|
|
32
|
+
dispose(): void;
|
|
19
33
|
}
|
|
20
34
|
//# sourceMappingURL=indexedDatabase.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indexedDatabase.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/indexedDatabase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"indexedDatabase.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/indexedDatabase.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE3C;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,QAAQ,CAAC,EAAE;QACT,KAAK,EAAE,QAAQ,CAAA;QACf,UAAU,EAAE,QAAQ,CAAA;QACpB,UAAU,EAAE,QAAQ,CAAA;KACrB,CAAA;CACF;AACD,qBAAa,eAAgB,YAAW,QAAQ;;gBAOlC,OAAO,EAAE,sBAAsB;IAI3C;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAwE3B;;;OAGG;IACG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBzC;;;OAGG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAmC1D,OAAO,IAAI,IAAI;CAKhB"}
|
|
@@ -1,31 +1,150 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
3
|
+
exports.IndexedDatabase = void 0;
|
|
4
|
+
/* eslint-disable @typescript-eslint/no-base-to-string */
|
|
5
|
+
/* eslint-disable @typescript-eslint/prefer-promise-reject-errors */
|
|
6
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
7
|
+
/* eslint-disable @typescript-eslint/no-unsafe-function-type */
|
|
8
|
+
const shared_1 = require("@speckle/shared");
|
|
4
9
|
class IndexedDatabase {
|
|
5
10
|
#options;
|
|
6
|
-
#
|
|
7
|
-
#
|
|
11
|
+
#db = undefined;
|
|
12
|
+
#dbName = 'speckle-cache';
|
|
13
|
+
#storeName = 'cache';
|
|
8
14
|
constructor(options) {
|
|
9
15
|
this.#options = options;
|
|
10
|
-
this.#cacheDB = new ItemStore_js_1.ItemStore({
|
|
11
|
-
indexedDB: this.#options.indexedDB,
|
|
12
|
-
keyRange: this.#options.keyRange
|
|
13
|
-
}, 'speckle-cache', 'cache');
|
|
14
16
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Initializes the database connection and creates the object store if needed.
|
|
19
|
+
* This must be called before any other database operations.
|
|
20
|
+
*/
|
|
21
|
+
async init() {
|
|
22
|
+
if (this.#db)
|
|
23
|
+
return;
|
|
24
|
+
await this.#safariFix();
|
|
25
|
+
return this.#openDatabase();
|
|
18
26
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
27
|
+
/**
|
|
28
|
+
* Opens the database, and if there's an error, deletes the database and tries again.
|
|
29
|
+
*/
|
|
30
|
+
async #openDatabase() {
|
|
31
|
+
const idb = this.#options.indexedDB ?? indexedDB;
|
|
32
|
+
return new Promise((resolve, reject) => {
|
|
33
|
+
const request = idb.open(this.#dbName, 1);
|
|
34
|
+
request.onerror = () => {
|
|
35
|
+
console.warn(`Failed to open database: ${this.#dbName}, deleting and trying again`);
|
|
36
|
+
// Delete the database and try again
|
|
37
|
+
const deleteRequest = idb.deleteDatabase(this.#dbName);
|
|
38
|
+
deleteRequest.onsuccess = () => {
|
|
39
|
+
// Try opening again after deletion
|
|
40
|
+
void this.#openDatabase().then(resolve).catch(reject);
|
|
41
|
+
};
|
|
42
|
+
deleteRequest.onerror = () => {
|
|
43
|
+
reject(`Failed to delete and reopen database: ${this.#dbName}`);
|
|
44
|
+
};
|
|
45
|
+
};
|
|
46
|
+
request.onupgradeneeded = (event) => {
|
|
47
|
+
const db = event.target.result;
|
|
48
|
+
if (db.objectStoreNames.contains(this.#storeName)) {
|
|
49
|
+
db.deleteObjectStore(this.#storeName);
|
|
50
|
+
}
|
|
51
|
+
db.createObjectStore(this.#storeName, { keyPath: 'baseId' });
|
|
52
|
+
};
|
|
53
|
+
request.onsuccess = (event) => {
|
|
54
|
+
this.#db = event.target.result;
|
|
55
|
+
resolve();
|
|
56
|
+
};
|
|
57
|
+
});
|
|
23
58
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
59
|
+
#getDB() {
|
|
60
|
+
if (!this.#db) {
|
|
61
|
+
throw new Error('Database not initialized. Call init() first.');
|
|
62
|
+
}
|
|
63
|
+
return this.#db;
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Fixes a Safari bug where IndexedDB requests get lost and never resolve - invoke before you use IndexedDB
|
|
67
|
+
* @link Credits and more info: https://github.com/jakearchibald/safari-14-idb-fix
|
|
68
|
+
*/
|
|
69
|
+
async #safariFix() {
|
|
70
|
+
// No point putting other browsers or older versions of Safari through this mess.
|
|
71
|
+
if (!(0, shared_1.isSafari)() || !this.#options.indexedDB?.databases)
|
|
72
|
+
return Promise.resolve();
|
|
73
|
+
let intervalId;
|
|
74
|
+
return new Promise((resolve) => {
|
|
75
|
+
const tryIdb = () => this.#options.indexedDB?.databases().finally(resolve);
|
|
76
|
+
intervalId = setInterval(() => {
|
|
77
|
+
void tryIdb();
|
|
78
|
+
}, 100);
|
|
79
|
+
void tryIdb();
|
|
80
|
+
}).finally(() => clearInterval(intervalId));
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Inserts or updates an array of items in a single transaction.
|
|
84
|
+
* @param data The array of items to insert.
|
|
85
|
+
*/
|
|
86
|
+
async putAll(data) {
|
|
87
|
+
await this.init(); // Ensure the database is initialized
|
|
88
|
+
return new Promise((resolve, reject) => {
|
|
89
|
+
try {
|
|
90
|
+
const transaction = this.#getDB().transaction(this.#storeName, 'readwrite', {
|
|
91
|
+
durability: 'relaxed'
|
|
92
|
+
});
|
|
93
|
+
const store = transaction.objectStore(this.#storeName);
|
|
94
|
+
transaction.onerror = () => {
|
|
95
|
+
reject(`Transaction error: ${transaction.error}`);
|
|
96
|
+
};
|
|
97
|
+
transaction.oncomplete = () => {
|
|
98
|
+
resolve();
|
|
99
|
+
};
|
|
100
|
+
data.forEach((item) => store.put(item));
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
reject(error);
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Retrieves an array of items from the object store based on their IDs.
|
|
109
|
+
* @param ids The array of IDs to retrieve.
|
|
110
|
+
*/
|
|
111
|
+
async getAll(ids) {
|
|
112
|
+
await this.init(); // Ensure the database is initialized
|
|
113
|
+
return new Promise((resolve, reject) => {
|
|
114
|
+
if (ids.length === 0) {
|
|
115
|
+
return resolve([]);
|
|
116
|
+
}
|
|
117
|
+
try {
|
|
118
|
+
const transaction = this.#getDB().transaction(this.#storeName, 'readonly', {
|
|
119
|
+
durability: 'relaxed'
|
|
120
|
+
});
|
|
121
|
+
const store = transaction.objectStore(this.#storeName);
|
|
122
|
+
const promises = [];
|
|
123
|
+
for (const id of ids) {
|
|
124
|
+
promises.push(new Promise((resolveGet, rejectGet) => {
|
|
125
|
+
const request = store.get(id);
|
|
126
|
+
request.onerror = () => rejectGet(`Request error for id ${id}: ${request.error}`);
|
|
127
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
128
|
+
request.onsuccess = () => resolveGet(request.result);
|
|
129
|
+
}));
|
|
130
|
+
}
|
|
131
|
+
Promise.all(promises)
|
|
132
|
+
.then((results) => {
|
|
133
|
+
resolve(results);
|
|
134
|
+
})
|
|
135
|
+
.catch(reject);
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
reject(error);
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
dispose() {
|
|
143
|
+
if (!this.#db)
|
|
144
|
+
return;
|
|
145
|
+
this.#db.close();
|
|
146
|
+
this.#db = undefined;
|
|
28
147
|
}
|
|
29
148
|
}
|
|
30
|
-
exports.
|
|
149
|
+
exports.IndexedDatabase = IndexedDatabase;
|
|
31
150
|
//# sourceMappingURL=indexedDatabase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indexedDatabase.js","sourceRoot":"","sources":["../../../../src/core/stages/indexedDatabase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"indexedDatabase.js","sourceRoot":"","sources":["../../../../src/core/stages/indexedDatabase.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,7 @@ export declare class MemoryDatabase implements Database {
|
|
|
5
5
|
private items;
|
|
6
6
|
constructor(options?: MemoryDatabaseOptions);
|
|
7
7
|
getAll(keys: string[]): Promise<(Item | undefined)[]>;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
}): Promise<void>;
|
|
11
|
-
disposeAsync(): Promise<void>;
|
|
8
|
+
putAll(batch: Item[]): Promise<void>;
|
|
9
|
+
dispose(): void;
|
|
12
10
|
}
|
|
13
11
|
//# sourceMappingURL=memoryDatabase.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryDatabase.d.ts","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,IAAI,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAExD,qBAAa,cAAe,YAAW,QAAQ;IAC7C,OAAO,CAAC,KAAK,CAAmB;gBAEpB,OAAO,CAAC,EAAE,qBAAqB;IAI3C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAarD,
|
|
1
|
+
{"version":3,"file":"memoryDatabase.d.ts","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,IAAI,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAExD,qBAAa,cAAe,YAAW,QAAQ;IAC7C,OAAO,CAAC,KAAK,CAAmB;gBAEpB,OAAO,CAAC,EAAE,qBAAqB;IAI3C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAarD,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpC,OAAO,IAAI,IAAI;CAGhB"}
|
|
@@ -19,7 +19,7 @@ class MemoryDatabase {
|
|
|
19
19
|
}
|
|
20
20
|
return Promise.resolve(found);
|
|
21
21
|
}
|
|
22
|
-
|
|
22
|
+
putAll(batch) {
|
|
23
23
|
for (const item of batch) {
|
|
24
24
|
if (!item.baseId || !item.base) {
|
|
25
25
|
throw new Error('Item must have a baseId and base');
|
|
@@ -28,8 +28,8 @@ class MemoryDatabase {
|
|
|
28
28
|
}
|
|
29
29
|
return Promise.resolve();
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
dispose() {
|
|
32
|
+
this.items.clear();
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
exports.MemoryDatabase = MemoryDatabase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryDatabase.js","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDatabase.ts"],"names":[],"mappings":";;;AAIA,MAAa,cAAc;IACjB,KAAK,CAAmB;IAEhC,YAAY,OAA+B;QACzC,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,IAAI,GAAG,EAAgB,CAAA;IACxD,CAAC;IAED,MAAM,CAAC,IAAc;QACnB,MAAM,KAAK,GAAyB,EAAE,CAAA;QACtC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChC,IAAI,IAAI,EAAE,CAAC;gBACT,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;YACzC,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACvB,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC/B,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"memoryDatabase.js","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDatabase.ts"],"names":[],"mappings":";;;AAIA,MAAa,cAAc;IACjB,KAAK,CAAmB;IAEhC,YAAY,OAA+B;QACzC,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,IAAI,GAAG,EAAgB,CAAA;IACxD,CAAC;IAED,MAAM,CAAC,IAAc;QACnB,MAAM,KAAK,GAAyB,EAAE,CAAA;QACtC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChC,IAAI,IAAI,EAAE,CAAC;gBACT,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;YACzC,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACvB,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC/B,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;YACrD,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACxC,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IAED,OAAO;QACL,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;CACF;AAjCD,wCAiCC"}
|
|
@@ -4,7 +4,7 @@ import { Downloader } from '../../interfaces.js';
|
|
|
4
4
|
export declare class MemoryDownloader implements Downloader {
|
|
5
5
|
#private;
|
|
6
6
|
constructor(rootId: string, items: Map<string, Base>);
|
|
7
|
-
|
|
7
|
+
initialize(params: {
|
|
8
8
|
results: Queue<Item>;
|
|
9
9
|
total: number;
|
|
10
10
|
maxDownloadBatchWait?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryDownloader.d.ts","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,0BAA0B,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,qBAAa,gBAAiB,YAAW,UAAU;;gBAKrC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC;IAIpD,
|
|
1
|
+
{"version":3,"file":"memoryDownloader.d.ts","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,0BAA0B,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,qBAAa,gBAAiB,YAAW,UAAU;;gBAKrC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC;IAIpD,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;IAGR,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAG7B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;CAQtB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryDownloader.js","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDownloader.ts"],"names":[],"mappings":";;;AAIA,MAAa,gBAAgB;IAC3B,MAAM,CAAmB;IACzB,OAAO,CAAQ;IACf,QAAQ,CAAc;IAEtB,YAAY,MAAc,EAAE,KAAwB;QAClD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;IACrB,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"memoryDownloader.js","sourceRoot":"","sources":["../../../../../src/core/stages/memory/memoryDownloader.ts"],"names":[],"mappings":";;;AAIA,MAAa,gBAAgB;IAC3B,MAAM,CAAmB;IACzB,OAAO,CAAQ;IACf,QAAQ,CAAc;IAEtB,YAAY,MAAc,EAAE,KAAwB;QAClD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;IACrB,CAAC;IACD,UAAU,CAAC,MAIV;QACC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAA;IAChC,CAAC;IACD,cAAc;QACZ,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC1C,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9D,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAA;IAC7D,CAAC;IACD,YAAY;QACV,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IACD,GAAG,CAAC,EAAU;QACZ,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAChC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACxC,OAAM;QACR,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CACF;AAlCD,4CAkCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Queue from '../../queues/queue.js';
|
|
2
|
-
import { Fetcher } from '../../types/functions.js';
|
|
2
|
+
import { CustomLogger, Fetcher } from '../../types/functions.js';
|
|
3
3
|
import { Item } from '../../types/types.js';
|
|
4
4
|
import { Downloader } from '../interfaces.js';
|
|
5
5
|
export interface ServerDownloaderOptions {
|
|
@@ -8,12 +8,13 @@ export interface ServerDownloaderOptions {
|
|
|
8
8
|
objectId: string;
|
|
9
9
|
token?: string;
|
|
10
10
|
headers?: Headers;
|
|
11
|
+
logger: CustomLogger;
|
|
11
12
|
fetch?: Fetcher;
|
|
12
13
|
}
|
|
13
14
|
export default class ServerDownloader implements Downloader {
|
|
14
15
|
#private;
|
|
15
16
|
constructor(options: ServerDownloaderOptions);
|
|
16
|
-
|
|
17
|
+
initialize(params: {
|
|
17
18
|
results: Queue<Item>;
|
|
18
19
|
total: number;
|
|
19
20
|
maxDownloadBatchWait?: number;
|
|
@@ -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,OAAO,EAAyB,MAAM,0BAA0B,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,MAAM,sBAAsB,CAAA;AAC3C,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;CAChB;AAID,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,UAAU;;gBAiB7C,OAAO,EAAE,uBAAuB;IA4B5C,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;IA8HX,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BtC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const batchingQueue_js_1 = __importDefault(require("../../queues/batchingQueue.js"));
|
|
7
7
|
const errors_js_1 = require("../../types/errors.js");
|
|
8
8
|
const functions_js_1 = require("../../types/functions.js");
|
|
9
9
|
const MAX_SAFARI_DECODE_BYTES = 2 * 1024 * 1024 * 1024 - 1024 * 1024; // 2GB minus a margin
|
|
@@ -15,6 +15,7 @@ class ServerDownloader {
|
|
|
15
15
|
#fetch;
|
|
16
16
|
#results;
|
|
17
17
|
#total;
|
|
18
|
+
#logger;
|
|
18
19
|
#downloadQueue;
|
|
19
20
|
#decoder = new TextDecoder('utf-8', { fatal: true });
|
|
20
21
|
#decodedBytesCount = 0;
|
|
@@ -22,6 +23,7 @@ class ServerDownloader {
|
|
|
22
23
|
#rawEncoding;
|
|
23
24
|
constructor(options) {
|
|
24
25
|
this.#options = options;
|
|
26
|
+
this.#logger = options.logger;
|
|
25
27
|
this.#fetch =
|
|
26
28
|
options.fetch ?? ((...args) => globalThis.fetch(...args));
|
|
27
29
|
this.#headers = {};
|
|
@@ -39,19 +41,13 @@ class ServerDownloader {
|
|
|
39
41
|
const encoder = new TextEncoder();
|
|
40
42
|
this.#rawEncoding = encoder.encode(this.#rawString);
|
|
41
43
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
return [total];
|
|
45
|
-
}
|
|
46
|
-
return [10000, 25000, 10000, 1000];
|
|
47
|
-
}
|
|
48
|
-
initializePool(params) {
|
|
49
|
-
const { results, total } = params;
|
|
44
|
+
initialize(params) {
|
|
45
|
+
const { results, total, maxDownloadBatchWait } = params;
|
|
50
46
|
this.#results = results;
|
|
51
47
|
this.#total = total;
|
|
52
|
-
this.#downloadQueue = new
|
|
53
|
-
|
|
54
|
-
maxWaitTime:
|
|
48
|
+
this.#downloadQueue = new batchingQueue_js_1.default({
|
|
49
|
+
batchSize: 15000, // 15k is a good number for most cases
|
|
50
|
+
maxWaitTime: maxDownloadBatchWait ?? 1000, // 1 second
|
|
55
51
|
processFunction: (batch) => this.downloadBatch({
|
|
56
52
|
batch,
|
|
57
53
|
url: this.#requestUrlChildren,
|
|
@@ -59,14 +55,8 @@ class ServerDownloader {
|
|
|
59
55
|
})
|
|
60
56
|
});
|
|
61
57
|
}
|
|
62
|
-
#getPool() {
|
|
63
|
-
if (this.#downloadQueue) {
|
|
64
|
-
return this.#downloadQueue;
|
|
65
|
-
}
|
|
66
|
-
throw new Error('Download pool is not initialized');
|
|
67
|
-
}
|
|
68
58
|
add(id) {
|
|
69
|
-
this.#
|
|
59
|
+
this.#downloadQueue?.add(id, id);
|
|
70
60
|
}
|
|
71
61
|
/*
|
|
72
62
|
This is the most frequently reported and confirmed reason for this error in Safari. There's a known bug in WebKit (Safari's rendering engine) where TextDecoder can fail or throw a RangeError after decoding around 2GB of data. Chrome and other browsers handle much larger amounts of data without this specific limitation.
|
|
@@ -90,6 +80,8 @@ class ServerDownloader {
|
|
|
90
80
|
}
|
|
91
81
|
async downloadBatch(params) {
|
|
92
82
|
const { batch, url, headers } = params;
|
|
83
|
+
const start = performance.now();
|
|
84
|
+
this.#logger(`Downloading batch of ${batch.length} items...`);
|
|
93
85
|
const keys = new Set(batch);
|
|
94
86
|
const response = await this.#fetch(url, {
|
|
95
87
|
method: 'POST',
|
|
@@ -121,6 +113,7 @@ class ServerDownloader {
|
|
|
121
113
|
if (count >= this.#total) {
|
|
122
114
|
await this.#results?.disposeAsync(); // mark the queue as done
|
|
123
115
|
}
|
|
116
|
+
this.#logger(`Downloaded batch of ${batch.length} items in ${performance.now() - start}ms`);
|
|
124
117
|
}
|
|
125
118
|
async #processArray(leftover, value, keys, callback) {
|
|
126
119
|
//this concat will allocate a new array
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverDownloader.js","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"serverDownloader.js","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"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"}
|