Files
speckle-server/packages/objectloader2/src/operations/traverser.ts
T
Alexandru Popovici a385823b2d feat(viewer): objectloader2 integration (#4267)
* feat(viewer-sandbox): Made a sandbox function that will only invoke the object-loader loading objects

* first pass of creating an objectloader2

* updated build + added vitest

* try to get viewer sandbox to use new code

* sandbox type fix

* refactor a bit

* can download root

* intermediate commit for downloader/caching queue

* can download stuff!

* refactor files

* intro isBase and fix isString

* move single download to downloader

* fix download

* PR feedback

* some intermediate commit

* do clean up and download better

* clean up promises and linting

* can generate values while downloading and caching

* add a finish method

* remove unused functions

* remove asBase

* add temporary docs

* add more docs with mermaid

* add more test models

* add response validation

* add tests and redo options

* add test for download batch

* fix downloader tests and change Item to have clearer Base items

* add tests and refactor a little

* use fetch in downloader as an option

* use optional in-memory indexdb instead of monkey patching the global one

* more refactors for options for objectloader2

* add tests for objectloader2

* adjust single download

* benchmark loading and adjust ol2 batches

* download more!

* adjust to use hash privates

* refactored again with renaming

* cleanup

* make setupCacheDb throw instead

* use BatchedPool for downloads!

* fix tests

* adjust timings and add adaptive waiting

* Only wait if queue wasn't empty and queue size was full

* fix tests

* fix file names and some private usage

* fix interval and private usage

* rename vars

* use params for methods

* fix params for constructors and tests

* fix params for constructors and tests again

* using dexie

* faster settings but doesn't end well

* fixed end, optimized and removed logs

* fix tests

* fix types?

* update lock with WSL

* add e2e small model test

* fix/update yarn.lock

* Remove unused eslint ignore to fix pre-commit

* prettier fixes

* fix real DB usage

* rename methods to better match OL1

* rename methods to better match OL1 again

* add extra header collection

* add headers correctly

* test getTotalObjectCount

* feat(viewer-lib): Replaced old object loader with Adam's  objectloder2

* fix(viewer-lib): Removed the old object loader. Removed unneeded pause time in speckle loader

* Testing

* only deferred if not downloaded....don't save everything

* Lockfile

* pool isn't adjustable, adjust download buckets, dexie read is faster

* chore

* fix(viewer-lib): Fixed compiler errors

* fix getObject access with real indexeddb...adjust buffer for deferred access

* Fix disposal and pausing

* don't index item!

* fix dockerfiles to use OL2

* fix Dockerfile

* Fix dockerfile

* defer correctly and use record to add/lookup/remove to

* delete stuff correctly

* chore(sandbox): Enabled viewer loading

* use objects instead of arrays to avoid findIndex

* remove extra count

* add a found cache to avoid some db hits

* order matters for deferment

* move found map to deferment

* change option numbers

* 2 level cache with expiry

* defer everything, use loader to track what is requested....expire only found items

* add deferment disposal

* oops mismerge

* chore(sandbox): Default stream

* Beta version of CachePump and CacheReader

* Clean up initialization

* More clean up

* chore(objectloader2): Fixed CI compiler error

* chore(objectloader2): Fixed prettier

* add cachePump tests

* add cacheReader tests

* fixed more tests

* fixed final tests

* moving stuff around and lock return value

* try to move stuff out of objectloader2

* use a factory

* rename factory

* formatting

* eslist fixes

* try allocating no strings

* add comments

* small refactor and add another test

* fix deferment expiration and have test

* use byte size for max memory cache size

* fix deferment manager tests

* saved comment

* fix(viewer-sandbox): Fixed compiler error

* ignore tshy

* chore(frontend): Attempt to make viewer loading sequential

---------

Co-authored-by: Adam Hathcock <adam@hathcock.uk>
Co-authored-by: Kristaps Fabians Geikins <fabis94@live.com>
Co-authored-by: Iain Sproat <68657+iainsproat@users.noreply.github.com>
2025-05-21 10:05:50 +03:00

113 lines
3.2 KiB
TypeScript

import { Base, DataChunk, isBase, isReference, isScalar } from '../types/types.js'
import { ObjectLoader2 } from './objectLoader2.js'
export type ProgressStage = 'download' | 'construction'
export type OnProgress = (e: {
stage: ProgressStage
current: number
total: number
}) => void
export interface TraverserOptions {
excludeProps?: string[]
}
export default class Traverser {
#loader: ObjectLoader2
#options: TraverserOptions
#totalChildrenCount = 0
#traversedReferencesCount = 0
constructor(loader: ObjectLoader2, options?: TraverserOptions) {
this.#options = options || {}
this.#loader = loader
}
async traverse(onProgress?: OnProgress): Promise<Base> {
let firstObjectPromise: Promise<Base> | undefined = undefined
for await (const obj of this.#loader.getObjectIterator()) {
if (!firstObjectPromise) {
firstObjectPromise = this.traverseBase(obj, onProgress)
}
}
if (firstObjectPromise) {
return await firstObjectPromise
} else {
throw new Error('No objects found')
}
}
async traverseArray(array: Array<unknown>, onProgress?: OnProgress): Promise<void> {
for (let i = 0; i < 10; i++) {
const prop = array[i]
if (isScalar(prop)) continue
if (isBase(prop)) {
array[i] = await this.traverseBase(prop, onProgress)
} else if (isReference(prop)) {
array[i] = await this.traverseBase(
await this.#loader.getObject({ id: prop.referencedId }),
onProgress
)
}
}
}
async traverseBase(base: Base, onProgress?: OnProgress): Promise<Base> {
for (const ignoredProp of this.#options.excludeProps || []) {
delete (base as never)[ignoredProp]
}
if (base.__closure) {
const ids = Object.keys(base.__closure)
const promises: Promise<Base>[] = []
for (const id of ids) {
promises.push(
this.traverseBase(await this.#loader.getObject({ id }), onProgress)
)
}
await Promise.all(promises)
}
delete (base as never)['__closure']
// De-chunk
if (base.speckle_type?.includes('DataChunk')) {
const chunk = base as DataChunk
if (chunk.data) {
await this.traverseArray(chunk.data, onProgress)
}
}
//other props
for (const prop in base) {
if (prop === '__closure') continue
if (prop === 'referenceId') continue
if (prop === 'speckle_type') continue
if (prop === 'data') continue
const baseProp = (base as unknown as Record<string, unknown>)[prop]
if (isScalar(baseProp)) continue
if (isBase(baseProp)) {
await this.traverseBase(baseProp, onProgress)
} else if (isReference(baseProp)) {
await this.traverseBase(
await this.#loader.getObject({ id: baseProp.referencedId }),
onProgress
)
} else if (Array.isArray(baseProp)) {
await this.traverseArray(baseProp, onProgress)
}
}
if (onProgress) {
onProgress({
stage: 'construction',
current:
++this.#traversedReferencesCount > this.#totalChildrenCount
? this.#totalChildrenCount
: this.#traversedReferencesCount,
total: this.#totalChildrenCount
})
}
return base
}
}