github-mirror/project-nomad
1
0
Fork 0
mirror of https://github.com/Crosstalk-Solutions/project-nomad.git synced 2026-10-17 05:14:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge d28c2c9c0c into 54ee30a449

Browse Source
This commit is contained in:
Matt Moyles 2026-10-15 13:10:08 -04:00 committed by GitHub
commit ee623f93fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
admin/app/services/map_service.ts
View File

@ -79,7 +79,11 @@ export class MapService implements IMapService {
private readonly baseDirPath = join(process.cwd(), this.mapStoragePath)
private baseAssetsExistCache: boolean | null = null
private worldBasemapReady = false
private worldBasemapInFlight: Promise<void> | null = null
// Process-wide rather than per instance: controllers get a fresh MapService per request,
// so easy setup's parallel collection downloads, or a /maps visit landing at the same
// moment, would otherwise each download the tarball and extract the basemap.
private static baseAssetFilesInFlight: Promise<boolean> | null = null
private static worldBasemapInFlight: Promise<void> | null = null
async listRegions() {
const files = (await this.listAllMapStorageItems()).filter(
@ -147,6 +151,14 @@ export class MapService implements IMapService {
if (toDownload.length === 0) return null
// Collections are downloaded while online (often from easy setup, before anyone opens
// /maps), so provision the base assets and world basemap now too. Otherwise a box that
// goes offline next shows a grey map outside the downloaded regions (#1030). Not
// awaited: a failure leaves the lazy path on /maps and the Download Base Map action.
this.ensureBaseAssets().catch((err) => {
logger.warn(`[MapService] Base map provisioning for collection ${slug} failed: ${err}`)
})
const downloadFilenames: string[] = []
for (const resource of toDownload) {
@ -440,18 +452,30 @@ export class MapService implements IMapService {
*/
private async ensureWorldBasemap(): Promise<void> {
if (this.worldBasemapReady) return
if (this.worldBasemapInFlight) return this.worldBasemapInFlight
this.worldBasemapInFlight = this._setupWorldBasemap().finally(() => {
this.worldBasemapInFlight = null
})
return this.worldBasemapInFlight
if (!MapService.worldBasemapInFlight) {
MapService.worldBasemapInFlight = this._setupWorldBasemap().finally(() => {
MapService.worldBasemapInFlight = null
})
}
// _setupWorldBasemap() throws on failure, so reaching here means the file is in place,
// including when another instance ran the extract.
await MapService.worldBasemapInFlight
this.worldBasemapReady = true
}
/** Download the style/sprite/font base assets if missing. Does not touch the world basemap. */
private async ensureBaseAssetFiles(): Promise<boolean> {
const exists = await this.checkBaseAssetsExist()
if (exists) return true
return this.downloadBaseAssets()
if (!MapService.baseAssetFilesInFlight) {
MapService.baseAssetFilesInFlight = this.downloadBaseAssets().finally(() => {
MapService.baseAssetFilesInFlight = null
})
}
const downloaded = await MapService.baseAssetFilesInFlight
// This instance cached `false` above; downloadBaseAssets() only updates its own instance.
if (downloaded) this.baseAssetsExistCache = true
return downloaded
}
private async _setupWorldBasemap(): Promise<void> {