Files
cinny/src/app/state/upload.ts
T
jaredandClaude Opus 4.8 ab01d27aa7 fix(correctness): call-invite clock skew, forceState, upload cancel (COR-3/5/6)
COR-3 (CallEmbedProvider): the incoming-call lifetime guard distrusted a
caller's sender_ts only when it was >20s AHEAD of the server ts. A caller clock
that ran SLOW left sender_ts in the past, so the ring auto-dismissed/never
showed for a fresh invite. Trust sender_ts only within ±20s of the server ts,
else fall back to it (also fixes a NaN path when sender_ts is missing).

COR-6 (CallControl): forceState rebuilt CallControlState with 5 args, silently
defaulting screenshareAudioMuted to false; pass this.screenshareAudioMuted.

COR-5 (uploadContent + useBindUploadAtom): cancelling during the retry back-off
was a no-op (mx.cancelUpload only aborts an in-flight request), so the upload
resurrected on the next attempt. Thread an AbortSignal: the back-off sleep
resolves early on abort and the loop stops with an abort error; the hook aborts
a per-upload AbortController on cancel (alongside mx.cancelUpload for the
in-flight case).

All verified by two review passes (no double-settle / no resurrection); includes
their suggested abort-listener cleanup on normal sleep resolution.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-18 21:28:31 -04:00

153 lines
4.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';
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);
if ('promise' in update) {
set(baseUploadAtom, {
status: UploadStatus.Loading,
file,
promise: update.promise,
progress: { loaded: 0, total: file.size },
});
return;
}
if ('progress' in update && uploadState.status === UploadStatus.Loading) {
set(baseUploadAtom, {
...uploadState,
progress: update.progress,
});
return;
}
if ('mxc' in update) {
set(baseUploadAtom, {
status: UploadStatus.Success,
file,
mxc: update.mxc,
});
return;
}
if ('error' in update) {
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>;