sliftutils 1.2.17 → 1.2.18

package/index.d.ts

@@ -1336,7 +1336,7 @@ declare module "sliftutils/storage/fileSystemPointer" {
     export declare function getFileSystemPointer(config: {
         pointer: FileSystemPointer;
     }): Promise<{
-        onUserActivation(modeOverride?: "read" | "readwrite"): Promise<FileSystemFileHandle | FileSystemDirectoryHandle>;
+        onUserActivation(modeOverride?: "read" | "readwrite"): Promise<FileSystemFileHandle | FileSystemDirectoryHandle | undefined>;
     } | undefined>;
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "1.2.17",
+    "version": "1.2.18",
     "main": "index.js",
     "license": "MIT",
     "files": [

package/storage/DiskCollection.ts

@@ -8,7 +8,7 @@ import { TransactionStorage } from "./TransactionStorage";
 import { PendingStorage } from "./PendingStorage";
 import { isDefined } from "../misc/types";
 import { PrivateFileSystemStorage } from "./PrivateFileSystemStorage";
-import { isInChromeExtension } from "../misc/environment";
+import { isInChromeExtension, isInChromeExtensionBackground } from "../misc/environment";
 import { CBORStorage } from "./CBORStorage";
 
 export class DiskCollection<T> implements IStorageSync<T> {
@@ -27,7 +27,7 @@ export class DiskCollection<T> implements IStorageSync<T> {
     public transactionStorage: TransactionStorage | undefined;
     async initStorage(): Promise<IStorage<T>> {
         // If a Chrome extension, just return null. 
-        if (isInChromeExtension()) return null as any;
+        if (isInChromeExtensionBackground()) return null as any;
         let curCollection: IStorageRaw;
         if (this.config?.noPrompt && !isNode()) {
             curCollection = await new PrivateFileSystemStorage(`collections/${this.collectionName}`);

package/storage/fileSystemPointer.d.ts

@@ -7,5 +7,5 @@ export declare function deleteFileSystemPointer(pointer: FileSystemPointer): Pro
 export declare function getFileSystemPointer(config: {
     pointer: FileSystemPointer;
 }): Promise<{
-    onUserActivation(modeOverride?: "read" | "readwrite"): Promise<FileSystemFileHandle | FileSystemDirectoryHandle>;
+    onUserActivation(modeOverride?: "read" | "readwrite"): Promise<FileSystemFileHandle | FileSystemDirectoryHandle | undefined>;
 } | undefined>;

package/storage/fileSystemPointer.ts

@@ -63,7 +63,7 @@ export async function getFileSystemPointer(config: {
     // IMPORTANT! In some circumstances user activation is not required (with multiple tabs,
     //      and potentially with https://developer.chrome.com/blog/persistent-permissions-for-the-file-system-access-api),
     //      so... trying to call onUserActivation immmediately is a good idea (although it might throw).
-    onUserActivation(modeOverride?: "read" | "readwrite"): Promise<FileSystemFileHandle | FileSystemDirectoryHandle>
+    onUserActivation(modeOverride?: "read" | "readwrite"): Promise<FileSystemFileHandle | FileSystemDirectoryHandle | undefined>
 } | undefined
 > {
     const handle = await read(config.pointer);
@@ -71,10 +71,14 @@ export async function getFileSystemPointer(config: {
     let mode = config.pointer.split("_").at(-1);
     return {
         async onUserActivation(modeOverride) {
-            let testMode = await (handle as any).queryPermission({ mode: mode });
-            if (testMode !== mode) {
-                await (handle as any).requestPermission({ mode: modeOverride ?? mode });
+            let requestedMode = modeOverride ?? mode;
+            let permission = await (handle as any).queryPermission({ mode: requestedMode });
+            if (permission !== "granted") {
+                permission = await (handle as any).requestPermission({ mode: requestedMode });
             }
+            // If the user denied (or otherwise didn't grant) the request, treat the
+            //  stored pointer as unusable so callers can fall back to showDirectoryPicker.
+            if (permission !== "granted") return undefined;
             return handle;
         }
     };