diff --git a/app/static/js/app.jsx b/app/static/js/app.jsx index 828b6ff..7999588 100644 --- a/app/static/js/app.jsx +++ b/app/static/js/app.jsx @@ -280,7 +280,8 @@ const _dbgWorkletState = () => { try { if (window.BridgeAudioNode && window.BridgeAudioNode.getDiag) { const _d = window.BridgeAudioNode.getDiag(); - return 'wl=' + (_d.useWorklet ? 'y' : 'n') + ' pre=' + _d.preBufferLen + ' ch=' + _d.chunksLen; + const _ws = _d.ws ? (' ov=' + _d.ws.overruns + ' un=' + _d.ws.underruns + ' ring=' + _d.ws.ring) : ''; + return 'wl=' + (_d.useWorklet ? 'y' : 'n') + ' pre=' + _d.preBufferLen + ' ch=' + _d.chunksLen + _ws; } } catch (e) {} return 'wl=n/a'; @@ -11118,7 +11119,7 @@ const PianoRollTabEditor = ({ st, zoom, bpm, viewportWidth, activeTracks, onClos const _pdTab = activeTabRef.current; const _pdSub = subTabsRef.current ? (subTabsRef.current.find(s => s.id === _pdTab) || {}).type : null; const _kbArmedTab = !!(subTabsRef.current || []).some(function (s) { return s.type === 'PIANO_ROLL' && s.isArmed && s.trackId === st.trackId; }); - _dbgLog('preview_diag', 'src=keybed trk=' + st.trackId + ' kbTrk=' + (kbTrk ? kbTrk.id : 'UNDEF') + ' kbArmedTab=' + (_kbArmedTab ? 1 : 0) + ' armedTrk=' + (kbTrk && kbTrk.isArmed ? 1 : 0) + ' sl=' + (_kbSilent ? 1 : 0) + ' tab=' + _pdTab + ' sub=' + (_pdSub || 'none') + ' play=' + (isPlayingRef.current ? 1 : 0) + ' br=' + (window.SonicMidiRouter && window.SonicMidiRouter.isBridgeActive() ? 1 : 0) + ' fxRt=' + (fxRt.active ? 1 : 0) + ' dest=' + _pdDest + ' bd=' + (_pdD ? ('i=' + _pdD.initialized + ' wl=' + _pdD.useWorklet + ' nd=' + _pdD.hasWorkletNode + ' pre=' + _pdD.preBufferLen + ' ch=' + _pdD.chunksLen + ' g=' + _pdD.gain) : 'MISSING') + ' mb=' + (!!masterBus)); + _dbgLog('preview_diag', 'src=keybed trk=' + st.trackId + ' kbTrk=' + (kbTrk ? kbTrk.id : 'UNDEF') + ' kbArmedTab=' + (_kbArmedTab ? 1 : 0) + ' armedTrk=' + (kbTrk && kbTrk.isArmed ? 1 : 0) + ' sl=' + (_kbSilent ? 1 : 0) + ' tab=' + _pdTab + ' sub=' + (_pdSub || 'none') + ' play=' + (isPlayingRef.current ? 1 : 0) + ' br=' + (window.SonicMidiRouter && window.SonicMidiRouter.isBridgeActive() ? 1 : 0) + ' fxRt=' + (fxRt.active ? 1 : 0) + ' dest=' + _pdDest + ' bd=' + (_pdD ? ('i=' + _pdD.initialized + ' wl=' + _pdD.useWorklet + ' nd=' + _pdD.hasWorkletNode + ' pre=' + _pdD.preBufferLen + ' ch=' + _pdD.chunksLen + ' g=' + _pdD.gain + ' ws=' + (_pdD.ws ? (_pdD.ws.overruns + '/' + _pdD.ws.underruns) : '-')) : 'MISSING') + ' mb=' + (!!masterBus)); } catch (e) {} // V45.19 Bug 2: _kbSilent -> bo qua phat (MAIN/SECTION + ARM off = cam). if (!_kbSilent) { @@ -18666,9 +18667,9 @@ const App = () => { var bPrArmed = {}; if (_isPrTabNow) { try { - // V45.25: chi sub-tab PR dang active; khong gom ARM sub-tab khac. + // V45.27: chi sub-tab PR dang active VA co ARM (isArmed); khong gom ARM sub-tab khac / MAIN. var _actPrSub = (subTabsRef.current || []).find(function (s) { return s.id === activeTabRef.current; }); - if (_actPrSub && _actPrSub.type === 'PIANO_ROLL' && _actPrSub.trackId) bPrArmed[_actPrSub.trackId] = true; + if (_actPrSub && _actPrSub.type === 'PIANO_ROLL' && _actPrSub.isArmed && _actPrSub.trackId) bPrArmed[_actPrSub.trackId] = true; } catch (e) {} } bTracks.forEach(function (bt) { @@ -18687,10 +18688,10 @@ const App = () => { } else if (window.SonicSF) { var allTracks = activeTracksRef.current || []; var arSubs = []; - // V45.25: chi sub-tab PR dang active; khong gom ARM sub-tab khac. + // V45.27: chi sub-tab PR dang active VA co ARM (isArmed); khong gom ARM sub-tab khac / MAIN. if (_isPrTabNow && subTabsRef && subTabsRef.current) { var _actPrSub = subTabsRef.current.find(function(s) { return s.id === activeTabRef.current; }); - if (_actPrSub && _actPrSub.type === 'PIANO_ROLL' && _actPrSub.trackId) arSubs.push(_actPrSub); + if (_actPrSub && _actPrSub.type === 'PIANO_ROLL' && _actPrSub.isArmed && _actPrSub.trackId) arSubs.push(_actPrSub); } var armedTracks = _isPrTabNow ? [] : allTracks.filter(function(t) { return t.isArmed; }); // Piano Roll arming has priority: route to each armed sub-tab's parent track @@ -23925,11 +23926,11 @@ const App = () => { const _prTabNow = (subTabsRef.current || []).find(function (s) { return s.id === activeTabRef.current; }); const _isPrTabNow = !!(_prTabNow && _prTabNow.type === 'PIANO_ROLL'); const prArmedIds = {}; - // V45.25: PR tab preview chi track dang edit (sub-tab active) - bat ke ARM. + // V45.27: PR tab preview chi track dang edit (sub-tab active) VA chi khi sub-tab do ARM (isArmed). // ARM tu sub-tab PR khac / track MAIN KHONG leak sang PR tab nay. try { if (_isPrTabNow) { - if (_prTabNow.trackId) prArmedIds[_prTabNow.trackId] = true; + if (_prTabNow.isArmed && _prTabNow.trackId) prArmedIds[_prTabNow.trackId] = true; } } catch (e) {} const armed = allTracks.filter(function (t) { return t.isArmed; }); @@ -23948,7 +23949,7 @@ const App = () => { const _pdD = window.BridgeAudioNode ? window.BridgeAudioNode.getDiag() : null; const _pdTab = activeTabRef.current; const _pdSub = subTabsRef.current ? (subTabsRef.current.find(s => s.id === _pdTab) || {}).type : null; - _dbgLog('preview_diag', 'armed=' + armed.length + ' trg=' + targets.length + ' prTab=' + (_isPrTabNow ? 1 : 0) + ' tab=' + _pdTab + ' sub=' + (_pdSub || 'none') + ' play=' + (isPlayingRef.current ? 1 : 0) + ' br=' + (window.SonicMidiRouter && window.SonicMidiRouter.isBridgeActive() ? 1 : 0) + ' fxRt=' + (fxRt.active ? 1 : 0) + ' dest=' + _pdDest + ' bd=' + (_pdD ? ('i=' + _pdD.initialized + ' wl=' + _pdD.useWorklet + ' nd=' + _pdD.hasWorkletNode + ' pre=' + _pdD.preBufferLen + ' ch=' + _pdD.chunksLen + ' g=' + _pdD.gain) : 'MISSING') + ' mb=' + (!!masterBus)); + _dbgLog('preview_diag', 'armed=' + armed.length + ' trg=' + targets.length + ' prTab=' + (_isPrTabNow ? 1 : 0) + ' tab=' + _pdTab + ' sub=' + (_pdSub || 'none') + ' play=' + (isPlayingRef.current ? 1 : 0) + ' br=' + (window.SonicMidiRouter && window.SonicMidiRouter.isBridgeActive() ? 1 : 0) + ' fxRt=' + (fxRt.active ? 1 : 0) + ' dest=' + _pdDest + ' bd=' + (_pdD ? ('i=' + _pdD.initialized + ' wl=' + _pdD.useWorklet + ' nd=' + _pdD.hasWorkletNode + ' pre=' + _pdD.preBufferLen + ' ch=' + _pdD.chunksLen + ' g=' + _pdD.gain + ' ws=' + (_pdD.ws ? (_pdD.ws.overruns + '/' + _pdD.ws.underruns) : '-')) : 'MISSING') + ' mb=' + (!!masterBus)); } catch (e) {} // DIAG Bug 3/4: arm bo dem audio frames (500ms sau note-on) de biet // engine co gui audio ve JS khong (tach engine vs JS routing). diff --git a/app/static/js/app.precompiled.js b/app/static/js/app.precompiled.js index 7945843..d7f6bd5 100644 --- a/app/static/js/app.precompiled.js +++ b/app/static/js/app.precompiled.js @@ -63,7 +63,7 @@ let _cc11Epoch=0;// V17: fade session dang treo (gain ramp FADE_MS) — restore let _pendingFadeSession=null;const restorePendingFadeSession=()=>{if(!_pendingFadeSession)return;let _bgBefore=-1;try{if(_pendingFadeSession.bridgeGainNode)_bgBefore=_pendingFadeSession.bridgeGainNode.gain.value;}catch(e){}try{const t=getAudioContext().currentTime;_pendingFadeSession.fadedGains.forEach(g=>{try{g.node.gain.cancelScheduledValues(t);g.node.gain.setValueAtTime(g.prev,t);}catch(e){}});if(_pendingFadeSession.bridgeGainNode){try{_pendingFadeSession.bridgeGainNode.gain.cancelScheduledValues(t);_pendingFadeSession.bridgeGainNode.gain.setValueAtTime(1.0,t);}catch(e){}}}catch(e){}_dbgLog('restore','gains='+_pendingFadeSession.fadedGains.length+' bg='+_bgBefore.toFixed(4)+'->1.0');_pendingFadeSession=null;};// V28: timing diagnostics -> %APPDATA%/SonicForgeDAW/logs/dbg.log (Rust dbg_log). // Fire-and-forget invoke — khong chan main thread; tag+extra ghi kem unix_ms. const _dbgLog=(tag,extra)=>{try{if(window.__TAURI__&&window.__TAURI__.core&&window.__TAURI__.core.invoke){window.__TAURI__.core.invoke('dbg_log',{tag:tag,extra:extra===undefined?'':String(extra)}).catch(function(){});}}catch(e){}};// V29: expose dbg hook cho BridgeAudioNode (worklet state) + helpers. -window.__dbgLog=_dbgLog;if(window.PerformanceObserver){try{new PerformanceObserver(list=>{for(const e of list.getEntries())_dbgLog('longtask','d='+Math.round(e.duration)+' s='+Math.round(e.startTime));}).observe({entryTypes:['longtask']});}catch(e){}}const _dbgBridgeGain=()=>{try{if(window.BridgeAudioNode&&window.BridgeAudioNode.getOutputNode){const _g=window.BridgeAudioNode.getOutputNode();if(_g&&_g.gain)return'bg='+_g.gain.value.toFixed(4);return'bg=none';}}catch(e){}return'bg=n/a';};const _dbgWorkletState=()=>{try{if(window.BridgeAudioNode&&window.BridgeAudioNode.getDiag){const _d=window.BridgeAudioNode.getDiag();return'wl='+(_d.useWorklet?'y':'n')+' pre='+_d.preBufferLen+' ch='+_d.chunksLen;}}catch(e){}return'wl=n/a';};window.__dbgBridgeGain=_dbgBridgeGain;window.__dbgWorkletState=_dbgWorkletState;// V28: ding fix — midi bat ky (keyboard/pad/timeline) restore bridge gain sau +window.__dbgLog=_dbgLog;if(window.PerformanceObserver){try{new PerformanceObserver(list=>{for(const e of list.getEntries())_dbgLog('longtask','d='+Math.round(e.duration)+' s='+Math.round(e.startTime));}).observe({entryTypes:['longtask']});}catch(e){}}const _dbgBridgeGain=()=>{try{if(window.BridgeAudioNode&&window.BridgeAudioNode.getOutputNode){const _g=window.BridgeAudioNode.getOutputNode();if(_g&&_g.gain)return'bg='+_g.gain.value.toFixed(4);return'bg=none';}}catch(e){}return'bg=n/a';};const _dbgWorkletState=()=>{try{if(window.BridgeAudioNode&&window.BridgeAudioNode.getDiag){const _d=window.BridgeAudioNode.getDiag();const _ws=_d.ws?' ov='+_d.ws.overruns+' un='+_d.ws.underruns+' ring='+_d.ws.ring:'';return'wl='+(_d.useWorklet?'y':'n')+' pre='+_d.preBufferLen+' ch='+_d.chunksLen+_ws;}}catch(e){}return'wl=n/a';};window.__dbgBridgeGain=_dbgBridgeGain;window.__dbgWorkletState=_dbgWorkletState;// V28: ding fix — midi bat ky (keyboard/pad/timeline) restore bridge gain sau // stop (gain giu ~0.0001 — V27 restore 800ms khong du cho VSTi release tail dai). window.__restorePendingFadeSession=restorePendingFadeSession;// V31: live note (ARM keyboard) — xoa backlog outQueue master FX truoc khi // note preview render (idle block ~341ms lam ARM lag ~0.3s). @@ -344,7 +344,7 @@ else if(fxRt.chainKey!==ck){fxRtSetChain(chain);fxRt.chainKey=ck;return;}else re // node → bypass vô hiệu. Mỗi fxRtStop() bump startToken → mọi checkpoint // dưới đây thấy mismatch → hủy session vừa tạo, không nối node. const token=++fxRt.startToken;fxRt.starting=true;const ctx=getAudioContext();if(!ctx||!ctx.audioWorklet||!masterBus||!masterBus.output||!masterBus.analyser||!masterBus.masterFxGain||!masterBus.masterFxDryGain)return;const chainPayload=chain.map(s=>s.type==='vst3'?{type:'vst3',path:s.path,name:s.name||s.path,preset_b64:s.preset_b64||'',bypass:!!s.bypass||!!(window.currentMasteringSettings||{}).vstBypass}:{type:'builtin',id:s.type,params:s.params&&Object.keys(s.params).length?s.params:{},bypass:!!s.bypass});let st;try{st=await window.SonicAPI.fxRealtimeStart({fx_chain:chainPayload,sample_rate:ctx.sampleRate||44100});}catch(e){console.warn('[FX RT] start fail:',e);showToast('Không khởi động VST FX realtime: '+(e.message||e),'warning');fxRt.starting=false;return;}if(token!==fxRt.startToken){// Bypass/stop giữa lúc engine đang load chain — hủy session vừa tạo. -console.warn('[FX RT] start cancelled mid-flight — session stopped');try{window.SonicAPI.fxRealtimeStop({session_id:st.session_id}).catch(()=>{});}catch(e2){}fxRt.starting=false;return;}fxRt.sessionId=st.session_id;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=202608311756`);if(token!==fxRt.startToken){fxRt.starting=false;return;}fxRt.node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms: Chromium thu ::1 truoc (Windows khong +console.warn('[FX RT] start cancelled mid-flight — session stopped');try{window.SonicAPI.fxRealtimeStop({session_id:st.session_id}).catch(()=>{});}catch(e2){}fxRt.starting=false;return;}fxRt.sessionId=st.session_id;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=202608311809`);if(token!==fxRt.startToken){fxRt.starting=false;return;}fxRt.node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms: Chromium thu ::1 truoc (Windows khong // co listener IPv6 -> SYN hang ~2s) roi moi fallback 127.0.0.1. Dung // thang 127.0.0.1 (loopback) -> WS open ~5ms. Server chap nhan loopback. const wsHost=u.hostname==='localhost'||u.hostname==='::1'?'127.0.0.1'+(u.port?':'+u.port:''):u.host;const tok=localStorage.getItem('sonic_token')||'';const wsUrl=`${wsProto}${wsHost}${st.ws_url}${tok?'?token='+encodeURIComponent(tok):''}`;const ws=new WebSocket(wsUrl);fxRt.ws=ws;ws.binaryType='arraybuffer';ws.onopen=()=>{if(token!==fxRt.startToken){try{ws.close();}catch(e){}fxRt.starting=false;return;}fxRt.active=true;fxRt.flushing=false;fxRt.starting=false;fxRt.inQueue=[];// bỏ audio stale sản xuất trước khi WS open (~4s load VST) — hết lag khởi đầu @@ -904,7 +904,7 @@ const _kbSilent=false;const keys=[];for(let pitch=127;pitch>=PITCH_START;pitch-- // keybed PHẢI qua mastering FX của main out khi chain đang bật // (trước đây phải bật/tắt power mới có tác dụng). try{if(window.__ensureMasteringRouting)window.__ensureMasteringRouting();}catch(er){}// DIAG Bug 2 (keybed ARM khong am): routing + ARM state tai note-on. -try{let _pdDest='none';if(window.AudioRoutingEngine&&window.AudioRoutingEngine._connected){_pdDest=window.AudioRoutingEngine._dest&&window.AudioRoutingEngine._dest.constructor?window.AudioRoutingEngine._dest.constructor.name:'null';_pdDest+='/'+window.AudioRoutingEngine._trackId;}else{_pdDest='NOT_CONNECTED';}const _pdD=window.BridgeAudioNode?window.BridgeAudioNode.getDiag():null;const _pdTab=activeTabRef.current;const _pdSub=subTabsRef.current?(subTabsRef.current.find(s=>s.id===_pdTab)||{}).type:null;const _kbArmedTab=!!(subTabsRef.current||[]).some(function(s){return s.type==='PIANO_ROLL'&&s.isArmed&&s.trackId===st.trackId;});_dbgLog('preview_diag','src=keybed trk='+st.trackId+' kbTrk='+(kbTrk?kbTrk.id:'UNDEF')+' kbArmedTab='+(_kbArmedTab?1:0)+' armedTrk='+(kbTrk&&kbTrk.isArmed?1:0)+' sl='+(_kbSilent?1:0)+' tab='+_pdTab+' sub='+(_pdSub||'none')+' play='+(isPlayingRef.current?1:0)+' br='+(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive()?1:0)+' fxRt='+(fxRt.active?1:0)+' dest='+_pdDest+' bd='+(_pdD?'i='+_pdD.initialized+' wl='+_pdD.useWorklet+' nd='+_pdD.hasWorkletNode+' pre='+_pdD.preBufferLen+' ch='+_pdD.chunksLen+' g='+_pdD.gain:'MISSING')+' mb='+!!masterBus);}catch(e){}// V45.19 Bug 2: _kbSilent -> bo qua phat (MAIN/SECTION + ARM off = cam). +try{let _pdDest='none';if(window.AudioRoutingEngine&&window.AudioRoutingEngine._connected){_pdDest=window.AudioRoutingEngine._dest&&window.AudioRoutingEngine._dest.constructor?window.AudioRoutingEngine._dest.constructor.name:'null';_pdDest+='/'+window.AudioRoutingEngine._trackId;}else{_pdDest='NOT_CONNECTED';}const _pdD=window.BridgeAudioNode?window.BridgeAudioNode.getDiag():null;const _pdTab=activeTabRef.current;const _pdSub=subTabsRef.current?(subTabsRef.current.find(s=>s.id===_pdTab)||{}).type:null;const _kbArmedTab=!!(subTabsRef.current||[]).some(function(s){return s.type==='PIANO_ROLL'&&s.isArmed&&s.trackId===st.trackId;});_dbgLog('preview_diag','src=keybed trk='+st.trackId+' kbTrk='+(kbTrk?kbTrk.id:'UNDEF')+' kbArmedTab='+(_kbArmedTab?1:0)+' armedTrk='+(kbTrk&&kbTrk.isArmed?1:0)+' sl='+(_kbSilent?1:0)+' tab='+_pdTab+' sub='+(_pdSub||'none')+' play='+(isPlayingRef.current?1:0)+' br='+(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive()?1:0)+' fxRt='+(fxRt.active?1:0)+' dest='+_pdDest+' bd='+(_pdD?'i='+_pdD.initialized+' wl='+_pdD.useWorklet+' nd='+_pdD.hasWorkletNode+' pre='+_pdD.preBufferLen+' ch='+_pdD.chunksLen+' g='+_pdD.gain+' ws='+(_pdD.ws?_pdD.ws.overruns+'/'+_pdD.ws.underruns:'-'):'MISSING')+' mb='+!!masterBus);}catch(e){}// V45.19 Bug 2: _kbSilent -> bo qua phat (MAIN/SECTION + ARM off = cam). if(!_kbSilent){try{window.__dbgPreviewAudioArmed={count:0,nz:0,t0:performance.now()};}catch(e){}if(window.triggerMidiVuActivity){window.triggerMidiVuActivity((st.parent_tab_id&&st.parent_tab_id.startsWith('session_')?'_sess_':'')+st.trackId,100);}const kbNative=isStandaloneSf()&&isSfTrackEngine(kbCtx.synthEngine)&&!(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive());const kbNativeVst=isStandaloneSf()&&isVstTrackEngine(kbCtx.synthEngine)&&!(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive());if(kbNative){playNativeSfNote(kbTrk,pitch,100/127,5000,undefined,'kb_'+st.trackId+'_'+pitch);}else if(kbNativeVst){playNativeVstNote(kbTrk,pitch,100/127,5000,undefined,'kb_'+st.trackId+'_'+pitch);}if(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive()){try{if(window.__ensureBridgeProgram)window.__ensureBridgeProgram(kbTrk?kbTrk.id:0,kbCtx.program,kbCtx.synthEngine);}catch(er){}window.SonicMidiRouter.pushEvent({cmd:'NOTE_ON',channel:kbTrk?kbTrk.id:0,pitch:pitch,velocity:100/127,percussion:!!(kbCtx&&kbCtx.synthEngine&&kbCtx.synthEngine.soundfont_bank===128),live:true});}else if(window.SonicSF&&!kbNative&&!kbNativeVst){// ⚠️ FIX: giữ note theo thời gian bấm phím — durationMs lớn (5s) // chỉ là auto-off phòng hờ; mouseup/mouseleave gọi stopNote dừng // NGAY (trước đây 500ms → note tự tắt giữa chừng khi giữ phím). @@ -1301,11 +1301,11 @@ if(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive()){// D1: bridg var bTracks=activeTracksRef.current||[];// ARM piano roll (sub-tab isArmed, cuc bo) cung tinh nhu ARM // track - preview note tu piano roll tab phai toi track dang // edit du track main KHONG ARM (ARM piano roll khong truyen). -var bPrArmed={};if(_isPrTabNow){try{// V45.25: chi sub-tab PR dang active; khong gom ARM sub-tab khac. -var _actPrSub=(subTabsRef.current||[]).find(function(s){return s.id===activeTabRef.current;});if(_actPrSub&&_actPrSub.type==='PIANO_ROLL'&&_actPrSub.trackId)bPrArmed[_actPrSub.trackId]=true;}catch(e){}}bTracks.forEach(function(bt){if(_isPrTabNow?!bPrArmed[bt.id]:!bt.isArmed)return;// V45.24: PR preview doc lap voi mute/solo MAIN/SECTION — +var bPrArmed={};if(_isPrTabNow){try{// V45.27: chi sub-tab PR dang active VA co ARM (isArmed); khong gom ARM sub-tab khac / MAIN. +var _actPrSub=(subTabsRef.current||[]).find(function(s){return s.id===activeTabRef.current;});if(_actPrSub&&_actPrSub.type==='PIANO_ROLL'&&_actPrSub.isArmed&&_actPrSub.trackId)bPrArmed[_actPrSub.trackId]=true;}catch(e){}}bTracks.forEach(function(bt){if(_isPrTabNow?!bPrArmed[bt.id]:!bt.isArmed)return;// V45.24: PR preview doc lap voi mute/solo MAIN/SECTION — // khoi phuc volume track (bo qua mute/solo) khi o PR tab. -if(_isPrTabNow){try{ensureTrackPrAudible(bt,bTracks,activeTrackNodesRef.current[bt.id]);}catch(e){}}if(window.triggerMidiVuActivity){window.triggerMidiVuActivity(bt.id,scaledVel);}try{heldMidiNotesRef.current[bt.id]=(heldMidiNotesRef.current[bt.id]||0)+1;}catch(err){}try{window.SonicMidiRouter.pushEvent({cmd:'NOTE_ON',channel:bt.id,pitch:pitch,velocity:scaledVel/127,percussion:!!(bt.synth_engine&&bt.synth_engine.soundfont_bank===128),live:true});}catch(e){}});}else if(window.SonicSF){var allTracks=activeTracksRef.current||[];var arSubs=[];// V45.25: chi sub-tab PR dang active; khong gom ARM sub-tab khac. -if(_isPrTabNow&&subTabsRef&&subTabsRef.current){var _actPrSub=subTabsRef.current.find(function(s){return s.id===activeTabRef.current;});if(_actPrSub&&_actPrSub.type==='PIANO_ROLL'&&_actPrSub.trackId)arSubs.push(_actPrSub);}var armedTracks=_isPrTabNow?[]:allTracks.filter(function(t){return t.isArmed;});// Piano Roll arming has priority: route to each armed sub-tab's parent track +if(_isPrTabNow){try{ensureTrackPrAudible(bt,bTracks,activeTrackNodesRef.current[bt.id]);}catch(e){}}if(window.triggerMidiVuActivity){window.triggerMidiVuActivity(bt.id,scaledVel);}try{heldMidiNotesRef.current[bt.id]=(heldMidiNotesRef.current[bt.id]||0)+1;}catch(err){}try{window.SonicMidiRouter.pushEvent({cmd:'NOTE_ON',channel:bt.id,pitch:pitch,velocity:scaledVel/127,percussion:!!(bt.synth_engine&&bt.synth_engine.soundfont_bank===128),live:true});}catch(e){}});}else if(window.SonicSF){var allTracks=activeTracksRef.current||[];var arSubs=[];// V45.27: chi sub-tab PR dang active VA co ARM (isArmed); khong gom ARM sub-tab khac / MAIN. +if(_isPrTabNow&&subTabsRef&&subTabsRef.current){var _actPrSub=subTabsRef.current.find(function(s){return s.id===activeTabRef.current;});if(_actPrSub&&_actPrSub.type==='PIANO_ROLL'&&_actPrSub.isArmed&&_actPrSub.trackId)arSubs.push(_actPrSub);}var armedTracks=_isPrTabNow?[]:allTracks.filter(function(t){return t.isArmed;});// Piano Roll arming has priority: route to each armed sub-tab's parent track if(arSubs.length>0){arSubs.forEach(function(as){var asTrk=allTracks.find(function(t){return t.id===as.trackId;});// V45.24: PR preview doc lap voi mute/solo MAIN/SECTION. if(_isPrTabNow&&asTrk){try{ensureTrackPrAudible(asTrk,allTracks,activeTrackNodesRef.current[as.trackId]);}catch(e){}}var asCh=asTrk?assignTrackMidiChannel(asTrk,allTracks):0;var asProg=as.instrumentProgram;var asSe=as.synth_engine;if(window.triggerMidiVuActivity){window.triggerMidiVuActivity(as.trackId,scaledVel);}// Giữ VU theo trường độ: tăng counter note đang giữ // (tick giữ peak cho tới khi note-off) @@ -1803,10 +1803,10 @@ const showToast=(text,type='info',actionText=null,onActionClick=null)=>{if(toast const vkbNoteOn=(pitch,vel)=>{try{if(window.__ensureMasteringRouting)window.__ensureMasteringRouting();}catch(er){}const allTracks=activeTracksRef.current||[];// V45.19 Bug 2: ARM piano roll chi tac dung khi DANG o PIANO_ROLL tab. O // MAIN/SECTION chi tinh track isArmed that su; ARM tu piano roll KHONG truyen // sang. Khong track nao ARM o MAIN/SECTION -> targets rong -> preview cam. -const _prTabNow=(subTabsRef.current||[]).find(function(s){return s.id===activeTabRef.current;});const _isPrTabNow=!!(_prTabNow&&_prTabNow.type==='PIANO_ROLL');const prArmedIds={};// V45.25: PR tab preview chi track dang edit (sub-tab active) - bat ke ARM. +const _prTabNow=(subTabsRef.current||[]).find(function(s){return s.id===activeTabRef.current;});const _isPrTabNow=!!(_prTabNow&&_prTabNow.type==='PIANO_ROLL');const prArmedIds={};// V45.27: PR tab preview chi track dang edit (sub-tab active) VA chi khi sub-tab do ARM (isArmed). // ARM tu sub-tab PR khac / track MAIN KHONG leak sang PR tab nay. -try{if(_isPrTabNow){if(_prTabNow.trackId)prArmedIds[_prTabNow.trackId]=true;}}catch(e){}const armed=allTracks.filter(function(t){return t.isArmed;});const targets=_isPrTabNow?allTracks.filter(function(t){return prArmedIds[t.id];}):armed.length?armed:[];if(!_isPrTabNow&&!armed.length&&!window.__vkbNoArmToast){window.__vkbNoArmToast=true;showToast('Không có track nào ARM — preview MIDI câm (MAIN/SECTION).','info');}// DIAG Bug 3/4 (preview khong am): trang thai routing tai note-on. -try{let _pdDest='none';if(window.AudioRoutingEngine&&window.AudioRoutingEngine._connected){_pdDest=window.AudioRoutingEngine._dest&&window.AudioRoutingEngine._dest.constructor?window.AudioRoutingEngine._dest.constructor.name:'null';_pdDest+='/'+window.AudioRoutingEngine._trackId;}else{_pdDest='NOT_CONNECTED';}const _pdD=window.BridgeAudioNode?window.BridgeAudioNode.getDiag():null;const _pdTab=activeTabRef.current;const _pdSub=subTabsRef.current?(subTabsRef.current.find(s=>s.id===_pdTab)||{}).type:null;_dbgLog('preview_diag','armed='+armed.length+' trg='+targets.length+' prTab='+(_isPrTabNow?1:0)+' tab='+_pdTab+' sub='+(_pdSub||'none')+' play='+(isPlayingRef.current?1:0)+' br='+(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive()?1:0)+' fxRt='+(fxRt.active?1:0)+' dest='+_pdDest+' bd='+(_pdD?'i='+_pdD.initialized+' wl='+_pdD.useWorklet+' nd='+_pdD.hasWorkletNode+' pre='+_pdD.preBufferLen+' ch='+_pdD.chunksLen+' g='+_pdD.gain:'MISSING')+' mb='+!!masterBus);}catch(e){}// DIAG Bug 3/4: arm bo dem audio frames (500ms sau note-on) de biet +try{if(_isPrTabNow){if(_prTabNow.isArmed&&_prTabNow.trackId)prArmedIds[_prTabNow.trackId]=true;}}catch(e){}const armed=allTracks.filter(function(t){return t.isArmed;});const targets=_isPrTabNow?allTracks.filter(function(t){return prArmedIds[t.id];}):armed.length?armed:[];if(!_isPrTabNow&&!armed.length&&!window.__vkbNoArmToast){window.__vkbNoArmToast=true;showToast('Không có track nào ARM — preview MIDI câm (MAIN/SECTION).','info');}// DIAG Bug 3/4 (preview khong am): trang thai routing tai note-on. +try{let _pdDest='none';if(window.AudioRoutingEngine&&window.AudioRoutingEngine._connected){_pdDest=window.AudioRoutingEngine._dest&&window.AudioRoutingEngine._dest.constructor?window.AudioRoutingEngine._dest.constructor.name:'null';_pdDest+='/'+window.AudioRoutingEngine._trackId;}else{_pdDest='NOT_CONNECTED';}const _pdD=window.BridgeAudioNode?window.BridgeAudioNode.getDiag():null;const _pdTab=activeTabRef.current;const _pdSub=subTabsRef.current?(subTabsRef.current.find(s=>s.id===_pdTab)||{}).type:null;_dbgLog('preview_diag','armed='+armed.length+' trg='+targets.length+' prTab='+(_isPrTabNow?1:0)+' tab='+_pdTab+' sub='+(_pdSub||'none')+' play='+(isPlayingRef.current?1:0)+' br='+(window.SonicMidiRouter&&window.SonicMidiRouter.isBridgeActive()?1:0)+' fxRt='+(fxRt.active?1:0)+' dest='+_pdDest+' bd='+(_pdD?'i='+_pdD.initialized+' wl='+_pdD.useWorklet+' nd='+_pdD.hasWorkletNode+' pre='+_pdD.preBufferLen+' ch='+_pdD.chunksLen+' g='+_pdD.gain+' ws='+(_pdD.ws?_pdD.ws.overruns+'/'+_pdD.ws.underruns:'-'):'MISSING')+' mb='+!!masterBus);}catch(e){}// DIAG Bug 3/4: arm bo dem audio frames (500ms sau note-on) de biet // engine co gui audio ve JS khong (tach engine vs JS routing). try{window.__dbgPreviewAudioArmed={count:0,nz:0,t0:performance.now()};}catch(e){}activeMidiPitchesRef.current.add(pitch);setActiveMidiPitches(new Set(activeMidiPitchesRef.current));vkbHeldRef.current.add(pitch);targets.forEach(function(t){// V45.24: PR preview doc lap voi mute/solo MAIN/SECTION — khoi phuc // volume track khi o PR tab. @@ -1996,7 +1996,7 @@ fxRtTrackReconcile(trackId,node,track);}catch(e){console.warn('rebuildTrackFxGra // Cần activeTrackNodesRef/isPlayingRef. Session giống master (fxRtStart): // fetch start → AudioWorkletNode 'sf-fx-realtime' → WS; WS open → splice // worklet vào chain hiện tại (đọc mods MỚI NHẤT — an toàn với rebuild). -const fxRtTrackStart=async(trackId,track,path)=>{const key=trackId+':'+path;const chain=fxRtTrackChain(track);if(!chain.length)return;if(fxRtTracks[key]){if(!fxRtTracks[key].node||fxRtTracks[key].node.context!==getAudioContext())fxRtTrackStop(trackId,path,true);else return;}const ctx=getAudioContext();if(!ctx||!ctx.audioWorklet)return;const chainPayload=chain.map(s=>s.type==='vst3'?{type:'vst3',path:s.path,name:s.name||s.path,preset_b64:s.preset_b64||'',bypass:!!s.bypass||!!(track&&track.vstFxBypass)}:{type:'builtin',id:s.type,params:s.params&&Object.keys(s.params).length?s.params:{},bypass:!!s.bypass});let st;try{st=await window.SonicAPI.fxRealtimeStart({fx_chain:chainPayload,sample_rate:ctx.sampleRate||44100});}catch(e){console.warn('[FX RT track] start fail',trackId,path,e);return;}const entry={sessionId:st.session_id,ws:null,node:null,ready:false,path,spliced:null,chainKey:fxRtTrackChainKey(chain)+'|vb:'+(track&&track.vstFxBypass?'1':'0'),paramsBySlot:chain.map(s=>fxRtEntryParams(s,null)),inQueue:[],pumpTimer:null,lastInSent:0,flushing:false,flushTimer:null};fxRtTracks[key]=entry;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=202608311756`);const node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});entry.node=node;const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms (Chromium thu ::1 truoc roi fallback) - dung 127.0.0.1 +const fxRtTrackStart=async(trackId,track,path)=>{const key=trackId+':'+path;const chain=fxRtTrackChain(track);if(!chain.length)return;if(fxRtTracks[key]){if(!fxRtTracks[key].node||fxRtTracks[key].node.context!==getAudioContext())fxRtTrackStop(trackId,path,true);else return;}const ctx=getAudioContext();if(!ctx||!ctx.audioWorklet)return;const chainPayload=chain.map(s=>s.type==='vst3'?{type:'vst3',path:s.path,name:s.name||s.path,preset_b64:s.preset_b64||'',bypass:!!s.bypass||!!(track&&track.vstFxBypass)}:{type:'builtin',id:s.type,params:s.params&&Object.keys(s.params).length?s.params:{},bypass:!!s.bypass});let st;try{st=await window.SonicAPI.fxRealtimeStart({fx_chain:chainPayload,sample_rate:ctx.sampleRate||44100});}catch(e){console.warn('[FX RT track] start fail',trackId,path,e);return;}const entry={sessionId:st.session_id,ws:null,node:null,ready:false,path,spliced:null,chainKey:fxRtTrackChainKey(chain)+'|vb:'+(track&&track.vstFxBypass?'1':'0'),paramsBySlot:chain.map(s=>fxRtEntryParams(s,null)),inQueue:[],pumpTimer:null,lastInSent:0,flushing:false,flushTimer:null};fxRtTracks[key]=entry;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=202608311809`);const node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});entry.node=node;const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms (Chromium thu ::1 truoc roi fallback) - dung 127.0.0.1 const wsHost=u.hostname==='localhost'||u.hostname==='::1'?'127.0.0.1'+(u.port?':'+u.port:''):u.host;const tok=localStorage.getItem('sonic_token')||'';const ws=new WebSocket(`${wsProto}${wsHost}${st.ws_url}${tok?'?token='+encodeURIComponent(tok):''}`);entry.ws=ws;ws.binaryType='arraybuffer';ws.onopen=()=>{entry.ready=true;entry.inQueue=[];// bỏ audio stale trước khi WS open — hết lag khởi đầu fxRtTrackSplice(trackId,path);try{(entry.paramsBySlot||[]).forEach((pl,slot)=>pl.forEach(p=>ws.send(JSON.stringify({cmd:'set_param',slot,key:p.key,value:p.value}))));}catch(e){}};ws.onmessage=ev=>{if(typeof ev.data==='string'){try{const d=JSON.parse(ev.data);if(d&&d.cmd==='flush_done'){entry.flushing=false;if(entry.flushTimer){clearTimeout(entry.flushTimer);entry.flushTimer=null;}if(entry.node)entry.node.port.postMessage({type:'flush_done'});}}catch(e){}return;}if(!(ev.data instanceof ArrayBuffer)||!entry.node)return;if(entry.flushing)return;// V24: output stale trong luc flush — drop const f=new Float32Array(ev.data);const half=f.length/2;const l=new Float32Array(half);const r=new Float32Array(half);for(let i=0;ifxRtTrackStop(trackId,path,true);ws.onerror=()=>{try{ws.close();}catch(e){}};entry.node.port.onmessage=ev=>{const d=ev.data;if(!d||!entry.ws)return;if(d.type==='flush'){// V24: nhu master — worklet underrun-resume → flush engine ring diff --git a/app/static/js/services/bridgeAudioNode.js b/app/static/js/services/bridgeAudioNode.js index f558859..c5a00a0 100644 --- a/app/static/js/services/bridgeAudioNode.js +++ b/app/static/js/services/bridgeAudioNode.js @@ -16,6 +16,7 @@ var _ctx = null; var _initialized = false; var _useWorklet = false; + var _workletStats = null; // stats tu worklet (overrun/underrun) — getDiag var _dest = null; // destination gain node da noi (chong connect trung) function _getCtx() { @@ -31,7 +32,7 @@ console.warn('[BridgeAudioNode] AudioWorklet unavailable — ScriptProcessor fallback'); return false; } - var url = '/static/js/services/bridgeAudioWorklet.js?v=202608291200'; + var url = '/static/js/services/bridgeAudioWorklet.js?v=202608311809'; _ctx.audioWorklet.addModule(url).then(function () { if (!_initialized) return; // disconnect() happened while loading if (_useWorklet) return; // already set up (init retry) @@ -42,6 +43,9 @@ outputChannelCount: [2] }); _workletNode.connect(_gainNode); + _workletNode.port.onmessage = function (ev) { + if (ev.data && ev.data.type === 'stats') _workletStats = ev.data; + }; _useWorklet = true; // drain pre-buffer into worklet (order preserved) while (_preBuffer.length) { @@ -168,7 +172,8 @@ hasWorkletNode: !!_workletNode, preBufferLen: _preBuffer.length, chunksLen: _chunks.length, - gain: _gainNode ? _gainNode.gain.value : -1 + gain: _gainNode ? _gainNode.gain.value : -1, + ws: _workletStats }; } }; diff --git a/app/static/js/services/bridgeAudioWorklet.js b/app/static/js/services/bridgeAudioWorklet.js index fea9eae..7f33b09 100644 --- a/app/static/js/services/bridgeAudioWorklet.js +++ b/app/static/js/services/bridgeAudioWorklet.js @@ -1,23 +1,29 @@ // app/static/js/services/bridgeAudioWorklet.js // VSTi crackle fix: audio sink chay tren audio thread (khong jank main thread). -// - Ring block 256 mau, toi da 16 block (~85ms @48k) — hap thu jitter pump -// (option 2: 8->16 de dung tremolo crackle; backlog lon hon ~85ms) -// nhung gioi han backlog: 64 block (~371ms) tao tre ~0.3-0.4s khi play/ -// keyboard preview (audio moi phai cho ring cu chay het). +// - Ring block 256 mau, toi da 32 block (~170ms @48k) — hap thu jitter pump +// (V45.27: 16->32 de dung crackle VST2 loop/tremolo — render loop C++ bi +// stall khi instrument xu li loop/tremolo nang CPU; 8->16 truoc do da dung +// tremolo crackle, 16 van chua du cho stall >85ms). Flush o play start +// (app.jsx) xoa ring nen do tre khong tang: ring thuong can o preview. // - Underrun: fade ve 0 thay vi click (hard silence). // - Resume sau silence: fade vao tu 0. // - Overrun: drop block cu nhat + crossfade 64 mau tai diem drop (het click). +// - Stats: dem overrun/underrun, gui ve main thread moi ~0.5s — kiem tra +// con crackle nao la do ring can (underrun) hay ring tran (overrun). class BridgeAudioSinkProcessor extends AudioWorkletProcessor { constructor() { super(); this._ring = []; - this._MAX = 16; + this._MAX = 32; this._gain = 1.0; this._lastOutL = 0.0; this._lastOutR = 0.0; this._skipFade = 0; // >0: crossfade dang chay sau overrun drop this._skipFromL = 0.0; this._skipFromR = 0.0; + this._wasUnderrun = false; + this._statAccum = 0; + this._stats = { overruns: 0, underruns: 0 }; this.port.onmessage = (e) => { const m = e.data; if (!m) return; @@ -27,6 +33,7 @@ class BridgeAudioSinkProcessor extends AudioWorkletProcessor { // overrun: bo block cu nhat; lan consume toi se crossfade ranh gioi this._ring.shift(); this._skipFade = 64; + this._stats.overruns++; } } else if (m.type === 'flush') { this._ring.length = 0; @@ -44,6 +51,7 @@ class BridgeAudioSinkProcessor extends AudioWorkletProcessor { let w = 0; while (w < n) { if (this._ring.length) { + if (this._wasUnderrun) this._wasUnderrun = false; const blk = this._ring[0]; const avail = blk.l.length; const take = Math.min(avail, n - w); @@ -71,7 +79,8 @@ class BridgeAudioSinkProcessor extends AudioWorkletProcessor { blk.r = blk.r.subarray(take); } } else { - // underrun: fade ve 0 (khong click) + // underrun: fade ve 0 (khong click) — dem 1 lan moi lan roi vao trang thai trong + if (!this._wasUnderrun) { this._wasUnderrun = true; this._stats.underruns++; } for (let i = w; i < n; i++) { this._gain = Math.max(0, this._gain - 1.0 / 256.0); L[i] = this._lastOutL * this._gain; @@ -82,6 +91,20 @@ class BridgeAudioSinkProcessor extends AudioWorkletProcessor { w = n; } } + // Stats: gui ve main thread moi ~0.5s (24000 mau @48k) — log overrun/underrun + this._statAccum += n; + if (this._statAccum >= 24000) { + this._statAccum = 0; + try { + this.port.postMessage({ + type: 'stats', + overruns: this._stats.overruns, + underruns: this._stats.underruns, + ring: this._ring.length, + max: this._MAX + }); + } catch (e) {} + } return true; } } diff --git a/app/templates/index.html b/app/templates/index.html index 482de20..c18155b 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - +