From db8f45f3867462ffd9932b85334679489250f18a Mon Sep 17 00:00:00 2001
From: KernelDeimos <7225168+KernelDeimos@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:21:15 -0400
Subject: [PATCH] fix: rm another ref to storage, rm dupe meter

There were two references to `storage` in file.js but the search string
I used only detected one of them. I was looking for more references to
`storage` when I found this one. Also, I realized the metering updates
in file.js become redundant if ll_read is used instead so I've removed
those as well.
---
 src/backend/src/routers/file.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/backend/src/routers/file.js b/src/backend/src/routers/file.js
index 557df822a..2b8a59f69 100644
--- a/src/backend/src/routers/file.js
+++ b/src/backend/src/routers/file.js
@@ -134,16 +134,22 @@ router.get('/file', async (req, res, next) => {
             res.setHeader('Content-Type', contentType);
         }
 
-        const storage = req.ctx.get('storage');
+        const svc_filesystem = req.services.get('filesystem');
 
         // stream data from S3
         try {
-            let stream = await storage.create_read_stream(fsentry[0].uuid, {
-                bucket: fsentry[0].bucket,
-                bucket_region: fsentry[0].bucket_region,
+            /* eslint-disable */
+            const fsNode = await svc_filesystem.node(
+                new NodeRawEntrySelector(fsentry[0]),
+            );
+            /* eslint-enable */
+            const ll_read = new LLRead();
+            const stream = await ll_read.run({
+                no_acl: true,
+                actor: req.actor ?? ownerActor,
+                fsNode,
             });
 
-            meteringService.incrementUsage(ownerActor, 'filesystem:egress:bytes', fileSize);
             return stream.pipe(res);
         } catch (e){
             errors.report('read from storage', {
@@ -198,9 +204,11 @@ router.get('/file', async (req, res, next) => {
 
         try {
             const svc_filesystem = req.services.get('filesystem');
+            /* eslint-disable */
             const fsNode = await svc_filesystem.node(
                 new NodeRawEntrySelector(fsentry[0]),
             );
+            /* eslint-enable */
             const ll_read = new LLRead();
             const stream = await ll_read.run({
                 no_acl: true,
@@ -213,7 +221,6 @@ router.get('/file', async (req, res, next) => {
             //     bucket: fsentry[0].bucket,
             //     bucket_region: fsentry[0].bucket_region,
             // });
-            meteringService.incrementUsage(ownerActor, 'filesystem:egress:bytes', chunkSize);
             return stream.pipe(res);
         } catch (e){
             errors.report('read from storage', {