react-native-permission-handler 0.2.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +44 -0
- package/dist/engines/expo.d.mts +1 -1
- package/dist/engines/expo.d.ts +1 -1
- package/dist/engines/rnp.d.mts +1 -1
- package/dist/engines/rnp.d.ts +1 -1
- package/dist/index.d.mts +2 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.js +165 -43
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +165 -43
- package/dist/index.mjs.map +1 -1
- package/dist/{types-QXyq8VnD.d.mts → types-DwqbbLGD.d.mts} +6 -0
- package/dist/{types-QXyq8VnD.d.ts → types-DwqbbLGD.d.ts} +6 -0
- package/package.json +1 -1
- package/src/core/debug-logger.test.ts +67 -0
- package/src/core/debug-logger.ts +29 -0
- package/src/core/with-timeout.test.ts +82 -0
- package/src/core/with-timeout.ts +34 -0
- package/src/hooks/use-multiple-permissions.ts +71 -29
- package/src/hooks/use-permission-handler.ts +60 -14
- package/src/types.ts +6 -0
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { PermissionTimeoutError, withTimeout } from "./with-timeout";
|
|
3
|
+
|
|
4
|
+
describe("withTimeout", () => {
|
|
5
|
+
beforeEach(() => {
|
|
6
|
+
vi.useFakeTimers();
|
|
7
|
+
});
|
|
8
|
+
|
|
9
|
+
afterEach(() => {
|
|
10
|
+
vi.useRealTimers();
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
it("resolves when the promise resolves before timeout", async () => {
|
|
14
|
+
const promise = Promise.resolve("granted");
|
|
15
|
+
const result = await withTimeout(promise, 5000, "camera");
|
|
16
|
+
expect(result).toBe("granted");
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
it("rejects with PermissionTimeoutError when promise hangs", async () => {
|
|
20
|
+
const promise = new Promise(() => {}); // never resolves
|
|
21
|
+
const wrapped = withTimeout(promise, 1000, "camera");
|
|
22
|
+
|
|
23
|
+
vi.advanceTimersByTime(1000);
|
|
24
|
+
|
|
25
|
+
await expect(wrapped).rejects.toThrow(PermissionTimeoutError);
|
|
26
|
+
await expect(wrapped).rejects.toThrow("timed out after 1000ms");
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it("includes permission name in error", async () => {
|
|
30
|
+
const promise = new Promise(() => {});
|
|
31
|
+
const wrapped = withTimeout(promise, 500, "microphone");
|
|
32
|
+
|
|
33
|
+
vi.advanceTimersByTime(500);
|
|
34
|
+
|
|
35
|
+
try {
|
|
36
|
+
await wrapped;
|
|
37
|
+
} catch (err) {
|
|
38
|
+
expect(err).toBeInstanceOf(PermissionTimeoutError);
|
|
39
|
+
expect((err as PermissionTimeoutError).permission).toBe("microphone");
|
|
40
|
+
expect((err as PermissionTimeoutError).timeoutMs).toBe(500);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it("clears the timer when promise resolves", async () => {
|
|
45
|
+
const clearTimeoutSpy = vi.spyOn(globalThis, "clearTimeout");
|
|
46
|
+
const promise = Promise.resolve("denied");
|
|
47
|
+
|
|
48
|
+
await withTimeout(promise, 5000, "camera");
|
|
49
|
+
|
|
50
|
+
expect(clearTimeoutSpy).toHaveBeenCalled();
|
|
51
|
+
clearTimeoutSpy.mockRestore();
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
it("clears the timer when promise rejects", async () => {
|
|
55
|
+
const clearTimeoutSpy = vi.spyOn(globalThis, "clearTimeout");
|
|
56
|
+
const promise = Promise.reject(new Error("network error"));
|
|
57
|
+
|
|
58
|
+
await expect(withTimeout(promise, 5000, "camera")).rejects.toThrow("network error");
|
|
59
|
+
|
|
60
|
+
expect(clearTimeoutSpy).toHaveBeenCalled();
|
|
61
|
+
clearTimeoutSpy.mockRestore();
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
it("propagates original rejection when promise rejects before timeout", async () => {
|
|
65
|
+
const error = new Error("engine error");
|
|
66
|
+
const promise = Promise.reject(error);
|
|
67
|
+
|
|
68
|
+
await expect(withTimeout(promise, 5000, "camera")).rejects.toBe(error);
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
describe("PermissionTimeoutError", () => {
|
|
73
|
+
it("has the correct name", () => {
|
|
74
|
+
const error = new PermissionTimeoutError("camera", 1000);
|
|
75
|
+
expect(error.name).toBe("PermissionTimeoutError");
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
it("is an instance of Error", () => {
|
|
79
|
+
const error = new PermissionTimeoutError("camera", 1000);
|
|
80
|
+
expect(error).toBeInstanceOf(Error);
|
|
81
|
+
});
|
|
82
|
+
});
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export class PermissionTimeoutError extends Error {
|
|
2
|
+
readonly permission: string;
|
|
3
|
+
readonly timeoutMs: number;
|
|
4
|
+
|
|
5
|
+
constructor(permission: string, timeoutMs: number) {
|
|
6
|
+
super(`Permission request for "${permission}" timed out after ${timeoutMs}ms`);
|
|
7
|
+
this.name = "PermissionTimeoutError";
|
|
8
|
+
this.permission = permission;
|
|
9
|
+
this.timeoutMs = timeoutMs;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export function withTimeout<T>(
|
|
14
|
+
promise: Promise<T>,
|
|
15
|
+
timeoutMs: number,
|
|
16
|
+
permission: string,
|
|
17
|
+
): Promise<T> {
|
|
18
|
+
return new Promise((resolve, reject) => {
|
|
19
|
+
const timer = setTimeout(
|
|
20
|
+
() => reject(new PermissionTimeoutError(permission, timeoutMs)),
|
|
21
|
+
timeoutMs,
|
|
22
|
+
);
|
|
23
|
+
promise.then(
|
|
24
|
+
(val) => {
|
|
25
|
+
clearTimeout(timer);
|
|
26
|
+
resolve(val);
|
|
27
|
+
},
|
|
28
|
+
(err) => {
|
|
29
|
+
clearTimeout(timer);
|
|
30
|
+
reject(err);
|
|
31
|
+
},
|
|
32
|
+
);
|
|
33
|
+
});
|
|
34
|
+
}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { useCallback, useEffect, useRef, useState } from "react";
|
|
2
|
+
import { createDebugLogger } from "../core/debug-logger";
|
|
3
|
+
import { PermissionTimeoutError, withTimeout } from "../core/with-timeout";
|
|
2
4
|
import { resolveEngine } from "../engines/use-engine";
|
|
3
5
|
import type {
|
|
4
6
|
MultiPermissionEntry,
|
|
@@ -37,7 +39,16 @@ export function useMultiplePermissions(
|
|
|
37
39
|
config: MultiplePermissionsConfig,
|
|
38
40
|
): MultiplePermissionsResult {
|
|
39
41
|
const engine = resolveEngine(config.engine);
|
|
40
|
-
const {
|
|
42
|
+
const {
|
|
43
|
+
permissions,
|
|
44
|
+
strategy,
|
|
45
|
+
autoCheck = true,
|
|
46
|
+
requestTimeout,
|
|
47
|
+
onTimeout,
|
|
48
|
+
debug,
|
|
49
|
+
onAllGranted,
|
|
50
|
+
} = config;
|
|
51
|
+
const logger = createDebugLogger(debug, "multi");
|
|
41
52
|
const [statuses, setStatuses] = useState<Record<string, PermissionFlowState>>(() => {
|
|
42
53
|
const initial: Record<string, PermissionFlowState> = {};
|
|
43
54
|
for (const entry of permissions) {
|
|
@@ -54,14 +65,17 @@ export function useMultiplePermissions(
|
|
|
54
65
|
isRunning.current = true;
|
|
55
66
|
|
|
56
67
|
const update = (key: string, state: PermissionFlowState) => {
|
|
57
|
-
setStatuses((prev) =>
|
|
68
|
+
setStatuses((prev) => {
|
|
69
|
+
logger.transition(prev[key] ?? "idle", state, key);
|
|
70
|
+
return { ...prev, [key]: state };
|
|
71
|
+
});
|
|
58
72
|
};
|
|
59
73
|
|
|
60
74
|
try {
|
|
61
75
|
if (strategy === "sequential") {
|
|
62
|
-
await runSequential(permissions, engine, update);
|
|
76
|
+
await runSequential(permissions, engine, update, requestTimeout, onTimeout);
|
|
63
77
|
} else {
|
|
64
|
-
await runParallel(permissions, engine, update);
|
|
78
|
+
await runParallel(permissions, engine, update, requestTimeout, onTimeout);
|
|
65
79
|
}
|
|
66
80
|
|
|
67
81
|
// Final check: are all granted?
|
|
@@ -79,7 +93,7 @@ export function useMultiplePermissions(
|
|
|
79
93
|
} finally {
|
|
80
94
|
isRunning.current = false;
|
|
81
95
|
}
|
|
82
|
-
}, [permissions, strategy, engine, onAllGranted]);
|
|
96
|
+
}, [permissions, strategy, engine, requestTimeout, onTimeout, logger, onAllGranted]);
|
|
83
97
|
|
|
84
98
|
// Auto-check on mount
|
|
85
99
|
// biome-ignore lint/correctness/useExhaustiveDependencies: intentional mount-only effect
|
|
@@ -112,6 +126,8 @@ async function runSequential(
|
|
|
112
126
|
permissions: MultiPermissionEntry[],
|
|
113
127
|
engine: PermissionEngine,
|
|
114
128
|
updateStatus: (key: string, state: PermissionFlowState) => void,
|
|
129
|
+
requestTimeout?: number,
|
|
130
|
+
onTimeout?: () => void,
|
|
115
131
|
): Promise<void> {
|
|
116
132
|
for (const entry of permissions) {
|
|
117
133
|
const key = permissionKey(entry);
|
|
@@ -138,19 +154,31 @@ async function runSequential(
|
|
|
138
154
|
|
|
139
155
|
// Denied — request it
|
|
140
156
|
updateStatus(key, "requesting");
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
157
|
+
try {
|
|
158
|
+
const requestPromise = engine.request(entry.permission);
|
|
159
|
+
const requestStatus = requestTimeout
|
|
160
|
+
? await withTimeout(requestPromise, requestTimeout, entry.permission)
|
|
161
|
+
: await requestPromise;
|
|
162
|
+
|
|
163
|
+
if (isGrantedStatus(requestStatus)) {
|
|
164
|
+
updateStatus(key, "granted");
|
|
165
|
+
entry.onGrant?.();
|
|
166
|
+
} else if (requestStatus === "blocked") {
|
|
167
|
+
updateStatus(key, "blockedPrompt");
|
|
168
|
+
entry.onBlock?.();
|
|
169
|
+
break;
|
|
170
|
+
} else {
|
|
171
|
+
updateStatus(key, "denied");
|
|
172
|
+
entry.onDeny?.();
|
|
173
|
+
break;
|
|
174
|
+
}
|
|
175
|
+
} catch (err) {
|
|
176
|
+
if (err instanceof PermissionTimeoutError) {
|
|
177
|
+
onTimeout?.();
|
|
178
|
+
updateStatus(key, "blockedPrompt");
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
throw err;
|
|
154
182
|
}
|
|
155
183
|
}
|
|
156
184
|
}
|
|
@@ -159,6 +187,8 @@ async function runParallel(
|
|
|
159
187
|
permissions: MultiPermissionEntry[],
|
|
160
188
|
engine: PermissionEngine,
|
|
161
189
|
updateStatus: (key: string, state: PermissionFlowState) => void,
|
|
190
|
+
requestTimeout?: number,
|
|
191
|
+
onTimeout?: () => void,
|
|
162
192
|
): Promise<void> {
|
|
163
193
|
// Check all in parallel
|
|
164
194
|
const checkResults = await Promise.all(
|
|
@@ -193,17 +223,29 @@ async function runParallel(
|
|
|
193
223
|
}
|
|
194
224
|
|
|
195
225
|
updateStatus(key, "requesting");
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
226
|
+
try {
|
|
227
|
+
const requestPromise = engine.request(entry.permission);
|
|
228
|
+
const requestStatus = requestTimeout
|
|
229
|
+
? await withTimeout(requestPromise, requestTimeout, entry.permission)
|
|
230
|
+
: await requestPromise;
|
|
231
|
+
|
|
232
|
+
if (isGrantedStatus(requestStatus)) {
|
|
233
|
+
updateStatus(key, "granted");
|
|
234
|
+
entry.onGrant?.();
|
|
235
|
+
} else if (requestStatus === "blocked") {
|
|
236
|
+
updateStatus(key, "blockedPrompt");
|
|
237
|
+
entry.onBlock?.();
|
|
238
|
+
} else {
|
|
239
|
+
updateStatus(key, "denied");
|
|
240
|
+
entry.onDeny?.();
|
|
241
|
+
}
|
|
242
|
+
} catch (err) {
|
|
243
|
+
if (err instanceof PermissionTimeoutError) {
|
|
244
|
+
onTimeout?.();
|
|
245
|
+
updateStatus(key, "blockedPrompt");
|
|
246
|
+
} else {
|
|
247
|
+
throw err;
|
|
248
|
+
}
|
|
207
249
|
}
|
|
208
250
|
}
|
|
209
251
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { useCallback, useEffect, useRef, useState } from "react";
|
|
2
2
|
import { AppState } from "react-native";
|
|
3
|
+
import { createDebugLogger } from "../core/debug-logger";
|
|
3
4
|
import { transition } from "../core/state-machine";
|
|
5
|
+
import { PermissionTimeoutError, withTimeout } from "../core/with-timeout";
|
|
4
6
|
import { resolveEngine } from "../engines/use-engine";
|
|
5
7
|
import type {
|
|
6
8
|
PermissionFlowState,
|
|
@@ -17,52 +19,91 @@ export function usePermissionHandler(config: PermissionHandlerConfig): Permissio
|
|
|
17
19
|
const waitingForSettings = useRef(false);
|
|
18
20
|
const appStateRef = useRef(AppState.currentState);
|
|
19
21
|
|
|
20
|
-
const {
|
|
22
|
+
const {
|
|
23
|
+
permission,
|
|
24
|
+
autoCheck = true,
|
|
25
|
+
requestTimeout,
|
|
26
|
+
onTimeout,
|
|
27
|
+
debug,
|
|
28
|
+
onGrant,
|
|
29
|
+
onDeny,
|
|
30
|
+
onBlock,
|
|
31
|
+
onSettingsReturn,
|
|
32
|
+
} = config;
|
|
33
|
+
|
|
34
|
+
const logger = createDebugLogger(debug, permission);
|
|
21
35
|
|
|
22
36
|
const checkPermission = useCallback(async () => {
|
|
23
|
-
setFlowState((s) =>
|
|
37
|
+
setFlowState((s) => {
|
|
38
|
+
const next = transition(s, { type: "CHECK" });
|
|
39
|
+
logger.transition(s, next, "CHECK");
|
|
40
|
+
return next;
|
|
41
|
+
});
|
|
24
42
|
try {
|
|
25
43
|
const status = await engine.check(permission);
|
|
26
44
|
setNativeStatus(status);
|
|
27
45
|
setFlowState((s) => {
|
|
28
46
|
const next = transition(s, { type: "CHECK_RESULT", status });
|
|
47
|
+
logger.transition(s, next, `CHECK_RESULT:${status}`);
|
|
29
48
|
if (next === "granted" && s !== "granted") onGrant?.();
|
|
30
49
|
return next;
|
|
31
50
|
});
|
|
32
51
|
} catch {
|
|
33
52
|
setFlowState("idle");
|
|
34
53
|
}
|
|
35
|
-
}, [engine, permission, onGrant]);
|
|
54
|
+
}, [engine, permission, logger, onGrant]);
|
|
36
55
|
|
|
37
56
|
const requestPermission = useCallback(async () => {
|
|
38
57
|
if (isRequesting.current) return;
|
|
39
58
|
isRequesting.current = true;
|
|
40
59
|
|
|
41
|
-
setFlowState((s) =>
|
|
60
|
+
setFlowState((s) => {
|
|
61
|
+
const next = transition(s, { type: "PRE_PROMPT_CONFIRM" });
|
|
62
|
+
logger.transition(s, next, "PRE_PROMPT_CONFIRM");
|
|
63
|
+
return next;
|
|
64
|
+
});
|
|
42
65
|
try {
|
|
43
|
-
const
|
|
66
|
+
const requestPromise = engine.request(permission);
|
|
67
|
+
const status = requestTimeout
|
|
68
|
+
? await withTimeout(requestPromise, requestTimeout, permission)
|
|
69
|
+
: await requestPromise;
|
|
44
70
|
setNativeStatus(status);
|
|
45
71
|
setFlowState((s) => {
|
|
46
72
|
const next = transition(s, { type: "REQUEST_RESULT", status });
|
|
73
|
+
logger.transition(s, next, `REQUEST_RESULT:${status}`);
|
|
47
74
|
if (next === "granted") onGrant?.();
|
|
48
75
|
if (next === "denied") onDeny?.();
|
|
49
76
|
if (next === "blockedPrompt") onBlock?.();
|
|
50
77
|
return next;
|
|
51
78
|
});
|
|
52
|
-
} catch {
|
|
53
|
-
|
|
79
|
+
} catch (err) {
|
|
80
|
+
if (err instanceof PermissionTimeoutError) {
|
|
81
|
+
logger.info(`request timed out after ${requestTimeout}ms`);
|
|
82
|
+
onTimeout?.();
|
|
83
|
+
setFlowState("blockedPrompt");
|
|
84
|
+
} else {
|
|
85
|
+
setFlowState("denied");
|
|
86
|
+
}
|
|
54
87
|
} finally {
|
|
55
88
|
isRequesting.current = false;
|
|
56
89
|
}
|
|
57
|
-
}, [engine, permission, onGrant, onDeny, onBlock]);
|
|
90
|
+
}, [engine, permission, requestTimeout, onTimeout, logger, onGrant, onDeny, onBlock]);
|
|
58
91
|
|
|
59
92
|
const dismiss = useCallback(() => {
|
|
60
|
-
setFlowState((s) =>
|
|
93
|
+
setFlowState((s) => {
|
|
94
|
+
const next = transition(s, { type: "PRE_PROMPT_DISMISS" });
|
|
95
|
+
logger.transition(s, next, "PRE_PROMPT_DISMISS");
|
|
96
|
+
return next;
|
|
97
|
+
});
|
|
61
98
|
onDeny?.();
|
|
62
|
-
}, [onDeny]);
|
|
99
|
+
}, [logger, onDeny]);
|
|
63
100
|
|
|
64
101
|
const goToSettings = useCallback(async () => {
|
|
65
|
-
setFlowState((s) =>
|
|
102
|
+
setFlowState((s) => {
|
|
103
|
+
const next = transition(s, { type: "OPEN_SETTINGS" });
|
|
104
|
+
logger.transition(s, next, "OPEN_SETTINGS");
|
|
105
|
+
return next;
|
|
106
|
+
});
|
|
66
107
|
waitingForSettings.current = true;
|
|
67
108
|
try {
|
|
68
109
|
await engine.openSettings();
|
|
@@ -70,15 +111,20 @@ export function usePermissionHandler(config: PermissionHandlerConfig): Permissio
|
|
|
70
111
|
waitingForSettings.current = false;
|
|
71
112
|
setFlowState("blockedPrompt");
|
|
72
113
|
}
|
|
73
|
-
}, [engine]);
|
|
114
|
+
}, [engine, logger]);
|
|
74
115
|
|
|
75
116
|
const recheckAfterSettings = useCallback(async () => {
|
|
76
|
-
setFlowState((s) =>
|
|
117
|
+
setFlowState((s) => {
|
|
118
|
+
const next = transition(s, { type: "SETTINGS_RETURN" });
|
|
119
|
+
logger.transition(s, next, "SETTINGS_RETURN");
|
|
120
|
+
return next;
|
|
121
|
+
});
|
|
77
122
|
try {
|
|
78
123
|
const status = await engine.check(permission);
|
|
79
124
|
setNativeStatus(status);
|
|
80
125
|
setFlowState((s) => {
|
|
81
126
|
const next = transition(s, { type: "RECHECK_RESULT", status });
|
|
127
|
+
logger.transition(s, next, `RECHECK_RESULT:${status}`);
|
|
82
128
|
if (next === "granted") onGrant?.();
|
|
83
129
|
onSettingsReturn?.(next === "granted");
|
|
84
130
|
return next;
|
|
@@ -86,7 +132,7 @@ export function usePermissionHandler(config: PermissionHandlerConfig): Permissio
|
|
|
86
132
|
} catch {
|
|
87
133
|
setFlowState("blockedPrompt");
|
|
88
134
|
}
|
|
89
|
-
}, [engine, permission, onGrant, onSettingsReturn]);
|
|
135
|
+
}, [engine, permission, logger, onGrant, onSettingsReturn]);
|
|
90
136
|
|
|
91
137
|
// Auto-check on mount
|
|
92
138
|
// biome-ignore lint/correctness/useExhaustiveDependencies: intentional mount-only effect
|
package/src/types.ts
CHANGED
|
@@ -82,6 +82,9 @@ export interface PermissionHandlerConfig extends PermissionCallbacks {
|
|
|
82
82
|
blockedPrompt: BlockedPromptConfig;
|
|
83
83
|
autoCheck?: boolean;
|
|
84
84
|
recheckOnForeground?: boolean;
|
|
85
|
+
requestTimeout?: number;
|
|
86
|
+
onTimeout?: () => void;
|
|
87
|
+
debug?: boolean | ((msg: string) => void);
|
|
85
88
|
}
|
|
86
89
|
|
|
87
90
|
/**
|
|
@@ -118,6 +121,9 @@ export interface MultiplePermissionsConfig {
|
|
|
118
121
|
strategy: "sequential" | "parallel";
|
|
119
122
|
engine?: PermissionEngine;
|
|
120
123
|
autoCheck?: boolean;
|
|
124
|
+
requestTimeout?: number;
|
|
125
|
+
onTimeout?: () => void;
|
|
126
|
+
debug?: boolean | ((msg: string) => void);
|
|
121
127
|
onAllGranted?: () => void;
|
|
122
128
|
}
|
|
123
129
|
|