Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions apps/mobile/src/lib/composerAttachmentUploadQueue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,30 +114,6 @@ export function composerAttachmentsStillUploading(input: {
});
}

/** Changes when an upload starts or settles, not on its progress ticks. */
export function uploadingComposerAttachmentKeys(
states: Readonly<Record<string, ComposerAttachmentUploadState>>,
): string {
return Object.keys(states)
.filter((key) => states[key]?.status === "uploading")
.sort()
.join("\n");
}

/** A queued message waits for the worker's upload instead of starting a second one. */
export function queuedAttachmentsStillUploading(input: {
readonly environmentId: EnvironmentId;
readonly attachments: ReadonlyArray<DraftComposerAttachment>;
readonly states: Readonly<Record<string, ComposerAttachmentUploadState>>;
}): boolean {
return input.attachments.some(
(attachment) =>
attachment.uploadedAttachmentId === undefined &&
input.states[composerAttachmentUploadKey(input.environmentId, attachment.id)]?.status ===
"uploading",
);
}

/** Equal by environment and attachment id; the request rides along for the upload. */
class UploadKey implements Equal.Equal {
constructor(
Expand Down
8 changes: 0 additions & 8 deletions apps/mobile/src/state/composer-attachment-upload-states.ts

This file was deleted.

49 changes: 26 additions & 23 deletions apps/mobile/src/state/composer-attachment-uploads.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { CommandId, EnvironmentId, MessageId, ThreadId } from "@t3tools/contracts";
import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
import { expect, it } from "@effect/vitest";
import * as Effect from "effect/Effect";
import { afterEach, beforeEach, vi } from "vite-plus/test";

type UploadOptions = {
signal: AbortSignal;
Expand Down Expand Up @@ -167,7 +169,7 @@ vi.mock("./use-thread-outbox", async () => {
const { Atom } = await import("effect/reactivity");
return {
editingQueuedMessageIdsAtom: Atom.make<Record<string, boolean>>({}).pipe(Atom.keepAlive),
dispatchingQueuedMessageIdAtom: Atom.make<Record<string, string>>({}).pipe(Atom.keepAlive),
dispatchingQueuedMessageIdsAtom: Atom.make<Record<string, true>>({}).pipe(Atom.keepAlive),
useThreadOutboxMessages: () =>
appAtomRegistry.get(threadOutboxManager.queuedMessagesByThreadKeyAtom),
retryingQueuedMessageIdsAtom: Atom.make({}).pipe(Atom.keepAlive),
Expand Down Expand Up @@ -296,29 +298,30 @@ function uploadState() {
];
}

it.each(["decode", "write"] as const)(
it.effect.each(["decode", "write"] as const)(
"keeps an accepted upload ready when the draft %s fails",
async (fault) => {
native.fault = fault;
if (fault === "decode")
native.files.set(draftsUri, Buffer.from('{"schemaVersion":1,"drafts":'));
drafts.resetComposerDraftsLoadState();
const queue = worker();
await queue.settled();
expect(uploadState()).toEqual({ status: "ready" });
expect(native.deleted).toEqual([]);
expect(composerAttachmentUploadBlockReason(sendInput())).toBeNull();
expect(composerAttachmentsStillUploading(sendInput())).toBe(false);
(fault) =>
Effect.gen(function* () {
native.fault = fault;
if (fault === "decode")
native.files.set(draftsUri, Buffer.from('{"schemaVersion":1,"drafts":'));
drafts.resetComposerDraftsLoadState();
const queue = worker();
yield* Effect.promise(() => queue.settled());
expect(uploadState()).toEqual({ status: "ready" });
expect(native.deleted).toEqual([]);
expect(composerAttachmentUploadBlockReason(sendInput())).toBeNull();
expect(composerAttachmentsStillUploading(sendInput())).toBe(false);

const message = queuedMessage();
expect(message.attachments[0]?.uploadedAttachmentId).toBe("pending-1");
await enqueueThreadOutboxMessage(message);
const prepared = await prepareQueuedMessageAttachments(message);
expect(prepared.status).toBe("ready");
if (prepared.status !== "ready") throw new Error("Outbox preparation abandoned");
expect(prepared.prepared.pendingAttachmentIds).toEqual(["pending-1"]);
expect(native.transfer).toHaveBeenCalledTimes(1);
},
const message = queuedMessage();
expect(message.attachments[0]?.uploadedAttachmentId).toBe("pending-1");
yield* Effect.promise(() => enqueueThreadOutboxMessage(message));
const prepared = yield* prepareQueuedMessageAttachments(message);
expect(prepared.status).toBe("ready");
if (prepared.status !== "ready") throw new Error("Outbox preparation abandoned");
expect(prepared.prepared.pendingAttachmentIds).toEqual(["pending-1"]);
expect(native.transfer).toHaveBeenCalledTimes(1);
}),
);

it("keeps an upload running when its message is sent mid-upload and records it on the message", async () => {
Expand Down
6 changes: 4 additions & 2 deletions apps/mobile/src/state/composer-attachment-uploads.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import {
composerDraftEnvironmentId,
canUploadComposerAttachment,
createComposerAttachmentUploadQueue,
type ComposerAttachmentUploadState,
} from "../lib/composerAttachmentUploadQueue";
import { appAtomRegistry } from "./atom-registry";
import { composerAttachmentUploadsAtom } from "./composer-attachment-upload-states";
import { environmentServerConfigsAtom } from "./server";
import {
flattenQueuedThreadMessages,
Expand Down Expand Up @@ -46,7 +46,9 @@ export {
composerAttachmentsStillUploading,
} from "../lib/composerAttachmentUploadQueue";

export { composerAttachmentUploadsAtom };
export const composerAttachmentUploadsAtom = Atom.make<
Readonly<Record<string, ComposerAttachmentUploadState>>
>({}).pipe(Atom.keepAlive);
const uploadStateAtom = Atom.family((key: string) =>
Atom.map(composerAttachmentUploadsAtom, (states) => states[key]),
);
Expand Down
8 changes: 4 additions & 4 deletions apps/mobile/src/state/edit-pending-thread-message.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CommandId, EnvironmentId, MessageId, ThreadId } from "@t3tools/contract
import type { QueuedThreadMessage } from "./thread-outbox-model";

const state = vi.hoisted(() => ({
dispatching: null as string | null,
dispatching: {} as Record<string, true>,
held: {} as Record<string, true>,
draft: { text: "Existing draft", attachments: [] as { id: string }[] },
confirm: vi.fn(async () => true),
Expand All @@ -16,7 +16,7 @@ vi.mock("./atom-registry", () => ({
},
}));
vi.mock("./use-thread-outbox", () => ({
dispatchingQueuedMessageIdAtom: "dispatching",
dispatchingQueuedMessageIdsAtom: "dispatching",
editingQueuedMessageIdsAtom: "editing",
holdEditingQueuedMessage: (id: string) => {
state.held[id] = true;
Expand Down Expand Up @@ -67,7 +67,7 @@ const message: QueuedThreadMessage = {
};
beforeEach(() => {
vi.clearAllMocks();
state.dispatching = null;
state.dispatching = {};
state.held = {};
state.draft = { text: "Existing draft", attachments: [] };
state.confirm.mockResolvedValue(true);
Expand All @@ -90,7 +90,7 @@ describe("editing a pending message", () => {
expect(state.held).toEqual({});
});
it("does not reclaim a message already being dispatched", async () => {
state.dispatching = message.messageId;
state.dispatching = { [message.messageId]: true };
expect(await editPendingThreadMessage(message)).toBe(false);
expect(state.confirm).not.toHaveBeenCalled();
expect(state.draft.text).toBe("Existing draft");
Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/src/state/edit-pending-thread-message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
waitForComposerDraftsLoaded,
} from "./use-composer-drafts";
import {
dispatchingQueuedMessageIdAtom,
dispatchingQueuedMessageIdsAtom,
editingQueuedMessageIdsAtom,
holdEditingQueuedMessage,
releaseEditingQueuedMessage,
Expand All @@ -26,7 +26,7 @@ import {
export async function editPendingThreadMessage(message: QueuedThreadMessage): Promise<boolean> {
if (
message.creation ||
appAtomRegistry.get(dispatchingQueuedMessageIdAtom) === message.messageId ||
appAtomRegistry.get(dispatchingQueuedMessageIdsAtom)[message.messageId] ||
appAtomRegistry.get(editingQueuedMessageIdsAtom)[message.messageId]
) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/src/state/thread-task-permissions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ vi.mock("./threads", async () => {
});
vi.mock("./use-thread-outbox", async () => {
const { Atom } = await import("effect/reactivity");
return { dispatchingQueuedMessageIdAtom: Atom.make(null), useThreadOutboxMessages: () => ({}) };
return { dispatchingQueuedMessageIdsAtom: Atom.make({}), useThreadOutboxMessages: () => ({}) };
});
vi.mock("./thread-outbox", () => ({ enqueueThreadOutboxMessage: state.enqueue }));
vi.mock("./composer-attachment-uploads", async () => {
Expand Down
Loading
Loading