fix: idempotent conv-key upsert + guard tauri-only notification calls
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "ChatApp",
|
"productName": "ChatApp",
|
||||||
"version": "0.4.1",
|
"version": "0.4.2",
|
||||||
"identifier": "com.meinname.chatapp",
|
"identifier": "com.meinname.chatapp",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "pnpm vite:dev",
|
"beforeDevCommand": "pnpm vite:dev",
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import {
|
|||||||
sendNotification,
|
sendNotification,
|
||||||
} from '@tauri-apps/plugin-notification';
|
} from '@tauri-apps/plugin-notification';
|
||||||
|
|
||||||
|
import { isTauriRuntime } from './globalShortcut';
|
||||||
|
|
||||||
// Tracks whether permission has already been requested this session so we
|
// Tracks whether permission has already been requested this session so we
|
||||||
// don't spam the OS prompt. Actual permission state lives in the OS.
|
// don't spam the OS prompt. Actual permission state lives in the OS.
|
||||||
let permissionChecked = false;
|
let permissionChecked = false;
|
||||||
@@ -12,6 +14,11 @@ let permissionGranted = false;
|
|||||||
export async function ensureNotificationPermission(): Promise<boolean> {
|
export async function ensureNotificationPermission(): Promise<boolean> {
|
||||||
if (permissionChecked) return permissionGranted;
|
if (permissionChecked) return permissionGranted;
|
||||||
permissionChecked = true;
|
permissionChecked = true;
|
||||||
|
if (!isTauriRuntime()) {
|
||||||
|
// Web preview / Chrome — Tauri notification plugin not available.
|
||||||
|
permissionGranted = false;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
let granted = await isPermissionGranted();
|
let granted = await isPermissionGranted();
|
||||||
if (!granted) {
|
if (!granted) {
|
||||||
@@ -20,7 +27,6 @@ export async function ensureNotificationPermission(): Promise<boolean> {
|
|||||||
}
|
}
|
||||||
permissionGranted = granted;
|
permissionGranted = granted;
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
// Not running under Tauri (e.g. web preview) — fall back silently.
|
|
||||||
permissionGranted = false;
|
permissionGranted = false;
|
||||||
console.warn('notification permission check failed', err);
|
console.warn('notification permission check failed', err);
|
||||||
}
|
}
|
||||||
@@ -40,6 +46,7 @@ interface NotifyOpts {
|
|||||||
|
|
||||||
export async function notify({ title, body, force = false }: NotifyOpts): Promise<void> {
|
export async function notify({ title, body, force = false }: NotifyOpts): Promise<void> {
|
||||||
if (!force && isAppFocused()) return;
|
if (!force && isAppFocused()) return;
|
||||||
|
if (!isTauriRuntime()) return;
|
||||||
const granted = await ensureNotificationPermission();
|
const granted = await ensureNotificationPermission();
|
||||||
if (!granted) return;
|
if (!granted) return;
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -161,7 +161,10 @@ export async function bootstrapConvKey(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const { error } = await rawFrom(client, 'conversation_keys').insert(rows);
|
const { error } = await rawFrom(client, 'conversation_keys').upsert(rows, {
|
||||||
|
onConflict: 'conversation_id,recipient_device_id,key_version',
|
||||||
|
ignoreDuplicates: true,
|
||||||
|
});
|
||||||
if (error) throw error;
|
if (error) throw error;
|
||||||
|
|
||||||
const handle = { conversationId, keyVersion, key: convKey };
|
const handle = { conversationId, keyVersion, key: convKey };
|
||||||
@@ -262,15 +265,21 @@ export async function shareConvKeyToDevice(
|
|||||||
recipientPublicKey,
|
recipientPublicKey,
|
||||||
own.privateKey,
|
own.privateKey,
|
||||||
);
|
);
|
||||||
const { error } = await rawFrom(client, 'conversation_keys').insert({
|
const { error } = await rawFrom(client, 'conversation_keys').upsert(
|
||||||
conversation_id: conversationId,
|
{
|
||||||
recipient_device_id: recipientDeviceId,
|
conversation_id: conversationId,
|
||||||
key_version: version,
|
recipient_device_id: recipientDeviceId,
|
||||||
sender_device_id: own.deviceId,
|
key_version: version,
|
||||||
encrypted_key: bytesToPgHex(wrapped.ciphertext),
|
sender_device_id: own.deviceId,
|
||||||
nonce: bytesToPgHex(wrapped.nonce),
|
encrypted_key: bytesToPgHex(wrapped.ciphertext),
|
||||||
});
|
nonce: bytesToPgHex(wrapped.nonce),
|
||||||
if (error && !String(error.message ?? '').includes('duplicate')) throw error;
|
},
|
||||||
|
{
|
||||||
|
onConflict: 'conversation_id,recipient_device_id,key_version',
|
||||||
|
ignoreDuplicates: true,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if (error) throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-exports for convenience.
|
// Re-exports for convenience.
|
||||||
|
|||||||
Reference in New Issue
Block a user