Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4486f02bc6 |
@@ -16,7 +16,7 @@ import { SettingTile } from '../setting-tile';
|
|||||||
import { UsageSwitcher } from './UsageSwitcher';
|
import { UsageSwitcher } from './UsageSwitcher';
|
||||||
import { ImagePackProfile, ImagePackProfileEdit } from './PackMeta';
|
import { ImagePackProfile, ImagePackProfileEdit } from './PackMeta';
|
||||||
import * as css from './style.css';
|
import * as css from './style.css';
|
||||||
import { useFilePicker } from '../../hooks/useFilePicker';
|
import { useStrippedFilePicker } from '../../hooks/useStrippedFilePicker';
|
||||||
import { CompactUploadCardRenderer } from '../upload-card';
|
import { CompactUploadCardRenderer } from '../upload-card';
|
||||||
import { UploadSuccess } from '../../state/upload';
|
import { UploadSuccess } from '../../state/upload';
|
||||||
import { getImageInfo, TUploadContent } from '../../utils/matrix';
|
import { getImageInfo, TUploadContent } from '../../utils/matrix';
|
||||||
@@ -60,7 +60,7 @@ export const ImagePackContent = as<'div', ImagePackContentProps>(
|
|||||||
[imagePack, savedImages, uploadedImages],
|
[imagePack, savedImages, uploadedImages],
|
||||||
);
|
);
|
||||||
|
|
||||||
const pickFiles = useFilePicker(
|
const pickFiles = useStrippedFilePicker(
|
||||||
useCallback(
|
useCallback(
|
||||||
(pickedFiles: File[]) => {
|
(pickedFiles: File[]) => {
|
||||||
const uniqueFiles = pickedFiles.map((file) => {
|
const uniqueFiles = pickedFiles.map((file) => {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import { nameInitials } from '../../utils/common';
|
|||||||
import { BreakWord } from '../../styles/Text.css';
|
import { BreakWord } from '../../styles/Text.css';
|
||||||
import { LINKIFY_OPTS } from '../../plugins/react-custom-html-parser';
|
import { LINKIFY_OPTS } from '../../plugins/react-custom-html-parser';
|
||||||
import { ContainerColor } from '../../styles/ContainerColor.css';
|
import { ContainerColor } from '../../styles/ContainerColor.css';
|
||||||
import { useFilePicker } from '../../hooks/useFilePicker';
|
import { useStrippedFilePicker } from '../../hooks/useStrippedFilePicker';
|
||||||
import { useObjectURL } from '../../hooks/useObjectURL';
|
import { useObjectURL } from '../../hooks/useObjectURL';
|
||||||
import { createUploadAtom, UploadSuccess } from '../../state/upload';
|
import { createUploadAtom, UploadSuccess } from '../../state/upload';
|
||||||
import { CompactUploadCardRenderer } from '../upload-card';
|
import { CompactUploadCardRenderer } from '../upload-card';
|
||||||
@@ -111,7 +111,7 @@ export function ImagePackProfileEdit({ meta, onCancel, onSave }: ImagePackProfil
|
|||||||
return undefined;
|
return undefined;
|
||||||
}, [imageFile]);
|
}, [imageFile]);
|
||||||
|
|
||||||
const pickFile = useFilePicker(setImageFile, false);
|
const pickFile = useStrippedFilePicker(setImageFile, false);
|
||||||
|
|
||||||
const handleRemoveUpload = useCallback(() => {
|
const handleRemoveUpload = useCallback(() => {
|
||||||
setImageFile(undefined);
|
setImageFile(undefined);
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import { useImagePackRooms } from '../../../hooks/useImagePackRooms';
|
|||||||
import { roomToParentsAtom } from '../../../state/room/roomToParents';
|
import { roomToParentsAtom } from '../../../state/room/roomToParents';
|
||||||
import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
||||||
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
||||||
import { useFilePicker } from '../../../hooks/useFilePicker';
|
import { useStrippedFilePicker } from '../../../hooks/useStrippedFilePicker';
|
||||||
import { CompactUploadCardRenderer } from '../../../components/upload-card';
|
import { CompactUploadCardRenderer } from '../../../components/upload-card';
|
||||||
import { createUploadAtom, UploadSuccess } from '../../../state/upload';
|
import { createUploadAtom, UploadSuccess } from '../../../state/upload';
|
||||||
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
||||||
@@ -68,7 +68,7 @@ function EditPower({ maxPower, power, tag, onSave, onClose }: EditPowerProps) {
|
|||||||
const imagePackRooms = useImagePackRooms(room.roomId, roomToParents);
|
const imagePackRooms = useImagePackRooms(room.roomId, roomToParents);
|
||||||
|
|
||||||
const [iconFile, setIconFile] = useState<File>();
|
const [iconFile, setIconFile] = useState<File>();
|
||||||
const pickFile = useFilePicker(setIconFile, false);
|
const pickFile = useStrippedFilePicker(setIconFile, false);
|
||||||
|
|
||||||
const [tagColor, setTagColor] = useState<string | undefined>(tag?.color);
|
const [tagColor, setTagColor] = useState<string | undefined>(tag?.color);
|
||||||
const [tagIcon, setTagIcon] = useState<MemberPowerTagIcon | undefined>(tag?.icon);
|
const [tagIcon, setTagIcon] = useState<MemberPowerTagIcon | undefined>(tag?.icon);
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { useCallback } from 'react';
|
||||||
|
import { useFilePicker } from './useFilePicker';
|
||||||
|
import { useSetting } from '../state/hooks/settings';
|
||||||
|
import { settingsAtom } from '../state/settings';
|
||||||
|
import { stripImageMetadata } from '../utils/stripImageMetadata';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #332] `useFilePicker` for images that get published (emoji / sticker
|
||||||
|
* packs, pack avatars, power-level badges): applies "Remove Photo Metadata"
|
||||||
|
* like message attachments and avatars, so a phone photo's GPS location and
|
||||||
|
* timestamp don't go to every member of the room or space.
|
||||||
|
*/
|
||||||
|
export const useStrippedFilePicker = <M extends boolean | undefined = undefined>(
|
||||||
|
onSelect: (file: M extends true ? File[] : File) => void,
|
||||||
|
multiple?: M,
|
||||||
|
) => {
|
||||||
|
const [strip] = useSetting(settingsAtom, 'stripImageMetadata');
|
||||||
|
const handle = useCallback(
|
||||||
|
(picked: File | File[]) => {
|
||||||
|
if (!strip) {
|
||||||
|
onSelect(picked as M extends true ? File[] : File);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const clean = (f: File) => stripImageMetadata(f).then((r) => r.file);
|
||||||
|
if (Array.isArray(picked)) {
|
||||||
|
Promise.all(picked.map(clean)).then((files) =>
|
||||||
|
onSelect(files as M extends true ? File[] : File),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
clean(picked).then((file) => onSelect(file as M extends true ? File[] : File));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[strip, onSelect],
|
||||||
|
);
|
||||||
|
return useFilePicker(handle as (file: M extends true ? File[] : File) => void, multiple);
|
||||||
|
};
|
||||||
@@ -218,9 +218,6 @@ export class CallEmbed {
|
|||||||
// - transparent background so the room wallpaper shows through natively
|
// - transparent background so the room wallpaper shows through natively
|
||||||
lotusCallState: 'true',
|
lotusCallState: 'true',
|
||||||
lotusTransparent: '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
|
// [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',
|
||||||
|
|||||||
+64
-73
@@ -87,106 +87,97 @@ function copyPdfWorker() {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// The denoise assets the fork loads from ./denoise/ at runtime, as
|
// Lotus ML noise suppression: ship the RNNoise worklet/wasm + our getUserMedia
|
||||||
// [source, path under denoise/] pairs; `dir: true` entries are whole trees.
|
// shim alongside the vendored Element Call bundle, and inject the shim <script>
|
||||||
// Shared by the build copy and the dev server (Gitea #293).
|
// into EC's index.html so it runs before EC captures the mic. Runs after
|
||||||
function denoiseSources() {
|
// viteStaticCopy has populated dist/public/element-call (closeBundle order).
|
||||||
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() {
|
function lotusDenoise() {
|
||||||
const DEV_PREFIX = '/public/element-call/denoise/';
|
|
||||||
return {
|
return {
|
||||||
name: 'lotus-denoise',
|
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() {
|
closeBundle() {
|
||||||
const ecDir = path.resolve('dist/public/element-call');
|
const ecDir = path.resolve('dist/public/element-call');
|
||||||
if (!fs.existsSync(ecDir)) return;
|
if (!fs.existsSync(ecDir)) return;
|
||||||
|
|
||||||
const denoiseDir = path.join(ecDir, 'denoise');
|
const denoiseDir = path.join(ecDir, 'denoise');
|
||||||
fs.mkdirSync(denoiseDir, { recursive: true });
|
fs.mkdirSync(denoiseDir, { recursive: true });
|
||||||
const { sapphi, dtln, dfn } = denoiseSources();
|
|
||||||
|
|
||||||
// A missing source means a partial/changed install would otherwise
|
const sapphi = path.resolve('node_modules/@sapphi-red/web-noise-suppressor/dist');
|
||||||
// silently ship a broken ML feature (worklet 404 -> raw mic), so we fail
|
// All bundled denoise assets are REQUIRED: every entry backs a model the
|
||||||
// the build instead.
|
// UI can select (RNNoise, Speex) or the optional noise gate. A missing
|
||||||
const missing = sapphi.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
|
// 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);
|
||||||
if (missing.length > 0) {
|
if (missing.length > 0) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`[lotus-denoise] Required denoise asset(s) missing — build aborted to avoid shipping a broken ML feature:\n ${missing.join('\n ')}`,
|
`[lotus-denoise] Required denoise asset(s) missing — build aborted to avoid shipping a broken ML feature:\n ${missing.join('\n ')}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
sapphi.forEach(([s, rel]) => fs.copyFileSync(s, path.join(denoiseDir, rel)));
|
assets.forEach(([s, d]) => fs.copyFileSync(s, d));
|
||||||
|
|
||||||
const dtlnEntry = path.join(dtln[0], 'audio-worklet.js');
|
// 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');
|
||||||
if (!fs.existsSync(dtlnEntry)) {
|
if (!fs.existsSync(dtlnEntry)) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`[lotus-denoise] DTLN entry missing (${dtlnEntry}) — build aborted. ` +
|
`[lotus-denoise] DTLN entry missing (${dtlnEntry}) — build aborted. ` +
|
||||||
'Run `npm ci` to install @workadventure/noise-suppression.',
|
'Run `npm ci` to install @workadventure/noise-suppression.',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
fs.cpSync(dtln[0], path.join(denoiseDir, dtln[1]), { recursive: true });
|
fs.cpSync(dtlnSrc, path.join(denoiseDir, 'workadventure'), { recursive: true });
|
||||||
|
|
||||||
const dfnMissing = dfn.filter(([s]) => !fs.existsSync(s)).map(([s]) => s);
|
// 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);
|
||||||
if (dfnMissing.length > 0) {
|
if (dfnMissing.length > 0) {
|
||||||
throw new Error(
|
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/.)',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
dfn.forEach(([s, rel]) => {
|
dfnAssets.forEach(([s, d]) => {
|
||||||
const d = path.join(denoiseDir, rel);
|
|
||||||
fs.mkdirSync(path.dirname(d), { recursive: true });
|
fs.mkdirSync(path.dirname(d), { recursive: true });
|
||||||
fs.copyFileSync(s, d);
|
fs.copyFileSync(s, d);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user