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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
4 changes: 3 additions & 1 deletion apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1040,7 +1040,9 @@ function renderFeedEntry(
const isUser = message.role === "user";
const styles = isUser ? markdownStyles.user : markdownStyles.assistant;
const timestampLabel = formatMessageTime(isUser ? message.createdAt : message.updatedAt);
const attachments = message.attachments ?? [];
const attachments = (message.attachments ?? []).filter(
(attachment) => attachment.type === "image",
);
const hasReviewCommentContext = message.text.includes("<review_comment");
// A bubble that sizes itself from its content cannot lay out a block whose
// intrinsic width overflows `maxWidth`: Android positions the bubble's
Expand Down
34 changes: 30 additions & 4 deletions apps/server/src/assets/AssetAccess.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ import {
timingSafeEqualBase64Url,
} from "../auth/utils.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { resolveAttachmentPathById } from "../attachmentStore.ts";
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
import * as ServerConfig from "../config.ts";
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
Expand DownExpand Up@@ -79,6 +79,13 @@ const AssetClaimsSchema = Schema.Union([
version: Schema.Literal(1),
kind: Schema.Literal("attachment"),
attachmentId: Schema.String,
/** Decided at mint time. Absent tokens (from before this field) serve
inline, which is only ever the image case. */
download: Schema.optionalKey(Schema.Boolean),
/** Display name and mime the caller supplied at mint time; drive the
download filename and Content-Type. */
fileName: Schema.optionalKey(Schema.String),
mimeType: Schema.optionalKey(Schema.String),
expiresAt: Schema.Number,
}),
Schema.Struct({
Expand All@@ -101,7 +108,13 @@ const AssetClaimsJson = Schema.fromJsonString(AssetClaimsSchema);
const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset = { readonly kind: "file"; readonly path: string };
export type ResolvedAsset = {
readonly kind: "file";
readonly path: string;
readonly download?: boolean;
readonly fileName?: string;
readonly mimeType?: string;
};

function decodeClaims(encodedPayload: string): AssetClaims | null {
try {
Expand DownExpand Up@@ -286,13 +299,20 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
resource: input.resource,
});
}
// Generic files carry their extension inside the attachment id (that
// shape resolves the on-disk path); images do not. Only generic files
// download, images render inline in chat.
const isGenericFile = parseAttachmentFileExtension(input.resource.attachmentId) !== null;
claims = {
version: 1,
kind: "attachment",
attachmentId: input.resource.attachmentId,
...(isGenericFile ? { download: true } : {}),
...(input.resource.fileName !== undefined ? { fileName: input.resource.fileName } : {}),
...(input.resource.mimeType !== undefined ? { mimeType: input.resource.mimeType } : {}),
expiresAt,
};
fileName = path.basename(attachmentPath);
fileName = input.resource.fileName ?? path.basename(attachmentPath);
break;
}
case "project-favicon": {
Expand DownExpand Up@@ -464,7 +484,13 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
Effect.orElseSucceed(() => Option.none()),
);
return Option.isSome(info) && info.value.type === "File"
? ({ kind: "file", path: attachmentPath } satisfies ResolvedAsset)
? ({
kind: "file",
path: attachmentPath,
...(claims.download ? { download: true } : {}),
...(claims.fileName !== undefined ? { fileName: claims.fileName } : {}),
...(claims.mimeType !== undefined ? { mimeType: claims.mimeType } : {}),
} satisfies ResolvedAsset)
: null;
}

Expand Down
122 changes: 122 additions & 0 deletions apps/server/src/assets/AttachmentUpload.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,16 @@ import * as NodePath from "node:path";

import * as NodeServices from "@effect/platform-node/NodeServices";
import { describe, expect, it } from "@effect/vitest";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import { base64UrlEncode, signPayload } from "../auth/utils.ts";
import * as ServerConfig from "../config.ts";
import { parseThreadSegmentFromAttachmentId } from "../attachmentStore.ts";
import {
Expand All@@ -30,6 +35,19 @@ const uploadInput = {
sizeBytes: 6,
} as const;

const LegacyAttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
sizeBytes: Schema.Number,
expiresAt: Schema.Number,
});
const encodeLegacyAttachmentUploadClaims = Schema.encodeEffect(
Schema.fromJsonString(LegacyAttachmentUploadClaims),
);

describe("AttachmentUpload", () => {
it.effect("signs the attachment metadata and validates the upload token", () =>
Effect.gen(function* () {
Expand DownExpand Up@@ -59,6 +77,31 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("accepts unexpired image upload tokens issued before file support", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const secretStore = yield* ServerSecretStore.ServerSecretStore;
const secret = yield* secretStore.getOrCreateRandom("asset-access-signing-key", 32);
const encodedPayload = base64UrlEncode(
yield* encodeLegacyAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
attachmentId: issued.attachmentId,
name: uploadInput.name,
mimeType: uploadInput.mimeType,
sizeBytes: uploadInput.sizeBytes,
expiresAt: issued.expiresAt,
}),
);
const legacyToken = `${encodedPayload}.${signPayload(encodedPayload, secret)}`;

expect(yield* validateAttachmentUploadToken(legacyToken)).toMatchObject({
type: "image",
attachmentId: issued.attachmentId,
});
}).pipe(Effect.provide(testLayer)),
);

it.effect("rejects expired upload tokens", () =>
Effect.gen(function* () {
const issued = yield* issueAttachmentUploadUrl(uploadInput);
Expand DownExpand Up@@ -108,6 +151,85 @@ describe("AttachmentUpload", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect("streams generic files to a path with their original extension", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl({
type: "file",
name: "report.PDF",
mimeType: "application/pdf",
sizeBytes: 6,
});
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(
yield* storeAttachmentUpload(
claims,
Stream.make(new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])),
),
).toEqual({ ok: true });
expect(issued.attachmentId).toMatch(/-pdf$/);
expect(
NodeFS.readFileSync(NodePath.join(config.attachmentsDir, `${issued.attachmentId}.pdf`)),
).toEqual(Buffer.from([1, 2, 3, 4, 5, 6]));

yield* deletePendingAttachment(issued.attachmentId);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads that exceed their signed size", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

expect(yield* storeAttachmentUpload(claims, Stream.make(new Uint8Array(7)))).toMatchObject({
ok: false,
status: 400,
});
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("removes partial streamed uploads when the upload is interrupted", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
const issued = yield* issueAttachmentUploadUrl(uploadInput);
const token = issued.relativeUrl.slice(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`.length);
const claims = yield* validateAttachmentUploadToken(token);
if (!claims) {
throw new Error("Expected valid upload claims.");
}

const nextChunkRequested = yield* Deferred.make<void>();
const body = Stream.make(new Uint8Array([1, 2, 3])).pipe(
Stream.concat(
Stream.fromEffect(
Deferred.succeed(nextChunkRequested, undefined).pipe(Effect.andThen(Effect.never)),
),
),
);
const upload = yield* storeAttachmentUpload(claims, body).pipe(Effect.forkScoped);

yield* Deferred.await(nextChunkRequested);
expect(
NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.endsWith(".part")),
).toHaveLength(1);

yield* Fiber.interrupt(upload);
expect(NodeFS.readdirSync(config.attachmentsDir)).toEqual([]);
}).pipe(Effect.provide(testLayer)),
);

it.effect("deletes pending uploads without deleting thread-owned copies", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig;
Expand Down
57 changes: 43 additions & 14 deletions apps/server/src/assets/AttachmentUpload.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,11 @@ import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import type * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";

import {
attachmentFileExtension,
createPendingAttachmentId,
parseThreadSegmentFromAttachmentId,
PENDING_ATTACHMENT_THREAD_SEGMENT,
Expand DownExpand Up@@ -41,6 +44,9 @@ const lastPendingSweepByDirectory = new Map<string, number>();
const AttachmentUploadClaims = Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("attachment-upload"),
type: Schema.Literals(["image", "file"]).pipe(
Schema.withDecodingDefault(Effect.succeed("image" as const)),
),
attachmentId: Schema.String,
name: Schema.String,
mimeType: Schema.String,
Expand DownExpand Up@@ -89,12 +95,16 @@ export const issueAttachmentUploadUrl = Effect.fn("AttachmentUpload.issueUrl")(f
}
}

const attachmentId = createPendingAttachmentId();
const attachmentType = input.type ?? "image";
const attachmentId = createPendingAttachmentId(
attachmentType === "file" ? attachmentFileExtension(input.name) : undefined,
);
const expiresAt = nowMs + ATTACHMENT_UPLOAD_URL_TTL_MS;
const encodedPayload = base64UrlEncode(
encodeAttachmentUploadClaims({
version: 1,
kind: "attachment-upload",
type: attachmentType,
attachmentId,
name: input.name,
mimeType: input.mimeType,
Expand DownExpand Up@@ -141,18 +151,21 @@ export type StoreAttachmentUploadResult =

export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(function* (
claims: AttachmentUploadClaims,
bytes: Uint8Array,
body: Uint8Array | HttpServerRequest.HttpServerRequest["stream"],
) {
if (bytes.byteLength !== claims.sizeBytes) {
if (body instanceof Uint8Array && body.byteLength !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${bytes.byteLength} bytes, expected ${claims.sizeBytes}.`,
detail: `Body was ${body.byteLength} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}

const config = yield* ServerConfig.ServerConfig;
const extension = inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const extension =
claims.type === "file"
? attachmentFileExtension(claims.name)
: inferImageExtension({ mimeType: claims.mimeType, fileName: claims.name });
const relativePath = `${claims.attachmentId}${extension}`;
const finalPath = resolveAttachmentRelativePath({
attachmentsDir: config.attachmentsDir,
Expand All@@ -168,28 +181,44 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
let receivedBytes = 0;
const bodyStream = body instanceof Uint8Array ? Stream.make(body) : body;
return yield* Effect.gen(function* () {
yield* fileSystem.makeDirectory(path.dirname(finalPath), { recursive: true });
yield* fileSystem.writeFile(partPath, bytes);
yield* Stream.run(
bodyStream.pipe(
Stream.takeWhile((chunk) => {
receivedBytes += chunk.byteLength;
return receivedBytes <= claims.sizeBytes;
}),
),
fileSystem.sink(partPath),
);
if (receivedBytes !== claims.sizeBytes) {
return {
ok: false,
status: 400,
detail: `Body was ${receivedBytes} bytes, expected ${claims.sizeBytes}.`,
} satisfies StoreAttachmentUploadResult;
}
yield* fileSystem.rename(partPath, finalPath);
return { ok: true } satisfies StoreAttachmentUploadResult;
}).pipe(
Effect.catch((cause) =>
fileSystem.remove(partPath, { force: true }).pipe(
Effect.orElseSucceed(() => undefined),
Effect.andThen(
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}),
),
Effect.logError("Failed to persist attachment upload.", {
attachmentId: claims.attachmentId,
cause,
}).pipe(
Effect.as({
ok: false,
status: 500,
detail: "Failed to persist upload.",
} satisfies StoreAttachmentUploadResult),
),
),
Effect.ensuring(
fileSystem.remove(partPath, { force: true }).pipe(Effect.orElseSucceed(() => undefined)),
),
);
});

Expand Down
Loading
Loading