Fix #2338 - Added explicit fs.revoke(path) (#2368)

WebReflection · web-flow · commit b4e9a3093c1c · 2025-08-06T14:40:52.000+02:00
diff --git a/core/src/stdlib/pyscript.js b/core/src/stdlib/pyscript.js
diff --git a/core/src/stdlib/pyscript/fs.py b/core/src/stdlib/pyscript/fs.py
@@ -49,6 +49,28 @@ async def mount(path, mode="readwrite", root="", id="pyscript"):
     mounted[path] = await interpreter.mountNativeFS(path, handler)
 
 
+async def revoke(path, id="pyscript"):
+    from _pyscript import fs, interpreter
+    from pyscript.magic_js import (
+        RUNNING_IN_WORKER,
+        sync,
+    )
+
+    uid = f"{path}@{id}"
+
+    if RUNNING_IN_WORKER:
+        had = sync.deleteFSHandler(uid)
+    else:
+        had = await fs.idb.has(uid)
+        if had:
+            had = await fs.idb.delete(uid)
+
+    if had:
+        interpreter._module.FS.unmount(path)
+
+    return had
+
+
 async def sync(path):
     await mounted[path].syncfs()
 
diff --git a/core/src/sync.js b/core/src/sync.js
@@ -16,7 +16,7 @@ export default {
      * Ask a user action via dialog and returns the directory handler once granted.
      * @param {string} uid
      * @param {{id?:string, mode?:"read"|"readwrite", hint?:"desktop"|"documents"|"downloads"|"music"|"pictures"|"videos"}} options
-     * @returns {boolean}
+     * @returns {Promise<boolean>}
      */
     async storeFSHandler(uid, options = {}) {
         if (await idb.has(uid)) return true;
@@ -28,4 +28,15 @@ export default {
             () => false,
         );
     },
+
+    /**
+     * Explicitly remove the unique identifier for the FS handler.
+     * @param {string} uid
+     * @returns {Promise<boolean>}
+     */
+    async deleteFSHandler(uid) {
+        const had = await idb.has(uid);
+        if (had) await idb.delete(uid);
+        return had;
+    },
 };
diff --git a/core/tests/manual/fs/index.py b/core/tests/manual/fs/index.py
@@ -19,6 +19,8 @@
 
     await fs.sync("/persistent")
 
+    # await fs.revoke("/persistent")
+
 elif not RUNNING_IN_WORKER:
     from pyscript import document
 
@@ -39,7 +41,7 @@ async def mount(event):
             js.alert("unable to grant access")
 
     async def unmount(event):
-        await fs.unmount("/persistent")
+        await fs.revoke("/persistent")
         button.textContent = "mount"
         button.onclick = mount
 
diff --git a/core/types/sync.d.ts b/core/types/sync.d.ts
@@ -9,12 +9,18 @@ declare namespace _default {
      * Ask a user action via dialog and returns the directory handler once granted.
      * @param {string} uid
      * @param {{id?:string, mode?:"read"|"readwrite", hint?:"desktop"|"documents"|"downloads"|"music"|"pictures"|"videos"}} options
-     * @returns {boolean}
+     * @returns {Promise<boolean>}
      */
     function storeFSHandler(uid: string, options?: {
         id?: string;
         mode?: "read" | "readwrite";
         hint?: "desktop" | "documents" | "downloads" | "music" | "pictures" | "videos";
-    }): boolean;
+    }): Promise<boolean>;
+    /**
+     * Explicitly remove the unique identifier for the FS handler.
+     * @param {string} uid
+     * @returns {Promise<boolean>}
+     */
+    function deleteFSHandler(uid: string): Promise<boolean>;
 }
 export default _default;
