Revert "refactor(server/upload): convert js to ts (#2618)"

This reverts commit e9f7286.

packages/server/modules/core/rest/upload.ts → packages/server/modules/core/rest/upload.js

@@ -1,43 +1,34 @@
-import zlib from 'zlib'
-import { corsMiddleware } from '@/modules/core/configs/cors'
-import Busboy from 'busboy'
-import { validatePermissionsWriteStream } from '@/modules/core/rest/authUtils'
-import {
+'use strict'
+const zlib = require('zlib')
+const { corsMiddleware } = require('@/modules/core/configs/cors')
+const Busboy = require('busboy')
+
+const { validatePermissionsWriteStream } = require('./authUtils')
+const {
   getFeatureFlags,
   maximumObjectUploadFileSizeMb
-} from '@/modules/shared/helpers/envHelper'
-import {
+} = require('@/modules/shared/helpers/envHelper')
+const {
   createObjectsBatched,
   createObjectsBatchedAndNoClosures
-} from '@/modules/core/services/objects'
-import { ObjectHandlingError } from '@/modules/core/errors/object'
-import { estimateStringMegabyteSize } from '@/modules/core/utils/chunking'
-import { toMegabytesWith1DecimalPlace } from '@/modules/core/utils/formatting'
-import { Logger } from 'pino'
-import { Router } from 'express'
+} = require('@/modules/core/services/objects')
+const { ObjectHandlingError } = require('@/modules/core/errors/object')
+const { estimateStringMegabyteSize } = require('@/modules/core/utils/chunking')
+const { toMegabytesWith1DecimalPlace } = require('@/modules/core/utils/formatting')
 
 const MAX_FILE_SIZE = maximumObjectUploadFileSizeMb() * 1024 * 1024
 const { FF_NO_CLOSURE_WRITES } = getFeatureFlags()
 
-let objectInsertionService: (params: {
-  streamId: string
-  objects: unknown[]
-  logger?: Logger
-}) => Promise<boolean | string[]> = createObjectsBatched
+let objectInsertionService = createObjectsBatched
 if (FF_NO_CLOSURE_WRITES) {
   objectInsertionService = createObjectsBatchedAndNoClosures
 }
 
-export default (app: Router) => {
+module.exports = (app) => {
   app.options('/objects/:streamId', corsMiddleware())
 
   app.post('/objects/:streamId', corsMiddleware(), async (req, res) => {
-    const calculateLogMetadata = (params: {
-      batchSizeMb: number
-      start: number
-      batchStartTime: number
-      totalObjectsProcessed: number
-    }) => {
+    const calculateLogMetadata = (params) => {
       return {
         batchSizeMb: params.batchSizeMb,
         maxFileSizeMb: toMegabytesWith1DecimalPlace(MAX_FILE_SIZE),
@@ -78,7 +69,7 @@ export default (app: Router) => {
     }
     let totalObjectsProcessed = 0
 
-    const promises: Promise<boolean | void | string[]>[] = []
+    const promises = []
     let requestDropped = false
 
     busboy.on('file', (name, file, info) => {
@@ -87,7 +78,7 @@ export default (app: Router) => {
       if (requestDropped) return
 
       if (mimeType === 'application/gzip') {
-        const buffer: Uint8Array[] = []
+        const buffer = []
 
         file.on('data', (data) => {
           if (data) buffer.push(data)

packages/server/package.json

@@ -125,7 +125,6 @@
     "@tiptap/core": "^2.0.0-beta.176",
     "@types/bcrypt": "^5.0.0",
     "@types/bull": "^3.15.9",
-    "@types/busboy": "^1.5.4",
     "@types/chai-as-promised": "^7.1.8",
     "@types/compression": "^1.7.2",
     "@types/connect-redis": "^0.0.23",

yarn.lock

@@ -15398,7 +15398,6 @@ __metadata:
     "@tiptap/core": "npm:^2.0.0-beta.176"
     "@types/bcrypt": "npm:^5.0.0"
     "@types/bull": "npm:^3.15.9"
-    "@types/busboy": "npm:^1.5.4"
     "@types/chai-as-promised": "npm:^7.1.8"
     "@types/compression": "npm:^1.7.2"
     "@types/connect-redis": "npm:^0.0.23"
@@ -17891,15 +17890,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/busboy@npm:^1.5.4":
-  version: 1.5.4
-  resolution: "@types/busboy@npm:1.5.4"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/43cdd26754603fbee81f538ac52769f2cc8445d5f238666845d99a9fee22e0b608a075d0c346f78c43ade4ce4ec04433a51a1ffa21524ca29ead9d2375f4ec9c
-  languageName: node
-  linkType: hard
-
 "@types/cacheable-request@npm:^6.0.1":
   version: 6.0.3
   resolution: "@types/cacheable-request@npm:6.0.3"