Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function getPushGatewayUrl(clientConfig: ClientConfig): string {
return pushGatewayUrl;
}

export async function isNativePushPermissionGranted(): Promise<boolean> {
export async function isNativePushPermissionGranted(): Promise<boolean | null> {
const api = await getNativePushNotificationsApi();
return api.isPermissionGranted();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export type NativePushRegistration = {
};

export type NativePushNotificationsApi = {
isPermissionGranted: () => Promise<boolean>;
isPermissionGranted: () => Promise<boolean | null>;
requestPermission: () => Promise<NotificationPermission>;
registerForPushNotifications: (vapid?: string) => Promise<NativePushRegistration>;
unregisterForPushNotifications: () => Promise<void>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,29 @@ import { useClientConfig } from '$hooks/useClientConfig';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { enableUnifiedPush } from './UnifiedPushNotifications';
import { enableNativePush } from './NativePushNotifications';
import { enableNativePush, isNativePushPermissionGranted } from './NativePushNotifications';
import { isUnifiedPushPermissionGranted } from './UnifiedPushTransport';
import {
NotificationTransportRuntime,
type NotificationTransportRuntimeContext,
} from './NotificationTransportRuntime';
import {
type NotificationTransportPlatform,
type NotificationTransportProvider,
normalizeNotificationTransportMode,
resolvePreferredNotificationTransportProvider,
} from './NotificationTransport';

const log = createLogger('NotificationTransportRuntimeFeature');

async function checkPushPermission(
provider: NotificationTransportProvider | null
): Promise<boolean | null> {
if (provider === 'unifiedpush') return isUnifiedPushPermissionGranted();
if (provider === 'native') return isNativePushPermissionGranted();
return null;
}

function currentPlatform(): NotificationTransportPlatform {
if (!isTauri()) return 'web';
const platform = osType();
Expand All @@ -31,8 +41,14 @@ function currentPlatform(): NotificationTransportPlatform {
export function NotificationTransportRuntimeFeature() {
const mx = useMatrixClient();
const clientConfig = useClientConfig();
const [backgroundPushEnabled] = useSetting(settingsAtom, 'backgroundPushEnabled');
const [backgroundPushProvider] = useSetting(settingsAtom, 'backgroundPushProvider');
const [backgroundPushEnabled, setBackgroundPushEnabled] = useSetting(
settingsAtom,
'backgroundPushEnabled'
);
const [backgroundPushProvider, setBackgroundPushProvider] = useSetting(
settingsAtom,
'backgroundPushProvider'
);
const [pushTransportMode] = useSetting(settingsAtom, 'pushTransportMode');
const [pushTransportOverride] = useSetting(settingsAtom, 'pushTransportOverride');
const [useInAppNotifications] = useSetting(settingsAtom, 'useInAppNotifications');
Expand Down Expand Up @@ -107,26 +123,33 @@ export function NotificationTransportRuntimeFeature() {
useEffect(() => {
if (!mx) return undefined;

if (provider === 'unifiedpush') {
enableUnifiedPush(mx, upConfigRef.current)
.then((result) => {
void (async () => {
const granted = await checkPushPermission(provider);
if (granted === false) {
setBackgroundPushEnabled(false);
setBackgroundPushProvider(null);
return;
}

try {
if (provider === 'unifiedpush') {
const result = await enableUnifiedPush(mx, upConfigRef.current);
lastEndpointRef.current = result.endpoint;
})
.catch((error) => {
log.warn('UnifiedPush pusher registration failed at startup', error);
});
} else if (provider === 'native') {
enableNativePush(mx, clientConfigRef.current)
.then((token) => {
} else if (provider === 'native') {
const token = await enableNativePush(mx, clientConfigRef.current);
lastEndpointRef.current = token;
})
.catch((error) => {
log.warn('Native push pusher registration failed at startup', error);
});
}
}
} catch (error) {
log.warn('Pusher registration failed at startup', error);
if ((await checkPushPermission(provider)) === false) {
setBackgroundPushEnabled(false);
setBackgroundPushProvider(null);
}
}
})();

return () => {};
}, [provider, mx]);
}, [provider, mx, setBackgroundPushEnabled, setBackgroundPushProvider]);

useEffect(
() => () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ async function getUnifiedPushPermissionState(): Promise<UnifiedPushPermissionSta
return permission === 'granted' ? 'granted' : permission;
}

export async function isUnifiedPushPermissionGranted(): Promise<boolean | null> {
const api = await getUnifiedPushTransportApi();
return api.isPermissionGranted();
}

export async function getUnifiedPushDistributors(): Promise<string[]> {
const api = await getUnifiedPushTransportApi();
return api.listDistributors();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export type UnifiedPushRegistration = {
};

export type UnifiedPushTransportApi = {
isPermissionGranted: () => Promise<boolean>;
isPermissionGranted: () => Promise<boolean | null>;
requestPermission: () => Promise<NotificationPermission>;
registerForPushNotifications: (vapid?: string) => Promise<UnifiedPushRegistration>;
unregisterForPushNotifications: () => Promise<void>;
Expand Down
2 changes: 1 addition & 1 deletion src/types/tauri-plugin-notifications-api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ declare module '@choochmeque/tauri-plugin-notifications-api' {
unregister: () => Promise<void> | void;
};

export function isPermissionGranted(): Promise<boolean>;
export function isPermissionGranted(): Promise<boolean | null>;
export function requestPermission(): Promise<NotificationPermission>;
export function sendNotification(options: NotificationOptions | string): Promise<void>;
export function registerForPushNotifications(): Promise<string>;
Expand Down
Loading