fix(dev): ML noise suppression works on npm start; no lotusTheme warning per call (#293)

The denoise worklets/wasm/models were only copied into dist/ by the
lotus-denoise closeBundle hook, so on the dev server the call frame got
the SPA fallback for them and silently used the raw mic. The asset list
is now shared (denoiseSources) between that copy and a dev-server
middleware serving the same paths. Also send lotusTheme=true with
lotusTransparent, which the fork warned about in every call.

Fixes #293

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5

src/app/pages/client/ClientNonUIFeatures.tsx

@@ -571,8 +571,7 @@ function MessageNotifications() {
                 // NotificationOptions typing.
                 actions: [{ action: 'reply', title: 'Reply', type: 'text', placeholder: 'Reply…' }],
               }),
-          // userId: [Gitea #299] the SW replies as this account only.
-          data: { path: roomPath, roomId, threadId: threadId || undefined, userId: mx.getUserId() },
+          data: { path: roomPath, roomId, threadId: threadId || undefined },
         },
         () => {
           window.focus();
@@ -580,7 +579,7 @@ function MessageNotifications() {
         },
       );
     },
-    [navigate, setToast, mDirects, mx],
+    [navigate, setToast, mDirects],
   );
 
   // N105: when a service-worker-owned notification is clicked, the SW focuses

src/app/plugins/call/CallEmbed.ts

@@ -218,6 +218,9 @@ export class CallEmbed {
       //  - transparent background so the room wallpaper shows through natively
       lotusCallState: 'true',
       lotusTransparent: 'true',
+      // [Gitea #293] the fork applies the theme with transparency anyway, and
+      // warned in every call that lotusTheme wasn't set
+      lotusTheme: 'true',
       // [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.
       lotusHostControls: 'true',

src/index.tsx

@@ -43,7 +43,7 @@ if ('serviceWorker' in navigator && swProtocolOk) {
 
   const sendSessionToSW = () => {
     const session = getFallbackSession();
-    pushSessionToSW(session?.baseUrl, session?.accessToken, session?.userId);
+    pushSessionToSW(session?.baseUrl, session?.accessToken);
   };
 
   // The dev worker is an ES module (it imports workbox), so it must be

src/sw-session.ts

@@ -1,4 +1,4 @@
-export function pushSessionToSW(baseUrl?: string, accessToken?: string, userId?: string) {
+export function pushSessionToSW(baseUrl?: string, accessToken?: string) {
   if (!('serviceWorker' in navigator)) return;
   if (!navigator.serviceWorker.controller) return;
 
@@ -6,6 +6,5 @@ export function pushSessionToSW(baseUrl?: string, accessToken?: string, userId?:
     type: 'setSession',
     accessToken,
     baseUrl,
-    userId,
   });
 }

src/sw.ts

@@ -2,7 +2,7 @@
 
 import { precacheAndRoute, type PrecacheEntry } from 'workbox-precaching';
 import { SHARE_TARGET_PATH, stashSharedForm } from './swShare';
-import { pickReplySession, replyFailureText, sendNotificationReply } from './swReply';
+import { sendNotificationReply } from './swReply';
 
 export type {};
 declare const self: ServiceWorkerGlobalScope & {
@@ -40,8 +40,6 @@ precacheAndRoute(self.__WB_MANIFEST);
 type SessionInfo = {
   accessToken: string;
   baseUrl: string;
-  /** [Gitea #299] whose session this is, so a notification reply uses its own account */
-  userId?: string;
 };
 
 /**
@@ -65,13 +63,9 @@ async function cleanupDeadClients() {
   });
 }
 
-function setSession(clientId: string, accessToken: string, baseUrl: string, userId?: unknown) {
+function setSession(clientId: string, accessToken: string, baseUrl: string) {
   if (typeof accessToken === 'string' && typeof baseUrl === 'string') {
-    sessions.set(clientId, {
-      accessToken,
-      baseUrl,
-      userId: typeof userId === 'string' ? userId : undefined,
-    });
+    sessions.set(clientId, { accessToken, baseUrl });
   } else {
     // Logout or invalid session
     sessions.delete(clientId);
@@ -136,10 +130,10 @@ self.addEventListener('message', (event: ExtendableMessageEvent) => {
   const client = event.source as Client | null;
   if (!client) return;
 
-  const { type, accessToken, baseUrl, userId } = event.data || {};
+  const { type, accessToken, baseUrl } = event.data || {};
 
   if (type === 'setSession') {
-    setSession(client.id, accessToken, baseUrl, userId);
+    setSession(client.id, accessToken, baseUrl);
     cleanupDeadClients();
   }
 });
@@ -161,19 +155,15 @@ self.addEventListener('notificationclick', (event: NotificationEvent) => {
     if (text) {
       event.waitUntil(
         sendNotificationReply(
-          // [Gitea #299] The notification's own account, not the newest session.
-          pickReplySession(
-            Array.from(sessions.values()),
-            typeof data.userId === 'string' ? data.userId : undefined,
-          ),
+          Array.from(sessions.values()).pop(),
           data.roomId,
           data.threadId,
           text,
-        ).then((result) => {
-          if (result !== 'sent') {
+        ).then((ok) => {
+          if (!ok) {
             // Let the user know it didn't go out, and keep their text reachable.
             return self.registration.showNotification('Reply not sent', {
-              body: replyFailureText(result, text),
+              body: `Couldn't send "${text.slice(0, 60)}" — open the app to retry.`,
               tag: `swreply-fail-${data.roomId}`,
               data: { path },
             });

src/swReply.test.ts

@@ -1,12 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import {
-  buildReplyContent,
-  pickReplySession,
-  replyFailureText,
-  replySendUrl,
-  sendNotificationReply,
-} from './swReply';
+import { buildReplyContent, replySendUrl, sendNotificationReply } from './swReply';
 
 test('thread replies carry the m.thread relation, room replies do not', () => {
   assert.deepEqual(buildReplyContent('hi'), { msgtype: 'm.text', body: 'hi', 'm.mentions': {} });
@@ -25,64 +19,40 @@ test('send URL encodes the room id against the session base URL', () => {
   );
 });
 
-test('sendNotificationReply checks encryption, then PUTs with the bearer token (#203, #299)', async () => {
+test('sendNotificationReply PUTs with the bearer token and reports ok / failure', async () => {
   const calls: { url: string; init: RequestInit }[] = [];
-  const fetchFor = (encStatus: number, sendOk = true) =>
-    (async (url: string, init: RequestInit = {}) => {
-      calls.push({ url, init });
-      if (url.includes('/state/m.room.encryption/')) {
-        return { ok: encStatus === 200, status: encStatus } as Response;
-      }
-      return { ok: sendOk, status: sendOk ? 200 : 500 } as Response;
-    }) as unknown as typeof fetch;
-  const session = { accessToken: 'tok', baseUrl: 'https://hs' };
-
-  assert.equal(await sendNotificationReply(session, '!r:hs', '$t', 'yo', fetchFor(404)), 'sent');
-  assert.match(calls[0].url, /\/rooms\/!r%3Ahs\/state\/m\.room\.encryption\/$/);
-  const put = calls[1];
-  assert.equal(put.init.method, 'PUT');
-  assert.equal((put.init.headers as Record<string, string>).Authorization, 'Bearer tok');
+  const fetchOk = (async (url: string, init: RequestInit) => {
+    calls.push({ url, init });
+    return { ok: true } as Response;
+  }) as unknown as typeof fetch;
+  assert.equal(
+    await sendNotificationReply(
+      { accessToken: 'tok', baseUrl: 'https://hs' },
+      '!r:hs',
+      '$t',
+      'yo',
+      fetchOk,
+    ),
+    true,
+  );
+  assert.equal(calls[0].init.method, 'PUT');
+  assert.equal((calls[0].init.headers as Record<string, string>).Authorization, 'Bearer tok');
   assert.match(
-    put.url,
+    calls[0].url,
     /^https:\/\/hs\/_matrix\/client\/v3\/rooms\/!r%3Ahs\/send\/m\.room\.message\/swreply-/,
   );
-  assert.equal(JSON.parse(put.init.body as string)['m.relates_to'].event_id, '$t');
+  assert.equal(JSON.parse(calls[0].init.body as string)['m.relates_to'].event_id, '$t');
 
-  // Encryption turned on since the notification was shown: nothing is sent.
-  calls.length = 0;
+  const fetchFail = (async () => ({ ok: false }) as Response) as unknown as typeof fetch;
   assert.equal(
-    await sendNotificationReply(session, '!r:hs', undefined, 'yo', fetchFor(200)),
-    'encrypted',
-  );
-  assert.equal(calls.length, 1);
-  // Can't tell (server error): fail safe, nothing is sent.
-  calls.length = 0;
-  assert.equal(
-    await sendNotificationReply(session, '!r:hs', undefined, 'yo', fetchFor(500)),
-    'failed',
-  );
-  assert.equal(calls.length, 1);
-  assert.equal(
-    await sendNotificationReply(session, '!r:hs', undefined, 'yo', fetchFor(404, false)),
-    'failed',
-  );
-  assert.equal(
-    await sendNotificationReply(undefined, '!r:hs', undefined, 'yo', fetchFor(404)),
-    'no-session',
+    await sendNotificationReply(
+      { accessToken: 'tok', baseUrl: 'https://hs' },
+      '!r:hs',
+      undefined,
+      'yo',
+      fetchFail,
+    ),
+    false,
   );
-});
-
-test('pickReplySession: the notification account only (#299)', () => {
-  const a = { accessToken: 'a', baseUrl: 'https://hs', userId: '@a:hs' };
-  const b = { accessToken: 'b', baseUrl: 'https://hs', userId: '@b:hs' };
-  assert.equal(pickReplySession([a, b], '@a:hs'), a);
-  assert.equal(pickReplySession([b], '@a:hs'), undefined, 'logged out of @a here');
-  assert.equal(pickReplySession([a], undefined), a, 'old notification, one session');
-  assert.equal(pickReplySession([a, b], undefined), undefined, 'old notification, ambiguous');
-});
-
-test('replyFailureText says why', () => {
-  assert.match(replyFailureText('encrypted', 'hi'), /now encrypted/);
-  assert.match(replyFailureText('no-session', 'hi'), /no longer signed in/);
-  assert.match(replyFailureText('failed', 'hi'), /retry/);
+  assert.equal(await sendNotificationReply(undefined, '!r:hs', undefined, 'yo', fetchOk), false);
 });

src/swReply.ts

@@ -1,42 +1,9 @@
 /**
  * [Gitea #203] Build and send an inline reply typed into a notification's
  * text action. Lives outside sw.ts so it can be unit-tested; the SW passes in
- * the notification account's session and the global fetch.
+ * its newest known session and the global fetch.
  */
-export type SwReplySession = { accessToken: string; baseUrl: string; userId?: string };
-
-export type SwReplyResult = 'sent' | 'failed' | 'encrypted' | 'no-session';
-
-/**
- * [Gitea #299] The session to reply with: the notification's own account. A
- * notification without a user id (shown before this change) may only use the
- * session if it is the only one, so a reply never posts as another account.
- */
-export const pickReplySession = (
-  sessions: SwReplySession[],
-  userId: string | undefined,
-): SwReplySession | undefined => {
-  if (userId) return sessions.filter((x) => x.userId === userId).pop();
-  return sessions.length === 1 ? sessions[0] : undefined;
-};
-
-/** What the "Reply not sent" notification says for each failure. */
-export const replyFailureText = (result: SwReplyResult, text: string): string => {
-  const quoted = `"${text.slice(0, 60)}"`;
-  if (result === 'encrypted') {
-    return `This room is now encrypted, so ${quoted} wasn't sent. Open the app to reply.`;
-  }
-  if (result === 'no-session') {
-    return `You're no longer signed in to that account here, so ${quoted} wasn't sent.`;
-  }
-  return `Couldn't send ${quoted}. Open the app to retry.`;
-};
-
-export const encryptionStateUrl = (baseUrl: string, roomId: string): string =>
-  new URL(
-    `/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/state/m.room.encryption/`,
-    baseUrl,
-  ).href;
+export type SwReplySession = { accessToken: string; baseUrl: string };
 
 export const buildReplyContent = (text: string, threadId?: string): Record<string, unknown> => {
   const content: Record<string, unknown> = { msgtype: 'm.text', body: text, 'm.mentions': {} };
@@ -63,24 +30,20 @@ export async function sendNotificationReply(
   threadId: string | undefined,
   text: string,
   fetchFn: typeof fetch = fetch,
-): Promise<SwReplyResult> {
-  if (!session?.accessToken || !session.baseUrl) return 'no-session';
-  const headers = { Authorization: `Bearer ${session.accessToken}` };
+): Promise<boolean> {
+  if (!session?.accessToken || !session.baseUrl) return false;
+  const txn = `swreply-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   try {
-    // [Gitea #299] The SW can't encrypt, and the reply action was offered when
-    // the notification was shown — possibly hours ago. Re-check now: only a
-    // definite "no encryption state" (404) lets the plain reply go out.
-    const enc = await fetchFn(encryptionStateUrl(session.baseUrl, roomId), { headers });
-    if (enc.ok) return 'encrypted';
-    if (enc.status !== 404) return 'failed';
-    const txn = `swreply-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
     const res = await fetchFn(replySendUrl(session.baseUrl, roomId, txn), {
       method: 'PUT',
-      headers: { ...headers, 'Content-Type': 'application/json' },
+      headers: {
+        Authorization: `Bearer ${session.accessToken}`,
+        'Content-Type': 'application/json',
+      },
       body: JSON.stringify(buildReplyContent(text, threadId)),
     });
-    return res.ok ? 'sent' : 'failed';
+    return res.ok;
   } catch {
-    return 'failed';
+    return false;
   }
 }

vite.config.js

@@ -87,97 +87,106 @@ function copyPdfWorker() {
   };
 }
 
-// Lotus ML noise suppression: ship the RNNoise worklet/wasm + our getUserMedia
-// shim alongside the vendored Element Call bundle, and inject the shim <script>
-// into EC's index.html so it runs before EC captures the mic. Runs after
-// viteStaticCopy has populated dist/public/element-call (closeBundle order).
+// The denoise assets the fork loads from ./denoise/ at runtime, as
+// [source, path under denoise/] pairs; `dir: true` entries are whole trees.
+// Shared by the build copy and the dev server (Gitea #293).
+function denoiseSources() {
+  const sapphi = path.resolve('node_modules/@sapphi-red/web-noise-suppressor/dist');
+  const dfnVendor = path.resolve('build/denoise-vendor/deepfilternet');
+  return {
+    // All bundled denoise assets are REQUIRED: every entry backs a model the
+    // UI can select (RNNoise, Speex) or the optional noise gate.
+    sapphi: [
+      [path.join(sapphi, 'rnnoise/workletProcessor.js'), 'rnnoiseWorklet.js'],
+      [path.join(sapphi, 'rnnoise.wasm'), 'rnnoise.wasm'],
+      [path.join(sapphi, 'rnnoise_simd.wasm'), 'rnnoise_simd.wasm'],
+      [path.join(sapphi, 'speex/workletProcessor.js'), 'speexWorklet.js'],
+      [path.join(sapphi, 'speex.wasm'), 'speex.wasm'],
+      [path.join(sapphi, 'noiseGate/workletProcessor.js'), 'noiseGateWorklet.js'],
+    ],
+    // DTLN (@workadventure/noise-suppression): a self-contained ES module that
+    // resolves its own worklet, LiteRT WASM runtime and TFLite models via
+    // `import.meta.url`, so its whole dist/ tree is served intact.
+    dtln: [path.resolve('node_modules/@workadventure/noise-suppression/dist'), 'workadventure'],
+    // DeepFilterNet 3: the ESM (worklet inlined) plus the vendored wasm and ONNX
+    // model (CDN-free / Tauri-CSP safe), in the package's expected v2/ layout.
+    dfn: [
+      [
+        path.resolve('node_modules/deepfilternet3-noise-filter/dist/index.esm.js'),
+        'deepfilternet/index.esm.js',
+      ],
+      [path.join(dfnVendor, 'v2/pkg/df_bg.wasm'), 'deepfilternet/v2/pkg/df_bg.wasm'],
+      [
+        path.join(dfnVendor, 'v2/models/DeepFilterNet3_onnx.tar.gz'),
+        'deepfilternet/v2/models/DeepFilterNet3_onnx.tar.gz',
+      ],
+    ],
+  };
+}
+
+// Lotus ML noise suppression: ship the denoise worklets/wasm/models alongside
+// the vendored Element Call bundle. Runs after viteStaticCopy has populated
+// dist/public/element-call (closeBundle order). [Gitea #293] The dev server
+// serves the same files at the same URLs, so `npm start` can test denoise.
 function lotusDenoise() {
+  const DEV_PREFIX = '/public/element-call/denoise/';
   return {
     name: 'lotus-denoise',
+    configureServer(server) {
+      const { sapphi, dtln, dfn } = denoiseSources();
+      const files = new Map([...sapphi, ...dfn].map(([src, rel]) => [rel, src]));
+      const types = { '.js': 'text/javascript', '.wasm': 'application/wasm' };
+      server.middlewares.use((req, res, next) => {
+        const url = (req.url ?? '').split('?')[0];
+        if (!url.startsWith(DEV_PREFIX)) return next();
+        const rel = decodeURIComponent(url.slice(DEV_PREFIX.length));
+        let file = files.get(rel);
+        if (!file && rel.startsWith(`${dtln[1]}/`)) {
+          const candidate = path.resolve(dtln[0], rel.slice(dtln[1].length + 1));
+          if (candidate.startsWith(dtln[0] + path.sep)) file = candidate;
+        }
+        if (!file || !fs.existsSync(file)) return next();
+        res.setHeader('Content-Type', types[path.extname(file)] ?? 'application/octet-stream');
+        fs.createReadStream(file).pipe(res);
+        return undefined;
+      });
+    },
     closeBundle() {
       const ecDir = path.resolve('dist/public/element-call');
       if (!fs.existsSync(ecDir)) return;
 
       const denoiseDir = path.join(ecDir, 'denoise');
       fs.mkdirSync(denoiseDir, { recursive: true });
+      const { sapphi, dtln, dfn } = denoiseSources();
 
-      const sapphi = path.resolve('node_modules/@sapphi-red/web-noise-suppressor/dist');
-      // All bundled denoise assets are REQUIRED: every entry backs a model the
-      // UI can select (RNNoise, Speex) or the optional noise gate. A missing
-      // source means a partial/changed install would otherwise silently ship a
-      // broken ML feature (worklet 404 -> raw mic), so we fail the build instead.
-      const assets = [
-        [
-          path.join(sapphi, 'rnnoise/workletProcessor.js'),
-          path.join(denoiseDir, 'rnnoiseWorklet.js'),
-        ],
-        [path.join(sapphi, 'rnnoise.wasm'), path.join(denoiseDir, 'rnnoise.wasm')],
-        [path.join(sapphi, 'rnnoise_simd.wasm'), path.join(denoiseDir, 'rnnoise_simd.wasm')],
-        [path.join(sapphi, 'speex/workletProcessor.js'), path.join(denoiseDir, 'speexWorklet.js')],
-        [path.join(sapphi, 'speex.wasm'), path.join(denoiseDir, 'speex.wasm')],
-        [
-          path.join(sapphi, 'noiseGate/workletProcessor.js'),
-          path.join(denoiseDir, 'noiseGateWorklet.js'),
-        ],
-      ];
-      const missing = assets.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
+      // A missing source means a partial/changed install would otherwise
+      // silently ship a broken ML feature (worklet 404 -> raw mic), so we fail
+      // the build instead.
+      const missing = sapphi.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
       if (missing.length > 0) {
         throw new Error(
           `[lotus-denoise] Required denoise asset(s) missing — build aborted to avoid shipping a broken ML feature:\n  ${missing.join('\n  ')}`,
         );
       }
-      assets.forEach(([s, d]) => fs.copyFileSync(s, d));
+      sapphi.forEach(([s, rel]) => fs.copyFileSync(s, path.join(denoiseDir, rel)));
 
-      // DTLN (@workadventure/noise-suppression): unlike the flat sapphi
-      // worklets, this package is a self-contained ES module that resolves its
-      // own AudioWorklet processor, LiteRT WASM runtime and TFLite models via
-      // `import.meta.url`. So we copy its whole dist/ tree intact to
-      // denoise/workadventure/ (preserving assets/ + vendor/) and let the shim
-      // dynamic-import denoise/workadventure/audio-worklet.js at runtime. The
-      // entry module is required — fail the build if the install is broken.
-      const dtlnSrc = path.resolve('node_modules/@workadventure/noise-suppression/dist');
-      const dtlnEntry = path.join(dtlnSrc, 'audio-worklet.js');
+      const dtlnEntry = path.join(dtln[0], 'audio-worklet.js');
       if (!fs.existsSync(dtlnEntry)) {
         throw new Error(
           `[lotus-denoise] DTLN entry missing (${dtlnEntry}) — build aborted. ` +
             'Run `npm ci` to install @workadventure/noise-suppression.',
         );
       }
-      fs.cpSync(dtlnSrc, path.join(denoiseDir, 'workadventure'), { recursive: true });
+      fs.cpSync(dtln[0], path.join(denoiseDir, dtln[1]), { recursive: true });
 
-      // DeepFilterNet 3 (deepfilternet3-noise-filter): the npm package ships only
-      // its ESM (index.esm.js) with the AudioWorklet processor + wasm-bindgen glue
-      // INLINED as a string (loaded via a Blob URL, no CDN for the worklet). The
-      // only runtime CDN fetches are its single-threaded `df_bg.wasm` and the
-      // ONNX `DeepFilterNet3_onnx.tar.gz` model — which we VENDOR locally (under
-      // build/denoise-vendor/deepfilternet/) and serve, overriding the package's
-      // cdnUrl to our self-hosted base. This keeps the feature CDN-free / Tauri-CSP
-      // safe. We copy the ESM (the shim dynamic-imports it, mirroring DTLN) plus
-      // the vendored assets, preserving the package's expected v2/... layout. All
-      // are required — a missing entry means a broken install, so fail the build.
-      const dfnEsm = path.resolve('node_modules/deepfilternet3-noise-filter/dist/index.esm.js');
-      const dfnVendor = path.resolve('build/denoise-vendor/deepfilternet');
-      const dfnAssets = [
-        [dfnEsm, path.join(denoiseDir, 'deepfilternet/index.esm.js')],
-        [
-          path.join(dfnVendor, 'v2/pkg/df_bg.wasm'),
-          path.join(denoiseDir, 'deepfilternet/v2/pkg/df_bg.wasm'),
-        ],
-        [
-          path.join(dfnVendor, 'v2/models/DeepFilterNet3_onnx.tar.gz'),
-          path.join(denoiseDir, 'deepfilternet/v2/models/DeepFilterNet3_onnx.tar.gz'),
-        ],
-      ];
-      const dfnMissing = dfnAssets.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
+      const dfnMissing = dfn.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
       if (dfnMissing.length > 0) {
         throw new Error(
-          '[lotus-denoise] DeepFilterNet 3 asset(s) missing — build aborted to avoid ' +
-            'shipping a broken ML feature:\n  ' +
-            dfnMissing.join('\n  ') +
-            '\n(Run `npm ci`; the vendored wasm/model live under build/denoise-vendor/deepfilternet/.)',
+          `[lotus-denoise] DeepFilterNet 3 asset(s) missing — build aborted to avoid shipping a broken ML feature:\n  ${dfnMissing.join('\n  ')}\n(Run \`npm ci\`; the vendored wasm/model live under build/denoise-vendor/deepfilternet/.)`,
         );
       }
-      dfnAssets.forEach(([s, d]) => {
+      dfn.forEach(([s, rel]) => {
+        const d = path.join(denoiseDir, rel);
         fs.mkdirSync(path.dirname(d), { recursive: true });
         fs.copyFileSync(s, d);
       });