From 1310ff322013955f810c0f74cd3f052ec2651f25 Mon Sep 17 00:00:00 2001
From: user <thisemail@doesnotexist.com>
Date: Mon, 2 Mar 2026 21:40:02 +0200
Subject: [PATCH] now files do presigned url setup

---
 .../src/lib/domains/files/files.remote.ts     | 20 +++++
 .../src/lib/domains/files/files.vm.svelte.ts  | 26 ++++++-
 .../src/lib/domains/mobile/mobile.remote.ts   | 33 +++++++-
 .../main/src/routes/(main)/files/+page.svelte |  9 +--
 packages/logic/domains/files/controller.ts    | 27 +++++++
 packages/logic/domains/files/data.ts          |  8 ++
 .../logic/domains/files/storage.repository.ts | 77 ++++++++++++++++++-
 packages/objectstorage/src/client.ts          | 41 ++++++++++
 packages/objectstorage/src/data.ts            |  8 ++
 9 files changed, 239 insertions(+), 10 deletions(-)

diff --git a/apps/main/src/lib/domains/files/files.remote.ts b/apps/main/src/lib/domains/files/files.remote.ts
index 77f4074..d2a5bb0 100644
--- a/apps/main/src/lib/domains/files/files.remote.ts
+++ b/apps/main/src/lib/domains/files/files.remote.ts
@@ -51,6 +51,10 @@ const deleteFileInputSchema = v.object({
     fileId: v.string(),
 });
 
+const getFileAccessUrlInputSchema = v.object({
+    fileId: v.string(),
+});
+
 export const deleteFileSC = command(deleteFileInputSchema, async (input) => {
     const event = getRequestEvent();
     const fctx = await getFlowExecCtxForRemoteFuncs(event.locals);
@@ -64,6 +68,22 @@ export const deleteFileSC = command(deleteFileInputSchema, async (input) => {
         : { data: null, error: res.error };
 });
 
+export const getFileAccessUrlSQ = query(
+    getFileAccessUrlInputSchema,
+    async (input) => {
+        const event = getRequestEvent();
+        const fctx = await getFlowExecCtxForRemoteFuncs(event.locals);
+        if (!fctx.userId) {
+            return unauthorized(fctx);
+        }
+
+        const res = await fc.getFileAccessUrl(fctx, input.fileId, fctx.userId, 3600);
+        return res.isOk()
+            ? { data: res.value, error: null }
+            : { data: null, error: res.error };
+    },
+);
+
 export const cleanupDanglingFilesSC = command(v.object({}), async () => {
     const event = getRequestEvent();
     const fctx = await getFlowExecCtxForRemoteFuncs(event.locals);
diff --git a/apps/main/src/lib/domains/files/files.vm.svelte.ts b/apps/main/src/lib/domains/files/files.vm.svelte.ts
index 3f880ac..59eade8 100644
--- a/apps/main/src/lib/domains/files/files.vm.svelte.ts
+++ b/apps/main/src/lib/domains/files/files.vm.svelte.ts
@@ -1,5 +1,10 @@
 import type { File } from "@pkg/logic/domains/files/data";
-import { cleanupDanglingFilesSC, deleteFileSC, getFilesSQ } from "./files.remote";
+import {
+    cleanupDanglingFilesSC,
+    deleteFileSC,
+    getFileAccessUrlSQ,
+    getFilesSQ,
+} from "./files.remote";
 import { toast } from "svelte-sonner";
 
 class FilesViewModel {
@@ -104,6 +109,25 @@ class FilesViewModel {
             this.cleanupLoading = false;
         }
     }
+
+    async openFile(fileId: string) {
+        try {
+            const result = await getFileAccessUrlSQ({ fileId });
+            if (result?.error || !result?.data?.url) {
+                toast.error(result?.error?.message || "Failed to open file", {
+                    description: result?.error?.description || "Please try again later",
+                });
+                return;
+            }
+
+            window.open(result.data.url, "_blank", "noopener,noreferrer");
+        } catch (error) {
+            toast.error("Failed to open file", {
+                description:
+                    error instanceof Error ? error.message : "Please try again later",
+            });
+        }
+    }
 }
 
 export const filesVM = new FilesViewModel();
diff --git a/apps/main/src/lib/domains/mobile/mobile.remote.ts b/apps/main/src/lib/domains/mobile/mobile.remote.ts
index 4d27c02..43084d5 100644
--- a/apps/main/src/lib/domains/mobile/mobile.remote.ts
+++ b/apps/main/src/lib/domains/mobile/mobile.remote.ts
@@ -1,4 +1,5 @@
 import { getMobileController } from "@pkg/logic/domains/mobile/controller";
+import { getFileController } from "@pkg/logic/domains/files/controller";
 import {
     mobilePaginationSchema,
     listMobileDeviceMediaFiltersSchema,
@@ -12,6 +13,7 @@ import { command, getRequestEvent, query } from "$app/server";
 import * as v from "valibot";
 
 const mc = getMobileController();
+const fc = getFileController();
 
 const getDevicesInputSchema = v.object({
     search: v.optional(v.string()),
@@ -104,9 +106,34 @@ export const getDeviceMediaSQ = query(
         });
 
         const res = await mc.listDeviceMedia(fctx, filters, input.pagination);
-        return res.isOk()
-            ? { data: res.value, error: null }
-            : { data: null, error: res.error };
+        if (res.isErr()) {
+            return { data: null, error: res.error };
+        }
+
+        const rows = res.value.data;
+        const withAccessUrls = await Promise.all(
+            rows.map(async (row) => {
+                const access = await fc.getFileAccessUrl(
+                    fctx,
+                    row.fileId,
+                    fctx.userId!,
+                    3600,
+                );
+
+                return {
+                    ...row,
+                    r2Url: access.isOk() ? access.value.url : null,
+                };
+            }),
+        );
+
+        return {
+            data: {
+                ...res.value,
+                data: withAccessUrls,
+            },
+            error: null,
+        };
     },
 );
 
diff --git a/apps/main/src/routes/(main)/files/+page.svelte b/apps/main/src/routes/(main)/files/+page.svelte
index e7db948..c8be921 100644
--- a/apps/main/src/routes/(main)/files/+page.svelte
+++ b/apps/main/src/routes/(main)/files/+page.svelte
@@ -98,14 +98,13 @@
                                     {new Date(item.uploadedAt).toLocaleString()}
                                 </Table.Cell>
                                 <Table.Cell>
-                                    <a
-                                        href={item.r2Url}
-                                        target="_blank"
-                                        rel="noreferrer"
+                                    <button
+                                        type="button"
+                                        onclick={() => void filesVM.openFile(item.id)}
                                         class="text-xs text-primary underline"
                                     >
                                         Open
-                                    </a>
+                                    </button>
                                 </Table.Cell>
                                 <Table.Cell>
                                     <Button
diff --git a/packages/logic/domains/files/controller.ts b/packages/logic/domains/files/controller.ts
index cc8a5e1..dd2fce8 100644
--- a/packages/logic/domains/files/controller.ts
+++ b/packages/logic/domains/files/controller.ts
@@ -43,6 +43,33 @@ export class FileController {
         });
     }
 
+    getFileAccessUrl(
+        fctx: FlowExecCtx,
+        fileId: string,
+        userId: string,
+        expiresIn: number = 3600,
+    ) {
+        return traceResultAsync({
+            name: "logic.files.controller.getFileAccessUrl",
+            fctx,
+            attributes: {
+                "app.user.id": userId,
+                "app.file.id": fileId,
+                "app.file.access_ttl_sec": expiresIn,
+            },
+            fn: () =>
+                this.fileRepo
+                    .getFileById(fctx, fileId, userId)
+                    .andThen((file) =>
+                        this.storageRepo.generatePresignedDownloadUrl(
+                            fctx,
+                            file.objectKey,
+                            expiresIn,
+                        ),
+                    ),
+        });
+    }
+
     uploadFile(
         fctx: FlowExecCtx,
         userId: string,
diff --git a/packages/logic/domains/files/data.ts b/packages/logic/domains/files/data.ts
index 2b1b6fc..2cbcc71 100644
--- a/packages/logic/domains/files/data.ts
+++ b/packages/logic/domains/files/data.ts
@@ -91,6 +91,14 @@ export type PresignedUploadResponse = v.InferOutput<
     typeof presignedUploadResponseSchema
 >;
 
+export const presignedFileAccessResponseSchema = v.object({
+    url: v.string(),
+    expiresIn: v.pipe(v.number(), v.integer()),
+});
+export type PresignedFileAccessResponse = v.InferOutput<
+    typeof presignedFileAccessResponseSchema
+>;
+
 export const fileUploadResultSchema = v.object({
     success: v.boolean(),
     file: v.optional(fileSchema),
diff --git a/packages/logic/domains/files/storage.repository.ts b/packages/logic/domains/files/storage.repository.ts
index 0c38a8a..ba1a0a2 100644
--- a/packages/logic/domains/files/storage.repository.ts
+++ b/packages/logic/domains/files/storage.repository.ts
@@ -1,6 +1,9 @@
 import { ResultAsync, errAsync, okAsync } from "neverthrow";
 import { FlowExecCtx } from "@core/flow.execution.context";
-import type { PresignedUploadResponse } from "./data";
+import type {
+    PresignedFileAccessResponse,
+    PresignedUploadResponse,
+} from "./data";
 import { R2StorageClient } from "@pkg/objectstorage";
 import { type Err } from "@pkg/result";
 import { fileErrors } from "./errors";
@@ -209,6 +212,78 @@ export class StorageRepository {
         });
     }
 
+    generatePresignedDownloadUrl(
+        fctx: FlowExecCtx,
+        objectKey: string,
+        expiresIn: number,
+    ): ResultAsync<PresignedFileAccessResponse, Err> {
+        const startedAt = Date.now();
+        logDomainEvent({
+            event: "files.storage.presigned_download.started",
+            fctx,
+            meta: { objectKey, expiresIn },
+        });
+
+        return ResultAsync.fromPromise(
+            this.storageClient.generatePresignedDownloadUrl(objectKey, expiresIn),
+            (error) => {
+                logDomainEvent({
+                    level: "error",
+                    event: "files.storage.presigned_download.failed",
+                    fctx,
+                    durationMs: Date.now() - startedAt,
+                    error,
+                    meta: { objectKey },
+                });
+                return fileErrors.presignedUrlFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).andThen((result) => {
+            if (result.error) {
+                logDomainEvent({
+                    level: "error",
+                    event: "files.storage.presigned_download.failed",
+                    fctx,
+                    durationMs: Date.now() - startedAt,
+                    error: result.error,
+                    meta: { objectKey, stage: "storage_response" },
+                });
+                return errAsync(
+                    fileErrors.presignedUrlFailed(fctx, String(result.error)),
+                );
+            }
+
+            const data = result.data;
+            if (!data?.downloadUrl) {
+                logDomainEvent({
+                    level: "error",
+                    event: "files.storage.presigned_download.failed",
+                    fctx,
+                    durationMs: Date.now() - startedAt,
+                    error: {
+                        code: "NO_PRESIGNED_DATA",
+                        message: "No presigned download data returned",
+                    },
+                    meta: { objectKey },
+                });
+                return errAsync(fileErrors.noPresignedData(fctx));
+            }
+
+            logDomainEvent({
+                event: "files.storage.presigned_download.succeeded",
+                fctx,
+                durationMs: Date.now() - startedAt,
+                meta: { objectKey, expiresIn },
+            });
+            return okAsync({
+                url: data.downloadUrl,
+                expiresIn: data.expiresIn,
+            });
+        });
+    }
+
     deleteFile(
         fctx: FlowExecCtx,
         objectKey: string,
diff --git a/packages/objectstorage/src/client.ts b/packages/objectstorage/src/client.ts
index ef9da4b..90850ec 100644
--- a/packages/objectstorage/src/client.ts
+++ b/packages/objectstorage/src/client.ts
@@ -11,6 +11,7 @@ import {
 import type {
     FileMetadata,
     FileUploadConfig,
+    PresignedDownloadResult,
     PresignedUrlResult,
     UploadOptions,
     UploadResult,
@@ -266,6 +267,46 @@ export class R2StorageClient {
         }
     }
 
+    /**
+     * Generate presigned URL for private object download/view
+     */
+    async generatePresignedDownloadUrl(
+        objectKey: string,
+        expiresIn: number = 3600,
+    ): Promise<Result<PresignedDownloadResult>> {
+        try {
+            const command = new GetObjectCommand({
+                Bucket: this.config.bucketName,
+                Key: objectKey,
+            });
+
+            const downloadUrl = await getSignedUrl(this.s3Client, command, {
+                expiresIn,
+            });
+
+            logger.info(`Generated presigned download URL for ${objectKey}`);
+            return {
+                data: {
+                    downloadUrl,
+                    expiresIn,
+                },
+            };
+        } catch (error) {
+            logger.error("Failed to generate presigned download URL:", error);
+            return {
+                error: getError(
+                    {
+                        code: ERROR_CODES.STORAGE_ERROR,
+                        message: "Failed to generate presigned download URL",
+                        description: "Could not create download URL",
+                        detail: "S3 presigned URL generation failed",
+                    },
+                    error,
+                ),
+            };
+        }
+    }
+
     /**
      * Get file from R2
      */
diff --git a/packages/objectstorage/src/data.ts b/packages/objectstorage/src/data.ts
index d9f1760..6d19e77 100644
--- a/packages/objectstorage/src/data.ts
+++ b/packages/objectstorage/src/data.ts
@@ -60,6 +60,14 @@ export const presignedUrlResultSchema = v.object({
 });
 export type PresignedUrlResult = v.InferOutput<typeof presignedUrlResultSchema>;
 
+export const presignedDownloadResultSchema = v.object({
+    downloadUrl: v.string(),
+    expiresIn: v.pipe(v.number(), v.integer()),
+});
+export type PresignedDownloadResult = v.InferOutput<
+    typeof presignedDownloadResultSchema
+>;
+
 // File Validation Result Schema
 export const fileValidationResultSchema = v.object({
     isValid: v.boolean(),