Merge pull request #229 from autonomys/improve-encoding-management

Improve encoding management

Author: clostao

backend/__tests__/e2e/users/credits.spec.ts

@@ -12,7 +12,7 @@ import { SubscriptionsUseCases } from '../../../src/useCases/index.js'
 describe('CreditsUseCases', () => {
   let mockUser: UserWithOrganization
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     mockRabbitPublish()
     await getDatabase()
     await dbMigration.up()
@@ -21,7 +21,7 @@ describe('CreditsUseCases', () => {
     if (!result) throw new PreconditionError('Failed to setup test user')
   })
 
-  afterAll(async () => {
+  afterEach(async () => {
     unmockMethods()
     await closeDatabase()
     await dbMigration.down()

backend/src/repositories/objects/interactions.ts

@@ -51,6 +51,8 @@ const getInteractionsBySubscriptionIdAndTypeInTimeRange = async (
     [subscriptionId, type, start.toISOString(), end.toISOString()],
   )
 
+  console.log(interactions.rows)
+
   return mapRows(interactions.rows)
 }
 

backend/src/services/download/express.ts

@@ -9,6 +9,10 @@ export const handleDownloadResponseHeaders = (
   const safeName = encodeURIComponent(metadata.name || 'download')
   const isExpectedDocument = req.headers['sec-fetch-site'] === 'none'
 
+  const shouldHandleEncoding = req.query.ignoreEncoding
+    ? req.query.ignoreEncoding !== 'true'
+    : isExpectedDocument
+
   if (metadata.type === 'file') {
     res.set('Content-Type', metadata.mimeType || 'application/octet-stream')
     res.set(
@@ -17,7 +21,7 @@ export const handleDownloadResponseHeaders = (
     )
     const compressedButNoEncrypted =
       metadata.uploadOptions?.compression && !metadata.uploadOptions?.encryption
-    if (compressedButNoEncrypted && isExpectedDocument) {
+    if (compressedButNoEncrypted && shouldHandleEncoding) {
       res.set('Content-Encoding', 'deflate')
     }
     res.set('Content-Length', metadata.totalSize.toString())