3dtours/SonicForgeStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: locateFile cho FluidSynth WASM module (dùng self-host/CDN)

Browse Source 
Module script (type=module) có document.currentScript === null,
nên libfluidsynth không thể tự locate .wasm file. Fix: pass
locateFile() trả về URL .wasm tương ứng với URL .js đã load.

fluidsynthLoader.js: expose __FluidSynthLocateWasm() trả về
FLUIDSYNTH_JS_URL.replace('.js', '.wasm'). Dùng polling
setInterval thay vì resolve callback cho đáng tin cậy hơn.
soundfontPlayer.js: pass locateFile factory khi gọi factory.
This commit is contained in:
3dtours
2026-07-27 14:48:58 +07:00
parent ef1238b87d
commit e801023beb
2 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/static/js/services/fluidsynthLoader.js
+23 -9
View File
@@ -1,23 +1,37 @@
window.__FluidSynthReady = new Promise(function (resolve) { (function () {
var FLUIDSYNTH_SRC; if (window.__FluidSynthReady) return;
var FLUIDSYNTH_JS_URL;
var FLUIDSYNTH_WASM_URL;
if (window.__FLUIDSYNTH_CDN) { if (window.__FLUIDSYNTH_CDN) {
FLUIDSYNTH_SRC = window.__FLUIDSYNTH_CDN; FLUIDSYNTH_JS_URL = window.__FLUIDSYNTH_CDN;
} else if (window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1') { } else if (window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1') {
FLUIDSYNTH_SRC = 'https://cdn.jsdelivr.net/npm/@enikey87/fluidsynth-emscripten@0.1.1/dist/libfluidsynth-2.3.0-sf3.js'; FLUIDSYNTH_JS_URL = 'https://cdn.jsdelivr.net/npm/@enikey87/fluidsynth-emscripten@0.1.1/dist/libfluidsynth-2.3.0-sf3.js';
} else { } else {
FLUIDSYNTH_SRC = '/static/js/vendor/libfluidsynth-2.3.0-sf3.js'; FLUIDSYNTH_JS_URL = '/static/js/vendor/libfluidsynth-2.3.0-sf3.js';
} }
FLUIDSYNTH_WASM_URL = FLUIDSYNTH_JS_URL.replace(/\.js$/, '.wasm');
window.__FluidSynthLocateWasm = function () { return FLUIDSYNTH_WASM_URL; };
window.__FluidSynthReady = new Promise(function (resolve) {
var script = document.createElement('script'); var script = document.createElement('script');
script.type = 'module'; script.type = 'module';
script.textContent = [ script.textContent = [
'import FluidsynthModule from "' + FLUIDSYNTH_SRC + '";', 'import FluidsynthModule from "' + FLUIDSYNTH_JS_URL + '";',
'window.__FluidSynthModuleFactory = FluidsynthModule;', 'window.__FluidSynthModuleFactory = FluidsynthModule;',
'window.__FluidSynthReadyResolver = function() { window.__FluidSynthReadyResolve(); };', 'console.log("[FluidSynth] Loaded:", "' + FLUIDSYNTH_JS_URL + '");'
'console.log("[FluidSynth] Loaded from:", "' + FLUIDSYNTH_SRC + '");'
].join('\n'); ].join('\n');
document.head.appendChild(script); document.head.appendChild(script);
window.__FluidSynthReadyResolve = resolve; var check = setInterval(function () {
if (window.__FluidSynthModuleFactory) {
clearInterval(check);
resolve();
}
}, 50);
setTimeout(function () { clearInterval(check); resolve(); }, 15000);
}); });
})();
app/static/js/services/soundfontPlayer.js
+8 -1
View File
@@ -73,7 +73,14 @@
} }
console.log("[SonicSF] Initializing FluidSynth WASM Engine..."); console.log("[SonicSF] Initializing FluidSynth WASM Engine...");
_fluidModule = await window.__FluidSynthModuleFactory(); _fluidModule = await window.__FluidSynthModuleFactory({
locateFile: function (path) {
if (path.endsWith('.wasm')) {
return window.__FluidSynthLocateWasm ? window.__FluidSynthLocateWasm() : path;
}
return path;
}
});
if (!_fluidModule || !_fluidModule._new_fluid_settings) { if (!_fluidModule || !_fluidModule._new_fluid_settings) {
throw new Error("FluidSynth WASM module loaded but API missing"); throw new Error("FluidSynth WASM module loaded but API missing");