Files
cinny/src/app/state/upload.ts
T
Lotus CIandClaude Opus 5.5 146ba4d2ff feat(desktop): upload progress on the taskbar button (cinny-desktop #10)
Upload atoms now also report into an app-wide `uploadProgressAtom`, and
`aggregateUploadProgress` turns every in-flight upload into one taskbar
state: byte-weighted percentage while uploading, indeterminate until a
size is known, red after a failure (held 4 s, then cleared), none when
done. Cancelled uploads just disappear. `useTauriTaskbarProgress` sends it
to the native `set_taskbar_progress`, at most ~4 times a second, always
ending on the latest state.

Verified with a throttled 6 MB upload: 0% → 99% at 250 ms steps, then
cleared; with the upload request aborted: 0% → error → cleared after 4 s.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PPmy3tPq869XDW4njjVaKA
2026-09-23 22:04:48 -04:00

175 lines
5.1 KiB
TypeScript

import { atom, useAtom } from 'jotai';
import { atomFamily } from 'jotai/utils';
import { MatrixClient, UploadResponse, UploadProgress, MatrixError } from 'matrix-js-sdk';
import { useCallback, useRef } from 'react';
import { useThrottle } from '../hooks/useThrottle';
import { uploadContent, TUploadContent } from '../utils/matrix';
import { uploadProgressAtom } from './uploadProgress';
export enum UploadStatus {
Idle = 'idle',
Loading = 'loading',
Success = 'success',
Error = 'error',
}
export type UploadIdle = {
file: TUploadContent;
status: UploadStatus.Idle;
};
export type UploadLoading = {
file: TUploadContent;
status: UploadStatus.Loading;
promise: Promise<UploadResponse>;
progress: UploadProgress;
};
export type UploadSuccess = {
file: TUploadContent;
status: UploadStatus.Success;
mxc: string;
};
export type UploadError = {
file: TUploadContent;
status: UploadStatus.Error;
error: MatrixError;
};
export type Upload = UploadIdle | UploadLoading | UploadSuccess | UploadError;
export type UploadAtomAction =
| {
promise: Promise<UploadResponse>;
}
| {
progress: UploadProgress;
}
| {
mxc: string;
}
| {
error: MatrixError;
};
export const createUploadAtom = (file: TUploadContent) => {
const baseUploadAtom = atom<Upload>({
file,
status: UploadStatus.Idle,
});
return atom<Upload, [UploadAtomAction], undefined>(
(get) => get(baseUploadAtom),
(get, set, update) => {
const uploadState = get(baseUploadAtom);
// [cinny-desktop #10] Mirror into the app-wide progress map for the
// desktop taskbar bar. Cancelled uploads just disappear (no red bar).
const track = (entry: { loaded: number; total: number; failed: boolean } | undefined) =>
set(uploadProgressAtom, (prev) => {
const next = new Map(prev);
if (entry) next.set(file, { ...entry, updatedAt: Date.now() });
else next.delete(file);
return next;
});
if ('promise' in update) {
track({ loaded: 0, total: file.size, failed: false });
set(baseUploadAtom, {
status: UploadStatus.Loading,
file,
promise: update.promise,
progress: { loaded: 0, total: file.size },
});
return;
}
if ('progress' in update && uploadState.status === UploadStatus.Loading) {
track({
loaded: update.progress.loaded,
total: update.progress.total || file.size,
failed: false,
});
set(baseUploadAtom, {
...uploadState,
progress: update.progress,
});
return;
}
if ('mxc' in update) {
track(undefined);
set(baseUploadAtom, {
status: UploadStatus.Success,
file,
mxc: update.mxc,
});
return;
}
if ('error' in update) {
const cancelled =
update.error?.name === 'AbortError' || /abort/i.test(update.error?.message ?? '');
const loaded =
uploadState.status === UploadStatus.Loading ? uploadState.progress.loaded : 0;
track(cancelled ? undefined : { loaded, total: file.size, failed: true });
set(baseUploadAtom, {
status: UploadStatus.Error,
file,
error: update.error,
});
}
},
);
};
export type TUploadAtom = ReturnType<typeof createUploadAtom>;
export const useBindUploadAtom = (
mx: MatrixClient,
uploadAtom: TUploadAtom,
hideFilename?: boolean,
) => {
const [upload, setUpload] = useAtom(uploadAtom);
const { file } = upload;
const handleProgress = useThrottle(
useCallback((progress: UploadProgress) => setUpload({ progress }), [setUpload]),
{ immediate: true, wait: 200 },
);
const abortRef = useRef<AbortController | undefined>(undefined);
const startUpload = useCallback(() => {
const controller = new AbortController();
abortRef.current = controller;
return uploadContent(mx, file, {
hideFilename,
signal: controller.signal,
onPromise: (promise: Promise<UploadResponse>) => setUpload({ promise }),
onProgress: handleProgress,
onSuccess: (mxc) => setUpload({ mxc }),
onError: (error) => setUpload({ error }),
});
}, [mx, file, hideFilename, setUpload, handleProgress]);
const cancelUpload = useCallback(async () => {
// Abort the retry loop first (covers a cancel during the back-off sleep, when
// there is no in-flight request), then abort any in-flight upload request.
abortRef.current?.abort();
if (upload.status === UploadStatus.Loading) {
await mx.cancelUpload(upload.promise);
}
}, [mx, upload]);
return {
upload,
startUpload,
cancelUpload,
};
};
export const createUploadAtomFamily = () =>
atomFamily<TUploadContent, TUploadAtom>(createUploadAtom);
export type TUploadAtomFamily = ReturnType<typeof createUploadAtomFamily>;
export const createUploadFamilyObserverAtom = (
uploadFamily: TUploadAtomFamily,
uploads: TUploadContent[],
) => atom<Upload[]>((get) => uploads.map((upload) => get(uploadFamily(upload))));
export type TUploadFamilyObserverAtom = ReturnType<typeof createUploadFamilyObserverAtom>;