Skip to content

fix: resolve race condition in concurrent initAsset calls #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MinCrohn merged 1 commit into from
Oct 28, 2025
Merged

fix: resolve race condition in concurrent initAsset calls #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 32 additions & 19 deletions src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,42 @@ export const initAsset = async (opts = {}) => {
mergeBy: ['name', 'alias'],
});

const bundlesToLoad = [];
const assetsToLoad = [];
for (const asset of assets) {
if (asset.name && Array.isArray(asset.items)) {
if (!PIXI.Assets.resolver.hasBundle(asset.name)) {
PIXI.Assets.addBundle(asset.name, asset.items);
bundlesToLoad.push(asset.name);
const bundlesToAdd = new Map();
const assetsToAdd = new Map();
const requiredBundles = new Set();
const requiredAssets = new Set();

for (const assetDef of assets) {
if (assetDef.name && Array.isArray(assetDef.items)) {
requiredBundles.add(assetDef.name);
if (
!PIXI.Assets.resolver.hasBundle(assetDef.name) &&
!bundlesToAdd.has(assetDef.name)
) {
bundlesToAdd.set(assetDef.name, assetDef.items);
}
} else if (asset.alias && asset.src) {
if (!PIXI.Assets.cache.has(asset.alias)) {
PIXI.Assets.add(asset);
assetsToLoad.push(asset.alias);
} else if (assetDef.alias && assetDef.src) {
requiredAssets.add(assetDef.alias);
if (
!PIXI.Assets.resolver.hasKey(assetDef.alias) &&
!assetsToAdd.has(assetDef.alias)
) {
assetsToAdd.set(assetDef.alias, assetDef);
}
}
}
await Promise.all([
bundlesToLoad.length > 0
? PIXI.Assets.loadBundle(bundlesToLoad)
: Promise.resolve(),
assetsToLoad.length > 0
? PIXI.Assets.load(assetsToLoad)
: Promise.resolve(),
]);
bundlesToAdd.forEach((items, name) => PIXI.Assets.addBundle(name, items));
assetsToAdd.forEach((assetDef) => PIXI.Assets.add(assetDef));

const bundleLoadPromise =
requiredBundles.size > 0
? PIXI.Assets.loadBundle([...requiredBundles])
: Promise.resolve();
const assetLoadPromise =
requiredAssets.size > 0
? PIXI.Assets.load([...requiredAssets])
: Promise.resolve();
await Promise.all([bundleLoadPromise, assetLoadPromise]);
};

export const initResizeObserver = (el, app, viewport) => {
Expand Down