Fix the mangling of the opfs async proxy script's URI caused by both OPFS VFSes modif...

FossilOrigin-Name: c1cb61f473a11a325ef421ba8edfb20257203688565f7db62309044be183af5f

diff --git a/ext/wasm/api/opfs-common-shared.c-pp.js b/ext/wasm/api/opfs-common-shared.c-pp.js
index 15eec1ff8d12993b3507976ce7e8fd010f379ce1..ae750e75d3529643ebf18e9fc043278fd84ea483 100644 (file)
--- a/ext/wasm/api/opfs-common-shared.c-pp.js
+++ b/ext/wasm/api/opfs-common-shared.c-pp.js
@@ -465,13 +465,15 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       ? +urlParams.get('opfs-verbose') : 1;
     options.sanityChecks ??= urlParams.has('opfs-sanity-check');
 
-    opfsUtil.proxyUri ??= "sqlite3-opfs-async-proxy.js";
-    if( sqlite3.scriptInfo?.sqlite3Dir ){
-      /* Doing this from one scope up, outside of this function, does
-         not work. */
-      opfsUtil.proxyUri = (
-        sqlite3.scriptInfo.sqlite3Dir + opfsUtil.proxyUri
-      );
+    if( !opfsUtil.proxyUri ){
+      opfsUtil.proxyUri = "sqlite3-opfs-async-proxy.js";
+      if( sqlite3.scriptInfo?.sqlite3Dir ){
+        /* Doing this from one scope up, outside of this function, does
+           not work. */
+        opfsUtil.proxyUri = (
+          sqlite3.scriptInfo.sqlite3Dir + opfsUtil.proxyUri
+        );
+      }
     }
     options.proxyUri ??= opfsUtil.proxyUri;
     if('function' === typeof options.proxyUri){

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index fd65dbc3395186c57fa4beea24d7c417e93f1eb4..6f22dc150bb104b32639a30f697b119987e0a7e0 100644 (file)
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -115,6 +115,11 @@
               <a href='speedtest1-worker-64bit.html?vfs=opfs&size=10'>64-bit</a>):
               speedtest1-worker with the
               OPFS VFS preselected and configured for a moderate workload.</li>
+            <li>speedtest1-worker?vfs=opfs-wl
+              (<a href='speedtest1-worker.html?vfs=opfs-wl&size=10'>32-bit</a>,
+              <a href='speedtest1-worker-64bit.html?vfs=opfs-wl&size=10'>64-bit</a>):
+              speedtest1-worker with the
+              OPFS Web Locks VFS preselected and configured for a moderate workload.</li>
             <li>speedtest1-worker?vfs=opfs-sahpool
               (<a href='speedtest1-worker.html?vfs=opfs-sahpool&size=10'>32-bit</a>,
               <a href='speedtest1-worker-64bit.html?vfs=opfs-sahpool&size=10'>64-bit</a>):

diff --git a/manifest b/manifest
index 44ee1e71071630316165715496f3f8695074a727..313bebc506999f72bd1a83d3919492c7eda91f7c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cleanups\sand\sdocs\sin\sthe\sopfs\svfs\sand\sits\sconcurrency\stester.\sExperimentally\sadd\ssqlite3.capi.sqlite3_js_retry_busy(),\swhich\sruns\sa\scallback\srepeatedly\suntil\sit\s_stops_\sreturning\s(or\sthrowing)\san\sSQLITE_BUSY\serror.
-D 2026-03-07T03:32:17.361
+C Fix\sthe\smangling\sof\sthe\sopfs\sasync\sproxy\sscript's\sURI\scaused\sby\sboth\sOPFS\sVFSes\smodifying\sit\sto\saccound\sfor\ssqlite3.dir.\sAdd\sa\slink\sto\sspeedtest1\swith\sopfw-wl\sto\sindex.html.
+D 2026-03-07T04:19:08.919
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -585,7 +585,7 @@ F ext/wasm/api/README.md a905d5c6bfc3e2df875bd391d6d6b7b48d41b43bdee02ad115b4724
 F ext/wasm/api/extern-post-js.c-pp.js d9f42ecbedc784c0d086bc37800e52946a14f7a21600b291daa3f963c314f930
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/opfs-common-inline.c-pp.js 5be8d6d91963849e218221b48206ae55612630bb2cd7f30b1b6fcf7a9e374b76
-F ext/wasm/api/opfs-common-shared.c-pp.js d58f16b8bf00401d954249d154c91abc4d4f54221f755d774cf5c4e8f83a1a9f
+F ext/wasm/api/opfs-common-shared.c-pp.js 7ff4b6cfd486a9fff1781af9c1fe2e3f328fd2a6b3a2d7dd3d5f83979e2ca552
 F ext/wasm/api/post-js-footer.js a50c1a2c4d008aede7b2aa1f18891a7ee71437c2f415b8aeb3db237ddce2935b
 F ext/wasm/api/post-js-header.js f35d2dcf1ab7f22a93d565f8e0b622a2934fc4e743edf3b708e4dd8140eeff55
 F ext/wasm/api/pre-js.c-pp.js 9234ea680a2f6a2a177e8dcd934bdc5811a9f8409165433a252b87f4c07bba6f
@@ -624,7 +624,7 @@ F ext/wasm/fiddle/fiddle-worker.js 6c72acac2d381480bc9f5eb538e3f2faf2c1f72dd4fcb
 F ext/wasm/fiddle/fiddle.js 84fd75967e0af8b69d3dd849818342227d0f81d13db92e0dcbc63649b31a4893
 F ext/wasm/fiddle/index.c-pp.html 72c7e5517217960b3809648429ea396a7cbad0ffb2c92f6a2f5703abecb27317
 F ext/wasm/index-dist.html db23748044e286773f2768eec287669501703b5d5f72755e8db73607dc54d290
-F ext/wasm/index.html 475bc283338749db4e3fbf24cf3f5aa020cc85a1fffb780d400a915fcb5f1756
+F ext/wasm/index.html 5bf6cf1b0a3c8b9f5f54d77f2219d7ae87a15162055ce308109c49b1dcab4239
 F ext/wasm/jaccwabyt/jaccwabyt.js 4e2b797dc170851c9c530c3567679f4aa509eec0fab73b466d945b00b356574b
 F ext/wasm/jaccwabyt/jaccwabyt.md 6aa90fa1a973d0ad10d077088bea163b241d8470c75eafdef87620a1de1dea41
 F ext/wasm/mkdist.sh f8883b077a2ca47cf92e6f0ce305fbf72ca648c3501810125056c4b09c2d5554 x
@@ -2191,8 +2191,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 3b74ad9081daee560bf9b400e69a75abcc62dae7c5f55dcf46de84daae50ed9f
-R 5251eca545de3a2827b98f8a138c1479
+P 45c02ed21635f7ef45214ab5ec6230b6b8bd89e35ef5889db318523e1c679fea
+R a0b14fb61a3f361676cb6a84638efe48
 U stephan
-Z e640850ae89db803157694e7fdf4c165
+Z 3353e988da2dca384c44895dc97fbee8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d297924b935ffb17cbacf64844a2cb549e9fc24b..988c55dc1884775059864cb9816b6072e5381c96 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45c02ed21635f7ef45214ab5ec6230b6b8bd89e35ef5889db318523e1c679fea
+c1cb61f473a11a325ef421ba8edfb20257203688565f7db62309044be183af5f