Compare commits
34
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6acdd439d5 | ||
|
|
9aec3691ac | ||
|
|
4c36c03066 | ||
|
|
fbdac30d18 | ||
|
|
27d659118f | ||
|
|
747400ea25 | ||
|
|
6ae0087213 | ||
|
|
d6548c56fd | ||
|
|
23f059d9a4 | ||
|
|
9b9f33b270 | ||
|
|
7d7a379ce0 | ||
|
|
91f82d60e3 | ||
|
|
f0865115a4 | ||
|
|
899e160aed | ||
|
|
3e5fdd0dab | ||
|
|
bb569d69a2 | ||
|
|
02d86caeb0 | ||
|
|
c0c93213c1 | ||
|
|
1ea6987083 | ||
|
|
be8e49a2bb | ||
|
|
1e217592fc | ||
|
|
ffe1d5a81e | ||
|
|
fff583fca5 | ||
|
|
e2b23397bd | ||
|
|
b929cbf74b | ||
|
|
8520de232d | ||
|
|
773e41311e | ||
|
|
da78bff316 | ||
|
|
4dcc5176e2 | ||
|
|
df395776b4 | ||
|
|
49dec686f1 | ||
|
|
ba48e95993 | ||
|
|
a8db61f79f | ||
|
|
f5d3c43b6c |
+12
-1
@@ -12,5 +12,16 @@
|
|||||||
"enabled": false,
|
"enabled": false,
|
||||||
"basename": "/"
|
"basename": "/"
|
||||||
},
|
},
|
||||||
"gifApiKey": ""
|
"gifApiKey": "",
|
||||||
|
"statusPages": {
|
||||||
|
"matrix.lotusguild.org": {
|
||||||
|
"url": "https://isitup.lotusguild.org",
|
||||||
|
"slug": "matrix",
|
||||||
|
"groups": {
|
||||||
|
"homeserver": "Homeserver",
|
||||||
|
"calls": "Voice calls",
|
||||||
|
"login": "Login"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -169,6 +169,56 @@ test.describe('local homeserver regression', () => {
|
|||||||
await ctx.close();
|
await ctx.close();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('a thread I started keeps its unread replies while I view the room (#217)', async ({
|
||||||
|
page,
|
||||||
|
}) => {
|
||||||
|
const room = await createRoom(alice, 'Thread Unread Room', { invite: [bob.userId] });
|
||||||
|
await joinRoom(bob, room);
|
||||||
|
const inThread = (root: string) => ({
|
||||||
|
'm.relates_to': {
|
||||||
|
rel_type: 'm.thread',
|
||||||
|
event_id: root,
|
||||||
|
is_falling_back: true,
|
||||||
|
'm.in_reply_to': { event_id: root },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const root = await sendText(alice, room, 'my thread root');
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
// While the room is open and at the bottom: a thread reply, then a newer
|
||||||
|
// main-timeline message. Neither may clear the thread without opening it.
|
||||||
|
await sendText(bob, room, 'reply in your thread', inThread(root));
|
||||||
|
await sendText(bob, room, 'newer main message');
|
||||||
|
await expect(page.getByText('newer main message')).toBeVisible();
|
||||||
|
const chip = page
|
||||||
|
.locator('[data-message-item]', { hasText: 'my thread root' })
|
||||||
|
.getByRole('button', { name: /1 reply/ });
|
||||||
|
const threadUnread = async () => {
|
||||||
|
// not_types varies so Synapse's sync response cache can't serve a stale answer.
|
||||||
|
const filter = {
|
||||||
|
room: {
|
||||||
|
rooms: [room],
|
||||||
|
timeline: { limit: 1, unread_thread_notifications: true, not_types: [uniq('x.')] },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const sync = await api<{
|
||||||
|
rooms: {
|
||||||
|
join: Record<string, { unread_thread_notifications?: Record<string, unknown> }>;
|
||||||
|
};
|
||||||
|
}>(
|
||||||
|
'GET',
|
||||||
|
`/_matrix/client/v3/sync?timeout=0&filter=${enc(JSON.stringify(filter))}`,
|
||||||
|
alice.token,
|
||||||
|
);
|
||||||
|
return root in (sync.rooms.join[room]?.unread_thread_notifications ?? {});
|
||||||
|
};
|
||||||
|
await page.waitForTimeout(2000); // let any receipt the room view would send go out
|
||||||
|
expect(await threadUnread()).toBe(true);
|
||||||
|
await expect(chip).toHaveAccessibleName(/unread replies/);
|
||||||
|
await chip.click();
|
||||||
|
await expect.poll(threadUnread).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
test('timeline image opens the gallery lightbox (#219) @webkit', async ({ page }) => {
|
test('timeline image opens the gallery lightbox (#219) @webkit', async ({ page }) => {
|
||||||
const room = await createRoom(alice, 'Lightbox Room');
|
const room = await createRoom(alice, 'Lightbox Room');
|
||||||
const png = Buffer.from(
|
const png = Buffer.from(
|
||||||
@@ -207,12 +257,21 @@ test.describe('local homeserver regression', () => {
|
|||||||
await page.clock.install({ time: Date.now() + 14 * 60 * 1000 });
|
await page.clock.install({ time: Date.now() + 14 * 60 * 1000 });
|
||||||
await loginUI(page, alice);
|
await loginUI(page, alice);
|
||||||
await openRoom(page, room);
|
await openRoom(page, room);
|
||||||
for (let i = 0; i < 4; i += 1) {
|
const ticks = async (from: number, n: number) => {
|
||||||
// eslint-disable-next-line no-await-in-loop
|
for (let i = from; i < from + n; i += 1) {
|
||||||
await sendText(bob, room, `tick ${i}`);
|
// eslint-disable-next-line no-await-in-loop
|
||||||
// eslint-disable-next-line no-await-in-loop
|
await sendText(bob, room, `tick ${i}`);
|
||||||
await page.waitForTimeout(500);
|
// eslint-disable-next-line no-await-in-loop
|
||||||
}
|
await page.waitForTimeout(500);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
await ticks(0, 4);
|
||||||
|
// "Ahead" could be a late delivery (a stalled server), so it is only
|
||||||
|
// reported once it has held for a minute of fresh samples.
|
||||||
|
await page.waitForTimeout(2000);
|
||||||
|
await expect(page.getByText(/clock is .*ahead of the server/)).toHaveCount(0);
|
||||||
|
await page.clock.fastForward('01:05');
|
||||||
|
await ticks(4, 2);
|
||||||
await expect(page.getByText(/clock is .*14 minutes ahead of the server/)).toBeVisible();
|
await expect(page.getByText(/clock is .*14 minutes ahead of the server/)).toBeVisible();
|
||||||
await page.getByRole('button', { name: 'Dismiss for 24 h' }).click();
|
await page.getByRole('button', { name: 'Dismiss for 24 h' }).click();
|
||||||
await expect(page.getByText(/clock is .*ahead of the server/)).toHaveCount(0);
|
await expect(page.getByText(/clock is .*ahead of the server/)).toHaveCount(0);
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
import { test, expect, Page } from '@playwright/test';
|
||||||
|
import {
|
||||||
|
HS,
|
||||||
|
createRoom,
|
||||||
|
ensureUser,
|
||||||
|
hsReachable,
|
||||||
|
loginUI,
|
||||||
|
openRoom,
|
||||||
|
uniq,
|
||||||
|
TestUser,
|
||||||
|
} from './localHs';
|
||||||
|
|
||||||
|
// [Gitea #124] Status banner from the homeserver's Uptime Kuma page. Kuma is
|
||||||
|
// answered by fixtures here; nothing contacts a real Kuma.
|
||||||
|
const KUMA = 'https://isitup.lotusguild.org';
|
||||||
|
const PAGE_CFG = { url: KUMA, slug: 'matrix' };
|
||||||
|
const UP = 1;
|
||||||
|
const DOWN = 0;
|
||||||
|
|
||||||
|
type Fixture = { hs?: number; calls?: number; staleMinutes?: number; fail?: boolean };
|
||||||
|
|
||||||
|
const kumaTime = (ms: number) => new Date(ms).toISOString().replace('T', ' ').slice(0, 23);
|
||||||
|
|
||||||
|
/** Serve config.json with a status page for `serverName` and answer Kuma from `fx()`. */
|
||||||
|
async function mockKuma(page: Page, serverName: string | null, fx: () => Fixture) {
|
||||||
|
const kumaRequests: string[] = [];
|
||||||
|
await page.route(/\/config\.json(\?.*)?$/, async (route) => {
|
||||||
|
const res = await route.fetch();
|
||||||
|
const cfg = await res.json();
|
||||||
|
cfg.statusPages = serverName ? { [serverName]: PAGE_CFG } : {};
|
||||||
|
await route.fulfill({ response: res, json: cfg });
|
||||||
|
});
|
||||||
|
await page.route(/isitup\.lotusguild\.org\/api\/status-page\//, async (route) => {
|
||||||
|
const url = route.request().url();
|
||||||
|
kumaRequests.push(url);
|
||||||
|
const f = fx();
|
||||||
|
if (f.fail) {
|
||||||
|
await route.fulfill({ status: 500, body: 'oops' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const cors = { 'access-control-allow-origin': '*' };
|
||||||
|
if (url.includes('/heartbeat/')) {
|
||||||
|
// Two checks, the latest `staleMinutes` ago (0 = just now).
|
||||||
|
const last = Date.now() - (f.staleMinutes ?? 0) * 60_000;
|
||||||
|
const beats = (s: number) => [
|
||||||
|
{ status: s, time: kumaTime(last - 60_000) },
|
||||||
|
{ status: s, time: kumaTime(last) },
|
||||||
|
];
|
||||||
|
await route.fulfill({
|
||||||
|
headers: cors,
|
||||||
|
json: { heartbeatList: { 1: beats(f.hs ?? UP), 2: beats(f.calls ?? UP) }, uptimeList: {} },
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await route.fulfill({
|
||||||
|
headers: cors,
|
||||||
|
json: {
|
||||||
|
config: { slug: 'matrix' },
|
||||||
|
incidents: [],
|
||||||
|
maintenanceList: [],
|
||||||
|
publicGroupList: [
|
||||||
|
{ name: 'Homeserver', monitorList: [{ id: 1 }] },
|
||||||
|
{ name: 'Voice calls', monitorList: [{ id: 2 }] },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return kumaRequests;
|
||||||
|
}
|
||||||
|
|
||||||
|
const serverOf = (u: TestUser) => u.userId.split(':').slice(1).join(':');
|
||||||
|
const strip = (page: Page, text: RegExp) =>
|
||||||
|
page.locator('[role="status"], [role="alert"]').filter({ hasText: text });
|
||||||
|
const cutSync = (page: Page) =>
|
||||||
|
page.route(/\/_matrix\/client\/v3\/sync/, (route) => route.abort('connectionfailed'));
|
||||||
|
|
||||||
|
test.describe('server status banner (#124)', () => {
|
||||||
|
let alice: TestUser;
|
||||||
|
let room: string;
|
||||||
|
|
||||||
|
test.beforeAll(async () => {
|
||||||
|
test.skip(!(await hsReachable()), `no local homeserver at ${HS} (set E2E_LOCAL_HS)`);
|
||||||
|
alice = await ensureUser(uniq('e2e_status_'));
|
||||||
|
room = await createRoom(alice, 'Status Room');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('calls down: amber strip, dismiss sticks across a reload', async ({ page }) => {
|
||||||
|
await mockKuma(page, serverOf(alice), () => ({ calls: DOWN }));
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
const calls = strip(page, /Voice calls are down right now\. Messages still work\./);
|
||||||
|
await expect(calls).toBeVisible();
|
||||||
|
await calls.getByRole('button', { name: 'Dismiss' }).click();
|
||||||
|
await expect(calls).toHaveCount(0);
|
||||||
|
await page.reload();
|
||||||
|
await openRoom(page, room);
|
||||||
|
await page.waitForTimeout(2000);
|
||||||
|
await expect(calls).toHaveCount(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('other homeservers never contact Kuma', async ({ page }) => {
|
||||||
|
const requests = await mockKuma(page, 'some.other.server', () => ({ hs: DOWN }));
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
await page.waitForTimeout(3000);
|
||||||
|
expect(requests).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Kuma failing shows nothing (fail quiet)', async ({ page }) => {
|
||||||
|
const requests = await mockKuma(page, serverOf(alice), () => ({ fail: true }));
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
await expect.poll(() => requests.length).toBeGreaterThan(0);
|
||||||
|
await page.waitForTimeout(1500);
|
||||||
|
await expect(strip(page, /server|Voice calls|Maintenance/i)).toHaveCount(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('connection lost + Kuma says the server is down: critical strip, not "Connection Lost"', async ({
|
||||||
|
page,
|
||||||
|
}) => {
|
||||||
|
test.setTimeout(150_000);
|
||||||
|
await mockKuma(page, serverOf(alice), () => ({ hs: DOWN }));
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
// Connected: the server is "having problems" for others, not for us.
|
||||||
|
await expect(strip(page, /server is having problems/)).toBeVisible();
|
||||||
|
await cutSync(page);
|
||||||
|
const down = page.getByRole('alert').filter({ hasText: /server is down\. We're on it/ });
|
||||||
|
await expect(down).toBeVisible({ timeout: 120_000 });
|
||||||
|
await expect(page.getByText('Connection Lost! Reconnecting...')).toHaveCount(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('connection lost + Kuma checked since and the server is up: "may be your connection"', async ({
|
||||||
|
page,
|
||||||
|
}) => {
|
||||||
|
test.setTimeout(150_000);
|
||||||
|
await mockKuma(page, serverOf(alice), () => ({ hs: UP }));
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
await cutSync(page);
|
||||||
|
await expect(page.getByText(/server is up, so it may be your internet connection/)).toBeVisible(
|
||||||
|
{
|
||||||
|
timeout: 120_000,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('connection lost + only a stale "up" from Kuma: plain "Connection Lost"', async ({
|
||||||
|
page,
|
||||||
|
}) => {
|
||||||
|
test.setTimeout(150_000);
|
||||||
|
await mockKuma(page, serverOf(alice), () => ({ hs: UP, staleMinutes: 10 }));
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
await cutSync(page);
|
||||||
|
await expect(page.getByText('Connection Lost! Reconnecting...')).toBeVisible({
|
||||||
|
timeout: 120_000,
|
||||||
|
});
|
||||||
|
await page.waitForTimeout(3000);
|
||||||
|
await expect(page.getByText(/may be your internet connection/)).toHaveCount(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
Generated
+7
-7
@@ -81,7 +81,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "4.13.0",
|
"@axe-core/playwright": "4.13.0",
|
||||||
"@lotusguild/element-call-embedded": "0.25.0-lotus.19",
|
"@lotusguild/element-call-embedded": "0.25.0-lotus.22",
|
||||||
"@playwright/test": "1.63.0",
|
"@playwright/test": "1.63.0",
|
||||||
"@rollup/plugin-inject": "5.0.5",
|
"@rollup/plugin-inject": "5.0.5",
|
||||||
"@rollup/plugin-wasm": "6.2.2",
|
"@rollup/plugin-wasm": "6.2.2",
|
||||||
@@ -2695,9 +2695,9 @@
|
|||||||
"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
|
"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
|
||||||
},
|
},
|
||||||
"node_modules/@lotusguild/element-call-embedded": {
|
"node_modules/@lotusguild/element-call-embedded": {
|
||||||
"version": "0.25.0-lotus.19",
|
"version": "0.25.0-lotus.22",
|
||||||
"resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.19/element-call-embedded-0.25.0-lotus.19.tgz",
|
"resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.22/element-call-embedded-0.25.0-lotus.22.tgz",
|
||||||
"integrity": "sha512-xNWgja9PHeDuSgo6fvoI1BJkYHof0xJ9kkLnURqPkrHV0o1UagHgaYcFgbFZMtDsoPnz5UrOGleLsjFo7d5/wQ==",
|
"integrity": "sha512-AimDKZA4xUKEEyl2XUFUSUDl03tBKFv88T/3igKyH2VqNSPMGnqcQJC5HXIkHLTWrOmg8kLcJ//FFbqlUZiLcA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@matrix-org/matrix-sdk-crypto-wasm": {
|
"node_modules/@matrix-org/matrix-sdk-crypto-wasm": {
|
||||||
@@ -5026,9 +5026,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/brace-expansion": {
|
"node_modules/brace-expansion": {
|
||||||
"version": "1.1.18",
|
"version": "1.1.21",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
|
||||||
"integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
|
"integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"balanced-match": "^1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
|
|||||||
+1
-1
@@ -108,7 +108,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "4.13.0",
|
"@axe-core/playwright": "4.13.0",
|
||||||
"@lotusguild/element-call-embedded": "0.25.0-lotus.19",
|
"@lotusguild/element-call-embedded": "0.25.0-lotus.22",
|
||||||
"@playwright/test": "1.63.0",
|
"@playwright/test": "1.63.0",
|
||||||
"@rollup/plugin-inject": "5.0.5",
|
"@rollup/plugin-inject": "5.0.5",
|
||||||
"@rollup/plugin-wasm": "6.2.2",
|
"@rollup/plugin-wasm": "6.2.2",
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import {
|
|||||||
} from '../hooks/useCallEmbed';
|
} from '../hooks/useCallEmbed';
|
||||||
import { callChatAtom, callEmbedAtom } from '../state/callEmbed';
|
import { callChatAtom, callEmbedAtom } from '../state/callEmbed';
|
||||||
import { toastQueueAtom } from '../state/toast';
|
import { toastQueueAtom } from '../state/toast';
|
||||||
import { CallEmbed, useCallControlState } from '../plugins/call';
|
import { CallEmbed, useCallControlState, useScreensharePromptOpen } from '../plugins/call';
|
||||||
import { hangupCallAndWait } from '../plugins/call/hangup';
|
import { hangupCallAndWait } from '../plugins/call/hangup';
|
||||||
import { useSelectedRoom } from '../hooks/router/useSelectedRoom';
|
import { useSelectedRoom } from '../hooks/router/useSelectedRoom';
|
||||||
import { ScreenSize, useScreenSizeContext } from '../hooks/useScreenSize';
|
import { ScreenSize, useScreenSizeContext } from '../hooks/useScreenSize';
|
||||||
@@ -78,9 +78,11 @@ import { getPowersLevelFromMatrixEvent } from '../hooks/usePowerLevels';
|
|||||||
import { getRoomCreatorsForRoomId } from '../hooks/useRoomCreators';
|
import { getRoomCreatorsForRoomId } from '../hooks/useRoomCreators';
|
||||||
import { getRoomPermissionsAPI } from '../hooks/useRoomPermissions';
|
import { getRoomPermissionsAPI } from '../hooks/useRoomPermissions';
|
||||||
import { useLivekitSupport } from '../hooks/useLivekitSupport';
|
import { useLivekitSupport } from '../hooks/useLivekitSupport';
|
||||||
|
import { useRoomCallPolicy } from '../hooks/useRoomCallPolicy';
|
||||||
import { useNotificationsQuiet } from '../hooks/useNotificationsQuiet';
|
import { useNotificationsQuiet } from '../hooks/useNotificationsQuiet';
|
||||||
import { CallAvatarAnimation } from '../styles/Animations.css';
|
import { CallAvatarAnimation } from '../styles/Animations.css';
|
||||||
import { webRTCSupported } from '../utils/rtc';
|
import { webRTCSupported } from '../utils/rtc';
|
||||||
|
import { CallsUnavailableMessage } from '../features/call/CallsUnavailable';
|
||||||
import { zIndices } from '../styles/zIndex';
|
import { zIndices } from '../styles/zIndex';
|
||||||
|
|
||||||
const PIP_MIN_W = 200;
|
const PIP_MIN_W = 200;
|
||||||
@@ -230,13 +232,7 @@ function IncomingCall({ dm, info, onIgnore, onAnswer, onReject }: IncomingCallPr
|
|||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
{!webRTCSupported() && (
|
{!webRTCSupported() && (
|
||||||
<Text
|
<CallsUnavailableMessage roomId={room.roomId} actionLabel="Answer in browser" />
|
||||||
style={{ margin: 'auto', color: color.Critical.Main }}
|
|
||||||
size="L400"
|
|
||||||
align="Center"
|
|
||||||
>
|
|
||||||
Your browser does not support WebRTC, which is required for calling.
|
|
||||||
</Text>
|
|
||||||
)}
|
)}
|
||||||
<Box direction="Column" gap="300">
|
<Box direction="Column" gap="300">
|
||||||
{willAnswerWithCamera && (
|
{willAnswerWithCamera && (
|
||||||
@@ -758,6 +754,12 @@ function CallUtils({ embed, joined }: { embed: CallEmbed; joined: boolean }) {
|
|||||||
useCallPolicyRevokedToast(embed, joined);
|
useCallPolicyRevokedToast(embed, joined);
|
||||||
useCallEndedToast(embed);
|
useCallEndedToast(embed);
|
||||||
useScreenshareNotices(embed);
|
useScreenshareNotices(embed);
|
||||||
|
// [Gitea #43] The in-frame screenshare button follows the same room policy
|
||||||
|
// as the host bar's (hidden where the server would refuse the share).
|
||||||
|
const { allowScreenshare } = useRoomCallPolicy(embed.room);
|
||||||
|
useEffect(() => {
|
||||||
|
embed.control.setFrameScreenshareAllowed(allowScreenshare);
|
||||||
|
}, [embed, allowScreenshare]);
|
||||||
usePttHaptics();
|
usePttHaptics();
|
||||||
useCallAnnouncements(embed, joined);
|
useCallAnnouncements(embed, joined);
|
||||||
useMutedTalkWarning(embed, joined);
|
useMutedTalkWarning(embed, joined);
|
||||||
@@ -875,6 +877,7 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
|
|||||||
const callActive = callEmbed && joined;
|
const callActive = callEmbed && joined;
|
||||||
const callVisible = inCallRoom && callActive && !chatOnlyView;
|
const callVisible = inCallRoom && callActive && !chatOnlyView;
|
||||||
const pipMode = callActive && !inCallRoom;
|
const pipMode = callActive && !inCallRoom;
|
||||||
|
const pipPromptOpen = useScreensharePromptOpen(callEmbed?.control);
|
||||||
const { navigateRoom } = useRoomNavigate();
|
const { navigateRoom } = useRoomNavigate();
|
||||||
|
|
||||||
const { screenshare: pipScreenshare } = useCallControlState(callEmbed?.control);
|
const { screenshare: pipScreenshare } = useCallControlState(callEmbed?.control);
|
||||||
@@ -1356,6 +1359,9 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
|
|||||||
zIndex: 1,
|
zIndex: 1,
|
||||||
background: 'transparent',
|
background: 'transparent',
|
||||||
cursor: 'grab',
|
cursor: 'grab',
|
||||||
|
// [Gitea #43] The call's "Share your screen?" prompt is drawn
|
||||||
|
// inside the frame: let the click reach its Share button.
|
||||||
|
pointerEvents: pipPromptOpen ? 'none' : undefined,
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
alignItems: 'flex-start',
|
alignItems: 'flex-start',
|
||||||
justifyContent: 'flex-end',
|
justifyContent: 'flex-end',
|
||||||
|
|||||||
@@ -261,52 +261,69 @@ export function PollContent({
|
|||||||
handleVote(answers[idx].id);
|
handleVote(answers[idx].id);
|
||||||
};
|
};
|
||||||
|
|
||||||
const headerLabel = isEnded
|
// [Gitea #246] Type line under the "Poll" label.
|
||||||
? 'Poll closed · Final results'
|
const typeLabel = (() => {
|
||||||
: `Poll · ${isMultiple ? 'Multiple choice' : 'Single choice'}`;
|
if (isEnded) return 'Final results';
|
||||||
|
if (isUndisclosed) return 'Results hidden until the end';
|
||||||
|
return isMultiple ? `Pick up to ${maxSelections}` : 'Single choice';
|
||||||
|
})();
|
||||||
|
|
||||||
|
// Multiple choice counts people, not answers ("1 voter" who picked two).
|
||||||
|
const unit = isMultiple ? 'voter' : 'vote';
|
||||||
const footerNote = (() => {
|
const footerNote = (() => {
|
||||||
|
const totalPart = total > 0 ? `${total} ${unit}${total === 1 ? '' : 's'}` : `No ${unit}s yet`;
|
||||||
if (isUndisclosed && !isEnded) {
|
if (isUndisclosed && !isEnded) {
|
||||||
return canVote
|
return canVote
|
||||||
? 'Voting open · Results hidden until the poll ends'
|
? `${myVotes.size > 0 ? 'You voted' : 'Voting open'} · results shown when the poll ends`
|
||||||
: 'Results hidden until the poll ends';
|
: 'Results shown when the poll ends';
|
||||||
}
|
}
|
||||||
const votesPart = total > 0 ? `${total} vote${total === 1 ? '' : 's'}` : 'No votes yet';
|
if (isEnded) return `${totalPart} · Poll closed`;
|
||||||
if (isEnded) return `${votesPart} · Poll closed`;
|
if (!canVote) return totalPart;
|
||||||
if (!canVote) return votesPart;
|
return `${totalPart} · ${myVotes.size > 0 ? 'Select another answer to change your vote' : 'Select an answer to vote'}`;
|
||||||
if (isMultiple) return `${votesPart} · Select up to ${maxSelections}`;
|
|
||||||
return `${votesPart} · ${myVotes.size > 0 ? 'Click to change' : 'Click to vote'}`;
|
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
// Neutral tones derived from the theme's text colour, so they have contrast
|
||||||
|
// in every theme (the Container/ContainerLine tokens were near-invisible).
|
||||||
|
const muted = (pct: number) =>
|
||||||
|
`color-mix(in srgb, ${color.SurfaceVariant.OnContainer} ${pct}%, transparent)`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
data-poll-content
|
data-poll-content
|
||||||
direction="Column"
|
direction="Column"
|
||||||
gap="200"
|
gap="300"
|
||||||
style={{ maxWidth: '340px', paddingTop: '2px', paddingBottom: '4px' }}
|
style={{
|
||||||
|
// Same width for every poll (the message body shrink-wraps its content).
|
||||||
|
width: toRem(460),
|
||||||
|
maxWidth: '100%',
|
||||||
|
margin: `${config.space.S100} 0`,
|
||||||
|
padding: config.space.S300,
|
||||||
|
borderRadius: config.radii.R400,
|
||||||
|
border: `${config.borderWidth.B300} solid ${muted(18)}`,
|
||||||
|
background: muted(4),
|
||||||
|
boxSizing: 'border-box',
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Text
|
<Box direction="Column" gap="100">
|
||||||
as="div"
|
<Box alignItems="Center" gap="200" wrap="Wrap" data-poll-content-label>
|
||||||
size="T200"
|
<Icon size="100" src={Icons.OrderList} style={{ opacity: 0.8 }} />
|
||||||
priority="300"
|
<Text as="span" size="L400" style={{ fontWeight: 600 }}>
|
||||||
data-poll-content-label
|
Poll
|
||||||
style={{
|
</Text>
|
||||||
fontWeight: 700,
|
<Text as="span" size="T200" priority="300">
|
||||||
letterSpacing: '0.12em',
|
·
|
||||||
textTransform: 'uppercase',
|
</Text>
|
||||||
marginBottom: config.space.S100,
|
<Text as="span" size="T200" priority="300">
|
||||||
}}
|
{typeLabel}
|
||||||
>
|
</Text>
|
||||||
<span aria-hidden>◉ </span>
|
</Box>
|
||||||
{headerLabel}
|
<Text size="T400" style={{ fontWeight: 600, overflowWrap: 'anywhere' }}>
|
||||||
</Text>
|
{question}
|
||||||
<Text size="T400" style={{ fontWeight: 600 }}>
|
</Text>
|
||||||
{question}
|
</Box>
|
||||||
</Text>
|
|
||||||
<Box
|
<Box
|
||||||
direction="Column"
|
direction="Column"
|
||||||
gap="100"
|
gap="200"
|
||||||
style={{ marginTop: '2px' }}
|
|
||||||
role={isMultiple ? 'group' : 'radiogroup'}
|
role={isMultiple ? 'group' : 'radiogroup'}
|
||||||
aria-label={question}
|
aria-label={question}
|
||||||
onKeyDown={handleRadioKeyDown}
|
onKeyDown={handleRadioKeyDown}
|
||||||
@@ -316,20 +333,32 @@ export function PollContent({
|
|||||||
const text = answer.text;
|
const text = answer.text;
|
||||||
const selected = myVotes.has(id);
|
const selected = myVotes.has(id);
|
||||||
const voteCount = counts.get(id) ?? 0;
|
const voteCount = counts.get(id) ?? 0;
|
||||||
const pct = showResults && total > 0 ? Math.round((voteCount / total) * 100) : 0;
|
const showBar = showResults && total > 0;
|
||||||
|
const pct = showBar ? Math.round((voteCount / total) * 100) : 0;
|
||||||
const isWinner = winners.has(id);
|
const isWinner = winners.has(id);
|
||||||
|
const resultText = `${voteCount} ${voteCount === 1 ? 'vote' : 'votes'} · ${pct}%`;
|
||||||
// Roving tabindex for the single-choice radiogroup; checkboxes stay tabbable.
|
// Roving tabindex for the single-choice radiogroup; checkboxes stay tabbable.
|
||||||
const tabIndex = isMultiple ? 0 : selected || (myVotes.size === 0 && i === 0) ? 0 : -1;
|
const tabIndex = isMultiple ? 0 : selected || (myVotes.size === 0 && i === 0) ? 0 : -1;
|
||||||
|
let barColor = muted(40);
|
||||||
|
if (isWinner) barColor = color.Success.Main;
|
||||||
|
else if (selected) barColor = color.Primary.Main;
|
||||||
|
let rowBorder = muted(22);
|
||||||
|
if (isWinner) rowBorder = color.Success.Main;
|
||||||
|
else if (selected) rowBorder = color.Primary.Main;
|
||||||
|
const labelParts = [text];
|
||||||
|
if (showBar) labelParts.push(resultText);
|
||||||
|
if (isWinner) labelParts.push('winning answer');
|
||||||
return (
|
return (
|
||||||
<React.Fragment key={id}>
|
<React.Fragment key={id}>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
data-poll-answer
|
data-poll-answer
|
||||||
data-selected={selected}
|
data-selected={selected}
|
||||||
|
data-winner={isWinner || undefined}
|
||||||
role={isMultiple ? 'checkbox' : 'radio'}
|
role={isMultiple ? 'checkbox' : 'radio'}
|
||||||
aria-checked={selected}
|
aria-checked={selected}
|
||||||
aria-disabled={!canVote}
|
aria-disabled={!canVote}
|
||||||
aria-label={isWinner ? `${text}, winning answer` : undefined}
|
aria-label={labelParts.join(', ')}
|
||||||
aria-describedby={
|
aria-describedby={
|
||||||
showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0
|
showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0
|
||||||
? `poll-voters-${eventId}-${id}`
|
? `poll-voters-${eventId}-${id}`
|
||||||
@@ -340,60 +369,36 @@ export function PollContent({
|
|||||||
style={{
|
style={{
|
||||||
padding: `${config.space.S200} ${config.space.S300}`,
|
padding: `${config.space.S200} ${config.space.S300}`,
|
||||||
borderRadius: config.radii.R300,
|
borderRadius: config.radii.R300,
|
||||||
background: selected ? color.Primary.Container : color.SurfaceVariant.Container,
|
background: selected ? muted(8) : 'transparent',
|
||||||
border: `${config.borderWidth.B300} solid ${
|
border: `${config.borderWidth.B300} solid ${rowBorder}`,
|
||||||
isWinner
|
|
||||||
? color.Success.Main
|
|
||||||
: selected
|
|
||||||
? color.Primary.Main
|
|
||||||
: color.SurfaceVariant.ContainerLine
|
|
||||||
}`,
|
|
||||||
lineHeight: 1.4,
|
lineHeight: 1.4,
|
||||||
textAlign: 'left',
|
textAlign: 'left',
|
||||||
cursor: canVote ? 'pointer' : 'default',
|
cursor: canVote ? 'pointer' : 'default',
|
||||||
color: 'inherit',
|
color: 'inherit',
|
||||||
|
font: 'inherit',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
gap: config.space.S100,
|
gap: config.space.S200,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
position: 'relative',
|
|
||||||
overflow: 'hidden',
|
|
||||||
transition: 'border-color 0.15s, background 0.15s',
|
transition: 'border-color 0.15s, background 0.15s',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{showResults && total > 0 && (
|
|
||||||
<span
|
|
||||||
aria-hidden
|
|
||||||
style={{
|
|
||||||
position: 'absolute',
|
|
||||||
inset: 0,
|
|
||||||
right: 'auto',
|
|
||||||
width: `${pct}%`,
|
|
||||||
background: selected
|
|
||||||
? color.Primary.ContainerActive
|
|
||||||
: color.SurfaceVariant.ContainerActive,
|
|
||||||
pointerEvents: 'none',
|
|
||||||
transition: 'width 0.3s ease',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<span
|
<span
|
||||||
style={{
|
style={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
gap: config.space.S200,
|
gap: config.space.S200,
|
||||||
position: 'relative',
|
width: '100%',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
aria-hidden
|
aria-hidden
|
||||||
style={{
|
style={{
|
||||||
flexShrink: 0,
|
flexShrink: 0,
|
||||||
width: toRem(14),
|
boxSizing: 'border-box',
|
||||||
height: toRem(14),
|
width: toRem(18),
|
||||||
border: `${config.borderWidth.B300} solid ${
|
height: toRem(18),
|
||||||
selected ? color.Primary.Main : color.Primary.ContainerLine
|
border: `2px solid ${selected ? color.Primary.Main : muted(55)}`,
|
||||||
}`,
|
|
||||||
borderRadius: isMultiple ? config.radii.R300 : config.radii.Pill,
|
borderRadius: isMultiple ? config.radii.R300 : config.radii.Pill,
|
||||||
background: selected ? color.Primary.Main : 'transparent',
|
background: selected ? color.Primary.Main : 'transparent',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -405,29 +410,72 @@ export function PollContent({
|
|||||||
>
|
>
|
||||||
{selected ? <Icon size="50" src={Icons.Check} /> : null}
|
{selected ? <Icon size="50" src={Icons.Check} /> : null}
|
||||||
</span>
|
</span>
|
||||||
<Text as="span" size="T300" style={{ flexGrow: 1 }}>
|
<Text
|
||||||
|
as="span"
|
||||||
|
size="T300"
|
||||||
|
style={{ flexGrow: 1, minWidth: 0, overflowWrap: 'anywhere' }}
|
||||||
|
>
|
||||||
{text}
|
{text}
|
||||||
</Text>
|
</Text>
|
||||||
{isWinner && (
|
{isWinner && (
|
||||||
<Icon
|
<Text
|
||||||
size="50"
|
as="span"
|
||||||
src={Icons.Check}
|
size="T200"
|
||||||
style={{ flexShrink: 0, color: color.Success.Main }}
|
style={{
|
||||||
/>
|
flexShrink: 0,
|
||||||
|
display: 'inline-flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: config.space.S100,
|
||||||
|
color: color.Success.Main,
|
||||||
|
fontWeight: 600,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Icon size="50" src={Icons.Star} filled />
|
||||||
|
Winner
|
||||||
|
</Text>
|
||||||
)}
|
)}
|
||||||
{showResults && total > 0 && (
|
{showBar && (
|
||||||
<Text as="span" size="T200" priority="300" style={{ flexShrink: 0 }}>
|
<Text
|
||||||
{pct}%
|
as="span"
|
||||||
|
size="T200"
|
||||||
|
priority="300"
|
||||||
|
style={{ flexShrink: 0, fontVariantNumeric: 'tabular-nums' }}
|
||||||
|
>
|
||||||
|
{resultText}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
|
{showBar && (
|
||||||
|
<span
|
||||||
|
aria-hidden
|
||||||
|
style={{
|
||||||
|
display: 'block',
|
||||||
|
width: '100%',
|
||||||
|
height: toRem(6),
|
||||||
|
borderRadius: config.radii.Pill,
|
||||||
|
background: muted(12),
|
||||||
|
overflow: 'hidden',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
style={{
|
||||||
|
display: 'block',
|
||||||
|
height: '100%',
|
||||||
|
width: `${pct}%`,
|
||||||
|
borderRadius: config.radii.Pill,
|
||||||
|
background: barColor,
|
||||||
|
transition: 'width 0.3s ease',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
{showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0 && (
|
{showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0 && (
|
||||||
<Text
|
<Text
|
||||||
id={`poll-voters-${eventId}-${id}`}
|
id={`poll-voters-${eventId}-${id}`}
|
||||||
size="T200"
|
size="T200"
|
||||||
priority="300"
|
priority="300"
|
||||||
style={{ padding: `0 ${config.space.S300} ${config.space.S100}` }}
|
style={{ padding: `0 ${config.space.S300}`, marginTop: `-${config.space.S100}` }}
|
||||||
>
|
>
|
||||||
{`Voted by ${(voters.get(id) ?? []).map((s) => getMemberName(room, s)).join(', ')}`}
|
{`Voted by ${(voters.get(id) ?? []).map((s) => getMemberName(room, s)).join(', ')}`}
|
||||||
</Text>
|
</Text>
|
||||||
@@ -436,48 +484,56 @@ export function PollContent({
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</Box>
|
</Box>
|
||||||
{canShowVoters && (
|
<Box alignItems="Center" justifyContent="SpaceBetween" gap="200" wrap="Wrap">
|
||||||
<Box>
|
<Text size="T200" priority="300" style={{ minWidth: 0, flex: '1 1 12rem' }}>
|
||||||
<Chip
|
{footerNote}
|
||||||
variant={showVoters ? 'Primary' : 'SurfaceVariant'}
|
|
||||||
radii="Pill"
|
|
||||||
aria-pressed={showVoters}
|
|
||||||
onClick={() => setShowVoters((v) => !v)}
|
|
||||||
before={<Icon size="50" src={Icons.User} />}
|
|
||||||
>
|
|
||||||
<Text size="T200">{showVoters ? 'Hide voters' : 'Show who voted'}</Text>
|
|
||||||
</Chip>
|
|
||||||
</Box>
|
|
||||||
)}
|
|
||||||
<Box alignItems="Center" justifyContent="SpaceBetween" gap="200">
|
|
||||||
<Text size="T200" priority="300" style={{ minWidth: 0 }}>
|
|
||||||
<i>{footerNote}</i>
|
|
||||||
</Text>
|
</Text>
|
||||||
{canEnd &&
|
<Box gap="100" shrink="No" alignItems="Center" wrap="Wrap">
|
||||||
(confirmEnd ? (
|
{canShowVoters && (
|
||||||
<Box gap="100" shrink="No" alignItems="Center">
|
|
||||||
<Chip
|
|
||||||
variant="Critical"
|
|
||||||
radii="Pill"
|
|
||||||
aria-disabled={ending}
|
|
||||||
onClick={ending ? undefined : handleEndPoll}
|
|
||||||
>
|
|
||||||
<Text size="T200">{ending ? 'Ending…' : 'End poll'}</Text>
|
|
||||||
</Chip>
|
|
||||||
<Chip variant="Secondary" radii="Pill" onClick={() => setConfirmEnd(false)}>
|
|
||||||
<Text size="T200">Cancel</Text>
|
|
||||||
</Chip>
|
|
||||||
</Box>
|
|
||||||
) : (
|
|
||||||
<Chip
|
<Chip
|
||||||
variant="SurfaceVariant"
|
variant={showVoters ? 'Primary' : 'SurfaceVariant'}
|
||||||
radii="Pill"
|
radii="Pill"
|
||||||
onClick={() => setConfirmEnd(true)}
|
aria-pressed={showVoters}
|
||||||
before={<Icon size="50" src={Icons.Cross} />}
|
onClick={() => setShowVoters((v) => !v)}
|
||||||
|
before={<Icon size="50" src={Icons.User} />}
|
||||||
>
|
>
|
||||||
<Text size="T200">End poll</Text>
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
{showVoters ? 'Hide voters' : 'Who voted'}
|
||||||
|
</Text>
|
||||||
</Chip>
|
</Chip>
|
||||||
))}
|
)}
|
||||||
|
{canEnd &&
|
||||||
|
(confirmEnd ? (
|
||||||
|
<>
|
||||||
|
<Chip
|
||||||
|
variant="Critical"
|
||||||
|
radii="Pill"
|
||||||
|
aria-disabled={ending}
|
||||||
|
onClick={ending ? undefined : handleEndPoll}
|
||||||
|
>
|
||||||
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
{ending ? 'Ending…' : 'End poll'}
|
||||||
|
</Text>
|
||||||
|
</Chip>
|
||||||
|
<Chip variant="Secondary" radii="Pill" onClick={() => setConfirmEnd(false)}>
|
||||||
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
Cancel
|
||||||
|
</Text>
|
||||||
|
</Chip>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Chip
|
||||||
|
variant="SurfaceVariant"
|
||||||
|
radii="Pill"
|
||||||
|
onClick={() => setConfirmEnd(true)}
|
||||||
|
before={<Icon size="50" src={Icons.Cross} />}
|
||||||
|
>
|
||||||
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
End poll
|
||||||
|
</Text>
|
||||||
|
</Chip>
|
||||||
|
))}
|
||||||
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -3,7 +3,12 @@ import React, { useCallback, useState } from 'react';
|
|||||||
import { useSetAtom } from 'jotai';
|
import { useSetAtom } from 'jotai';
|
||||||
import { MicLevelBars } from '../call/MicLevelBars';
|
import { MicLevelBars } from '../call/MicLevelBars';
|
||||||
import { StatusDivider } from './components';
|
import { StatusDivider } from './components';
|
||||||
import { CallEmbed, useCallControlState, useCallMicLevel } from '../../plugins/call';
|
import {
|
||||||
|
CallEmbed,
|
||||||
|
useCallControlState,
|
||||||
|
useCallMicLevel,
|
||||||
|
useScreenshareMode,
|
||||||
|
} from '../../plugins/call';
|
||||||
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
|
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
|
||||||
import { callEmbedAtom } from '../../state/callEmbed';
|
import { callEmbedAtom } from '../../state/callEmbed';
|
||||||
import { MobileTouchTarget } from '../../styles/mobile.css';
|
import { MobileTouchTarget } from '../../styles/mobile.css';
|
||||||
@@ -192,8 +197,16 @@ export function CallControl({
|
|||||||
// Keep a forbidden control visible while its track is still live (so the user
|
// Keep a forbidden control visible while its track is still live (so the user
|
||||||
// can stop it); otherwise hide it entirely.
|
// can stop it); otherwise hide it entirely.
|
||||||
const showCamera = allowCamera || video;
|
const showCamera = allowCamera || video;
|
||||||
const showScreenshare = allowScreenshare || screenshare;
|
// [Gitea #43] Hidden where EC shows its own screenshare button in the frame;
|
||||||
|
// where the click can't be delegated, starting asks for the in-frame prompt.
|
||||||
|
const screenshareMode = useScreenshareMode(callEmbed.control);
|
||||||
|
const showScreenshare = screenshareMode !== 'hidden' && (allowScreenshare || screenshare);
|
||||||
const [shareConfirm, setShareConfirm] = useState(false);
|
const [shareConfirm, setShareConfirm] = useState(false);
|
||||||
|
const handleScreenshareToggle = () => {
|
||||||
|
if (screenshare) callEmbed.control.toggleScreenshare();
|
||||||
|
else if (screenshareMode === 'prompt') callEmbed.control.promptScreenshare();
|
||||||
|
else setShareConfirm(true);
|
||||||
|
};
|
||||||
|
|
||||||
const handleMicrophoneToggle = useCallback(
|
const handleMicrophoneToggle = useCallback(
|
||||||
() => callEmbed.control.toggleMicrophone(),
|
() => callEmbed.control.toggleMicrophone(),
|
||||||
@@ -248,9 +261,7 @@ export function CallControl({
|
|||||||
{!compact && showScreenshare && (
|
{!compact && showScreenshare && (
|
||||||
<ScreenShareButton
|
<ScreenShareButton
|
||||||
enabled={screenshare}
|
enabled={screenshare}
|
||||||
onToggle={() =>
|
onToggle={() => handleScreenshareToggle()}
|
||||||
screenshare ? callEmbed.control.toggleScreenshare() : setShareConfirm(true)
|
|
||||||
}
|
|
||||||
disabled={!callJoined}
|
disabled={!callJoined}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -72,9 +72,9 @@ export function CallStatus({ callEmbed }: CallStatusProps) {
|
|||||||
size="T200"
|
size="T200"
|
||||||
truncate
|
truncate
|
||||||
style={{ color: color.Warning.Main }}
|
style={{ color: color.Warning.Main }}
|
||||||
title="Fix your computer's clock — calls and encryption depend on it"
|
title="This device's clock is off. Calls and encryption depend on it: turn on automatic time in your system settings."
|
||||||
>
|
>
|
||||||
Clock {describeSkewVsServer(clockSkew.skewMs)} — calls will fail
|
Device clock {describeSkewVsServer(clockSkew.skewMs)}: calls may fail
|
||||||
</Text>
|
</Text>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -29,7 +29,12 @@ import {
|
|||||||
SoundButton,
|
SoundButton,
|
||||||
VideoButton,
|
VideoButton,
|
||||||
} from './Controls';
|
} from './Controls';
|
||||||
import { CallEmbed, useCallControlState, useCallMicLevel } from '../../plugins/call';
|
import {
|
||||||
|
CallEmbed,
|
||||||
|
useCallControlState,
|
||||||
|
useCallMicLevel,
|
||||||
|
useScreenshareMode,
|
||||||
|
} from '../../plugins/call';
|
||||||
import { useSetting } from '../../state/hooks/settings';
|
import { useSetting } from '../../state/hooks/settings';
|
||||||
import { settingsAtom } from '../../state/settings';
|
import { settingsAtom } from '../../state/settings';
|
||||||
import { callEmbedAtom } from '../../state/callEmbed';
|
import { callEmbedAtom } from '../../state/callEmbed';
|
||||||
@@ -106,6 +111,15 @@ export function CallControls({ callEmbed }: CallControlsProps) {
|
|||||||
// Keep a forbidden control visible while its track is still live (so the user
|
// Keep a forbidden control visible while its track is still live (so the user
|
||||||
// can stop it); otherwise hide it entirely.
|
// can stop it); otherwise hide it entirely.
|
||||||
const showCamera = allowCamera || video;
|
const showCamera = allowCamera || video;
|
||||||
|
// [Gitea #43] Where EC shows its own screenshare button in the frame, ours
|
||||||
|
// is hidden (the screenshare-audio mute stays); where the click can't be
|
||||||
|
// delegated, starting asks for the fork's in-frame "Share your screen?".
|
||||||
|
const screenshareMode = useScreenshareMode(callEmbed.control);
|
||||||
|
const handleScreenshareToggle = () => {
|
||||||
|
if (screenshare) callEmbed.control.toggleScreenshare();
|
||||||
|
else if (screenshareMode === 'prompt') callEmbed.control.promptScreenshare();
|
||||||
|
else setShareConfirm(true);
|
||||||
|
};
|
||||||
const showScreenshare = allowScreenshare || screenshare;
|
const showScreenshare = allowScreenshare || screenshare;
|
||||||
const showVideoGroup = showCamera || showScreenshare || !!document.fullscreenEnabled;
|
const showVideoGroup = showCamera || showScreenshare || !!document.fullscreenEnabled;
|
||||||
const handleOpenMenu: MouseEventHandler<HTMLButtonElement> = (evt) => {
|
const handleOpenMenu: MouseEventHandler<HTMLButtonElement> = (evt) => {
|
||||||
@@ -216,12 +230,12 @@ export function CallControls({ callEmbed }: CallControlsProps) {
|
|||||||
{showCamera && <VideoButton enabled={video} onToggle={handleVideoToggle} />}
|
{showCamera && <VideoButton enabled={video} onToggle={handleVideoToggle} />}
|
||||||
{showScreenshare && (
|
{showScreenshare && (
|
||||||
<>
|
<>
|
||||||
<ScreenShareButton
|
{screenshareMode !== 'hidden' && (
|
||||||
enabled={screenshare}
|
<ScreenShareButton
|
||||||
onToggle={() =>
|
enabled={screenshare}
|
||||||
screenshare ? callEmbed.control.toggleScreenshare() : setShareConfirm(true)
|
onToggle={() => handleScreenshareToggle()}
|
||||||
}
|
/>
|
||||||
/>
|
)}
|
||||||
{/* Mute-screenshare-audio sits directly next to the screenshare
|
{/* Mute-screenshare-audio sits directly next to the screenshare
|
||||||
control since they're the same concern. */}
|
control since they're the same concern. */}
|
||||||
<ScreenshareAudioButton
|
<ScreenshareAudioButton
|
||||||
|
|||||||
@@ -115,7 +115,12 @@ export function CallSoundboard({ callEmbed }: CallSoundboardProps) {
|
|||||||
try {
|
try {
|
||||||
const url = await resolveClipObjectUrl(mx, flat.clip.url);
|
const url = await resolveClipObjectUrl(mx, flat.clip.url);
|
||||||
const vol = (flat.clip.volume / 100) * master;
|
const vol = (flat.clip.volume / 100) * master;
|
||||||
const result = await callEmbed.control.injectAudio(url, vol);
|
// [Gitea #43] Send the bytes too: the call page may be on another
|
||||||
|
// origin, where this blob: URL can't be fetched.
|
||||||
|
const clipBytes = await fetch(url)
|
||||||
|
.then((r) => r.arrayBuffer())
|
||||||
|
.catch(() => undefined);
|
||||||
|
const result = await callEmbed.control.injectAudio(url, vol, clipBytes);
|
||||||
if (!result.played) {
|
if (!result.played) {
|
||||||
// [EC#13] Refused fork-side (only reason today: local mic muted) —
|
// [EC#13] Refused fork-side (only reason today: local mic muted) —
|
||||||
// don't play it locally either, or the user would think it went out.
|
// don't play it locally either, or the user would think it went out.
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import { CallMemberRenderer } from './CallMemberCard';
|
|||||||
import * as css from './styles.css';
|
import * as css from './styles.css';
|
||||||
import { CallControls } from './CallControls';
|
import { CallControls } from './CallControls';
|
||||||
import { useLivekitSupport } from '../../hooks/useLivekitSupport';
|
import { useLivekitSupport } from '../../hooks/useLivekitSupport';
|
||||||
|
import { CallsUnavailableMessage } from './CallsUnavailable';
|
||||||
import { webRTCSupported } from '../../utils/rtc';
|
import { webRTCSupported } from '../../utils/rtc';
|
||||||
|
|
||||||
function LivekitServerMissingMessage() {
|
function LivekitServerMissingMessage() {
|
||||||
@@ -33,25 +34,19 @@ function LivekitServerMissingMessage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function WebRTCMissingError() {
|
|
||||||
return (
|
|
||||||
<Text style={{ margin: 'auto', color: color.Critical.Main }} size="L400" align="Center">
|
|
||||||
Your browser does not support WebRTC, which is required for calling.
|
|
||||||
</Text>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function JoinMessage({
|
function JoinMessage({
|
||||||
|
roomId,
|
||||||
hasParticipant,
|
hasParticipant,
|
||||||
livekitSupported,
|
livekitSupported,
|
||||||
rtcSupported,
|
rtcSupported,
|
||||||
}: {
|
}: {
|
||||||
|
roomId: string;
|
||||||
hasParticipant?: boolean;
|
hasParticipant?: boolean;
|
||||||
livekitSupported?: boolean;
|
livekitSupported?: boolean;
|
||||||
rtcSupported?: boolean;
|
rtcSupported?: boolean;
|
||||||
}) {
|
}) {
|
||||||
if (rtcSupported === false) {
|
if (rtcSupported === false) {
|
||||||
return <WebRTCMissingError />;
|
return <CallsUnavailableMessage roomId={roomId} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (livekitSupported === false) {
|
if (livekitSupported === false) {
|
||||||
@@ -144,6 +139,7 @@ function CallPrescreen() {
|
|||||||
)}
|
)}
|
||||||
{!inOtherCall && hasPermission && !channelFull && (
|
{!inOtherCall && hasPermission && !channelFull && (
|
||||||
<JoinMessage
|
<JoinMessage
|
||||||
|
roomId={room.roomId}
|
||||||
hasParticipant={hasParticipant}
|
hasParticipant={hasParticipant}
|
||||||
livekitSupported={livekitSupported}
|
livekitSupported={livekitSupported}
|
||||||
rtcSupported={rtcSupported}
|
rtcSupported={rtcSupported}
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import React, { useMemo } from 'react';
|
||||||
|
import { Box, Button, Icon, Icons, Text, color } from 'folds';
|
||||||
|
import { useClientConfig } from '../../hooks/useClientConfig';
|
||||||
|
import { isTauri } from '../../hooks/useTauri';
|
||||||
|
import { webRTCSupported } from '../../utils/rtc';
|
||||||
|
import { getCallInBrowserUrl, resolveWebAppUrl } from '../../utils/callInBrowser';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [cinny-desktop: Linux calls] The desktop app on Linux runs on WebKitGTK,
|
||||||
|
* which ships without WebRTC (disabled in 2.54; a libwebrtc backend is due
|
||||||
|
* around 2.56). Where calls can't work here, send the user to the room in the
|
||||||
|
* web app instead of a dead end. Only in the desktop app, and only when
|
||||||
|
* config.json sets `webAppUrl`.
|
||||||
|
*/
|
||||||
|
export const useCallInBrowserUrl = (roomId: string): string | undefined => {
|
||||||
|
const { webAppUrl } = useClientConfig();
|
||||||
|
return useMemo(
|
||||||
|
() =>
|
||||||
|
isTauri() && !webRTCSupported()
|
||||||
|
? getCallInBrowserUrl(resolveWebAppUrl(webAppUrl), roomId)
|
||||||
|
: undefined,
|
||||||
|
[webAppUrl, roomId],
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Opens through the desktop's new-window handler → the system browser. */
|
||||||
|
export const openCallInBrowser = (url: string): void => {
|
||||||
|
window.open(url, '_blank', 'noopener,noreferrer');
|
||||||
|
};
|
||||||
|
|
||||||
|
const desktopUnavailableText = (): string =>
|
||||||
|
typeof navigator !== 'undefined' && /Linux/i.test(navigator.userAgent)
|
||||||
|
? 'Calls aren’t available in the desktop app on Linux yet: its web engine has no WebRTC.'
|
||||||
|
: 'Calls aren’t available in this desktop app: its web engine has no WebRTC.';
|
||||||
|
|
||||||
|
type CallsUnavailableMessageProps = {
|
||||||
|
roomId: string;
|
||||||
|
/** Button label, e.g. "Answer in browser" for an incoming call. */
|
||||||
|
actionLabel?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function CallsUnavailableMessage({
|
||||||
|
roomId,
|
||||||
|
actionLabel = 'Open in browser',
|
||||||
|
}: CallsUnavailableMessageProps) {
|
||||||
|
const url = useCallInBrowserUrl(roomId);
|
||||||
|
|
||||||
|
if (!isTauri()) {
|
||||||
|
return (
|
||||||
|
<Text style={{ margin: 'auto', color: color.Critical.Main }} size="L400" align="Center">
|
||||||
|
Your browser does not support WebRTC, which is required for calling.
|
||||||
|
</Text>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box direction="Column" alignItems="Center" gap="200" style={{ margin: 'auto' }}>
|
||||||
|
<Text style={{ color: color.Warning.Main }} size="L400" align="Center">
|
||||||
|
{desktopUnavailableText()}
|
||||||
|
{url ? ' You can join from the web app in your browser.' : ''}
|
||||||
|
</Text>
|
||||||
|
{url && (
|
||||||
|
<Button
|
||||||
|
size="300"
|
||||||
|
variant="Secondary"
|
||||||
|
fill="Soft"
|
||||||
|
radii="300"
|
||||||
|
before={<Icon size="100" src={Icons.External} />}
|
||||||
|
onClick={() => openCallInBrowser(url)}
|
||||||
|
>
|
||||||
|
<Text size="B300">{actionLabel}</Text>
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import { useCallEmbed, useCallJoined, useCallStart } from '../../hooks/useCallEm
|
|||||||
import { useCallPreferences } from '../../state/hooks/callPreferences';
|
import { useCallPreferences } from '../../state/hooks/callPreferences';
|
||||||
import { useSetting } from '../../state/hooks/settings';
|
import { useSetting } from '../../state/hooks/settings';
|
||||||
import { settingsAtom } from '../../state/settings';
|
import { settingsAtom } from '../../state/settings';
|
||||||
|
import { useCallsDown } from '../server-status/ServerStatusBanner';
|
||||||
|
|
||||||
type MediaPermState = 'granted' | 'denied' | 'prompt' | 'unknown';
|
type MediaPermState = 'granted' | 'denied' | 'prompt' | 'unknown';
|
||||||
|
|
||||||
@@ -61,6 +62,7 @@ export function PrescreenControls({ canJoin }: PrescreenControlsProps) {
|
|||||||
|
|
||||||
const micPermission = useMediaPermissions();
|
const micPermission = useMediaPermissions();
|
||||||
const micDenied = micPermission === 'denied';
|
const micDenied = micPermission === 'denied';
|
||||||
|
const callsDown = useCallsDown();
|
||||||
|
|
||||||
const disabled = inOtherCall || !canJoin || micDenied;
|
const disabled = inOtherCall || !canJoin || micDenied;
|
||||||
|
|
||||||
@@ -91,6 +93,11 @@ export function PrescreenControls({ canJoin }: PrescreenControlsProps) {
|
|||||||
<ChatButton />
|
<ChatButton />
|
||||||
</Box>
|
</Box>
|
||||||
<Box grow="Yes" direction="Column" gap="200">
|
<Box grow="Yes" direction="Column" gap="200">
|
||||||
|
{callsDown && (
|
||||||
|
<Text size="T200" style={{ color: color.Warning.Main, textAlign: 'center' }}>
|
||||||
|
Voice calls are down right now, so joining may fail.
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
{micDenied && (
|
{micDenied && (
|
||||||
<Text size="T200" style={{ color: color.Critical.Main, textAlign: 'center' }}>
|
<Text size="T200" style={{ color: color.Critical.Main, textAlign: 'center' }}>
|
||||||
Microphone access is blocked. Enable it in your browser settings to join.
|
Microphone access is blocked. Enable it in your browser settings to join.
|
||||||
|
|||||||
@@ -0,0 +1,268 @@
|
|||||||
|
import { useSetAtom } from 'jotai';
|
||||||
|
import { useEffect } from 'react';
|
||||||
|
import {
|
||||||
|
ClientEvent,
|
||||||
|
ClientEventHandlerMap,
|
||||||
|
ConnectionError,
|
||||||
|
EventStatus,
|
||||||
|
KnownMembership,
|
||||||
|
MatrixClient,
|
||||||
|
MatrixError,
|
||||||
|
MatrixEvent,
|
||||||
|
Room,
|
||||||
|
RoomEvent,
|
||||||
|
RoomEventHandlerMap,
|
||||||
|
SyncState,
|
||||||
|
} from 'matrix-js-sdk';
|
||||||
|
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||||
|
import { sendOfflineAtom } from '../../state/sendOffline';
|
||||||
|
import {
|
||||||
|
OUTBOX_MAX_AUTO_RETRIES,
|
||||||
|
OutboxEntry,
|
||||||
|
isRetryableSendError,
|
||||||
|
loadOutbox,
|
||||||
|
outboxRetryDelayMs,
|
||||||
|
planRestore,
|
||||||
|
saveOutbox,
|
||||||
|
shouldKeepInOutbox,
|
||||||
|
withEntry,
|
||||||
|
withoutEntry,
|
||||||
|
} from '../../utils/outbox';
|
||||||
|
|
||||||
|
const PENDING: ReadonlySet<EventStatus | null> = new Set([
|
||||||
|
EventStatus.SENDING,
|
||||||
|
EventStatus.ENCRYPTING,
|
||||||
|
EventStatus.QUEUED,
|
||||||
|
EventStatus.NOT_SENT,
|
||||||
|
]);
|
||||||
|
const ONLINE: ReadonlySet<SyncState | null> = new Set([
|
||||||
|
SyncState.Prepared,
|
||||||
|
SyncState.Syncing,
|
||||||
|
SyncState.Catchup,
|
||||||
|
]);
|
||||||
|
const OFFLINE: ReadonlySet<SyncState | null> = new Set([SyncState.Reconnecting, SyncState.Error]);
|
||||||
|
|
||||||
|
/** The server already has it: its transaction id came back down /sync. */
|
||||||
|
const isDelivered = (room: Room, txnId: string): boolean => {
|
||||||
|
const hasTxn = (events: MatrixEvent[]) =>
|
||||||
|
events.some((e) => e.getUnsigned().transaction_id === txnId);
|
||||||
|
return (
|
||||||
|
hasTxn(room.getLiveTimeline().getEvents()) ||
|
||||||
|
room.getThreads().some((t) => hasTxn(t.liveTimeline.getEvents()))
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
type OutboxSession = {
|
||||||
|
/** Own pending events of this session, by txnId. */
|
||||||
|
live: Map<string, { event: MatrixEvent; room: Room }>;
|
||||||
|
autoRetries: Map<string, number>;
|
||||||
|
restored: boolean;
|
||||||
|
retrying: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Per client, not per mount: a remount must neither restore twice nor forget
|
||||||
|
// the events it is tracking.
|
||||||
|
const sessions = new WeakMap<MatrixClient, OutboxSession>();
|
||||||
|
const getSession = (mx: MatrixClient): OutboxSession => {
|
||||||
|
let session = sessions.get(mx);
|
||||||
|
if (!session) {
|
||||||
|
session = { live: new Map(), autoRetries: new Map(), restored: false, retrying: false };
|
||||||
|
sessions.set(mx, session);
|
||||||
|
}
|
||||||
|
return session;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #112] Offline outbox (see utils/outbox.ts): mirrors own message sends
|
||||||
|
* into localStorage until the server confirms them, puts unsent ones back
|
||||||
|
* after a reload, and re-sends network failures when the connection returns.
|
||||||
|
*/
|
||||||
|
export function OutboxFeature() {
|
||||||
|
const mx = useMatrixClient();
|
||||||
|
const setOffline = useSetAtom(sendOfflineAtom);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const userId = mx.getSafeUserId();
|
||||||
|
let entries = loadOutbox(userId);
|
||||||
|
const session = getSession(mx);
|
||||||
|
const { live, autoRetries } = session;
|
||||||
|
let disposed = false;
|
||||||
|
let offlineNow = false;
|
||||||
|
const timers = new Set<ReturnType<typeof setTimeout>>();
|
||||||
|
|
||||||
|
const isOffline = () =>
|
||||||
|
OFFLINE.has(mx.getSyncState()) ||
|
||||||
|
(typeof navigator !== 'undefined' && navigator.onLine === false);
|
||||||
|
|
||||||
|
const persist = (next: OutboxEntry[]) => {
|
||||||
|
if (next === entries) return;
|
||||||
|
entries = next;
|
||||||
|
saveOutbox(userId, entries);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A network failure while we think we're online (a blip neither sync nor
|
||||||
|
* the browser noticed): try again shortly, backing off. Real outages are
|
||||||
|
* handled by the reconnect / back-online triggers below.
|
||||||
|
*/
|
||||||
|
const scheduleBlipRetry = (event: MatrixEvent) => {
|
||||||
|
const attempts = autoRetries.get(event.getTxnId() ?? '') ?? 0;
|
||||||
|
if (!isRetryableSendError(event.error) || attempts >= OUTBOX_MAX_AUTO_RETRIES || isOffline())
|
||||||
|
return;
|
||||||
|
const timer = setTimeout(() => {
|
||||||
|
timers.delete(timer);
|
||||||
|
retryQueued();
|
||||||
|
}, outboxRetryDelayMs(attempts));
|
||||||
|
timers.add(timer);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onLocalEcho: RoomEventHandlerMap[RoomEvent.LocalEchoUpdated] = (event, room) => {
|
||||||
|
const txnId = event.getTxnId();
|
||||||
|
if (!txnId || event.getSender() !== userId) return;
|
||||||
|
if (PENDING.has(event.status)) {
|
||||||
|
if (!shouldKeepInOutbox(event.getType(), event.getContent())) return;
|
||||||
|
live.set(txnId, { event, room });
|
||||||
|
if (event.status === EventStatus.NOT_SENT) scheduleBlipRetry(event);
|
||||||
|
persist(
|
||||||
|
withEntry(entries, {
|
||||||
|
txnId,
|
||||||
|
roomId: room.roomId,
|
||||||
|
threadId: event.threadRootId ?? null,
|
||||||
|
type: event.getType(),
|
||||||
|
content: event.getContent(),
|
||||||
|
ts: event.getTs(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// SENT, CANCELLED, or the remote echo replaced it (status null).
|
||||||
|
live.delete(txnId);
|
||||||
|
autoRetries.delete(txnId);
|
||||||
|
persist(withoutEntry(entries, txnId));
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Re-send network failures, oldest first; a room stops at its first failure. */
|
||||||
|
const retryQueued = async () => {
|
||||||
|
if (session.retrying || disposed) return;
|
||||||
|
session.retrying = true;
|
||||||
|
try {
|
||||||
|
const byRoom = new Map<Room, MatrixEvent[]>();
|
||||||
|
Array.from(live.values())
|
||||||
|
.filter(
|
||||||
|
({ event }) =>
|
||||||
|
event.status === EventStatus.NOT_SENT &&
|
||||||
|
isRetryableSendError(event.error) &&
|
||||||
|
(autoRetries.get(event.getTxnId() ?? '') ?? 0) < OUTBOX_MAX_AUTO_RETRIES,
|
||||||
|
)
|
||||||
|
.sort((a, b) => a.event.getTs() - b.event.getTs())
|
||||||
|
.forEach(({ event, room }) => {
|
||||||
|
byRoom.set(room, [...(byRoom.get(room) ?? []), event]);
|
||||||
|
});
|
||||||
|
await Promise.all(
|
||||||
|
Array.from(byRoom.entries()).map(async ([room, events]) => {
|
||||||
|
for (const event of events) {
|
||||||
|
if (disposed || event.status !== EventStatus.NOT_SENT) continue;
|
||||||
|
const txnId = event.getTxnId() ?? '';
|
||||||
|
autoRetries.set(txnId, (autoRetries.get(txnId) ?? 0) + 1);
|
||||||
|
try {
|
||||||
|
// eslint-disable-next-line no-await-in-loop
|
||||||
|
await mx.resendEvent(event, room);
|
||||||
|
} catch (e) {
|
||||||
|
// Still offline: keep the rest of this room in order for the next try.
|
||||||
|
if (isRetryableSendError(e)) break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
session.retrying = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const restore = () => {
|
||||||
|
if (session.restored) return;
|
||||||
|
session.restored = true;
|
||||||
|
const plan = planRestore(
|
||||||
|
entries,
|
||||||
|
Date.now(),
|
||||||
|
(roomId) => mx.getRoom(roomId)?.getMyMembership() === KnownMembership.Join,
|
||||||
|
(entry) => {
|
||||||
|
const room = mx.getRoom(entry.roomId);
|
||||||
|
return !!room && isDelivered(room, entry.txnId);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
plan.drop.forEach((entry) => persist(withoutEntry(entries, entry.txnId)));
|
||||||
|
plan.restore.forEach((entry) => {
|
||||||
|
const room = mx.getRoom(entry.roomId);
|
||||||
|
if (!room || live.has(entry.txnId)) return;
|
||||||
|
// Same shape as the SDK's own local echo (client.sendCompleteEvent).
|
||||||
|
const event = new MatrixEvent({
|
||||||
|
type: entry.type,
|
||||||
|
content: entry.content,
|
||||||
|
event_id: `~${entry.roomId}:${entry.txnId}`,
|
||||||
|
sender: userId,
|
||||||
|
room_id: entry.roomId,
|
||||||
|
origin_server_ts: entry.ts,
|
||||||
|
});
|
||||||
|
const thread = entry.threadId ? room.getThread(entry.threadId) : undefined;
|
||||||
|
if (thread) event.setThread(thread);
|
||||||
|
event.setTxnId(entry.txnId);
|
||||||
|
event.setStatus(EventStatus.NOT_SENT);
|
||||||
|
if (plan.autoSend.has(entry.txnId)) {
|
||||||
|
// Recent: treat like a send that lost the network (shown as Queued
|
||||||
|
// while offline, re-sent below and on reconnect).
|
||||||
|
// (The SDK types `error` as MatrixError but stores any send error there.)
|
||||||
|
event.error = new ConnectionError(
|
||||||
|
'not sent before the app was closed',
|
||||||
|
) as unknown as MatrixError;
|
||||||
|
} else {
|
||||||
|
// Old: back as "Failed to send"; the user decides (Retry / Cancel).
|
||||||
|
autoRetries.set(entry.txnId, OUTBOX_MAX_AUTO_RETRIES);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
room.addPendingEvent(event, entry.txnId); // emits LocalEchoUpdated → `live`
|
||||||
|
} catch {
|
||||||
|
// Already pending under this txnId: nothing to restore.
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (!isOffline()) retryQueued();
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateOffline = () => {
|
||||||
|
const offline = isOffline();
|
||||||
|
// Back online (sync recovered or the browser says so): send what's queued.
|
||||||
|
if (offlineNow && !offline && session.restored) retryQueued();
|
||||||
|
offlineNow = offline;
|
||||||
|
setOffline(offline);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onSync: ClientEventHandlerMap[ClientEvent.Sync] = (state, prevState) => {
|
||||||
|
updateOffline();
|
||||||
|
if (!ONLINE.has(state)) return;
|
||||||
|
if (!session.restored) {
|
||||||
|
restore();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (OFFLINE.has(prevState) || prevState === SyncState.Catchup) retryQueued();
|
||||||
|
};
|
||||||
|
const onBrowserOnline = () => updateOffline();
|
||||||
|
|
||||||
|
mx.on(RoomEvent.LocalEchoUpdated, onLocalEcho);
|
||||||
|
mx.on(ClientEvent.Sync, onSync);
|
||||||
|
window.addEventListener('online', onBrowserOnline);
|
||||||
|
window.addEventListener('offline', onBrowserOnline);
|
||||||
|
updateOffline();
|
||||||
|
if (ONLINE.has(mx.getSyncState())) restore();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
disposed = true;
|
||||||
|
timers.forEach((t) => clearTimeout(t));
|
||||||
|
mx.off(RoomEvent.LocalEchoUpdated, onLocalEcho);
|
||||||
|
mx.off(ClientEvent.Sync, onSync);
|
||||||
|
window.removeEventListener('online', onBrowserOnline);
|
||||||
|
window.removeEventListener('offline', onBrowserOnline);
|
||||||
|
};
|
||||||
|
}, [mx, setOffline]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
@@ -41,6 +41,7 @@ import { stopPropagation } from '../../utils/keyboard';
|
|||||||
import * as css from './MediaGallery.css';
|
import * as css from './MediaGallery.css';
|
||||||
import { useTimestampFormatter } from '../../hooks/useTimestampFormatter';
|
import { useTimestampFormatter } from '../../hooks/useTimestampFormatter';
|
||||||
import { formatRelativeAge } from '../../utils/formatTimestamp';
|
import { formatRelativeAge } from '../../utils/formatTimestamp';
|
||||||
|
import { canCopyImage, copyImageFromUrl } from '../../utils/copyImage';
|
||||||
|
|
||||||
type GalleryTab = 'image' | 'video' | 'file' | 'audio';
|
type GalleryTab = 'image' | 'video' | 'file' | 'audio';
|
||||||
|
|
||||||
@@ -160,6 +161,7 @@ function LightboxMedia({
|
|||||||
onMouseDown,
|
onMouseDown,
|
||||||
onTouchStart,
|
onTouchStart,
|
||||||
onImageDoubleClick,
|
onImageDoubleClick,
|
||||||
|
onUrl,
|
||||||
}: {
|
}: {
|
||||||
item: LightboxItem;
|
item: LightboxItem;
|
||||||
useAuthentication: boolean;
|
useAuthentication: boolean;
|
||||||
@@ -169,6 +171,7 @@ function LightboxMedia({
|
|||||||
onMouseDown: React.MouseEventHandler<HTMLElement>;
|
onMouseDown: React.MouseEventHandler<HTMLElement>;
|
||||||
onTouchStart: React.TouchEventHandler<HTMLElement>;
|
onTouchStart: React.TouchEventHandler<HTMLElement>;
|
||||||
onImageDoubleClick: () => void;
|
onImageDoubleClick: () => void;
|
||||||
|
onUrl: (url: string | undefined) => void;
|
||||||
}) {
|
}) {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const media = useDecryptedMediaUrl(
|
const media = useDecryptedMediaUrl(
|
||||||
@@ -178,6 +181,11 @@ function LightboxMedia({
|
|||||||
useAuthentication,
|
useAuthentication,
|
||||||
item.mimeType,
|
item.mimeType,
|
||||||
);
|
);
|
||||||
|
const readyUrl = media.status === 'ok' ? media.url : undefined;
|
||||||
|
useEffect(() => {
|
||||||
|
onUrl(readyUrl);
|
||||||
|
return () => onUrl(undefined);
|
||||||
|
}, [readyUrl, onUrl]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
@@ -292,6 +300,24 @@ export function Lightbox({
|
|||||||
);
|
);
|
||||||
const toggleZoom = useCallback(() => setZoom((z) => (z === 1 ? 2 : 1)), [setZoom]);
|
const toggleZoom = useCallback(() => setZoom((z) => (z === 1 ? 2 : 1)), [setZoom]);
|
||||||
|
|
||||||
|
// [Gitea #164] Copy image. No "open in new tab": an E2EE image is a blob URL
|
||||||
|
// revoked when the viewer closes, and authenticated media 401s in a bare tab.
|
||||||
|
const [mediaUrl, setMediaUrl] = useState<string>();
|
||||||
|
const [copyState, setCopyState] = useState<'idle' | 'copied' | 'failed'>('idle');
|
||||||
|
useEffect(() => {
|
||||||
|
if (copyState === 'idle') return undefined;
|
||||||
|
const t = window.setTimeout(() => setCopyState('idle'), 2000);
|
||||||
|
return () => window.clearTimeout(t);
|
||||||
|
}, [copyState]);
|
||||||
|
useEffect(() => setCopyState('idle'), [index]);
|
||||||
|
const handleCopyImage = useCallback(() => {
|
||||||
|
if (!mediaUrl) return;
|
||||||
|
copyImageFromUrl(mediaUrl).then(
|
||||||
|
() => setCopyState('copied'),
|
||||||
|
() => setCopyState('failed'),
|
||||||
|
);
|
||||||
|
}, [mediaUrl]);
|
||||||
|
|
||||||
// Reset zoom when navigating to another item (and thus pan, via usePan).
|
// Reset zoom when navigating to another item (and thus pan, via usePan).
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setZoom(1);
|
setZoom(1);
|
||||||
@@ -409,6 +435,40 @@ export function Lightbox({
|
|||||||
</IconButton>
|
</IconButton>
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
{isImage && canCopyImage() && (
|
||||||
|
<TooltipProvider
|
||||||
|
position="Bottom"
|
||||||
|
align="End"
|
||||||
|
offset={4}
|
||||||
|
tooltip={
|
||||||
|
<Tooltip>
|
||||||
|
<Text>
|
||||||
|
{copyState === 'copied' && 'Copied'}
|
||||||
|
{copyState === 'failed' && 'Could not copy image'}
|
||||||
|
{copyState === 'idle' && 'Copy image'}
|
||||||
|
</Text>
|
||||||
|
</Tooltip>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{(ref) => (
|
||||||
|
<IconButton
|
||||||
|
ref={ref}
|
||||||
|
variant="Surface"
|
||||||
|
aria-label={copyState === 'copied' ? 'Image copied' : 'Copy image'}
|
||||||
|
onClick={handleCopyImage}
|
||||||
|
disabled={!mediaUrl}
|
||||||
|
>
|
||||||
|
<Icon
|
||||||
|
src={
|
||||||
|
(copyState === 'copied' && Icons.Check) ||
|
||||||
|
(copyState === 'failed' && Icons.Warning) ||
|
||||||
|
Icons.Photo
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
</TooltipProvider>
|
||||||
|
)}
|
||||||
{item.mxcUrl && (
|
{item.mxcUrl && (
|
||||||
<TooltipProvider
|
<TooltipProvider
|
||||||
position="Bottom"
|
position="Bottom"
|
||||||
@@ -512,6 +572,7 @@ export function Lightbox({
|
|||||||
onMouseDown={onMouseDown}
|
onMouseDown={onMouseDown}
|
||||||
onTouchStart={onTouchStart}
|
onTouchStart={onTouchStart}
|
||||||
onImageDoubleClick={toggleZoom}
|
onImageDoubleClick={toggleZoom}
|
||||||
|
onUrl={setMediaUrl}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
{index < items.length - 1 && (
|
{index < items.length - 1 && (
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ import {
|
|||||||
getIntersectionObserverEntry,
|
getIntersectionObserverEntry,
|
||||||
useIntersectionObserver,
|
useIntersectionObserver,
|
||||||
} from '../../hooks/useIntersectionObserver';
|
} from '../../hooks/useIntersectionObserver';
|
||||||
import { markAsRead } from '../../utils/notifications';
|
import { markAsRead, MarkAsReadOptions } from '../../utils/notifications';
|
||||||
import { useDebounce } from '../../hooks/useDebounce';
|
import { useDebounce } from '../../hooks/useDebounce';
|
||||||
import { getResizeObserverEntry, useResizeObserver } from '../../hooks/useResizeObserver';
|
import { getResizeObserverEntry, useResizeObserver } from '../../hooks/useResizeObserver';
|
||||||
import * as css from './RoomTimeline.css';
|
import * as css from './RoomTimeline.css';
|
||||||
@@ -505,6 +505,11 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
|||||||
|
|
||||||
const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(room.roomId));
|
const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(room.roomId));
|
||||||
const setActiveThreadId = useSetAtom(roomIdToActiveThreadIdAtomFamily(room.roomId));
|
const setActiveThreadId = useSetAtom(roomIdToActiveThreadIdAtomFamily(room.roomId));
|
||||||
|
// [Gitea #217] Reads from just viewing the timeline are passive: threads the
|
||||||
|
// user follows stay unread, and the open thread panel sends its own receipts.
|
||||||
|
const activeThreadId = useAtomValue(roomIdToActiveThreadIdAtomFamily(room.roomId));
|
||||||
|
const passiveReadRef = useRef<MarkAsReadOptions>({ passive: true });
|
||||||
|
passiveReadRef.current = { passive: true, openThreadId: activeThreadId ?? undefined };
|
||||||
// Thread summary chips only mount for events that already carry thread data
|
// Thread summary chips only mount for events that already carry thread data
|
||||||
// (perf: a chip subscribes room-level listeners, so mounting one per rendered
|
// (perf: a chip subscribes room-level listeners, so mounting one per rendered
|
||||||
// message would exceed the SDK's emitter cap). This single room-level
|
// message would exceed the SDK's emitter cap). This single room-level
|
||||||
@@ -707,7 +712,10 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
|||||||
// and either there are no unread messages or the latest message is from the current user.
|
// and either there are no unread messages or the latest message is from the current user.
|
||||||
// If either condition is met, trigger the markAsRead function to send a read receipt.
|
// If either condition is met, trigger the markAsRead function to send a read receipt.
|
||||||
const _roomId = mEvt.getRoomId();
|
const _roomId = mEvt.getRoomId();
|
||||||
if (_roomId) requestAnimationFrame(() => markAsRead(mx, _roomId, hideActivity));
|
if (_roomId)
|
||||||
|
requestAnimationFrame(() =>
|
||||||
|
markAsRead(mx, _roomId, hideActivity, passiveReadRef.current),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!document.hasFocus() && !unreadInfo) {
|
if (!document.hasFocus() && !unreadInfo) {
|
||||||
@@ -829,13 +837,17 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
|||||||
const tryAutoMarkAsRead = useCallback(() => {
|
const tryAutoMarkAsRead = useCallback(() => {
|
||||||
const readUptoEventId = readUptoEventIdRef.current;
|
const readUptoEventId = readUptoEventIdRef.current;
|
||||||
if (!readUptoEventId) {
|
if (!readUptoEventId) {
|
||||||
requestAnimationFrame(() => markAsRead(mx, room.roomId, hideActivity));
|
requestAnimationFrame(() =>
|
||||||
|
markAsRead(mx, room.roomId, hideActivity, passiveReadRef.current),
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const evtTimeline = getEventTimeline(room, readUptoEventId);
|
const evtTimeline = getEventTimeline(room, readUptoEventId);
|
||||||
const latestTimeline = evtTimeline && getFirstLinkedTimeline(evtTimeline, Direction.Forward);
|
const latestTimeline = evtTimeline && getFirstLinkedTimeline(evtTimeline, Direction.Forward);
|
||||||
if (latestTimeline === room.getLiveTimeline()) {
|
if (latestTimeline === room.getLiveTimeline()) {
|
||||||
requestAnimationFrame(() => markAsRead(mx, room.roomId, hideActivity));
|
requestAnimationFrame(() =>
|
||||||
|
markAsRead(mx, room.roomId, hideActivity, passiveReadRef.current),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}, [mx, room, hideActivity]);
|
}, [mx, room, hideActivity]);
|
||||||
|
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ import { widgetsPanelAtom } from '../../state/widgetsPanel';
|
|||||||
import { mobileMembersPanelAtom } from '../../state/mobileMembersPanel';
|
import { mobileMembersPanelAtom } from '../../state/mobileMembersPanel';
|
||||||
import { threadsListAtom } from '../../state/threadsList';
|
import { threadsListAtom } from '../../state/threadsList';
|
||||||
import { usePendingKnocks } from '../../hooks/usePendingKnocks';
|
import { usePendingKnocks } from '../../hooks/usePendingKnocks';
|
||||||
|
import { openCallInBrowser, useCallInBrowserUrl } from '../call/CallsUnavailable';
|
||||||
import { bookmarksPanelAtom } from '../../state/bookmarksPanel';
|
import { bookmarksPanelAtom } from '../../state/bookmarksPanel';
|
||||||
|
|
||||||
type RoomMenuProps = {
|
type RoomMenuProps = {
|
||||||
@@ -465,6 +466,36 @@ function CallRulesChip({ room }: { room: Room }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [cinny-desktop: Linux calls] Stand-in for CallButton where this app can't
|
||||||
|
* make calls (desktop on WebKitGTK): opens the room in the web app instead.
|
||||||
|
*/
|
||||||
|
function CallInBrowserButton({ url }: { url: string }) {
|
||||||
|
return (
|
||||||
|
<TooltipProvider
|
||||||
|
position="Bottom"
|
||||||
|
offset={4}
|
||||||
|
tooltip={
|
||||||
|
<Tooltip>
|
||||||
|
<Text>Call in your browser (this desktop app can’t make calls here)</Text>
|
||||||
|
</Tooltip>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{(triggerRef) => (
|
||||||
|
<IconButton
|
||||||
|
variant="Surface"
|
||||||
|
fill="None"
|
||||||
|
ref={triggerRef}
|
||||||
|
aria-label="Start call in browser"
|
||||||
|
onClick={() => openCallInBrowser(url)}
|
||||||
|
>
|
||||||
|
<Icon size="400" src={Icons.VideoCamera} />
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
</TooltipProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function CallButton() {
|
function CallButton() {
|
||||||
const room = useRoom();
|
const room = useRoom();
|
||||||
const direct = useIsDirectRoom();
|
const direct = useIsDirectRoom();
|
||||||
@@ -555,6 +586,7 @@ export function RoomViewHeader({ callView }: { callView?: boolean }) {
|
|||||||
);
|
);
|
||||||
const livekitSupported = useLivekitSupport();
|
const livekitSupported = useLivekitSupport();
|
||||||
const rtcSupported = webRTCSupported();
|
const rtcSupported = webRTCSupported();
|
||||||
|
const callInBrowserUrl = useCallInBrowserUrl(room.roomId);
|
||||||
|
|
||||||
const [menuAnchor, setMenuAnchor] = useState<RectCords>();
|
const [menuAnchor, setMenuAnchor] = useState<RectCords>();
|
||||||
const [pinMenuAnchor, setPinMenuAnchor] = useState<RectCords>();
|
const [pinMenuAnchor, setPinMenuAnchor] = useState<RectCords>();
|
||||||
@@ -782,11 +814,16 @@ export function RoomViewHeader({ callView }: { callView?: boolean }) {
|
|||||||
{screenSize === ScreenSize.Desktop && <CallRulesChip room={room} />}
|
{screenSize === ScreenSize.Desktop && <CallRulesChip room={room} />}
|
||||||
{!room.isCallRoom() &&
|
{!room.isCallRoom() &&
|
||||||
livekitSupported &&
|
livekitSupported &&
|
||||||
rtcSupported &&
|
(rtcSupported || callInBrowserUrl) &&
|
||||||
hasCallPermission &&
|
hasCallPermission &&
|
||||||
(direct ||
|
(direct ||
|
||||||
(room.getJoinRule() === 'invite' &&
|
(room.getJoinRule() === 'invite' &&
|
||||||
getStateEvents(room, StateEvent.SpaceParent).length === 0)) && <CallButton />}
|
getStateEvents(room, StateEvent.SpaceParent).length === 0)) &&
|
||||||
|
(rtcSupported ? (
|
||||||
|
<CallButton />
|
||||||
|
) : (
|
||||||
|
callInBrowserUrl && <CallInBrowserButton url={callInBrowserUrl} />
|
||||||
|
))}
|
||||||
{screenSize === ScreenSize.Desktop && (
|
{screenSize === ScreenSize.Desktop && (
|
||||||
<TooltipProvider
|
<TooltipProvider
|
||||||
position="Bottom"
|
position="Bottom"
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import {
|
|||||||
config,
|
config,
|
||||||
} from 'folds';
|
} from 'folds';
|
||||||
import React, {
|
import React, {
|
||||||
|
CSSProperties,
|
||||||
FormEventHandler,
|
FormEventHandler,
|
||||||
MouseEventHandler,
|
MouseEventHandler,
|
||||||
ReactNode,
|
ReactNode,
|
||||||
@@ -38,7 +39,7 @@ import { useHover, useFocusWithin } from 'react-aria';
|
|||||||
import { MatrixEvent, Room, EventStatus } from 'matrix-js-sdk';
|
import { MatrixEvent, Room, EventStatus } from 'matrix-js-sdk';
|
||||||
import { Relations } from 'matrix-js-sdk/lib/models/relations';
|
import { Relations } from 'matrix-js-sdk/lib/models/relations';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { useAtom } from 'jotai';
|
import { useAtom, useAtomValue } from 'jotai';
|
||||||
import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types';
|
import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types';
|
||||||
import {
|
import {
|
||||||
AvatarBase,
|
AvatarBase,
|
||||||
@@ -83,8 +84,6 @@ import { copyToClipboard } from '../../../utils/dom';
|
|||||||
import { stopPropagation } from '../../../utils/keyboard';
|
import { stopPropagation } from '../../../utils/keyboard';
|
||||||
import { getMatrixToRoomEvent } from '../../../plugins/matrix-to';
|
import { getMatrixToRoomEvent } from '../../../plugins/matrix-to';
|
||||||
import { getLotusRoomPermalink } from '../../../plugins/lotus-permalink';
|
import { getLotusRoomPermalink } from '../../../plugins/lotus-permalink';
|
||||||
import { getOriginBaseUrl } from '../../../pages/pathUtils';
|
|
||||||
import { useClientConfig } from '../../../hooks/useClientConfig';
|
|
||||||
import { getViaServers } from '../../../plugins/via-servers';
|
import { getViaServers } from '../../../plugins/via-servers';
|
||||||
import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
||||||
import { useRoomPinnedEvents } from '../../../hooks/useRoomPinnedEvents';
|
import { useRoomPinnedEvents } from '../../../hooks/useRoomPinnedEvents';
|
||||||
@@ -98,28 +97,41 @@ import { useLongPress } from '../../../hooks/useLongPress';
|
|||||||
import { ActionSheet } from '../../../components/action-sheet';
|
import { ActionSheet } from '../../../components/action-sheet';
|
||||||
import { useBookmarks } from '../../../hooks/useBookmarks';
|
import { useBookmarks } from '../../../hooks/useBookmarks';
|
||||||
import { PresenceRingAvatar } from '../../../components/presence';
|
import { PresenceRingAvatar } from '../../../components/presence';
|
||||||
|
import { useLotusShareBase } from '../../../hooks/useLotusLinkBase';
|
||||||
import { AvatarDecoration } from '../../../components/avatar-decoration/AvatarDecoration';
|
import { AvatarDecoration } from '../../../components/avatar-decoration/AvatarDecoration';
|
||||||
|
import { sendOfflineAtom } from '../../../state/sendOffline';
|
||||||
|
import { isRetryableSendError } from '../../../utils/outbox';
|
||||||
|
|
||||||
// Delivery status indicator for own messages
|
// Delivery status indicator for own messages
|
||||||
function DeliveryStatus({
|
function DeliveryStatus({
|
||||||
status,
|
mEvent,
|
||||||
|
room,
|
||||||
lotusTerminal,
|
lotusTerminal,
|
||||||
}: {
|
}: {
|
||||||
status: string | null;
|
mEvent: MatrixEvent;
|
||||||
|
room: Room;
|
||||||
lotusTerminal: boolean;
|
lotusTerminal: boolean;
|
||||||
}) {
|
}) {
|
||||||
|
const mx = useMatrixClient();
|
||||||
|
const offline = useAtomValue(sendOfflineAtom);
|
||||||
|
const { status } = mEvent;
|
||||||
if (status === null) return null; // confirmed by server — read receipts take over
|
if (status === null) return null; // confirmed by server — read receipts take over
|
||||||
let iconSrc: IconSrc;
|
let iconSrc: IconSrc;
|
||||||
let label: string;
|
let label: string;
|
||||||
let colorStyle: string;
|
let colorStyle: string;
|
||||||
const isSending = status === EventStatus.SENDING || status === EventStatus.ENCRYPTING;
|
const isSending = status === EventStatus.SENDING || status === EventStatus.ENCRYPTING;
|
||||||
if (status === EventStatus.NOT_SENT || status === EventStatus.CANCELLED) {
|
// [Gitea #112] A network failure while offline is queued, not failed: the
|
||||||
|
// outbox sends it again when the connection is back.
|
||||||
|
const queued = status === EventStatus.NOT_SENT && offline && isRetryableSendError(mEvent.error);
|
||||||
|
const failed = !queued && (status === EventStatus.NOT_SENT || status === EventStatus.CANCELLED);
|
||||||
|
if (failed) {
|
||||||
iconSrc = Icons.Cross;
|
iconSrc = Icons.Cross;
|
||||||
label = 'Failed to send';
|
label = status === EventStatus.NOT_SENT ? 'Failed to send. Click to retry' : 'Failed to send';
|
||||||
colorStyle = lotusTerminal ? 'var(--lt-accent-red)' : color.Critical.Main;
|
colorStyle = lotusTerminal ? 'var(--lt-accent-red)' : color.Critical.Main;
|
||||||
} else if (status === EventStatus.QUEUED || isSending) {
|
} else if (queued || status === EventStatus.QUEUED || isSending) {
|
||||||
iconSrc = Icons.Send;
|
iconSrc = queued ? Icons.RecentClock : Icons.Send;
|
||||||
label = isSending ? 'Sending...' : 'Queued';
|
if (queued) label = "Queued. Will send when you're back online";
|
||||||
|
else label = isSending ? 'Sending...' : 'Queued';
|
||||||
colorStyle = lotusTerminal
|
colorStyle = lotusTerminal
|
||||||
? 'color-mix(in srgb, var(--lt-accent-cyan) 60%, transparent)'
|
? 'color-mix(in srgb, var(--lt-accent-cyan) 60%, transparent)'
|
||||||
: color.Secondary.Main;
|
: color.Secondary.Main;
|
||||||
@@ -130,27 +142,49 @@ function DeliveryStatus({
|
|||||||
? 'color-mix(in srgb, var(--lt-accent-cyan) 70%, transparent)'
|
? 'color-mix(in srgb, var(--lt-accent-cyan) 70%, transparent)'
|
||||||
: color.Secondary.Main;
|
: color.Secondary.Main;
|
||||||
}
|
}
|
||||||
|
const retryable = failed && status === EventStatus.NOT_SENT;
|
||||||
|
const handleRetry: MouseEventHandler<HTMLButtonElement> = (evt) => {
|
||||||
|
evt.stopPropagation();
|
||||||
|
if (mEvent.status === EventStatus.NOT_SENT) mx.resendEvent(mEvent, room).catch(() => undefined);
|
||||||
|
};
|
||||||
|
const style: CSSProperties = {
|
||||||
|
display: 'inline-flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
marginTop: '2px',
|
||||||
|
lineHeight: 1,
|
||||||
|
color: colorStyle,
|
||||||
|
opacity: 0.85,
|
||||||
|
userSelect: 'none',
|
||||||
|
...(lotusTerminal && failed ? { textShadow: 'var(--lt-glow-red)' } : {}),
|
||||||
|
};
|
||||||
|
const icon = (
|
||||||
|
<span className={isSending ? SendingSpinClass : undefined}>
|
||||||
|
<Icon size="100" src={iconSrc} />
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
if (retryable) {
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={handleRetry}
|
||||||
|
aria-label={label}
|
||||||
|
title={label}
|
||||||
|
style={{
|
||||||
|
...style,
|
||||||
|
background: 'none',
|
||||||
|
border: 'none',
|
||||||
|
padding: 0,
|
||||||
|
cursor: 'pointer',
|
||||||
|
font: 'inherit',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{icon}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box as="span" aria-label={label} title={label} style={style}>
|
||||||
as="span"
|
{icon}
|
||||||
aria-label={label}
|
|
||||||
title={label}
|
|
||||||
style={{
|
|
||||||
display: 'inline-flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
marginTop: '2px',
|
|
||||||
lineHeight: 1,
|
|
||||||
color: colorStyle,
|
|
||||||
opacity: 0.85,
|
|
||||||
userSelect: 'none',
|
|
||||||
...(lotusTerminal && status === EventStatus.NOT_SENT
|
|
||||||
? { textShadow: 'var(--lt-glow-red)' }
|
|
||||||
: {}),
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<span className={isSending ? SendingSpinClass : undefined}>
|
|
||||||
<Icon size="100" src={iconSrc} />
|
|
||||||
</span>
|
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -460,18 +494,11 @@ export const MessageCopyLotusLinkItem = as<
|
|||||||
onClose?: () => void;
|
onClose?: () => void;
|
||||||
}
|
}
|
||||||
>(({ room, mEvent, onClose, ...props }, ref) => {
|
>(({ room, mEvent, onClose, ...props }, ref) => {
|
||||||
const { hashRouter } = useClientConfig();
|
const lotusBase = useLotusShareBase();
|
||||||
const handleCopy = () => {
|
const handleCopy = () => {
|
||||||
const eventId = mEvent.getId();
|
const eventId = mEvent.getId();
|
||||||
if (!eventId) return;
|
if (!eventId) return;
|
||||||
copyToClipboard(
|
copyToClipboard(getLotusRoomPermalink(lotusBase, room.roomId, eventId, getViaServers(room)));
|
||||||
getLotusRoomPermalink(
|
|
||||||
getOriginBaseUrl(hashRouter),
|
|
||||||
room.roomId,
|
|
||||||
eventId,
|
|
||||||
getViaServers(room),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
onClose?.();
|
onClose?.();
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1110,7 +1137,7 @@ export const Message = React.memo(
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{isMine && !mEvent.isState() && readReceiptUsers.length === 0 && (
|
{isMine && !mEvent.isState() && readReceiptUsers.length === 0 && (
|
||||||
<DeliveryStatus status={mEvent.status} lotusTerminal={!!lotusTerminal} />
|
<DeliveryStatus mEvent={mEvent} room={room} lotusTerminal={!!lotusTerminal} />
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ import { Badge, Box, Chip, Icon, Icons, Line, Scroll, Spinner, Text, color, conf
|
|||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { Opts as LinkifyOpts } from 'linkifyjs';
|
import { Opts as LinkifyOpts } from 'linkifyjs';
|
||||||
import { isKeyHotkey } from 'is-hotkey';
|
import { isKeyHotkey } from 'is-hotkey';
|
||||||
|
import { isRetryableSendError } from '../../../utils/outbox';
|
||||||
|
import { sendOfflineAtom } from '../../../state/sendOffline';
|
||||||
import { eventWithShortcode, factoryEventSentBy } from '../../../utils/matrix';
|
import { eventWithShortcode, factoryEventSentBy } from '../../../utils/matrix';
|
||||||
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
||||||
import { useVirtualPaginator, ItemRange } from '../../../hooks/useVirtualPaginator';
|
import { useVirtualPaginator, ItemRange } from '../../../hooks/useVirtualPaginator';
|
||||||
@@ -73,7 +75,7 @@ import { useSetting } from '../../../state/hooks/settings';
|
|||||||
import { MessageLayout, settingsAtom } from '../../../state/settings';
|
import { MessageLayout, settingsAtom } from '../../../state/settings';
|
||||||
import { Message, Reactions, EncryptedContent } from '../message';
|
import { Message, Reactions, EncryptedContent } from '../message';
|
||||||
import { RenderMessageContent } from '../../../components/RenderMessageContent';
|
import { RenderMessageContent } from '../../../components/RenderMessageContent';
|
||||||
import { RoomMediaLightbox } from '../RoomMediaLightbox';
|
import { Lightbox, toLightboxItems } from '../MediaGallery';
|
||||||
import { Image } from '../../../components/media';
|
import { Image } from '../../../components/media';
|
||||||
import { ImageViewer } from '../../../components/image-viewer';
|
import { ImageViewer } from '../../../components/image-viewer';
|
||||||
import * as css from './ThreadTimeline.css';
|
import * as css from './ThreadTimeline.css';
|
||||||
@@ -253,6 +255,7 @@ export type ThreadTimelineProps = {
|
|||||||
|
|
||||||
export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
|
const sendOffline = useAtomValue(sendOfflineAtom);
|
||||||
const alive = useAlive();
|
const alive = useAlive();
|
||||||
const useAuthentication = useMediaAuthentication();
|
const useAuthentication = useMediaAuthentication();
|
||||||
|
|
||||||
@@ -308,7 +311,7 @@ export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
|||||||
|
|
||||||
const [editId, setEditId] = useState<string>();
|
const [editId, setEditId] = useState<string>();
|
||||||
const [editHistoryEvent, setEditHistoryEvent] = useState<MatrixEvent | undefined>();
|
const [editHistoryEvent, setEditHistoryEvent] = useState<MatrixEvent | undefined>();
|
||||||
// [Gitea #219] Thread images open the room's shared media lightbox too.
|
// [Gitea #219] Thread images open the shared media lightbox too.
|
||||||
const [lightboxEventId, setLightboxEventId] = useState<string | undefined>();
|
const [lightboxEventId, setLightboxEventId] = useState<string | undefined>();
|
||||||
|
|
||||||
const linkifyOpts = useMemo<LinkifyOpts>(
|
const linkifyOpts = useMemo<LinkifyOpts>(
|
||||||
@@ -627,11 +630,9 @@ export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleOpenReply: MouseEventHandler = useCallback(
|
// best-effort: scroll to an event if it is inside the loaded thread window
|
||||||
(evt) => {
|
const scrollToThreadEvent = useCallback(
|
||||||
const targetId = evt.currentTarget.getAttribute('data-event-id');
|
(targetId: string) => {
|
||||||
if (!targetId) return;
|
|
||||||
// best-effort: scroll to referenced event if it is inside the loaded thread window
|
|
||||||
let absIndex = -1;
|
let absIndex = -1;
|
||||||
let acc = 0;
|
let acc = 0;
|
||||||
timeline.linkedTimelines.some((tl) => {
|
timeline.linkedTimelines.some((tl) => {
|
||||||
@@ -654,6 +655,39 @@ export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
|||||||
[timeline.linkedTimelines, scrollToItem],
|
[timeline.linkedTimelines, scrollToItem],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handleOpenReply: MouseEventHandler = useCallback(
|
||||||
|
(evt) => {
|
||||||
|
const targetId = evt.currentTarget.getAttribute('data-event-id');
|
||||||
|
if (targetId) scrollToThreadEvent(targetId);
|
||||||
|
},
|
||||||
|
[scrollToThreadEvent],
|
||||||
|
);
|
||||||
|
|
||||||
|
// [Gitea #164] The viewer steps through this thread's media (root + loaded
|
||||||
|
// replies). Thread replies never reach the room's media timeline, so the
|
||||||
|
// room lightbox could only ever show a thread image as "1 / 1".
|
||||||
|
const lightboxItems = useMemo(() => {
|
||||||
|
if (!lightboxEventId) return [];
|
||||||
|
const seen = new Set<string>();
|
||||||
|
const events = [thread.rootEvent, ...timeline.linkedTimelines.flatMap((tl) => tl.getEvents())]
|
||||||
|
.filter((ev): ev is MatrixEvent => !!ev)
|
||||||
|
.filter((ev) => {
|
||||||
|
const id = ev.getId();
|
||||||
|
if (!id || seen.has(id) || ev.isRedacted()) return false;
|
||||||
|
seen.add(id);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
return toLightboxItems(room, events);
|
||||||
|
}, [lightboxEventId, thread.rootEvent, timeline.linkedTimelines, room]);
|
||||||
|
const lightboxIndex = lightboxItems.findIndex((it) => it.eventId === lightboxEventId);
|
||||||
|
const handleLightboxJump = useCallback(
|
||||||
|
(id: string) => {
|
||||||
|
setLightboxEventId(undefined);
|
||||||
|
scrollToThreadEvent(id);
|
||||||
|
},
|
||||||
|
[scrollToThreadEvent],
|
||||||
|
);
|
||||||
|
|
||||||
const renderMessageContent = useCallback(
|
const renderMessageContent = useCallback(
|
||||||
(mEvent: MatrixEvent, mEventId: string, timelineSet: EventTimelineSet): ReactNode => {
|
(mEvent: MatrixEvent, mEventId: string, timelineSet: EventTimelineSet): ReactNode => {
|
||||||
// Evaluated lazily so EncryptedContent can re-run it (re-reading getType())
|
// Evaluated lazily so EncryptedContent can re-run it (re-reading getType())
|
||||||
@@ -961,8 +995,12 @@ export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
|||||||
const showEmptyReplies = ready && thread.length === 0;
|
const showEmptyReplies = ready && thread.length === 0;
|
||||||
|
|
||||||
const renderPendingEvent = (mEvent: MatrixEvent) => {
|
const renderPendingEvent = (mEvent: MatrixEvent) => {
|
||||||
|
// [Gitea #112] Network failures while offline are queued, not failed.
|
||||||
|
const queued =
|
||||||
|
mEvent.status === EventStatus.NOT_SENT && sendOffline && isRetryableSendError(mEvent.error);
|
||||||
const failed =
|
const failed =
|
||||||
mEvent.status === EventStatus.NOT_SENT || mEvent.status === EventStatus.CANCELLED;
|
!queued &&
|
||||||
|
(mEvent.status === EventStatus.NOT_SENT || mEvent.status === EventStatus.CANCELLED);
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={mEvent.getId() ?? mEvent.getTxnId()}
|
key={mEvent.getId() ?? mEvent.getTxnId()}
|
||||||
@@ -976,6 +1014,13 @@ export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
|||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
{queued && (
|
||||||
|
<Box style={{ padding: `0 ${config.space.S400}` }}>
|
||||||
|
<Text size="T200" priority="300">
|
||||||
|
Queued. Will send when you're back online
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1051,11 +1096,13 @@ export function ThreadTimeline({ room, thread, editor }: ThreadTimelineProps) {
|
|||||||
onClose={() => setEditHistoryEvent(undefined)}
|
onClose={() => setEditHistoryEvent(undefined)}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{lightboxEventId && (
|
{lightboxEventId && lightboxIndex !== -1 && (
|
||||||
<RoomMediaLightbox
|
<Lightbox
|
||||||
room={room}
|
items={lightboxItems}
|
||||||
eventId={lightboxEventId}
|
initialIndex={lightboxIndex}
|
||||||
|
useAuthentication={useAuthentication}
|
||||||
onClose={() => setLightboxEventId(undefined)}
|
onClose={() => setLightboxEventId(undefined)}
|
||||||
|
onJump={handleLightboxJump}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { Capability, ClientWidgetApi, IRoomEvent, Widget } from 'matrix-widget-a
|
|||||||
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
||||||
import { GeneralWidgetDriver } from './GeneralWidgetDriver';
|
import { GeneralWidgetDriver } from './GeneralWidgetDriver';
|
||||||
import { WidgetPermissionRequest, isWidgetUrlSafe } from './widgetUtils';
|
import { WidgetPermissionRequest, isWidgetUrlSafe } from './widgetUtils';
|
||||||
|
import { restrictWidgetMessages } from '../../../plugins/widgetTransport';
|
||||||
import { WidgetPermissionPrompt } from './WidgetPermissionPrompt';
|
import { WidgetPermissionPrompt } from './WidgetPermissionPrompt';
|
||||||
|
|
||||||
type PendingAsk = {
|
type PendingAsk = {
|
||||||
@@ -96,6 +97,9 @@ export function RoomWidgetView({ room, widget }: RoomWidgetViewProps) {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
const clientApi = new ClientWidgetApi(current, iframe, driver);
|
const clientApi = new ClientWidgetApi(current, iframe, driver);
|
||||||
|
// Only messages from this widget's own frame and origin are handled, so a
|
||||||
|
// widget can't impersonate another one (or the call).
|
||||||
|
restrictWidgetMessages(clientApi, iframe, current.origin);
|
||||||
clientApi.setViewedRoomId(room.roomId);
|
clientApi.setViewedRoomId(room.roomId);
|
||||||
|
|
||||||
// Live room events for widgets that were allowed to see them
|
// Live room events for widgets that were allowed to see them
|
||||||
|
|||||||
@@ -0,0 +1,168 @@
|
|||||||
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
|
import { useAtomValue, useSetAtom } from 'jotai';
|
||||||
|
import { MatrixClient, SyncState } from 'matrix-js-sdk';
|
||||||
|
import { Box, Button, config, Icon, IconButton, Icons, IconSrc, Line, Text } from 'folds';
|
||||||
|
import { ContainerColor } from '../../styles/ContainerColor.css';
|
||||||
|
import { useClientConfig } from '../../hooks/useClientConfig';
|
||||||
|
import { useSyncState } from '../../hooks/useSyncState';
|
||||||
|
import { useServerStatus } from '../../hooks/useServerStatus';
|
||||||
|
import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
|
||||||
|
import { serverStatusAtom } from '../../state/serverStatus';
|
||||||
|
import { pickBanner, resolveStatusPage, StatusBanner } from '../../utils/kumaStatus';
|
||||||
|
|
||||||
|
const DISMISS_KEY = 'lotus-status-banner-dismissed';
|
||||||
|
const DISMISS_MAX = 50;
|
||||||
|
|
||||||
|
const readDismissed = (): string[] => {
|
||||||
|
try {
|
||||||
|
const v = JSON.parse(localStorage.getItem(DISMISS_KEY) ?? '[]');
|
||||||
|
return Array.isArray(v) ? v.filter((k): k is string => typeof k === 'string') : [];
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const bannerIcon = (b: StatusBanner): IconSrc => {
|
||||||
|
if (b.kind === 'maintenance') return Icons.Setting;
|
||||||
|
if (b.tone === 'Primary') return Icons.Info;
|
||||||
|
return Icons.Warning;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #124] One status strip, in the same slot and style as the sync and
|
||||||
|
* clock banners. Presentational: the caller picks the banner.
|
||||||
|
*/
|
||||||
|
export function StatusStrip({
|
||||||
|
banner,
|
||||||
|
onDismiss,
|
||||||
|
}: {
|
||||||
|
banner: StatusBanner;
|
||||||
|
onDismiss?: () => void;
|
||||||
|
}) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const mobile = useScreenSizeContext() === ScreenSize.Mobile;
|
||||||
|
useEffect(() => setOpen(false), [banner.key]);
|
||||||
|
const critical = banner.tone === 'Critical';
|
||||||
|
return (
|
||||||
|
<Box direction="Column" shrink="No">
|
||||||
|
<Box
|
||||||
|
className={ContainerColor({ variant: banner.tone })}
|
||||||
|
style={{ padding: `${config.space.S100} ${config.space.S300}` }}
|
||||||
|
direction="Column"
|
||||||
|
gap="100"
|
||||||
|
role={critical ? 'alert' : 'status'}
|
||||||
|
aria-live={critical ? 'assertive' : 'polite'}
|
||||||
|
>
|
||||||
|
<Box
|
||||||
|
alignItems="Center"
|
||||||
|
justifyContent={mobile ? 'Start' : 'Center'}
|
||||||
|
gap="200"
|
||||||
|
style={{ minHeight: config.size.X300 }}
|
||||||
|
>
|
||||||
|
<Icon size="100" src={bannerIcon(banner)} />
|
||||||
|
<Text size="L400" truncate={mobile && !open} style={{ minWidth: 0 }}>
|
||||||
|
{banner.text}
|
||||||
|
</Text>
|
||||||
|
{banner.detail && (
|
||||||
|
<Button
|
||||||
|
size="300"
|
||||||
|
variant={banner.tone}
|
||||||
|
fill="None"
|
||||||
|
radii="300"
|
||||||
|
aria-expanded={open}
|
||||||
|
onClick={() => setOpen((v) => !v)}
|
||||||
|
style={{ flexShrink: 0 }}
|
||||||
|
>
|
||||||
|
<Text size="B300" style={{ textDecoration: 'underline' }}>
|
||||||
|
{open ? 'Hide' : 'Details'}
|
||||||
|
</Text>
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
{banner.dismissable && onDismiss && (
|
||||||
|
<IconButton
|
||||||
|
size="300"
|
||||||
|
variant={banner.tone}
|
||||||
|
fill="None"
|
||||||
|
radii="300"
|
||||||
|
aria-label="Dismiss"
|
||||||
|
onClick={onDismiss}
|
||||||
|
style={{ flexShrink: 0 }}
|
||||||
|
>
|
||||||
|
<Icon size="100" src={Icons.Cross} />
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
{banner.detail && open && (
|
||||||
|
<Box justifyContent={mobile ? 'Start' : 'Center'}>
|
||||||
|
<Text size="T200" style={{ maxWidth: 680, whiteSpace: 'pre-line' }}>
|
||||||
|
{banner.detail}
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
<Line variant={banner.tone} size="300" />
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Runs the Kuma poller for the logged-in homeserver and publishes it. */
|
||||||
|
export function ServerStatusFeature({ mx }: { mx: MatrixClient }) {
|
||||||
|
const { statusPages } = useClientConfig();
|
||||||
|
const page = useMemo(
|
||||||
|
() => resolveStatusPage(statusPages, mx.getDomain() ?? undefined),
|
||||||
|
[statusPages, mx],
|
||||||
|
);
|
||||||
|
const [lostAt, setLostAt] = useState<number | null>(null);
|
||||||
|
useSyncState(
|
||||||
|
mx,
|
||||||
|
useCallback((state: SyncState | null) => {
|
||||||
|
const lost = state === SyncState.Reconnecting || state === SyncState.Error;
|
||||||
|
setLostAt((prev) => {
|
||||||
|
if (!lost) return null;
|
||||||
|
return prev ?? Date.now();
|
||||||
|
});
|
||||||
|
}, []),
|
||||||
|
);
|
||||||
|
const syncLost = lostAt !== null;
|
||||||
|
const status = useServerStatus(page, syncLost);
|
||||||
|
const setAtom = useSetAtom(serverStatusAtom);
|
||||||
|
useEffect(() => setAtom({ status, syncLost, lostAt }), [setAtom, status, syncLost, lostAt]);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The logged-in app's status strip. */
|
||||||
|
export function ServerStatusBanner() {
|
||||||
|
const { status, syncLost } = useAtomValue(serverStatusAtom);
|
||||||
|
const [dismissed, setDismissed] = useState(readDismissed);
|
||||||
|
const banner = pickBanner(status, {
|
||||||
|
syncLost,
|
||||||
|
where: 'client',
|
||||||
|
dismissed: new Set(dismissed),
|
||||||
|
});
|
||||||
|
if (!banner) return null;
|
||||||
|
const dismiss = () => {
|
||||||
|
const next = [...dismissed.filter((k) => k !== banner.key), banner.key].slice(-DISMISS_MAX);
|
||||||
|
try {
|
||||||
|
localStorage.setItem(DISMISS_KEY, JSON.stringify(next));
|
||||||
|
} catch {
|
||||||
|
// storage unavailable — dismissed for this session only
|
||||||
|
}
|
||||||
|
setDismissed(next);
|
||||||
|
};
|
||||||
|
return <StatusStrip banner={banner} onDismiss={dismiss} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The sign-in screen's strip, for the homeserver being signed in to. */
|
||||||
|
export function LoginStatusBanner({ serverName }: { serverName: string }) {
|
||||||
|
const { statusPages } = useClientConfig();
|
||||||
|
const page = useMemo(() => resolveStatusPage(statusPages, serverName), [statusPages, serverName]);
|
||||||
|
const status = useServerStatus(page);
|
||||||
|
const banner = pickBanner(status, { syncLost: false, where: 'login' });
|
||||||
|
return banner ? <StatusStrip banner={banner} /> : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Calls-down note for the call Join controls (null when calls are fine). */
|
||||||
|
export function useCallsDown(): boolean {
|
||||||
|
const { status } = useAtomValue(serverStatusAtom);
|
||||||
|
return status?.calls === 'down' && status.homeserver !== 'down';
|
||||||
|
}
|
||||||
@@ -112,8 +112,15 @@ import {
|
|||||||
import { chromeTranslationEngine } from '../../../utils/translation/chromeEngine';
|
import { chromeTranslationEngine } from '../../../utils/translation/chromeEngine';
|
||||||
import { SequenceCardStyle } from '../styles.css';
|
import { SequenceCardStyle } from '../styles.css';
|
||||||
import { UpdateProgress, useTauriUpdater } from '../../../hooks/useTauriUpdater';
|
import { UpdateProgress, useTauriUpdater } from '../../../hooks/useTauriUpdater';
|
||||||
import { describeUpdateError, manualDownloadUrl } from '../../../utils/updateErrors';
|
import {
|
||||||
|
describeUpdateError,
|
||||||
|
isPackageManagedError,
|
||||||
|
manualDownloadUrl,
|
||||||
|
packageUpdateHelp,
|
||||||
|
} from '../../../utils/updateErrors';
|
||||||
|
import { copyToClipboard } from '../../../utils/dom';
|
||||||
import { isTauri as isTauriEnv, invokeTauri, tauriInvoke } from '../../../hooks/useTauri';
|
import { isTauri as isTauriEnv, invokeTauri, tauriInvoke } from '../../../hooks/useTauri';
|
||||||
|
import { useKeychainMirrorStatus } from '../../../state/keychainMirror';
|
||||||
import { isSafeGlobalToggleKey } from '../../../hooks/useCallHotkeys';
|
import { isSafeGlobalToggleKey } from '../../../hooks/useCallHotkeys';
|
||||||
import { customWindowChromeAtom } from '../../../state/customWindowChrome';
|
import { customWindowChromeAtom } from '../../../state/customWindowChrome';
|
||||||
import { useDateFormatItems } from '../../../hooks/useDateFormat';
|
import { useDateFormatItems } from '../../../hooks/useDateFormat';
|
||||||
@@ -238,6 +245,27 @@ function AutostartSetting() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// [Gitea #105] Desktop: whether the login is also kept in the OS keychain.
|
||||||
|
function KeychainMirrorSetting() {
|
||||||
|
const status = useKeychainMirrorStatus();
|
||||||
|
if (!isTauriEnv() || status.state === 'idle' || status.state === 'cleared') return null;
|
||||||
|
let description: string;
|
||||||
|
if (status.state === 'ok') {
|
||||||
|
description =
|
||||||
|
"A copy of your login is kept in the system keychain (Windows Credential Manager). A later update will keep it only there, out of the app's data folder.";
|
||||||
|
} else if (status.state === 'unsupported') {
|
||||||
|
description =
|
||||||
|
"Not available on this system yet. Your login is saved in the app's data folder, as before.";
|
||||||
|
} else {
|
||||||
|
description = `Couldn't save a copy to the system keychain (${status.error}). You stay logged in; your login is saved in the app's data folder, as before.`;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||||
|
<SettingTile title="Login in the system keychain" description={description} />
|
||||||
|
</SequenceCard>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
type ThemeSelectorProps = {
|
type ThemeSelectorProps = {
|
||||||
themeNames: Record<string, string>;
|
themeNames: Record<string, string>;
|
||||||
themes: Theme[];
|
themes: Theme[];
|
||||||
@@ -570,6 +598,7 @@ function Appearance() {
|
|||||||
|
|
||||||
<DesktopChromeSetting />
|
<DesktopChromeSetting />
|
||||||
<AutostartSetting />
|
<AutostartSetting />
|
||||||
|
<KeychainMirrorSetting />
|
||||||
|
|
||||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||||
<SettingTile
|
<SettingTile
|
||||||
@@ -2771,12 +2800,76 @@ function updateProgressText(progress: UpdateProgress | undefined): string {
|
|||||||
return `Downloading update… ${pct}% (${formatMb(downloaded)} of ${formatMb(total)})${attempt}`;
|
return `Downloading update… ${pct}% (${formatMb(downloaded)} of ${formatMb(total)})${attempt}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function AppUpdates() {
|
/**
|
||||||
const { isTauri, status, check, install } = useTauriUpdater();
|
* A Linux package install is updated with its package manager (the in-app
|
||||||
if (!isTauri) return null;
|
* updater can't write to /usr/bin): the command, Copy and a download link.
|
||||||
|
*/
|
||||||
|
function PackageUpdate({ help }: { help: NonNullable<ReturnType<typeof packageUpdateHelp>> }) {
|
||||||
|
const [copied, setCopied] = useState<'no' | 'yes' | 'failed'>('no');
|
||||||
|
const copy = () => {
|
||||||
|
const text = help.command ?? '';
|
||||||
|
if (!navigator.clipboard) {
|
||||||
|
copyToClipboard(text);
|
||||||
|
setCopied('yes');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
navigator.clipboard.writeText(text).then(
|
||||||
|
() => setCopied('yes'),
|
||||||
|
() => setCopied('failed'),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
let copyLabel = 'Copy command';
|
||||||
|
if (copied === 'yes') copyLabel = 'Copied';
|
||||||
|
else if (copied === 'failed') copyLabel = 'Copy failed: select it above';
|
||||||
|
return (
|
||||||
|
<Box direction="Column" gap="200">
|
||||||
|
<Text size="T200">
|
||||||
|
Lotus Chat was installed as a system package, so update it the same way
|
||||||
|
{help.command ? ' (your chats and settings are kept):' : '.'}
|
||||||
|
</Text>
|
||||||
|
{help.command && (
|
||||||
|
<Text
|
||||||
|
size="T200"
|
||||||
|
style={{ fontFamily: 'monospace', wordBreak: 'break-all', userSelect: 'all' }}
|
||||||
|
>
|
||||||
|
{help.command}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
<Box gap="200" wrap="Wrap">
|
||||||
|
{help.command && (
|
||||||
|
<Button size="300" radii="300" variant="Secondary" onClick={copy}>
|
||||||
|
<Text size="B300">{copyLabel}</Text>
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
size="300"
|
||||||
|
radii="300"
|
||||||
|
variant="Secondary"
|
||||||
|
fill="None"
|
||||||
|
outlined
|
||||||
|
onClick={() => window.open(help.url, '_blank')}
|
||||||
|
>
|
||||||
|
<Text size="B300">{help.download}</Text>
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const description =
|
function AppUpdates() {
|
||||||
status.state === 'checking'
|
const { isTauri, status, check, install, installKind } = useTauriUpdater();
|
||||||
|
if (!isTauri) return null;
|
||||||
|
const packageHelp = packageUpdateHelp(installKind);
|
||||||
|
const packageUpdate =
|
||||||
|
!!packageHelp &&
|
||||||
|
(status.state === 'available' ||
|
||||||
|
(status.state === 'error' && isPackageManagedError(status.message)));
|
||||||
|
|
||||||
|
const description = packageUpdate
|
||||||
|
? status.state === 'available'
|
||||||
|
? `Update available: v${status.version}`
|
||||||
|
: 'An update is available.'
|
||||||
|
: status.state === 'checking'
|
||||||
? 'Checking for updates...'
|
? 'Checking for updates...'
|
||||||
: status.state === 'up-to-date'
|
: status.state === 'up-to-date'
|
||||||
? 'Lotus Chat is up to date.'
|
? 'Lotus Chat is up to date.'
|
||||||
@@ -2793,43 +2886,43 @@ function AppUpdates() {
|
|||||||
else check();
|
else check();
|
||||||
};
|
};
|
||||||
|
|
||||||
const after =
|
const after = packageUpdate ? undefined : status.state === 'available' ? (
|
||||||
status.state === 'available' ? (
|
<Button size="300" radii="300" onClick={() => install()}>
|
||||||
<Button size="300" radii="300" onClick={() => install()}>
|
<Text size="B300">Install & Restart</Text>
|
||||||
<Text size="B300">Install & Restart</Text>
|
</Button>
|
||||||
|
) : status.state === 'checking' || status.state === 'installing' ? (
|
||||||
|
<Spinner variant="Secondary" size="200" />
|
||||||
|
) : status.state === 'error' ? (
|
||||||
|
<Box gap="200" wrap="Wrap" justifyContent="End">
|
||||||
|
<Button size="300" radii="300" variant="Secondary" onClick={retry}>
|
||||||
|
<Text size="B300">Try again</Text>
|
||||||
</Button>
|
</Button>
|
||||||
) : status.state === 'checking' || status.state === 'installing' ? (
|
{status.phase !== 'check' && (
|
||||||
<Spinner variant="Secondary" size="200" />
|
<Button
|
||||||
) : status.state === 'error' ? (
|
size="300"
|
||||||
<Box gap="200" wrap="Wrap" justifyContent="End">
|
radii="300"
|
||||||
<Button size="300" radii="300" variant="Secondary" onClick={retry}>
|
variant="Secondary"
|
||||||
<Text size="B300">Try again</Text>
|
fill="None"
|
||||||
|
outlined
|
||||||
|
onClick={() => window.open(manualDownloadUrl(navigator.userAgent), '_blank')}
|
||||||
|
>
|
||||||
|
<Text size="B300">Download installer</Text>
|
||||||
</Button>
|
</Button>
|
||||||
{status.phase !== 'check' && (
|
)}
|
||||||
<Button
|
</Box>
|
||||||
size="300"
|
) : (
|
||||||
radii="300"
|
<Button size="300" radii="300" variant="Secondary" onClick={check}>
|
||||||
variant="Secondary"
|
<Text size="B300">Check</Text>
|
||||||
fill="None"
|
</Button>
|
||||||
outlined
|
);
|
||||||
onClick={() => window.open(manualDownloadUrl(navigator.userAgent), '_blank')}
|
|
||||||
>
|
|
||||||
<Text size="B300">Download installer</Text>
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</Box>
|
|
||||||
) : (
|
|
||||||
<Button size="300" radii="300" variant="Secondary" onClick={check}>
|
|
||||||
<Text size="B300">Check</Text>
|
|
||||||
</Button>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box direction="Column" gap="100">
|
<Box direction="Column" gap="100">
|
||||||
<Text size="L400">App Updates</Text>
|
<Text size="L400">App Updates</Text>
|
||||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||||
<SettingTile title="Check for Updates" description={description} after={after} />
|
<SettingTile title="Check for Updates" description={description} after={after} />
|
||||||
{status.state === 'error' && (
|
{packageUpdate && packageHelp && <PackageUpdate help={packageHelp} />}
|
||||||
|
{status.state === 'error' && !packageUpdate && (
|
||||||
<Text size="T200" priority="300" style={{ wordBreak: 'break-word' }}>
|
<Text size="T200" priority="300" style={{ wordBreak: 'break-word' }}>
|
||||||
Details: {status.message}
|
Details: {status.message}
|
||||||
</Text>
|
</Text>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useRef, useState } from 'react';
|
import { useEffect, useRef } from 'react';
|
||||||
import { atom, useSetAtom } from 'jotai';
|
import { atom, useSetAtom } from 'jotai';
|
||||||
import { CallEmbed, useCallControlState } from '../plugins/call';
|
import { CallEmbed, useCallControlState } from '../plugins/call';
|
||||||
import { useSetting } from '../state/hooks/settings';
|
import { useSetting } from '../state/hooks/settings';
|
||||||
@@ -105,32 +105,6 @@ const isInteractive = (el: HTMLElement): boolean => {
|
|||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Bind listeners to the EC iframe's window and keep them bound across document
|
|
||||||
* reloads. [Gitea #60] Listeners registered on a contentWindow are discarded
|
|
||||||
* when that window navigates to a new document (crash recovery, in-widget
|
|
||||||
* navigation), so re-run `bind` from the iframe's `load` event and detach the
|
|
||||||
* previous set. Returns a cleanup that detaches everything.
|
|
||||||
*/
|
|
||||||
const bindIframeWindow = (
|
|
||||||
iframe: HTMLIFrameElement,
|
|
||||||
bind: (win: Window) => () => void,
|
|
||||||
): (() => void) => {
|
|
||||||
let unbind: (() => void) | undefined;
|
|
||||||
const attach = () => {
|
|
||||||
unbind?.();
|
|
||||||
const win = iframe.contentWindow;
|
|
||||||
unbind = win ? bind(win) : undefined;
|
|
||||||
};
|
|
||||||
attach();
|
|
||||||
iframe.addEventListener('load', attach);
|
|
||||||
return () => {
|
|
||||||
iframe.removeEventListener('load', attach);
|
|
||||||
unbind?.();
|
|
||||||
unbind = undefined;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Push-to-talk and deafen hotkeys for the active call.
|
* Push-to-talk and deafen hotkeys for the active call.
|
||||||
*
|
*
|
||||||
@@ -150,20 +124,6 @@ export function useCallHotkeys(callEmbed: CallEmbed | undefined, joined: boolean
|
|||||||
const { microphone } = useCallControlState(embed?.control);
|
const { microphone } = useCallControlState(embed?.control);
|
||||||
const setPttActive = useSetAtom(pttActiveAtom);
|
const setPttActive = useSetAtom(pttActiveAtom);
|
||||||
|
|
||||||
// [Gitea #43] Once the fork reports it handles hotkeys, keys pressed inside
|
|
||||||
// the call frame arrive as io.lotus.hotkey and we stop adding listeners to
|
|
||||||
// the frame's window (which needs same-origin access).
|
|
||||||
const [forkHotkeys, setForkHotkeys] = useState(false);
|
|
||||||
useEffect(() => {
|
|
||||||
if (!embed) {
|
|
||||||
setForkHotkeys(false);
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
const sync = () => setForkHotkeys(embed.control.forkHandlesHotkeys);
|
|
||||||
sync();
|
|
||||||
return embed.control.onForkHotkeysChange(sync);
|
|
||||||
}, [embed]);
|
|
||||||
|
|
||||||
// Track microphone via ref so the PTT effect doesn't need it as a dep (avoids listener churn)
|
// Track microphone via ref so the PTT effect doesn't need it as a dep (avoids listener churn)
|
||||||
const microphoneRef = useRef(microphone);
|
const microphoneRef = useRef(microphone);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -268,25 +228,23 @@ export function useCallHotkeys(callEmbed: CallEmbed | undefined, joined: boolean
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
const unbindHost = bind(window);
|
const unbindHost = bind(window);
|
||||||
// BUG-9: PTT also works with focus in the call frame — reported by the
|
// BUG-9: PTT also works with focus in the call frame, reported by the
|
||||||
// fork, or (older fork) via listeners on the frame's window.
|
// fork (io.lotus.hotkey; the host no longer listens on the frame's window).
|
||||||
embed.control.setHotkeyCodes('ptt', [pttKey]);
|
embed.control.setHotkeyCodes('ptt', [pttKey]);
|
||||||
const unbindFork = embed.control.onHotkey((r) => {
|
const unbindFork = embed.control.onHotkey((r) => {
|
||||||
if (r.type === 'focus') onFocusChange();
|
if (r.type === 'focus') onFocusChange();
|
||||||
else if (r.type === 'keydown') pttDown(r, r.editable, r.interactive);
|
else if (r.type === 'keydown') pttDown(r, r.editable, r.interactive);
|
||||||
else if (r.code === pttKey) release();
|
else if (r.code === pttKey) release();
|
||||||
});
|
});
|
||||||
const unbindIframe = forkHotkeys ? () => undefined : bindIframeWindow(embed.iframe, bind);
|
|
||||||
return () => {
|
return () => {
|
||||||
unbindHost();
|
unbindHost();
|
||||||
unbindFork();
|
unbindFork();
|
||||||
unbindIframe();
|
|
||||||
embed.control.setHotkeyCodes('ptt', []);
|
embed.control.setHotkeyCodes('ptt', []);
|
||||||
// BUG-8: if the embed changes while PTT is active, release mic on cleanup
|
// BUG-8: if the embed changes while PTT is active, release mic on cleanup
|
||||||
if (pttActiveRef.current) release();
|
if (pttActiveRef.current) release();
|
||||||
};
|
};
|
||||||
// microphone intentionally read via microphoneRef — excluded from deps to avoid listener churn
|
// microphone intentionally read via microphoneRef — excluded from deps to avoid listener churn
|
||||||
}, [pttMode, pttKey, embed, setPttActive, forkHotkeys]);
|
}, [pttMode, pttKey, embed, setPttActive]);
|
||||||
|
|
||||||
// [cinny-desktop #2] System-wide PTT/deafen while a game has focus. The
|
// [cinny-desktop #2] System-wide PTT/deafen while a game has focus. The
|
||||||
// desktop polls the configured keys without consuming them and emits one
|
// desktop polls the configured keys without consuming them and emits one
|
||||||
@@ -366,17 +324,10 @@ export function useCallHotkeys(callEmbed: CallEmbed | undefined, joined: boolean
|
|||||||
embed.control.toggleSound();
|
embed.control.toggleSound();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const unbindIframe = forkHotkeys
|
|
||||||
? () => undefined
|
|
||||||
: bindIframeWindow(embed.iframe, (win) => {
|
|
||||||
win.addEventListener('keydown', onKeyDown);
|
|
||||||
return () => win.removeEventListener('keydown', onKeyDown);
|
|
||||||
});
|
|
||||||
return () => {
|
return () => {
|
||||||
window.removeEventListener('keydown', onKeyDown);
|
window.removeEventListener('keydown', onKeyDown);
|
||||||
unbindFork();
|
unbindFork();
|
||||||
unbindIframe();
|
|
||||||
embed.control.setHotkeyCodes('deafen', []);
|
embed.control.setHotkeyCodes('deafen', []);
|
||||||
};
|
};
|
||||||
}, [embed, deafenKey, deafenHotkey, forkHotkeys]);
|
}, [embed, deafenKey, deafenHotkey]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1,16 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { CallEmbed } from '../plugins/call';
|
import { CallEmbed } from '../plugins/call';
|
||||||
import { getCallDocument } from '../plugins/call/utils';
|
|
||||||
import { isUserId } from '../utils/matrix';
|
|
||||||
import { nextSpeakerSet } from '../utils/speakerSet';
|
import { nextSpeakerSet } from '../utils/speakerSet';
|
||||||
import { useCallMembers, useCallSession } from './useCall';
|
import { useCallMembers, useCallSession } from './useCall';
|
||||||
import { useCallJoined } from './useCallEmbed';
|
import { useCallJoined } from './useCallEmbed';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the set of Matrix user IDs currently speaking in the Element Call
|
* Returns the set of Matrix user IDs currently speaking in the call, from the
|
||||||
* iframe.
|
* fork's io.lotus.call_state reports ([lotus #2]).
|
||||||
*
|
*
|
||||||
* EC renders each participant's video tile with a `[data-video-fit]` wrapper.
|
* [Gitea #43] The fallback that scraped EC's rendered tiles (the speaking
|
||||||
* When a participant is speaking, EC draws a speaking indicator via the tile's
|
* ring's `::before` background) is gone: the bundled fork always reports call
|
||||||
* `::before` pseudo-element `background-image` (anything other than `none`).
|
* state, and the host no longer reads the call frame's DOM.
|
||||||
* The participant's Matrix user ID is exposed on the first descendant carrying
|
|
||||||
* an `aria-label`.
|
|
||||||
*
|
|
||||||
* We watch the whole iframe document so tiles added/removed mid-call are picked
|
|
||||||
* up automatically, and on every relevant mutation we re-scan ALL `[data-video-fit]`
|
|
||||||
* tiles and rebuild the set from the full current DOM state (rather than just the
|
|
||||||
* tiles in the mutation batch).
|
|
||||||
*/
|
*/
|
||||||
export const useCallSpeakers = (callEmbed: CallEmbed): Set<string> => {
|
export const useCallSpeakers = (callEmbed: CallEmbed): Set<string> => {
|
||||||
const [speakers, setSpeakers] = useState(new Set<string>());
|
const [speakers, setSpeakers] = useState(new Set<string>());
|
||||||
@@ -28,9 +19,8 @@ export const useCallSpeakers = (callEmbed: CallEmbed): Set<string> => {
|
|||||||
const joined = useCallJoined(callEmbed);
|
const joined = useCallJoined(callEmbed);
|
||||||
|
|
||||||
// C-L5 — depend on a STABLE boolean, not the callMembers array (whose identity
|
// C-L5 — depend on a STABLE boolean, not the callMembers array (whose identity
|
||||||
// changes on every membership change). The MutationObserver + io.lotus.call_state
|
// changes on every membership change). The io.lotus.call_state subscription
|
||||||
// subscription below already track tiles joining/leaving live, so rebuilding
|
// below already tracks participants joining/leaving live.
|
||||||
// them on each membership change is pure churn.
|
|
||||||
const hasCallMembers = callMembers.length > 0;
|
const hasCallMembers = callMembers.length > 0;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -39,123 +29,22 @@ export const useCallSpeakers = (callEmbed: CallEmbed): Set<string> => {
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
const getDoc = (): Document | undefined => getCallDocument(callEmbed.iframe);
|
|
||||||
|
|
||||||
let tileObserver: MutationObserver | undefined;
|
|
||||||
|
|
||||||
const detachTileObserver = (): void => {
|
|
||||||
tileObserver?.disconnect();
|
|
||||||
tileObserver = undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
// #32 — only attach the DOM fallback observer while the fork isn't
|
|
||||||
// supplying usable speaker data; it stays disconnected for the rest of
|
|
||||||
// the call once io.lotus.call_state starts reporting participants.
|
|
||||||
const attachTileObserver = (): void => {
|
|
||||||
if (tileObserver) return;
|
|
||||||
const doc = getDoc();
|
|
||||||
if (!doc?.body) return;
|
|
||||||
// Watch the whole document for attribute changes on tiles (which carry
|
|
||||||
// the speaking indicator) and for new tiles being added/removed.
|
|
||||||
tileObserver = new MutationObserver((mutations) => {
|
|
||||||
const relevant = mutations.some(
|
|
||||||
(m) =>
|
|
||||||
m.type === 'attributes' ||
|
|
||||||
(m.type === 'childList' &&
|
|
||||||
(Array.from(m.addedNodes).some(
|
|
||||||
(n) => n instanceof Element && n.querySelector('[data-video-fit]'),
|
|
||||||
) ||
|
|
||||||
Array.from(m.removedNodes).some(
|
|
||||||
(n) => n instanceof Element && n.querySelector('[data-video-fit]'),
|
|
||||||
))),
|
|
||||||
);
|
|
||||||
if (relevant) syncState();
|
|
||||||
});
|
|
||||||
tileObserver.observe(doc.body, {
|
|
||||||
subtree: true,
|
|
||||||
childList: true,
|
|
||||||
attributes: true,
|
|
||||||
attributeFilter: ['class', 'style'],
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const syncState = (): void => {
|
const syncState = (): void => {
|
||||||
// [lotus #2] Prefer the fork's io.lotus.call_state events over scraping
|
// #32 — bail out of setState (and the re-render it causes) when the
|
||||||
// EC's rendered DOM. Falls back to the DOM path below when the fork hasn't
|
// derived set is unchanged from the previous one.
|
||||||
// sent yet (null) OR sent a spurious empty list (you're always present in
|
setSpeakers((prev) => nextSpeakerSet(prev, callEmbed.getLotusParticipants() ?? []));
|
||||||
// your own joined call, so [] means "no usable data", not "nobody").
|
|
||||||
const lotus = callEmbed.getLotusParticipants();
|
|
||||||
if (lotus !== null && lotus.length > 0) {
|
|
||||||
detachTileObserver();
|
|
||||||
// #32 — bail out of setState (and the re-render it causes) when the
|
|
||||||
// derived set is unchanged from the previous one.
|
|
||||||
setSpeakers((prev) => nextSpeakerSet(prev, lotus));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const doc = getDoc();
|
|
||||||
if (!doc) {
|
|
||||||
setSpeakers(new Set<string>());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Fork gave no usable data (older fork, or hasn't sent yet) — fall back
|
|
||||||
// to scraping the DOM, and keep watching it for changes.
|
|
||||||
attachTileObserver();
|
|
||||||
const s = new Set<string>();
|
|
||||||
// Re-scan every tile on each mutation and build the set from the full
|
|
||||||
// current DOM state, not just the tiles that mutated this batch.
|
|
||||||
const tiles = doc.querySelectorAll<HTMLElement>('[data-video-fit]');
|
|
||||||
tiles.forEach((el) => {
|
|
||||||
const style = callEmbed.iframe.contentWindow?.getComputedStyle(el, '::before');
|
|
||||||
if (!style) return;
|
|
||||||
const tileBackgroundImage = style.getPropertyValue('background-image');
|
|
||||||
const speaking = tileBackgroundImage !== 'none';
|
|
||||||
if (!speaking) return;
|
|
||||||
|
|
||||||
const speakerId = el.querySelector('[aria-label]')?.getAttribute('aria-label');
|
|
||||||
if (speakerId && isUserId(speakerId)) {
|
|
||||||
s.add(speakerId);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
setSpeakers(s);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
syncState();
|
syncState();
|
||||||
// [lotus #2] Re-derive whenever the fork pushes new call-state.
|
return callEmbed.onLotusCallState(syncState);
|
||||||
const unsubLotus = callEmbed.onLotusCallState(syncState);
|
|
||||||
|
|
||||||
// If iframe isn't ready yet, wait for body to be available.
|
|
||||||
let bodyWatcher: MutationObserver | undefined;
|
|
||||||
if (!getDoc()?.body) {
|
|
||||||
bodyWatcher = new MutationObserver(() => {
|
|
||||||
if (getDoc()?.body) {
|
|
||||||
bodyWatcher?.disconnect();
|
|
||||||
bodyWatcher = undefined;
|
|
||||||
syncState();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
const doc = getDoc();
|
|
||||||
if (doc) bodyWatcher.observe(doc, { childList: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
detachTileObserver();
|
|
||||||
bodyWatcher?.disconnect();
|
|
||||||
unsubLotus();
|
|
||||||
};
|
|
||||||
}, [callEmbed, hasCallMembers, joined]);
|
}, [callEmbed, hasCallMembers, joined]);
|
||||||
|
|
||||||
return speakers;
|
return speakers;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true when any REMOTE participant has their microphone muted in the
|
* Returns true when there is at least one REMOTE participant and every one of
|
||||||
* Element Call iframe.
|
* them has their microphone muted, from the fork's io.lotus.call_state reports.
|
||||||
*
|
|
||||||
* EC renders a mute-icon element per participant tile with a `data-muted`
|
|
||||||
* attribute ("true" = muted, "false" = unmuted) and an `aria-label` set to
|
|
||||||
* the participant's Matrix user ID. We watch for attribute changes on all
|
|
||||||
* `[data-muted]` elements, filter out the local user, and return true if any
|
|
||||||
* remaining participant is muted.
|
|
||||||
*/
|
*/
|
||||||
export const useRemoteAllMuted = (callEmbed: CallEmbed | undefined): boolean => {
|
export const useRemoteAllMuted = (callEmbed: CallEmbed | undefined): boolean => {
|
||||||
const [muted, setMuted] = useState(false);
|
const [muted, setMuted] = useState(false);
|
||||||
@@ -163,105 +52,17 @@ export const useRemoteAllMuted = (callEmbed: CallEmbed | undefined): boolean =>
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!callEmbed) return undefined;
|
if (!callEmbed) return undefined;
|
||||||
|
|
||||||
const getDoc = (): Document | undefined => getCallDocument(callEmbed.iframe);
|
|
||||||
|
|
||||||
const localUserId = callEmbed.room.client?.getUserId() ?? '';
|
const localUserId = callEmbed.room.client?.getUserId() ?? '';
|
||||||
|
|
||||||
let tileObserver: MutationObserver | undefined;
|
|
||||||
|
|
||||||
const detachTileObserver = (): void => {
|
|
||||||
tileObserver?.disconnect();
|
|
||||||
tileObserver = undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
// #32 — only attach the DOM fallback observer while the fork isn't
|
|
||||||
// supplying usable participant data; it stays disconnected for the rest
|
|
||||||
// of the call once io.lotus.call_state starts reporting participants.
|
|
||||||
const attachTileObserver = (): void => {
|
|
||||||
if (tileObserver) return;
|
|
||||||
const doc = getDoc();
|
|
||||||
if (!doc?.body) return;
|
|
||||||
// Watch the whole document for attribute changes on data-muted elements
|
|
||||||
// and for new tiles being added/removed.
|
|
||||||
tileObserver = new MutationObserver((mutations) => {
|
|
||||||
const relevant = mutations.some(
|
|
||||||
(m) =>
|
|
||||||
m.type === 'attributes' ||
|
|
||||||
(m.type === 'childList' &&
|
|
||||||
(Array.from(m.addedNodes).some(
|
|
||||||
(n) => n instanceof Element && n.querySelector('[data-muted]'),
|
|
||||||
) ||
|
|
||||||
Array.from(m.removedNodes).some(
|
|
||||||
(n) => n instanceof Element && n.querySelector('[data-muted]'),
|
|
||||||
))),
|
|
||||||
);
|
|
||||||
if (relevant) syncState();
|
|
||||||
});
|
|
||||||
tileObserver.observe(doc.body, {
|
|
||||||
subtree: true,
|
|
||||||
childList: true,
|
|
||||||
attributes: true,
|
|
||||||
attributeFilter: ['data-muted'],
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const syncState = (): void => {
|
const syncState = (): void => {
|
||||||
// [lotus #2] Prefer the fork's io.lotus.call_state over DOM scraping;
|
const remote = (callEmbed.getLotusParticipants() ?? []).filter(
|
||||||
// ignore a spurious empty list (fall back to DOM).
|
(p) => p.userId !== localUserId,
|
||||||
const lotus = callEmbed.getLotusParticipants();
|
);
|
||||||
if (lotus !== null && lotus.length > 0) {
|
setMuted(remote.length > 0 && remote.every((p) => !p.audioEnabled));
|
||||||
detachTileObserver();
|
|
||||||
const remote = lotus.filter((p) => p.userId !== localUserId);
|
|
||||||
setMuted(remote.length > 0 && remote.every((p) => !p.audioEnabled));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const doc = getDoc();
|
|
||||||
if (!doc) {
|
|
||||||
setMuted(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Fork gave no usable data (older fork, or hasn't sent yet) — fall back
|
|
||||||
// to scraping the DOM, and keep watching it for changes.
|
|
||||||
attachTileObserver();
|
|
||||||
// Each participant's mute icon has data-muted="true"|"false" and
|
|
||||||
// aria-label set to their Matrix user ID.
|
|
||||||
const muteIcons = doc.querySelectorAll<HTMLElement>('[data-muted]');
|
|
||||||
let remoteCount = 0;
|
|
||||||
let remoteMutedCount = 0;
|
|
||||||
muteIcons.forEach((el) => {
|
|
||||||
const userId = el.getAttribute('aria-label') ?? '';
|
|
||||||
if (userId === localUserId) return;
|
|
||||||
remoteCount += 1;
|
|
||||||
if (el.getAttribute('data-muted') === 'true') remoteMutedCount += 1;
|
|
||||||
});
|
|
||||||
// "All muted" badge: true only when there is at least one remote
|
|
||||||
// participant and every one of them is muted (not merely any single one).
|
|
||||||
setMuted(remoteCount > 0 && remoteMutedCount === remoteCount);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
syncState();
|
syncState();
|
||||||
// [lotus #2] Re-derive whenever the fork pushes new call-state.
|
return callEmbed.onLotusCallState(syncState);
|
||||||
const unsubLotus = callEmbed.onLotusCallState(syncState);
|
|
||||||
|
|
||||||
// If iframe isn't ready yet, wait for body to be available.
|
|
||||||
let bodyWatcher: MutationObserver | undefined;
|
|
||||||
if (!getDoc()?.body) {
|
|
||||||
bodyWatcher = new MutationObserver(() => {
|
|
||||||
if (getDoc()?.body) {
|
|
||||||
bodyWatcher?.disconnect();
|
|
||||||
bodyWatcher = undefined;
|
|
||||||
syncState();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
const doc = getDoc();
|
|
||||||
if (doc) bodyWatcher.observe(doc, { childList: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
detachTileObserver();
|
|
||||||
bodyWatcher?.disconnect();
|
|
||||||
unsubLotus();
|
|
||||||
};
|
|
||||||
}, [callEmbed]);
|
}, [callEmbed]);
|
||||||
|
|
||||||
return muted;
|
return muted;
|
||||||
|
|||||||
@@ -19,6 +19,34 @@ export type ClientConfig = {
|
|||||||
|
|
||||||
hashRouter?: HashRouterConfig;
|
hashRouter?: HashRouterConfig;
|
||||||
gifApiKey?: string;
|
gifApiKey?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #43] Absolute https URL of the Element Call page on its own origin.
|
||||||
|
* Unset: the bundled copy on this origin. Ignored in the desktop app.
|
||||||
|
*/
|
||||||
|
elementCallUrl?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #43] Desktop only: the loopback origin the desktop app's local
|
||||||
|
* server also answers on (e.g. "http://127.0.0.1:44548"), to load the
|
||||||
|
* bundled call page from a different origin than the app
|
||||||
|
* ("http://localhost:44548"). Set by cinny-desktop together with the server
|
||||||
|
* and CSP changes it needs; unset keeps the same-origin call page.
|
||||||
|
*/
|
||||||
|
desktopCallOrigin?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #124] Uptime Kuma status page per homeserver, for the status banner:
|
||||||
|
* { "<server name>": { url, slug, groups?: { homeserver, calls, login } } }.
|
||||||
|
* Homeservers not listed never contact Kuma.
|
||||||
|
*/
|
||||||
|
statusPages?: Record<string, unknown>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Absolute https URL of the public web app (e.g. https://chat.lotusguild.org).
|
||||||
|
* The desktop app sets it so it can hand calls it can't make to the browser.
|
||||||
|
*/
|
||||||
|
webAppUrl?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
const ClientConfigContext = createContext<ClientConfig | null>(null);
|
const ClientConfigContext = createContext<ClientConfig | null>(null);
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { lotusLinkBases, lotusShareBase } from './useLotusLinkBase';
|
||||||
|
|
||||||
|
const LOCAL = 'http://localhost:44548/#/';
|
||||||
|
const WEB = 'https://chat.lotusguild.org';
|
||||||
|
|
||||||
|
test('web: shared links use the page origin', () => {
|
||||||
|
assert.equal(lotusShareBase(WEB, false, WEB), WEB);
|
||||||
|
assert.deepEqual(lotusLinkBases(WEB, false, undefined), [WEB]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('desktop with webAppUrl: shared links use the public web app', () => {
|
||||||
|
assert.equal(lotusShareBase(LOCAL, true, `${WEB}/`), WEB);
|
||||||
|
assert.deepEqual(lotusLinkBases(LOCAL, true, WEB), [LOCAL, WEB]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('desktop without a valid webAppUrl falls back to the origin', () => {
|
||||||
|
[undefined, '', 'http://chat.lotusguild.org', 'nonsense'].forEach((v) => {
|
||||||
|
assert.equal(lotusShareBase(LOCAL, true, v), LOCAL, String(v));
|
||||||
|
assert.deepEqual(lotusLinkBases(LOCAL, true, v), [LOCAL]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { useMemo } from 'react';
|
||||||
|
import { useClientConfig } from './useClientConfig';
|
||||||
|
import { isTauri } from './useTauri';
|
||||||
|
import { getOriginBaseUrl } from '../pages/pathUtils';
|
||||||
|
import { resolveWebAppUrl } from '../utils/callInBrowser';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #248] Base URL for Lotus links meant for other people.
|
||||||
|
*
|
||||||
|
* On the web that's this page's origin. In the desktop app the page is served
|
||||||
|
* from a local address (and hash-routed), which nobody else can open, so use
|
||||||
|
* the public web app from config `webAppUrl` (web path routing) instead.
|
||||||
|
* Without a valid `webAppUrl` it falls back to the origin, as before.
|
||||||
|
*/
|
||||||
|
export const lotusShareBase = (originBase: string, desktop: boolean, webAppUrl: unknown): string =>
|
||||||
|
(desktop && resolveWebAppUrl(webAppUrl)) || originBase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every base a Lotus link to this deployment may start with: the origin, plus
|
||||||
|
* the public web app in the desktop app, so a shared https link opens in-app.
|
||||||
|
*/
|
||||||
|
export const lotusLinkBases = (
|
||||||
|
originBase: string,
|
||||||
|
desktop: boolean,
|
||||||
|
webAppUrl: unknown,
|
||||||
|
): string[] => {
|
||||||
|
const shared = lotusShareBase(originBase, desktop, webAppUrl);
|
||||||
|
return shared === originBase ? [originBase] : [originBase, shared];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useLotusShareBase = (): string => {
|
||||||
|
const { hashRouter, webAppUrl } = useClientConfig();
|
||||||
|
return useMemo(
|
||||||
|
() => lotusShareBase(getOriginBaseUrl(hashRouter), isTauri(), webAppUrl),
|
||||||
|
[hashRouter, webAppUrl],
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
Room,
|
Room,
|
||||||
RoomEvent,
|
RoomEvent,
|
||||||
RoomEventHandlerMap,
|
RoomEventHandlerMap,
|
||||||
|
ThreadEvent,
|
||||||
} from 'matrix-js-sdk';
|
} from 'matrix-js-sdk';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -34,7 +35,7 @@ export const isMediaMessage = (event: MatrixEvent): boolean =>
|
|||||||
const PAGE_SIZE = 100;
|
const PAGE_SIZE = 100;
|
||||||
|
|
||||||
export type RoomMediaTimeline = {
|
export type RoomMediaTimeline = {
|
||||||
/** Every loaded media message in the room, newest first. */
|
/** Every loaded media message in the room and its threads, newest first. */
|
||||||
events: MatrixEvent[];
|
events: MatrixEvent[];
|
||||||
loadMore: () => Promise<void>;
|
loadMore: () => Promise<void>;
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
@@ -57,11 +58,23 @@ export const useRoomMediaTimeline = (mx: MatrixClient, room: Room): RoomMediaTim
|
|||||||
[mx, room],
|
[mx, room],
|
||||||
);
|
);
|
||||||
|
|
||||||
const readEvents = useCallback(
|
// [Gitea #165] The SDK routes thread replies out of every room timeline set
|
||||||
(): MatrixEvent[] =>
|
// (ours included) into the room's Thread objects, so media posted in a
|
||||||
collectTimelineEvents(detached.set.getLiveTimeline()).filter(isMediaMessage).reverse(),
|
// thread only shows up if we read the loaded threads too.
|
||||||
[detached],
|
const readEvents = useCallback((): MatrixEvent[] => {
|
||||||
);
|
const seen = new Set<string>();
|
||||||
|
return [
|
||||||
|
...collectTimelineEvents(detached.set.getLiveTimeline()),
|
||||||
|
...room.getThreads().flatMap((thread) => thread.timeline),
|
||||||
|
]
|
||||||
|
.filter((event) => {
|
||||||
|
const id = event.getId();
|
||||||
|
if (!id || seen.has(id) || !isMediaMessage(event)) return false;
|
||||||
|
seen.add(id);
|
||||||
|
return true;
|
||||||
|
})
|
||||||
|
.sort((a, b) => b.getTs() - a.getTs());
|
||||||
|
}, [detached, room]);
|
||||||
|
|
||||||
const [events, setEvents] = useState<MatrixEvent[]>(readEvents);
|
const [events, setEvents] = useState<MatrixEvent[]>(readEvents);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
@@ -119,11 +132,23 @@ export const useRoomMediaTimeline = (mx: MatrixClient, room: Room): RoomMediaTim
|
|||||||
refresh();
|
refresh();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onThreadReply = (_thread: unknown, event: MatrixEvent) => {
|
||||||
|
if (event.isBeingDecrypted() || event.shouldAttemptDecryption()) {
|
||||||
|
event.once(MatrixEventEvent.Decrypted, () => {
|
||||||
|
if (isMediaMessage(event)) refresh();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (isMediaMessage(event)) refresh();
|
||||||
|
};
|
||||||
|
|
||||||
room.on(RoomEvent.Timeline, onTimeline);
|
room.on(RoomEvent.Timeline, onTimeline);
|
||||||
room.on(RoomEvent.Redaction, onRedaction);
|
room.on(RoomEvent.Redaction, onRedaction);
|
||||||
|
room.on(ThreadEvent.NewReply, onThreadReply);
|
||||||
return () => {
|
return () => {
|
||||||
room.removeListener(RoomEvent.Timeline, onTimeline);
|
room.removeListener(RoomEvent.Timeline, onTimeline);
|
||||||
room.removeListener(RoomEvent.Redaction, onRedaction);
|
room.removeListener(RoomEvent.Redaction, onRedaction);
|
||||||
|
room.removeListener(ThreadEvent.NewReply, onThreadReply);
|
||||||
};
|
};
|
||||||
}, [detached, room, readEvents]);
|
}, [detached, room, readEvents]);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { kumaUrls, parseKumaStatus, ServerStatus, StatusPageConfig } from '../utils/kumaStatus';
|
||||||
|
|
||||||
|
/** Normal poll, and while a problem is showing (so recovery clears quickly). */
|
||||||
|
export const STATUS_POLL_MS = 5 * 60 * 1000;
|
||||||
|
export const STATUS_POLL_PROBLEM_MS = 60 * 1000;
|
||||||
|
const STATUS_FETCH_TIMEOUT_MS = 10 * 1000;
|
||||||
|
const STATUS_BACKOFF_MAX_MS = 15 * 60 * 1000;
|
||||||
|
|
||||||
|
const fetchJson = async (url: string, signal: AbortSignal): Promise<unknown> => {
|
||||||
|
const res = await fetch(url, { cache: 'no-store', credentials: 'omit', signal });
|
||||||
|
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||||
|
return res.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
export const hasProblem = (s: ServerStatus | null): boolean =>
|
||||||
|
!!s &&
|
||||||
|
(s.homeserver === 'down' || s.calls === 'down' || s.login === 'down' || s.maintenance.length > 0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #124] Poll the homeserver's Kuma status page (none configured → no
|
||||||
|
* requests, null). Only while the page is visible; every 5 min, every 60 s
|
||||||
|
* while something is wrong, and at once when `urgent` turns true (this
|
||||||
|
* client's connection dropped). Any failure → null ("no banner"), with
|
||||||
|
* backoff: Kuma being unreachable must never look like Matrix being down.
|
||||||
|
*/
|
||||||
|
export const useServerStatus = (
|
||||||
|
page: StatusPageConfig | undefined,
|
||||||
|
urgent = false,
|
||||||
|
): ServerStatus | null => {
|
||||||
|
const [status, setStatus] = useState<ServerStatus | null>(null);
|
||||||
|
const pageKey = page ? `${page.url}/${page.slug}` : '';
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!page) {
|
||||||
|
setStatus(null);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const urls = kumaUrls(page);
|
||||||
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
||||||
|
let controller: AbortController | undefined;
|
||||||
|
let failures = 0;
|
||||||
|
let stopped = false;
|
||||||
|
let last: ServerStatus | null = null;
|
||||||
|
|
||||||
|
const schedule = (ms: number) => {
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
timer = setTimeout(poll, ms);
|
||||||
|
};
|
||||||
|
|
||||||
|
async function poll() {
|
||||||
|
if (stopped) return;
|
||||||
|
if (typeof document !== 'undefined' && document.visibilityState === 'hidden') return;
|
||||||
|
controller?.abort();
|
||||||
|
controller = new AbortController();
|
||||||
|
const abort = controller;
|
||||||
|
const timeout = setTimeout(() => abort.abort(), STATUS_FETCH_TIMEOUT_MS);
|
||||||
|
try {
|
||||||
|
const [pageJson, heartbeatJson] = await Promise.all([
|
||||||
|
fetchJson(urls.page, abort.signal),
|
||||||
|
fetchJson(urls.heartbeat, abort.signal),
|
||||||
|
]);
|
||||||
|
if (stopped) return;
|
||||||
|
failures = 0;
|
||||||
|
last = parseKumaStatus(pageJson, heartbeatJson, page!.groups);
|
||||||
|
setStatus(last);
|
||||||
|
// While this client's connection is lost, keep asking every minute: that
|
||||||
|
// is how it learns Kuma has checked the server since the drop.
|
||||||
|
schedule(hasProblem(last) || urgent ? STATUS_POLL_PROBLEM_MS : STATUS_POLL_MS);
|
||||||
|
} catch {
|
||||||
|
if (stopped) return;
|
||||||
|
failures += 1;
|
||||||
|
last = null;
|
||||||
|
setStatus(null);
|
||||||
|
schedule(Math.min(STATUS_POLL_PROBLEM_MS * 2 ** failures, STATUS_BACKOFF_MAX_MS));
|
||||||
|
} finally {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const onVisible = () => {
|
||||||
|
if (document.visibilityState === 'visible') poll();
|
||||||
|
};
|
||||||
|
document.addEventListener('visibilitychange', onVisible);
|
||||||
|
poll();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
stopped = true;
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
controller?.abort();
|
||||||
|
document.removeEventListener('visibilitychange', onVisible);
|
||||||
|
};
|
||||||
|
// pageKey identifies the page; the object itself is rebuilt from config.
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [pageKey, urgent]);
|
||||||
|
|
||||||
|
return status;
|
||||||
|
};
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useCallback } from 'react';
|
import { useCallback, useEffect } from 'react';
|
||||||
import { atom, useAtom, useSetAtom } from 'jotai';
|
import { atom, useAtom, useSetAtom } from 'jotai';
|
||||||
import { useTauriEvent } from './useTauri';
|
import { useTauriEvent } from './useTauri';
|
||||||
import { UpdatePhase, parseUpdateError } from '../utils/updateErrors';
|
import { InstallKind, UpdatePhase, parseUpdateError, toInstallKind } from '../utils/updateErrors';
|
||||||
|
|
||||||
type TauriInternals = { invoke: (cmd: string, args?: Record<string, unknown>) => Promise<unknown> };
|
type TauriInternals = { invoke: (cmd: string, args?: Record<string, unknown>) => Promise<unknown> };
|
||||||
const tauriInvoke = (): TauriInternals['invoke'] | undefined =>
|
const tauriInvoke = (): TauriInternals['invoke'] | undefined =>
|
||||||
@@ -36,6 +36,11 @@ export type UpdateFailure = { phase: UpdatePhase; message: string };
|
|||||||
// mid-request by the resolve/reject below, so nothing gets stuck.
|
// mid-request by the resolve/reject below, so nothing gets stuck.
|
||||||
const updateStatusAtom = atom<UpdateStatus>({ state: 'idle' });
|
const updateStatusAtom = atom<UpdateStatus>({ state: 'idle' });
|
||||||
|
|
||||||
|
// How this install gets updated; asked once. A desktop build without the
|
||||||
|
// command (older than it) rejects the call: keep the old in-app behaviour.
|
||||||
|
const installKindAtom = atom<InstallKind | undefined>(undefined);
|
||||||
|
let installKindRequested = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mirror native download progress into the status. Mounted once (in
|
* Mirror native download progress into the status. Mounted once (in
|
||||||
* TauriUpdateFeature) so the listener isn't duplicated per consumer.
|
* TauriUpdateFeature) so the listener isn't duplicated per consumer.
|
||||||
@@ -50,6 +55,16 @@ export function useTauriUpdateProgress(): void {
|
|||||||
export function useTauriUpdater() {
|
export function useTauriUpdater() {
|
||||||
const isTauri = !!tauriInvoke();
|
const isTauri = !!tauriInvoke();
|
||||||
const [status, setStatus] = useAtom(updateStatusAtom);
|
const [status, setStatus] = useAtom(updateStatusAtom);
|
||||||
|
const [installKind, setInstallKind] = useAtom(installKindAtom);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const invoke = tauriInvoke();
|
||||||
|
if (!invoke || installKindRequested) return;
|
||||||
|
installKindRequested = true;
|
||||||
|
invoke('update_install_kind')
|
||||||
|
.then((kind) => setInstallKind(toInstallKind(kind)))
|
||||||
|
.catch(() => setInstallKind('in-app'));
|
||||||
|
}, [setInstallKind]);
|
||||||
|
|
||||||
const check = useCallback(async () => {
|
const check = useCallback(async () => {
|
||||||
const invoke = tauriInvoke();
|
const invoke = tauriInvoke();
|
||||||
@@ -89,5 +104,5 @@ export function useTauriUpdater() {
|
|||||||
}
|
}
|
||||||
}, [setStatus]);
|
}, [setStatus]);
|
||||||
|
|
||||||
return { isTauri, status, check, install };
|
return { isTauri, status, check, install, installKind: installKind ?? 'in-app' };
|
||||||
}
|
}
|
||||||
|
|||||||
+34
-17
@@ -36,6 +36,11 @@ import { applyCustomAccent, removeCustomAccent } from '../utils/accentColor';
|
|||||||
import { zIndices } from '../styles/zIndex';
|
import { zIndices } from '../styles/zIndex';
|
||||||
import { OIDC_CALLBACK_PATH } from './paths';
|
import { OIDC_CALLBACK_PATH } from './paths';
|
||||||
import { OidcCallback } from './auth/oidc/OidcCallback';
|
import { OidcCallback } from './auth/oidc/OidcCallback';
|
||||||
|
import {
|
||||||
|
resolveCallPageUrl,
|
||||||
|
resolveDesktopCallPageUrl,
|
||||||
|
setCallPageUrl,
|
||||||
|
} from '../plugins/call/callPageUrl';
|
||||||
|
|
||||||
// The emoji families (Twemoji when "Twitter emoji" is on, Twemoji flags on
|
// The emoji families (Twemoji when "Twitter emoji" is on, Twemoji flags on
|
||||||
// Windows — see SystemEmojiFeature) must sit before the generic family, or the
|
// Windows — see SystemEmojiFeature) must sit before the generic family, or the
|
||||||
@@ -220,23 +225,35 @@ function App() {
|
|||||||
<ConfigConfigError error={err} retry={retry} ignore={ignore} />
|
<ConfigConfigError error={err} retry={retry} ignore={ignore} />
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{(clientConfig) => (
|
{(clientConfig) => {
|
||||||
<ClientConfigProvider value={clientConfig}>
|
// [Gitea #43] Idempotent: where the call page is loaded from.
|
||||||
<QueryClientProvider client={queryClient}>
|
setCallPageUrl(
|
||||||
<JotaiProvider>
|
isTauri()
|
||||||
<AppearanceEffects />
|
? resolveDesktopCallPageUrl(
|
||||||
<TauriEffects />
|
clientConfig.desktopCallOrigin,
|
||||||
<DesktopChrome>
|
window.location.origin,
|
||||||
<RouterProvider router={createRouter(clientConfig, screenSize)} />
|
import.meta.env.BASE_URL,
|
||||||
</DesktopChrome>
|
)
|
||||||
<SeasonalEffect />
|
: resolveCallPageUrl(clientConfig.elementCallUrl, false),
|
||||||
<NightLightOverlay />
|
);
|
||||||
<LotusToastContainer />
|
return (
|
||||||
</JotaiProvider>
|
<ClientConfigProvider value={clientConfig}>
|
||||||
<ReactQueryDevtools initialIsOpen={false} />
|
<QueryClientProvider client={queryClient}>
|
||||||
</QueryClientProvider>
|
<JotaiProvider>
|
||||||
</ClientConfigProvider>
|
<AppearanceEffects />
|
||||||
)}
|
<TauriEffects />
|
||||||
|
<DesktopChrome>
|
||||||
|
<RouterProvider router={createRouter(clientConfig, screenSize)} />
|
||||||
|
</DesktopChrome>
|
||||||
|
<SeasonalEffect />
|
||||||
|
<NightLightOverlay />
|
||||||
|
<LotusToastContainer />
|
||||||
|
</JotaiProvider>
|
||||||
|
<ReactQueryDevtools initialIsOpen={false} />
|
||||||
|
</QueryClientProvider>
|
||||||
|
</ClientConfigProvider>
|
||||||
|
);
|
||||||
|
}}
|
||||||
</ClientConfigLoader>
|
</ClientConfigLoader>
|
||||||
</FeatureCheck>
|
</FeatureCheck>
|
||||||
</ScreenSizeProvider>
|
</ScreenSizeProvider>
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import { AuthFlowsLoader } from '../../components/AuthFlowsLoader';
|
|||||||
import { AuthFlowsProvider } from '../../hooks/useAuthFlows';
|
import { AuthFlowsProvider } from '../../hooks/useAuthFlows';
|
||||||
import { AuthServerProvider } from '../../hooks/useAuthServer';
|
import { AuthServerProvider } from '../../hooks/useAuthServer';
|
||||||
import { tryDecodeURIComponent } from '../../utils/dom';
|
import { tryDecodeURIComponent } from '../../utils/dom';
|
||||||
|
import { LoginStatusBanner } from '../../features/server-status/ServerStatusBanner';
|
||||||
|
|
||||||
const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus-logo.png');
|
const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus-logo.png');
|
||||||
|
|
||||||
@@ -125,89 +126,92 @@ export function AuthLayout() {
|
|||||||
discoveryState.status === AsyncStatus.Success ? discoveryState.data.response : [];
|
discoveryState.status === AsyncStatus.Success ? discoveryState.data.response : [];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Scroll variant="Background" visibility="Hover" size="300" hideTrack>
|
<Box direction="Column" style={{ height: '100%' }}>
|
||||||
<Box
|
<LoginStatusBanner serverName={server} />
|
||||||
className={classNames(css.AuthLayout, PatternsCss.BackgroundDotPattern)}
|
<Scroll variant="Background" visibility="Hover" size="300" hideTrack>
|
||||||
direction="Column"
|
<Box
|
||||||
alignItems="Center"
|
className={classNames(css.AuthLayout, PatternsCss.BackgroundDotPattern)}
|
||||||
justifyContent="SpaceBetween"
|
direction="Column"
|
||||||
gap="400"
|
alignItems="Center"
|
||||||
>
|
justifyContent="SpaceBetween"
|
||||||
<Box direction="Column" className={css.AuthCard}>
|
gap="400"
|
||||||
<Header className={css.AuthHeader} size="600" variant="Surface">
|
>
|
||||||
<Box grow="Yes" direction="Row" gap="300" alignItems="Center">
|
<Box direction="Column" className={css.AuthCard}>
|
||||||
<img className={css.AuthLogo} src={LotusLogo} alt="Lotus Chat Logo" />
|
<Header className={css.AuthHeader} size="600" variant="Surface">
|
||||||
<Text as="h1" size="H3">
|
<Box grow="Yes" direction="Row" gap="300" alignItems="Center">
|
||||||
Lotus Chat
|
<img className={css.AuthLogo} src={LotusLogo} alt="Lotus Chat Logo" />
|
||||||
</Text>
|
<Text as="h1" size="H3">
|
||||||
|
Lotus Chat
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
</Header>
|
||||||
|
<Box className={css.AuthCardContent} direction="Column">
|
||||||
|
<Box direction="Column" gap="100">
|
||||||
|
<Text as="label" size="L400" priority="300">
|
||||||
|
Homeserver
|
||||||
|
</Text>
|
||||||
|
<ServerPicker
|
||||||
|
server={server}
|
||||||
|
serverList={clientConfig.homeserverList ?? []}
|
||||||
|
allowCustomServer={clientConfig.allowCustomHomeservers}
|
||||||
|
onServerChange={selectServer}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
{discoveryState.status === AsyncStatus.Loading && (
|
||||||
|
<AuthLayoutLoading message="Looking for homeserver..." />
|
||||||
|
)}
|
||||||
|
{discoveryState.status === AsyncStatus.Error && (
|
||||||
|
<AuthLayoutError message="Failed to find homeserver." />
|
||||||
|
)}
|
||||||
|
{autoDiscoveryError?.action === AutoDiscoveryAction.FAIL_PROMPT && (
|
||||||
|
<AuthLayoutError
|
||||||
|
message={`Failed to connect. Homeserver configuration found with ${autoDiscoveryError.host} appears unusable.`}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{autoDiscoveryError?.action === AutoDiscoveryAction.FAIL_ERROR && (
|
||||||
|
<AuthLayoutError message="Failed to connect. Homeserver configuration base_url appears invalid." />
|
||||||
|
)}
|
||||||
|
{discoveryState.status === AsyncStatus.Success && autoDiscoveryInfo && (
|
||||||
|
<AuthServerProvider value={discoveryState.data.serverName}>
|
||||||
|
<AutoDiscoveryInfoProvider value={autoDiscoveryInfo}>
|
||||||
|
<SpecVersionsLoader
|
||||||
|
baseUrl={autoDiscoveryInfo['m.homeserver'].base_url}
|
||||||
|
fallback={() => (
|
||||||
|
<AuthLayoutLoading
|
||||||
|
message={`Connecting to ${autoDiscoveryInfo['m.homeserver'].base_url}`}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
error={() => (
|
||||||
|
<AuthLayoutError message="Failed to connect. Either homeserver is unavailable at this moment or does not exist." />
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{(specVersions) => (
|
||||||
|
<SpecVersionsProvider value={specVersions}>
|
||||||
|
<AuthFlowsLoader
|
||||||
|
fallback={() => (
|
||||||
|
<AuthLayoutLoading message="Loading authentication flow..." />
|
||||||
|
)}
|
||||||
|
error={() => (
|
||||||
|
<AuthLayoutError message="Failed to get authentication flow information." />
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{(authFlows) => (
|
||||||
|
<AuthFlowsProvider value={authFlows}>
|
||||||
|
<Outlet />
|
||||||
|
</AuthFlowsProvider>
|
||||||
|
)}
|
||||||
|
</AuthFlowsLoader>
|
||||||
|
</SpecVersionsProvider>
|
||||||
|
)}
|
||||||
|
</SpecVersionsLoader>
|
||||||
|
</AutoDiscoveryInfoProvider>
|
||||||
|
</AuthServerProvider>
|
||||||
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
</Header>
|
|
||||||
<Box className={css.AuthCardContent} direction="Column">
|
|
||||||
<Box direction="Column" gap="100">
|
|
||||||
<Text as="label" size="L400" priority="300">
|
|
||||||
Homeserver
|
|
||||||
</Text>
|
|
||||||
<ServerPicker
|
|
||||||
server={server}
|
|
||||||
serverList={clientConfig.homeserverList ?? []}
|
|
||||||
allowCustomServer={clientConfig.allowCustomHomeservers}
|
|
||||||
onServerChange={selectServer}
|
|
||||||
/>
|
|
||||||
</Box>
|
|
||||||
{discoveryState.status === AsyncStatus.Loading && (
|
|
||||||
<AuthLayoutLoading message="Looking for homeserver..." />
|
|
||||||
)}
|
|
||||||
{discoveryState.status === AsyncStatus.Error && (
|
|
||||||
<AuthLayoutError message="Failed to find homeserver." />
|
|
||||||
)}
|
|
||||||
{autoDiscoveryError?.action === AutoDiscoveryAction.FAIL_PROMPT && (
|
|
||||||
<AuthLayoutError
|
|
||||||
message={`Failed to connect. Homeserver configuration found with ${autoDiscoveryError.host} appears unusable.`}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{autoDiscoveryError?.action === AutoDiscoveryAction.FAIL_ERROR && (
|
|
||||||
<AuthLayoutError message="Failed to connect. Homeserver configuration base_url appears invalid." />
|
|
||||||
)}
|
|
||||||
{discoveryState.status === AsyncStatus.Success && autoDiscoveryInfo && (
|
|
||||||
<AuthServerProvider value={discoveryState.data.serverName}>
|
|
||||||
<AutoDiscoveryInfoProvider value={autoDiscoveryInfo}>
|
|
||||||
<SpecVersionsLoader
|
|
||||||
baseUrl={autoDiscoveryInfo['m.homeserver'].base_url}
|
|
||||||
fallback={() => (
|
|
||||||
<AuthLayoutLoading
|
|
||||||
message={`Connecting to ${autoDiscoveryInfo['m.homeserver'].base_url}`}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
error={() => (
|
|
||||||
<AuthLayoutError message="Failed to connect. Either homeserver is unavailable at this moment or does not exist." />
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{(specVersions) => (
|
|
||||||
<SpecVersionsProvider value={specVersions}>
|
|
||||||
<AuthFlowsLoader
|
|
||||||
fallback={() => (
|
|
||||||
<AuthLayoutLoading message="Loading authentication flow..." />
|
|
||||||
)}
|
|
||||||
error={() => (
|
|
||||||
<AuthLayoutError message="Failed to get authentication flow information." />
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{(authFlows) => (
|
|
||||||
<AuthFlowsProvider value={authFlows}>
|
|
||||||
<Outlet />
|
|
||||||
</AuthFlowsProvider>
|
|
||||||
)}
|
|
||||||
</AuthFlowsLoader>
|
|
||||||
</SpecVersionsProvider>
|
|
||||||
)}
|
|
||||||
</SpecVersionsLoader>
|
|
||||||
</AutoDiscoveryInfoProvider>
|
|
||||||
</AuthServerProvider>
|
|
||||||
)}
|
|
||||||
</Box>
|
</Box>
|
||||||
|
<AuthFooter />
|
||||||
</Box>
|
</Box>
|
||||||
<AuthFooter />
|
</Scroll>
|
||||||
</Box>
|
</Box>
|
||||||
</Scroll>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import { allInvitesAtom } from '../../state/room-list/inviteList';
|
|||||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||||
import { useClientConfig } from '../../hooks/useClientConfig';
|
import { useClientConfig } from '../../hooks/useClientConfig';
|
||||||
import { useHydrateMsgDrafts } from '../../hooks/useHydrateMsgDrafts';
|
import { useHydrateMsgDrafts } from '../../hooks/useHydrateMsgDrafts';
|
||||||
|
import { OutboxFeature } from '../../features/outbox/OutboxFeature';
|
||||||
import { useSearchCacheInvalidation } from '../../utils/searchCacheInvalidation';
|
import { useSearchCacheInvalidation } from '../../utils/searchCacheInvalidation';
|
||||||
import { ClockSkewMonitor } from '../../utils/clockSkew';
|
import { ClockSkewMonitor } from '../../utils/clockSkew';
|
||||||
import { clockSkewAtom } from '../../state/clockSkew';
|
import { clockSkewAtom } from '../../state/clockSkew';
|
||||||
@@ -68,6 +69,7 @@ import { dismissToastAtom, toastQueueAtom } from '../../state/toast';
|
|||||||
import { useReminders } from '../../hooks/useReminders';
|
import { useReminders } from '../../hooks/useReminders';
|
||||||
import { getRoomRetentionMs, isExpired } from '../../utils/retention';
|
import { getRoomRetentionMs, isExpired } from '../../utils/retention';
|
||||||
import { useTauriUpdateProgress, useTauriUpdater } from '../../hooks/useTauriUpdater';
|
import { useTauriUpdateProgress, useTauriUpdater } from '../../hooks/useTauriUpdater';
|
||||||
|
import { settingsRequestAtom } from '../../state/settingsRequest';
|
||||||
import { isNetworkUpdateError } from '../../utils/updateErrors';
|
import { isNetworkUpdateError } from '../../utils/updateErrors';
|
||||||
import { invokeTauri, isTauri as isTauriApp, useTauriEvent } from '../../hooks/useTauri';
|
import { invokeTauri, isTauri as isTauriApp, useTauriEvent } from '../../hooks/useTauri';
|
||||||
import { CloseBehaviorPrompt } from '../../components/CloseBehaviorPrompt';
|
import { CloseBehaviorPrompt } from '../../components/CloseBehaviorPrompt';
|
||||||
@@ -77,6 +79,7 @@ import { KeyboardShortcutsDialog, useKeyboardShortcutsTrigger } from '../../feat
|
|||||||
import { useRoomsListener } from '../../hooks/useRoomsListener';
|
import { useRoomsListener } from '../../hooks/useRoomsListener';
|
||||||
import { threadNotificationsAtom } from '../../state/threadNotifications';
|
import { threadNotificationsAtom } from '../../state/threadNotifications';
|
||||||
import { roomIdToActiveThreadIdAtomFamily } from '../../state/room/thread';
|
import { roomIdToActiveThreadIdAtomFamily } from '../../state/room/thread';
|
||||||
|
import { lotusLinkBases } from '../../hooks/useLotusLinkBase';
|
||||||
import {
|
import {
|
||||||
getThreadNotificationMode,
|
getThreadNotificationMode,
|
||||||
shouldNotifyThreadReply,
|
shouldNotifyThreadReply,
|
||||||
@@ -118,11 +121,12 @@ function SystemEmojiFeature() {
|
|||||||
|
|
||||||
// [Gitea #103] Mirror the privacy toggle into the html parser's module flag.
|
// [Gitea #103] Mirror the privacy toggle into the html parser's module flag.
|
||||||
function LotusPermalinkFeature() {
|
function LotusPermalinkFeature() {
|
||||||
const { hashRouter } = useClientConfig();
|
const { hashRouter, webAppUrl } = useClientConfig();
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setLotusPermalinkBase(getOriginBaseUrl(hashRouter));
|
// [Gitea #248] In the desktop app, links to the public web app count too.
|
||||||
|
setLotusPermalinkBase(lotusLinkBases(getOriginBaseUrl(hashRouter), isTauriApp(), webAppUrl));
|
||||||
return () => setLotusPermalinkBase(undefined);
|
return () => setLotusPermalinkBase(undefined);
|
||||||
}, [hashRouter]);
|
}, [hashRouter, webAppUrl]);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -910,7 +914,8 @@ const UPDATE_PROGRESS_TOAST = 'tauri-update-progress';
|
|||||||
const UPDATE_FAILED_TOAST = 'tauri-update-failed';
|
const UPDATE_FAILED_TOAST = 'tauri-update-failed';
|
||||||
|
|
||||||
function TauriUpdateFeature() {
|
function TauriUpdateFeature() {
|
||||||
const { isTauri, status, check, install } = useTauriUpdater();
|
const { isTauri, status, check, install, installKind } = useTauriUpdater();
|
||||||
|
const requestSettings = useSetAtom(settingsRequestAtom);
|
||||||
useTauriUpdateProgress();
|
useTauriUpdateProgress();
|
||||||
const setToast = useSetAtom(toastQueueAtom);
|
const setToast = useSetAtom(toastQueueAtom);
|
||||||
const dismissToast = useSetAtom(dismissToastAtom);
|
const dismissToast = useSetAtom(dismissToastAtom);
|
||||||
@@ -969,18 +974,24 @@ function TauriUpdateFeature() {
|
|||||||
if (status.state !== 'available') return;
|
if (status.state !== 'available') return;
|
||||||
if (firedRef.current === status.version) return;
|
if (firedRef.current === status.version) return;
|
||||||
firedRef.current = status.version;
|
firedRef.current = status.version;
|
||||||
|
// A Linux package install can't be updated in place: point at the
|
||||||
|
// package-manager command in Settings instead of an install that fails.
|
||||||
|
const viaPackage = installKind !== 'in-app';
|
||||||
setToast({
|
setToast({
|
||||||
id: `tauri-update-${status.version}`,
|
id: `tauri-update-${status.version}`,
|
||||||
displayName: '⬆ Update Available',
|
displayName: '⬆ Update Available',
|
||||||
body: `Lotus Chat ${status.version} is ready. Click to install and restart.`,
|
body: viaPackage
|
||||||
|
? `Lotus Chat ${status.version} is available. Click for the command to update it with your package manager.`
|
||||||
|
: `Lotus Chat ${status.version} is ready. Click to install and restart.`,
|
||||||
roomName: 'System',
|
roomName: 'System',
|
||||||
roomId: '',
|
roomId: '',
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
installFromToast();
|
if (viaPackage) requestSettings('general');
|
||||||
|
else installFromToast();
|
||||||
},
|
},
|
||||||
sticky: true,
|
sticky: true,
|
||||||
});
|
});
|
||||||
}, [status, setToast, installFromToast]);
|
}, [status, setToast, installFromToast, installKind, requestSettings]);
|
||||||
|
|
||||||
// [cinny-desktop #6] Mirror a pending update into the tray ("Restart to
|
// [cinny-desktop #6] Mirror a pending update into the tray ("Restart to
|
||||||
// update" + tooltip) so a dismissed toast isn't the only reminder. Kept while
|
// update" + tooltip) so a dismissed toast isn't the only reminder. Kept while
|
||||||
@@ -1069,6 +1080,10 @@ function ClockSkewFeature() {
|
|||||||
data,
|
data,
|
||||||
) => {
|
) => {
|
||||||
if (!data.liveEvent) return;
|
if (!data.liveEvent) return;
|
||||||
|
// Only events our homeserver stamped: a federated event's
|
||||||
|
// origin_server_ts is the other server's clock.
|
||||||
|
const senderServer = mEvent.getSender()?.split(':').slice(1).join(':');
|
||||||
|
if (senderServer !== mx.getDomain()) return;
|
||||||
monitor.sample(mEvent.getTs(), mEvent.getAge(), mEvent.localTimestamp);
|
monitor.sample(mEvent.getTs(), mEvent.getAge(), mEvent.localTimestamp);
|
||||||
};
|
};
|
||||||
mx.on(RoomEvent.Timeline, onTimeline);
|
mx.on(RoomEvent.Timeline, onTimeline);
|
||||||
@@ -1105,6 +1120,7 @@ export function ClientNonUIFeatures({ children }: ClientNonUIFeaturesProps) {
|
|||||||
<TauriDesktopFeatures />
|
<TauriDesktopFeatures />
|
||||||
<CloseBehaviorPrompt />
|
<CloseBehaviorPrompt />
|
||||||
<ConsentRequiredPrompt />
|
<ConsentRequiredPrompt />
|
||||||
|
<OutboxFeature />
|
||||||
<LotusDenoiseFeature />
|
<LotusDenoiseFeature />
|
||||||
<DeepLinkNavigator />
|
<DeepLinkNavigator />
|
||||||
<KeyboardShortcutsFeature />
|
<KeyboardShortcutsFeature />
|
||||||
|
|||||||
@@ -44,6 +44,10 @@ import { useSyncState } from '../../hooks/useSyncState';
|
|||||||
import { stopPropagation } from '../../utils/keyboard';
|
import { stopPropagation } from '../../utils/keyboard';
|
||||||
import { SyncStatus } from './SyncStatus';
|
import { SyncStatus } from './SyncStatus';
|
||||||
import { ClockSkewBanner } from './ClockSkewBanner';
|
import { ClockSkewBanner } from './ClockSkewBanner';
|
||||||
|
import {
|
||||||
|
ServerStatusBanner,
|
||||||
|
ServerStatusFeature,
|
||||||
|
} from '../../features/server-status/ServerStatusBanner';
|
||||||
import { AuthMetadataProvider } from '../../hooks/useAuthMetadata';
|
import { AuthMetadataProvider } from '../../hooks/useAuthMetadata';
|
||||||
import { getFallbackSession, removeFallbackSession } from '../../state/sessions';
|
import { getFallbackSession, removeFallbackSession } from '../../state/sessions';
|
||||||
import { pushSessionToSW } from '../../../sw-session';
|
import { pushSessionToSW } from '../../../sw-session';
|
||||||
@@ -245,6 +249,8 @@ export function ClientRoot({ children }: ClientRootProps) {
|
|||||||
return (
|
return (
|
||||||
<AutoDiscovery userId={userId!} baseUrl={baseUrl!}>
|
<AutoDiscovery userId={userId!} baseUrl={baseUrl!}>
|
||||||
<SpecVersions baseUrl={baseUrl!}>
|
<SpecVersions baseUrl={baseUrl!}>
|
||||||
|
{mx && <ServerStatusFeature mx={mx} />}
|
||||||
|
{mx && !syncError && <ServerStatusBanner />}
|
||||||
{mx && !syncError && <SyncStatus mx={mx} />}
|
{mx && !syncError && <SyncStatus mx={mx} />}
|
||||||
{mx && !syncError && <ClockSkewBanner />}
|
{mx && !syncError && <ClockSkewBanner />}
|
||||||
{loading && <ClientRootOptions mx={mx} />}
|
{loading && <ClientRootOptions mx={mx} />}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ const readDismissedUntil = (): number => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [Gitea #158] "Your computer's clock is 14 minutes ahead of the server."
|
* [Gitea #158] "This device's clock is 14 minutes ahead of the server."
|
||||||
* Same slot and style as the sync banners. Shown while the skew monitor is
|
* Same slot and style as the sync banners. Shown while the skew monitor is
|
||||||
* over its threshold; the direction matters, so it is said. Dismissable for
|
* over its threshold; the direction matters, so it is said. Dismissable for
|
||||||
* 24 h; never auto-corrects anything.
|
* 24 h; never auto-corrects anything.
|
||||||
@@ -53,8 +53,8 @@ export function ClockSkewBanner() {
|
|||||||
>
|
>
|
||||||
<Box alignItems="Center" gap="300" wrap="Wrap" justifyContent="Center">
|
<Box alignItems="Center" gap="300" wrap="Wrap" justifyContent="Center">
|
||||||
<Text size="L400" align="Center">
|
<Text size="L400" align="Center">
|
||||||
Your computer's clock is <b>{describeSkewVsServer(skewMs)}</b>. Encrypted messages
|
This device's clock is <b>{describeSkewVsServer(skewMs)}</b>. Voice calls and
|
||||||
and voice calls will fail until it is fixed.
|
encrypted messages can fail until it's corrected.
|
||||||
</Text>
|
</Text>
|
||||||
<Button
|
<Button
|
||||||
size="300"
|
size="300"
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
import { MatrixClient, SyncState } from 'matrix-js-sdk';
|
import { MatrixClient, SyncState } from 'matrix-js-sdk';
|
||||||
import React, { useCallback, useState } from 'react';
|
import React, { useCallback, useState } from 'react';
|
||||||
|
import { useAtomValue } from 'jotai';
|
||||||
import { Box, config, Line, Text } from 'folds';
|
import { Box, config, Line, Text } from 'folds';
|
||||||
import { useSyncState } from '../../hooks/useSyncState';
|
import { useSyncState } from '../../hooks/useSyncState';
|
||||||
import { ContainerColor } from '../../styles/ContainerColor.css';
|
import { ContainerColor } from '../../styles/ContainerColor.css';
|
||||||
|
import { serverStatusAtom } from '../../state/serverStatus';
|
||||||
|
import { serverConfirmedUpSince } from '../../utils/kumaStatus';
|
||||||
|
|
||||||
type StateData = {
|
type StateData = {
|
||||||
current: SyncState | null;
|
current: SyncState | null;
|
||||||
@@ -13,6 +16,7 @@ type SyncStatusProps = {
|
|||||||
mx: MatrixClient;
|
mx: MatrixClient;
|
||||||
};
|
};
|
||||||
export function SyncStatus({ mx }: SyncStatusProps) {
|
export function SyncStatus({ mx }: SyncStatusProps) {
|
||||||
|
const serverStatus = useAtomValue(serverStatusAtom);
|
||||||
const [stateData, setStateData] = useState<StateData>({
|
const [stateData, setStateData] = useState<StateData>({
|
||||||
current: null,
|
current: null,
|
||||||
previous: undefined,
|
previous: undefined,
|
||||||
@@ -53,7 +57,14 @@ export function SyncStatus({ mx }: SyncStatusProps) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stateData.current === SyncState.Reconnecting) {
|
// [Gitea #124] When Kuma confirms the homeserver is down, the status banner
|
||||||
|
// says so ("Lotus Chat's server is down…") instead of "Connection Lost!".
|
||||||
|
const serverDown = serverStatus.status?.homeserver === 'down';
|
||||||
|
// Only blame the user's connection when Kuma has checked the server since
|
||||||
|
// the drop and it was fine (a stale "up" from before proves nothing).
|
||||||
|
const serverUp = serverConfirmedUpSince(serverStatus.status, serverStatus.lostAt);
|
||||||
|
|
||||||
|
if (stateData.current === SyncState.Reconnecting && !serverDown) {
|
||||||
return (
|
return (
|
||||||
<Box direction="Column" shrink="No">
|
<Box direction="Column" shrink="No">
|
||||||
<Box
|
<Box
|
||||||
@@ -64,14 +75,18 @@ export function SyncStatus({ mx }: SyncStatusProps) {
|
|||||||
role="status"
|
role="status"
|
||||||
aria-live="polite"
|
aria-live="polite"
|
||||||
>
|
>
|
||||||
<Text size="L400">Connection Lost! Reconnecting...</Text>
|
<Text size="L400">
|
||||||
|
{serverUp
|
||||||
|
? "Connection lost. Our status checks say Lotus Chat's server is up, so it may be your internet connection. Reconnecting…"
|
||||||
|
: 'Connection Lost! Reconnecting...'}
|
||||||
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<Line variant="Warning" size="300" />
|
<Line variant="Warning" size="300" />
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stateData.current === SyncState.Error) {
|
if (stateData.current === SyncState.Error && !serverDown) {
|
||||||
return (
|
return (
|
||||||
<Box direction="Column" shrink="No">
|
<Box direction="Column" shrink="No">
|
||||||
<Box
|
<Box
|
||||||
@@ -82,7 +97,11 @@ export function SyncStatus({ mx }: SyncStatusProps) {
|
|||||||
role="alert"
|
role="alert"
|
||||||
aria-live="assertive"
|
aria-live="assertive"
|
||||||
>
|
>
|
||||||
<Text size="L400">Connection Lost!</Text>
|
<Text size="L400">
|
||||||
|
{serverUp
|
||||||
|
? "Connection lost. Our status checks say Lotus Chat's server is up, so check your internet connection."
|
||||||
|
: 'Connection Lost!'}
|
||||||
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<Line variant="Critical" size="300" />
|
<Line variant="Critical" size="300" />
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -49,13 +49,7 @@ import { roomToParentsAtom } from '../../../state/room/roomToParents';
|
|||||||
import { allRoomsAtom } from '../../../state/room-list/roomList';
|
import { allRoomsAtom } from '../../../state/room-list/roomList';
|
||||||
import { useAnyRoomLiveCall } from '../../../hooks/useSpaceLiveCall';
|
import { useAnyRoomLiveCall } from '../../../hooks/useSpaceLiveCall';
|
||||||
import { LiveDot } from './SpaceTabs.css';
|
import { LiveDot } from './SpaceTabs.css';
|
||||||
import {
|
import { getSpaceLobbyPath, getSpacePath, joinPathComponent } from '../../pathUtils';
|
||||||
getOriginBaseUrl,
|
|
||||||
getSpaceLobbyPath,
|
|
||||||
getSpacePath,
|
|
||||||
joinPathComponent,
|
|
||||||
} from '../../pathUtils';
|
|
||||||
import { useClientConfig } from '../../../hooks/useClientConfig';
|
|
||||||
import {
|
import {
|
||||||
SidebarAvatar,
|
SidebarAvatar,
|
||||||
SidebarItem,
|
SidebarItem,
|
||||||
@@ -102,6 +96,7 @@ import { settingsAtom } from '../../../state/settings';
|
|||||||
import { useOpenSpaceSettings } from '../../../state/hooks/spaceSettings';
|
import { useOpenSpaceSettings } from '../../../state/hooks/spaceSettings';
|
||||||
import { useRoomCreators } from '../../../hooks/useRoomCreators';
|
import { useRoomCreators } from '../../../hooks/useRoomCreators';
|
||||||
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
|
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
|
||||||
|
import { useLotusShareBase } from '../../../hooks/useLotusLinkBase';
|
||||||
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
||||||
|
|
||||||
type SpaceMenuProps = {
|
type SpaceMenuProps = {
|
||||||
@@ -112,7 +107,7 @@ type SpaceMenuProps = {
|
|||||||
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
||||||
({ room, requestClose, onUnpin }, ref) => {
|
({ room, requestClose, onUnpin }, ref) => {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const { hashRouter } = useClientConfig();
|
const lotusBase = useLotusShareBase();
|
||||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||||
const roomToParents = useAtomValue(roomToParentsAtom);
|
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||||
const powerLevels = usePowerLevels(room);
|
const powerLevels = usePowerLevels(room);
|
||||||
@@ -152,9 +147,7 @@ const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
|||||||
const handleCopyLotusLink = () => {
|
const handleCopyLotusLink = () => {
|
||||||
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
||||||
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
||||||
copyToClipboard(
|
copyToClipboard(getLotusSpacePermalink(lotusBase, roomIdOrAlias, viaServers));
|
||||||
getLotusSpacePermalink(getOriginBaseUrl(hashRouter), roomIdOrAlias, viaServers),
|
|
||||||
);
|
|
||||||
requestClose();
|
requestClose();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -39,13 +39,7 @@ import {
|
|||||||
NavItemContent,
|
NavItemContent,
|
||||||
NavLink,
|
NavLink,
|
||||||
} from '../../../components/nav';
|
} from '../../../components/nav';
|
||||||
import {
|
import { getSpaceLobbyPath, getSpaceRoomPath, getSpaceSearchPath } from '../../pathUtils';
|
||||||
getOriginBaseUrl,
|
|
||||||
getSpaceLobbyPath,
|
|
||||||
getSpaceRoomPath,
|
|
||||||
getSpaceSearchPath,
|
|
||||||
} from '../../pathUtils';
|
|
||||||
import { useClientConfig } from '../../../hooks/useClientConfig';
|
|
||||||
import { getCanonicalAliasOrRoomId, isRoomAlias } from '../../../utils/matrix';
|
import { getCanonicalAliasOrRoomId, isRoomAlias } from '../../../utils/matrix';
|
||||||
import { useSelectedRoom } from '../../../hooks/router/useSelectedRoom';
|
import { useSelectedRoom } from '../../../hooks/router/useSelectedRoom';
|
||||||
import {
|
import {
|
||||||
@@ -92,6 +86,7 @@ import { ContainerColor } from '../../../styles/ContainerColor.css';
|
|||||||
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
||||||
import { BreakWord } from '../../../styles/Text.css';
|
import { BreakWord } from '../../../styles/Text.css';
|
||||||
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
||||||
|
import { useLotusShareBase } from '../../../hooks/useLotusLinkBase';
|
||||||
import { useCallEmbed } from '../../../hooks/useCallEmbed';
|
import { useCallEmbed } from '../../../hooks/useCallEmbed';
|
||||||
|
|
||||||
type SpaceMenuProps = {
|
type SpaceMenuProps = {
|
||||||
@@ -100,7 +95,7 @@ type SpaceMenuProps = {
|
|||||||
};
|
};
|
||||||
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClose }, ref) => {
|
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClose }, ref) => {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const { hashRouter } = useClientConfig();
|
const lotusBase = useLotusShareBase();
|
||||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||||
const [developerTools] = useSetting(settingsAtom, 'developerTools');
|
const [developerTools] = useSetting(settingsAtom, 'developerTools');
|
||||||
const roomToParents = useAtomValue(roomToParentsAtom);
|
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||||
@@ -137,9 +132,7 @@ const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClo
|
|||||||
const handleCopyLotusLink = () => {
|
const handleCopyLotusLink = () => {
|
||||||
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
||||||
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
||||||
copyToClipboard(
|
copyToClipboard(getLotusSpacePermalink(lotusBase, roomIdOrAlias, viaServers));
|
||||||
getLotusSpacePermalink(getOriginBaseUrl(hashRouter), roomIdOrAlias, viaServers),
|
|
||||||
);
|
|
||||||
requestClose();
|
requestClose();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+128
-203
@@ -2,7 +2,7 @@ import { ClientWidgetApi } from 'matrix-widget-api';
|
|||||||
import { EventEmitter } from 'events';
|
import { EventEmitter } from 'events';
|
||||||
import { CallControlState } from './CallControlState';
|
import { CallControlState } from './CallControlState';
|
||||||
import { ElementMediaStateDetail, ElementMediaStatePayload, ElementWidgetActions } from './types';
|
import { ElementMediaStateDetail, ElementMediaStatePayload, ElementWidgetActions } from './types';
|
||||||
import { getCallDocument } from './utils';
|
import { canDelegateCapability } from './utils';
|
||||||
|
|
||||||
export enum CallControlEvent {
|
export enum CallControlEvent {
|
||||||
StateUpdate = 'state_update',
|
StateUpdate = 'state_update',
|
||||||
@@ -54,16 +54,6 @@ export function parseForkHotkeyReport(data: unknown): ForkHotkeyReport | null {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Capability Delegation (`postMessage(msg, { delegate })`) ships only in
|
|
||||||
* Chromium; other engines silently ignore the option, so the frame would get
|
|
||||||
* no activation. `navigator.userAgentData` is likewise Chromium-only, which
|
|
||||||
* makes it the practical feature test.
|
|
||||||
*/
|
|
||||||
function canDelegateCapability(): boolean {
|
|
||||||
return typeof navigator !== 'undefined' && 'userAgentData' in navigator;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class CallControl extends EventEmitter implements CallControlState {
|
export class CallControl extends EventEmitter implements CallControlState {
|
||||||
private state: CallControlState;
|
private state: CallControlState;
|
||||||
|
|
||||||
@@ -71,14 +61,6 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
|
|
||||||
private iframe: HTMLIFrameElement;
|
private iframe: HTMLIFrameElement;
|
||||||
|
|
||||||
private bodyMutationObserver: MutationObserver;
|
|
||||||
|
|
||||||
private controlMutationObserver: MutationObserver;
|
|
||||||
|
|
||||||
// C-H3: coalesces bursts of body-subtree mutations into a single debounced
|
|
||||||
// re-observe pass so a busy EC re-render doesn't thrash the control observer.
|
|
||||||
private bodyMutationTimer?: ReturnType<typeof setTimeout>;
|
|
||||||
|
|
||||||
// [Gitea #56] Tracks the participant currently pinned via focusCameraParticipant(),
|
// [Gitea #56] Tracks the participant currently pinned via focusCameraParticipant(),
|
||||||
// so callers (MemberGlance) can render a "Focus camera" / "Unfocus camera" toggle
|
// so callers (MemberGlance) can render a "Focus camera" / "Unfocus camera" toggle
|
||||||
// instead of a one-way pin with no way back. null == no manual pin (speaker-follows).
|
// instead of a one-way pin with no way back. null == no manual pin (speaker-follows).
|
||||||
@@ -107,68 +89,12 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
// timeout — io.lotus toWidget actions must only be sent after call-join).
|
// timeout — io.lotus toWidget actions must only be sent after call-join).
|
||||||
private joined = false;
|
private joined = false;
|
||||||
|
|
||||||
private get document(): Document | undefined {
|
|
||||||
return getCallDocument(this.iframe);
|
|
||||||
}
|
|
||||||
|
|
||||||
private get screenshareButton(): HTMLElement | undefined {
|
|
||||||
const screenshareBtn = this.document?.querySelector(
|
|
||||||
'[data-testid="incall_screenshare"]',
|
|
||||||
) as HTMLElement | null;
|
|
||||||
|
|
||||||
return screenshareBtn ?? undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private get leaveButton(): Element | undefined {
|
|
||||||
const leaveBtn = this.document?.querySelector('[data-testid="incall_leave"]');
|
|
||||||
|
|
||||||
return leaveBtn ?? undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private get settingsButton(): HTMLElement | undefined {
|
|
||||||
// EC 0.20.1: settings button moved to bottom-left; fall back to bottom-center.
|
|
||||||
const settingsButtonLeft = this.document?.querySelector(
|
|
||||||
'[data-testid="settings-bottom-left"]',
|
|
||||||
) as HTMLButtonElement | undefined;
|
|
||||||
const settingsButtonCenter = this.document?.querySelector(
|
|
||||||
'[data-testid="settings-bottom-center"]',
|
|
||||||
) as HTMLButtonElement | undefined;
|
|
||||||
|
|
||||||
return settingsButtonLeft ?? settingsButtonCenter ?? undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private get reactionsButton(): HTMLElement | undefined {
|
|
||||||
// EC 0.20.1: reactions/raise-hand button sits just before the leave button.
|
|
||||||
const reactionsButton = this.leaveButton?.previousElementSibling as HTMLElement | null;
|
|
||||||
|
|
||||||
return reactionsButton ?? undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private get spotlightButton(): HTMLInputElement | undefined {
|
|
||||||
const spotlightButton = this.document?.querySelector(
|
|
||||||
'input[value="spotlight"]',
|
|
||||||
) as HTMLInputElement | null;
|
|
||||||
|
|
||||||
return spotlightButton ?? undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private get gridButton(): HTMLInputElement | undefined {
|
|
||||||
const gridButton = this.document?.querySelector(
|
|
||||||
'input[value="grid"]',
|
|
||||||
) as HTMLInputElement | null;
|
|
||||||
|
|
||||||
return gridButton ?? undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(state: CallControlState, call: ClientWidgetApi, iframe: HTMLIFrameElement) {
|
constructor(state: CallControlState, call: ClientWidgetApi, iframe: HTMLIFrameElement) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
this.state = state;
|
this.state = state;
|
||||||
this.call = call;
|
this.call = call;
|
||||||
this.iframe = iframe;
|
this.iframe = iframe;
|
||||||
|
|
||||||
this.bodyMutationObserver = new MutationObserver(this.onBodyMutation.bind(this));
|
|
||||||
this.controlMutationObserver = new MutationObserver(this.onControlMutation.bind(this));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public getState(): CallControlState {
|
public getState(): CallControlState {
|
||||||
@@ -225,6 +151,8 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
this.joined = true;
|
this.joined = true;
|
||||||
this.sendDeafenState();
|
this.sendDeafenState();
|
||||||
this.sendQuality();
|
this.sendQuality();
|
||||||
|
this.sendHotkeyCodes();
|
||||||
|
this.sendFrameScreenshareAllowed();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -240,55 +168,7 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
// [Gitea #17] The pin lives fork-side and is dropped on a handler remount.
|
// [Gitea #17] The pin lives fork-side and is dropped on a handler remount.
|
||||||
if (this._focusedUserId !== null) this.sendFocus(this._focusedUserId, this._focusedMediaId);
|
if (this._focusedUserId !== null) this.sendFocus(this._focusedUserId, this._focusedMediaId);
|
||||||
this.sendHotkeyCodes();
|
this.sendHotkeyCodes();
|
||||||
}
|
this.sendFrameScreenshareAllowed();
|
||||||
|
|
||||||
public startObserving() {
|
|
||||||
if (!this.document) return;
|
|
||||||
|
|
||||||
// C-H3: watch the whole body subtree (not just direct children) so we
|
|
||||||
// re-bind the control observer when EC re-renders its controls deeper in the
|
|
||||||
// tree. Debounced via onBodyMutation() to avoid thrashing on busy renders.
|
|
||||||
this.bodyMutationObserver.observe(this.document.body, {
|
|
||||||
childList: true,
|
|
||||||
subtree: true,
|
|
||||||
});
|
|
||||||
this.applyBodyMutation();
|
|
||||||
}
|
|
||||||
|
|
||||||
private onBodyMutation() {
|
|
||||||
// C-H3: coalesce a burst of subtree mutations into one debounced pass.
|
|
||||||
if (this.bodyMutationTimer !== undefined) return;
|
|
||||||
this.bodyMutationTimer = setTimeout(() => {
|
|
||||||
this.bodyMutationTimer = undefined;
|
|
||||||
this.applyBodyMutation();
|
|
||||||
}, 100);
|
|
||||||
}
|
|
||||||
|
|
||||||
private applyBodyMutation() {
|
|
||||||
if (!this.document) return;
|
|
||||||
// Hiding EC's footer and the transparent background are the fork's job now
|
|
||||||
// (lotusHostControls / lotusTransparent URL flags, Gitea #43).
|
|
||||||
this.observeControls();
|
|
||||||
}
|
|
||||||
|
|
||||||
private observeControls() {
|
|
||||||
this.controlMutationObserver.disconnect();
|
|
||||||
|
|
||||||
const screenshareBtn = this.screenshareButton;
|
|
||||||
if (screenshareBtn) {
|
|
||||||
this.controlMutationObserver.observe(screenshareBtn, {
|
|
||||||
attributes: true,
|
|
||||||
attributeFilter: ['data-kind'],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const spotlightBtn = this.spotlightButton;
|
|
||||||
if (spotlightBtn) {
|
|
||||||
this.controlMutationObserver.observe(spotlightBtn, {
|
|
||||||
attributes: true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
this.onControlMutation();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async setMediaState(state: ElementMediaStatePayload) {
|
private async setMediaState(state: ElementMediaStatePayload) {
|
||||||
@@ -369,39 +249,87 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// [Gitea #43] Set once the fork reports io.lotus.controls_state: from then on
|
// [Gitea #43] The fork has reported io.lotus.controls_state, so its Lotus
|
||||||
// layout / settings / reactions go over the widget API and screenshare +
|
// action handlers are mounted. Screenshare and layout state come from that
|
||||||
// layout state come from that report, not from EC's DOM. Older forks never
|
// report; the host never reads or clicks EC's DOM.
|
||||||
// send it and keep the DOM path below.
|
private forkReady = false;
|
||||||
private forkControls = false;
|
|
||||||
|
|
||||||
// [Gitea #43] The fork handles io.lotus.set_screenshare (reported in
|
// [Gitea #43] The fork shows EC's own screenshare button inside the frame
|
||||||
// controls_state). Used only where Capability Delegation exists.
|
// (lotusFrameScreenshare: no Capability Delegation here), so the host bar
|
||||||
private forkScreenshare = false;
|
// hides its own.
|
||||||
|
private _frameScreenshare = false;
|
||||||
|
|
||||||
// [Gitea #43] The fork reports call hotkeys pressed inside its frame
|
private frameScreenshareListeners = new Set<() => void>();
|
||||||
// (io.lotus.set_hotkeys → io.lotus.hotkey), so the host stops adding key
|
|
||||||
// listeners to the frame's window.
|
// [Gitea #43] The fork draws the "Share your screen?" prompt inside the frame
|
||||||
private forkHotkeys = false;
|
// on request (io.lotus.prompt_screenshare), so where the click can't be
|
||||||
|
// delegated our call-bar button asks for that instead of starting the share.
|
||||||
|
private _screensharePrompt = false;
|
||||||
|
|
||||||
|
// [Gitea #43] The fork's in-frame prompt is showing: anything the host lays
|
||||||
|
// over the frame (the picture-in-picture overlay) must let clicks through.
|
||||||
|
private _screensharePromptOpen = false;
|
||||||
|
|
||||||
|
// [Gitea #43] Whether the room's call policy allows screensharing; the fork
|
||||||
|
// hides its in-frame button when it doesn't.
|
||||||
|
private frameScreenshareAllowed = true;
|
||||||
|
|
||||||
private hotkeyCodes = new Map<string, string[]>();
|
private hotkeyCodes = new Map<string, string[]>();
|
||||||
|
|
||||||
private hotkeyListeners = new Set<(report: ForkHotkeyReport) => void>();
|
private hotkeyListeners = new Set<(report: ForkHotkeyReport) => void>();
|
||||||
|
|
||||||
private forkHotkeysListeners = new Set<() => void>();
|
/** EC's own screenshare button is shown in the frame instead of ours. */
|
||||||
|
public get frameScreenshare(): boolean {
|
||||||
public get forkHandlesHotkeys(): boolean {
|
return this._frameScreenshare;
|
||||||
return this.forkHotkeys;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Subscribe to `forkHandlesHotkeys` turning on. Returns an unsubscribe. */
|
/**
|
||||||
public onForkHotkeysChange(cb: () => void): () => void {
|
* Starting a share must go through the fork's in-frame prompt: this engine
|
||||||
this.forkHotkeysListeners.add(cb);
|
* can't delegate the click (Firefox, Safari, WebKitGTK) and the fork has
|
||||||
|
* the prompt. Stopping never needs it.
|
||||||
|
*/
|
||||||
|
public get screenshareNeedsPrompt(): boolean {
|
||||||
|
return this._screensharePrompt && !canDelegateCapability();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The fork's in-frame "Share your screen?" prompt is showing. */
|
||||||
|
public get screensharePromptOpen(): boolean {
|
||||||
|
return this._screensharePromptOpen;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ask the fork to show "Share your screen?" inside the call frame; its Share
|
||||||
|
* button starts the share with the frame's own click.
|
||||||
|
*/
|
||||||
|
public promptScreenshare(): void {
|
||||||
|
this.sendForkAction('io.lotus.prompt_screenshare', {});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Subscribe to `frameScreenshare` / `screenshareNeedsPrompt` /
|
||||||
|
* `screensharePromptOpen` changes. Returns an unsubscribe.
|
||||||
|
*/
|
||||||
|
public onFrameScreenshareChange(cb: () => void): () => void {
|
||||||
|
this.frameScreenshareListeners.add(cb);
|
||||||
return () => {
|
return () => {
|
||||||
this.forkHotkeysListeners.delete(cb);
|
this.frameScreenshareListeners.delete(cb);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Room call policy for the in-frame screenshare button. */
|
||||||
|
public setFrameScreenshareAllowed(allowed: boolean): void {
|
||||||
|
this.frameScreenshareAllowed = allowed;
|
||||||
|
this.sendFrameScreenshareAllowed();
|
||||||
|
}
|
||||||
|
|
||||||
|
private sendFrameScreenshareAllowed(): void {
|
||||||
|
if (!this.joined || !this.forkReady) return;
|
||||||
|
if (!this._frameScreenshare && !this._screensharePrompt) return;
|
||||||
|
this.sendForkAction('io.lotus.set_frame_screenshare', {
|
||||||
|
visible: this.frameScreenshareAllowed,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/** Key codes `source` (e.g. 'ptt', 'deafen') wants reported from the frame. */
|
/** Key codes `source` (e.g. 'ptt', 'deafen') wants reported from the frame. */
|
||||||
public setHotkeyCodes(source: string, codes: string[]): void {
|
public setHotkeyCodes(source: string, codes: string[]): void {
|
||||||
this.hotkeyCodes.set(source, codes);
|
this.hotkeyCodes.set(source, codes);
|
||||||
@@ -409,7 +337,7 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private sendHotkeyCodes(): void {
|
private sendHotkeyCodes(): void {
|
||||||
if (!this.joined || !this.forkHotkeys) return;
|
if (!this.joined || !this.forkReady) return;
|
||||||
const codes = [...new Set([...this.hotkeyCodes.values()].flat())];
|
const codes = [...new Set([...this.hotkeyCodes.values()].flat())];
|
||||||
this.call.transport.send('io.lotus.set_hotkeys', { codes }).catch(() => undefined);
|
this.call.transport.send('io.lotus.set_hotkeys', { codes }).catch(() => undefined);
|
||||||
}
|
}
|
||||||
@@ -431,18 +359,35 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
/** [Gitea #43] The fork's `io.lotus.controls_state` report. */
|
/** [Gitea #43] The fork's `io.lotus.controls_state` report. */
|
||||||
public onControlsState(data: unknown) {
|
public onControlsState(data: unknown) {
|
||||||
if (typeof data !== 'object' || data === null) return;
|
if (typeof data !== 'object' || data === null) return;
|
||||||
const { screensharing, layout, screenshareAction, hotkeys } = data as {
|
const { screensharing, layout, frameScreenshare, screensharePrompt, screensharePromptOpen } =
|
||||||
screensharing?: unknown;
|
data as {
|
||||||
layout?: unknown;
|
screensharing?: unknown;
|
||||||
screenshareAction?: unknown;
|
layout?: unknown;
|
||||||
hotkeys?: unknown;
|
frameScreenshare?: unknown;
|
||||||
};
|
screensharePrompt?: unknown;
|
||||||
this.forkControls = true;
|
screensharePromptOpen?: unknown;
|
||||||
this.forkScreenshare = screenshareAction === true;
|
};
|
||||||
if (hotkeys === true && !this.forkHotkeys) {
|
const firstReport = !this.forkReady;
|
||||||
this.forkHotkeys = true;
|
this.forkReady = true;
|
||||||
|
const frame = frameScreenshare === true;
|
||||||
|
const prompt = screensharePrompt === true;
|
||||||
|
const promptOpen = screensharePromptOpen === true;
|
||||||
|
if (promptOpen !== this._screensharePromptOpen) {
|
||||||
|
this._screensharePromptOpen = promptOpen;
|
||||||
|
if (frame === this._frameScreenshare && prompt === this._screensharePrompt) {
|
||||||
|
this.frameScreenshareListeners.forEach((l) => l());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (frame !== this._frameScreenshare || prompt !== this._screensharePrompt) {
|
||||||
|
const promptTurnedOn = prompt && !this._screensharePrompt;
|
||||||
|
this._frameScreenshare = frame;
|
||||||
|
this._screensharePrompt = prompt;
|
||||||
|
this.frameScreenshareListeners.forEach((l) => l());
|
||||||
|
if (promptTurnedOn && !firstReport) this.sendFrameScreenshareAllowed();
|
||||||
|
}
|
||||||
|
if (firstReport) {
|
||||||
this.sendHotkeyCodes();
|
this.sendHotkeyCodes();
|
||||||
this.forkHotkeysListeners.forEach((l) => l());
|
this.sendFrameScreenshareAllowed();
|
||||||
}
|
}
|
||||||
this.applyControls(
|
this.applyControls(
|
||||||
typeof screensharing === 'boolean' ? screensharing : this.screenshare,
|
typeof screensharing === 'boolean' ? screensharing : this.screenshare,
|
||||||
@@ -450,13 +395,6 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private onControlMutation() {
|
|
||||||
if (this.forkControls) return;
|
|
||||||
const screenshare: boolean = this.screenshareButton?.getAttribute('data-kind') === 'primary';
|
|
||||||
const spotlight: boolean = this.spotlightButton?.checked ?? false;
|
|
||||||
this.applyControls(screenshare, spotlight);
|
|
||||||
}
|
|
||||||
|
|
||||||
private applyControls(screenshare: boolean, spotlight: boolean) {
|
private applyControls(screenshare: boolean, spotlight: boolean) {
|
||||||
const wasScreensharing = this.screenshare;
|
const wasScreensharing = this.screenshare;
|
||||||
|
|
||||||
@@ -560,16 +498,17 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
* Must be called synchronously inside the user's click: starting a share
|
* Must be called synchronously inside the user's click: starting a share
|
||||||
* calls getDisplayMedia in the frame, which needs that click. Where the
|
* calls getDisplayMedia in the frame, which needs that click. Where the
|
||||||
* browser can hand the click over (Capability Delegation, Chromium incl.
|
* browser can hand the click over (Capability Delegation, Chromium incl.
|
||||||
* WebView2) this goes over the widget API; elsewhere (Firefox, Safari,
|
* WebView2) it is sent with delegation. Elsewhere the host bar hides its
|
||||||
* WebKitGTK desktop) it still clicks EC's hidden button, which needs
|
* button and EC's own shows in the frame (`frameScreenshare`); a plain send
|
||||||
* same-origin access to the frame.
|
* still stops a share, which needs no click.
|
||||||
*/
|
*/
|
||||||
public toggleScreenshare() {
|
public toggleScreenshare() {
|
||||||
if (this.forkScreenshare && canDelegateCapability()) {
|
const data = { on: !this.screenshare };
|
||||||
this.sendDelegated('io.lotus.set_screenshare', { on: !this.screenshare }, 'display-capture');
|
if (canDelegateCapability()) {
|
||||||
|
this.sendDelegated('io.lotus.set_screenshare', data, 'display-capture');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.screenshareButton?.click();
|
this.sendForkAction('io.lotus.set_screenshare', data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -602,34 +541,18 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public toggleSpotlight() {
|
public toggleSpotlight() {
|
||||||
if (this.forkControls) {
|
this.sendForkAction('io.lotus.set_layout', {
|
||||||
this.sendForkAction('io.lotus.set_layout', {
|
layout: this.spotlight ? 'grid' : 'spotlight',
|
||||||
layout: this.spotlight ? 'grid' : 'spotlight',
|
});
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (this.spotlight) {
|
|
||||||
this.gridButton?.click();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.spotlightButton?.click();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public toggleReactions() {
|
public toggleReactions() {
|
||||||
if (this.forkControls) {
|
this.sendForkAction('io.lotus.toggle_reactions', {});
|
||||||
this.sendForkAction('io.lotus.toggle_reactions', {});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.reactionsButton?.click();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public toggleSettings() {
|
public toggleSettings() {
|
||||||
if (this.forkControls) {
|
// Same as clicking EC's settings button: opens the modal.
|
||||||
// Same as clicking EC's settings button: opens the modal.
|
this.sendForkAction('io.lotus.open_settings', { open: true });
|
||||||
this.sendForkAction('io.lotus.open_settings', { open: true });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.settingsButton?.click();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private sendForkAction(action: string, data: Record<string, unknown>): void {
|
private sendForkAction(action: string, data: Record<string, unknown>): void {
|
||||||
@@ -690,19 +613,27 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
* track (`io.lotus.inject_audio`) rather than splicing the mic. `url` must be
|
* track (`io.lotus.inject_audio`) rather than splicing the mic. `url` must be
|
||||||
* an https/blob URL the widget can fetch WITHOUT credentials — the host
|
* an https/blob URL the widget can fetch WITHOUT credentials — the host
|
||||||
* resolves an mxc clip to a `blob:` object URL first (authenticated media
|
* resolves an mxc clip to a `blob:` object URL first (authenticated media
|
||||||
* can't be fetched cross-realm by the widget). `volume` is 0–1.
|
* can't be fetched cross-realm by the widget) — and `audio` the same clip's
|
||||||
|
* bytes, which the fork prefers. `volume` is 0–1.
|
||||||
*
|
*
|
||||||
* The local user does not hear their own published track, so callers should
|
* The local user does not hear their own published track, so callers should
|
||||||
* also play the clip locally for feedback.
|
* also play the clip locally for feedback.
|
||||||
*/
|
*/
|
||||||
public injectAudio(url: string, volume = 1): Promise<{ played: boolean; reason?: string }> {
|
public injectAudio(
|
||||||
|
url: string,
|
||||||
|
volume = 1,
|
||||||
|
audio?: ArrayBuffer,
|
||||||
|
): Promise<{ played: boolean; reason?: string }> {
|
||||||
// [EC#13] The fork now refuses while the local mic is muted and replies
|
// [EC#13] The fork now refuses while the local mic is muted and replies
|
||||||
// { played:false, reason:"muted" }; older forks reply {} (treated as played).
|
// { played:false, reason:"muted" }; older forks reply {} (treated as played).
|
||||||
|
// [Gitea #43] `audio` carries the clip's bytes: a `blob:` URL only works on
|
||||||
|
// this origin, so a call page on its own origin can't fetch it. Forks that
|
||||||
|
// predate `audio` ignore it and use `url`.
|
||||||
return this.call.transport
|
return this.call.transport
|
||||||
.send<{ url: string; volume: number }, { played?: boolean; reason?: string }>(
|
.send<
|
||||||
'io.lotus.inject_audio',
|
{ url: string; volume: number; audio?: ArrayBuffer },
|
||||||
{ url, volume },
|
{ played?: boolean; reason?: string }
|
||||||
)
|
>('io.lotus.inject_audio', audio ? { url, volume, audio } : { url, volume })
|
||||||
.then((r) => ({ played: r?.played !== false, reason: r?.reason }))
|
.then((r) => ({ played: r?.played !== false, reason: r?.reason }))
|
||||||
.catch(() => ({ played: true }));
|
.catch(() => ({ played: true }));
|
||||||
}
|
}
|
||||||
@@ -731,14 +662,8 @@ export class CallControl extends EventEmitter implements CallControlState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public dispose() {
|
public dispose() {
|
||||||
if (this.bodyMutationTimer !== undefined) {
|
|
||||||
clearTimeout(this.bodyMutationTimer);
|
|
||||||
this.bodyMutationTimer = undefined;
|
|
||||||
}
|
|
||||||
// [Gitea #56] Don't let a manual focus pin outlive the call.
|
// [Gitea #56] Don't let a manual focus pin outlive the call.
|
||||||
this.clearFocusParticipant();
|
this.clearFocusParticipant();
|
||||||
this.bodyMutationObserver.disconnect();
|
|
||||||
this.controlMutationObserver.disconnect();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private emitStateUpdate() {
|
private emitStateUpdate() {
|
||||||
|
|||||||
@@ -28,7 +28,9 @@ import {
|
|||||||
import { CallControl } from './CallControl';
|
import { CallControl } from './CallControl';
|
||||||
import { CallControlState } from './CallControlState';
|
import { CallControlState } from './CallControlState';
|
||||||
import { verifyDenoiseAssets } from './denoiseSmokeCheck';
|
import { verifyDenoiseAssets } from './denoiseSmokeCheck';
|
||||||
import { getCallDocument } from './utils';
|
import { canDelegateCapability } from './utils';
|
||||||
|
import { getCallPageUrl } from './callPageUrl';
|
||||||
|
import { restrictWidgetMessages } from '../widgetTransport';
|
||||||
|
|
||||||
// Maximum time to wait for the embedded Element Call iframe to progress from
|
// Maximum time to wait for the embedded Element Call iframe to progress from
|
||||||
// initial load to a ready/joined state. If it hasn't by then, we assume the
|
// initial load to a ready/joined state. If it hasn't by then, we assume the
|
||||||
@@ -218,6 +220,11 @@ export class CallEmbed {
|
|||||||
// [Gitea #43] The fork hides its own footer (we draw the call bar) and
|
// [Gitea #43] The fork hides its own footer (we draw the call bar) and
|
||||||
// sets its root color-scheme from the theme, instead of us injecting CSS.
|
// sets its root color-scheme from the theme, instead of us injecting CSS.
|
||||||
lotusHostControls: 'true',
|
lotusHostControls: 'true',
|
||||||
|
// [Gitea #43] Engines without Capability Delegation (Firefox, Safari,
|
||||||
|
// WebKitGTK) can't start a share from our call bar: getDisplayMedia
|
||||||
|
// needs the click inside the frame. There the fork shows EC's own
|
||||||
|
// screenshare button and we hide ours.
|
||||||
|
...(canDelegateCapability() ? {} : { lotusFrameScreenshare: 'true' }),
|
||||||
// [lotus #3 / P5-15] Arm the fork's audio-inject handler so the in-call
|
// [lotus #3 / P5-15] Arm the fork's audio-inject handler so the in-call
|
||||||
// soundboard can publish clips into the call. Dormant until the host
|
// soundboard can publish clips into the call. Dormant until the host
|
||||||
// sends io.lotus.inject_audio (only on an explicit user click), so
|
// sends io.lotus.inject_audio (only on an explicit user click), so
|
||||||
@@ -248,10 +255,14 @@ export class CallEmbed {
|
|||||||
params.append('sendNotificationType', CallEmbed.dmCall(intent) ? 'ring' : 'notification');
|
params.append('sendNotificationType', CallEmbed.dmCall(intent) ? 'ring' : 'notification');
|
||||||
}
|
}
|
||||||
|
|
||||||
const widgetUrl = new URL(
|
// [Gitea #43] On its own origin when config.json sets elementCallUrl.
|
||||||
`${trimTrailingSlash(import.meta.env.BASE_URL)}/public/element-call/index.html`,
|
const externalPage = getCallPageUrl();
|
||||||
window.location.origin,
|
const widgetUrl = externalPage
|
||||||
);
|
? new URL(externalPage)
|
||||||
|
: new URL(
|
||||||
|
`${trimTrailingSlash(import.meta.env.BASE_URL)}/public/element-call/index.html`,
|
||||||
|
window.location.origin,
|
||||||
|
);
|
||||||
widgetUrl.search = params.toString();
|
widgetUrl.search = params.toString();
|
||||||
|
|
||||||
const options: IWidget = {
|
const options: IWidget = {
|
||||||
@@ -300,6 +311,8 @@ export class CallEmbed {
|
|||||||
|
|
||||||
const callWidgetDriver: WidgetDriver = new CallWidgetDriver(mx, room.roomId);
|
const callWidgetDriver: WidgetDriver = new CallWidgetDriver(mx, room.roomId);
|
||||||
const call: ClientWidgetApi = new ClientWidgetApi(widget, iframe, callWidgetDriver);
|
const call: ClientWidgetApi = new ClientWidgetApi(widget, iframe, callWidgetDriver);
|
||||||
|
// Only messages from the call's own frame and origin reach the widget API.
|
||||||
|
restrictWidgetMessages(call, iframe, widget.origin);
|
||||||
|
|
||||||
this.mx = mx;
|
this.mx = mx;
|
||||||
this.call = call;
|
this.call = call;
|
||||||
@@ -311,10 +324,6 @@ export class CallEmbed {
|
|||||||
const controlState = initialControlState ?? new CallControlState(true, false, true);
|
const controlState = initialControlState ?? new CallControlState(true, false, true);
|
||||||
this.control = new CallControl(controlState, call, iframe);
|
this.control = new CallControl(controlState, call, iframe);
|
||||||
this.initialState = controlState;
|
this.initialState = controlState;
|
||||||
this.control.startObserving();
|
|
||||||
iframe.onload = () => {
|
|
||||||
this.control.startObserving();
|
|
||||||
};
|
|
||||||
// If the iframe document itself fails to load, fail fast.
|
// If the iframe document itself fails to load, fail fast.
|
||||||
iframe.onerror = () => {
|
iframe.onerror = () => {
|
||||||
this.settleLoad('iframe');
|
this.settleLoad('iframe');
|
||||||
@@ -348,10 +357,6 @@ export class CallEmbed {
|
|||||||
return this.room.roomId;
|
return this.room.roomId;
|
||||||
}
|
}
|
||||||
|
|
||||||
get document(): Document | undefined {
|
|
||||||
return getCallDocument(this.iframe);
|
|
||||||
}
|
|
||||||
|
|
||||||
public setTheme(theme: ElementCallThemeKind) {
|
public setTheme(theme: ElementCallThemeKind) {
|
||||||
this.themeKind = theme;
|
this.themeKind = theme;
|
||||||
return this.call.transport
|
return this.call.transport
|
||||||
@@ -573,13 +578,12 @@ export class CallEmbed {
|
|||||||
|
|
||||||
private onCallJoined(): void {
|
private onCallJoined(): void {
|
||||||
this.settleLoad();
|
this.settleLoad();
|
||||||
this.control.startObserving();
|
|
||||||
|
|
||||||
// C-H1: EC fires JoinCall again on an EC reconnect (this action has no
|
// C-H1: EC fires JoinCall again on an EC reconnect (this action has no
|
||||||
// once-guard). forceState() would reset live mic/video/deafen back to the
|
// once-guard). forceState() would reset live mic/video/deafen back to the
|
||||||
// join-time snapshot, so only run it on the FIRST join. On a rejoin we just
|
// join-time snapshot, so only run it on the FIRST join. On a rejoin we just
|
||||||
// re-apply styles/observers (above) and re-push the sticky fork state
|
// re-push the sticky fork state (deafen/quality), leaving the user's live
|
||||||
// (deafen/quality), leaving the user's live media state untouched.
|
// media state untouched.
|
||||||
if (this.joined) {
|
if (this.joined) {
|
||||||
this.control.resendForkState();
|
this.control.resendForkState();
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { resolveCallPageUrl, resolveDesktopCallPageUrl } from './callPageUrl';
|
||||||
|
|
||||||
|
const URL_OK = 'https://call.chat.example.org/public/element-call/index.html';
|
||||||
|
|
||||||
|
test('uses an absolute https URL on the web', () => {
|
||||||
|
assert.equal(resolveCallPageUrl(URL_OK, false), URL_OK);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('strips a query or hash (the app adds its own parameters)', () => {
|
||||||
|
assert.equal(resolveCallPageUrl(`${URL_OK}?x=1#y`, false), URL_OK);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('allows http only on localhost (development)', () => {
|
||||||
|
assert.equal(
|
||||||
|
resolveCallPageUrl('http://127.0.0.1:5174/public/element-call/index.html', false),
|
||||||
|
'http://127.0.0.1:5174/public/element-call/index.html',
|
||||||
|
);
|
||||||
|
assert.equal(resolveCallPageUrl('http://call.example.org/index.html', false), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('desktop keeps the bundled page', () => {
|
||||||
|
assert.equal(resolveCallPageUrl(URL_OK, true), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('anything else falls back to the bundled page', () => {
|
||||||
|
[
|
||||||
|
undefined,
|
||||||
|
null,
|
||||||
|
42,
|
||||||
|
'',
|
||||||
|
' ',
|
||||||
|
'not a url',
|
||||||
|
'/public/element-call/index.html',
|
||||||
|
'http://call.chat.example.org/index.html',
|
||||||
|
['javascript', 'alert(1)'].join(':'),
|
||||||
|
'data:text/html,x',
|
||||||
|
].forEach((v) => assert.equal(resolveCallPageUrl(v, false), undefined, String(v)));
|
||||||
|
});
|
||||||
|
|
||||||
|
const APP = 'http://localhost:44548';
|
||||||
|
const PAGE = '/public/element-call/index.html';
|
||||||
|
|
||||||
|
test('desktop: the bundled page from the loopback origin on the same port', () => {
|
||||||
|
assert.equal(
|
||||||
|
resolveDesktopCallPageUrl('http://127.0.0.1:44548', APP, '/'),
|
||||||
|
`http://127.0.0.1:44548${PAGE}`,
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
resolveDesktopCallPageUrl('http://127.0.0.1:44548/', APP, '/app/'),
|
||||||
|
`http://127.0.0.1:44548/app${PAGE}`,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('desktop: unset or anything but same-port loopback http keeps the same-origin page', () => {
|
||||||
|
[
|
||||||
|
undefined,
|
||||||
|
'',
|
||||||
|
'http://127.0.0.1:44549',
|
||||||
|
'http://127.0.0.1',
|
||||||
|
'https://127.0.0.1:44548',
|
||||||
|
'http://localhost:44548',
|
||||||
|
'http://[::1]:44548',
|
||||||
|
'http://10.0.0.5:44548',
|
||||||
|
'https://call.chat.lotusguild.org',
|
||||||
|
'http://127.0.0.1:44548/evil/',
|
||||||
|
'http://127.0.0.1:44548/?x=1',
|
||||||
|
'http://user:pw@127.0.0.1:44548',
|
||||||
|
'not a url',
|
||||||
|
42,
|
||||||
|
].forEach((v) => assert.equal(resolveDesktopCallPageUrl(v, APP, '/'), undefined, String(v)));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('desktop: only when the app itself runs on http://localhost (release builds)', () => {
|
||||||
|
const v = 'http://127.0.0.1:44548';
|
||||||
|
assert.equal(resolveDesktopCallPageUrl(v, 'tauri://localhost', '/'), undefined);
|
||||||
|
assert.equal(resolveDesktopCallPageUrl(v, 'http://tauri.localhost', '/'), undefined);
|
||||||
|
assert.equal(resolveDesktopCallPageUrl(v, 'https://chat.lotusguild.org', '/'), undefined);
|
||||||
|
assert.equal(resolveDesktopCallPageUrl(v, 'http://localhost', '/'), undefined);
|
||||||
|
});
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
/**
|
||||||
|
* [Gitea #43] Where the Element Call page is loaded from.
|
||||||
|
*
|
||||||
|
* By default it's the copy bundled with this app (same origin). With
|
||||||
|
* `elementCallUrl` in config.json (e.g.
|
||||||
|
* "https://call.chat.lotusguild.org/public/element-call/index.html") the web
|
||||||
|
* app loads it from that origin instead, so the call frame can no longer
|
||||||
|
* reach this origin's storage (login token, crypto store) or service worker.
|
||||||
|
*
|
||||||
|
* Web only: the desktop app keeps its bundled copy (a network copy could
|
||||||
|
* drift from the bundle); see resolveDesktopCallPageUrl for how it isolates
|
||||||
|
* it. Anything that isn't an absolute https URL (http only on localhost, for
|
||||||
|
* development) is ignored, so a bad value falls
|
||||||
|
* back to the bundled page instead of breaking calls.
|
||||||
|
*/
|
||||||
|
export const resolveCallPageUrl = (value: unknown, desktop: boolean): string | undefined => {
|
||||||
|
if (desktop || typeof value !== 'string' || value.trim() === '') return undefined;
|
||||||
|
try {
|
||||||
|
const url = new URL(value);
|
||||||
|
// http only for local development (localhost is a secure context).
|
||||||
|
const local = url.hostname === 'localhost' || url.hostname === '127.0.0.1';
|
||||||
|
if (url.protocol !== 'https:' && !(url.protocol === 'http:' && local)) return undefined;
|
||||||
|
url.search = '';
|
||||||
|
url.hash = '';
|
||||||
|
return url.href;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #43] Desktop: the bundled call page from a second origin.
|
||||||
|
*
|
||||||
|
* The desktop app is served by its local server at http://localhost:<port>.
|
||||||
|
* The same server answers on http://127.0.0.1:<port>, which is a different
|
||||||
|
* origin (and still a secure context), so loading the bundled call page from
|
||||||
|
* there cuts the call frame off from the app's storage (login token, crypto
|
||||||
|
* store) without a network copy that could drift from the bundle.
|
||||||
|
*
|
||||||
|
* Only used when cinny-desktop sets `desktopCallOrigin` (it ships the server
|
||||||
|
* and CSP changes this needs in the same release), only for a loopback http
|
||||||
|
* origin on the SAME port as the app, and only when the app itself runs on
|
||||||
|
* http://localhost (release builds). Anything else keeps the same-origin page.
|
||||||
|
*/
|
||||||
|
export const resolveDesktopCallPageUrl = (
|
||||||
|
value: unknown,
|
||||||
|
appOrigin: string,
|
||||||
|
basePath: string,
|
||||||
|
): string | undefined => {
|
||||||
|
if (typeof value !== 'string' || value.trim() === '') return undefined;
|
||||||
|
try {
|
||||||
|
const app = new URL(appOrigin);
|
||||||
|
const call = new URL(value);
|
||||||
|
if (app.protocol !== 'http:' || app.hostname !== 'localhost' || !app.port) return undefined;
|
||||||
|
if (call.protocol !== 'http:' || call.hostname !== '127.0.0.1') return undefined;
|
||||||
|
if (call.port !== app.port || call.username || call.password) return undefined;
|
||||||
|
if (call.pathname !== '/' || call.search || call.hash) return undefined;
|
||||||
|
const base = basePath.replace(/\/+$/, '');
|
||||||
|
return `${call.origin}${base}/public/element-call/index.html`;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let callPageUrl: string | undefined;
|
||||||
|
|
||||||
|
export const setCallPageUrl = (url: string | undefined): void => {
|
||||||
|
callPageUrl = url;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getCallPageUrl = (): string | undefined => callPageUrl;
|
||||||
@@ -73,3 +73,48 @@ export const useCallMicLevel = (callEmbed: CallEmbed | undefined): number => {
|
|||||||
);
|
);
|
||||||
return useSyncExternalStore(subscribe, () => callEmbed?.getMicLevel() ?? 0);
|
return useSyncExternalStore(subscribe, () => callEmbed?.getMicLevel() ?? 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #43] How the call bar's screenshare button behaves:
|
||||||
|
* - `hidden`: EC's own button is inside the frame (fork lotus.20/21), so ours hides;
|
||||||
|
* - `prompt`: starting asks the fork for its in-frame "Share your screen?"
|
||||||
|
* (no Capability Delegation in this engine);
|
||||||
|
* - `direct`: our own confirm, then a (delegated) set_screenshare.
|
||||||
|
*/
|
||||||
|
export type ScreenshareMode = 'hidden' | 'prompt' | 'direct';
|
||||||
|
|
||||||
|
const screenshareMode = (control: CallControl): ScreenshareMode => {
|
||||||
|
if (control.frameScreenshare) return 'hidden';
|
||||||
|
return control.screenshareNeedsPrompt ? 'prompt' : 'direct';
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useScreenshareMode = (control: CallControl | undefined): ScreenshareMode => {
|
||||||
|
const [mode, setMode] = useState<ScreenshareMode>(() =>
|
||||||
|
control ? screenshareMode(control) : 'direct',
|
||||||
|
);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!control) {
|
||||||
|
setMode('direct');
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const sync = () => setMode(screenshareMode(control));
|
||||||
|
sync();
|
||||||
|
return control.onFrameScreenshareChange(sync);
|
||||||
|
}, [control]);
|
||||||
|
return mode;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** [Gitea #43] The fork's in-frame "Share your screen?" prompt is showing. */
|
||||||
|
export const useScreensharePromptOpen = (control: CallControl | undefined): boolean => {
|
||||||
|
const [open, setOpen] = useState(() => control?.screensharePromptOpen ?? false);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!control) {
|
||||||
|
setOpen(false);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const sync = () => setOpen(control.screensharePromptOpen);
|
||||||
|
sync();
|
||||||
|
return control.onFrameScreenshareChange(sync);
|
||||||
|
}, [control]);
|
||||||
|
return open;
|
||||||
|
};
|
||||||
|
|||||||
@@ -118,17 +118,10 @@ export function getCallCapabilities(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The EC iframe's document, or undefined when it cannot be read. The widget is
|
* Capability Delegation (`postMessage(msg, { delegate })`) ships only in
|
||||||
* same-origin, but when its navigation fails (offline, blocked) the frame
|
* Chromium; other engines silently ignore the option, so the frame would get
|
||||||
* becomes a cross-origin error page and `contentWindow.document` THROWS a
|
* no activation. `navigator.userAgentData` is likewise Chromium-only, which
|
||||||
* SecurityError — which surfaced as page errors (and a React "Should not
|
* makes it the practical feature test.
|
||||||
* already be working" cascade) from every DOM-driven call hook the moment the
|
|
||||||
* load watchdog fired. Treat "can't read" the same as "not loaded yet".
|
|
||||||
*/
|
*/
|
||||||
export const getCallDocument = (iframe: HTMLIFrameElement): Document | undefined => {
|
export const canDelegateCapability = (): boolean =>
|
||||||
try {
|
typeof navigator !== 'undefined' && 'userAgentData' in navigator;
|
||||||
return iframe.contentDocument ?? iframe.contentWindow?.document ?? undefined;
|
|
||||||
} catch {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -122,11 +122,15 @@ const cleanHref = (href: string): string =>
|
|||||||
stripTrackingOnRender ? stripTrackingParams(href) : href;
|
stripTrackingOnRender ? stripTrackingParams(href) : href;
|
||||||
|
|
||||||
// [Gitea #130] Links to THIS deployment's room routes render and click like
|
// [Gitea #130] Links to THIS deployment's room routes render and click like
|
||||||
// matrix.to links. The base is set once from the client config
|
// matrix.to links. The bases are set once from the client config
|
||||||
// (ClientNonUIFeatures) because this module has no access to hooks.
|
// (ClientNonUIFeatures) because this module has no access to hooks. [Gitea
|
||||||
let lotusPermalinkBase: string | undefined;
|
// #248] Several: the desktop app knows both its local origin and the public web
|
||||||
export const setLotusPermalinkBase = (baseUrl: string | undefined): void => {
|
// app (`webAppUrl`), and people share the public one.
|
||||||
lotusPermalinkBase = baseUrl;
|
let lotusPermalinkBases: string[] = [];
|
||||||
|
export const setLotusPermalinkBase = (baseUrls: string | string[] | undefined): void => {
|
||||||
|
lotusPermalinkBases = (Array.isArray(baseUrls) ? baseUrls : [baseUrls]).filter(
|
||||||
|
(b): b is string => !!b,
|
||||||
|
);
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* The matrix.to form of `href` when it is a matrix.to link or a Lotus
|
* The matrix.to form of `href` when it is a matrix.to link or a Lotus
|
||||||
@@ -134,7 +138,11 @@ export const setLotusPermalinkBase = (baseUrl: string | undefined): void => {
|
|||||||
*/
|
*/
|
||||||
export const toMatrixToHref = (href: string): string | undefined => {
|
export const toMatrixToHref = (href: string): string | undefined => {
|
||||||
if (testMatrixTo(href)) return href;
|
if (testMatrixTo(href)) return href;
|
||||||
return lotusPermalinkBase ? lotusPermalinkToMatrixTo(lotusPermalinkBase, href) : undefined;
|
for (const base of lotusPermalinkBases) {
|
||||||
|
const matrixTo = lotusPermalinkToMatrixTo(base, href);
|
||||||
|
if (matrixTo) return matrixTo;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const LINKIFY_OPTS: LinkifyOpts = {
|
export const LINKIFY_OPTS: LinkifyOpts = {
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { ClientWidgetApi } from 'matrix-widget-api';
|
||||||
|
import { isFromWidgetFrame, restrictWidgetMessages } from './widgetTransport';
|
||||||
|
|
||||||
|
const frame = {} as Window;
|
||||||
|
const other = {} as Window;
|
||||||
|
const ORIGIN = 'https://call.example.org';
|
||||||
|
|
||||||
|
test('isFromWidgetFrame: only the widget frame at its origin', () => {
|
||||||
|
assert.equal(isFromWidgetFrame({ source: frame, origin: ORIGIN }, frame, ORIGIN), true);
|
||||||
|
assert.equal(isFromWidgetFrame({ source: other, origin: ORIGIN }, frame, ORIGIN), false);
|
||||||
|
assert.equal(isFromWidgetFrame({ source: frame, origin: 'null' }, frame, ORIGIN), false);
|
||||||
|
assert.equal(
|
||||||
|
isFromWidgetFrame({ source: frame, origin: 'https://evil.example' }, frame, ORIGIN),
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
assert.equal(isFromWidgetFrame({ source: null, origin: ORIGIN }, null, ORIGIN), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('restrictWidgetMessages swaps the listener and drops foreign messages', () => {
|
||||||
|
const seen: unknown[] = [];
|
||||||
|
const original = (ev: MessageEvent) => {
|
||||||
|
seen.push(ev.data);
|
||||||
|
};
|
||||||
|
const transport = { handleMessage: original };
|
||||||
|
const api = { transport } as unknown as ClientWidgetApi;
|
||||||
|
const iframe = { contentWindow: frame } as HTMLIFrameElement;
|
||||||
|
const listeners = new Set<EventListener>([original as EventListener]);
|
||||||
|
const inbound = {
|
||||||
|
addEventListener: (_t: string, l: EventListener) => listeners.add(l),
|
||||||
|
removeEventListener: (_t: string, l: EventListener) => listeners.delete(l),
|
||||||
|
} as unknown as Window;
|
||||||
|
|
||||||
|
restrictWidgetMessages(api, iframe, ORIGIN, inbound);
|
||||||
|
assert.equal(listeners.has(original as EventListener), false);
|
||||||
|
assert.equal(listeners.size, 1);
|
||||||
|
assert.equal(transport.handleMessage === original, false);
|
||||||
|
|
||||||
|
const dispatch = (ev: Partial<MessageEvent>) =>
|
||||||
|
listeners.forEach((l) => l(ev as unknown as Event));
|
||||||
|
dispatch({ source: other, origin: ORIGIN, data: 'spoof' });
|
||||||
|
dispatch({ source: frame, origin: 'null', data: 'wrong-origin' });
|
||||||
|
dispatch({ source: frame, origin: ORIGIN, data: 'real' });
|
||||||
|
assert.deepEqual(seen, ['real']);
|
||||||
|
});
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { ClientWidgetApi } from 'matrix-widget-api';
|
||||||
|
|
||||||
|
type MessageLike = Pick<MessageEvent, 'source' | 'origin'>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* True when a message came from the widget's own frame, at the origin the
|
||||||
|
* widget was loaded from.
|
||||||
|
*/
|
||||||
|
export const isFromWidgetFrame = (
|
||||||
|
ev: MessageLike,
|
||||||
|
frameWindow: Window | null | undefined,
|
||||||
|
widgetOrigin: string,
|
||||||
|
): boolean => !!frameWindow && ev.source === frameWindow && ev.origin === widgetOrigin;
|
||||||
|
|
||||||
|
type InboundTransport = {
|
||||||
|
handleMessage: (ev: MessageEvent) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* matrix-widget-api's host transport accepts a message from ANY window on the
|
||||||
|
* page as long as it carries the widget's id (its `strictOriginCheck` only
|
||||||
|
* compares against the host's own origin, and is off by default). The call
|
||||||
|
* widget's id is fixed ('call-embed'), so any other frame (a room widget, a
|
||||||
|
* URL-preview embed) could post fromWidget actions as the call: e.g. a fake
|
||||||
|
* push-to-talk keydown turned the user's mic on.
|
||||||
|
*
|
||||||
|
* Swap the transport's listener for one that only lets through messages from
|
||||||
|
* this widget's iframe and origin. `stop()` removes `handleMessage`, which is
|
||||||
|
* the guarded one after this. Call right after `new ClientWidgetApi(...)`,
|
||||||
|
* which has already started the transport.
|
||||||
|
*/
|
||||||
|
export const restrictWidgetMessages = (
|
||||||
|
api: ClientWidgetApi,
|
||||||
|
iframe: HTMLIFrameElement,
|
||||||
|
widgetOrigin: string,
|
||||||
|
inbound: Pick<Window, 'addEventListener' | 'removeEventListener'> = window,
|
||||||
|
): void => {
|
||||||
|
const transport = api.transport as unknown as InboundTransport;
|
||||||
|
const original = transport.handleMessage;
|
||||||
|
const guarded = (ev: MessageEvent) => {
|
||||||
|
if (!isFromWidgetFrame(ev, iframe.contentWindow, widgetOrigin)) return;
|
||||||
|
original(ev);
|
||||||
|
};
|
||||||
|
inbound.removeEventListener('message', original as EventListener);
|
||||||
|
transport.handleMessage = guarded;
|
||||||
|
inbound.addEventListener('message', guarded as EventListener);
|
||||||
|
};
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { KeychainInvoke, sameTokens, syncKeychain, tokensOf } from './keychainMirror';
|
||||||
|
import type { Session } from './sessions';
|
||||||
|
|
||||||
|
const session: Session = {
|
||||||
|
baseUrl: 'https://matrix.example.org',
|
||||||
|
userId: '@alice:example.org',
|
||||||
|
deviceId: 'DEV1',
|
||||||
|
accessToken: 'syt_token',
|
||||||
|
refreshToken: 'mar_refresh',
|
||||||
|
};
|
||||||
|
|
||||||
|
/** An in-memory keychain behind the same commands the desktop app exposes. */
|
||||||
|
const fakeKeychain = (opts: { supported?: boolean; failSet?: boolean; corrupt?: boolean } = {}) => {
|
||||||
|
let stored: unknown = null;
|
||||||
|
const calls: string[] = [];
|
||||||
|
const invoke: KeychainInvoke = async (cmd, args) => {
|
||||||
|
calls.push(cmd);
|
||||||
|
switch (cmd) {
|
||||||
|
case 'secure_session_supported':
|
||||||
|
return opts.supported ?? true;
|
||||||
|
case 'secure_session_get':
|
||||||
|
return stored;
|
||||||
|
case 'secure_session_set':
|
||||||
|
if (opts.failSet) throw new Error('Access is denied.');
|
||||||
|
stored = opts.corrupt ? { ...(args?.tokens as object), accessToken: 'x' } : args?.tokens;
|
||||||
|
return null;
|
||||||
|
case 'secure_session_clear':
|
||||||
|
stored = null;
|
||||||
|
return null;
|
||||||
|
default:
|
||||||
|
throw new Error(`unknown ${cmd}`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
return { invoke, calls, get: () => stored };
|
||||||
|
};
|
||||||
|
|
||||||
|
test('stores the tokens (not the whole session) and verifies them', async () => {
|
||||||
|
const kc = fakeKeychain();
|
||||||
|
assert.deepEqual(await syncKeychain(kc.invoke, session), { state: 'ok' });
|
||||||
|
assert.deepEqual(kc.get(), {
|
||||||
|
userId: '@alice:example.org',
|
||||||
|
deviceId: 'DEV1',
|
||||||
|
accessToken: 'syt_token',
|
||||||
|
refreshToken: 'mar_refresh',
|
||||||
|
});
|
||||||
|
assert.deepEqual(kc.calls, [
|
||||||
|
'secure_session_supported',
|
||||||
|
'secure_session_get',
|
||||||
|
'secure_session_set',
|
||||||
|
'secure_session_get',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('an up-to-date copy is not rewritten', async () => {
|
||||||
|
const kc = fakeKeychain();
|
||||||
|
await syncKeychain(kc.invoke, session);
|
||||||
|
kc.calls.length = 0;
|
||||||
|
assert.deepEqual(await syncKeychain(kc.invoke, session), { state: 'ok' });
|
||||||
|
assert.deepEqual(kc.calls, ['secure_session_supported', 'secure_session_get']);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a token rotation rewrites; no session clears', async () => {
|
||||||
|
const kc = fakeKeychain();
|
||||||
|
await syncKeychain(kc.invoke, session);
|
||||||
|
await syncKeychain(kc.invoke, { ...session, accessToken: 'syt_new', refreshToken: undefined });
|
||||||
|
assert.equal((kc.get() as { accessToken: string }).accessToken, 'syt_new');
|
||||||
|
assert.equal('refreshToken' in (kc.get() as object), false);
|
||||||
|
assert.deepEqual(await syncKeychain(kc.invoke, null), { state: 'cleared' });
|
||||||
|
assert.equal(kc.get(), null);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('unsupported platform: nothing is touched', async () => {
|
||||||
|
const kc = fakeKeychain({ supported: false });
|
||||||
|
assert.deepEqual(await syncKeychain(kc.invoke, session), { state: 'unsupported' });
|
||||||
|
assert.deepEqual(kc.calls, ['secure_session_supported']);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('failures become a status, never an exception', async () => {
|
||||||
|
assert.deepEqual(await syncKeychain(fakeKeychain({ failSet: true }).invoke, session), {
|
||||||
|
state: 'error',
|
||||||
|
error: 'Access is denied.',
|
||||||
|
});
|
||||||
|
assert.deepEqual(await syncKeychain(fakeKeychain({ corrupt: true }).invoke, session), {
|
||||||
|
state: 'error',
|
||||||
|
error: 'read-back did not match',
|
||||||
|
});
|
||||||
|
// The credential store hangs (the support check itself is instant).
|
||||||
|
const hung: KeychainInvoke = async (cmd) =>
|
||||||
|
cmd === 'secure_session_supported'
|
||||||
|
? true
|
||||||
|
: new Promise(() => {
|
||||||
|
/* never settles */
|
||||||
|
});
|
||||||
|
assert.deepEqual(await syncKeychain(hung, session, 50), {
|
||||||
|
state: 'error',
|
||||||
|
error: 'keychain timed out',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a desktop build without the commands reads as unsupported, not an error', async () => {
|
||||||
|
const missingCommand: KeychainInvoke = async (cmd) => {
|
||||||
|
throw new Error(`Command ${cmd} not found`);
|
||||||
|
};
|
||||||
|
assert.deepEqual(await syncKeychain(missingCommand, session), { state: 'unsupported' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('sameTokens compares only the secrets, treating a missing refresh token as absent', () => {
|
||||||
|
const t = tokensOf({ ...session, refreshToken: undefined });
|
||||||
|
assert.equal(sameTokens({ ...t }, t), true);
|
||||||
|
assert.equal(sameTokens({ ...t, refreshToken: undefined }, t), true);
|
||||||
|
assert.equal(sameTokens({ ...t, accessToken: 'other' }, t), false);
|
||||||
|
assert.equal(sameTokens({ ...t, refreshToken: 'r' }, t), false);
|
||||||
|
assert.equal(sameTokens(null, t), false);
|
||||||
|
assert.equal(sameTokens('string', t), false);
|
||||||
|
});
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { getFallbackSession, onSessionPersisted, Session } from './sessions';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #105] Desktop, step 1: mirror the login tokens into the OS keychain.
|
||||||
|
*
|
||||||
|
* The session is still read from localStorage exactly as before; this only
|
||||||
|
* keeps a copy in the keychain (Windows Credential Manager) and checks it by
|
||||||
|
* reading it back, so real installs prove the keychain works before step 2
|
||||||
|
* switches reads over to it. Nothing here can log anyone out: every failure
|
||||||
|
* just records a status for Settings.
|
||||||
|
*
|
||||||
|
* Writes are serialized (a token rotation right after login must not race
|
||||||
|
* the login's write) and time out, so a hung credential store can't pile up.
|
||||||
|
* When there's no session the keychain entry is cleared, which also covers a
|
||||||
|
* logout whose page reload beat the clear.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type KeychainTokens = {
|
||||||
|
userId: string;
|
||||||
|
deviceId: string;
|
||||||
|
accessToken: string;
|
||||||
|
refreshToken?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type KeychainMirrorStatus =
|
||||||
|
| { state: 'idle' }
|
||||||
|
| { state: 'unsupported' }
|
||||||
|
| { state: 'ok' }
|
||||||
|
| { state: 'cleared' }
|
||||||
|
| { state: 'error'; error: string };
|
||||||
|
|
||||||
|
export type KeychainInvoke = (cmd: string, args?: Record<string, unknown>) => Promise<unknown>;
|
||||||
|
|
||||||
|
export const KEYCHAIN_TIMEOUT_MS = 5000;
|
||||||
|
|
||||||
|
export const tokensOf = (session: Session): KeychainTokens => ({
|
||||||
|
userId: session.userId,
|
||||||
|
deviceId: session.deviceId,
|
||||||
|
accessToken: session.accessToken,
|
||||||
|
...(session.refreshToken ? { refreshToken: session.refreshToken } : {}),
|
||||||
|
});
|
||||||
|
|
||||||
|
export const sameTokens = (a: unknown, b: KeychainTokens): boolean => {
|
||||||
|
if (!a || typeof a !== 'object') return false;
|
||||||
|
const t = a as Partial<KeychainTokens>;
|
||||||
|
return (
|
||||||
|
t.userId === b.userId &&
|
||||||
|
t.deviceId === b.deviceId &&
|
||||||
|
t.accessToken === b.accessToken &&
|
||||||
|
(t.refreshToken ?? undefined) === (b.refreshToken ?? undefined)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const withTimeout = <T>(p: Promise<T>, ms: number): Promise<T> =>
|
||||||
|
new Promise<T>((resolve, reject) => {
|
||||||
|
const timer = setTimeout(() => reject(new Error('keychain timed out')), ms);
|
||||||
|
p.then(
|
||||||
|
(v) => {
|
||||||
|
clearTimeout(timer);
|
||||||
|
resolve(v);
|
||||||
|
},
|
||||||
|
(e) => {
|
||||||
|
clearTimeout(timer);
|
||||||
|
reject(e);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
const errorText = (e: unknown): string =>
|
||||||
|
(e instanceof Error ? e.message : String(e)).slice(0, 200);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bring the keychain in line with `session` (null = no session). Reads first
|
||||||
|
* and only writes when the stored copy differs, then verifies by reading back.
|
||||||
|
*/
|
||||||
|
export const syncKeychain = async (
|
||||||
|
invoke: KeychainInvoke,
|
||||||
|
session: Session | null,
|
||||||
|
timeoutMs = KEYCHAIN_TIMEOUT_MS,
|
||||||
|
): Promise<KeychainMirrorStatus> => {
|
||||||
|
// A desktop build without the commands (older than this feature) rejects
|
||||||
|
// the call: that is "not supported", not an error to show the user.
|
||||||
|
let supported: unknown;
|
||||||
|
try {
|
||||||
|
supported = await withTimeout(invoke('secure_session_supported'), timeoutMs);
|
||||||
|
} catch {
|
||||||
|
supported = false;
|
||||||
|
}
|
||||||
|
if (supported !== true) return { state: 'unsupported' };
|
||||||
|
try {
|
||||||
|
if (!session) {
|
||||||
|
await withTimeout(invoke('secure_session_clear'), timeoutMs);
|
||||||
|
return { state: 'cleared' };
|
||||||
|
}
|
||||||
|
const tokens = tokensOf(session);
|
||||||
|
const stored = await withTimeout(invoke('secure_session_get'), timeoutMs);
|
||||||
|
if (sameTokens(stored, tokens)) return { state: 'ok' };
|
||||||
|
await withTimeout(invoke('secure_session_set', { tokens }), timeoutMs);
|
||||||
|
const back = await withTimeout(invoke('secure_session_get'), timeoutMs);
|
||||||
|
if (!sameTokens(back, tokens)) return { state: 'error', error: 'read-back did not match' };
|
||||||
|
return { state: 'ok' };
|
||||||
|
} catch (e) {
|
||||||
|
return { state: 'error', error: errorText(e) };
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let status: KeychainMirrorStatus = { state: 'idle' };
|
||||||
|
const statusListeners = new Set<(s: KeychainMirrorStatus) => void>();
|
||||||
|
const setStatus = (next: KeychainMirrorStatus): void => {
|
||||||
|
status = next;
|
||||||
|
statusListeners.forEach((cb) => cb(next));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getKeychainMirrorStatus = (): KeychainMirrorStatus => status;
|
||||||
|
|
||||||
|
let started = false;
|
||||||
|
|
||||||
|
/** Start mirroring (desktop only; call once at boot). */
|
||||||
|
export const startKeychainMirror = (invoke: KeychainInvoke | undefined): void => {
|
||||||
|
if (!invoke || started) return;
|
||||||
|
started = true;
|
||||||
|
let chain: Promise<unknown> = Promise.resolve();
|
||||||
|
const enqueue = (session: Session | null) => {
|
||||||
|
chain = chain.then(async () => setStatus(await syncKeychain(invoke, session)));
|
||||||
|
};
|
||||||
|
enqueue(getFallbackSession() ?? null);
|
||||||
|
onSessionPersisted((session) => enqueue(session));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useKeychainMirrorStatus = (): KeychainMirrorStatus => {
|
||||||
|
const [value, setValue] = useState(status);
|
||||||
|
useEffect(() => {
|
||||||
|
setValue(status);
|
||||||
|
statusListeners.add(setValue);
|
||||||
|
return () => {
|
||||||
|
statusListeners.delete(setValue);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
return value;
|
||||||
|
};
|
||||||
@@ -36,6 +36,7 @@ test('clearPlaintextCaches removes every plaintext/PII localStorage key', () =>
|
|||||||
store.set('cinny_recent_forward_targets_v1', '[]');
|
store.set('cinny_recent_forward_targets_v1', '[]');
|
||||||
store.set('cinny_recent_gifs_v1', '[]');
|
store.set('cinny_recent_gifs_v1', '[]');
|
||||||
store.set('cinny_recent_stickers_v1', '[]');
|
store.set('cinny_recent_stickers_v1', '[]');
|
||||||
|
store.set('lotus_outbox_v1', '{"userId":"@me:server","entries":[]}');
|
||||||
removed.length = 0;
|
removed.length = 0;
|
||||||
|
|
||||||
clearPlaintextCaches();
|
clearPlaintextCaches();
|
||||||
@@ -47,6 +48,7 @@ test('clearPlaintextCaches removes every plaintext/PII localStorage key', () =>
|
|||||||
'cinny_recent_forward_targets_v1',
|
'cinny_recent_forward_targets_v1',
|
||||||
'cinny_recent_gifs_v1',
|
'cinny_recent_gifs_v1',
|
||||||
'cinny_recent_stickers_v1',
|
'cinny_recent_stickers_v1',
|
||||||
|
'lotus_outbox_v1', // [Gitea #112] unsent message content
|
||||||
]) {
|
]) {
|
||||||
assert.ok(removed.includes(key), `${key} cleared`);
|
assert.ok(removed.includes(key), `${key} cleared`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { clearRecentStickers } from './recentStickers';
|
|||||||
import { clearNavToActivePathStore } from './navToActivePath';
|
import { clearNavToActivePathStore } from './navToActivePath';
|
||||||
import { DRAFT_MSG_KEY_PREFIX } from '../utils/draft';
|
import { DRAFT_MSG_KEY_PREFIX } from '../utils/draft';
|
||||||
import { clearCallSession } from '../utils/callRejoin';
|
import { clearCallSession } from '../utils/callRejoin';
|
||||||
|
import { clearOutbox } from '../utils/outbox';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [Gitea #41] Wipe every persisted composer draft (`draft-msg-<roomId>`). Drafts
|
* [Gitea #41] Wipe every persisted composer draft (`draft-msg-<roomId>`). Drafts
|
||||||
@@ -44,6 +45,7 @@ const clearMsgDrafts = (): void => {
|
|||||||
* - `cinny_recent_forward_targets_v1` — recent forward contact/room graph (PII)
|
* - `cinny_recent_forward_targets_v1` — recent forward contact/room graph (PII)
|
||||||
* - `cinny_recent_gifs_v1` / `cinny_recent_stickers_v1` — media the user sent
|
* - `cinny_recent_gifs_v1` / `cinny_recent_stickers_v1` — media the user sent
|
||||||
* - `navToActivePath<userId>` — per-space last-visited room paths (needs userId)
|
* - `navToActivePath<userId>` — per-space last-visited room paths (needs userId)
|
||||||
|
* - `lotus_outbox_v1` — decrypted content of messages not yet sent ([Gitea #112])
|
||||||
* - `draft-msg-*` — unsent composer drafts (decrypted message text, unscoped by
|
* - `draft-msg-*` — unsent composer drafts (decrypted message text, unscoped by
|
||||||
* user — see [Gitea #41]; previously deliberately preserved across logout
|
* user — see [Gitea #41]; previously deliberately preserved across logout
|
||||||
* (N98), which let the next account on this device see/send a prior user's
|
* (N98), which let the next account on this device see/send a prior user's
|
||||||
@@ -93,6 +95,7 @@ export const clearPlaintextCaches = (userId?: string): void => {
|
|||||||
clearRecentGifs();
|
clearRecentGifs();
|
||||||
clearRecentStickers();
|
clearRecentStickers();
|
||||||
clearMsgDrafts();
|
clearMsgDrafts();
|
||||||
|
clearOutbox();
|
||||||
clearCallSession();
|
clearCallSession();
|
||||||
clearStatusMessage();
|
clearStatusMessage();
|
||||||
if (userId) clearNavToActivePathStore(userId);
|
if (userId) clearNavToActivePathStore(userId);
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import { atom } from 'jotai';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #112] True while the client can't reach the homeserver (sync is
|
||||||
|
* reconnecting / erroring, or the browser reports offline). Messages that
|
||||||
|
* failed for network reasons show "Queued" instead of "Failed to send" while
|
||||||
|
* this is set; the outbox sends them again once it clears.
|
||||||
|
*/
|
||||||
|
export const sendOfflineAtom = atom(false);
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { atom } from 'jotai';
|
||||||
|
import { ServerStatus } from '../utils/kumaStatus';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #124] The homeserver's status from its Kuma status page (null: none
|
||||||
|
* configured, not fetched yet, or Kuma unreachable — all mean "no banner"),
|
||||||
|
* plus whether this client's own connection is currently lost.
|
||||||
|
*/
|
||||||
|
export const serverStatusAtom = atom<{
|
||||||
|
status: ServerStatus | null;
|
||||||
|
syncLost: boolean;
|
||||||
|
/** When this client's connection dropped (ms), null while connected. */
|
||||||
|
lostAt: number | null;
|
||||||
|
}>({
|
||||||
|
status: null,
|
||||||
|
syncLost: false,
|
||||||
|
lostAt: null,
|
||||||
|
});
|
||||||
@@ -432,3 +432,20 @@ test('subscribeSessionChanges ignores unrelated storage keys', () => {
|
|||||||
listeners.forEach((cb) => cb({ key: 'some_unrelated_preference' }));
|
listeners.forEach((cb) => cb({ key: 'some_unrelated_preference' }));
|
||||||
assert.equal(fired, false);
|
assert.equal(fired, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('onSessionPersisted: told about writes and removals; a throwing listener is harmless', async () => {
|
||||||
|
installStorage();
|
||||||
|
const { onSessionPersisted } = await import('./sessions');
|
||||||
|
const seen: (string | null)[] = [];
|
||||||
|
const offBad = onSessionPersisted(() => {
|
||||||
|
throw new Error('boom');
|
||||||
|
});
|
||||||
|
const off = onSessionPersisted((s) => seen.push(s ? s.accessToken : null));
|
||||||
|
setFallbackSession('tok-a', 'DEV', '@a:hs', 'https://hs', { refreshToken: 'ref-a' });
|
||||||
|
removeFallbackSession();
|
||||||
|
off();
|
||||||
|
offBad();
|
||||||
|
setFallbackSession('tok-b', 'DEV', '@a:hs', 'https://hs');
|
||||||
|
assert.deepEqual(seen, ['tok-a', null]);
|
||||||
|
assert.equal(getFallbackSession()?.accessToken, 'tok-b', 'write still happened');
|
||||||
|
});
|
||||||
|
|||||||
@@ -233,6 +233,27 @@ export type SessionStoreName = {
|
|||||||
// crypto: 'crypto-store',
|
// crypto: 'crypto-store',
|
||||||
// } as const;
|
// } as const;
|
||||||
|
|
||||||
|
// [Gitea #105] Listeners told about every session write in THIS tab (login,
|
||||||
|
// token rotation) and removal (logout), e.g. the desktop keychain mirror.
|
||||||
|
// A throwing listener never breaks the write.
|
||||||
|
type PersistListener = (session: Session | null) => void;
|
||||||
|
const persistListeners = new Set<PersistListener>();
|
||||||
|
const notifyPersisted = (session: Session | null): void => {
|
||||||
|
persistListeners.forEach((cb) => {
|
||||||
|
try {
|
||||||
|
cb(session);
|
||||||
|
} catch {
|
||||||
|
/* listener errors must not affect login/logout */
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
export const onSessionPersisted = (cb: PersistListener): (() => void) => {
|
||||||
|
persistListeners.add(cb);
|
||||||
|
return () => {
|
||||||
|
persistListeners.delete(cb);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
// Persist the session. Writes the atomic blob FIRST (so the consistent,
|
// Persist the session. Writes the atomic blob FIRST (so the consistent,
|
||||||
// never-torn copy is established before the multi-key legacy write), then
|
// never-torn copy is established before the multi-key legacy write), then
|
||||||
// dual-writes the legacy keys for rollback safety. Signature is unchanged —
|
// dual-writes the legacy keys for rollback safety. Signature is unchanged —
|
||||||
@@ -249,6 +270,7 @@ export function setFallbackSession(
|
|||||||
localStorage.setItem(SESSION_BLOB_KEY, JSON.stringify(persisted));
|
localStorage.setItem(SESSION_BLOB_KEY, JSON.stringify(persisted));
|
||||||
// Dual-write the legacy keys (removal of this half is a future release).
|
// Dual-write the legacy keys (removal of this half is a future release).
|
||||||
writeLegacyKeys(persisted);
|
writeLegacyKeys(persisted);
|
||||||
|
notifyPersisted(sessionFromPersisted(persisted));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear BOTH the atomic blob and every legacy key so no reader (blob-preferring
|
// Clear BOTH the atomic blob and every legacy key so no reader (blob-preferring
|
||||||
@@ -257,6 +279,7 @@ export const removeFallbackSession = () => {
|
|||||||
localStorage.removeItem(SESSION_BLOB_KEY);
|
localStorage.removeItem(SESSION_BLOB_KEY);
|
||||||
Object.values(LEGACY_KEYS).forEach((key) => localStorage.removeItem(key));
|
Object.values(LEGACY_KEYS).forEach((key) => localStorage.removeItem(key));
|
||||||
Object.values(OIDC_KEYS).forEach((key) => localStorage.removeItem(key));
|
Object.values(OIDC_KEYS).forEach((key) => localStorage.removeItem(key));
|
||||||
|
notifyPersisted(null);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Read the session, preferring the atomic blob. If the blob is absent or
|
// Read the session, preferring the atomic blob. If the blob is absent or
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { getCallInBrowserUrl, resolveWebAppUrl } from './callInBrowser';
|
||||||
|
|
||||||
|
test('resolveWebAppUrl keeps an https origin (+ path) without a trailing slash', () => {
|
||||||
|
assert.equal(resolveWebAppUrl('https://chat.example.org'), 'https://chat.example.org');
|
||||||
|
assert.equal(resolveWebAppUrl('https://chat.example.org/'), 'https://chat.example.org');
|
||||||
|
assert.equal(resolveWebAppUrl('https://example.org/chat/'), 'https://example.org/chat');
|
||||||
|
assert.equal(resolveWebAppUrl('https://chat.example.org/?x=1#y'), 'https://chat.example.org');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('resolveWebAppUrl rejects anything but absolute https', () => {
|
||||||
|
[
|
||||||
|
undefined,
|
||||||
|
null,
|
||||||
|
1,
|
||||||
|
'',
|
||||||
|
' ',
|
||||||
|
'/home',
|
||||||
|
'http://chat.example.org',
|
||||||
|
'not a url',
|
||||||
|
['javascript', 'alert(1)'].join(':'),
|
||||||
|
'data:text/html,x',
|
||||||
|
].forEach((v) => assert.equal(resolveWebAppUrl(v), undefined, String(v)));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('getCallInBrowserUrl points at the room in the web app (no auto-join)', () => {
|
||||||
|
const url = getCallInBrowserUrl('https://chat.example.org', '!room:example.org');
|
||||||
|
assert.equal(url, 'https://chat.example.org/home/!room%3Aexample.org');
|
||||||
|
assert.ok(!/join|call=/i.test(url ?? ''));
|
||||||
|
assert.equal(getCallInBrowserUrl(undefined, '!room:example.org'), undefined);
|
||||||
|
});
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { getLotusRoomPermalink } from '../plugins/lotus-permalink';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The public web app's address from config.json `webAppUrl` (the desktop app
|
||||||
|
* sets it; its own origin is a local server). Absolute https only; anything
|
||||||
|
* else is ignored.
|
||||||
|
*/
|
||||||
|
export const resolveWebAppUrl = (value: unknown): string | undefined => {
|
||||||
|
if (typeof value !== 'string' || value.trim() === '') return undefined;
|
||||||
|
try {
|
||||||
|
const url = new URL(value);
|
||||||
|
if (url.protocol !== 'https:') return undefined;
|
||||||
|
return url.origin + url.pathname.replace(/\/+$/, '');
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Where to send the user to take a call this app can't make: the room in the
|
||||||
|
* web app (they press Join there themselves — never an auto-join link, which
|
||||||
|
* a crafted URL could abuse to open someone's mic).
|
||||||
|
*/
|
||||||
|
export const getCallInBrowserUrl = (
|
||||||
|
webAppUrl: string | undefined,
|
||||||
|
roomId: string,
|
||||||
|
): string | undefined => (webAppUrl ? getLotusRoomPermalink(webAppUrl, roomId) : undefined);
|
||||||
@@ -8,44 +8,96 @@ import {
|
|||||||
formatSkew,
|
formatSkew,
|
||||||
} from './clockSkew';
|
} from './clockSkew';
|
||||||
|
|
||||||
// A live event received when the local clock is `skew` ms ahead of the server:
|
const T = 1_700_000_000_000;
|
||||||
// origin_server_ts = T (server clock), age = a, localTimestamp = (T + a + skew) - a.
|
|
||||||
const feed = (m: ClockSkewMonitor, skew: number, age = 500, t = 1_700_000_000_000) =>
|
|
||||||
m.sample(t, age, t + skew);
|
|
||||||
|
|
||||||
test('needs three samples, then reports the median with direction', () => {
|
/**
|
||||||
|
* A live event received `atSec` seconds into the test, when the local clock is
|
||||||
|
* `skew` ms off the server and the response took `delay` ms to arrive:
|
||||||
|
* localTimestamp − origin_server_ts = skew + delay.
|
||||||
|
*/
|
||||||
|
const feed = (m: ClockSkewMonitor, skew: number, atSec = 0, delay = 0, wallJump = 0) =>
|
||||||
|
m.sample(T, 500, T + skew + delay, { wall: T + atSec * 1000 + wallJump, mono: atSec * 1000 });
|
||||||
|
|
||||||
|
test('behind: reported as soon as there are three samples', () => {
|
||||||
const m = new ClockSkewMonitor();
|
const m = new ClockSkewMonitor();
|
||||||
assert.equal(feed(m, 60_000).skewMs, null);
|
assert.equal(feed(m, -60_000, 0).skewMs, null);
|
||||||
assert.equal(feed(m, 61_000).skewMs, null);
|
assert.equal(feed(m, -61_000, 1).skewMs, null);
|
||||||
const s = feed(m, 59_000);
|
const s = feed(m, -59_000, 2);
|
||||||
assert.equal(s.skewMs, 60_000);
|
assert.equal(s.skewMs, -61_000);
|
||||||
assert.equal(s.warning, true);
|
assert.equal(s.warning, true);
|
||||||
assert.equal(formatSkew(s.skewMs!), '60 seconds ahead');
|
assert.equal(formatSkew(s.skewMs!), '61 seconds behind');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('one bad sample cannot trip the warning (median) and hysteresis clears only under 15 s', () => {
|
test('ahead: only once it has held for a minute', () => {
|
||||||
const m = new ClockSkewMonitor();
|
const m = new ClockSkewMonitor();
|
||||||
feed(m, 1000);
|
feed(m, 60_000, 0);
|
||||||
feed(m, 1500);
|
feed(m, 60_000, 10);
|
||||||
assert.equal(feed(m, 90_000).warning, false); // outlier
|
assert.equal(feed(m, 60_000, 20).warning, false);
|
||||||
assert.equal(m.getState().skewMs, 1500);
|
assert.equal(m.getState().skewMs, 60_000);
|
||||||
|
assert.equal(feed(m, 60_000, 59).warning, false);
|
||||||
|
assert.equal(feed(m, 60_000, 61).warning, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('server stall (2026-09-29): a burst of late events does not read as a wrong clock', () => {
|
||||||
|
const m = new ClockSkewMonitor();
|
||||||
|
// Normal traffic, then the homeserver stalls and one /sync arrives 30 s late
|
||||||
|
// with a pile of events, then normal traffic again.
|
||||||
|
feed(m, 200, 0);
|
||||||
|
feed(m, 150, 5);
|
||||||
|
feed(m, 300, 10);
|
||||||
|
[1, 2, 3, 4, 5, 6].forEach(() => feed(m, 0, 130, 31_000));
|
||||||
|
assert.equal(m.getState().warning, false);
|
||||||
|
assert.ok(m.getState().skewMs! < 1000);
|
||||||
|
|
||||||
|
// Fresh client whose first samples are all from the late burst.
|
||||||
|
const fresh = new ClockSkewMonitor();
|
||||||
|
[1, 2, 3, 4, 5, 6].forEach(() => feed(fresh, 0, 0, 31_000));
|
||||||
|
assert.equal(fresh.getState().warning, false);
|
||||||
|
// …and the next timely event brings the estimate back down.
|
||||||
|
feed(fresh, 0, 70, 100);
|
||||||
|
assert.equal(fresh.getState().warning, false);
|
||||||
|
assert.equal(fresh.getState().skewMs, 100);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('slow deliveries mixed with fast ones: the fastest one wins', () => {
|
||||||
|
const m = new ClockSkewMonitor();
|
||||||
|
[0, 20, 40, 60, 80].forEach((at, i) => feed(m, 45_000, at, i === 2 ? 0 : 20_000));
|
||||||
|
assert.equal(m.getState().skewMs, 45_000);
|
||||||
|
assert.equal(m.getState().warning, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('hysteresis: once on, clears only under 15 s', () => {
|
||||||
const w = new ClockSkewMonitor();
|
const w = new ClockSkewMonitor();
|
||||||
[40_000, 41_000, 39_000, 40_000, 40_000].forEach((s) => feed(w, s));
|
[0, 1, 2].forEach((at) => feed(w, -40_000, at));
|
||||||
assert.equal(w.getState().warning, true);
|
assert.equal(w.getState().warning, true);
|
||||||
// drifting down to 20 s: still >= 15 s → stays on
|
// Samples expire after 5 minutes; drifting to -20 s keeps it on (>= 15 s).
|
||||||
[20_000, 20_000, 20_000, 20_000, 20_000].forEach((s) => feed(w, s));
|
[400, 401, 402].forEach((at) => feed(w, -20_000, at));
|
||||||
|
assert.equal(w.getState().skewMs, -20_000);
|
||||||
assert.equal(w.getState().warning, true);
|
assert.equal(w.getState().warning, true);
|
||||||
[10_000, 10_000, 10_000, 10_000, 10_000].forEach((s) => feed(w, s));
|
[800, 801, 802].forEach((at) => feed(w, -10_000, at));
|
||||||
assert.equal(w.getState().warning, false);
|
assert.equal(w.getState().warning, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('fixing the local clock starts the measurement afresh', () => {
|
||||||
|
const m = new ClockSkewMonitor();
|
||||||
|
[0, 1, 2].forEach((at) => feed(m, -14 * 60_000, at));
|
||||||
|
assert.equal(m.getState().warning, true);
|
||||||
|
// The user sets the clock forward 14 minutes: wall jumps vs the monotonic clock.
|
||||||
|
const jump = 14 * 60_000;
|
||||||
|
feed(m, 0, 10, 0, jump);
|
||||||
|
assert.equal(m.getState().warning, false);
|
||||||
|
assert.equal(m.getState().skewMs, null);
|
||||||
|
feed(m, 0, 11, 0, jump);
|
||||||
|
feed(m, 0, 12, 0, jump);
|
||||||
|
assert.equal(m.getState().skewMs, 0);
|
||||||
|
assert.equal(m.getState().warning, false);
|
||||||
|
});
|
||||||
|
|
||||||
test('stale or missing age is ignored (cache replay must not read as skew)', () => {
|
test('stale or missing age is ignored (cache replay must not read as skew)', () => {
|
||||||
const m = new ClockSkewMonitor();
|
const m = new ClockSkewMonitor();
|
||||||
const t = 1_700_000_000_000;
|
m.sample(T, undefined, T + 3_600_000);
|
||||||
m.sample(t, undefined, t + 3_600_000);
|
m.sample(T, 40 * 24 * 60 * 60 * 1000, T + 3_600_000);
|
||||||
m.sample(t, 40 * 24 * 60 * 60 * 1000, t + 3_600_000);
|
m.sample(T, -5, T);
|
||||||
m.sample(t, -5, t);
|
|
||||||
assert.equal(m.getState().skewMs, null);
|
assert.equal(m.getState().skewMs, null);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -53,10 +105,7 @@ test('subscribe fires on change only; reset clears', () => {
|
|||||||
const m = new ClockSkewMonitor();
|
const m = new ClockSkewMonitor();
|
||||||
const seen: (number | null)[] = [];
|
const seen: (number | null)[] = [];
|
||||||
m.subscribe((s) => seen.push(s.skewMs));
|
m.subscribe((s) => seen.push(s.skewMs));
|
||||||
feed(m, -120_000);
|
[0, 1, 2, 3].forEach((at) => feed(m, -120_000, at));
|
||||||
feed(m, -120_000);
|
|
||||||
feed(m, -120_000);
|
|
||||||
feed(m, -120_000);
|
|
||||||
assert.deepEqual(seen, [-120_000]);
|
assert.deepEqual(seen, [-120_000]);
|
||||||
assert.equal(formatSkew(-120_000), '2 minutes behind');
|
assert.equal(formatSkew(-120_000), '2 minutes behind');
|
||||||
m.reset();
|
m.reset();
|
||||||
|
|||||||
+56
-11
@@ -22,8 +22,23 @@
|
|||||||
|
|
||||||
export const SKEW_WARN_MS = 30_000;
|
export const SKEW_WARN_MS = 30_000;
|
||||||
export const SKEW_CLEAR_MS = 15_000;
|
export const SKEW_CLEAR_MS = 15_000;
|
||||||
export const SKEW_SAMPLES = 5;
|
|
||||||
export const SKEW_MIN_SAMPLES = 3;
|
export const SKEW_MIN_SAMPLES = 3;
|
||||||
|
/** Samples older than this are forgotten. */
|
||||||
|
export const SKEW_WINDOW_MS = 5 * 60 * 1000;
|
||||||
|
export const SKEW_MAX_SAMPLES = 30;
|
||||||
|
/**
|
||||||
|
* "Ahead" must hold across samples received at least this far apart.
|
||||||
|
*
|
||||||
|
* Incident 2026-09-29: the homeserver's host ran out of memory and stalled for
|
||||||
|
* ~2 minutes; the /sync that finally went out carried events whose `age` was
|
||||||
|
* computed ~30 s before it arrived, so every client read "your clock is 30 s
|
||||||
|
* ahead" — while the real problem was the server. A late delivery can only make
|
||||||
|
* the local clock look AHEAD (never behind), so the estimate is the LOWEST
|
||||||
|
* recent sample (the one delivered fastest), and "ahead" has to persist across
|
||||||
|
* a minute of fresh samples before it is reported. "Behind" can't come from a
|
||||||
|
* delay and is reported as soon as there are enough samples.
|
||||||
|
*/
|
||||||
|
export const SKEW_AHEAD_SPAN_MS = 60_000;
|
||||||
/**
|
/**
|
||||||
* Sanity cap on `age`. Old events are still valid samples (the server computes
|
* Sanity cap on `age`. Old events are still valid samples (the server computes
|
||||||
* `age` at response time, so `ts + age` is its clock regardless of the event's
|
* `age` at response time, so `ts + age` is its clock regardless of the event's
|
||||||
@@ -38,14 +53,21 @@ export type ClockSkewState = {
|
|||||||
warning: boolean;
|
warning: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
const median = (xs: number[]): number => {
|
/** A wall-clock change larger than this (vs the monotonic clock) resets the samples. */
|
||||||
const s = [...xs].sort((a, b) => a - b);
|
export const CLOCK_JUMP_MS = 5_000;
|
||||||
const mid = Math.floor(s.length / 2);
|
|
||||||
return s.length % 2 ? s[mid] : (s[mid - 1] + s[mid]) / 2;
|
type Sample = { skew: number; at: number };
|
||||||
|
|
||||||
|
const currentClock = (): { wall: number; mono: number } => {
|
||||||
|
const wall = Date.now();
|
||||||
|
const mono = typeof performance !== 'undefined' ? performance.now() : wall;
|
||||||
|
return { wall, mono };
|
||||||
};
|
};
|
||||||
|
|
||||||
export class ClockSkewMonitor {
|
export class ClockSkewMonitor {
|
||||||
private samples: number[] = [];
|
private samples: Sample[] = [];
|
||||||
|
|
||||||
|
private clockOffset: number | undefined;
|
||||||
|
|
||||||
private state: ClockSkewState = { skewMs: null, warning: false };
|
private state: ClockSkewState = { skewMs: null, warning: false };
|
||||||
|
|
||||||
@@ -64,25 +86,47 @@ export class ClockSkewMonitor {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed one live event. `originServerTs` + `age` come from the event;
|
* Feed one live event. `originServerTs` + `age` come from the event;
|
||||||
* `localTimestamp` is the SDK's `Date.now() − age` at construction.
|
* `localTimestamp` is the SDK's `Date.now() − age` at construction; `clock`
|
||||||
|
* is when the sample was taken: wall clock and a monotonic clock
|
||||||
|
* (performance.now()), so samples are aged by real elapsed time and a change
|
||||||
|
* of the local clock (someone fixing it) starts the measurement afresh.
|
||||||
|
* Only feed events stamped by OUR homeserver: another server's
|
||||||
|
* `origin_server_ts` carries that server's clock.
|
||||||
* Returns the new state (unchanged object when nothing moved).
|
* Returns the new state (unchanged object when nothing moved).
|
||||||
*/
|
*/
|
||||||
public sample(
|
public sample(
|
||||||
originServerTs: number,
|
originServerTs: number,
|
||||||
age: number | undefined,
|
age: number | undefined,
|
||||||
localTimestamp: number,
|
localTimestamp: number,
|
||||||
|
clock: { wall: number; mono: number } = currentClock(),
|
||||||
): ClockSkewState {
|
): ClockSkewState {
|
||||||
if (age === undefined || !Number.isFinite(age) || age < 0 || age > SKEW_MAX_AGE_MS) {
|
if (age === undefined || !Number.isFinite(age) || age < 0 || age > SKEW_MAX_AGE_MS) {
|
||||||
return this.state;
|
return this.state;
|
||||||
}
|
}
|
||||||
if (!Number.isFinite(originServerTs) || !Number.isFinite(localTimestamp)) return this.state;
|
if (!Number.isFinite(originServerTs) || !Number.isFinite(localTimestamp)) return this.state;
|
||||||
this.samples.push(localTimestamp - originServerTs);
|
const now = clock.mono;
|
||||||
if (this.samples.length > SKEW_SAMPLES) this.samples.shift();
|
const offset = clock.wall - clock.mono;
|
||||||
|
if (this.clockOffset !== undefined && Math.abs(offset - this.clockOffset) > CLOCK_JUMP_MS) {
|
||||||
|
// The local clock was changed: earlier samples measured the old clock.
|
||||||
|
this.reset();
|
||||||
|
}
|
||||||
|
this.clockOffset = offset;
|
||||||
|
this.samples.push({ skew: localTimestamp - originServerTs, at: now });
|
||||||
|
this.samples = this.samples.filter((s) => now - s.at <= SKEW_WINDOW_MS);
|
||||||
|
if (this.samples.length > SKEW_MAX_SAMPLES) this.samples.shift();
|
||||||
if (this.samples.length < SKEW_MIN_SAMPLES) return this.state;
|
if (this.samples.length < SKEW_MIN_SAMPLES) return this.state;
|
||||||
|
|
||||||
const skewMs = median(this.samples);
|
// Delivery delay only ever adds to a sample: the smallest is the truest.
|
||||||
|
const skewMs = Math.min(...this.samples.map((s) => s.skew));
|
||||||
const abs = Math.abs(skewMs);
|
const abs = Math.abs(skewMs);
|
||||||
const warning = this.state.warning ? abs >= SKEW_CLEAR_MS : abs > SKEW_WARN_MS;
|
let warning: boolean;
|
||||||
|
if (this.state.warning) warning = abs >= SKEW_CLEAR_MS;
|
||||||
|
else if (skewMs < -SKEW_WARN_MS) warning = true;
|
||||||
|
else if (skewMs > SKEW_WARN_MS) {
|
||||||
|
// Ahead: only if the fastest-delivered samples stayed high for a minute.
|
||||||
|
const span = now - Math.min(...this.samples.map((s) => s.at));
|
||||||
|
warning = span >= SKEW_AHEAD_SPAN_MS;
|
||||||
|
} else warning = false;
|
||||||
if (skewMs === this.state.skewMs && warning === this.state.warning) return this.state;
|
if (skewMs === this.state.skewMs && warning === this.state.warning) return this.state;
|
||||||
this.state = { skewMs, warning };
|
this.state = { skewMs, warning };
|
||||||
this.listeners.forEach((cb) => cb(this.state));
|
this.listeners.forEach((cb) => cb(this.state));
|
||||||
@@ -91,6 +135,7 @@ export class ClockSkewMonitor {
|
|||||||
|
|
||||||
public reset(): void {
|
public reset(): void {
|
||||||
this.samples = [];
|
this.samples = [];
|
||||||
|
this.clockOffset = undefined;
|
||||||
if (this.state.skewMs !== null || this.state.warning) {
|
if (this.state.skewMs !== null || this.state.warning) {
|
||||||
this.state = { skewMs: null, warning: false };
|
this.state = { skewMs: null, warning: false };
|
||||||
this.listeners.forEach((cb) => cb(this.state));
|
this.listeners.forEach((cb) => cb(this.state));
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { afterEach, test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { canCopyImage, copyImageFromUrl, toPngBlob } from './copyImage';
|
||||||
|
|
||||||
|
const g = globalThis as Record<string, unknown>;
|
||||||
|
const saved = {
|
||||||
|
ClipboardItem: Object.getOwnPropertyDescriptor(g, 'ClipboardItem'),
|
||||||
|
navigator: Object.getOwnPropertyDescriptor(g, 'navigator'),
|
||||||
|
fetch: Object.getOwnPropertyDescriptor(g, 'fetch'),
|
||||||
|
};
|
||||||
|
const stub = (key: keyof typeof saved, value: unknown) =>
|
||||||
|
Object.defineProperty(g, key, { value, configurable: true, writable: true });
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
(Object.keys(saved) as (keyof typeof saved)[]).forEach((key) => {
|
||||||
|
const desc = saved[key];
|
||||||
|
if (desc) Object.defineProperty(g, key, desc);
|
||||||
|
else delete g[key];
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
class FakeClipboardItem {
|
||||||
|
constructor(public data: Record<string, Promise<Blob>>) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
test('canCopyImage is false without ClipboardItem', () => {
|
||||||
|
stub('ClipboardItem', undefined);
|
||||||
|
assert.equal(canCopyImage(), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('canCopyImage is true with ClipboardItem and clipboard.write', () => {
|
||||||
|
stub('ClipboardItem', FakeClipboardItem);
|
||||||
|
stub('navigator', { clipboard: { write: async () => undefined } });
|
||||||
|
assert.equal(canCopyImage(), true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('toPngBlob passes a PNG through untouched', async () => {
|
||||||
|
const png = new Blob(['x'], { type: 'image/png' });
|
||||||
|
assert.equal(await toPngBlob(png), png);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('copyImageFromUrl writes a single image/png item', async () => {
|
||||||
|
const png = new Blob(['x'], { type: 'image/png' });
|
||||||
|
stub('fetch', async () => ({ ok: true, blob: async () => png }));
|
||||||
|
stub('ClipboardItem', FakeClipboardItem);
|
||||||
|
const written: FakeClipboardItem[][] = [];
|
||||||
|
stub('navigator', {
|
||||||
|
clipboard: {
|
||||||
|
write: async (items: FakeClipboardItem[]) => {
|
||||||
|
written.push(items);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await copyImageFromUrl('blob:x');
|
||||||
|
assert.equal(written.length, 1);
|
||||||
|
assert.deepEqual(Object.keys(written[0][0].data), ['image/png']);
|
||||||
|
assert.equal(await written[0][0].data['image/png'], png);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('copyImageFromUrl rejects when the fetch fails', async () => {
|
||||||
|
stub('fetch', async () => ({ ok: false, status: 404 }));
|
||||||
|
stub('ClipboardItem', FakeClipboardItem);
|
||||||
|
stub('navigator', {
|
||||||
|
clipboard: {
|
||||||
|
write: async (items: FakeClipboardItem[]) => {
|
||||||
|
await items[0].data['image/png'];
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await assert.rejects(copyImageFromUrl('blob:x'), /404/);
|
||||||
|
});
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
/**
|
||||||
|
* [Gitea #164] Copy an image to the system clipboard.
|
||||||
|
*
|
||||||
|
* The async Clipboard API only guarantees `image/png`, so anything else (JPEG,
|
||||||
|
* WebP, a GIF's first frame) is re-encoded through a canvas first. The blob is
|
||||||
|
* handed to `ClipboardItem` as a promise so the write starts inside the click's
|
||||||
|
* user activation — Safari rejects a write that begins after an await.
|
||||||
|
*/
|
||||||
|
export function canCopyImage(): boolean {
|
||||||
|
return (
|
||||||
|
typeof ClipboardItem !== 'undefined' &&
|
||||||
|
typeof navigator !== 'undefined' &&
|
||||||
|
typeof navigator.clipboard?.write === 'function'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function toPngBlob(blob: Blob): Promise<Blob> {
|
||||||
|
if (blob.type === 'image/png') return blob;
|
||||||
|
const bitmap = await createImageBitmap(blob);
|
||||||
|
try {
|
||||||
|
const canvas = document.createElement('canvas');
|
||||||
|
canvas.width = bitmap.width;
|
||||||
|
canvas.height = bitmap.height;
|
||||||
|
const ctx = canvas.getContext('2d');
|
||||||
|
if (!ctx) throw new Error('no 2d context');
|
||||||
|
ctx.drawImage(bitmap, 0, 0);
|
||||||
|
return await new Promise<Blob>((resolve, reject) => {
|
||||||
|
canvas.toBlob((b) => (b ? resolve(b) : reject(new Error('png encode failed'))), 'image/png');
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
bitmap.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function copyImageFromUrl(url: string): Promise<void> {
|
||||||
|
const png = fetch(url)
|
||||||
|
.then((res) => {
|
||||||
|
if (!res.ok) throw new Error(`fetch failed: ${res.status}`);
|
||||||
|
return res.blob();
|
||||||
|
})
|
||||||
|
.then(toPngBlob);
|
||||||
|
await navigator.clipboard.write([new ClipboardItem({ 'image/png': png })]);
|
||||||
|
}
|
||||||
@@ -0,0 +1,262 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import {
|
||||||
|
DEFAULT_GROUPS,
|
||||||
|
kumaBeatTime,
|
||||||
|
kumaUrls,
|
||||||
|
parseKumaStatus,
|
||||||
|
pickBanner,
|
||||||
|
resolveStatusPage,
|
||||||
|
serverConfirmedUpSince,
|
||||||
|
ServerStatus,
|
||||||
|
} from './kumaStatus';
|
||||||
|
|
||||||
|
// The live `matrix` status page's groups (captured 2026-09-29).
|
||||||
|
const PAGE = {
|
||||||
|
publicGroupList: [
|
||||||
|
{ name: 'Homeserver', monitorList: [{ id: 30, name: 'Synapse HTTP' }] },
|
||||||
|
{
|
||||||
|
name: 'Voice calls',
|
||||||
|
monitorList: [
|
||||||
|
{ id: 37, name: 'Matrix: LiveKit (public /rtc)' },
|
||||||
|
{ id: 38, name: 'Matrix: call tokens (public /sfu/get)' },
|
||||||
|
{ id: 39, name: 'Matrix: call page (call.chat)' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{ name: 'Login', monitorList: [{ id: 15, name: 'Authentication Server' }] },
|
||||||
|
],
|
||||||
|
maintenanceList: [],
|
||||||
|
incidents: [],
|
||||||
|
};
|
||||||
|
const UP = 1;
|
||||||
|
const DOWN = 0;
|
||||||
|
const PENDING = 2;
|
||||||
|
/** Kuma's beat format: "YYYY-MM-DD HH:MM:SS.mmm" in UTC, oldest first. */
|
||||||
|
const beats = (...statuses: number[]) =>
|
||||||
|
statuses.map((status, i) => ({
|
||||||
|
status,
|
||||||
|
time: `2026-09-29 14:${String(10 + i).padStart(2, '0')}:00.000`,
|
||||||
|
msg: '',
|
||||||
|
}));
|
||||||
|
const hb = (over: Record<number, number[]> = {}) => ({
|
||||||
|
heartbeatList: {
|
||||||
|
30: beats(...(over[30] ?? [UP, UP, UP])),
|
||||||
|
37: beats(...(over[37] ?? [UP, UP])),
|
||||||
|
38: beats(...(over[38] ?? [UP, UP])),
|
||||||
|
39: beats(...(over[39] ?? [UP, UP])),
|
||||||
|
15: beats(...(over[15] ?? [UP, UP])),
|
||||||
|
},
|
||||||
|
uptimeList: {},
|
||||||
|
});
|
||||||
|
const parse = (page: unknown, heartbeat: unknown) =>
|
||||||
|
parseKumaStatus(page, heartbeat, DEFAULT_GROUPS);
|
||||||
|
|
||||||
|
test('config: only a valid page for the listed homeserver', () => {
|
||||||
|
const cfg = {
|
||||||
|
'matrix.lotusguild.org': { url: 'https://isitup.lotusguild.org/', slug: 'matrix' },
|
||||||
|
};
|
||||||
|
const page = resolveStatusPage(cfg, 'matrix.lotusguild.org');
|
||||||
|
assert.deepEqual(page, {
|
||||||
|
url: 'https://isitup.lotusguild.org',
|
||||||
|
slug: 'matrix',
|
||||||
|
groups: DEFAULT_GROUPS,
|
||||||
|
});
|
||||||
|
assert.deepEqual(kumaUrls(page!), {
|
||||||
|
page: 'https://isitup.lotusguild.org/api/status-page/matrix',
|
||||||
|
heartbeat: 'https://isitup.lotusguild.org/api/status-page/heartbeat/matrix',
|
||||||
|
});
|
||||||
|
assert.equal(resolveStatusPage(cfg, 'matrix.org'), undefined, 'other homeservers: nothing');
|
||||||
|
assert.equal(resolveStatusPage(cfg, undefined), undefined);
|
||||||
|
assert.equal(resolveStatusPage(undefined, 'matrix.lotusguild.org'), undefined);
|
||||||
|
for (const bad of [
|
||||||
|
{ url: 'http://isitup.lotusguild.org', slug: 'matrix' },
|
||||||
|
{ url: ['javascript', 'alert(1)'].join(':'), slug: 'matrix' },
|
||||||
|
{ url: 'https://isitup.lotusguild.org', slug: '../admin' },
|
||||||
|
{ url: 'https://isitup.lotusguild.org', slug: '' },
|
||||||
|
{ url: 'not a url', slug: 'matrix' },
|
||||||
|
]) {
|
||||||
|
assert.equal(resolveStatusPage({ hs: bad }, 'hs'), undefined, JSON.stringify(bad));
|
||||||
|
}
|
||||||
|
assert.equal(
|
||||||
|
resolveStatusPage({ hs: { url: 'http://localhost:3001', slug: 'm' } }, 'hs')?.url,
|
||||||
|
'http://localhost:3001',
|
||||||
|
'http allowed for local development',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('all green on the live page layout', () => {
|
||||||
|
const s = parse(PAGE, hb());
|
||||||
|
assert.equal(s.homeserver, 'up');
|
||||||
|
assert.equal(s.calls, 'up');
|
||||||
|
assert.equal(s.login, 'up');
|
||||||
|
assert.equal(pickBanner(s, { syncLost: false, where: 'client' }), undefined);
|
||||||
|
assert.equal(pickBanner(s, { syncLost: true, where: 'client' }), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('down needs two failing checks: down+down or pending+down; one blip is not down', () => {
|
||||||
|
assert.equal(parse(PAGE, hb({ 30: [UP, UP, DOWN] })).homeserver, 'up', 'single failure');
|
||||||
|
assert.equal(parse(PAGE, hb({ 30: [UP, PENDING] })).homeserver, 'up', 'pending only');
|
||||||
|
assert.equal(parse(PAGE, hb({ 30: [UP, DOWN, DOWN] })).homeserver, 'down');
|
||||||
|
assert.equal(parse(PAGE, hb({ 30: [UP, PENDING, DOWN] })).homeserver, 'down');
|
||||||
|
assert.equal(parse(PAGE, hb({ 30: [DOWN, DOWN, UP] })).homeserver, 'up', 'recovered');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('any failing monitor takes its group down (one piece breaks calls)', () => {
|
||||||
|
const s = parse(PAGE, hb({ 38: [DOWN, DOWN] }));
|
||||||
|
assert.equal(s.calls, 'down');
|
||||||
|
assert.equal(s.homeserver, 'up');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('unknown when the group or its beats are missing, and unknown shows nothing', () => {
|
||||||
|
const s = parse({ publicGroupList: [] }, hb());
|
||||||
|
assert.deepEqual([s.homeserver, s.calls, s.login], ['unknown', 'unknown', 'unknown']);
|
||||||
|
assert.equal(parse(PAGE, { heartbeatList: {} }).homeserver, 'unknown');
|
||||||
|
assert.equal(pickBanner(s, { syncLost: true, where: 'client' }), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('garbage from Kuma never throws and never shows a banner', () => {
|
||||||
|
for (const [page, heartbeat] of [
|
||||||
|
[null, null],
|
||||||
|
['<html>', 42],
|
||||||
|
[{ publicGroupList: 'x', maintenanceList: {}, incidents: 7 }, { heartbeatList: [] }],
|
||||||
|
[{ publicGroupList: [{ name: 'Homeserver', monitorList: [{ id: {} }] }] }, hb()],
|
||||||
|
]) {
|
||||||
|
const s = parse(page, heartbeat);
|
||||||
|
assert.equal(pickBanner(s, { syncLost: true, where: 'client' }), undefined);
|
||||||
|
}
|
||||||
|
assert.equal(pickBanner(null, { syncLost: true, where: 'client' }), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('beat times are read as UTC; checkedAt is the oldest latest beat', () => {
|
||||||
|
assert.equal(kumaBeatTime('2026-09-29 14:16:11.804'), Date.UTC(2026, 8, 29, 14, 16, 11, 804));
|
||||||
|
assert.equal(kumaBeatTime('nope'), undefined);
|
||||||
|
const s = parse(PAGE, hb());
|
||||||
|
assert.equal(s.homeserverCheckedAt, Date.UTC(2026, 8, 29, 14, 12));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('"your connection" only when Kuma checked AFTER the drop and the server was up', () => {
|
||||||
|
const s = parse(PAGE, hb());
|
||||||
|
const checked = s.homeserverCheckedAt!;
|
||||||
|
assert.equal(serverConfirmedUpSince(s, checked - 60_000), true, 'checked after the drop');
|
||||||
|
assert.equal(serverConfirmedUpSince(s, checked + 1), false, 'stale: checked before the drop');
|
||||||
|
assert.equal(serverConfirmedUpSince(s, null), false, 'not disconnected');
|
||||||
|
const down = parse(PAGE, hb({ 30: [UP, DOWN, DOWN] }));
|
||||||
|
assert.equal(serverConfirmedUpSince(down, checked - 60_000), false);
|
||||||
|
assert.equal(serverConfirmedUpSince(null, 1), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('server down vs having problems depends on this client’s own connection', () => {
|
||||||
|
const s = parse(PAGE, hb({ 30: [DOWN, DOWN] }));
|
||||||
|
assert.equal(pickBanner(s, { syncLost: true, where: 'client' })?.kind, 'server-down');
|
||||||
|
assert.equal(pickBanner(s, { syncLost: true, where: 'client' })?.tone, 'Critical');
|
||||||
|
assert.equal(pickBanner(s, { syncLost: false, where: 'client' })?.kind, 'server-problems');
|
||||||
|
assert.equal(pickBanner(s, { syncLost: false, where: 'login' })?.kind, 'server-down');
|
||||||
|
assert.equal(pickBanner(s, { syncLost: true, where: 'client' })?.dismissable, false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('priority: server > maintenance > calls > announcement; one strip only', () => {
|
||||||
|
const s: ServerStatus = {
|
||||||
|
...parse(PAGE, hb({ 30: [DOWN, DOWN], 37: [DOWN, DOWN] })),
|
||||||
|
maintenance: [{ id: '1', title: 'Upgrade', description: '' }],
|
||||||
|
incidents: [{ id: '2', title: 'Heads up', content: '', style: 'info', updated: 'x' }],
|
||||||
|
};
|
||||||
|
assert.equal(pickBanner(s, { syncLost: true, where: 'client' })?.kind, 'server-down');
|
||||||
|
assert.equal(
|
||||||
|
pickBanner({ ...s, homeserver: 'up' }, { syncLost: false, where: 'client' })?.kind,
|
||||||
|
'maintenance',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
pickBanner({ ...s, homeserver: 'up', maintenance: [] }, { syncLost: false, where: 'client' })
|
||||||
|
?.kind,
|
||||||
|
'calls-down',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
pickBanner(
|
||||||
|
{ ...s, homeserver: 'up', maintenance: [], calls: 'up' },
|
||||||
|
{ syncLost: false, where: 'client' },
|
||||||
|
)?.kind,
|
||||||
|
'announcement',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('calls-down is not shown on the login screen or when the whole server is down', () => {
|
||||||
|
const calls = parse(PAGE, hb({ 37: [DOWN, DOWN] }));
|
||||||
|
assert.equal(pickBanner(calls, { syncLost: false, where: 'login' }), undefined);
|
||||||
|
const both = parse(PAGE, hb({ 30: [DOWN, DOWN], 37: [DOWN, DOWN] }));
|
||||||
|
assert.equal(pickBanner(both, { syncLost: false, where: 'client' })?.kind, 'server-problems');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('login-down only on the login screen', () => {
|
||||||
|
const s = parse(PAGE, hb({ 15: [DOWN, DOWN] }));
|
||||||
|
assert.equal(pickBanner(s, { syncLost: false, where: 'login' })?.kind, 'login-down');
|
||||||
|
assert.equal(pickBanner(s, { syncLost: false, where: 'client' }), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('maintenance: title, end time and plain-text description', () => {
|
||||||
|
const end = '2026-09-29T22:15:00.000Z';
|
||||||
|
const s = parse(
|
||||||
|
{
|
||||||
|
...PAGE,
|
||||||
|
maintenanceList: [
|
||||||
|
{
|
||||||
|
id: 7,
|
||||||
|
title: 'Homeserver upgrade',
|
||||||
|
description: '**Synapse 1.160**, see [notes](https://x)',
|
||||||
|
status: 'under-maintenance',
|
||||||
|
timeslotList: [{ startDate: '2026-09-29T22:00:00.000Z', endDate: end }],
|
||||||
|
},
|
||||||
|
{ id: 8, title: 'Later', status: 'scheduled' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
hb(),
|
||||||
|
);
|
||||||
|
assert.equal(s.maintenance.length, 1, 'only windows under maintenance');
|
||||||
|
assert.equal(s.maintenance[0].end, Date.parse(end));
|
||||||
|
const b = pickBanner(s, { syncLost: false, where: 'client' })!;
|
||||||
|
assert.equal(b.kind, 'maintenance');
|
||||||
|
assert.match(b.text, /^Maintenance in progress until .+: Homeserver upgrade\. /);
|
||||||
|
assert.equal(b.detail, 'Synapse 1.160, see notes');
|
||||||
|
assert.equal(b.dismissable, false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('announcements: tone from style, dismissable, a new edit comes back', () => {
|
||||||
|
const incident = {
|
||||||
|
id: 3,
|
||||||
|
style: 'danger',
|
||||||
|
title: 'Planned maintenance tonight',
|
||||||
|
content: 'Calls will drop briefly.',
|
||||||
|
active: true,
|
||||||
|
createdDate: '2026-09-29 15:00:00',
|
||||||
|
lastUpdatedDate: null,
|
||||||
|
};
|
||||||
|
const s = parse({ ...PAGE, incidents: [incident] }, hb());
|
||||||
|
const b = pickBanner(s, { syncLost: false, where: 'client' })!;
|
||||||
|
assert.equal(b.kind, 'announcement');
|
||||||
|
assert.equal(b.tone, 'Critical');
|
||||||
|
assert.equal(b.dismissable, true);
|
||||||
|
const dismissed = new Set([b.key]);
|
||||||
|
assert.equal(pickBanner(s, { syncLost: false, where: 'client', dismissed }), undefined);
|
||||||
|
const edited = parse(
|
||||||
|
{ ...PAGE, incidents: [{ ...incident, lastUpdatedDate: '2026-09-29 16:00:00' }] },
|
||||||
|
hb(),
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
pickBanner(edited, { syncLost: false, where: 'client', dismissed })?.kind,
|
||||||
|
'announcement',
|
||||||
|
);
|
||||||
|
const inactive = parse({ ...PAGE, incidents: [{ ...incident, active: false }] }, hb());
|
||||||
|
assert.equal(pickBanner(inactive, { syncLost: false, where: 'client' }), undefined);
|
||||||
|
const info = parse({ ...PAGE, incidents: [{ ...incident, style: 'info' }] }, hb());
|
||||||
|
assert.equal(pickBanner(info, { syncLost: false, where: 'client' })?.tone, 'Primary');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a dismissed calls-down banner lets the next one through, never hides server-down', () => {
|
||||||
|
const s = parse(PAGE, hb({ 37: [DOWN, DOWN] }));
|
||||||
|
const dismissed = new Set(['calls-down', 'server-down', 'server-problems']);
|
||||||
|
assert.equal(pickBanner(s, { syncLost: false, where: 'client', dismissed }), undefined);
|
||||||
|
const down = parse(PAGE, hb({ 30: [DOWN, DOWN] }));
|
||||||
|
assert.equal(
|
||||||
|
pickBanner(down, { syncLost: true, where: 'client', dismissed })?.kind,
|
||||||
|
'server-down',
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -0,0 +1,332 @@
|
|||||||
|
/**
|
||||||
|
* [Gitea #124] Homeserver status from an Uptime Kuma status page.
|
||||||
|
*
|
||||||
|
* config.json maps a homeserver to a Kuma status page:
|
||||||
|
* "statusPages": { "matrix.lotusguild.org": { "url": "https://isitup.lotusguild.org",
|
||||||
|
* "slug": "matrix", "groups": { "homeserver": "Homeserver", "calls": "Voice calls",
|
||||||
|
* "login": "Login" } } }
|
||||||
|
* Users of any other homeserver never contact Kuma.
|
||||||
|
*
|
||||||
|
* Kuma 2.x public JSON:
|
||||||
|
* - GET /api/status-page/<slug>: publicGroupList[{name, monitorList[{id}]}],
|
||||||
|
* maintenanceList (only windows UNDER maintenance right now), incidents
|
||||||
|
* (announcements posted on the page).
|
||||||
|
* - GET /api/status-page/heartbeat/<slug>: heartbeatList{<monitorId>: [{status, time}]},
|
||||||
|
* status 0 down, 1 up, 2 pending, 3 maintenance.
|
||||||
|
*
|
||||||
|
* Everything here is pure and defensive: anything unexpected reads as
|
||||||
|
* "unknown", and unknown never shows a banner.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type StatusGroups = { homeserver?: string; calls?: string; login?: string };
|
||||||
|
export type StatusPageConfig = { url: string; slug: string; groups: StatusGroups };
|
||||||
|
|
||||||
|
export type ServiceState = 'up' | 'down' | 'unknown';
|
||||||
|
export type KumaMaintenance = { id: string; title: string; description: string; end?: number };
|
||||||
|
export type KumaIncident = {
|
||||||
|
id: string;
|
||||||
|
title: string;
|
||||||
|
content: string;
|
||||||
|
style: string;
|
||||||
|
updated: string;
|
||||||
|
};
|
||||||
|
export type ServerStatus = {
|
||||||
|
homeserver: ServiceState;
|
||||||
|
/**
|
||||||
|
* When Kuma last checked every homeserver monitor (the OLDEST of their
|
||||||
|
* latest beats, ms). Lets the client tell "Kuma has looked since my
|
||||||
|
* connection dropped and the server was fine" from a stale "up".
|
||||||
|
*/
|
||||||
|
homeserverCheckedAt?: number;
|
||||||
|
calls: ServiceState;
|
||||||
|
login: ServiceState;
|
||||||
|
maintenance: KumaMaintenance[];
|
||||||
|
incidents: KumaIncident[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const DEFAULT_GROUPS: Required<StatusGroups> = {
|
||||||
|
homeserver: 'Homeserver',
|
||||||
|
calls: 'Voice calls',
|
||||||
|
login: 'Login',
|
||||||
|
};
|
||||||
|
|
||||||
|
const obj = (v: unknown): Record<string, unknown> | undefined =>
|
||||||
|
v && typeof v === 'object' && !Array.isArray(v) ? (v as Record<string, unknown>) : undefined;
|
||||||
|
const str = (v: unknown): string => (typeof v === 'string' ? v : '');
|
||||||
|
|
||||||
|
/** The status page for `serverName`, if config.json names a valid one. */
|
||||||
|
export const resolveStatusPage = (
|
||||||
|
statusPages: unknown,
|
||||||
|
serverName: string | undefined,
|
||||||
|
): StatusPageConfig | undefined => {
|
||||||
|
if (!serverName) return undefined;
|
||||||
|
const entry = obj(obj(statusPages)?.[serverName]);
|
||||||
|
if (!entry) return undefined;
|
||||||
|
const slug = str(entry.slug);
|
||||||
|
if (!/^[a-z0-9-]{1,64}$/i.test(slug)) return undefined;
|
||||||
|
try {
|
||||||
|
const url = new URL(str(entry.url));
|
||||||
|
const local = url.hostname === 'localhost' || url.hostname === '127.0.0.1';
|
||||||
|
if (url.protocol !== 'https:' && !(url.protocol === 'http:' && local)) return undefined;
|
||||||
|
const g = obj(entry.groups) ?? {};
|
||||||
|
return {
|
||||||
|
url: url.origin,
|
||||||
|
slug,
|
||||||
|
groups: {
|
||||||
|
homeserver: str(g.homeserver) || DEFAULT_GROUPS.homeserver,
|
||||||
|
calls: str(g.calls) || DEFAULT_GROUPS.calls,
|
||||||
|
login: str(g.login) || DEFAULT_GROUPS.login,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const kumaUrls = (page: StatusPageConfig) => ({
|
||||||
|
page: `${page.url}/api/status-page/${page.slug}`,
|
||||||
|
heartbeat: `${page.url}/api/status-page/heartbeat/${page.slug}`,
|
||||||
|
});
|
||||||
|
|
||||||
|
const DOWN = 0;
|
||||||
|
|
||||||
|
const PENDING = 2;
|
||||||
|
|
||||||
|
/** Kuma beat time ("2026-09-29 14:16:11.804", UTC) → ms. */
|
||||||
|
export const kumaBeatTime = (time: unknown): number | undefined => {
|
||||||
|
const t = Date.parse(`${str(time).trim().replace(' ', 'T')}Z`);
|
||||||
|
return Number.isFinite(t) ? t : undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
const sortedBeats = (list: unknown): Record<string, unknown>[] =>
|
||||||
|
(Array.isArray(list) ? list : [])
|
||||||
|
.map((b) => obj(b))
|
||||||
|
.filter((b): b is Record<string, unknown> => !!b && typeof b.status === 'number')
|
||||||
|
.sort((a, b) => str(a.time).localeCompare(str(b.time)));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A group is down when ANY of its monitors is failing across two checks in a
|
||||||
|
* row: its latest beat is down and the one before is down or pending (Kuma
|
||||||
|
* marks a first failure "pending" when the monitor has a retry). One piece
|
||||||
|
* down, say the call token service, already breaks the feature; two checks so
|
||||||
|
* a single blip doesn't flash a banner. Up when every monitor we have beats
|
||||||
|
* for is fine; unknown when the group or its beats are missing.
|
||||||
|
*/
|
||||||
|
const groupState = (
|
||||||
|
groupName: string | undefined,
|
||||||
|
groups: Map<string, string[]>,
|
||||||
|
beats: Record<string, unknown>,
|
||||||
|
): ServiceState => {
|
||||||
|
if (!groupName) return 'unknown';
|
||||||
|
const ids = groups.get(groupName);
|
||||||
|
if (!ids || ids.length === 0) return 'unknown';
|
||||||
|
let known = 0;
|
||||||
|
let down = false;
|
||||||
|
ids.forEach((id) => {
|
||||||
|
const statuses = sortedBeats(beats[id]).map((b) => b.status as number);
|
||||||
|
if (statuses.length === 0) return;
|
||||||
|
known += 1;
|
||||||
|
const [prev, last] = statuses.slice(-2);
|
||||||
|
if (statuses.length >= 2 && last === DOWN && (prev === DOWN || prev === PENDING)) down = true;
|
||||||
|
});
|
||||||
|
if (down) return 'down';
|
||||||
|
return known > 0 ? 'up' : 'unknown';
|
||||||
|
};
|
||||||
|
|
||||||
|
export const parseKumaStatus = (
|
||||||
|
pageJson: unknown,
|
||||||
|
heartbeatJson: unknown,
|
||||||
|
groupNames: StatusGroups,
|
||||||
|
): ServerStatus => {
|
||||||
|
const page = obj(pageJson) ?? {};
|
||||||
|
const groups = new Map<string, string[]>();
|
||||||
|
(Array.isArray(page.publicGroupList) ? page.publicGroupList : []).forEach((g) => {
|
||||||
|
const group = obj(g);
|
||||||
|
if (!group) return;
|
||||||
|
const ids = (Array.isArray(group.monitorList) ? group.monitorList : [])
|
||||||
|
.map((m) => obj(m)?.id)
|
||||||
|
.filter((id): id is number | string => typeof id === 'number' || typeof id === 'string')
|
||||||
|
.map(String);
|
||||||
|
groups.set(str(group.name), ids);
|
||||||
|
});
|
||||||
|
const beats = obj(obj(heartbeatJson)?.heartbeatList) ?? {};
|
||||||
|
|
||||||
|
const maintenance: KumaMaintenance[] = (
|
||||||
|
Array.isArray(page.maintenanceList) ? page.maintenanceList : []
|
||||||
|
)
|
||||||
|
.map((m) => obj(m))
|
||||||
|
.filter((m): m is Record<string, unknown> => !!m && str(m.title) !== '')
|
||||||
|
.filter((m) => !m.status || m.status === 'under-maintenance')
|
||||||
|
.map((m) => {
|
||||||
|
const slot = obj((Array.isArray(m.timeslotList) ? m.timeslotList : [])[0]);
|
||||||
|
const end = Date.parse(str(slot?.endDate));
|
||||||
|
return {
|
||||||
|
id: String(m.id ?? str(m.title)),
|
||||||
|
title: str(m.title),
|
||||||
|
description: str(m.description),
|
||||||
|
...(Number.isFinite(end) ? { end } : {}),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const incidents: KumaIncident[] = (Array.isArray(page.incidents) ? page.incidents : [])
|
||||||
|
.map((i) => obj(i))
|
||||||
|
.filter((i): i is Record<string, unknown> => !!i && str(i.title) !== '' && i.active !== false)
|
||||||
|
.map((i) => ({
|
||||||
|
id: String(i.id ?? str(i.title)),
|
||||||
|
title: str(i.title),
|
||||||
|
content: str(i.content),
|
||||||
|
style: str(i.style) || 'info',
|
||||||
|
updated: str(i.lastUpdatedDate) || str(i.createdDate),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const hsIds = (groupNames.homeserver && groups.get(groupNames.homeserver)) || [];
|
||||||
|
const hsLatest = hsIds.map((id) => kumaBeatTime(sortedBeats(beats[id]).slice(-1)[0]?.time));
|
||||||
|
const homeserverCheckedAt =
|
||||||
|
hsLatest.length > 0 && hsLatest.every((t): t is number => t !== undefined)
|
||||||
|
? Math.min(...hsLatest)
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
return {
|
||||||
|
homeserver: groupState(groupNames.homeserver, groups, beats),
|
||||||
|
...(homeserverCheckedAt !== undefined ? { homeserverCheckedAt } : {}),
|
||||||
|
calls: groupState(groupNames.calls, groups, beats),
|
||||||
|
login: groupState(groupNames.login, groups, beats),
|
||||||
|
maintenance,
|
||||||
|
incidents,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Kuma checked the homeserver AFTER this client lost its connection, and it
|
||||||
|
* was fine: the problem is more likely on the user's side. A stale "up" from
|
||||||
|
* before the drop proves nothing (Kuma takes a minute or two to notice an
|
||||||
|
* outage), so it doesn't count.
|
||||||
|
*/
|
||||||
|
export const serverConfirmedUpSince = (
|
||||||
|
status: ServerStatus | null | undefined,
|
||||||
|
lostAt: number | null | undefined,
|
||||||
|
): boolean =>
|
||||||
|
!!status &&
|
||||||
|
!!lostAt &&
|
||||||
|
status.homeserver === 'up' &&
|
||||||
|
status.homeserverCheckedAt !== undefined &&
|
||||||
|
status.homeserverCheckedAt > lostAt;
|
||||||
|
|
||||||
|
export type BannerTone = 'Critical' | 'Warning' | 'Primary';
|
||||||
|
export type BannerKind =
|
||||||
|
| 'server-down'
|
||||||
|
| 'server-problems'
|
||||||
|
| 'maintenance'
|
||||||
|
| 'calls-down'
|
||||||
|
| 'announcement'
|
||||||
|
| 'login-down';
|
||||||
|
export type StatusBanner = {
|
||||||
|
kind: BannerKind;
|
||||||
|
/** Stable id for dismissing (announcements come back when edited). */
|
||||||
|
key: string;
|
||||||
|
tone: BannerTone;
|
||||||
|
text: string;
|
||||||
|
detail?: string;
|
||||||
|
dismissable: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatTime = (ms: number): string =>
|
||||||
|
new Date(ms).toLocaleTimeString(undefined, { hour: 'numeric', minute: '2-digit' });
|
||||||
|
|
||||||
|
const incidentTone = (style: string): BannerTone => {
|
||||||
|
if (style === 'danger') return 'Critical';
|
||||||
|
if (style === 'warning') return 'Warning';
|
||||||
|
return 'Primary';
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Markdown-ish incident text as plain text for the Details line. */
|
||||||
|
const plain = (s: string): string =>
|
||||||
|
s
|
||||||
|
.replace(/!\[[^\]]*\]\([^)]*\)/g, '')
|
||||||
|
.replace(/\[([^\]]+)\]\([^)]*\)/g, '$1')
|
||||||
|
.replace(/[*_`#>]/g, '')
|
||||||
|
.replace(/\s+\n/g, '\n')
|
||||||
|
.trim();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The one strip to show, highest priority first. `syncLost`: this client's
|
||||||
|
* connection is reconnecting/erroring. `where`: the logged-in app or the
|
||||||
|
* login screen.
|
||||||
|
*/
|
||||||
|
export const pickBanner = (
|
||||||
|
status: ServerStatus | null | undefined,
|
||||||
|
opts: { syncLost: boolean; where: 'client' | 'login'; dismissed?: ReadonlySet<string> },
|
||||||
|
): StatusBanner | undefined => {
|
||||||
|
if (!status) return undefined;
|
||||||
|
const dismissed = opts.dismissed ?? new Set<string>();
|
||||||
|
const candidates: StatusBanner[] = [];
|
||||||
|
|
||||||
|
if (status.homeserver === 'down') {
|
||||||
|
if (opts.syncLost || opts.where === 'login') {
|
||||||
|
candidates.push({
|
||||||
|
kind: 'server-down',
|
||||||
|
key: 'server-down',
|
||||||
|
tone: 'Critical',
|
||||||
|
text:
|
||||||
|
opts.where === 'login'
|
||||||
|
? "Lotus Chat's server is down. We're on it."
|
||||||
|
: "Lotus Chat's server is down. We're on it, reconnecting…",
|
||||||
|
dismissable: false,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
candidates.push({
|
||||||
|
kind: 'server-problems',
|
||||||
|
key: 'server-problems',
|
||||||
|
tone: 'Warning',
|
||||||
|
text: "Lotus Chat's server is having problems. Messages may be slow to send or arrive.",
|
||||||
|
dismissable: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const maint = status.maintenance[0];
|
||||||
|
if (maint) {
|
||||||
|
const until = maint.end ? ` until ${formatTime(maint.end)}` : '';
|
||||||
|
candidates.push({
|
||||||
|
kind: 'maintenance',
|
||||||
|
key: `maintenance:${maint.id}`,
|
||||||
|
tone: 'Warning',
|
||||||
|
text: `Maintenance in progress${until}: ${maint.title}. Messages and calls may be interrupted.`,
|
||||||
|
detail: plain(maint.description) || undefined,
|
||||||
|
dismissable: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts.where === 'login' && status.login === 'down') {
|
||||||
|
candidates.push({
|
||||||
|
kind: 'login-down',
|
||||||
|
key: 'login-down',
|
||||||
|
tone: 'Warning',
|
||||||
|
text: "Sign-in is having problems right now. If it doesn't work, try again in a few minutes.",
|
||||||
|
dismissable: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts.where === 'client' && status.calls === 'down' && status.homeserver !== 'down') {
|
||||||
|
candidates.push({
|
||||||
|
kind: 'calls-down',
|
||||||
|
key: 'calls-down',
|
||||||
|
tone: 'Warning',
|
||||||
|
text: 'Voice calls are down right now. Messages still work.',
|
||||||
|
dismissable: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
status.incidents.forEach((i) => {
|
||||||
|
candidates.push({
|
||||||
|
kind: 'announcement',
|
||||||
|
key: `announcement:${i.id}:${i.updated}`,
|
||||||
|
tone: incidentTone(i.style),
|
||||||
|
text: i.title,
|
||||||
|
detail: plain(i.content) || undefined,
|
||||||
|
dismissable: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return candidates.find((b) => !(b.dismissable && dismissed.has(b.key)));
|
||||||
|
};
|
||||||
@@ -13,13 +13,16 @@ type ReceiptCall = { eventId: string; receiptType: ReceiptType; unthreaded?: boo
|
|||||||
|
|
||||||
const evt = (id: string, sending = false) => ({ getId: () => id, isSending: () => sending }) as any;
|
const evt = (id: string, sending = false) => ({ getId: () => id, isSending: () => sending }) as any;
|
||||||
|
|
||||||
const thread = (id: string, lastReply: any) => ({ id, lastReply: () => lastReply }) as any;
|
const thread = (id: string, lastReply: any, extra: Record<string, unknown> = {}) =>
|
||||||
|
({ id, lastReply: () => lastReply, ...extra }) as any;
|
||||||
|
|
||||||
type RoomOpts = {
|
type RoomOpts = {
|
||||||
timeline?: any[];
|
timeline?: any[];
|
||||||
readUpTo?: string | null;
|
readUpTo?: string | null;
|
||||||
threads?: any[];
|
threads?: any[];
|
||||||
threadUnread?: Record<string, number>;
|
threadUnread?: Record<string, number>;
|
||||||
|
threadHighlight?: Record<string, number>;
|
||||||
|
readEvents?: string[];
|
||||||
markedUnread?: boolean;
|
markedUnread?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -30,8 +33,12 @@ const setup = (opts: RoomOpts) => {
|
|||||||
getLiveTimeline: () => ({ getEvents: () => opts.timeline ?? [] }),
|
getLiveTimeline: () => ({ getEvents: () => opts.timeline ?? [] }),
|
||||||
getEventReadUpTo: () => opts.readUpTo ?? null,
|
getEventReadUpTo: () => opts.readUpTo ?? null,
|
||||||
getThreads: () => opts.threads ?? [],
|
getThreads: () => opts.threads ?? [],
|
||||||
getThreadUnreadNotificationCount: (threadId: string, _type: NotificationCountType) =>
|
hasUserReadEvent: (_userId: string, eventId: string) =>
|
||||||
opts.threadUnread?.[threadId] ?? 0,
|
(opts.readEvents ?? []).includes(eventId),
|
||||||
|
getThreadUnreadNotificationCount: (threadId: string, type: NotificationCountType) =>
|
||||||
|
(type === NotificationCountType.Highlight ? opts.threadHighlight : opts.threadUnread)?.[
|
||||||
|
threadId
|
||||||
|
] ?? 0,
|
||||||
getAccountData: (type: string) =>
|
getAccountData: (type: string) =>
|
||||||
opts.markedUnread && type === 'm.marked_unread'
|
opts.markedUnread && type === 'm.marked_unread'
|
||||||
? { getContent: () => ({ unread: true }) }
|
? { getContent: () => ({ unread: true }) }
|
||||||
@@ -157,3 +164,127 @@ test('private receipt flag uses ReadPrivate', async () => {
|
|||||||
await markAsRead(mx, '!r:server', true);
|
await markAsRead(mx, '!r:server', true);
|
||||||
assert.equal(calls[0].receiptType, ReceiptType.ReadPrivate);
|
assert.equal(calls[0].receiptType, ReceiptType.ReadPrivate);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// [Gitea #217] A passive read (just looking at the room) keeps threads the user
|
||||||
|
// follows unread; an explicit mark-as-read still clears everything.
|
||||||
|
const sender = (userId: string) => ({ getSender: () => userId });
|
||||||
|
|
||||||
|
test('passive: a thread I replied in stays unread; main receipt is scoped to main', async () => {
|
||||||
|
const mine = thread('$mine', evt('$r1'), { hasCurrentUserParticipated: true });
|
||||||
|
const other = thread('$other', evt('$r2'));
|
||||||
|
const { mx, calls } = setup({
|
||||||
|
timeline: [evt('a'), evt('b')],
|
||||||
|
readUpTo: 'a',
|
||||||
|
threads: [mine, other],
|
||||||
|
threadUnread: { $mine: 1, $other: 1 },
|
||||||
|
});
|
||||||
|
await markAsRead(mx, '!r:server', false, { passive: true });
|
||||||
|
assert.deepEqual(
|
||||||
|
calls.map((c) => [c.eventId, c.unthreaded]),
|
||||||
|
[
|
||||||
|
['b', false], // main-scoped: unthreaded would also read $mine's reply
|
||||||
|
['$r2', false],
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('passive: threads I started or was mentioned in stay unread', async () => {
|
||||||
|
const started = thread('$started', evt('$r1'), { rootEvent: sender('@me:server') });
|
||||||
|
const byTimeline = thread('$t', evt('$r2'), { timeline: [sender('@me:server')] });
|
||||||
|
const mentioned = thread('$mention', evt('$r3'));
|
||||||
|
const { mx, calls } = setup({
|
||||||
|
timeline: [evt('a')],
|
||||||
|
readUpTo: 'a',
|
||||||
|
threads: [started, byTimeline, mentioned],
|
||||||
|
threadUnread: { $started: 1, $t: 1, $mention: 1 },
|
||||||
|
threadHighlight: { $mention: 1 },
|
||||||
|
});
|
||||||
|
await markAsRead(mx, '!r:server', false, { passive: true });
|
||||||
|
assert.equal(calls.length, 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('passive: no followed thread unread → main receipt stays unthreaded', async () => {
|
||||||
|
const other = thread('$other', evt('$r2'), { rootEvent: sender('@bob:server') });
|
||||||
|
const { mx, calls } = setup({
|
||||||
|
timeline: [evt('a'), evt('b')],
|
||||||
|
readUpTo: 'a',
|
||||||
|
threads: [other],
|
||||||
|
threadUnread: { $other: 1 },
|
||||||
|
});
|
||||||
|
await markAsRead(mx, '!r:server', false, { passive: true });
|
||||||
|
assert.deepEqual(
|
||||||
|
calls.map((c) => [c.eventId, c.unthreaded]),
|
||||||
|
[
|
||||||
|
['b', true],
|
||||||
|
['$r2', false],
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('explicit mark as read clears followed threads too', async () => {
|
||||||
|
const mine = thread('$mine', evt('$r1'), { hasCurrentUserParticipated: true });
|
||||||
|
const { mx, calls } = setup({
|
||||||
|
timeline: [evt('a'), evt('b')],
|
||||||
|
readUpTo: 'a',
|
||||||
|
threads: [mine],
|
||||||
|
threadUnread: { $mine: 1 },
|
||||||
|
});
|
||||||
|
await markAsRead(mx, '!r:server', false);
|
||||||
|
assert.deepEqual(
|
||||||
|
calls.map((c) => [c.eventId, c.unthreaded]),
|
||||||
|
[
|
||||||
|
['b', true],
|
||||||
|
['$r1', false],
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('passive: the thread open in the panel is left to the panel', async () => {
|
||||||
|
const open = thread('$open', evt('$r1'));
|
||||||
|
const other = thread('$other', evt('$r2'));
|
||||||
|
const { mx, calls } = setup({
|
||||||
|
timeline: [evt('a')],
|
||||||
|
readUpTo: 'a',
|
||||||
|
threads: [open, other],
|
||||||
|
threadUnread: { $open: 1, $other: 1 },
|
||||||
|
});
|
||||||
|
await markAsRead(mx, '!r:server', false, { passive: true, openThreadId: '$open' });
|
||||||
|
assert.deepEqual(
|
||||||
|
calls.map((c) => c.eventId),
|
||||||
|
['$r2'],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('passive: a followed thread whose count lags is still protected', async () => {
|
||||||
|
// The reply and a newer main message arrived in the same sync; the thread's
|
||||||
|
// count is still 0 but its latest reply (from bob) is unread.
|
||||||
|
const reply = { ...evt('$r1'), getSender: () => '@bob:server' };
|
||||||
|
const mine = thread('$mine', reply, { hasCurrentUserParticipated: true });
|
||||||
|
const { mx, calls } = setup({
|
||||||
|
timeline: [evt('a'), evt('b')],
|
||||||
|
readUpTo: 'a',
|
||||||
|
threads: [mine],
|
||||||
|
threadUnread: { $mine: 0 },
|
||||||
|
});
|
||||||
|
await markAsRead(mx, '!r:server', false, { passive: true });
|
||||||
|
assert.deepEqual(
|
||||||
|
calls.map((c) => [c.eventId, c.unthreaded]),
|
||||||
|
[['b', false]],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('passive: followed thread already read → main receipt stays unthreaded', async () => {
|
||||||
|
const reply = { ...evt('$r1'), getSender: () => '@bob:server' };
|
||||||
|
const mine = thread('$mine', reply, { hasCurrentUserParticipated: true });
|
||||||
|
const { mx, calls } = setup({
|
||||||
|
timeline: [evt('a'), evt('b')],
|
||||||
|
readUpTo: 'a',
|
||||||
|
threads: [mine],
|
||||||
|
readEvents: ['$r1'],
|
||||||
|
});
|
||||||
|
await markAsRead(mx, '!r:server', false, { passive: true });
|
||||||
|
assert.deepEqual(
|
||||||
|
calls.map((c) => [c.eventId, c.unthreaded]),
|
||||||
|
[['b', true]],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|||||||
@@ -1,8 +1,42 @@
|
|||||||
import { MatrixClient, NotificationCountType, ReceiptType } from 'matrix-js-sdk';
|
import { MatrixClient, NotificationCountType, ReceiptType, Room, Thread } from 'matrix-js-sdk';
|
||||||
import { getSettings } from '../state/settings';
|
import { getSettings } from '../state/settings';
|
||||||
import { readMarkedUnread, setMarkedUnread } from '../state/room/markedUnread';
|
import { readMarkedUnread, setMarkedUnread } from '../state/room/markedUnread';
|
||||||
|
|
||||||
export async function markAsRead(mx: MatrixClient, roomId: string, privateReceipt: boolean) {
|
/**
|
||||||
|
* [Gitea #217] Threads the user is following: they started it, replied in it,
|
||||||
|
* or were mentioned in it. `hasCurrentUserParticipated` comes from the server's
|
||||||
|
* thread bundle and lags a reply we just sent, so our own loaded events count too.
|
||||||
|
*/
|
||||||
|
export function isThreadFollowed(room: Room, thread: Thread, userId: string | null): boolean {
|
||||||
|
if (thread.hasCurrentUserParticipated) return true;
|
||||||
|
if (userId && thread.rootEvent?.getSender() === userId) return true;
|
||||||
|
if (userId && thread.timeline?.some((e) => e.getSender() === userId)) return true;
|
||||||
|
return (
|
||||||
|
(room.getThreadUnreadNotificationCount(thread.id, NotificationCountType.Highlight) ?? 0) > 0
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export type MarkAsReadOptions = {
|
||||||
|
/**
|
||||||
|
* [Gitea #217] The read comes from simply looking at the room (timeline at
|
||||||
|
* the bottom and focused), not an explicit "mark as read". Threads the user
|
||||||
|
* follows stay unread until their panel is opened, like Slack and Discord;
|
||||||
|
* the rest are cleared so they don't keep the room dot lit forever.
|
||||||
|
*/
|
||||||
|
passive?: boolean;
|
||||||
|
/**
|
||||||
|
* The thread open in the thread panel, which sends its own receipts; skip it
|
||||||
|
* here so each reply isn't receipted twice.
|
||||||
|
*/
|
||||||
|
openThreadId?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function markAsRead(
|
||||||
|
mx: MatrixClient,
|
||||||
|
roomId: string,
|
||||||
|
privateReceipt: boolean,
|
||||||
|
{ passive = false, openThreadId }: MarkAsReadOptions = {},
|
||||||
|
) {
|
||||||
const { privateReadReceipts } = getSettings();
|
const { privateReadReceipts } = getSettings();
|
||||||
const room = mx.getRoom(roomId);
|
const room = mx.getRoom(roomId);
|
||||||
if (!room) return;
|
if (!room) return;
|
||||||
@@ -29,12 +63,32 @@ export async function markAsRead(mx: MatrixClient, roomId: string, privateReceip
|
|||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const threads = room.getThreads();
|
||||||
|
const threadUnread = (thread: Thread) =>
|
||||||
|
room.getThreadUnreadNotificationCount(thread.id, NotificationCountType.Total) ?? 0;
|
||||||
|
const keepThread = (thread: Thread) => passive && isThreadFollowed(room, thread, mx.getUserId());
|
||||||
|
// [Gitea #217] An unthreaded receipt also reads every thread reply older than
|
||||||
|
// it, so a passive read while a followed thread is unread must stay scoped
|
||||||
|
// to the main timeline or the next main message would clear that thread.
|
||||||
|
// The count can lag: a reply and a newer main message often arrive in the
|
||||||
|
// same sync, before the thread's count is updated, so also ask whether the
|
||||||
|
// latest reply has been read.
|
||||||
|
const myUserId = mx.getUserId();
|
||||||
|
const hasUnreadReply = (thread: Thread) => {
|
||||||
|
if (threadUnread(thread) > 0) return true;
|
||||||
|
const last = thread.lastReply();
|
||||||
|
const lastId = last?.getId();
|
||||||
|
if (!last || !lastId || !myUserId || last.getSender() === myUserId) return false;
|
||||||
|
return !room.hasUserReadEvent(myUserId, lastId);
|
||||||
|
};
|
||||||
|
const keepAnyThread = threads.some((thread) => keepThread(thread) && hasUnreadReply(thread));
|
||||||
|
|
||||||
const latestEvent = timeline.length > 0 ? getLatestValidEvent() : null;
|
const latestEvent = timeline.length > 0 ? getLatestValidEvent() : null;
|
||||||
if (latestEvent) {
|
if (latestEvent) {
|
||||||
// Unthreaded receipt: with client threadSupport enabled the SDK would
|
// Unthreaded receipt: with client threadSupport enabled the SDK would
|
||||||
// otherwise scope this to the main timeline (thread_id: "main"). Unthreaded
|
// otherwise scope this to the main timeline (thread_id: "main"). Unthreaded
|
||||||
// clears the main timeline + every event up to this one.
|
// clears the main timeline + every event up to this one.
|
||||||
await mx.sendReadReceipt(latestEvent, receiptType, true);
|
await mx.sendReadReceipt(latestEvent, receiptType, !keepAnyThread);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear per-thread notification counts too — the room's unread dot sums them,
|
// Clear per-thread notification counts too — the room's unread dot sums them,
|
||||||
@@ -50,12 +104,10 @@ export async function markAsRead(mx: MatrixClient, roomId: string, privateReceip
|
|||||||
// returns null -> the room is reported unread on every mark-read call (this was
|
// returns null -> the room is reported unread on every mark-read call (this was
|
||||||
// the P6 regression, amplified by the bulk mark-all-orphan-rooms-read callers).
|
// the P6 regression, amplified by the bulk mark-all-orphan-rooms-read callers).
|
||||||
// If a thread's replies aren't loaded (lastReply() null), just skip it.
|
// If a thread's replies aren't loaded (lastReply() null), just skip it.
|
||||||
const threads = room.getThreads();
|
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
threads.map((thread) => {
|
threads.map((thread) => {
|
||||||
const unread =
|
if (threadUnread(thread) <= 0) return undefined;
|
||||||
room.getThreadUnreadNotificationCount(thread.id, NotificationCountType.Total) ?? 0;
|
if (keepThread(thread) || thread.id === openThreadId) return undefined;
|
||||||
if (unread <= 0) return undefined;
|
|
||||||
const lastReply = thread.lastReply();
|
const lastReply = thread.lastReply();
|
||||||
if (!lastReply || lastReply.isSending()) return undefined;
|
if (!lastReply || lastReply.isSending()) return undefined;
|
||||||
// Threaded receipt (unthreaded = false → the SDK scopes it to this thread
|
// Threaded receipt (unthreaded = false → the SDK scopes it to this thread
|
||||||
|
|||||||
@@ -0,0 +1,131 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import {
|
||||||
|
OUTBOX_AUTOSEND_MS,
|
||||||
|
OUTBOX_MAX_ENTRIES,
|
||||||
|
OutboxEntry,
|
||||||
|
isRetryableSendError,
|
||||||
|
outboxRetryDelayMs,
|
||||||
|
parseOutbox,
|
||||||
|
planRestore,
|
||||||
|
shouldKeepInOutbox,
|
||||||
|
withEntry,
|
||||||
|
withoutEntry,
|
||||||
|
} from './outbox';
|
||||||
|
|
||||||
|
const entry = (txnId: string, ts: number, roomId = '!a:hs'): OutboxEntry => ({
|
||||||
|
txnId,
|
||||||
|
roomId,
|
||||||
|
threadId: null,
|
||||||
|
type: 'm.room.message',
|
||||||
|
content: { msgtype: 'm.text', body: txnId },
|
||||||
|
ts,
|
||||||
|
});
|
||||||
|
|
||||||
|
test('keeps message-like events, not call signalling or redactions', () => {
|
||||||
|
assert.equal(shouldKeepInOutbox('m.room.message', { body: 'hi' }), true);
|
||||||
|
assert.equal(shouldKeepInOutbox('m.reaction', { 'm.relates_to': { event_id: '$x' } }), true);
|
||||||
|
assert.equal(shouldKeepInOutbox('org.matrix.msc3381.poll.start', {}), true);
|
||||||
|
assert.equal(shouldKeepInOutbox('org.matrix.msc4075.rtc.notification', {}), false);
|
||||||
|
assert.equal(shouldKeepInOutbox('m.call.invite', {}), false);
|
||||||
|
assert.equal(shouldKeepInOutbox('m.room.redaction', {}), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('skips events that point at another unsent message (local id)', () => {
|
||||||
|
assert.equal(
|
||||||
|
shouldKeepInOutbox('m.reaction', { 'm.relates_to': { event_id: '~!a:hs:m123' } }),
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
shouldKeepInOutbox('m.room.message', {
|
||||||
|
body: 'reply',
|
||||||
|
'm.relates_to': { 'm.in_reply_to': { event_id: '~!a:hs:m1' } },
|
||||||
|
}),
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
shouldKeepInOutbox('m.room.message', {
|
||||||
|
body: 'reply',
|
||||||
|
'm.relates_to': { 'm.in_reply_to': { event_id: '$real' } },
|
||||||
|
}),
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('retryable: connection loss, timeouts, rate limits, server errors', () => {
|
||||||
|
const connectionError = new Error('fetch failed');
|
||||||
|
Object.defineProperty(connectionError, 'name', { value: 'ConnectionError' });
|
||||||
|
assert.equal(isRetryableSendError(connectionError), true);
|
||||||
|
assert.equal(isRetryableSendError({ httpStatus: 429 }), true);
|
||||||
|
assert.equal(isRetryableSendError({ httpStatus: 408 }), true);
|
||||||
|
assert.equal(isRetryableSendError({ httpStatus: 502 }), true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('not retryable: client errors, consent, unknown or missing errors', () => {
|
||||||
|
assert.equal(isRetryableSendError({ httpStatus: 403, errcode: 'M_FORBIDDEN' }), false);
|
||||||
|
assert.equal(isRetryableSendError({ httpStatus: 403, errcode: 'M_CONSENT_NOT_GIVEN' }), false);
|
||||||
|
assert.equal(isRetryableSendError({ httpStatus: 400 }), false);
|
||||||
|
assert.equal(isRetryableSendError(new Error('encryption failed')), false);
|
||||||
|
assert.equal(isRetryableSendError(undefined), false);
|
||||||
|
assert.equal(isRetryableSendError(null), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('parse: only this user, only well-formed entries, junk tolerated', () => {
|
||||||
|
const good = entry('m1', 1);
|
||||||
|
const raw = JSON.stringify({ userId: '@me:hs', entries: [good, { txnId: 5 }, null] });
|
||||||
|
assert.deepEqual(parseOutbox(raw, '@me:hs'), [good]);
|
||||||
|
assert.deepEqual(parseOutbox(raw, '@other:hs'), []);
|
||||||
|
assert.deepEqual(parseOutbox('{not json', '@me:hs'), []);
|
||||||
|
assert.deepEqual(parseOutbox(null, '@me:hs'), []);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('withEntry: first write wins, sorted, capped (oldest dropped)', () => {
|
||||||
|
const a = entry('a', 2);
|
||||||
|
let list = withEntry([], a);
|
||||||
|
assert.equal(withEntry(list, { ...a, content: { body: 'changed' } }), list);
|
||||||
|
list = withEntry(list, entry('b', 1));
|
||||||
|
assert.deepEqual(
|
||||||
|
list.map((e) => e.txnId),
|
||||||
|
['b', 'a'],
|
||||||
|
);
|
||||||
|
let many: OutboxEntry[] = [];
|
||||||
|
for (let i = 0; i < OUTBOX_MAX_ENTRIES + 5; i += 1) many = withEntry(many, entry(`t${i}`, i));
|
||||||
|
assert.equal(many.length, OUTBOX_MAX_ENTRIES);
|
||||||
|
assert.equal(many[0].txnId, 't5');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('withoutEntry: removes, and returns the same list when absent', () => {
|
||||||
|
const list = [entry('a', 1), entry('b', 2)];
|
||||||
|
assert.deepEqual(
|
||||||
|
withoutEntry(list, 'a').map((e) => e.txnId),
|
||||||
|
['b'],
|
||||||
|
);
|
||||||
|
assert.equal(withoutEntry(list, 'zzz'), list);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('restore plan: drops delivered / left rooms, auto-sends only recent ones', () => {
|
||||||
|
const now = 10 * OUTBOX_AUTOSEND_MS;
|
||||||
|
const recent = entry('recent', now - 60_000);
|
||||||
|
const old = entry('old', now - OUTBOX_AUTOSEND_MS - 1);
|
||||||
|
const delivered = entry('delivered', now - 1000);
|
||||||
|
const left = entry('left', now - 1000, '!left:hs');
|
||||||
|
const plan = planRestore(
|
||||||
|
[recent, left, old, delivered],
|
||||||
|
now,
|
||||||
|
(roomId) => roomId !== '!left:hs',
|
||||||
|
(e) => e.txnId === 'delivered',
|
||||||
|
);
|
||||||
|
assert.deepEqual(
|
||||||
|
plan.restore.map((e) => e.txnId),
|
||||||
|
['old', 'recent'],
|
||||||
|
);
|
||||||
|
assert.deepEqual([...plan.autoSend], ['recent']);
|
||||||
|
assert.deepEqual(plan.drop.map((e) => e.txnId).sort(), ['delivered', 'left']);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('blip retry delay backs off and is capped at a minute', () => {
|
||||||
|
assert.deepEqual(
|
||||||
|
[0, 1, 2, 3, 4, 9].map(outboxRetryDelayMs),
|
||||||
|
[5000, 10000, 20000, 40000, 60000, 60000],
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
import { IContent } from 'matrix-js-sdk';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #112] Offline outbox: unsent messages survive a reload and are
|
||||||
|
* retried when the connection comes back.
|
||||||
|
*
|
||||||
|
* The SDK keeps local echoes in memory only (chronological pending ordering),
|
||||||
|
* so a reload used to drop every message that hadn't reached the server. Each
|
||||||
|
* own message send is mirrored here (type + clear content + txnId) from its
|
||||||
|
* first local echo until the server confirms it or the user cancels it. On
|
||||||
|
* the next start it is put back as a failed local echo (Retry / Cancel as
|
||||||
|
* usual) and, if it's recent, sent again with the SAME txnId — the server
|
||||||
|
* deduplicates a transaction it already accepted.
|
||||||
|
*
|
||||||
|
* The content is the decrypted message, like a composer draft: it lives in
|
||||||
|
* localStorage until sent and is wiped on logout (clearPlaintextCaches).
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type OutboxEntry = {
|
||||||
|
txnId: string;
|
||||||
|
roomId: string;
|
||||||
|
threadId: string | null;
|
||||||
|
type: string;
|
||||||
|
content: IContent;
|
||||||
|
/** When the message was first sent (local echo timestamp, ms). */
|
||||||
|
ts: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
type Stored = { userId: string; entries: OutboxEntry[] };
|
||||||
|
|
||||||
|
const STORAGE_KEY = 'lotus_outbox_v1';
|
||||||
|
/** Hard cap so a long offline stretch can't grow localStorage without bound. */
|
||||||
|
export const OUTBOX_MAX_ENTRIES = 100;
|
||||||
|
/**
|
||||||
|
* Restored messages younger than this are sent again automatically after a
|
||||||
|
* reload; older ones come back as "Failed to send" and wait for the user
|
||||||
|
* (sending a message typed hours ago without asking would surprise people).
|
||||||
|
*/
|
||||||
|
export const OUTBOX_AUTOSEND_MS = 60 * 60 * 1000;
|
||||||
|
/** Auto-retries per message per session (one per reconnect). */
|
||||||
|
export const OUTBOX_MAX_AUTO_RETRIES = 10;
|
||||||
|
|
||||||
|
/** Delay before automatic retry number `attempt` (0-based) after a blip. */
|
||||||
|
export const outboxRetryDelayMs = (attempt: number): number =>
|
||||||
|
Math.min(5000 * 2 ** Math.max(0, attempt), 60_000);
|
||||||
|
|
||||||
|
/** Message-like events worth keeping. Not call signalling, not redactions. */
|
||||||
|
export const OUTBOX_EVENT_TYPES: ReadonlySet<string> = new Set([
|
||||||
|
'm.room.message',
|
||||||
|
'm.sticker',
|
||||||
|
'm.reaction',
|
||||||
|
'm.poll.start',
|
||||||
|
'm.poll.response',
|
||||||
|
'm.poll.end',
|
||||||
|
'org.matrix.msc3381.poll.start',
|
||||||
|
'org.matrix.msc3381.poll.response',
|
||||||
|
'org.matrix.msc3381.poll.end',
|
||||||
|
]);
|
||||||
|
|
||||||
|
const relatesToPendingEvent = (content: IContent): boolean => {
|
||||||
|
const rel = content['m.relates_to'] as
|
||||||
|
| { event_id?: unknown; 'm.in_reply_to'?: { event_id?: unknown } }
|
||||||
|
| undefined;
|
||||||
|
const ids = [rel?.event_id, rel?.['m.in_reply_to']?.event_id];
|
||||||
|
// A local echo's id ("~!room:txn") means nothing after a reload.
|
||||||
|
return ids.some((id) => typeof id === 'string' && id.startsWith('~'));
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Whether a send should be mirrored into the outbox. */
|
||||||
|
export const shouldKeepInOutbox = (type: string, content: IContent): boolean =>
|
||||||
|
OUTBOX_EVENT_TYPES.has(type) && !relatesToPendingEvent(content);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A failure the network is to blame for: no connection (the SDK's
|
||||||
|
* ConnectionError), a timeout, rate limiting or a server error. Anything else
|
||||||
|
* (403, consent, bad request, encryption failure) needs the user.
|
||||||
|
*/
|
||||||
|
export const isRetryableSendError = (err: unknown): boolean => {
|
||||||
|
if (!err || typeof err !== 'object') return false;
|
||||||
|
const { name, httpStatus } = err as { name?: unknown; httpStatus?: unknown };
|
||||||
|
if (name === 'ConnectionError') return true;
|
||||||
|
if (typeof httpStatus !== 'number') return false;
|
||||||
|
return httpStatus === 408 || httpStatus === 429 || httpStatus >= 500;
|
||||||
|
};
|
||||||
|
|
||||||
|
const isEntry = (e: unknown): e is OutboxEntry => {
|
||||||
|
if (!e || typeof e !== 'object') return false;
|
||||||
|
const o = e as Record<string, unknown>;
|
||||||
|
return (
|
||||||
|
typeof o.txnId === 'string' &&
|
||||||
|
typeof o.roomId === 'string' &&
|
||||||
|
(o.threadId === null || typeof o.threadId === 'string') &&
|
||||||
|
typeof o.type === 'string' &&
|
||||||
|
!!o.content &&
|
||||||
|
typeof o.content === 'object' &&
|
||||||
|
typeof o.ts === 'number'
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Parse the stored outbox, keeping only this user's well-formed entries. */
|
||||||
|
export const parseOutbox = (raw: string | null, userId: string): OutboxEntry[] => {
|
||||||
|
if (!raw) return [];
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(raw) as Partial<Stored>;
|
||||||
|
if (parsed.userId !== userId || !Array.isArray(parsed.entries)) return [];
|
||||||
|
return parsed.entries.filter(isEntry);
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Add (or keep) an entry: first write wins, oldest dropped past the cap. */
|
||||||
|
export const withEntry = (entries: OutboxEntry[], entry: OutboxEntry): OutboxEntry[] => {
|
||||||
|
if (entries.some((e) => e.txnId === entry.txnId)) return entries;
|
||||||
|
const next = [...entries, entry].sort((a, b) => a.ts - b.ts);
|
||||||
|
return next.length > OUTBOX_MAX_ENTRIES ? next.slice(next.length - OUTBOX_MAX_ENTRIES) : next;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const withoutEntry = (entries: OutboxEntry[], txnId: string): OutboxEntry[] =>
|
||||||
|
entries.some((e) => e.txnId === txnId) ? entries.filter((e) => e.txnId !== txnId) : entries;
|
||||||
|
|
||||||
|
export type RestorePlan = {
|
||||||
|
/** Put back as failed local echoes, oldest first. */
|
||||||
|
restore: OutboxEntry[];
|
||||||
|
/** Subset of `restore` to send again right away. */
|
||||||
|
autoSend: Set<string>;
|
||||||
|
/** Already delivered or no longer sendable: forget them. */
|
||||||
|
drop: OutboxEntry[];
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decide what to do with the stored outbox on start.
|
||||||
|
* `canSend(roomId)`: the user is still joined; `delivered(entry)`: the
|
||||||
|
* server already has it (the transaction id came back down /sync).
|
||||||
|
*/
|
||||||
|
export const planRestore = (
|
||||||
|
entries: OutboxEntry[],
|
||||||
|
now: number,
|
||||||
|
canSend: (roomId: string) => boolean,
|
||||||
|
delivered: (entry: OutboxEntry) => boolean,
|
||||||
|
): RestorePlan => {
|
||||||
|
const restore: OutboxEntry[] = [];
|
||||||
|
const autoSend = new Set<string>();
|
||||||
|
const drop: OutboxEntry[] = [];
|
||||||
|
[...entries]
|
||||||
|
.sort((a, b) => a.ts - b.ts)
|
||||||
|
.forEach((entry) => {
|
||||||
|
if (!canSend(entry.roomId) || delivered(entry)) {
|
||||||
|
drop.push(entry);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
restore.push(entry);
|
||||||
|
if (now - entry.ts < OUTBOX_AUTOSEND_MS) autoSend.add(entry.txnId);
|
||||||
|
});
|
||||||
|
return { restore, autoSend, drop };
|
||||||
|
};
|
||||||
|
|
||||||
|
export const loadOutbox = (userId: string): OutboxEntry[] => {
|
||||||
|
try {
|
||||||
|
return parseOutbox(localStorage.getItem(STORAGE_KEY), userId);
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const saveOutbox = (userId: string, entries: OutboxEntry[]): void => {
|
||||||
|
try {
|
||||||
|
if (entries.length === 0) localStorage.removeItem(STORAGE_KEY);
|
||||||
|
else localStorage.setItem(STORAGE_KEY, JSON.stringify({ userId, entries } satisfies Stored));
|
||||||
|
} catch {
|
||||||
|
// Storage full or blocked: the outbox is best-effort.
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Wipe the outbox (logout): it holds decrypted message content. */
|
||||||
|
export const clearOutbox = (): void => {
|
||||||
|
try {
|
||||||
|
localStorage.removeItem(STORAGE_KEY);
|
||||||
|
} catch {
|
||||||
|
/* localStorage unavailable — nothing to clear */
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -55,3 +55,36 @@ test('manual download link: Windows gets the installer, others the release page'
|
|||||||
);
|
);
|
||||||
assert.equal(manualDownloadUrl('Mozilla/5.0 (X11; Linux x86_64)'), MANUAL_DOWNLOAD_URL.other);
|
assert.equal(manualDownloadUrl('Mozilla/5.0 (X11; Linux x86_64)'), MANUAL_DOWNLOAD_URL.other);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('install kinds: anything unknown keeps the in-app updater', async () => {
|
||||||
|
const { toInstallKind } = await import('./updateErrors');
|
||||||
|
assert.equal(toInstallKind('pacman'), 'pacman');
|
||||||
|
assert.equal(toInstallKind('deb'), 'deb');
|
||||||
|
assert.equal(toInstallKind('manual'), 'manual');
|
||||||
|
assert.equal(toInstallKind('in-app'), 'in-app');
|
||||||
|
assert.equal(toInstallKind(undefined), 'in-app', 'older desktop build without the command');
|
||||||
|
assert.equal(toInstallKind('rpm'), 'in-app');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('package installs get their package manager’s command, not an Install button', async () => {
|
||||||
|
const { packageUpdateHelp, isPackageManagedError } = await import('./updateErrors');
|
||||||
|
const pacman = packageUpdateHelp('pacman')!;
|
||||||
|
// Not `pacman -U <url>`: that also wants `<url>.sig`, which we don't publish.
|
||||||
|
assert.equal(
|
||||||
|
pacman.command,
|
||||||
|
'curl -LO https://code.lotusguild.org/LotusGuild/cinny-desktop/releases/download/latest/LotusChat-x86_64.pkg.tar.zst && sudo pacman -U ./LotusChat-x86_64.pkg.tar.zst',
|
||||||
|
);
|
||||||
|
assert.match(pacman.url, /LotusChat-x86_64\.pkg\.tar\.zst$/);
|
||||||
|
const deb = packageUpdateHelp('deb')!;
|
||||||
|
assert.match(deb.command!, /sudo apt install \.\/LotusChat-x86_64\.deb$/);
|
||||||
|
assert.equal(packageUpdateHelp('manual')?.command, undefined);
|
||||||
|
assert.equal(packageUpdateHelp('in-app'), undefined);
|
||||||
|
assert.equal(
|
||||||
|
isPackageManagedError('package-managed (pacman): update Lotus Chat with your package manager'),
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
isPackageManagedError('Permission denied (os error 13) at path "/usr/bin/tauri_current_app"'),
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|||||||
@@ -47,3 +47,46 @@ export const describeUpdateError = (phase: UpdatePhase, message: string): string
|
|||||||
}
|
}
|
||||||
return 'The update downloaded but couldn’t be installed. Download the installer yourself and run it; your chats and settings are kept.';
|
return 'The update downloaded but couldn’t be installed. Download the installer yourself and run it; your chats and settings are kept.';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How this desktop install gets updated (cinny-desktop `update_install_kind`).
|
||||||
|
* Linux package installs can't be replaced in place by the in-app updater
|
||||||
|
* (it tried to write into /usr/bin: "Permission denied (os error 13)"), so
|
||||||
|
* they get their package manager's command instead of an Install button.
|
||||||
|
*/
|
||||||
|
export type InstallKind = 'in-app' | 'pacman' | 'deb' | 'manual';
|
||||||
|
|
||||||
|
const RELEASE_DOWNLOAD =
|
||||||
|
'https://code.lotusguild.org/LotusGuild/cinny-desktop/releases/download/latest';
|
||||||
|
|
||||||
|
export const toInstallKind = (value: unknown): InstallKind =>
|
||||||
|
value === 'pacman' || value === 'deb' || value === 'manual' ? value : 'in-app';
|
||||||
|
|
||||||
|
export type PackageUpdateHelp = { command?: string; url: string; download: string };
|
||||||
|
|
||||||
|
export const packageUpdateHelp = (kind: InstallKind): PackageUpdateHelp | undefined => {
|
||||||
|
if (kind === 'pacman') {
|
||||||
|
const url = `${RELEASE_DOWNLOAD}/LotusChat-x86_64.pkg.tar.zst`;
|
||||||
|
// Download first, then install the local file: `pacman -U <url>` also
|
||||||
|
// fetches `<url>.sig` and fails without it (we don't sign packages),
|
||||||
|
// while a local file falls under LocalFileSigLevel (signature optional).
|
||||||
|
return {
|
||||||
|
command: `curl -LO ${url} && sudo pacman -U ./LotusChat-x86_64.pkg.tar.zst`,
|
||||||
|
url,
|
||||||
|
download: 'Download package',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'deb') {
|
||||||
|
const url = `${RELEASE_DOWNLOAD}/LotusChat-x86_64.deb`;
|
||||||
|
return {
|
||||||
|
command: `curl -LO ${url} && sudo apt install ./LotusChat-x86_64.deb`,
|
||||||
|
url,
|
||||||
|
download: 'Download package',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'manual') return { url: MANUAL_DOWNLOAD_URL.other, download: 'Open downloads' };
|
||||||
|
return undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The native side refuses an in-app install on a package install. */
|
||||||
|
export const isPackageManagedError = (message: string): boolean => /package-managed/.test(message);
|
||||||
|
|||||||
@@ -17,10 +17,16 @@ import App from './app/pages/App';
|
|||||||
import './app/i18n';
|
import './app/i18n';
|
||||||
import { pushSessionToSW } from './sw-session';
|
import { pushSessionToSW } from './sw-session';
|
||||||
import { getFallbackSession } from './app/state/sessions';
|
import { getFallbackSession } from './app/state/sessions';
|
||||||
|
import { startKeychainMirror } from './app/state/keychainMirror';
|
||||||
|
import { tauriInvoke } from './app/hooks/useTauri';
|
||||||
import { cleanupSearchCacheIfSignedOut } from './client/initMatrix';
|
import { cleanupSearchCacheIfSignedOut } from './client/initMatrix';
|
||||||
|
|
||||||
document.body.classList.add(configClass, varsClass);
|
document.body.classList.add(configClass, varsClass);
|
||||||
|
|
||||||
|
// [Gitea #105] Desktop: keep a copy of the login tokens in the OS keychain
|
||||||
|
// (step 1: mirror only; the session is still read from localStorage).
|
||||||
|
startKeychainMirror(tauriInvoke());
|
||||||
|
|
||||||
// Register Service Worker
|
// Register Service Worker
|
||||||
// Service workers only register on http(s) pages. The desktop app loads from
|
// Service workers only register on http(s) pages. The desktop app loads from
|
||||||
// `tauri://localhost` in debug builds (and on any platform where the localhost
|
// `tauri://localhost` in debug builds (and on any platform where the localhost
|
||||||
|
|||||||
@@ -898,6 +898,14 @@ globalStyle(
|
|||||||
boxShadow: '0 0 10px rgba(255,107,0,0.10)',
|
boxShadow: '0 0 10px rgba(255,107,0,0.10)',
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
// [Gitea #246] The poll's winning answer (after it ends).
|
||||||
|
globalStyle(
|
||||||
|
`body.${lotusTerminalBodyClass} [data-poll-content] [data-poll-answer][data-winner="true"]`,
|
||||||
|
{
|
||||||
|
border: '1px solid rgba(0,255,136,0.55) !important',
|
||||||
|
boxShadow: '0 0 10px rgba(0,255,136,0.10)',
|
||||||
|
},
|
||||||
|
);
|
||||||
globalStyle(`body.${lotusTerminalBodyClass} [data-poll-content] [data-poll-content-label]`, {
|
globalStyle(`body.${lotusTerminalBodyClass} [data-poll-content] [data-poll-content-label]`, {
|
||||||
color: 'rgba(0,212,255,0.60) !important',
|
color: 'rgba(0,212,255,0.60) !important',
|
||||||
opacity: '1 !important',
|
opacity: '1 !important',
|
||||||
|
|||||||
Reference in New Issue
Block a user