Compare commits

..
Author SHA1 Message Date
Lotus CIandClaude Opus 5.5 888ed1a66c fix(lotus): soundboard says "not permitted" in audio-only rooms instead of failing silently (#47)
CI / Publish to Gitea npm registry (pull_request) Skipped
CI / Build embedded bundle (pull_request) Successful in 3m20s
Clips publish as an Unknown-source track. In audio-only rooms the guard
signs a microphone-only token, LiveKit refuses the publish, and since
the fork had already replied {} the host never heard. Check the grants
up front and reply { played: false, reason: "not_permitted" }.

Refs #47

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5
2026-10-18 01:22:49 -04:00
5 changed files with 44 additions and 37 deletions
-2
View File
@@ -34,7 +34,6 @@ describe("LotusWidgetActions", () => {
LotusWidgetActions.SetHotkeys,
LotusWidgetActions.SetFrameScreenshare,
LotusWidgetActions.PromptScreenshare,
LotusWidgetActions.Reconnect,
];
expect(new Set(LOTUS_TO_WIDGET_ACTIONS)).toEqual(new Set(expectedToWidget));
@@ -57,6 +56,5 @@ describe("LotusWidgetActions", () => {
);
expect(LOTUS_TO_WIDGET_ACTIONS).not.toContain(LotusWidgetActions.MicLevel);
expect(LOTUS_TO_WIDGET_ACTIONS).not.toContain(LotusWidgetActions.Hotkey);
expect(LOTUS_TO_WIDGET_ACTIONS).not.toContain(LotusWidgetActions.CallError);
});
});
-9
View File
@@ -116,14 +116,6 @@ export enum LotusWidgetActions {
* only when it changes (≤ 10 Hz); 0 while muted or with no mic.
*/
MicLevel = "io.lotus.mic_level",
/**
* fromWidget: the call's error page is up (`{ code, recoverable }`) or
* cleared (`{ code: null }`) (cinny #318), so the host stops showing the call
* as joined after "Connection lost".
*/
CallError = "io.lotus.call_error",
/** toWidget: press the error page's Reconnect / Try again (cinny #318). */
Reconnect = "io.lotus.reconnect",
}
/** toWidget Lotus actions that must be allow-listed in `initializeWidget`. */
@@ -141,5 +133,4 @@ export const LOTUS_TO_WIDGET_ACTIONS: LotusWidgetActions[] = [
LotusWidgetActions.SetHotkeys,
LotusWidgetActions.SetFrameScreenshare,
LotusWidgetActions.PromptScreenshare,
LotusWidgetActions.Reconnect,
];
+15
View File
@@ -11,6 +11,7 @@ import { of } from "rxjs";
import { type CallViewModel } from "../state/CallViewModel/CallViewModel";
import {
canPublishSoundboard,
MAX_INJECT_BYTES,
parseInjectSource,
startLotusAudioInject,
@@ -258,3 +259,17 @@ test("parseInjectSource rejects oversized or non-buffer audio", () => {
expect(parseInjectSource({ audio: "not bytes" })).toBeNull();
expect(parseInjectSource({ audio: new Uint8Array(4) })).toBeNull();
});
test("canPublishSoundboard: refused by a microphone-only grant (EC #47)", () => {
expect(canPublishSoundboard(undefined)).toBe(true);
expect(
canPublishSoundboard({ canPublish: true, canPublishSources: [] }),
).toBe(true);
expect(
canPublishSoundboard({ canPublish: true, canPublishSources: [2] }),
).toBe(false);
expect(
canPublishSoundboard({ canPublish: true, canPublishSources: [2, 0] }),
).toBe(true);
expect(canPublishSoundboard({ canPublish: false })).toBe(false);
});
+29
View File
@@ -60,6 +60,22 @@ function acquireSharedAudio(): {
* No effect unless the host sends the action. Returns a teardown function that
* also aborts any clip still playing.
*/
/**
* Pure: whether these LiveKit permissions allow publishing the soundboard's
* Unknown-source track (EC #47). No permissions or an empty source list
* means unrestricted; otherwise UNKNOWN (TrackSource 0) must be allowed.
*/
export function canPublishSoundboard(
perm:
| { canPublish?: boolean; canPublishSources?: readonly number[] }
| undefined,
): boolean {
if (!perm) return true;
if (perm.canPublish === false) return false;
const sources = perm.canPublishSources ?? [];
return sources.length === 0 || sources.includes(0);
}
export function startLotusAudioInject(vm: CallViewModel): () => void {
const w = widget;
if (!w) return () => undefined;
@@ -116,6 +132,19 @@ export function startLotusAudioInject(vm: CallViewModel): () => void {
return;
}
// [EC #47] Clips publish as an Unknown-source track. Audio-only rooms get
// a token limited to the microphone source, where LiveKit refuses that
// publish *after* we replied; say so up front instead of failing silently.
if (
rooms.some((r) => !canPublishSoundboard(r.localParticipant.permissions))
) {
w.api.transport.reply(ev.detail, {
played: false,
reason: "not_permitted",
});
return;
}
w.api.transport.reply(ev.detail, {});
void playInjectedClip(clip, volume, rooms, activeClips).catch((e) =>
logger.warn("[lotus] inject_audio failed", e),
-26
View File
@@ -13,7 +13,6 @@ import {
type ReactNode,
type SVGAttributes,
useCallback,
useEffect,
} from "react";
import { Trans, useTranslation } from "react-i18next";
import {
@@ -25,7 +24,6 @@ import {
import { Button } from "@vector-im/compound-web";
import { logger } from "matrix-js-sdk/lib/logger";
import { MatrixError } from "matrix-js-sdk";
import { type IWidgetApiRequest } from "matrix-widget-api";
import {
ConnectionLostError,
@@ -40,7 +38,6 @@ import { FullScreenView } from "../FullScreenView.tsx";
import { ErrorView } from "../ErrorView.tsx";
import { type WidgetHelpers } from "../widget.ts";
import styles from "../ErrorView.module.css";
import { LotusWidgetActions, lotusSendToHost } from "../lotus/lotusWidget";
export type CallErrorRecoveryAction = "reconnect"; // | "retry" ;
@@ -77,29 +74,6 @@ const ErrorPage: FC<ErrorPageProps> = ({
icon = ErrorSolidIcon;
}
// [cinny #318] Tell the host the call dropped (it kept showing the call as
// joined), and let its call bar press Reconnect for us.
const recoverable =
error instanceof ConnectionLostError ||
error instanceof LivekitConnectionError ||
error instanceof PeerConnectionTimeoutError;
useEffect(() => {
lotusSendToHost(LotusWidgetActions.CallError, {
code: error.code,
recoverable,
});
const w = widget;
const onReconnect = (ev: CustomEvent<IWidgetApiRequest>): void => {
w?.api.transport.reply(ev.detail, {});
if (recoverable) void recoveryActionHandler("reconnect");
};
w?.lazyActions?.on(LotusWidgetActions.Reconnect, onReconnect);
return (): void => {
w?.lazyActions?.off(LotusWidgetActions.Reconnect, onReconnect);
lotusSendToHost(LotusWidgetActions.CallError, { code: null });
};
}, [error.code, recoverable, recoveryActionHandler, widget]);
const actions: { label: string; onClick: () => void }[] = [];
if (error instanceof ConnectionLostError) {
actions.push({