lee/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-09-16 02:05:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix: rm another ref to storage, rm dupe meter

Browse Source 
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.
This commit is contained in:
KernelDeimos
2025-11-04 13:58:46 -05:00
committed by Eric Dubé
parent f823eddfa5
commit db8f45f386
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/src/routers/file.js
+13 -6
View File
@@ -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', {