From c1ea57fbefec3d4a82660ee0b31de86af92ec484 Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Fri, 9 Oct 2026 09:05:25 +0000 Subject: [PATCH] fix(notes): keep Discard usable after a failed load Discard waited for a stored revision, so after a load failed (stored notes not valid UTF-8, a read error, a lost reply) the editor stayed read-only with no way to reload. The page now tracks the outstanding load itself: Discard is refused only while a load or save is in flight, a load error or a ten-second timeout ends the load, and Discard retries. A save acknowledgement arriving after its timeout and after Discard had started a reload replaced the saved state while the editor still showed older text, so the next save would silently revert it. Acknowledgements are ignored while a load is outstanding, and a reload forgets the last save. The component removes a lock whose token could not be written and cleans up renamed stale locks with the abandoned staging files. check_notes.py adds a failed load followed by a repaired file and Discard; the previous package stays read-only there and fails. --- examples/org.weft.demo.notes/app.wasm | Bin 176862 -> 177155 bytes examples/org.weft.demo.notes/signature.sig | 2 +- examples/org.weft.demo.notes/src/main.rs | 22 +++++++++---- examples/org.weft.demo.notes/ui/index.html | 36 ++++++++++++++++----- tests/frame/check_notes.py | 19 +++++++++++ 5 files changed, 64 insertions(+), 15 deletions(-) diff --git a/examples/org.weft.demo.notes/app.wasm b/examples/org.weft.demo.notes/app.wasm index 35818e7c413e94bbc4fa4a175c4f40b2ca6e806f..3bcdbb65173c89cf6ffc5faa1db0b74a4c44b3b6 100644 GIT binary patch delta 14584 zcmaib31Ae(^7q#4ZnDYlh9TM9A+@k%#8uh#DZI z1I;NxRBl98jS6ab3d9IVLX=YjC<@383If9S>zUac$ou|c&rWxBS65e8RaaF{em)kM ze>`x*i?Vcbns=gHYBOJwF0k-OB{GOCHXAiH$u^5AD9C2Ahz6p-K<}NAWt2UQ9FLEF z?CD2d95ecvXP$f9R44_kB{HdGAK7o%y_@J0nlSMT`bPRndMT}pR?%kqnvPPjv{>3k zTj?A6Qu-y&j5U%Qn9*;a3#1_sN(J5?x`B_Hvm+)EVr<9^tGq_SuNSlJXo= zmg+BmBG4)(HAl))LevFpX!CvaDN9yLrKtzlmOc?oamy^dOGth7E}(nPJ&caCE$#?9 z#SXYrjR}H{2{Jqn0mm1K$!xRdp~%}#6|BBFm$ix85>;TuJw*!=jRT7#Q4>Ej=gW6e@+SxFKQnG~C1N|th1e8N*2 zU16jzdsD(gw_mnPWh|}5d^*P}S|m&PCG290Znv!H(L{Yk({7I;SiR(ZAgL*}{dI1+ zU~5x(t5}89L+YWJQcb0#TKYN#mrE&2-X=imO?p9f^mP(jlsxKws~s?`K`|vs?~*52 z{LUxwTugGMzC)>|9IHTMRe&hjoMX*2??V@{aq@R{T_iDRswD3aEo?>d&;TV^t`cGr z#V#i+^ec;K+0Lm=B}S^j@=kulNiJ68_G>A|ViM{nXjLdvI!q1{r0pY(w5gaoNh+|) zyV&BEl~l>brlisLjHkRvyIEkXD<0qS6_?UnuC6D_6YC?3#iu63?x~0P+C__9iBVi~ z4I7)9Nr%|d)Q-VFie`t)t~hnEP&cv@snJx!tgSP;>cC(C#eSE7T$AF26nI>qxP%%A zgpUJgzk=PdWhpMUru7)w%bKROr|qn7T01-^r)AI%_F>w{2(fSaKP9}U-!P|1ub5e` zJB0N}4<$3ZFTF*y8~9dYL!q9KSQnV)?x_^4aEB^x#?#%MDh1mG`yiEzu`!A}(_A3+ zBzL%C>PeaA9LW)AS6u4No8}kRiN++UNOA@`?CgAcXK=Swo3^1gjE5{pVo{I=$rC!j zDY4u(t}uV2zt!Pq_mM00VC&l?hk2B+WRuD5hV%ui^g~_6tiKHt*k%Z-nu>~N}B3=q5gG`HE6{cd6I|dwvfVzW~B)8iEhJ`}>T!z4u zAKU_kln?5}vFF=$?`GDBDKYTads?;qfI4A6$lg=Zs*+YU*?~=;&kj*grn}uNvVF&Z z`h9+&eSApVx~XoD67Nn{65TD87VZ=!fz4?jO&<1ehfMZs`@513iRnS6kQV*j?M`y| zgOFtN6-^#=5WBC#6M;HgWBWMG?3)g4`u`-xf}vRZKJvJ<%}kOGkvmv#{FR(A0{Cx| zI}|9v|4;zJ!2RZRdlcHoX=PnAI?&H-LdJb~R%XOWh4a|ijCSrEs~O036&E&0)+RKj z!!G)^#F*8kn%uz--IBp1)#^*`=_eSeV7XYVW~+37Lq4o^ zu8Tv%PZd_>?B9IA)a>M(!#sDL>k z%k{9|beO|8jvBx&=rBKhTpuwoIZ1K|X-kqS$eqeIbac4EX|&3oVC(_8TWhLP$Mx12 z#SV7Nfv!E&X&{~}I`ti|+rD6>wOpey0LOzc<6=j3qYWHjMX-+*m?2c>vN%B?+WI)V z(p-u4q0ofq7abi=1|h*hzD#!Jz9Yf&RsMU9Yu75#<2s#f1z#@TC9kN>PO zG!k3((E&|?j*CHqY&Z=*1^eVH6u6NUq?3u3d z_TRKc1#8E`qOJ)$K5%3kR;M5ngdZK(}b!dHOA-NU%9LcF^}gbl)(A)HD1B>SnaqWp22PT~|$%YoD;pJL7W zC5D~WP(yhep=1yAOLU%YIG)YwH=E9|*#0qemUZc$*1ZwbAVKq*giEd2e8WuL&}XpR zGQ+C=!@C#~8=^F=)9Iuvd9yZe6Ghe=VHxa7h=*X-z_x+&>Z|TS5$wXigun%QlSTf8xd(NDJ2+}kBpqX~3`(Zo*s?(_X{vX}pa6;9 zW^_ojf#| zmaun+_CddsX!)CYhW&%y%J2s<-IU>Jm~QRxNIJl_4IheU_}$&A@=q*r#4ya) z^nCN+rP?^zq?i=AC)m{*wt7SgY{rixV)6WQL?RZ`Y~%)9`lZG+8S{rI1>kd;0WM~m4vPwWhTN26Bq(OFQfO}Lz`95cGj z-$FX=O*8{)5f<5|3$JKVEm`taO{URq0I#vmPadKf-te&>6Xa&+Q-zSd2cG_fma?W< zi=b%hvRYt!YO+$Plu6?zCDj>szs@GHy?z-$Ws|jeg>=Z8h{&bvopGI;Ypo6m0+b}( zBOW8_R7vrdm$GZ)X2&nnRzp5sN^0pmjh88kq#m!*mUfJ-e`XxQg{bi_(|I;${A0AA zT^iq>F0kZh@5k=vKHHqC*s^C^Qk8edv&9fz?<3DYCLuQZ?~9KhHu6jmtm`}BlaRWT zmFiE{CKD5BuQzjI7|}d-*Go~v+0!qz#}seBG%JD$>fD;#7uw(xibWLJKUx{E83Yo=#`Xc@OF}5C_~9`}7Ued$`1s>t!#WJu&4$ z+R4hN^bOf1dI;Ci{M1nwZ^S9&`OXJF`CortF-j@I0Q=t;uJCF&?ZSP%({@*RT$`{UWaD{-|U) z4;Hm!7D$~@!b);y!_$b*n@oq<(!Bm6H*zBHBOIJ>=O+lK;AVcuMn4H`*t8KKX7#iN z#8~Qx@tUVUL7?NQ88Oj$)fyjdibXBeT{?K9fZ0(Naiw6Nv{ zSyA5$QE(G%4rJA#P_$c5Bgos?qJp>p!|{}h+4h2@W*>;Pil7e$)+}!@YT!R=A2P=q z(ew*TdSfg!s_2anNuN#nD~Da55v5I+$f66Q=rYSF^hi1L*aL+z*}8?WN1Gsp*z6cR zPSg@Gdh}(t#}Q>CUa_DDDdqvJpRa#0a8r_!Hn$;=p9!#3;3;N3p9U-ikLE*b+aG!IcIr!>=8wUYkfr|NNPEC+QqG2a7o;~e?MqP2!M=JsxVrcq~MCnVL<*@SF^ zK1whER!&l^*y*Y4+T0YlJc;vKG{!V?o+sdlhDpxNV^ilH4Qq6ctGo4+c{!WHzxVum zN|+2WC3tMsNgY4GdG<6xs>ccz>tF+>5rkIVaN__GLlg_LFZdsZ@ob|7-7*N;V3DW( zZ^Ul6*k)B0){WU0Br1C12uwjVi*p?_VG=n7rCv_wI`r#BI-_ z0<9&4J-0Xltp$r0qBU+wE7+2uOCAHvyQCv+@t#^TRDz~-Elos#HKz3WPK$+(g6%no zo-930Jx|xXadFwjKc?N?(3EM2p z;ZAm9Wq(-iwyO&02exTdO9=9Bt5TZ%V4R~7Sx`Y>vm0)&4N-m#YrQ(sX&g}4dY4?q z?pd7(f~KsFvK{!KTpW~EmV4aAHm>dmTX1#tKZtg(tcl4m4q$Lv+h{>(2uOr2gLTf5 zbH%Kx$$kgSBwAs0#(5<9rgz}l_C&=jdtDsXxO`o^V9kTU(WpzJ$D;0H$Je!@1K!Z} z`z>&M&Tb4Rn$G+`TIZU3P^0I(kk$=`6XUJ;=mVkxHtCZ)Lf$Y|3XdTPV&;O!;NAX- zg#wKQTHzP{P?p@UA)Zfl4`7CVvKT~|)jxE1=?5`Y<1X@BdRMuS_4%|AGFkoUYrYBm zFu};rL>w{gv(EtP{`n-^M!oxJc6eJTtNHwWI7I*1)B?|UHg)S}9Cip-9lnf93oy(e z!=(Q4leXfsLM6+M73=r{O!9wO?B=`RM2_E_7ObsMk=#~cdq6a#Vg2S9>9agG=SB<_ zc~5M9mS{B_@nsQxjZ?J-+uijp7(t7i@&zl_W$s+(Wa6j5R#g$9dVR9wwrl%c^bTuQ5rIf9qhcZgoHZ2+T6R<|p4ls7z`CSL58}c>m6>*9q|JnoaAxI)9p>qQSUPClU<6|NR@O<)U+Xk< ziVzxKs5ardxRAPbQcHd9tG=5d?-1iXCOF|Xb-r2tmG#*17_Ig$-%&)gj|oXZ8d}QksP2tuD7U&Do*!2yV`Oc0f6Se<=T(W;vUh$MiRbknR^s{Ik5gcg zJ$s=o-?0JvGH~SQ>>IB=A7OXy4>I01X>XPLJ4$QvSnj@_tnY!A0KIS^gg$1|4opHC z;l_b4(6ag9K|JRlT8~Nl{q%D`L&SaBVF*mVV3d6XN!cp7B_THAv?Tdc(O!3$nuYud z!?AB2A3BgCg@=cZ7SWLv{d`aOEe^aG4AU&J@wJgsRTV$di#k98zO0SFkuav#O*{DE zUXg!aj z#%^ENy#z`AlC}ChgRZj2f1e&>unu9NVbj$Ex;#e6`CjYsPzi~#=#zJ2U!OY}Cq;P$ zP9&PAsJ=^?99=fOZ0)Im9Sktc-M4y2yv-M$gUQ|&R!ZujR+t+JFsed;BU$g$6Jb3* zJ1rP@?)24=x&#KPbqS1r&a}I2d#|%Co9q(viSrw3ZkE4iQ_c>qYx7h55dwbi-Fr4b zL_${CDx5?L-dj3+&y&5V%G{8V3-CzS!3y{tf?Yhl|+l_|3?2!xq z0o4aDRM8Q(?qWFJw_a=m%Xj(WG}ye?EF$UH=1#aZ ziljL$cVAvZ+t|&^;dq8$X-V6>J+C+^Ry&vxhibfY$=fwIPUyZxb%Ar^|Bel*)yN{@ znhB^v_Q&{~FlrX8IVUIV!ep>FmUL?NM!M>GS z9SE!&VBevGeVb-+AUbUTuGPTZ)ffZ2Sxe;AW51>kH{=l>rVrjgJ;B2*|Gb%``6UQ~ zBw5S$VU~2`j8;rde3?I!x|~h8(V2?a`WqebVax9~`cN%Py%~XL-2{r-h>F5Kp$yAo`QPWT6?^mo;7W*9F=mU(u%5_V|#=sA*f8 zW>mBdv>6p`w;V=A+>5AzMn&5Rr%}=P9$-{pzRYl~LDt`xi~q+;UFa`fW~HulnfLIc z2=4Twwjn;ca3|sG&WHO^COW<8N2x*AH9~<*7}D!}s~@$%%1-&wqv&y`KSgEyqxArZ z{&nZgr$1=vIv<-X4M4|r&_TWgV|}Sf*wp&L`-~oCd;IB|M1S+|11a|32Akgqq!&Ys zh@mc92UA#y^}32mVBe40$n=>mUGCNEv&Bb(A|bc*k7N_SB$ZxIZ()bcxnX(L^j7eYhm z5+52u4^Syz69SQ_(dMD)Hv!CaeT(k!8(opIaq?>NDaUH@>g;FuZC_9YO z4Uo^O^Dn|6VGDRbIE{jAjt!@lbd48>Q(Q#FcA?T9_`Rtn>&WTw5Zo0|OMSyo#_=ZS|zqQBFNLuOAPbCs}^*$$}g1;R_3T@|K zMUfjnN1~`(q%RBHAb!$gDc&)f1`oVt7mdglVs2dH)ivPg)$a9>6%>1CxHspjH1kDr zULM~SO(Vw|7ma4$MWac-Xf#Em2R0svk)_t}8O_2Jid2W@49X{kU*I+i!=O2b!Z{Fj z$RTS98bF|NgaNn%ImKtiP^-|o8^?yY`S&pt*v-m&Di>xn6F4$OEymLfvV>)Z)} zet-I-extw_#Zq^dW=-uLcoV~}rizX$|a9_Rv=7rZJ(Blp3Y76R3v-$KE^q|iQ z8GabfFZnHgsRbp`T;42^9`p?ZoaZG{Lgu{NaYP(@RxLiYs!3Vcz<>4PKPOVBF0=Jq z!xFkZV|~XUsS6H^rKl!x!6s0G*~61)K>8;Avyg-T$Ib{E#Zox`E{UQ8j5t!B&(9`N zf3U7&G9@)&ou!_26O-w_hHI`#rU|~fVCAru^cfJ?Q|LkZiH}X81lq}GrchMETlzH< z?1|Jv{|BMe@17uPLUD2H#CN1nT`C9PfAPCp(WoHJhJaob7F|BTzidVC&_X^sl_paG zKa@(HjkJ>mx{kCHylAAIcyepn?;{OaA?`?{RGb-|(WJ(jtNc7XY#Mp zDANcHEFzs_)`$yC$HDM9FG#0mar$=-_%cTeNO9iyES7GdREwO?E7GYS6i#kKaX~)_ zo@?ubPtUp9hEl?`b*W@rzCc1r@snrryf)OG_VNF=q1IH%&$pomV{WmcQV+#q7|7{| z_)~3hHgL|`QpW~&a(>{{zP3PK$*;DhXMLOyoAhEky5g%_aH>vhPY3HVbY^rInSt<^ z@!1&^t`lj;h6-C^OuDv~&*?BQ!zJ|!mi{_DwS9ih*IE%-2rk?m2jh`mQp`?XMHu+b+ zu`|7l1txc)kwBQ=g`UUHr7rYBqn=3Y@rifPI>0<#X{@xkS|@)c=0;vyB**q4Iku0d zbSHbdZaYQ700R2CPLxsGq}TK$tGrp%pfpc*r#G{8Gbg@+5EkEM7&%FvBRVMv2Q$sG ztl2D|_{&Uy#QjT<#e|PO#YYtS6^sncHcSK%MhJv4IznMc>O1-D2s(9X)Jwbk&~9^N zU+j0QX=#9%ukJz3Xb!LFL0u#N=Q?;SGJ&*)Ur}NFs<^u+b&RUi@)XEDNooMjx-2z2 zOEqgZqI^P6blbrf-_kAUmTn@E!p*%PK0okoy>KqqC13d4y$IPCUWV4X^oy?%!|tP_ zd`54|hncbWp+D(IPJN*VXL+l>Gynv?+?Pg$YkTSR({F>o5K?pVEb?l8vM+fc4bFaW z=8y8^e!#|fPCq!8`}yX6^l^aU)yTzsa(@~qYj@8uESkZE%J7>0lnlYU0c&a7Tw5-T zaR74kA$;us$kbN8V*o`4Y!Ma(wqrLxGl0Tq3%3pgX~+4Hfp8d)@a%y!9@L*6NWJK1 z-ewSJ`GVg$h~nTZzA%WMi1r`{{}12Q=Xm-vS`FV$X8pJ{7nB zHtqYCaWEa`5j4`Sb#f!UC?6;ri&QdjB@H!0^t-rrc2L}~v2Mj(S zjl&BRD;?i2s|F1?H?*S$Uo{Uwl2GsPjrdyx(F2+eMHR!{;x^2l!iS_&1U{GT*V)tr z3~z#O6a^(F`zTx?gz+Ic)CLARHwQwrpTCA!h&4+K0s9}!6l`6f@kvYJTG_ih`i#6hlIP;)})4&wN-RMaLZ0 zC;}4^C4+O~PEjXP_(KJS)HdRn-Xqy8E5frz)M63*Jj1ICp$oM=fKdr0#^%Zk3M+Oo{x?S@cMVKBpwo{IE=C zaV>t4e>IDG2m1gB3H0_0qWzAtVYBHO3O3NzC7k7B{QDwU#(((fB6!aK@W?rIug(XT zP4`*kpZHsIeC()eJj}nILmisxvxyrJU4}03fMR+m+L&gdmi`kwi}2`C7Lfg$#dMh0 z6jNFqvL*sqP?mh2yBK`{&V9q+E$rYQmQXm4E}>Sz+CHkL{!Ws5;KMqXyn~M{p}x0k z$Dn?+hyPtd=>vWeOce?XisU+q8Z=sbjXyVNwD}q}Nq`6l_hK%kH$5&oc`W$!OYDzD zuH_x(k%#{PSoBE&b6aqj8JgHxC}K8b?F3hF^24;D^BY6{5dB0brCmlH6*YKE_$n1B z;p)k!bT|pPP5z}0jzdyh$;zj7IL>jT{^eh|lhaoFn?fh;_Nx*(c=J?>2!LS~L8AN{ zzriUTtW28^P2A33nopi+P1Q7P=!S2nAiz$HMzC7RH_oT0kT8i}KrIswX_E_$6fY+G zA|gw+{DzndU$I~(Fh^H;Hh*RT6m&k{w1B$$7Ye9c$Zsxy9pq)j3u&DcTO=Bz6q7w2 zR~%wko#FC`7;e-OoQ8}~UqWM|O0<=X*W^g+Iaf5`!w#f^-bQfmSfte@7(ID=+3ux; zzpqOo-lFrGh_IwUS|GO{Q>^ zUA%LU)P>T@UJjBjQg(T=Y}$=-1mz-%xut9hL1}@~5v32x-6&6?Ohm~>DM49<@+rzT zl>I0-Q8H6x(@>PLC=*bopiD=Zhq4Z36Uw(JKcbvOxsW2aFgZb6G)fAJigF*yXp~n_ RrlQP7Sy&d-RNB4l{{fA_l^_5B delta 14633 zcmai52Ygh;*1zZOCRwt($tBtJK<;irNC+j=Kq%(YJ0d;>c{~f&s3<%|Y$SnzbOI9? zK*ZovK{1G~7%X5=AQUM9lu)FqfGAaXh$!EG=H6Wr%lF_nckj%ZIdkUBX>;ag;;Hb% z--WLlqp2Gw`k&Iu9JUMUITn|o$2uHTU(xIiyAlx*;ZW=mWOoqxZ%wG6f(hgrdGCFX z+&$)jdmnr3iIK`wwcZLM#USUfUIT}$AwNAi`eRzJeyWaX@d3R_A5kS8q1oy}^$Yr( z*3&0yrTX-X&redHYkQdH5~EU@M{}t8C-f<;r6n{~U8KIOE>>Sr|D(RHzM+1m`qdBA z)#^(1U3HcEUQhK+^=);9`i@$zE>M@KvuFk_RbN%h)YsHy>ig>F>LvAO^|E?J{jYje z{YCv%y{`VI-cSo|MYajHiMC=}xPM0IIkr8iXUwFDg@uZ?qEI|16yfP5Z5qo+PHXt> z1k@C#syL_K<)Q)_AA{m3u#Z>q8{!|8+*YOUndbA@qm9dqjW=T1?uMh(Ym9l*qixZ~ zR5moFhTdc?^)mJ6{j7eccy>llz4@xK_TDbQ@QinGVohmfp^~pv3NqZJN9mqa&{C)v zhuCp%GdWGHYE9C`_fKHGU}UllzJFTN*`thWrL05h`otL_x?(8p)MD{lO!+1rU#wx0 z8XF+BYg#KRW*5@DY*g1!d#quS&0gpc%{HYqk)Vv|;*fm9k)NRgpQ1Z-B~vYCO&dLI zE!z{o^+h9#ju=OgT!^8w3*B?sqQ*YIKGrO&5#Se8KfR+&HkF zvyB7mu|*l*`tQrAPf2^{Rf01{eQl%QhpseJ%E++yblcTDR+8xeDor*&Y>g5JzopRKpf{%lmw0i zgn^aK+ZC8Yq6F1gngG2{z9_Q`+Db`mq0fU&)V}&_GIY1-5u=MfVx!$+qf5aJMUT>U z2rWniqN~^iN4_3obwamHRmrijt}X7Mui3&DZD<4A(V{h;YIZx?!a8IR>#wJJeQI9a z|9V{4(A&UopEnh}z6rAh`{{AZd{M^ue1p)J?nsKTE2M_7J=y6=sUT!I4hP7&F54G7t*z>KjXdheF>XCvTZgO^2C55V_ z&>;yBm_s2|Ce~1=9@R`yjOIPvp$2)Ag_uUQK*P#IN>6u)p?Z@cO$KQ-k~3*;0{4=& z{i3EgF(M7D){_MpX)rIz*Tc~)=q?LUeU0=+Y+~z1sa|iop6qR`d%PJghZCkR&s>=) zP9^Ffx5A>^+>)=#kyAh*)CT%tE#28QM6M!4u0nA-4PnE^d6TgpP$+Md+;gxOq82o8 zl?T@g%Xh#eRF5&&>%`9Mlf9{|q)q#JH@CRDO3O5u=Fb&yrJy+7RKV8b46 zJG-S_%if2~aT#h2`8++`VPeIH$Qvc(LA-xUZfG9OVX z1qoBgw0p&v8)9KN`?y0b`>~f*g1wM*u)2*d?T7?A z&0klHWnhgX7D7EL-)%gbZ-kk6-8S}OholreGegyUQQ!!9o6AiJ@}PMS^!cbmA*4Px zw=bTPa(fn-hA~QSuI)ByX{OXjy*fnNF45w$fuqoZpdifJ1(`qo-qF7P}Fz9TR

KGw`Su9_QtvW2YY9xS< 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 diff --git a/examples/org.weft.demo.notes/signature.sig b/examples/org.weft.demo.notes/signature.sig index fe2ce52..a6539c9 100644 --- a/examples/org.weft.demo.notes/signature.sig +++ b/examples/org.weft.demo.notes/signature.sig @@ -1 +1 @@ -555f2d3d0183d28f99f66efef3f2dc8bb8aa3e6a4d038dc78b1414ccf54d23dd52a1668314d377d10603580908d7d9de7109a6ddcf0d7aa175bbf4bbd835c80c \ No newline at end of file +a533f421c6e9b5d5df82d082b68af0b8408a7f02fd060bd71d1b33bc1579046a3791d73a929b90c8a62c7c42949f412bd88952c7e10f1575cc85cccb1602a40d \ No newline at end of file diff --git a/examples/org.weft.demo.notes/src/main.rs b/examples/org.weft.demo.notes/src/main.rs index e5162d8..2edf4b1 100644 --- a/examples/org.weft.demo.notes/src/main.rs +++ b/examples/org.weft.demo.notes/src/main.rs @@ -79,13 +79,20 @@ impl SaveLock { .open(LOCK_PATH) { Ok(mut file) => { - let _ = file.write_all(token.as_bytes()); + if let Err(e) = file.write_all(token.as_bytes()) { + let _ = std::fs::remove_file(LOCK_PATH); + return Err(format!("cannot lock notes: {e}")); + } return Ok(SaveLock { token }); } Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => { - // A lock older than STALE_LOCK (or of unknown age) was left - // by an ended session. Renaming it away is atomic, so only - // one save can take it over. + // A lock older than STALE_LOCK was left by an ended session + // (wasmtime-wasi reports modification times, so an unknown + // age does not occur in practice). Renaming it away is + // atomic, so only one save can take it over. Two saves that + // both see it stale within the same instant could still + // both proceed; that needs an abandoned lock and two + // windows saving at once. let stale = std::fs::metadata(LOCK_PATH) .and_then(|m| m.modified()) .map(|t| t.elapsed().is_ok_and(|age| age > STALE_LOCK)) @@ -112,7 +119,8 @@ impl Drop for SaveLock { } } -/// Removes staging files left by saves that ended before their rename. Only +/// Removes staging files left by saves that ended before their rename, and +/// stale locks whose removal failed. Only /// called with the lock held, when no other save is in progress. fn remove_abandoned_staging() { let Ok(entries) = std::fs::read_dir("/data") else { @@ -121,7 +129,9 @@ fn remove_abandoned_staging() { for entry in entries.flatten() { let name = entry.file_name(); let name = name.to_string_lossy(); - if name.starts_with(".notes.txt.") && name.ends_with(".saving") { + let abandoned = (name.starts_with(".notes.txt.") && name.ends_with(".saving")) + || (name.starts_with(".notes.lock.") && name.ends_with(".stale")); + if abandoned { let _ = std::fs::remove_file(entry.path()); } } diff --git a/examples/org.weft.demo.notes/ui/index.html b/examples/org.weft.demo.notes/ui/index.html index 7442945..446f273 100644 --- a/examples/org.weft.demo.notes/ui/index.html +++ b/examples/org.weft.demo.notes/ui/index.html @@ -119,6 +119,7 @@ var seq = 0; var pending = null; var lastSent = null; + var loading = null; // timer of the outstanding load, if any var encoder = new TextEncoder(); function setStatus(msg) { statusEl.textContent = msg; } @@ -169,15 +170,32 @@ setStatus('saving…'); }); + // Loads the stored notes into a read-only editor. Only one load is + // outstanding at a time; a failed or unanswered load can be retried with + // Discard. + function load(status) { + rev = null; + lastSent = null; + setLoaded(false); + loading = setTimeout(function () { + loading = null; + setStatus('the notes did not load; use Discard to retry'); + }, REPLY_TIMEOUT); + send({ op: 'load' }); + setStatus(status); + } + + function finishLoad() { + clearTimeout(loading); + loading = null; + } + // Discard reloads the stored notes, replacing unsaved edits. document.getElementById('discard').addEventListener('click', function () { - if (!window.weftIpc || pending || rev === null) return; + if (!window.weftIpc || pending || loading) return; editor.value = saved; countChars(); - rev = null; - setLoaded(false); - send({ op: 'load' }); - setStatus('reloading…'); + load('reloading…'); }); document.addEventListener('keydown', function (e) { @@ -193,14 +211,15 @@ if (msg.op === 'loaded') { // Only the reply to the outstanding load applies; the editor is // read-only until it arrives, so it never replaces newer text. - if (rev !== null) return; + if (!loading) return; + finishLoad(); editor.value = msg.text; countChars(); saved = msg.text; rev = msg.rev; setLoaded(true); setStatus(''); - } else if (msg.op === 'saved' && lastSent && msg.seq === lastSent.seq) { + } else if (msg.op === 'saved' && !loading && lastSent && msg.seq === lastSent.seq) { // Also accepts an acknowledgement that arrives after the timeout. saved = lastSent.text; rev = msg.rev; @@ -208,6 +227,7 @@ setStatus(editor.value === saved ? 'saved' : 'saved; newer changes are not saved yet'); } else if (msg.op === 'error') { if (pending && msg.seq === pending.seq) finishSave(); + if (loading && msg.seq === undefined) finishLoad(); setStatus(msg.conflict ? 'not saved: changed in another window. Copy your text, then Discard to reload.' : 'error: ' + msg.message); @@ -217,7 +237,7 @@ function setupIpc() { if (!window.weftIpc) { setTimeout(setupIpc, 50); return; } window.weftIpc.onmessage = onMessage; - send({ op: 'load' }); + load(''); } setLoaded(false); diff --git a/tests/frame/check_notes.py b/tests/frame/check_notes.py index baad405..937ec1e 100644 --- a/tests/frame/check_notes.py +++ b/tests/frame/check_notes.py @@ -16,6 +16,9 @@ sequence, quotes, a tab and non-ASCII characters, launches 4. Discard reloads the stored text. Keys typed while that reload is in flight (runtime paused again) must be ignored, so a following save stores the reloaded text plus only what was typed afterwards. +5. A load that fails (the stored notes are not valid UTF-8) leaves Discard + usable: after the file is repaired, Discard loads it and it can be edited + and saved again. Requires Xvfb, xwd, ImageMagick's convert and xdotool. """ @@ -136,6 +139,22 @@ def run(args, desktop, home, xdotool): act("type", "--delay", "40", "!") act("key", "ctrl+s") wait_for_file(notes, other + "!") + notes.write_bytes(b"\xff not text") + act("mousemove", "--sync", *DISCARD) + act("click", "1") + time.sleep(2) + if notes.read_bytes() != b"\xff not text": + raise AssertionError("a failed load changed the stored notes") + notes.write_text("repaired", encoding="utf-8") + act("click", "1") + time.sleep(2) + act("mousemove", "--sync", "100", "300") + act("click", "1") + act("key", "ctrl+End") + act("type", "--delay", "40", "?") + act("key", "ctrl+s") + wait_for_file(notes, "repaired?") + leftovers = [p.name for p in notes.parent.iterdir() if p.name != "notes.txt"] if leftovers: raise AssertionError(f"files left beside the notes: {leftovers}")